commit e40152ee1e1c7a63f4777791863215e3faa37a86 Author: Linus Torvalds Date: Sun May 16 14:17:36 2010 -0700 Linus 2.6.34 commit b5dbc858717113c823fe6bb058807c2cb67d1efa Merge: d34e14f c02db8c Author: Linus Torvalds Date: Sun May 16 11:11:53 2010 -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: rtnetlink: make SR-IOV VF interface symmetric sctp: delete active ICMP proto unreachable timer when free transport tcp: fix MD5 (RFC2385) support commit d34e14f690d611ffe3db09e4ed8123d86c89a831 Merge: 18e41da 4e73238 Author: Linus Torvalds Date: Sun May 16 11:11:31 2010 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: Oprofile: Fix Loongson irq handler MIPS: N32: Use compat version for sys_ppoll. MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1 commit c02db8c6290bb992442fec1407643c94cc414375 Author: Chris Wright Date: Sun May 16 01:05:45 2010 -0700 rtnetlink: make SR-IOV VF interface symmetric Now we have a set of nested attributes: IFLA_VFINFO_LIST (NESTED) IFLA_VF_INFO (NESTED) IFLA_VF_MAC IFLA_VF_VLAN IFLA_VF_TX_RATE This allows a single set to operate on multiple attributes if desired. Among other things, it means a dump can be replayed to set state. The current interface has yet to be released, so this seems like something to consider for 2.6.34. Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit 55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3 Author: Wei Yongjun Date: Sun May 9 16:56:07 2010 +0000 sctp: delete active ICMP proto unreachable timer when free transport transport may be free before ICMP proto unreachable timer expire, so we should delete active ICMP proto unreachable timer when transport is going away. Signed-off-by: Wei Yongjun Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit 35790c0421121364883a167bab8a2e37e1f67f78 Author: Eric Dumazet Date: Sun May 16 00:34:04 2010 -0700 tcp: fix MD5 (RFC2385) support TCP MD5 support uses percpu data for temporary storage. It currently disables preemption so that same storage cannot be reclaimed by another thread on same cpu. We also have to make sure a softirq handler wont try to use also same context. Various bug reports demonstrated corruptions. Fix is to disable preemption and BH. Reported-by: Bhaskar Dutta Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4e73238d163c6fcf001264832701d2a6d4927672 Author: Wu Zhangjin Date: Fri May 7 00:59:46 2010 +0800 MIPS: Oprofile: Fix Loongson irq handler The interrupt enable bit for the performance counters is in the Control Register $24, not in the counter register. loongson2_perfcount_handler(), we need to use Reported-by: Xu Hengyang Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1198/ Signed-off-by: Ralf Baechle --- commit 46afb8296c2494bfce17064124b253eb9b176ef9 Author: Chandrakala Chavva Date: Mon May 10 17:11:54 2010 -0700 MIPS: N32: Use compat version for sys_ppoll. The sys_ppoll() takes struct 'struct timespec'. This is different for the N32 and N64 ABIs. Use the compat version to do the proper conversions. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1210/ Signed-off-by: Ralf Baechle --- commit 95e8f634d7a3ea5af40ec3fa42c8a152fd3a0624 Author: Shane McDonald Date: Thu May 6 23:26:57 2010 -0600 MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1 In the FPU emulator code of the MIPS, the Cause bits of the FCSR register are not currently writeable by the ctc1 instruction. In odd corner cases, this can cause problems. For example, a case existed where a divide-by-zero exception was generated by the FPU, and the signal handler attempted to restore the FPU registers to their state before the exception occurred. In this particular setup, writing the old value to the FCSR register would cause another divide-by-zero exception to occur immediately. The solution is to change the ctc1 instruction emulator code to allow the Cause bits of the FCSR register to be writeable. This is the behaviour of the hardware that the code is emulating. This problem was found by Shane McDonald, but the credit for the fix goes to Kevin Kissell. In Kevin's words: I submit that the bug is indeed in that ctc_op: case of the emulator. The Cause bits (17:12) are supposed to be writable by that instruction, but the CTC1 emulation won't let them be updated by the instruction. I think that actually if you just completely removed lines 387-388 [...] things would work a good deal better. At least, it would be a more accurate emulation of the architecturally defined FPU. If I wanted to be really, really pedantic (which I sometimes do), I'd also protect the reserved bits that aren't necessarily writable. Signed-off-by: Shane McDonald To: anemo@mba.ocn.ne.jp To: kevink@paralogos.com To: sshtylyov@mvista.com Patchwork: http://patchwork.linux-mips.org/patch/1205/ Signed-off-by: Ralf Baechle --- commit 18e41da89d55014d25b9a24502ee92b7f50599f9 Merge: 43aa7ac 5dc6416 Author: Linus Torvalds Date: Sat May 15 12:55:31 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: check for read permission on src file in the clone ioctl commit 43aa7ac736a4e21aae4882bd8f7c67403aed45b8 Author: kirjanov@gmail.com Date: Sat May 15 12:32:34 2010 -0400 lib/btree: fix possible NULL pointer dereference mempool_alloc() can return null in atomic case. Signed-off-by: Denis Kirjanov Cc: Joern Engel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdef2fe88b1e4bde7458aedd207929ce3f9d66ee Author: Nicolas Ferre Date: Sat May 15 12:32:31 2010 -0400 mmc: at91_mci: modify cache flush routines As we were using an internal dma flushing routine, this patch changes to the DMA API flush_kernel_dcache_page(). Driver is able to compile now. [akpm@linux-foundation.org: flush_kernel_dcache_page() comes before kunmap_atomic()] Signed-off-by: Nicolas Ferre Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395 Author: Dan Rosenberg Date: Sat May 15 11:27:37 2010 -0400 Btrfs: check for read permission on src file in the clone ioctl The existing code would have allowed you to clone a file that was only open for writing Signed-off-by: Chris Mason commit 3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f Merge: c28f3f8 684bdc7 Author: Linus Torvalds Date: Sat May 15 09:03:15 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: JFS: Free sbi memory in error path fs/sysv: dereferencing ERR_PTR() Fix double-free in logfs Fix the regression created by "set S_DEAD on unlink()..." commit commit c28f3f8660697d03afbdb581781b94ff6222a585 Merge: bfcf1ae 46db2c3 Author: Linus Torvalds Date: Sat May 15 09:03:02 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf record: Add a fallback to the reference relocation symbol commit 684bdc7ff95e0c1d4b0bcf236491840b55a54189 Author: Jan Blunck Date: Mon Apr 12 16:44:08 2010 -0700 JFS: Free sbi memory in error path I spotted the missing kfree() while removing the BKL. [akpm@linux-foundation.org: avoid multiple returns so it doesn't happen again] Signed-off-by: Jan Blunck Cc: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Al Viro commit 404e781249f003a37a140756fc4aeae463dcb217 Author: Dan Carpenter Date: Wed Apr 21 12:30:32 2010 +0200 fs/sysv: dereferencing ERR_PTR() I moved the dir_put_page() inside the if condition so we don't dereference "page", if it's an ERR_PTR(). Signed-off-by: Dan Carpenter Signed-off-by: Al Viro commit 265624495f5acf6077f8f8d264f8170573d8d752 Author: Al Viro Date: Wed Apr 28 20:57:02 2010 -0400 Fix double-free in logfs iput() is needed *until* we'd done successful d_alloc_root() Signed-off-by: Al Viro commit d83c49f3e36cecd2e8823b6c48ffba083b8a5704 Author: Al Viro Date: Fri Apr 30 17:17:09 2010 -0400 Fix the regression created by "set S_DEAD on unlink()..." commit 1) i_flags simply doesn't work for mount/unlink race prevention; we may have many links to file and rm on one of those obviously shouldn't prevent bind on top of another later on. To fix it right way we need to mark _dentry_ as unsuitable for mounting upon; new flag (DCACHE_CANT_MOUNT) is protected by d_flags and i_mutex on the inode in question. Set it (with dont_mount(dentry)) in unlink/rmdir/etc., check (with cant_mount(dentry)) in places in namespace.c that used to check for S_DEAD. Setting S_DEAD is still needed in places where we used to set it (for directories getting killed), since we rely on it for readdir/rmdir race prevention. 2) rename()/mount() protection has another bogosity - we unhash the target before we'd checked that it's not a mountpoint. Fixed. 3) ancient bogosity in pivot_root() - we locked i_mutex on the right directory, but checked S_DEAD on the different (and wrong) one. Noticed and fixed. Signed-off-by: Al Viro commit bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f Merge: ecbb458 98af057 Author: Linus Torvalds Date: Fri May 14 21:28:42 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes ARM: 6125/1: ARM TWD: move TWD registers to common header ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops ARM: 6106/1: Implement copy_to_user_page() for noMMU ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c commit ecbb458a484fd9c455f8feb36c87727e71b4ac1a Merge: 16a2164 e9b1d5d Author: Linus Torvalds Date: Fri May 14 21:28:23 2010 -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, mrst: Don't blindly access extended config space commit 16a2164bb03612efe79a76c73da6da44445b9287 Author: Hugh Dickins Date: Fri May 14 19:44:10 2010 -0700 profile: fix stats and data leakage If the kernel is large or the profiling step small, /proc/profile leaks data and readprofile shows silly stats, until readprofile -r has reset the buffer: clear the prof_buffer when it is vmalloc()ed. Signed-off-by: Hugh Dickins Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit bfcc6e2eca507819e297a4c758ebd6b26e625330 Author: Hugh Dickins Date: Fri May 14 19:40:35 2010 -0700 hughd: update email address My old address will shut down in a couple of weeks: update the tree. Signed-off-by: Hugh Dickins Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit e9b1d5d0ff4d3ae86050dc4c91b3147361c7af9e Author: H. Peter Anvin Date: Fri May 14 13:55:57 2010 -0700 x86, mrst: Don't blindly access extended config space Do not blindly access extended configuration space unless we actively know we're on a Moorestown platform. The fixed-size BAR capability lives in the extended configuration space, and thus is not applicable if the configuration space isn't appropriately sized. This fixes booting certain VMware configurations with CONFIG_MRST=y. Moorestown will add a fake PCI-X 266 capability to advertise the presence of extended configuration space. Reported-and-tested-by: Petr Vandrovec Signed-off-by: H. Peter Anvin Acked-by: Jacob Pan Acked-by: Jesse Barnes LKML-Reference: commit ef0e9180d3589ad35eefe9be6b239f32719fd548 Merge: 4fc4c3c 7f284d3 Author: Linus Torvalds Date: Fri May 14 12:20:09 2010 -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, cacheinfo: Turn off L3 cache index disable feature in virtualized environments x86, k8: Fix build error when K8_NB is disabled x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs x86: Fix fake apicid to node mapping for numa emulation commit 7f284d3cc96e02468a42e045f77af11e5ff8b095 Author: Frank Arnold Date: Thu Apr 22 16:06:59 2010 +0200 x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments When running a quest kernel on xen we get: BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 IP: [] cpuid4_cache_lookup_regs+0x2ca/0x3df PGD 0 Oops: 0000 [#1] SMP last sysfs file: CPU 0 Modules linked in: Pid: 0, comm: swapper Tainted: G W 2.6.34-rc3 #1 /HVM domU RIP: 0010:[] [] cpuid4_cache_lookup_regs+0x 2ca/0x3df RSP: 0018:ffff880002203e08 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000060 RDX: 0000000000000000 RSI: 0000000000000040 RDI: 0000000000000000 RBP: ffff880002203ed8 R08: 00000000000017c0 R09: ffff880002203e38 R10: ffff8800023d5d40 R11: ffffffff81a01e28 R12: ffff880187e6f5c0 R13: ffff880002203e34 R14: ffff880002203e58 R15: ffff880002203e68 FS: 0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000038 CR3: 0000000001a3c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 0, threadinfo ffffffff81a00000, task ffffffff81a44020) Stack: ffffffff810d7ecb ffff880002203e20 ffffffff81059140 ffff880002203e30 <0> ffffffff810d7ec9 0000000002203e40 000000000050d140 ffff880002203e70 <0> 0000000002008140 0000000000000086 ffff880040020140 ffffffff81068b8b Call Trace: [] ? sync_supers_timer_fn+0x0/0x1c [] ? mod_timer+0x23/0x25 [] ? arm_supers_timer+0x34/0x36 [] ? hrtimer_get_next_event+0xa7/0xc3 [] ? get_next_timer_interrupt+0x19a/0x20d [] get_cpu_leaves+0x5c/0x232 [] ? sched_clock_local+0x1c/0x82 [] ? sched_clock_tick+0x75/0x7a [] generic_smp_call_function_single_interrupt+0xae/0xd0 [] smp_call_function_single_interrupt+0x18/0x27 [] call_function_single_interrupt+0x13/0x20 [] ? notifier_call_chain+0x14/0x63 [] ? native_safe_halt+0xc/0xd [] ? default_idle+0x36/0x53 [] cpu_idle+0xaa/0xe4 [] rest_init+0x7e/0x80 [] start_kernel+0x40e/0x419 [] x86_64_start_reservations+0xb3/0xb7 [] x86_64_start_kernel+0xf8/0x107 Code: 14 d5 40 ff ae 81 8b 14 02 31 c0 3b 15 47 1c 8b 00 7d 0e 48 8b 05 36 1c 8b 00 48 63 d2 48 8b 04 d0 c7 85 5c ff ff ff 00 00 00 00 <8b> 70 38 48 8d 8d 5c ff ff ff 48 8b 78 10 ba c4 01 00 00 e8 eb RIP [] cpuid4_cache_lookup_regs+0x2ca/0x3df RSP CR2: 0000000000000038 ---[ end trace a7919e7f17c0a726 ]--- The L3 cache index disable feature of AMD CPUs has to be disabled if the kernel is running as guest on top of a hypervisor because northbridge devices are not available to the guest. Currently, this fixes a boot crash on top of Xen. In the future this will become an issue on KVM as well. Check if northbridge devices are present and do not enable the feature if there are none. [ hpa: backported to 2.6.34 ] Signed-off-by: Frank Arnold LKML-Reference: <1271945222-5283-3-git-send-email-bp@amd64.org> Acked-by: Borislav Petkov Signed-off-by: H. Peter Anvin Cc: commit ade029e2aaacc8965a548b0b0f80c5bee97ffc68 Author: Borislav Petkov Date: Sat Apr 24 09:56:53 2010 +0200 x86, k8: Fix build error when K8_NB is disabled K8_NB depends on PCI and when the last is disabled (allnoconfig) we fail at the final linking stage due to missing exported num_k8_northbridges. Add a header stub for that. Signed-off-by: Borislav Petkov LKML-Reference: <20100503183036.GJ26107@aftab> Signed-off-by: H. Peter Anvin Cc: commit 4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e Merge: 97b2073 b3b38d8 Author: Linus Torvalds Date: Fri May 14 11:49:42 2010 -0700 Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify * 'for-linus' of git://git.infradead.org/users/eparis/notify: inotify: don't leak user struct on inotify release inotify: race use after free/double free in inotify inode marks inotify: clean up the inotify_add_watch out path Inotify: undefined reference to `anon_inode_getfd' Manual merge to remove duplicate "select ANON_INODES" from Kconfig file commit 97b2073ff04814a7f2fef5fe0e82bb008cad7d8e Merge: 508ff9d b9af5dd Author: Linus Torvalds Date: Fri May 14 11:43:52 2010 -0700 Merge branch 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: DA830: fix USB 2.0 clock entry commit b9af5ddf8a34ff3c911372173c2e51c6f8a6ca8f Author: Sergei Shtylyov Date: Thu May 13 22:51:51 2010 +0400 DA830: fix USB 2.0 clock entry DA8xx OHCI driver fails to load due to failing clk_get() call for the USB 2.0 clock. Arrange matching USB 2.0 clock by the clock name instead of the device. (Adding another CLK() entry for "ohci.0" device won't do -- in the future I'll also have to enable USB 2.0 clock to configure CPPI 4.1 module, in which case I won't have any device at all.) Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman commit b3b38d842fa367d862b83e7670af4e0fd6a80fc0 Author: Pavel Emelyanov Date: Wed May 12 15:34:07 2010 -0700 inotify: don't leak user struct on inotify release inotify_new_group() receives a get_uid-ed user_struct and saves the reference on group->inotify_data.user. The problem is that free_uid() is never called on it. Issue seem to be introduced by 63c882a0 (inotify: reimplement inotify using fsnotify) after 2.6.30. Signed-off-by: Pavel Emelyanov Eric Paris Cc: Signed-off-by: Andrew Morton Signed-off-by: Eric Paris commit e08733446e72b983fed850fc5d8bd21b386feb29 Author: Eric Paris Date: Tue May 11 17:17:40 2010 -0400 inotify: race use after free/double free in inotify inode marks There is a race in the inotify add/rm watch code. A task can find and remove a mark which doesn't have all of it's references. This can result in a use after free/double free situation. Task A Task B ------------ ----------- inotify_new_watch() allocate a mark (refcnt == 1) add it to the idr inotify_rm_watch() inotify_remove_from_idr() fsnotify_put_mark() refcnt hits 0, free take reference because we are on idr [at this point it is a use after free] [time goes on] refcnt may hit 0 again, double free The fix is to take the reference BEFORE the object can be found in the idr. Signed-off-by: Eric Paris Cc: commit 3dbc6fb6a3c8a7dc164ae330ab024a3fe65ae53e Author: Eric Paris Date: Tue May 11 17:16:23 2010 -0400 inotify: clean up the inotify_add_watch out path inotify_add_watch explictly frees the unused inode mark, but it can just use the generic code. Just do that. Signed-off-by: Eric Paris commit 508ff9d41c9aa7e178f6330e703a22af03090dd5 Merge: 3ac4e82 d77f873 Author: Linus Torvalds Date: Fri May 14 07:56:45 2010 -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: vhost: fix barrier pairing commit 3ac4e829bd8575e9adea2ba1b9329da363881ffb Merge: 7ac992e 4ae69e6 Author: Linus Torvalds Date: Fri May 14 07:55:42 2010 -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: mmap_min_addr check CAP_SYS_RAWIO only for write commit 7ac992ef615c66a05ebb831915935e83c0ec8e05 Merge: 6a251b0 a5e48b8 Author: Linus Torvalds Date: Fri May 14 07:29:29 2010 -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: microblaze: Fix module loading on system with WB cache microblaze: export assembly functions used by modules microblaze: Remove powerpc code from Microblaze port microblaze: Remove compilation warnings in cache macro microblaze: export assembly functions used by modules microblaze: fix get_user/put_user side-effects microblaze: re-enable interrupts before calling schedule commit d77f873fdd21912803836da78f627d2efd267082 Merge: cea0d76 0d49935 Author: David S. Miller Date: Fri May 14 03:42:49 2010 -0700 Merge branch 'net-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 4ae69e6b718589abe97c9625ccbb1e0bc95a8c0e Author: Kees Cook Date: Thu Apr 22 12:19:17 2010 -0700 mmap_min_addr check CAP_SYS_RAWIO only for write Redirecting directly to lsm, here's the patch discussed on lkml: http://lkml.org/lkml/2010/4/22/219 The mmap_min_addr value is useful information for an admin to see without being root ("is my system vulnerable to kernel NULL pointer attacks?") and its setting is trivially easy for an attacker to determine by calling mmap() in PAGE_SIZE increments starting at 0, so trying to keep it private has no value. Only require CAP_SYS_RAWIO if changing the value, not reading it. Comment from Serge : Me, I like to write my passwords with light blue pen on dark blue paper, pasted on my window - if you're going to get my password, you're gonna get a headache. Signed-off-by: Kees Cook Acked-by: Serge Hallyn Signed-off-by: James Morris (cherry picked from commit 822cceec7248013821d655545ea45d1c6a9d15b3) commit a5e48b88da225580394f825ffe67e444b050074b Author: Michal Simek Date: Fri May 14 07:40:46 2010 +0200 microblaze: Fix module loading on system with WB cache There is necessary to flush whole dcache. Icache work should be done in kernel/module.c. Signed-off-by: Michal Simek commit f01487119dda3d9f58c9729c7361ecc50a61c188 Author: Andreas Herrmann Date: Tue Apr 27 12:13:48 2010 +0200 x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs If host CPU is exposed to a guest the OSVW MSRs are not guaranteed to be present and a GP fault occurs. Thus checking the feature flag is essential. Cc: # .32.x .33.x Signed-off-by: Andreas Herrmann LKML-Reference: <20100427101348.GC4489@alberich.amd.com> Signed-off-by: H. Peter Anvin commit 6a251b0ab67989f468f4cb65179e0cf40cf8c295 Merge: 9e766d8 5051d41 Author: Linus Torvalds Date: Thu May 13 14:48:10 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Clean up after WM83xx AUXADC interrupt if it arrives late commit 9e766d81b1f432826fd773fc5d679b8a8095e941 Merge: bf6239e 4f018c5 Author: Linus Torvalds Date: Thu May 13 14:36:19 2010 -0700 Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe() KVM: VMX: blocked-by-sti must not defer NMI injections KVM: x86: Call vcpu_load and vcpu_put in cpuid_update KVM: SVM: Fix wrong intercept masks on 32 bit KVM: convert ioapic lock to spinlock commit bf6239eb84e6d7331f168cd3593958b656ce42a3 Merge: 4462dc0 1c5250d Author: Linus Torvalds Date: Thu May 13 12:21:44 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: imx.c: fix CTS trigger level lower to avoid lost chars tty: Fix unbalanced BKL handling in error path serial: mpc52xx_uart: fix null pointer dereference commit 1c5250d6163dac28be3afabdfb6c723f107051b7 Author: Valentin Longchamp Date: Wed May 5 11:47:07 2010 +0200 serial: imx.c: fix CTS trigger level lower to avoid lost chars The imx CTS trigger level is left at its reset value that is 32 chars. Since the RX FIFO has 32 entries, when CTS is raised, the FIFO already is full. However, some serial port devices first empty their TX FIFO before stopping when CTS is raised, resulting in lost chars. This patch sets the trigger level lower so that other chars arrive after CTS is raised, there is still room for 16 of them. Signed-off-by: Valentin Longchamp Tested-by: Philippe Rétornaz Acked-by: Wolfram Sang Cc: stable Signed-off-by: Greg Kroah-Hartman commit 77945febbe60a69e9dcab7f49d33a1aa1e436973 Author: Alan Cox Date: Tue May 4 20:42:36 2010 +0100 tty: Fix unbalanced BKL handling in error path Arnd noted: After the "retry_open:" label, we first get the tty_mutex and then the BKL. However a the end of tty_open, we jump back to retry_open with the BKL still held. If we run into this case, the tty_open function will be left with the BKL still held. Signed-off-by: Alan Cox Acked-by: Arnd Bergmann Cc: stable Signed-off-by: Greg Kroah-Hartman commit e6114fa1d1d6a588766f28081b971047dd3e5def Author: Anatolij Gustschin Date: Wed May 5 00:18:59 2010 +0200 serial: mpc52xx_uart: fix null pointer dereference Commit 6acc6833510db8f72b5ef343296d97480555fda9 introduced NULL pointer dereference and kernel crash on ppc32 machines while booting. Fix this bug now. Reported-by: Leonardo Chiquitto Tested-by: Leonardo Chiquitto Signed-off-by: Anatolij Gustschin Acked-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 4462dc02842698f173f518c1f5ce79c0fb89395a Merge: 002baee 3d69438 Author: Linus Torvalds Date: Thu May 13 10:36:16 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: guard against hardlinking directories commit 002baeecf53677d2034113e34197ec221f42e037 Author: Jan Kara Date: Thu May 13 12:52:57 2010 +0200 vfs: Fix O_NOFOLLOW behavior for paths with trailing slashes According to specification mkdir d; ln -s d a; open("a/", O_NOFOLLOW | O_RDONLY) should return success but currently it returns ELOOP. This is a regression caused by path lookup cleanup patch series. Fix the code to ignore O_NOFOLLOW in case the provided path has trailing slashes. Cc: Andrew Morton Cc: Al Viro Reported-by: Marius Tolzmann Acked-by: Miklos Szeredi Signed-off-by: Jan Kara Signed-off-by: Linus Torvalds commit fc8e38f142dd59f81306ff6a81c1351e9eb0e014 Merge: aa86f26 105ce39 Author: Linus Torvalds Date: Thu May 13 07:35:26 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ice1724 - Fix ESI Maya44 capture source control ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs ALSA: virtuoso: fix Xonar D1/DX front panel microphone ALSA: hda - Add hp-dv4 model for IDT 92HD71bx ALSA: hda - Fix mute-LED GPIO pin for HP dv series ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice) commit aa86f26bd81a46985f1b32e513638d1c36cf3104 Merge: be83567 3843384 Author: Linus Torvalds Date: Thu May 13 07:28:43 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ad7877 - keep dma rx buffers in seperate cache lines Input: psmouse - reset all types of mice before reconnecting Input: elantech - use all 3 bytes when checking version Input: iforce - fix Guillemot Jet Leader 3D entry Input: iforce - add Guillemot Jet Leader Force Feedback commit 5051d411ec87381693433d24c4488b2fa4a6306c Author: Mark Brown Date: Fri Apr 2 13:08:39 2010 +0100 mfd: Clean up after WM83xx AUXADC interrupt if it arrives late In certain circumstances, especially under heavy load, the AUXADC completion interrupt may be detected after we've timed out waiting for it. That conversion would still succeed but the next conversion will see the completion that was signalled by the interrupt for the previous conversion and therefore not wait for the AUXADC conversion to run, causing it to report failure. Provide a simple, non-invasive cleanup by using try_wait_for_completion() to ensure that the completion is not signalled before we wait. Since the AUXADC is run within a mutex we know there can only have been at most one AUXADC interrupt outstanding. A more involved change should follow for the next merge window. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit ee4bcdf1d248c4ebe5f73e11631c3bd3f76d777b Author: Michal Simek Date: Thu May 13 12:11:42 2010 +0200 microblaze: export assembly functions used by modules Export __strncpy_user, memory_size, ioremap_bot for modules. Signed-off-by: Michal Simek commit 1ce2470aa544a0aa37b575c45cba366770860af7 Author: Michal Simek Date: Thu May 13 12:09:54 2010 +0200 microblaze: Remove powerpc code from Microblaze port Remove eeh_add_device_tree_late which is powerpc specific code. Signed-off-by: Michal Simek commit ddfbc935eae68294834dc29998f93147a5422a0d Author: Michal Simek Date: Thu May 13 10:55:47 2010 +0200 microblaze: Remove compilation warnings in cache macro CC arch/microblaze/kernel/cpu/cache.o arch/microblaze/kernel/cpu/cache.c: In function '__invalidate_dcache_range_wb': arch/microblaze/kernel/cpu/cache.c:398: warning: ISO C90 forbids mixed declarations and code arch/microblaze/kernel/cpu/cache.c: In function '__flush_dcache_range_wb': arch/microblaze/kernel/cpu/cache.c:509: warning: ISO C90 forbids mixed declara Signed-off-by: Michal Simek commit e1733d2c397476c245a681ba0b54c88858b7a0be Author: Steven J. Magnani Date: Tue Apr 27 13:00:35 2010 -0500 microblaze: export assembly functions used by modules Modules that use copy_{to,from}_user(), memcpy(), and memset() fail to build in certain circumstances. Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit 105ce39ca4fabf20e3211cae1abc8f037e6a1f7f Merge: 8213466 2a6ce6e Author: Takashi Iwai Date: Thu May 13 10:07:15 2010 +0200 Merge branch 'fix/hda' into for-linus commit 3843384a055496dfed3c93ae883d964d8290fdab Author: Oskar Schirmer Date: Thu May 13 00:42:23 2010 -0700 Input: ad7877 - keep dma rx buffers in seperate cache lines With dma based spi transmission, data corruption is observed occasionally. With dma buffers located right next to msg and xfer fields, cache lines correctly flushed in preparation for dma usage may be polluted again when writing to fields in the same cache line. Make sure cache fields used with dma do not share cache lines with fields changed during dma handling. As both fields are part of a struct that is allocated via kzalloc, thus cache aligned, moving the fields to the 1st position and insert padding for alignment does the job. Signed-off-by: Oskar Schirmer Signed-off-by: Daniel Glöckner Signed-off-by: Oliver Schneidewind Signed-off-by: Johannes Weiner Acked-by: Mike Frysinger [dtor@mail.ru - changed to use ___cacheline_aligned as suggested by akpm] Signed-off-by: Dmitry Torokhov commit ef110b24e28f36620f63dab94708a17c7e267358 Author: Dmitry Torokhov Date: Thu May 13 00:42:23 2010 -0700 Input: psmouse - reset all types of mice before reconnecting Synaptics hardware requires resetting device after suspend to ram in order for the device to be operational. The reset lives in synaptics-specific reconnect handler, but it is not being invoked if synaptics support is disabled and the device is handled as a standard PS/2 device (bare or IntelliMouse protocol). Let's add reset into generic reconnect handler as well. Signed-off-by: Dmitry Torokhov commit 504e8beed161bd11a2c6cbb8aaf352c14d39b5bb Author: Dmitry Torokhov Date: Thu May 13 00:41:15 2010 -0700 Input: elantech - use all 3 bytes when checking version Apparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant and should be taken into account when matching hardware version/features. Tested-by: Eric Piel Signed-off-by: Dmitry Torokhov commit 538722ca3b762023ac65cec214901a1ebff8b575 Author: Steven J. Magnani Date: Thu May 6 16:38:33 2010 -0500 microblaze: fix get_user/put_user side-effects The Microblaze implementations of get_user() and (MMU) put_user() evaluate the address argument more than once. This causes unexpected side-effects for invocations that include increment operators, i.e. get_user(foo, bar++). This patch also removes the distinction between MMU and noMMU put_user(). Without the patch: $ echo 1234567890 > /proc/sys/kernel/core_pattern $ cat /proc/sys/kernel/core_pattern 12345 Signed-off-by: Steven J. Magnani commit 0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9 Author: Steven J. Magnani Date: Tue Apr 27 13:00:23 2010 -0500 microblaze: re-enable interrupts before calling schedule schedule() should not be called with interrupts disabled. Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit 46db2c3205ca6e24adbb9b038441bc8f65360535 Author: Arnaldo Carvalho de Melo Date: Tue Mar 30 18:27:39 2010 -0300 perf record: Add a fallback to the reference relocation symbol Usually "_text" is enough, but I received reports that its not always available, so fallback to "_stext" for the symbol we use to check if we need to apply any relocation to all the symbols in the kernel symtab, for when, for instance, kexec is being used. Reported-by: Darren Hart Reported-by: Steven Rostedt Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar commit 4f018c513a81ba243165bfc4fcf44254986ad002 Author: Roel Kluin Date: Sun May 9 17:26:47 2010 +0200 KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe() An index of KVM44x_GUEST_TLB_SIZE is already one too large. Signed-off-by: Roel Kluin Acked-by: Hollis Blanchard Acked-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit f8c5fae16649445e15656667f72bd51d777f7766 Author: Jan Kiszka Date: Tue May 11 15:16:46 2010 +0200 KVM: VMX: blocked-by-sti must not defer NMI injections As the processor may not consider GUEST_INTR_STATE_STI as a reason for blocking NMI, it could return immediately with EXIT_REASON_NMI_WINDOW when we asked for it. But as we consider this state as NMI-blocking, we can run into an endless loop. Resolve this by allowing NMI injection if just GUEST_INTR_STATE_STI is active (originally suggested by Gleb). Intel confirmed that this is safe, the processor will never complain about NMI injection in this state. Signed-off-by: Jan Kiszka KVM-Stable-Tag Acked-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit fe19c5a46b4c519153fddd4d5efe32a3e4cfa694 Author: Dongxiao Xu Date: Tue May 11 18:21:33 2010 +0800 KVM: x86: Call vcpu_load and vcpu_put in cpuid_update cpuid_update may operate VMCS, so vcpu_load() and vcpu_put() should be called to ensure correctness. Signed-off-by: Dongxiao Xu Signed-off-by: Marcelo Tosatti commit 061e2fd16863009c8005b4b5fdfb75c7215c0b99 Author: Joerg Roedel Date: Wed May 5 16:04:43 2010 +0200 KVM: SVM: Fix wrong intercept masks on 32 bit This patch makes KVM on 32 bit SVM working again by correcting the masks used for iret interception. With the wrong masks the upper 32 bits of the intercepts are masked out which leaves vmrun unintercepted. This is not legal on svm and the vmrun fails. Bug was introduced by commits 95ba827313 and 3cfc3092. Cc: Jan Kiszka Cc: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 46a47b1ed118cda1a08b7f6077b837a00fbc112b Author: Marcelo Tosatti Date: Fri Apr 23 14:03:38 2010 -0300 KVM: convert ioapic lock to spinlock kvm_set_irq is used from non sleepable contexes, so convert ioapic from mutex to spinlock. KVM-Stable-Tag. Tested-by: Ralf Bonenkamp Signed-off-by: Marcelo Tosatti commit be835674b55324c1abe973b15343c3663910c620 Merge: 5ec390e 131c6c9 Author: Linus Torvalds Date: Wed May 12 18:48:26 2010 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/perf_event: Fix oops due to perf_event_do_pending call powerpc/swiotlb: Fix off by one in determining boundary of which ops to use commit 5ec390e046039942d59ef2634b967b8b23fc57c2 Merge: cdf5f61 57d8490 Author: Linus Torvalds Date: Wed May 12 18:47:55 2010 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y [S390] ptrace: fix return value of do_syscall_trace_enter() [S390] dasd: fix race between tasklet and dasd_sleep_on commit cdf5f61ed1d64d50eb9cf10071ab40836f5f9f91 Merge: 769d996 e84346b Author: Linus Torvalds Date: Wed May 12 18:47:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: preserve seq # on requeued messages after transient transport errors ceph: fix cap removal races ceph: zero unused message header, footer fields ceph: fix locking for waking session requests after reconnect ceph: resubmit requests on pg mapping change (not just primary change) ceph: fix open file counting on snapped inodes when mds returns no caps ceph: unregister osd request on failure ceph: don't use writeback_control in writepages completion ceph: unregister bdi before kill_anon_super releases device name commit 131c6c9eddfa252e376edb4aeff9c7fe1b96a798 Merge: 0fe1ac4 b8b14c6 Author: Benjamin Herrenschmidt Date: Thu May 13 11:42:40 2010 +1000 Merge commit 'kumar/merge' into merge commit 769d9968e42c995eaaf61ac5583d998f32e0769a Author: Linus Torvalds Date: Wed May 12 18:39:45 2010 -0700 Revert "PCI: update bridge resources to get more big ranges in PCI assign unssigned" This reverts commit 977d17bb1749517b353874ccdc9b85abc7a58c2a, because it can cause problems with some devices not getting any resources at all when the resource tree is re-allocated. For an example of this, see https://bugzilla.kernel.org/show_bug.cgi?id=15960 (originally https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4982) (lkml thread: http://lkml.org/lkml/2010/4/19/20) where Peter Henriksson reported his Xonar DX sound card gone, because the IO port region was no longer allocated. Reported-bisected-and-tested-by: Peter Henriksson Requested-by: Andrew Morton Requested-by: Clemens Ladisch Acked-by: Jesse Barnes Cc: Yinghai Lu Signed-off-by: Linus Torvalds commit 7ac512aa8237c43331ffaf77a4fd8b8d684819ba Author: David Howells Date: Wed May 12 15:34:03 2010 +0100 CacheFiles: Fix error handling in cachefiles_determine_cache_security() cachefiles_determine_cache_security() is expected to return with a security override in place. However, if set_create_files_as() fails, we fail to do this. In this case, we should just reinstate the security override that was set by the caller. Furthermore, if set_create_files_as() fails, we should dispose of the new credentials we were in the process of creating. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 91af70814105f4c05e6e11b51c3269907b71794b Author: Michel Lespinasse Date: Wed May 12 11:38:45 2010 +0100 rwsem: Test for no active locks in __rwsem_do_wake undo code If there are no active threasd using a semaphore, it is always correct to unqueue blocked threads. This seems to be what was intended in the undo code. What was done instead, was to look for a sem count of zero - this is an impossible situation, given that at least one thread is known to be queued on the semaphore. The code might be correct as written, but it's hard to reason about and it's not what was intended (otherwise the goto out would have been unconditional). Go for checking the active count - the alternative is not worth the headache. Signed-off-by: Michel Lespinasse Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 0d4993563bde70bc7c7718686bc5c5c089733001 Author: Michael S. Tsirkin Date: Tue May 11 19:44:17 2010 +0300 vhost: fix barrier pairing According to memory-barriers.txt, an smp memory barrier in guest should always be paired with an smp memory barrier in host, and I quote "a lack of appropriate pairing is almost certainly an error". In case of vhost, failure to flush out used index update before looking at the interrupt disable flag could result in missed interrupts, resulting in networking hang under stress. This might happen when flags read bypasses used index write. So we see interrupts disabled and do not interrupt, at the same time guest writes flags value to enable interrupt, reads an old used index value, thinks that used ring is empty and waits for interrupt. Note: the barrier we pair with here is in drivers/virtio/virtio_ring.c, function vring_enable_cb. Signed-off-by: Michael S. Tsirkin Acked-by: Juan Quintela commit e7b702b1a8f2a6961367da903217e669be0f099f Author: Russell King Date: Sun Apr 18 21:25:11 2010 +0100 Inotify: undefined reference to `anon_inode_getfd' Fix: fs/built-in.o: In function `sys_inotify_init1': summary.c:(.text+0x347a4): undefined reference to `anon_inode_getfd' found by kautobuild with arms bcmring_defconfig, which ends up with INOTIFY_USER enabled (through the 'default y') but leaves ANON_INODES unset. However, inotify_user.c uses anon_inode_getfd(). Signed-off-by: Russell King Signed-off-by: Eric Paris commit 8213466596bf10b75887754773ee13c10cf86f5c Author: Takashi Iwai Date: Wed May 12 16:43:32 2010 +0200 ALSA: ice1724 - Fix ESI Maya44 capture source control The capture source control of maya44 was wrongly coded with the bit shift instead of the bit mask. Also, the slot for line-in was wrongly assigned (slot 5 instead of 4). Reported-by: Alex Chernyshoff Cc: Signed-off-by: Takashi Iwai commit 98af057092f8f0dabe63c5df08adc2bbfbddb1d2 Author: Srinidhi Kasagar Date: Wed May 12 05:53:26 2010 +0100 ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes This fixes the build failures seen when building mpcore_wdt and it also removes the nonexistent ARM_MPCORE_PLATFORM dependency, instead make it dependent on HAVE_ARM_TWD. Also this fixes spinlock usage appropriately. Signed-off-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Russell King commit f4a27aed48584b9e4699e9ee76288618a8574d77 Author: Srinidhi Kasagar Date: Wed May 12 05:52:18 2010 +0100 ARM: 6125/1: ARM TWD: move TWD registers to common header This moves the TWD register set of MPcore to a common existing file so that watchdog driver can access it Signed-off-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Russell King commit 9fe17b5d47d3d3c85b35623dea8f571a184134c0 Author: Takashi Iwai Date: Wed May 12 10:32:42 2010 +0200 ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs MIPS non-coherent archs need the noncached pgprot in mmap of PCM buffers. But, since the coherency needs to be checked dynamically via plat_device_is_coherent(), we need an ugly check dependent on MIPS in ALSA core code. This should be cleaned up in MIPS arch side (e.g. creating dma_mmap_coherent()) in near future. Tested-by: Wu Zhangjin Signed-off-by: Takashi Iwai commit 6a45f7822544c54a2cf070d84f4e85f2fb32ec02 Author: Clemens Ladisch Date: Tue May 11 16:34:39 2010 +0200 ALSA: virtuoso: fix Xonar D1/DX front panel microphone Commit 65c3ac885ce9852852b895a4a62212f62cb5f2e9 in 2.6.33 accidentally left out the initialization of the AC97 codec FMIC2MIC bit, which broke recording from the front panel microphone. Signed-off-by: Clemens Ladisch Cc: Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 2a6ce6e5fda4721b35f309acedf4cac61ecbfb04 Author: Takashi Iwai Date: Wed May 12 10:16:20 2010 +0200 ALSA: hda - Add hp-dv4 model for IDT 92HD71bx It turned out that HP dv series have inconsistent the mute-LED GPIO mapping among various models. dv4/7 seem to use GPIO 0 while dv 5/6 seem to use GPIO 3. The previous commit 26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a ALSA: hda - Fix mute-LED GPIO pin for HP dv series breaks dv5/6. This patch adds the new quirk model, hp-dv4, to handle HP dv4/7 separately from HP dv5/6. Tested-by: Kunal Gangakhedkar (for dv6-1110ax) Acked-by: Kunal Gangakhedkar Signed-off-by: Takashi Iwai commit 57d84906f0f3005d4d22e13a3f5102a16a7fc4a2 Author: Martin Schwidefsky Date: Wed May 12 09:32:13 2010 +0200 [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y As of git commit 1844c9bc0b2fed3023551c1affe033ab38e90b9a head64.S/head31.S are not included in head.S anymore but build as an extra object. This breaks shared kernel support because the .org statement in head64.S/head31.S for CONFIG_SHARED_KERNEL=y will have a different effect. The end address of the head.text section in head.o will be added to the .org value, to compensate for this subtract 0x11000 to get the required value of 0x100000 again. Signed-off-by: Martin Schwidefsky commit 545c174d1f093a462b4bb9131b23d5ea72a600e1 Author: Gerald Schaefer Date: Wed May 12 09:32:12 2010 +0200 [S390] ptrace: fix return value of do_syscall_trace_enter() strace may change the system call number, so regs->gprs[2] must not be read before tracehook_report_syscall_entry(). This fixes a bug where "strace -f" will hang after a vfork(). Cc: Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 1c1e093cbf6d3a7576ba0bd10363362a1c5c74ee Author: Stefan Weinhuber Date: Wed May 12 09:32:11 2010 +0200 [S390] dasd: fix race between tasklet and dasd_sleep_on The various dasd_sleep_on functions use a global wait queue when waiting for a cqr. The wait condition checks the status and devlist fields of the cqr to determine if it is safe to continue. This evaluation may return true, although the tasklet has not finished processing of the cqr and the callback function has not been called yet. When the callback is finally called, the data in the cqr may already be invalid. The sleep_on wait condition needs a safe way to determine if the tasklet has finished processing. Use the callback_data field of the cqr to store a token, which is set by the callback function itself. Cc: Signed-off-by: Stefan Weinhuber Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 0fe1ac48bef018bed896307cd12f6ca9b5e704ab Author: Paul Mackerras Date: Tue Apr 13 20:46:04 2010 +0000 powerpc/perf_event: Fix oops due to perf_event_do_pending call Anton Blanchard found that large POWER systems would occasionally crash in the exception exit path when profiling with perf_events. The symptom was that an interrupt would occur late in the exit path when the MSR[RI] (recoverable interrupt) bit was clear. Interrupts should be hard-disabled at this point but they were enabled. Because the interrupt was not recoverable the system panicked. The reason is that the exception exit path was calling perf_event_do_pending after hard-disabling interrupts, and perf_event_do_pending will re-enable interrupts. The simplest and cleanest fix for this is to use the same mechanism that 32-bit powerpc does, namely to cause a self-IPI by setting the decrementer to 1. This means we can remove the tests in the exception exit path and raw_local_irq_restore. This also makes sure that the call to perf_event_do_pending from timer_interrupt() happens within irq_enter/irq_exit. (Note that calling perf_event_do_pending from timer_interrupt does not mean that there is a possible 1/HZ latency; setting the decrementer to 1 ensures that the timer interrupt will happen immediately, i.e. within one timebase tick, which is a few nanoseconds or 10s of nanoseconds.) Signed-off-by: Paul Mackerras Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt commit e84346b726ea90a8ed470bc81c4136a7b8710ea5 Author: Sage Weil Date: Tue May 11 21:20:38 2010 -0700 ceph: preserve seq # on requeued messages after transient transport errors If the tcp connection drops and we reconnect to reestablish a stateful session (with the mds), we need to resend previously sent (and possibly received) messages with the _same_ seq # so that they can be dropped on the other end if needed. Only assign a new seq once after the message is queued. Signed-off-by: Sage Weil commit f818a73674c5d197f66b636a46d7d578d7258129 Author: Sage Weil Date: Tue May 11 20:56:31 2010 -0700 ceph: fix cap removal races The iterate_session_caps helper traverses the session caps list and tries to grab an inode reference. However, the __ceph_remove_cap was clearing the inode backpointer _before_ removing itself from the session list, causing a null pointer dereference. Clear cap->ci under protection of s_cap_lock to avoid the race, and to tightly couple the list and backpointer state. Use a local flag to indicate whether we are releasing the cap, as cap->session may be modified by a racing thread in iterate_session_caps. Signed-off-by: Sage Weil commit cea0d767c29669bf89f86e4aee46ef462d2ebae8 Merge: b2464ab 0559a53 Author: Linus Torvalds Date: Tue May 11 17:38:04 2010 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (applesmc) Correct sysfs fan error handling hwmon: (asc7621) Bug fixes commit b2464ab2023f20aea23ef8df1cb45b338c859ea5 Merge: 788885a 829e924 Author: Linus Torvalds Date: Tue May 11 17:37:24 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kprobes/x86: Fix removed int3 checking order perf: Fix static strings treated like dynamic ones commit 788885ae7a298dec73ba999c2fc5d46d42072ddf Author: Andrew Morton Date: Tue May 11 14:07:05 2010 -0700 drivers/gpu/drm/i915/i915_irq.c:i915_error_object_create(): use correct kmap-atomic slot i915_error_object_create() is called from the timer interrupt and hence can corrupt the KM_USER0 slot. Use KM_IRQ0 instead. Reported-by: Jaswinder Singh Rajput Tested-by: Jaswinder Singh Rajput Acked-by: Chris Wilson Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06efbeb4a47b6f865e1c9d175ab9d6e90b69ae9e Author: Oliver Neukum Date: Tue May 11 14:07:03 2010 -0700 hp_accel: fix race in device removal The work queue has to be flushed after the device has been made inaccessible. The patch closes a window during which a work queue might remain active after the device is removed and would then lead to ACPI calls with undefined behavior. Signed-off-by: Oliver Neukum Acked-by: Eric Piel Acked-by: Pavel Machek Cc: Pavel Herrmann Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3ed2a15719219769bb095b28009c1d654a419e8 Author: André Goddard Rosa Date: Tue May 11 14:07:03 2010 -0700 mqueue: fix kernel BUG caused by double free() on mq_open() In case of aborting because we reach the maximum amount of memory which can be allocated to message queues per user (RLIMIT_MSGQUEUE), we would try to free the message area twice when bailing out: first by the error handling code itself, and then later when cleaning up the inode through delete_inode(). Signed-off-by: André Goddard Rosa Cc: Alexey Dobriyan Cc: Al Viro Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de145b44b95b9d3212a82d1c0f29b09778ef33c5 Author: Michael Hennerich Date: Tue May 11 14:07:00 2010 -0700 fbdev: bfin-t350mcqb-fb: fix fbmem allocation with blanking lines The current allocation does not include the memory required for blanking lines. So avoid memory corruption when multiple devices are using the DMA memory near each other. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 747388d78a0ae768fd82b55c4ed38aa646a72364 Author: KAMEZAWA Hiroyuki Date: Tue May 11 14:06:59 2010 -0700 memcg: fix css_is_ancestor() RCU locking Some callers (in memcontrol.c) calls css_is_ancestor() without rcu_read_lock. Because css_is_ancestor() has to access RCU protected data, it should be under rcu_read_lock(). This makes css_is_ancestor() itself does safe access to RCU protected area. (At least, "root" can have refcnt==0 if it's not an ancestor of "child". So, we need rcu_read_lock().) Signed-off-by: KAMEZAWA Hiroyuki Cc: "Paul E. McKenney" Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f0f15464185a92f9d8791ad231bcd7bf6df54e4 Author: KAMEZAWA Hiroyuki Date: Tue May 11 14:06:58 2010 -0700 memcg: fix css_id() RCU locking for real Commit ad4ba375373937817404fd92239ef4cadbded23b ("memcg: css_id() must be called under rcu_read_lock()") modifies memcontol.c for fixing RCU check message. But Andrew Morton pointed out that the fix doesn't seems sane and it was just for hidining lockdep messages. This is a patch for do proper things. Checking again, all places, accessing without rcu_read_lock, that commit fixies was intentional.... all callers of css_id() has reference count on it. So, it's not necessary to be under rcu_read_lock(). Considering again, we can use rcu_dereference_check for css_id(). We know css->id is valid if css->refcnt > 0. (css->id never changes and freed after css->refcnt going to be 0.) This patch makes use of rcu_dereference_check() in css_id/depth and remove unnecessary rcu-read-lock added by the commit. Signed-off-by: KAMEZAWA Hiroyuki Cc: "Paul E. McKenney" Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11cad320a4f4bc53d3585c85600c782faa12b99e Author: Vitaliy Gusev Date: Tue May 11 14:06:56 2010 -0700 bsdacct: use del_timer_sync() in acct_exit_ns() acct_exit_ns --> acct_file_reopen deletes timer without check timer execution on other CPUs. So acct_timeout() can change an unmapped memory. Signed-off-by: Vitaliy Gusev Cc: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab941e0fff3947b6dcc9c578d918d1bba54a6874 Author: Naoya Horiguchi Date: Tue May 11 14:06:55 2010 -0700 rmap: remove anon_vma check in page_address_in_vma() Currently page_address_in_vma() compares vma->anon_vma and page_anon_vma(page) for parameter check, but in 2.6.34 a vma can have multiple anon_vmas with anon_vma_chain, so current check does not work. (For anonymous page shared by multiple processes, some verified (page,vma) pairs return -EFAULT wrongly.) We can go to checking all anon_vmas in the "same_vma" chain, but it needs to meet lock requirement. Instead, we can remove anon_vma check safely because page_address_in_vma() assumes that page and vma are already checked to belong to the identical process. Signed-off-by: Naoya Horiguchi Reviewed-by: Rik van Riel Cc: Andi Kleen Cc: Andrea Arcangeli Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a6018f7f4f1075c1a5403b5ec0ee7262187b86c Author: Mel Gorman Date: Tue May 11 14:06:53 2010 -0700 hugetlbfs: kill applications that use MAP_NORESERVE with SIGBUS instead of OOM-killer Ordinarily, application using hugetlbfs will create mappings with reserves. For shared mappings, these pages are reserved before mmap() returns success and for private mappings, the caller process is guaranteed and a child process that cannot get the pages gets killed with sigbus. An application that uses MAP_NORESERVE gets no reservations and mmap() will always succeed at the risk the page will not be available at fault time. This might be used for example on very large sparse mappings where the developer is confident the necessary huge pages exist to satisfy all faults even though the whole mapping cannot be backed by huge pages. Unfortunately, if an allocation does fail, VM_FAULT_OOM is returned to the fault handler which proceeds to trigger the OOM-killer. This is unhelpful. Even without hugetlbfs mounted, a user using mmap() can trivially trigger the OOM-killer because VM_FAULT_OOM is returned (will provide example program if desired - it's a whopping 24 lines long). It could be considered a DOS available to an unprivileged user. This patch alters hugetlbfs to kill a process that uses MAP_NORESERVE where huge pages were not available with SIGBUS instead of triggering the OOM killer. This change affects hugetlb_cow() as well. I feel there is a failure case in there, but I didn't create one. It would need a fairly specific target in terms of the faulting application and the hugepage pool size. The hugetlb_no_page() path is much easier to hit but both might as well be closed. Signed-off-by: Mel Gorman Cc: Lee Schermerhorn Cc: David Rientjes Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 475f9aa6aa538befcbd0fa95bdebada600f247cd Author: Vitaly Mayatskikh Date: Tue May 11 14:06:51 2010 -0700 kexec: fix OOPS in crash_kernel_shrink Two "echo 0 > /sys/kernel/kexec_crash_size" OOPSes kernel. Also content of this file is invalid after first shrink to zero: it shows 1 instead of 0. This scenario is unlikely to happen often (root privs, valid crashkernel= in cmdline, dump-capture kernel not loaded), I hit it only by chance. This patch fixes it. Signed-off-by: Vitaly Mayatskikh Cc: Cong Wang Cc: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d586ebbb8814e039545d38f69029533f3f17748d Author: Nicolas Ferre Date: Tue May 11 14:06:50 2010 -0700 mmc: atmel-mci: fix in debugfs: response value printing In debugfs, printing of command response reports resp[2] twice: fix it to resp[3]. Signed-off-by: Nicolas Ferre Haavard Skinnemoen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abc2c9fdf636c4335a8d72ac3c5ae152bca44b68 Author: Nicolas Ferre Date: Tue May 11 14:06:50 2010 -0700 mmc: atmel-mci: remove data error interrupt after xfer Disable data error interrupts while we are actually recording that there is not such errors. This will prevent, in some cases, the warning message printed at new request queuing (in atmci_start_request()). Signed-off-by: Nicolas Ferre Cc: Haavard Skinnemoen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 009a891b22395fc86e5f34057d79fffee4509ab5 Author: Nicolas Ferre Date: Tue May 11 14:06:49 2010 -0700 mmc: atmel-mci: prevent kernel oops while removing card The removing of an SD card in certain circumstances can lead to a kernel oops if we do not make sure that the "data" field of the host structure is valid. This patch adds a test in atmci_dma_cleanup() function and also calls atmci_stop_dma() before throwing away the reference to data. Signed-off-by: Nicolas Ferre Cc: Haavard Skinnemoen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebb1fea9b3adf25d7e2f643c614163af4f93a17f Author: Nicolas Ferre Date: Tue May 11 14:06:48 2010 -0700 mmc: atmel-mci: fix two parameters swapped Two parameters were swapped in the calls to atmci_init_slot(). Signed-off-by: Nicolas Ferre Reported-by: Anders Grahn Cc: Haavard Skinnemoen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34441427aab4bdb3069a4ffcda69a99357abcb2e Author: Robin Holt Date: Tue May 11 14:06:46 2010 -0700 revert "procfs: provide stack information for threads" and its fixup commits Originally, commit d899bf7b ("procfs: provide stack information for threads") attempted to introduce a new feature for showing where the threadstack was located and how many pages are being utilized by the stack. Commit c44972f1 ("procfs: disable per-task stack usage on NOMMU") was applied to fix the NO_MMU case. Commit 89240ba0 ("x86, fs: Fix x86 procfs stack information for threads on 64-bit") was applied to fix a bug in ia32 executables being loaded. Commit 9ebd4eba7 ("procfs: fix /proc//stat stack pointer for kernel threads") was applied to fix a bug which had kernel threads printing a userland stack address. Commit 1306d603f ('proc: partially revert "procfs: provide stack information for threads"') was then applied to revert the stack pages being used to solve a significant performance regression. This patch nearly undoes the effect of all these patches. The reason for reverting these is it provides an unusable value in field 28. For x86_64, a fork will result in the task->stack_start value being updated to the current user top of stack and not the stack start address. This unpredictability of the stack_start value makes it worthless. That includes the intended use of showing how much stack space a thread has. Other architectures will get different values. As an example, ia64 gets 0. The do_fork() and copy_process() functions appear to treat the stack_start and stack_size parameters as architecture specific. I only partially reverted c44972f1 ("procfs: disable per-task stack usage on NOMMU") . If I had completely reverted it, I would have had to change mm/Makefile only build pagewalk.o when CONFIG_PROC_PAGE_MONITOR is configured. Since I could not test the builds without significant effort, I decided to not change mm/Makefile. I only partially reverted 89240ba0 ("x86, fs: Fix x86 procfs stack information for threads on 64-bit") . I left the KSTK_ESP() change in place as that seemed worthwhile. Signed-off-by: Robin Holt Cc: Stefani Seibold Cc: KOSAKI Motohiro Cc: Michal Simek Cc: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c904afd7358e9ef515eb5df36b6f25c2b7fc2da Author: Denis Turischev Date: Tue May 11 14:06:44 2010 -0700 it8761e_gpio: fix bug in gpio numbering The SIO chip contains 16 possible gpio lines, not 14. The schematic was not read carefully. Signed-off-by: Denis Turischev Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f33d7e2d2d113a63772bbc993cdec3b5327f0ef1 Author: FUJITA Tomonori Date: Tue May 11 14:06:43 2010 -0700 dma-mapping: fix dma_sync_single_range_* dma_sync_single_range_for_cpu() and dma_sync_single_range_for_device() use a wrong address with a partial synchronization. Signed-off-by: FUJITA Tomonori Reviewed-by: Konrad Rzeszutek Wilk Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45c6ceb547ad2d98215351974a4686bf8cb13e14 Author: Sage Weil Date: Tue May 11 15:01:51 2010 -0700 ceph: zero unused message header, footer fields We shouldn't leak any prior memory contents to other parties. And random data, particularly in the 'version' field, can cause problems down the line. Signed-off-by: Sage Weil commit 3d69438031b00c601c991ab447cafb7d5c3c59a6 Author: Jeff Layton Date: Tue May 11 14:59:55 2010 -0400 cifs: guard against hardlinking directories When we made serverino the default, we trusted that the field sent by the server in the "uniqueid" field was actually unique. It turns out that it isn't reliably so. Samba, in particular, will just put the st_ino in the uniqueid field when unix extensions are enabled. When a share spans multiple filesystems, it's quite possible that there will be collisions. This is a server bug, but when the inodes in question are a directory (as is often the case) and there is a collision with the root inode of the mount, the result is a kernel panic on umount. Fix this by checking explicitly for directory inodes with the same uniqueid. If that is the case, then we can assume that using server inode numbers will be a problem and that they should be disabled. Fixes Samba bugzilla 7407 Signed-off-by: Jeff Layton CC: Stable Reviewed-and-Tested-by: Suresh Jayaraman Signed-off-by: Steve French commit fc2a093e7ad23e935aa29e349bc27173c92f1a95 Merge: 9fc282b c9ff04c Author: Linus Torvalds Date: Tue May 11 10:12:18 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: Fix 3 regressions - since buffer rework commit 9fc282baa8f743a7049e301d13cf9968ee95a91c Merge: c61ea31 de02d72 Author: Linus Torvalds Date: Tue May 11 10:11:40 2010 -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: net: Fix FDDI and TR config checks in ipv4 arp and LLC. IPv4: unresolved multicast route cleanup mac80211: remove association work when processing deauth request ar9170: wait for asynchronous firmware loading ipv4: udp: fix short packet and bad checksum logging phy: Fix initialization in micrel driver. sctp: Fix a race between ICMP protocol unreachable and connect() veth: Dont kfree_skb() after dev_forward_skb() IPv6: fix IPV6_RECVERR handling of locally-generated errors net/gianfar: drop recycled skbs on MTU change iwlwifi: work around passive scan issue commit c61ea31dac0319ec64b33725917bda81fc293a25 Author: David Howells Date: Tue May 11 16:51:39 2010 +0100 CacheFiles: Fix occasional EIO on call to vfs_unlink() Fix an occasional EIO returned by a call to vfs_unlink(): [ 4868.465413] CacheFiles: I/O Error: Unlink failed [ 4868.465444] FS-Cache: Cache cachefiles stopped due to I/O error [ 4947.320011] CacheFiles: File cache on md3 unregistering [ 4947.320041] FS-Cache: Withdrawing cache "mycache" [ 5127.348683] FS-Cache: Cache "mycache" added (type cachefiles) [ 5127.348716] CacheFiles: File cache on md3 registered [ 7076.871081] CacheFiles: I/O Error: Unlink failed [ 7076.871130] FS-Cache: Cache cachefiles stopped due to I/O error [ 7116.780891] CacheFiles: File cache on md3 unregistering [ 7116.780937] FS-Cache: Withdrawing cache "mycache" [ 7296.813394] FS-Cache: Cache "mycache" added (type cachefiles) [ 7296.813432] CacheFiles: File cache on md3 registered What happens is this: (1) A cached NFS file is seen to have become out of date, so NFS retires the object and immediately acquires a new object with the same key. (2) Retirement of the old object is done asynchronously - so the lookup/create to generate the new object may be done first. This can be a problem as the old object and the new object must exist at the same point in the backing filesystem (i.e. they must have the same pathname). (3) The lookup for the new object sees that a backing file already exists, checks to see whether it is valid and sees that it isn't. It then deletes that file and creates a new one on disk. (4) The retirement phase for the old file is then performed. It tries to delete the dentry it has, but ext4_unlink() returns -EIO because the inode attached to that dentry no longer matches the inode number associated with the filename in the parent directory. The trace below shows this quite well. [md5sum] ==> __fscache_relinquish_cookie(ffff88002d12fb58{NFS.fh,ffff88002ce62100},1) [md5sum] ==> __fscache_acquire_cookie({NFS.server},{NFS.fh},ffff88002ce62100) NFS has retired the old cookie and asked for a new one. [kslowd] ==> fscache_object_state_machine({OBJ52,OBJECT_ACTIVE,24}) [kslowd] <== fscache_object_state_machine() [->OBJECT_DYING] [kslowd] ==> fscache_object_state_machine({OBJ53,OBJECT_INIT,0}) [kslowd] <== fscache_object_state_machine() [->OBJECT_LOOKING_UP] [kslowd] ==> fscache_object_state_machine({OBJ52,OBJECT_DYING,24}) [kslowd] <== fscache_object_state_machine() [->OBJECT_RECYCLING] The old object (OBJ52) is going through the terminal states to get rid of it, whilst the new object - (OBJ53) - is coming into being. [kslowd] ==> fscache_object_state_machine({OBJ53,OBJECT_LOOKING_UP,0}) [kslowd] ==> cachefiles_walk_to_object({ffff88003029d8b8},OBJ53,@68,) [kslowd] lookup '@68' [kslowd] next -> ffff88002ce41bd0 positive [kslowd] advance [kslowd] lookup 'Es0g00og0_Nd_XCYe3BOzvXrsBLMlN6aw16M1htaA' [kslowd] next -> ffff8800369faac8 positive The new object has looked up the subdir in which the file would be in (getting dentry ffff88002ce41bd0) and then looked up the file itself (getting dentry ffff8800369faac8). [kslowd] validate 'Es0g00og0_Nd_XCYe3BOzvXrsBLMlN6aw16M1htaA' [kslowd] ==> cachefiles_bury_object(,'@68','Es0g00og0_Nd_XCYe3BOzvXrsBLMlN6aw16M1htaA') [kslowd] remove ffff8800369faac8 from ffff88002ce41bd0 [kslowd] unlink stale object [kslowd] <== cachefiles_bury_object() = 0 It then checks the file's xattrs to see if it's valid. NFS says that the auxiliary data indicate the file is out of date (obvious to us - that's why NFS ditched the old version and got a new one). CacheFiles then deletes the old file (dentry ffff8800369faac8). [kslowd] redo lookup [kslowd] lookup 'Es0g00og0_Nd_XCYe3BOzvXrsBLMlN6aw16M1htaA' [kslowd] next -> ffff88002cd94288 negative [kslowd] create -> ffff88002cd94288{ffff88002cdaf238{ino=148247}} CacheFiles then redoes the lookup and gets a negative result in a new dentry (ffff88002cd94288) which it then creates a file for. [kslowd] ==> cachefiles_mark_object_active(,OBJ53) [kslowd] <== cachefiles_mark_object_active() = 0 [kslowd] === OBTAINED_OBJECT === [kslowd] <== cachefiles_walk_to_object() = 0 [148247] [kslowd] <== fscache_object_state_machine() [->OBJECT_AVAILABLE] The new object is then marked active and the state machine moves to the available state - at which point NFS can start filling the object. [kslowd] ==> fscache_object_state_machine({OBJ52,OBJECT_RECYCLING,20}) [kslowd] ==> fscache_release_object() [kslowd] ==> cachefiles_drop_object({OBJ52,2}) [kslowd] ==> cachefiles_delete_object(,OBJ52{ffff8800369faac8}) The old object, meanwhile, goes on with being retired. If allocation occurs first, cachefiles_delete_object() has to wait for dir->d_inode->i_mutex to become available before it can continue. [kslowd] ==> cachefiles_bury_object(,'@68','Es0g00og0_Nd_XCYe3BOzvXrsBLMlN6aw16M1htaA') [kslowd] remove ffff8800369faac8 from ffff88002ce41bd0 [kslowd] unlink stale object EXT4-fs warning (device sda6): ext4_unlink: Inode number mismatch in unlink (148247!=148193) CacheFiles: I/O Error: Unlink failed FS-Cache: Cache cachefiles stopped due to I/O error CacheFiles then tries to delete the file for the old object, but the dentry it has (ffff8800369faac8) no longer points to a valid inode for that directory entry, and so ext4_unlink() returns -EIO when de->inode does not match i_ino. [kslowd] <== cachefiles_bury_object() = -5 [kslowd] <== cachefiles_delete_object() = -5 [kslowd] <== fscache_object_state_machine() [->OBJECT_DEAD] [kslowd] ==> fscache_object_state_machine({OBJ53,OBJECT_AVAILABLE,0}) [kslowd] <== fscache_object_state_machine() [->OBJECT_ACTIVE] (Note that the above trace includes extra information beyond that produced by the upstream code). The fix is to note when an object that is being retired has had its object deleted preemptively by a replacement object that is being created, and to skip the second removal attempt in such a case. Reported-by: Greg M Reported-by: Mark Moseley Reported-by: Romain DEGEZ Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 7d6fb7bd1919517937ec390f6ca2d7bcf4f89fb6 Author: Alex Chiang Date: Tue May 11 10:21:38 2010 -0600 ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[] Duplicate entries ended up acpisleep_dmi_table[] by accident. They don't hurt functionality, but they are ugly, so let's get rid of them. Cc: stable@kernel.org Signed-off-by: Alex Chiang Signed-off-by: Linus Torvalds commit 9abf82b8bc93dd904738a71ca69aa5df356d4d24 Author: Sage Weil Date: Mon May 10 21:58:38 2010 -0700 ceph: fix locking for waking session requests after reconnect The session->s_waiting list is protected by mdsc->mutex, not s_mutex. This was causing (rare) s_waiting list corruption. Fix errors paths too, while we're here. A more thorough cleanup of this function is coming soon. Signed-off-by: Sage Weil commit d85b705663905b3dae30007f824355bdcfcf3f00 Author: Sage Weil Date: Mon May 10 10:24:48 2010 -0700 ceph: resubmit requests on pg mapping change (not just primary change) OSD requests need to be resubmitted on any pg mapping change, not just when the pg primary changes. Resending only when the primary changes results in occasional 'hung' requests during osd cluster recovery or rebalancing. Signed-off-by: Sage Weil commit 04d000eb358919043da538f197d63f2a5924a525 Author: Sage Weil Date: Fri May 7 11:26:34 2010 -0700 ceph: fix open file counting on snapped inodes when mds returns no caps It's possible the MDS will not issue caps on a snapped inode, in which case an open request may not __ceph_get_fmode(), botching the open file counting. (This is actually a server bug, but the client shouldn't BUG out in this case.) Signed-off-by: Sage Weil commit 0ceed5db321ac0f9782e77dda476ebe28a8e2199 Author: Sage Weil Date: Tue May 11 09:53:18 2010 -0700 ceph: unregister osd request on failure The osd request wasn't being unregistered when the osd returned a failure code, even though the result was returned to the caller. This would cause it to eventually time out, and then crash the kernel when it tried to resend the request using a stale page vector. Signed-off-by: Sage Weil commit 0559a538899d48e7d730affb9df2abb13a7d9008 Author: Henrik Rydberg Date: Tue May 11 09:17:47 2010 +0200 hwmon: (applesmc) Correct sysfs fan error handling The current code will not remove the sysfs files for fan numbers three and up. Also, upon exit, fans one and two are removed regardless of their existence. This patch cleans up the sysfs error handling for the fans. Signed-off-by: Henrik Rydberg Signed-off-by: Jean Delvare commit d1bf8cf6b911001d50f2079c158cb5dd9782e187 Author: Ken Milmore Date: Tue May 11 09:17:46 2010 +0200 hwmon: (asc7621) Bug fixes * Allow fan minimum RPM to be set to zero without triggering alarms. * Fix voltage scaling arithmetic and correct scale factors. * Correct fan1-fan4 alarm bit shifts. * Correct register address for temp3_smoothing_enable. * Read the alarm registers with high priority. Signed-off-by: Ken Milmore Signed-off-by: Jean Delvare commit 829e92458532b1dbfeb972435d45bb060cdbf5a3 Author: Masami Hiramatsu Date: Tue Apr 27 18:33:49 2010 -0400 kprobes/x86: Fix removed int3 checking order Fix kprobe/x86 to check removed int3 when failing to get kprobe from hlist. Since we have a time window between checking int3 exists on probed address and getting kprobe on that address, we can have following scenario: ------- CPU1 CPU2 hit int3 check int3 exists remove int3 remove kprobe from hlist get kprobe from hlist no kprobe->OOPS! ------- This patch moves int3 checking if there is no kprobe on that address for fixing this problem as follows: ------ CPU1 CPU2 hit int3 remove int3 remove kprobe from hlist get kprobe from hlist no kprobe->check int3 exists ->rollback&retry ------ Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: systemtap Cc: DLE Cc: Dave Anderson Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <20100427223348.2322.9112.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit de068ec048f807d4f62b7dda100c23a1365f086f Author: Frederic Weisbecker Date: Wed May 5 22:07:39 2010 +0200 perf: Fix static strings treated like dynamic ones The raw_field_ptr() helper, used to retrieve the address of a field inside a trace event, treats every strings as if they were dynamic ie: having a secondary level of indirection to retrieve their contents. FIELD_IS_STRING doesn't mean FIELD_IS_DYNAMIC, we only need to compute the secondary dereference for the latter case. This fixes perf sched segfaults, bad cmdline report and may be some other bugs. Reported-by: Jason Baron Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Tom Zanussi commit 26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a Author: Takashi Iwai Date: Tue May 11 08:36:29 2010 +0200 ALSA: hda - Fix mute-LED GPIO pin for HP dv series Old HP dv series seem to use the GPIO pin 0 for controlling the mute LED although the pin is a large package, where the newer models use GPIO 3 in such a case. For fixing the regression from the previous kernels, set spec->gpio_led statically for these model quirks. Signed-off-by: Takashi Iwai commit 0ebf9e3692d640917fb792a7494d05e1f5b1058f Author: Daniel T Chen Date: Mon May 10 21:50:04 2010 +0200 ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice) Reference: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-May/027525.html As reported on the mailing list, we also need to cap to the 0 dB offset for Lenovo models, else the sound will be distorted. Reported-and-Tested-by: Tim Starling Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 513d8be9883fe0a7a73d216c7cecd20e7c9effda Author: Marek Vasut Date: Mon May 10 15:35:11 2010 -0700 Input: iforce - fix Guillemot Jet Leader 3D entry USB ID entry for "Guillemot Jet Leader 3D" in iforce-main.c did not match one used in iforce-usb.c Signed-off-by: Marek Vasut Signed-off-by: Dmitry Torokhov commit d861f7bf14808b9f457cb32c34585e97df60f140 Author: Marek Vasut Date: Mon May 10 15:35:11 2010 -0700 Input: iforce - add Guillemot Jet Leader Force Feedback This device features a RUDDER on the knob. Signed-off-by: Marek Vasut Signed-off-by: Dmitry Torokhov commit de02d72bb3cc5b3d4c873db4ca8291723dd48479 Merge: f0ecde1 79733a8 Author: David S. Miller Date: Mon May 10 22:53:41 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit c9ff04c941d2cd87d27496d7fee8923238bb2ebb Author: Jean Delvare Date: Tue May 11 14:01:45 2010 +1000 drm/radeon: Fix 3 regressions - since buffer rework Commit b4fe945405e477cded91772b4fec854705443dd5 introduced 3 bugs, fix them: * Use the right command dword for second packet offset in RADEON_CNTL_PAINT/BITBLT_MULTI. * Don't leak memory if drm_buffer_copy_from_user() fails. * Don't call drm_buffer_unprocessed() unless drm_buffer_alloc() and drm_buffer_copy_from_user() have been called successfully first. Signed-off-by: Jean Delvare Cc: Pauli Nieminen Signed-off-by: Dave Airlie commit 94b849aaf6e22ab7bf54b0d0377a882d4892396d Merge: f742246 482c453 Author: Linus Torvalds Date: Mon May 10 09:48:27 2010 -0700 Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard" ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec ALSA: hda - fix DG45ID SPDIF output commit f7422464b57088071201cd94027662d8469f153b Author: Ian Kent Date: Mon May 10 16:46:08 2010 +0800 autofs4-2.6.34-rc1 - fix link_count usage After commit 1f36f774b2 ("Switch !O_CREAT case to use of do_last()") in 2.6.34-rc1 autofs direct mounts stopped working. This is caused by current->link_count being 0 when ->follow_link() is called from do_filp_open(). I can't work out why this hasn't been seen before Als patch series. This patch removes the autofs dependence on current->link_count. Signed-off-by: Ian Kent Cc: Al Viro Signed-off-by: Linus Torvalds commit b77b907fae863f3bc546a336a8bc5e660d371788 Merge: b57f95a fde4e2f Author: Linus Torvalds Date: Mon May 10 09:44:53 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: fix suspend crash by moving initializations earlier HID: sony: fix sony_set_operational_bt HID: ntrig: Remove unused macro, TripleTap and QuadTap HID: ntrig: TipSwitch for single touch mode touch. HID: hidraw: fix numbered reports HID: wacom: remove annoying non-error printk HID: ntrig: Emit TOUCH with DOUBLETAP for single touch HID: add support for cymotion master solar keyboard HID: ntrig: explain firmware quirk HID: fix N-trig touch panel with recent firmware commit 482c45331519524e4aeaf8a9084a445500822b85 Author: Stefan Lippers-Hollmann Date: Mon May 10 17:14:34 2010 +0200 ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard" This reverts commit 7aee67466536bbf8bb44a95712c848a61c5a0acd. As it doesn't seem to be universally valid for all mainboard revisions of the D945GCLF2 and breaks snd-hda-intel/ snd-hda-codec-realtek on the Intel Corporation "D945GCLF2" (LF94510J.86A.0229.2009.0729.0209) mainboard. 00:1b.0 Audio device [0403]: Intel Corporation N10/ICH 7 Family High Definition Audio Controller [8086:27d8] (rev 01) Signed-off-by: Stefan Lippers-Hollmann Cc: [2.6.33] Signed-off-by: Takashi Iwai commit f0ecde1466f21edf577b809735f4f35f354777a0 Author: David S. Miller Date: Mon May 10 04:59:07 2010 -0700 net: Fix FDDI and TR config checks in ipv4 arp and LLC. Need to check both CONFIG_FOO and CONFIG_FOO_MODULE Signed-off-by: David S. Miller commit bbd725435ddb1cac732f7a8c23c21ff67f24c60f Author: Andreas Meissner Date: Mon May 10 04:47:49 2010 -0700 IPv4: unresolved multicast route cleanup Fixes the expiration timer for unresolved multicast route entries. In case new multicast routing requests come in faster than the expiration timeout occurs (e.g. zap through multicast TV streams), the timer is prevented from being called at time for already existing entries. As the single timer is resetted to default whenever a new entry is made, the timeout for existing unresolved entires are missed and/or not updated. As a consequence new requests are denied when the limit of unresolved entries has been reached because old entries live longer than they are supposed to. The solution is to reset the timer only for the first unresolved entry in the multicast routing cache. All other timers are already set and updated correctly within the timer function itself by now. Signed-off by: Andreas Meissner Signed-off-by: David S. Miller commit 0217f1499cf880d93c64579b2943e9382d8c2c21 Author: Andrej Gelenberg Date: Sun May 9 22:10:41 2010 +0200 ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec Ideapad quirks working for my ThinkPad X100e (microphone is not tested). Signed-off-by: Andrej Gelenberg Signed-off-by: Takashi Iwai commit b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 Author: Linus Torvalds Date: Sun May 9 18:36:28 2010 -0700 Linux 2.6.34-rc7 commit 93cb463141d50e4c6a574efc2c6e4d6d76ffed77 Merge: 1c6fe03 77a4229 Author: Linus Torvalds Date: Sun May 9 18:35:53 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error [SCSI] scsi_debug: virtual_gb ignores sector_size [SCSI] libiscsi: regression: fix header digest errors [SCSI] fix locking around blk_abort_request() [SCSI] advansys: fix narrow board error path commit 1c6fe0364fa7bf28248488753ee0afb6b759cd04 Author: Arjan van de Ven Date: Sat May 8 15:47:37 2010 -0700 cpuidle: Fix incorrect optimization commit 672917dcc78 ("cpuidle: menu governor: reduce latency on exit") added an optimization, where the analysis on the past idle period moved from the end of idle, to the beginning of the new idle. Unfortunately, this optimization had a bug where it zeroed one key variable for new use, that is needed for the analysis. The fix is simple, zero the variable after doing the work from the previous idle. During the audit of the code that found this issue, another issue was also found; the ->measured_us data structure member is never set, a local variable is always used instead. Signed-off-by: Arjan van de Ven Cc: Corrado Zoccolo Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit e814d826dc1821dbce3aa1ddb7f2f739f420ffd8 Author: Catalin Marinas Date: Fri May 7 10:52:32 2010 +0100 ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled The patch adds the ENDPROC declarations for the __copy_to_user_std and __clear_user_std functions. Without these, the compiler generates BXL to ARM when compiling the kernel in Thumb-2 mode. Reported-by: Kyungmin Park Tested-by: Kyungmin Park Signed-off-by: Catalin Marinas Acked-by: Nicolas Pitre Signed-off-by: Russell King commit b8349b569aae661dea9d59d7d2ee587ccea3336c Author: Catalin Marinas Date: Fri May 7 18:03:05 2010 +0100 ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP The standard I-cache Invalidate All (ICIALLU) and Branch Predication Invalidate All (BPIALL) operations are not automatically broadcast to the other CPUs in an ARMv7 MP system. The patch adds the Inner Shareable variants, ICIALLUIS and BPIALLIS, if ARMv7 and SMP. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit f4d6477f7f073b99220386d62f5bf54bec3482cc Author: Catalin Marinas Date: Fri May 7 16:26:24 2010 +0100 ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops The Snoop Control Unit on the ARM11MPCore hardware does not detect the cache operations and the dma_cache_maint*() functions may leave stale cache entries on other CPUs. The solution implemented in this patch performs a Read or Write For Ownership in the ARMv6 DMA cache maintenance functions. These LDR/STR instructions change the cache line state to shared or exclusive so that the cache maintenance operation has the desired effect. Tested-by: George G. Davis Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit b5a07faadeb4e0cfd6dcee359e501d4755cab875 Author: Catalin Marinas Date: Thu May 6 15:15:28 2010 +0100 ARM: 6106/1: Implement copy_to_user_page() for noMMU Commit 7959722 introduced calls to copy_(to|from)_user_page() from access_process_vm() in mm/nommu.c. The copy_to_user_page() was not implemented on noMMU ARM. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit b1a9ceb2e003aab7b96e30d990c1092453a0ea44 Author: Catalin Marinas Date: Thu May 6 15:14:09 2010 +0100 ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c Commit 31aa8fd6 introduced the __arm_ioremap_caller() function but the nommu.c version did not have the _caller suffix. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit fde4e2f73208b8f34f123791e39c0cb6bc74b32a Author: Alan Stern Date: Fri May 7 10:41:10 2010 -0400 HID: fix suspend crash by moving initializations earlier Although the usbhid driver allocates its usbhid structure in the probe routine, several critical fields in that structure don't get initialized until usbhid_start(). However if report descriptor parsing fails then usbhid_start() is never called. This leads to problems during system suspend -- the system will freeze. This patch (as1378) fixes the bug by moving the initialization statements up into usbhid_probe(). Signed-off-by: Alan Stern Reported-by: Bruno Prémont Tested-By: Bruno Prémont Signed-off-by: Jiri Kosina commit f1c448e0a9e99c76f4ece368714fb35a40a8daba Merge: 2c32b1d 1176568 Author: Linus Torvalds Date: Fri May 7 14:11:40 2010 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: restore ability of spare drives to spin down. md/raid6: Fix raid-6 read-error correction in degraded state commit 2c32b1dab508ccaa4aea1a9d6047b65fc708e929 Merge: 48fe37c 15d0a87 Author: Linus Torvalds Date: Fri May 7 14:11:09 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix compilation after 16bit state locking changes pcmcia: order userspace suspend and resume requests pcmcia: avoid pccard_validate_cis failure in resume callpath commit 48fe37cb53a40e13c2f9fc974f574e38d18be303 Merge: e33b3e7 0341509 Author: Linus Torvalds Date: Fri May 7 14:07:20 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: blk-cgroup: Fix an RCU warning in blkiocg_create() blk-cgroup: Fix RCU correctness warning in cfq_init_queue() drbd: don't expose failed local READ to upper layers commit e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7 Merge: e2dbe06 8cfe92d Author: Linus Torvalds Date: Fri May 7 14:02:01 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/ttm: Remove the ttm_bo_block_reservation() function. drm/ttm: Remove some leftover debug messages. drm/radeon: async event synchronization for drmWaitVblank commit e2dbe06c271f3bb2a495627980aad3d1d8ccef2a Author: Stijn Tintel Date: Fri May 7 14:28:34 2010 +0930 virtio: initialize earlier Move initialization of the virtio framework before the initialization of mtd, so that block2mtd can be used on virtio-based block devices. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15644 Signed-off-by: Stijn Tintel Signed-off-by: Rusty Russell Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 91677467163b847f1a5497789a893ada97f375b6 Merge: 4a22533 17d2c0a Author: Linus Torvalds Date: Fri May 7 13:59:48 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix RCU issues in the NFSv4 delegation code NFSv4: Fix the locking in nfs_inode_reclaim_delegation() commit 4a2253313653bcc4126287818b676f95ac26dc09 Merge: 417a9ef 1468cf0 Author: Linus Torvalds Date: Fri May 7 13:59:22 2010 -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: ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x ACPI: fix acpi_hest_firmware_first_pci() caused oops sbshc: acpi_device_class "smbus_host_controller" too long power_meter: acpi_device_class "power_meter_resource" too long acpi_pad: "processor_aggregator" name too long PNP: don't check for conflicts with bridge windows ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads PNPACPI: compute Address Space length rather than using _LEN ACPI: silence kmemcheck false positive commit 417a9ef1f488e3cf92bacc4999e1cbabc0e7cf1a Merge: 91bc482 a47f6be Author: Linus Torvalds Date: Fri May 7 13:58:56 2010 -0700 Merge branch 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: V4L/DVB: pxa_camera: move fifo reset direct before dma start V4L/DVB: video: testing unsigned for less than 0 V4L/DVB: mx1-camera: compile fix V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" V4L/DVB: ngene: Workaround for stuck DiSEqC pin V4L/DVB: saa7146: fix regression of the av7110/budget-av driver V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1 V4L/DVB: feature-removal: announce videotext.h removal V4L/DVB: V4L - vpfe capture - fix for kernel crash V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration V4L/DVB: saa7146: fix up bytesperline if it is an impossible value V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci V4L/DVB: omap24xxcam: potential buffer overflow commit 91bc482ec5a615e8ecebc106aaf7d0c267d511de Merge: e8e8fad ee84b82 Author: Linus Torvalds Date: Fri May 7 13:58:21 2010 -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: rcu: create rcu_my_thread_group_empty() wrapper memcg: css_id() must be called under rcu_read_lock() cgroup: Check task_lock in task_subsys_state() sched: Fix an RCU warning in print_task() cgroup: Fix an RCU warning in alloc_css_id() cgroup: Fix an RCU warning in cgroup_path() KEYS: Fix an RCU warning in the reading of user keys KEYS: Fix an RCU warning commit 79733a865c7fd778ce45e3503962b3a875b0a153 Author: Reinette Chatre Date: Tue May 4 16:04:49 2010 -0700 mac80211: remove association work when processing deauth request In https://bugzilla.kernel.org/show_bug.cgi?id=15794 a user encountered the following: [18967.469098] wlan0: authenticated [18967.472527] wlan0: associate with 00:1c:10:b8:e3:ea (try 1) [18967.472585] wlan0: deauthenticating from 00:1c:10:b8:e3:ea by local choice (reason=3) [18967.672057] wlan0: associate with 00:1c:10:b8:e3:ea (try 2) [18967.872357] wlan0: associate with 00:1c:10:b8:e3:ea (try 3) [18968.072960] wlan0: association with 00:1c:10:b8:e3:ea timed out [18968.076890] ------------[ cut here ]------------ [18968.076898] WARNING: at net/wireless/mlme.c:341 cfg80211_send_assoc_timeout+0xa8/0x140() [18968.076900] Hardware name: GX628 [18968.076924] Pid: 1408, comm: phy0 Not tainted 2.6.34-rc4-00082-g250541f-dirty #3 [18968.076926] Call Trace: [18968.076931] [] ? warn_slowpath_common+0x6e/0xb0 [18968.076934] [] ? cfg80211_send_assoc_timeout+0xa8/0x140 [18968.076937] [] ? mod_timer+0x10b/0x180 [18968.076940] [] ? ieee80211_assoc_done+0xbc/0xc0 [18968.076943] [] ? ieee80211_work_work+0x553/0x11c0 [18968.076945] [] ? finish_task_switch+0x41/0xb0 [18968.076948] [] ? ieee80211_work_work+0x0/0x11c0 [18968.076951] [] ? worker_thread+0x13b/0x210 [18968.076954] [] ? autoremove_wake_function+0x0/0x30 [18968.076956] [] ? worker_thread+0x0/0x210 [18968.076959] [] ? kthread+0x8e/0xa0 [18968.076962] [] ? kernel_thread_helper+0x4/0x10 [18968.076964] [] ? kthread+0x0/0xa0 [18968.076966] [] ? kernel_thread_helper+0x0/0x10 [18968.076968] ---[ end trace 8aa6265f4b1adfe0 ]--- As explained by Johannes Berg : We authenticate successfully, and then userspace requests association. Then we start that process, but the AP doesn't respond. While we're still waiting for an AP response, userspace asks for a deauth. We do the deauth, but don't abort the association work. Then once the association work times out we tell cfg80211, but it no longer wants to know since for all it is concerned we accepted the deauth that also kills the association attempt. Fix this by, upon receipt of deauth request, removing the association work and continuing to send the deauth. Unfortunately the user reporting the issue is not able to reproduce this problem anymore and cannot verify this fix. This seems like a well understood issue though and I thus present the patch. Bug-identified-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 160b82420ab41f1e67fbf2e56dc587837ef39ce0 Author: Christian Lamparter Date: Thu Apr 29 17:53:33 2010 +0200 ar9170: wait for asynchronous firmware loading This patch fixes a regression introduced by the following patch: "ar9170: load firmware asynchronously" When we kick off a firmware loading request and then unbind, or disconnect the usb device right away, we get into trouble: > ------------[ cut here ]------------ > WARNING: at lib/kref.c:44 kref_get+0x1c/0x20() > Hardware name: 18666GU > Modules linked in: ar9170usb [...] > Pid: 6588, comm: firmware/ar9170 Not tainted 2.6.34-rc5-wl #43 > Call Trace: > [] ? warn_slowpath_common+0x6e/0xb0 > [] ? kref_get+0x1c/0x20 > [] ? warn_slowpath_null+0x13/0x20 > [] ? kref_get+0x1c/0x20 > [] ? kobject_get+0xf/0x20 > [] ? get_device+0x10/0x20 > [] ? device_add+0x60/0x530 > [] ? kobject_init+0x25/0xa0 > [] ? _request_firmware+0x139/0x3e0 > [] ? request_firmware_work_func+0x20/0x70 > [] ? request_firmware_work_func+0x0/0x70 > [] ? kthread+0x74/0x80 > [] ? kthread+0x0/0x80 > [] ? kernel_thread_helper+0x6/0x10 >---[ end trace 2d50bd818f64a1b7 ]--- - followed by a random Oops - Avoid that by waiting for the firmware loading to finish (whether successfully or not) before the unbind in ar9170_usb_disconnect. Reported-by: Johannes Berg Bug-fixed-by: Johannes Berg Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 1176568de7e066c0be9e46c37503b9fd4730edcf Author: NeilBrown Date: Fri May 7 19:44:26 2010 +1000 md: restore ability of spare drives to spin down. Some time ago we stopped the clean/active metadata updates from being written to a 'spare' device in most cases so that it could spin down and say spun down. Device failure/removal etc are still recorded on spares. However commit 51d5668cb2e3fd1827a55 broke this 50% of the time, depending on whether the event count is even or odd. The change log entry said: This means that the alignment between 'odd/even' and 'clean/dirty' might take a little longer to attain, how ever the code makes no attempt to create that alignment, so it could take arbitrarily long. So when we find that clean/dirty is not aligned with odd/even, force a second metadata-update immediately. There are already cases where a second metadata-update is needed immediately (e.g. when a device fails during the metadata update). We just piggy-back on that. Reported-by: Joe Bryant Signed-off-by: NeilBrown Cc: stable@kernel.org commit 87aa63000c484bfb9909989316f615240dfee018 Author: Gabriele A. Trombetti Date: Wed Apr 28 11:51:17 2010 +1000 md/raid6: Fix raid-6 read-error correction in degraded state Fix: Raid-6 was not trying to correct a read-error when in singly-degraded state and was instead dropping one more device, going to doubly-degraded state. This patch fixes this behaviour. Tested-by: Janos Haar Signed-off-by: Gabriele A. Trombetti Reported-by: Janos Haar Signed-off-by: NeilBrown Cc: stable@kernel.org commit 4d26f44657915f082806abfe3624aeded4c121fa Author: Wu Fengguang Date: Fri May 7 08:47:54 2010 +0800 ALSA: hda - fix DG45ID SPDIF output This reverts part of commit 52dc438606d1e, in order to fix a regression: broken SPDIF output on Intel DG45FC motherboard (IDT 92HD73E1X5 codec). --- DG45FC-IDT-codec-2.6.32 (SPDIF OK) +++ DG45FC-IDT-codec-2.6.33 (SPDIF broken) Node 0x22 [Pin Complex] wcaps 0x400301: Stereo Digital Pincap 0x00000010: OUT - Pin Default 0x40f000f0: [N/A] Other at Ext N/A - Conn = Unknown, Color = Unknown - DefAssociation = 0xf, Sequence = 0x0 - Pin-ctls: 0x00: + Pin Default 0x014510a0: [Jack] SPDIF Out at Ext Rear + Conn = Optical, Color = Black + DefAssociation = 0xa, Sequence = 0x0 + Pin-ctls: 0x40: OUT Connection: 3 0x25* 0x20 0x21 Node 0x23 [Pin Complex] wcaps 0x400301: Stereo Digital Pincap 0x00000010: OUT - Pin Default 0x01451140: [Jack] SPDIF Out at Ext Rear + Pin Default 0x074510b0: [Jack] SPDIF Out at Ext Rear Panel Conn = Optical, Color = Black - DefAssociation = 0x4, Sequence = 0x0 - Misc = NO_PRESENCE - Pin-ctls: 0x40: OUT + DefAssociation = 0xb, Sequence = 0x0 + Pin-ctls: 0x00: Connection: 3 0x26* 0x20 0x21 Cc: Cc: Alexey Fisher Tested-by: David Härdeman Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 0341509fdfc9519f7de6aabc5dd23217cef72b73 Author: Li Zefan Date: Fri May 7 08:57:00 2010 +0200 blk-cgroup: Fix an RCU warning in blkiocg_create() with CONFIG_PROVE_RCU=y, a warning can be triggered: # mount -t cgroup -o blkio xxx /mnt # mkdir /mnt/subgroup ... kernel/cgroup.c:4442 invoked rcu_dereference_check() without protection! ... To fix this, we avoid caling css_depth() here, which is a bit simpler than the original code. Signed-off-by: Li Zefan Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit ccc2d97cb7c798e785c9f198de243e2b59f7073b Author: Bjørn Mork Date: Thu May 6 03:44:34 2010 +0000 ipv4: udp: fix short packet and bad checksum logging commit 2783ef23 moved the initialisation of saddr and daddr after pskb_may_pull() to avoid a potential data corruption. Unfortunately also placing it after the short packet and bad checksum error paths, where these variables are used for logging. The result is bogus output like [92238.389505] UDP: short packet: From 2.0.0.0:65535 23715/178 to 0.0.0.0:65535 Moving the saddr and daddr initialisation above the error paths, while still keeping it after the pskb_may_pull() to keep the fix from commit 2783ef23. Signed-off-by: Bjørn Mork Cc: stable@kernel.org Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 1468cf0542663f873410b83d8bb61ae779e3a845 Merge: f238b41 5cc4a0f ea5bc73 11439a6 4bdae98 Author: Len Brown Date: Thu May 6 22:04:31 2010 -0400 Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release commit 8cfe92d683a0041ac8e016a0b0a487c99a78f6c1 Author: Thomas Hellstrom Date: Wed Apr 28 11:33:25 2010 +0200 drm/ttm: Remove the ttm_bo_block_reservation() function. It's unused and buggy in its current form, since it can place a bo in the reserved state without removing it from lru lists. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 5be6eff965aee22181d7f6210c2c463420e94e03 Author: Thomas Hellstrom Date: Wed Apr 28 11:33:24 2010 +0200 drm/ttm: Remove some leftover debug messages. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 4fa07bf146aaee1e8409d35ab08624041c2e3867 Author: Jerome Glisse Date: Thu May 6 18:52:14 2010 +0200 drm/radeon: async event synchronization for drmWaitVblank Bring radeon up to speed with the async event synchronization for drmWaitVblank. See c9a9c5e02aedc1a2815877b0268f886d2640b771 for more information. Without this patch event never get delivered to userspace client. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit a47f6be45670465d45a3d27f7ff71986bd35d6c4 Author: Stefan Herbrechtsmeier Date: Tue Apr 20 03:51:29 2010 -0300 V4L/DVB: pxa_camera: move fifo reset direct before dma start Move the fifo reset from pxa_camera_start_capture to pxa_camera_irq direct before the dma start after an end of frame interrupt to prevent images from shifting because of old data at the begin of the frame. Signed-off-by: Stefan Herbrechtsmeier Acked-by: Robert Jarzmik Tested-by: Antonio Ospite Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 981cbef2c30ee82d6011bb2ef50461f6a074de71 Author: Dan Carpenter Date: Wed Apr 7 06:41:14 2010 -0300 V4L/DVB: video: testing unsigned for less than 0 soc_mbus_bytes_per_line() returns -EINVAL on error but we store it in an unsigned int so the test for less than zero doesn't work. I think it always returns "small" positive values so we can just cast it to int here. Signed-off-by: Dan Carpenter Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b7d41d6d580743b1fed1b9560d948c9ef58564bd Author: Uwe Kleine-König Date: Sat Mar 27 18:42:13 2010 -0300 V4L/DVB: mx1-camera: compile fix This fixes a regression of 7d58289 (mx1: prefix SOC specific defines with MX1_ and deprecate old names) Signed-off-by: Uwe Kleine-König Acked-by: Sascha Hauer Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 6f550dc08369ee0bc6402963c377e65f0f2e3b71 Author: Bjørn Mork Date: Wed Mar 24 07:57:57 2010 -0300 V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" Never call dvb_frontend_detach if we failed to attach a frontend. This fixes the following oops, which will be triggered by a missing stv090x module: [ 8.172997] DVB: registering new adapter (TT-Budget S2-1600 PCI) [ 8.209018] adapter has MAC addr = 00:d0:5c:cc:a7:29 [ 8.328665] Intel ICH 0000:00:1f.5: PCI INT B -> GSI 17 (level, low) -> IRQ 17 [ 8.328753] Intel ICH 0000:00:1f.5: setting latency timer to 64 [ 8.562047] DVB: Unable to find symbol stv090x_attach() [ 8.562117] BUG: unable to handle kernel NULL pointer dereference at 000000ac [ 8.562239] IP: [] dvb_frontend_detach+0x4/0x67 [dvb_core] Ref http://bugs.debian.org/575207 Signed-off-by: Bjørn Mork Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 5dd92c1ff1f85b1a4dceba9caa0fda85835ccc4b Author: Oliver Endriss Date: Sun Mar 21 11:48:47 2010 -0300 V4L/DVB: ngene: Workaround for stuck DiSEqC pin Send one DiSEqC byte to make sure that the pin is set to low level. Signed-off-by: Oliver Endriss Reviewed-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 03b1930efd3c2320b1dcba76c8af15f7e454919d Author: Hans Verkuil Date: Wed Mar 24 19:09:55 2010 -0300 V4L/DVB: saa7146: fix regression of the av7110/budget-av driver An earlier regression fix for the mxb driver (V4L/DVB: saa7146_vv: fix regression where v4l2_device was registered too late) caused a new regression in the av7110 driver. Reverted the old fix and fixed the problem in the mxb driver instead. Tested on mxb and budget-av cards. The real problem is that the saa7146 framework has separate probe() and attach() driver callbacks which should be rolled into one. This is now done for the mxb driver, but others should do the same. Lack of hardware makes this hard to do, though. I hope to get hold of some hexium cards and then I can try to improve the framework to prevent this from happening again. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d2f2d6d0a11e892263ea511e46af449113fd2081 Author: Hans Verkuil Date: Mon Mar 22 03:14:22 2010 -0300 V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1 v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b75396a4ea473a2cd4f2fb99a81b2289265a8021 Author: Hans Verkuil Date: Mon Mar 22 05:43:08 2010 -0300 V4L/DVB: feature-removal: announce videotext.h removal Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6a4f0623a4ebe46c743d213db808067553953913 Author: Muralidharan Karicheri Date: Thu Mar 18 11:44:12 2010 -0300 V4L/DVB: V4L - vpfe capture - fix for kernel crash As part of upstream merge, set_params() function was removed from isif.c. This requires removal of BUG_ON() and check for set_params ptr in vpfe_capture.c. Without this kernel crash dump is seen while bootup on DM365 Also made following changes:- 1) converted error messages to debug messages since it is not right to flood the console with error messages for user mistakes. 2) returns -EINVAL if ioctl is not supported Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit f8f73d01a31488ec8e923b2148043579d43d0378 Author: John Ellson Date: Wed Mar 17 10:22:58 2010 -0300 V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver The 0461:0815 camera is spca561 based not spca508 Signed-off-by: John Ellson Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 55e0b489a39bb635a44f769d620e44c70d9c065b Author: Erik Andrén Date: Mon Mar 8 17:16:00 2010 -0300 V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver The 046d:08da usb id shouldn't be associated with the stv06xx driver as they're not compatible with each other. This fixes a bug where Quickcam Messenger cams fail to use its proper driver (gspca-zc3xx), rendering the camera inoperable. Signed-off-by: Erik Andrén Tested-by: Gabriel Craciunescu Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a76b9f49ba58d081e373080ff75130673140d3f1 Author: Yong Zhang Date: Fri Feb 5 10:52:39 2010 -0300 V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy Signed-off-by: Yong Zhang Signed-off-by: Jean-François Moine CC: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 84a1d9c83e3e13991b958c897b6e9d6a5e4ce76d Author: Michael Hunold Date: Sat Mar 13 11:45:46 2010 -0300 V4L/DVB: saa7146: fix up bytesperline if it is an impossible value xawtv using DGA on a Radeon graphics card provides bogus values to S_FBUF, which will then screw up overlay video: https://bugs.launchpad.net/ubuntu/+source/xawtv/+bug/499734 This fixes the bytesperline value if it is off completely. Signed-off-by: Michael Hunold Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ab51bec1f852f6b858a26e745b32a79cd1a67eec Author: Murali Karicheri Date: Mon Mar 1 19:54:02 2010 -0300 V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails This patch fixes a bug in vpfe_probe() that doesn't call mutex_unlock() if memory allocation for ccdc_cfg fails. See also the smatch warning report from Dan Carpenter that shows this as an issue. Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit b704e82a54591d69816b45f4324caf143f1a6fc8 Author: Vaibhav Hiremath Date: Sat Mar 13 10:58:39 2010 -0300 V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 2132deff694765bc2e6c7ac84c6b30dab0775256 Author: Dan Carpenter Date: Wed Mar 10 07:57:03 2010 -0300 V4L/DVB: omap24xxcam: potential buffer overflow The previous loop goes until last == VIDEO_MAX_FRAME, so this could potentially go one past the end of the loop. Signed-off-by: Dan Carpenter Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit ea5bc73f4f56449b2d450068d492bcd17a675d7a Author: Kamal Mostafa Date: Tue Apr 27 14:02:40 2010 -0700 ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume' list to fix hang on resume. BugLink: http://bugs.launchpad.net/bugs/553498 Signed-off-by: Kamal Mostafa Acked-by: Alex Chiang Cc: stable@kernel.org Signed-off-by: Len Brown commit ee84b8243b07c33a5c8aed42b4b2da60cb16d1d2 Author: Paul E. McKenney Date: Thu May 6 09:28:41 2010 -0700 rcu: create rcu_my_thread_group_empty() wrapper Some RCU-lockdep splat repairs need to know whether they are running in a single-threaded process. Unfortunately, the thread_group_empty() primitive is defined in sched.h, and can induce #include hell. This commit therefore introduces a rcu_my_thread_group_empty() wrapper that is defined in rcupdate.c, thus avoiding the need to include sched.h everywhere. Signed-off-by: "Paul E. McKenney" commit e8e8fade7b351f131433fa44ca5d4e960e1c0f9c Merge: 325ce9e 6513412 Author: Linus Torvalds Date: Thu May 6 08:38:20 2010 -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: microblaze: Defconfig update microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros microblaze: Fix consistent-sync code microblaze: Define correct L1_CACHE_SHIFT value microblaze: cpuinfo shows cache line length microblaze: Fix kmalloc alignment on non-coherent DMA platforms microblaze: Fix typo fault in cache code microblaze: Fix consistent code microblaze: pci-dma: use include/linux/dma-mapping.h microblaze: page.h: Remove get_user_page and free_user_page microblaze: Remove "cache" optimized copy_page function microblaze: invoke oom-killer from page fault microblaze: fix divide by zero exception message microblaze: Add isa_dma_bridge_buggy to dma.h microblaze: Remove ancient code microblaze: Quiet section mismatch warnings for MMU version microblaze: Quiet section mismatch warnings microblaze: Fix IRQ entry/exit ftracing microblaze: resource/PCI: align functions now return start of resource microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs commit 325ce9e3060960488fa2c1c9eccde5ad85d75e7c Merge: bbfdbe9 257dab81 Author: Linus Torvalds Date: Thu May 6 08:38:03 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa/colibri: fix missing #include in colibri.h [ARM] pxa/spitz: fix On/off key name to fix warning during boot [ARM] pxa: fix the incorrect cpu_is_pxa950() [ARM] pxa: update cpuid pattern for pxa9xx in head.S [ARM] pxa/viper: fix timeout usage for I2C [ARM] pxa/raumfeld: fix button name [ARM] pxa/imote2: Fix iMote2 defconfig [ARM] pxa: add missing new line to regs-u2d.h ARM: 6093/1: Fix kernel memory printing for sparsemem arch/arm/include/asm/elf.h: forward-declare the task-struct arch/arm/plat-pxa/dma.c: correct NULL test ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600 ARM: Update mach-types ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002 ARM: 6068/1: Fix build break with KPROBES enabled mx5: Fix build error for mx51_defconfig commit bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079 Merge: 722154e 8bed905 Author: Linus Torvalds Date: Thu May 6 08:37:39 2010 -0700 Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: fix a number of Oopses and leaks in SH framebuffer driver SH: fix error paths in DMA driver sh: sh7751 pci controller io port fix sh: Fix maximum number of SCIF ports in R2D defconfigs SH: fix TS field shift calculation for DMA drivers commit 80ea76bb2575c426154b8d61d324197ee3592baa Author: David S. Miller Date: Thu May 6 03:15:59 2010 -0700 phy: Fix initialization in micrel driver. Missing name string in ks8001_driver, so we crash on register. Reported-by: Ingo Molnar Tested-by: Ingo Molnar Signed-off-by: David S. Miller commit b0c4d952a158a6a2547672cf4fc9d55e415410de Author: David Rientjes Date: Thu May 6 02:24:34 2010 -0700 x86: Fix fake apicid to node mapping for numa emulation With NUMA emulation, it's possible for a single cpu to be bound to multiple nodes since more than one may have affinity if allocated on a physical node that is local to the cpu. APIC ids must therefore be mapped to the lowest node ids to maintain generic kernel use of functions such as cpu_to_node() that determine device affinity. For example, if a device has proximity to physical node 1, for instance, and a cpu happens to be mapped to a higher emulated node id 8, the proximity may not be correctly determined by comparison in generic code even though the cpu may be truly local and allocated on physical node 1. When this happens, the true topology of the machine isn't accurately represented in the emulated environment; although this isn't critical to the system's uptime, any generic code that is NUMA aware benefits from the physical topology being accurately represented. This can affect any system that maps multiple APIC ids to a single node and is booted with numa=fake=N where N is greater than the number of physical nodes. Signed-off-by: David Rientjes Cc: Yinghai Lu Cc: Suresh Siddha LKML-Reference: Signed-off-by: Ingo Molnar commit 651341213583e9c57072fed0f88a749cc240fe49 Author: Michal Simek Date: Thu May 6 11:37:42 2010 +0200 microblaze: Defconfig update Signed-off-by: Michal Simek commit 3274c5707c22221574b396d140d0db3480a2027a Author: Michal Simek Date: Mon Apr 26 08:54:13 2010 +0200 microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros 1. Remove CACHE_ALL_LOOP2 macro because it is identical to CACHE_ALL_LOOP 2. Change BUG_ON to WARN_ON 3. Remove end aligned from CACHE_LOOP_LIMITS. C implementation do not need aligned end address and ASM code do aligned in their macros 4. ASM optimized CACHE_RANGE_LOOP_1/2 macros needs to get aligned end address. Because end address is compound from start + size, end address is the first address which is exclude. Here is the corresponding code which describe it. + int align = ~(line_length - 1); + end = ((end & align) == end) ? end - line_length : end & align; a) end is aligned: it is necessary to subtruct line length because we don't want to work with next cacheline b) end address is not aligned: Just align it to be ready for ASM code. Signed-off-by: Michal Simek commit 385e1efafc73a5deeb20645ae8b227b4896852e2 Author: Michal Simek Date: Thu Apr 29 13:02:17 2010 +0200 microblaze: Fix consistent-sync code PCI_DMA_FROMDEVICE should call invalidation not flushing. Signed-off-by: Michal Simek commit 598acab44dcbda0e300d9d080e81566334138e7d Author: Michal Simek Date: Mon Apr 26 13:43:23 2010 +0200 microblaze: Define correct L1_CACHE_SHIFT value Microblaze cacheline length is configurable and current cpu uses two cacheline length 4 and 8. We are taking conservative maximum value to be sure that cacheline alignment is satisfied for all cases. Here is the calculation for cacheline lenght 8 32bit=4Byte values which is corresponding with SHIFT 5. Signed-off-by: Michal Simek commit 77543cebab7387eab7d482e90018a64d6f2ced1e Author: Michal Simek Date: Mon Apr 26 13:53:04 2010 +0200 microblaze: cpuinfo shows cache line length Show cache line length in /proc/cpuinfo. Signed-off-by: Michal Simek commit de925d9d3b64390ef6363e16e9d6a84d7dd7cee1 Author: Michal Simek Date: Mon Apr 26 13:49:01 2010 +0200 microblaze: Fix kmalloc alignment on non-coherent DMA platforms Based on PowerPC patche 52142e756e9bf6485d3d53596e8aff2e816a7253 PowerPC description: On platforms doing non-coherent DMA (4xx, 8xx, ...), it's important that the kmalloc minimum alignment is set to the cache line size, to avoid sharing cache lines between different objects, so that DMA to one of the objects doesn't corrupt the other. Signed-off-by: Michal Simek commit c17e1a1cedb723d48d4822cae1af1c010b608b5c Author: Michal Simek Date: Fri Apr 23 11:38:43 2010 +0200 microblaze: Fix typo fault in cache code Copy & paste error. Signed-off-by: Michal Simek commit f1525765fb9c432f5dc5d0d18102fbe9980a14ae Author: Michal Simek Date: Sat Apr 10 17:34:06 2010 +0200 microblaze: Fix consistent code This patch fix consistent code which had problems with consistent_free function. I am not sure if we need to call flush_tlb_all after it but it keeps tlbs synced. I added noMMU and MMU version together. Uncached shadow feature is not tested. Signed-off-by: Michal Simek commit 16f6e9989293ba32e33c4a2a9b29a1d77c321723 Author: Michal Simek Date: Fri Apr 16 09:13:27 2010 +0200 microblaze: pci-dma: use include/linux/dma-mapping.h Based on af407c6db16aa9ca63559076dbe620220a822580 and f41b177157718abe9a93868bb76e47d4a6f3681d Signed-off-by: Michal Simek commit 22dcc2e3b96107e464dbc1a5c84b5e7239906cb0 Author: Michal Simek Date: Thu Apr 22 08:07:46 2010 +0200 microblaze: page.h: Remove get_user_page and free_user_page Remove ancient macros which are here from Linux-2.4 Signed-off-by: Michal Simek commit 43f2a6e8b122378b9ad20cd8ea449cdb38f5d829 Author: Michal Simek Date: Thu Apr 22 07:28:48 2010 +0200 microblaze: Remove "cache" optimized copy_page function Current implementation doesn't handle dcache_line_length correctly that's why is better to use generic memcpy. Cache optimized function could be good way howto improve performance but must be based on benchmarking not blind function like this. Signed-off-by: Michal Simek commit 21e1c93631e027136ea4070e7bca600c4ad4f391 Author: Nick Piggin Date: Fri Apr 23 02:06:21 2010 +1000 microblaze: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Cc: microblaze-uclinux@itee.uq.edu.au Cc: Michal Simek Cc: linux-arch@vger.kernel.org Signed-off-by: Nick Piggin Acked-by: David Rientjes Acked-by: Michal Simek commit f3ff8212a24f1935b44a3fcdd81c787428f053a6 Author: Randy Dunlap Date: Wed Apr 21 14:11:34 2010 -0700 microblaze: fix divide by zero exception message Fix divide exception message to say "divide by zero". Signed-off-by: Randy Dunlap Cc: Michal Simek Cc: microblaze-uclinux@itee.uq.edu.au Signed-off-by: Michal Simek commit 113a591a17de9e71b90631be89d3268c406b11c6 Author: Michal Simek Date: Tue Apr 20 19:02:13 2010 +0200 microblaze: Add isa_dma_bridge_buggy to dma.h It is necessary for several drivers. Signed-off-by: Michal Simek commit e7682231092d1d1dd49bc590d6d3b7f0ddc07e74 Author: Michal Simek Date: Fri Apr 16 09:41:07 2010 +0200 microblaze: Remove ancient code I found several function which we don't use that's why I am removing them. Signed-off-by: Michal Simek commit 63f1032b97638fc2b023fa968b7703c8ebe6d6d9 Author: Michal Simek Date: Tue Apr 13 08:59:37 2010 +0200 microblaze: Quiet section mismatch warnings for MMU version Remove section mismatch - based on ppc aproach. WARNING: vmlinux.o(.text+0x64834): Section mismatch in reference from the function __pte_alloc_kernel() to the function .init.text:early_get_page() The function __pte_alloc_kernel() references the function __init early_get_page(). This is often because __pte_alloc_kernel lacks a __init annotation or the annotation of early_get_page is wrong. Signed-off-by: Michal Simek commit 7a0248e819ddaf2c2f28e6edd287b90aa930702a Author: Steven J. Magnani Date: Fri Apr 9 22:03:37 2010 -0500 microblaze: Quiet section mismatch warnings _start is located in .text, which causes mismatch warnings with machine_early_init() and start_kernel() in .init.text. Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit e6d7961e5be0a259ba87411370f8be7f7da4c0f6 Author: Steven J. Magnani Date: Mon Apr 12 16:01:36 2010 -0500 microblaze: Fix IRQ entry/exit ftracing Function traces on Microblaze don't include IRQ entry and exit arrows, i.e. 0) | memcpy_toiovec() { 0) ==========> | 0) | do_IRQ() { ... 0) <========== | 0) ! 5414.000 us | } ...because do_IRQ() doesn't have the proper attributes. Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit c86fac4382b3fb238a520ab5f2fa200c6a868b7f Author: Michal Simek Date: Fri Apr 16 09:04:51 2010 +0200 microblaze: resource/PCI: align functions now return start of resource This change should be part of b26b2d494b659f988b4d75eb394dfa0ddac415c9 Origin description: resource/PCI: align functions now return start of resource As suggested by Linus, align functions should return the start of a resource, not void. An update of "res->start" is no longer necessary. Signed-off-by: Michal Simek commit 8a66da71fa84d08bef7d1678db77df77dccefa20 Author: Michal Simek Date: Fri Apr 16 09:03:00 2010 +0200 microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs This change should be part of 89a74ecccd1f78e51faf6287e5c0e93a92ac096e Origin description: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs No functional change; this converts loops that iterate from 0 to PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the pci_bus_for_each_resource() iterator instead. This doesn't change the way resources are stored; it merely removes dependencies on the fact that they're in a table. Signed-off-by: Michal Simek commit 50b5d6ad63821cea324a5a7a19854d4de1a0a819 Author: Vlad Yasevich Date: Thu May 6 00:56:07 2010 -0700 sctp: Fix a race between ICMP protocol unreachable and connect() ICMP protocol unreachable handling completely disregarded the fact that the user may have locked the socket. It proceeded to destroy the association, even though the user may have held the lock and had a ref on the association. This resulted in the following: Attempt to release alive inet socket f6afcc00 ========================= [ BUG: held lock freed! ] ------------------------- somenu/2672 is freeing memory f6afcc00-f6afcfff, with a lock still held there! (sk_lock-AF_INET){+.+.+.}, at: [] sctp_connect+0x13/0x4c 1 lock held by somenu/2672: #0: (sk_lock-AF_INET){+.+.+.}, at: [] sctp_connect+0x13/0x4c stack backtrace: Pid: 2672, comm: somenu Not tainted 2.6.32-telco #55 Call Trace: [] ? printk+0xf/0x11 [] debug_check_no_locks_freed+0xce/0xff [] kmem_cache_free+0x21/0x66 [] __sk_free+0x9d/0xab [] sk_free+0x1c/0x1e [] sctp_association_put+0x32/0x89 [] __sctp_connect+0x36d/0x3f4 [] ? sctp_connect+0x13/0x4c [] ? autoremove_wake_function+0x0/0x33 [] sctp_connect+0x31/0x4c [] inet_dgram_connect+0x4b/0x55 [] sys_connect+0x54/0x71 [] ? lock_release_non_nested+0x88/0x239 [] ? might_fault+0x42/0x7c [] ? might_fault+0x42/0x7c [] sys_socketcall+0x6d/0x178 [] ? trace_hardirqs_on_thunk+0xc/0x10 [] syscall_call+0x7/0xb This was because the sctp_wait_for_connect() would aqcure the socket lock and then proceed to release the last reference count on the association, thus cause the fully destruction path to finish freeing the socket. The simplest solution is to start a very short timer in case the socket is owned by user. When the timer expires, we can do some verification and be able to do the release properly. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 6ec82562ffc6f297d0de36d65776cff8e5704867 Author: Eric Dumazet Date: Thu May 6 00:53:53 2010 -0700 veth: Dont kfree_skb() after dev_forward_skb() In case of congestion, netif_rx() frees the skb, so we must assume dev_forward_skb() also consume skb. Bug introduced by commit 445409602c092 (veth: move loopback logic to common location) We must change dev_forward_skb() to always consume skb, and veth to not double free it. Bug report : http://marc.info/?l=linux-netdev&m=127310770900442&w=3 Reported-by: Martín Ferrari Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 257dab81413b31b8648becfe11586b3a41e5c29a Merge: ea056df ccb8d8d Author: Russell King Date: Thu May 6 08:16:34 2010 +0100 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit dcf097b247affd8b88ad410a92298590c5600f44 Author: Vivek Goyal Date: Thu Apr 22 11:54:52 2010 -0400 blk-cgroup: Fix RCU correctness warning in cfq_init_queue() It is necessary to be in an RCU read-side critical section when invoking css_id(), so this patch adds one to blkiocg_add_blkio_group(). This is actually a false positive, because this is called at initialization time and hence always refers to the root cgroup, which cannot go away. [ 103.790505] =================================================== [ 103.790509] [ INFO: suspicious rcu_dereference_check() usage. ] [ 103.790511] --------------------------------------------------- [ 103.790514] kernel/cgroup.c:4432 invoked rcu_dereference_check() without protection! [ 103.790517] [ 103.790517] other info that might help us debug this: [ 103.790519] [ 103.790521] [ 103.790521] rcu_scheduler_active = 1, debug_locks = 1 [ 103.790524] 4 locks held by bash/4422: [ 103.790526] #0: (&buffer->mutex){+.+.+.}, at: [] sysfs_write_file+0x3c/0x144 [ 103.790537] #1: (s_active#102){.+.+.+}, at: [] sysfs_write_file+0xe7/0x144 [ 103.790544] #2: (&q->sysfs_lock){+.+.+.}, at: [] queue_attr_store+0x49/0x8f [ 103.790552] #3: (&(&blkcg->lock)->rlock){......}, at: [] blkiocg_add_blkio_group+0x2b/0xad [ 103.790560] [ 103.790561] stack backtrace: [ 103.790564] Pid: 4422, comm: bash Not tainted 2.6.34-rc4-blkio-second-crash #81 [ 103.790567] Call Trace: [ 103.790572] [] lockdep_rcu_dereference+0x9d/0xa5 [ 103.790577] [] css_id+0x44/0x57 [ 103.790581] [] blkiocg_add_blkio_group+0x53/0xad [ 103.790586] [] cfq_init_queue+0x139/0x32c [ 103.790591] [] elv_iosched_store+0xbf/0x1bf [ 103.790595] [] queue_attr_store+0x70/0x8f [ 103.790599] [] ? sysfs_write_file+0xe7/0x144 [ 103.790603] [] sysfs_write_file+0x108/0x144 [ 103.790609] [] vfs_write+0xae/0x10b [ 103.790612] [] ? trace_hardirqs_on_caller+0x10c/0x130 [ 103.790616] [] sys_write+0x4a/0x6e [ 103.790622] [] system_call_fastpath+0x16/0x1b [ 103.790625] Located-by: Miles Lane Signed-off-by: Vivek Goyal Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 4bdae98f1a456ea1fea5ea02f9249d23bceab75b Author: Shaohua Li Date: Thu Apr 8 11:16:15 2010 +0800 ACPI: fix acpi_hest_firmware_first_pci() caused oops acpi_hest_firmware_first_pci() could be called when acpi is disabled and cause system oops. Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit 97c227cb51ddcf52c66f7a7fba69237026418b56 Author: Dan Carpenter Date: Tue Apr 27 14:06:05 2010 -0700 sbshc: acpi_device_class "smbus_host_controller" too long acpi_device_class can only be 19 characters and a NULL terminator. With the current name we get a buffer overflow in acpi_smbus_hc_add() when we do: strcpy(acpi_device_class(device), ACPI_SMB_HC_CLASS); Signed-off-by: Dan Carpenter Cc: Alexey Starikovskiy Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 18262714ca0fb65c290b8ea1807b2b02bb52d0e3 Author: Dan Carpenter Date: Tue Apr 27 14:01:07 2010 -0700 power_meter: acpi_device_class "power_meter_resource" too long acpi_device_class can only be 19 characters and a NULL terminator. The current code has a buffer overflow in acpi_power_meter_add(): strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS); Signed-off-by: Dan Carpenter Cc: Len Brown Cc: "Darrick J. Wong" Cc: Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a40770a9537c72b555667851845e73484b22ba17 Author: Dan Carpenter Date: Tue Apr 27 14:06:05 2010 -0700 acpi_pad: "processor_aggregator" name too long cpi_device_class can only be 19 characters and a NULL terminator. With the current name we get a buffer overflow in acpi_pad_add() strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); [akpm@linux-foundation.org: call it acpi_pad, per Shaohua Li] Signed-off-by: Dan Carpenter Cc: walter harms Acked-by: Shaohua Li Cc: Len Brown Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 11439a6fd90b4861df64b4f983726e1c54977ab7 Author: Bjorn Helgaas Date: Mon May 3 10:47:21 2010 -0600 PNP: don't check for conflicts with bridge windows With fa35b4926, I broke a lot of PNP resource assignment. That commit made PNPACPI include bridge windows as PNP resources, and PNP resource assignment treats any enabled overlapping PNP resources as conflicts. Since PCI host bridge windows typically include most of the I/O port space, this makes PNP port assigments fail. The PCI host bridge driver will eventually use those PNP window resources, so we should make PNP ignore them when checking for conflicts. This fixes https://bugzilla.kernel.org/show_bug.cgi?id=15903 Reported-and-tested-by: Pavel Kysilka Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit d40a4de0be08f005814a4fddac748fe5353208ec Author: Brian Haley Date: Mon May 3 15:44:27 2010 +0000 IPv6: fix IPV6_RECVERR handling of locally-generated errors I noticed when I added support for IPV6_DONTFRAG that if you set IPV6_RECVERR and tried to send a UDP packet larger than 64K to an IPv6 destination, you'd correctly get an EMSGSIZE, but reading from MSG_ERRQUEUE returned the incorrect address in the cmsg: struct msghdr: msg_name 0x7fff8f3c96d0 msg_namelen 28 struct sockaddr_in6: sin6_family 10 sin6_port 7639 sin6_flowinfo 0 sin6_addr ::ffff:38.32.0.0 sin6_scope_id 0 ((null)) It should have returned this in my case: struct msghdr: msg_name 0x7fffd866b510 msg_namelen 28 struct sockaddr_in6: sin6_family 10 sin6_port 7639 sin6_flowinfo 0 sin6_addr 2620:0:a09:e000:21f:29ff:fe57:f88b sin6_scope_id 0 ((null)) The problem is that ipv6_recv_error() assumes that if the error wasn't generated by ICMPv6, it's an IPv4 address sitting there, and proceeds to create a v4-mapped address from it. Change ipv6_icmp_error() and ipv6_local_error() to set skb->protocol to htons(ETH_P_IPV6) so that ipv6_recv_error() knows the address sitting right after the extended error is IPv6, else it will incorrectly map the first octet into an IPv4-mapped IPv6 address in the cmsg structure returned in a recvmsg() call to obtain the error. Signed-off-by: Brian Haley -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: David S. Miller commit 54ad023ba8108d0163acc931ed4b5e4a8a3a7327 Author: Sage Weil Date: Wed May 5 21:30:35 2010 -0700 ceph: don't use writeback_control in writepages completion The ->writepages writeback_control is not still valid in the writepages completion. We were touching it solely to adjust pages_skipped when there was a writeback error (EIO, ENOSPC, EPERM due to bad osd credentials), causing an oops in the writeback code shortly thereafter. Updating pages_skipped on error isn't correct anyway, so let's just rip out this (clearly broken) code to pass the wbc to the completion. Signed-off-by: Sage Weil commit 7df9c43fbe470628a755dfd028e58fdd7ab9b44e Author: Sebastian Andrzej Siewior Date: Tue May 4 22:30:47 2010 +0000 net/gianfar: drop recycled skbs on MTU change The size for skbs which is added to the recycled list is using the current descriptor size which is current MTU. gfar_new_skb() is also using this size. So after changing or alteast increasing the MTU all recycled skbs should be dropped. Signed-off-by: Sebastian Andrzej Siewior Acked-by: Andy Fleming Signed-off-by: David S. Miller commit 8bed90557d2600d25e58de30df48b244980164ec Author: Guennadi Liakhovetski Date: Fri Apr 30 16:07:00 2010 +0000 sh: fix a number of Oopses and leaks in SH framebuffer driver Fix a number of Oopses, memory leaks and unbalanced calls on error paths in sh_mobile_lcdcfb.c. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit ccb8d8d070b8f25f0163da5c9ceacf63a5169540 Author: Jakob Viketoft Date: Wed May 5 18:25:27 2010 +0800 [ARM] pxa/colibri: fix missing #include in colibri.h The use of mfp_cfg_t causes build errors without including . CC: stable@kernel.org CC: Daniel Mack Signed-off-by: Jakob Viketoft Signed-off-by: Eric Miao commit b53f7710610215b6d53a5caea082d3afede142ea Author: Pavel Machek Date: Wed May 5 15:03:12 2010 +0800 [ARM] pxa/spitz: fix On/off key name to fix warning during boot On/Off contains slash in the name, which causes warning during boot. Signed-off-by: Pavel Machek Signed-off-by: Eric Miao commit 5d2fec5df1631076ce1d27c61def201aabc31167 Author: Haojian Zhuang Date: Fri Mar 12 08:51:54 2010 -0500 [ARM] pxa: fix the incorrect cpu_is_pxa950() Fix the wrong variable used in cpu_is_pxa950(). Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4157d317dc20f12bee9944155fed399bbe38fae4 Author: Haojian Zhuang Date: Fri Mar 12 05:47:55 2010 -0500 [ARM] pxa: update cpuid pattern for pxa9xx in head.S Update CPUID pattern of PXA9xx in head.S and fix the duplicate entries for pxa935. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 6ae87fe219ce32ea226254ee72e1d38ad35d9deb Author: Wolfram Sang Date: Sun Apr 18 13:48:29 2010 +0200 [ARM] pxa/viper: fix timeout usage for I2C The timeout value is in jiffies, so it should be using HZ, not a plain number. Assume with HZ=100 '100' means 1s here and adapt accordingly. Signed-off-by: Wolfram Sang Acked-by: Marc Zyngier Cc: Russell King Cc: Paul Shen Cc: Mike Rapoport Cc: Jean Delvare Signed-off-by: Eric Miao commit 299ed07868e2384dd3bff44e30892cfdadd7e1bc Author: Daniel Mack Date: Sun Apr 18 09:35:29 2010 +0200 [ARM] pxa/raumfeld: fix button name "on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well. While at it, fix another cosmetic coding style flaw as well. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 12145cae4d829d9d246a6272daef79074b5f4878 Author: Stefan Schmidt Date: Thu Apr 8 16:03:25 2010 +0200 [ARM] pxa/imote2: Fix iMote2 defconfig - Bring in a CMDLINE that actually works and prints to the right tty - Compile-in JFFS2 to boot into rootfs - Remove unneeded options for Bluetooth and radio - Disable CPU_FREQ as it makes the flash driver fail Thanks Jonathan for spotting what I messed up. Signed-off-by: Stefan Schmidt Acked-by: Jonathan Cameron Signed-off-by: Eric Miao commit d5df767dbe4bc1e7ce1bd16976f78ef938e53052 Author: Igor Grinberg Date: Wed Apr 7 11:40:37 2010 +0300 [ARM] pxa: add missing new line to regs-u2d.h Signed-off-by: Igor Grinberg Signed-off-by: Eric Miao commit 722154e4cacf015161efe60009ae9be23d492296 Merge: 1d7746c 0fd6b32 Author: Linus Torvalds Date: Wed May 5 15:48:13 2010 -0700 Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [MTD] Remove zero-length files mtdbdi.c and internal.ho commit 1d7746cb411d8b10c0ac934cae6c58bd1ece9616 Merge: 65be2f5 85ea2d3 Author: Linus Torvalds Date: Wed May 5 15:47:57 2010 -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: pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs libata: Fix several inaccuracies in developer's guide commit 0fd6b32b3b2f5c1bfd412de7b5fd040fb31b6712 Author: Jeff Garzik Date: Wed May 5 15:25:12 2010 -0400 [MTD] Remove zero-length files mtdbdi.c and internal.ho Both were "removed" in commit a33eb6b91034c95b9b08576f68be170f995b2c7d. Signed-off-by: Jeff Garzik commit 85ea2d3f9e71cd72e866fdb74a9d5a15d65d44c2 Author: Kristoffer Ericson Date: Sun May 2 21:48:24 2010 +0200 pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs This patch fixes the bad hashes for one Kingston and one Transcend card. Thanks to komuro for pointing this out. Signed-off-by: Kristoffer Ericson Signed-off-by: Jeff Garzik commit 40868c85b8dfe233192f29099f45348f5b363ce9 Author: Sergei Shtylyov Date: Wed May 5 17:27:10 2010 +0400 libata: Fix several inaccuracies in developer's guide Commit 6bfff31e77cfa1b13490337e5a4dbaa3407e83ac (libata: kill probe_ent and related helpers) killed ata_device_add() but didn't remove references to it from the libata developer's guide. Commits 9363c3825ea9ad76561eb48a395349dd29211ed6 (libata: rename SFF functions) and 5682ed33aae05d10a25c95633ef9d9c062825888 (libata: rename SFF port ops) renamed the taskfile access methods but didn't update the developer's guide. Commit c9f75b04ed5ed65a058d18a8a8dda50632a96de8 (libata: kill ata_noop_dev_select()) didn't update the developer's guide as well. The guide also refers to the long gone ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), and ata_mmio_data_xfer() -- replace those by the modern ata_sff_data_xfer_noirq(), ata_sff_data_xfer(), and ata_sff_data_xfer32(). Also, remove the reference to non-existant ata_port_stop()... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 65be2f501f5b31208a963713e6702d40e8e7863d Merge: 5f23370 111c7d8 Author: Linus Torvalds Date: Wed May 5 11:18:16 2010 -0700 Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix bad boundary check in init_kmem_cache_nodes() commit 111c7d82436db4c7673922b6ba021cebb7d26dd8 Author: Zhang, Yanmin Date: Thu Apr 1 17:32:30 2010 +0800 slub: Fix bad boundary check in init_kmem_cache_nodes() Function init_kmem_cache_nodes is incorrect when checking upper limitation of kmalloc_caches. The breakage was introduced by commit 91efd773c74bb26b5409c85ad755d536448e229c ("dma kmalloc handling fixes"). Acked-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 07bedca29b0973f36a6b6db36936deed367164ed Author: Alex Chiang Date: Tue Apr 20 08:03:14 2010 -0600 ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads Multiple Lenovo ThinkPad models with Intel Core i5/i7 CPUs can successfully suspend/resume once, and then hang on the second s/r cycle. We got confirmation that this was due to a BIOS defect. The BIOS did not properly set SCI_EN coming out of S3. The BIOS guys hinted that The Other Leading OS ignores the fact that hardware owns the bit and sets it manually. In any case, an existing DMI table exists for machines where this defect is a known problem. Lenovo promise to fix their BIOS, but for folks who either won't or can't upgrade their BIOS, allow Linux to workaround the issue. https://bugzilla.kernel.org/show_bug.cgi?id=15407 https://bugs.launchpad.net/ubuntu/+source/linux/+bug/532374 Confirmed by numerous testers in the launchpad bug that using acpi_sleep=sci_force_enable fixes the issue. We add the machines to acpisleep_dmi_table[] to automatically enable this workaround. Cc: stable@kernel.org Cc: Colin King Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 77a4229719e511a0d38d9c355317ae1469adeb54 Author: James Bottomley Date: Tue May 4 16:51:40 2010 -0400 [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error There's nastyness in the way we currently handle barriers (and discards): They're effectively filesystem commands, but they get processed as BLOCK_PC commands. Unfortunately BLOCK_PC commands are taken by SCSI to be SG_IO commands and the issuer expects to see and handle any returned errors, however trivial. This leads to a huge problem, because the block layer doesn't expect this to happen and any trivially retryable error on a barrier causes an immediate I/O error to the filesystem. The only real way to hack around this is to take the usual class of offending errors (unit attentions) and make them all retryable in the case of a REQ_HARDBARRIER. A correct fix would involve a rework of the entire block and SCSI submit system, and so is out of scope for a quick fix. Cc: Hannes Reinecke Cc: Stable Tree Signed-off-by: James Bottomley commit c213e1407be6b04b144794399a91472e0ef92aec Author: Hannes Reinecke Date: Tue May 4 16:49:21 2010 +0200 [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error Some arrays are giving I/O errors with ext3 filesystems when SYNCHRONIZE_CACHE gets a UNIT_ATTENTION. What is happening is that these commands have no retries, so the UNIT_ATTENTION causes the barrier to fail. We should be enable retries here to clear any transient error and allow the barrier to succeed. Signed-off-by: Hannes Reinecke Cc: Stable Tree Signed-off-by: James Bottomley commit 5f233706592fcce7df57e12674461c349b8f591d Merge: 8777c79 896903c Author: Linus Torvalds Date: Wed May 5 09:06:24 2010 -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: KEYS: call_sbin_request_key() must write lock keyrings before modifying them KEYS: Use RCU dereference wrappers in keyring key type code KEYS: find_keyring_by_name() can gain access to a freed keyring commit 8777c793d6a24c7f3adf52b1b1086e9706de4589 Merge: 7437e7d 47dd5be Author: Linus Torvalds Date: Wed May 5 07:56:36 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: flush_delayed_work: keep the original workqueue for re-queueing commit 7437e7d3672b6d23c08212c68752c9a9c25f8e9e Merge: 38c9e91 7cff094 Author: Linus Torvalds Date: Wed May 5 07:55:07 2010 -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: FEC: Fix kernel panic in fec_set_mac_address. ipv6: Fix default multicast hops setting. net: ep93xx_eth stops receiving packets drivers/net/phy: micrel phy driver dm9601: fix phy/eeprom write routine ppp_generic: handle non-linear skbs when passing them to pppd ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid net: fix compile error due to double return type in SOCK_DEBUG net/usb: initiate sync sequence in sierra_net.c driver net/usb: remove default in Kconfig for sierra_net driver r8169: Fix rtl8169_rx_interrupt() e1000e: Fix oops caused by ASPM patch. net/sb1250: register mdio bus in probe sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4) p54pci: fix bugs in p54p_check_tx_ring commit 38c9e91bc396672e9ea8013bad63ea4f59d9d31c Merge: 1d7aec3 69b5de8 Author: Linus Torvalds Date: Wed May 5 07:54:22 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice) ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582 ALSA: take tu->qlock with irqs disabled ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F ALSA: hda - fix array indexing while creating inputs for Cirrus codecs ALSA: es968: fix wrong PnP dma index commit 1d7aec304147aadcbc66ef9ab691208f9f22b6a8 Merge: 5157b4a 26a6931 Author: Linus Torvalds Date: Wed May 5 07:53:18 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: joydev - allow binding to button-only devices Input: elantech - ignore high bits in the position coordinates Input: elantech - allow forcing Elantech protocol Input: elantech - fix firmware version check Input: ati_remote - add some missing devices from lirc_atiusb Input: eeti_ts - cancel pending work when going to suspend Input: Add support of Synaptics Clickpad device Revert "Input: ALPS - add signature for HP Pavilion dm3 laptops" Input: psmouse - ignore parity error for basic protocols commit 5157b4aa5b7de8787b6318e61bcc285031bb9088 Author: Dan Williams Date: Tue May 4 20:41:56 2010 -0700 raid6: fix recovery performance regression The raid6 recovery code should immediately drop back to the optimized synchronous path when a p+q dma resource is not available. Otherwise we run the non-optimized/multi-pass async code in sync mode. Verified with raid6test (NDISKS=255) Applies to kernels >= 2.6.32. Cc: Acked-by: NeilBrown Reported-by: H. Peter Anvin Signed-off-by: Dan Williams Signed-off-by: Linus Torvalds commit 896903c2f5f79f029388f033a00c3b813bc91201 Author: David Howells Date: Fri Apr 30 14:32:23 2010 +0100 KEYS: call_sbin_request_key() must write lock keyrings before modifying them call_sbin_request_key() creates a keyring and then attempts to insert a link to the authorisation key into that keyring, but does so without holding a write lock on the keyring semaphore. It will normally get away with this because it hasn't told anyone that the keyring exists yet. The new keyring, however, has had its serial number published, which means it can be accessed directly by that handle. This was found by a previous patch that adds RCU lockdep checks to the code that reads the keyring payload pointer, which includes a check that the keyring semaphore is actually locked. Without this patch, the following command: keyctl request2 user b a @s will provoke the following lockdep warning is displayed in dmesg: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/keyring.c:727 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by keyctl/2076: #0: (key_types_sem){.+.+.+}, at: [] key_type_lookup+0x1c/0x71 #1: (keyring_serialise_link_sem){+.+.+.}, at: [] __key_link+0x4d/0x3c5 stack backtrace: Pid: 2076, comm: keyctl Not tainted 2.6.34-rc6-cachefs #54 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] ? __key_link+0x4d/0x3c5 [] __key_link+0x19e/0x3c5 [] ? __key_instantiate_and_link+0xb1/0xdc [] ? key_instantiate_and_link+0x42/0x5f [] call_sbin_request_key+0xe7/0x33b [] ? mutex_unlock+0x9/0xb [] ? __key_instantiate_and_link+0xb1/0xdc [] ? key_instantiate_and_link+0x42/0x5f [] ? request_key_auth_new+0x1c2/0x23c [] ? cache_alloc_debugcheck_after+0x108/0x173 [] ? request_key_and_link+0x146/0x300 [] ? kmem_cache_alloc+0xe1/0x118 [] request_key_and_link+0x28b/0x300 [] sys_request_key+0xf7/0x14a [] ? trace_hardirqs_on_caller+0x10c/0x130 [] ? trace_hardirqs_on_thunk+0x3a/0x3f [] system_call_fastpath+0x16/0x1b Signed-off-by: David Howells Signed-off-by: James Morris commit f0641cba7729e5e14f82d2eedc398103f5fa31b1 Author: David Howells Date: Fri Apr 30 14:32:18 2010 +0100 KEYS: Use RCU dereference wrappers in keyring key type code The keyring key type code should use RCU dereference wrappers, even when it holds the keyring's key semaphore. Reported-by: Vegard Nossum Signed-off-by: David Howells Acked-by: Serge Hallyn Signed-off-by: James Morris commit cea7daa3589d6b550546a8c8963599f7c1a3ae5c Author: Toshiyuki Okajima Date: Fri Apr 30 14:32:13 2010 +0100 KEYS: find_keyring_by_name() can gain access to a freed keyring find_keyring_by_name() can gain access to a keyring that has had its reference count reduced to zero, and is thus ready to be freed. This then allows the dead keyring to be brought back into use whilst it is being destroyed. The following timeline illustrates the process: |(cleaner) (user) | | free_user(user) sys_keyctl() | | | | key_put(user->session_keyring) keyctl_get_keyring_ID() | || //=> keyring->usage = 0 | | |schedule_work(&key_cleanup_task) lookup_user_key() | || | | kmem_cache_free(,user) | | . |[KEY_SPEC_USER_KEYRING] | . install_user_keyrings() | . || | key_cleanup() [<= worker_thread()] || | | || | [spin_lock(&key_serial_lock)] |[mutex_lock(&key_user_keyr..mutex)] | | || | atomic_read() == 0 || | |{ rb_ease(&key->serial_node,) } || | | || | [spin_unlock(&key_serial_lock)] |find_keyring_by_name() | | ||| | keyring_destroy(keyring) ||[read_lock(&keyring_name_lock)] | || ||| | |[write_lock(&keyring_name_lock)] ||atomic_inc(&keyring->usage) | |. ||| *** GET freeing keyring *** | |. ||[read_unlock(&keyring_name_lock)] | || || | |list_del() |[mutex_unlock(&key_user_k..mutex)] | || | | |[write_unlock(&keyring_name_lock)] ** INVALID keyring is returned ** | | . | kmem_cache_free(,keyring) . | . | atomic_dec(&keyring->usage) v *** DESTROYED *** TIME If CONFIG_SLUB_DEBUG=y then we may see the following message generated: ============================================================================= BUG key_jar: Poison overwritten ----------------------------------------------------------------------------- INFO: 0xffff880197a7e200-0xffff880197a7e200. First byte 0x6a instead of 0x6b INFO: Allocated in key_alloc+0x10b/0x35f age=25 cpu=1 pid=5086 INFO: Freed in key_cleanup+0xd0/0xd5 age=12 cpu=1 pid=10 INFO: Slab 0xffffea000592cb90 objects=16 used=2 fp=0xffff880197a7e200 flags=0x200000000000c3 INFO: Object 0xffff880197a7e200 @offset=512 fp=0xffff880197a7e300 Bytes b4 0xffff880197a7e1f0: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ Object 0xffff880197a7e200: 6a 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b jkkkkkkkkkkkkkkk Alternatively, we may see a system panic happen, such as: BUG: unable to handle kernel NULL pointer dereference at 0000000000000001 IP: [] kmem_cache_alloc+0x5b/0xe9 PGD 6b2b4067 PUD 6a80d067 PMD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/kernel/kexec_crash_loaded CPU 1 ... Pid: 31245, comm: su Not tainted 2.6.34-rc5-nofixed-nodebug #2 D2089/PRIMERGY RIP: 0010:[] [] kmem_cache_alloc+0x5b/0xe9 RSP: 0018:ffff88006af3bd98 EFLAGS: 00010002 RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff88007d19900b RDX: 0000000100000000 RSI: 00000000000080d0 RDI: ffffffff81828430 RBP: ffffffff81828430 R08: ffff88000a293750 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000100000 R12: 00000000000080d0 R13: 00000000000080d0 R14: 0000000000000296 R15: ffffffff810f20ce FS: 00007f97116bc700(0000) GS:ffff88000a280000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000001 CR3: 000000006a91c000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process su (pid: 31245, threadinfo ffff88006af3a000, task ffff8800374414c0) Stack: 0000000512e0958e 0000000000008000 ffff880037f8d180 0000000000000001 0000000000000000 0000000000008001 ffff88007d199000 ffffffff810f20ce 0000000000008000 ffff88006af3be48 0000000000000024 ffffffff810face3 Call Trace: [] ? get_empty_filp+0x70/0x12f [] ? do_filp_open+0x145/0x590 [] ? tlb_finish_mmu+0x2a/0x33 [] ? unmap_region+0xd3/0xe2 [] ? virt_to_head_page+0x9/0x2d [] ? alloc_fd+0x69/0x10e [] ? do_sys_open+0x56/0xfc [] ? system_call_fastpath+0x16/0x1b Code: 0f 1f 44 00 00 49 89 c6 fa 66 0f 1f 44 00 00 65 4c 8b 04 25 60 e8 00 00 48 8b 45 00 49 01 c0 49 8b 18 48 85 db 74 0d 48 63 45 18 <48> 8b 04 03 49 89 00 eb 14 4c 89 f9 83 ca ff 44 89 e6 48 89 ef RIP [] kmem_cache_alloc+0x5b/0xe9 This problem is that find_keyring_by_name does not confirm that the keyring is valid before accepting it. Skipping keyrings that have been reduced to a zero count seems the way to go. To this end, use atomic_inc_not_zero() to increment the usage count and skip the candidate keyring if that returns false. The following script _may_ cause the bug to happen, but there's no guarantee as the window of opportunity is small: #!/bin/sh LOOP=100000 USER=dummy_user /bin/su -c "exit;" $USER || { /usr/sbin/adduser -m $USER; add=1; } for ((i=0; i /dev/null" $USER done (( add == 1 )) && /usr/sbin/userdel -r $USER exit Note that the nominated user must not be in use. An alternative way of testing this may be: for ((i=0; i<100000; i++)) do keyctl session foo /bin/true || break done >&/dev/null as that uses a keyring named "foo" rather than relying on the user and user-session named keyrings. Reported-by: Toshiyuki Okajima Signed-off-by: David Howells Tested-by: Toshiyuki Okajima Acked-by: Serge Hallyn Signed-off-by: James Morris commit 69b5de84758237ee0086554849489baeeafcd097 Merge: bfe7078 8f0f5ff Author: Takashi Iwai Date: Wed May 5 10:08:30 2010 +0200 Merge branch 'fix/hda' into for-linus commit 8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 Author: Daniel T Chen Date: Wed Apr 28 18:00:11 2010 -0400 ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice) BugLink: https://launchpad.net/bugs/541802 The OR's hardware distorts at PCM 100% because it does not correspond to 0 dB. Fix this in patch_cxt5045() for all Packard Bell models. Reported-by: Valombre Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 231f50bc0e9735fd1b3fd376a8d3b6a14aee0694 Author: Anisse Astier Date: Wed Apr 28 18:05:06 2010 +0200 ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582 Add a quirk for all-in-one computer Dell Inspiron One 19 Touch to have proper HP and Mic support. Signed-off-by: Anisse Astier Signed-off-by: Takashi Iwai commit bfe70783ca8e61f1fc3588cd59c4f1b755e9d3cf Author: Dan Carpenter Date: Wed Apr 28 10:29:14 2010 +0200 ALSA: take tu->qlock with irqs disabled We should disable irqs when we take the tu->qlock because it is used in the irq handler. The only place that doesn't is snd_timer_user_ccallback(). Most of the time snd_timer_user_ccallback() is called with interrupts disabled but the the first ti->ccallback() call in snd_timer_notify1() has interrupts enabled. This was caught by lockdep which generates the following message: > ================================= > [ INFO: inconsistent lock state ] > 2.6.34-rc5 #5 > --------------------------------- > inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage. > dolphin/4003 [HC1[1]:SC0[0]:HE0:SE1] takes: > (&(&tu->qlock)->rlock){?.+...}, at: [] snd_timer_user_tinterrupt+0x28/0x132 [snd_timer] > {HARDIRQ-ON-W} state was registered at: > [] __lock_acquire+0x654/0x1482 > [] lock_acquire+0x5c/0x73 > [] _raw_spin_lock+0x25/0x34 > [] snd_timer_user_ccallback+0x55/0x95 [snd_timer] > [] snd_timer_notify1+0x53/0xca [snd_timer] Reported-by: Stefan Richter Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 7cff0943a1104479fc9fc2d6ced24c02ba81e73e Author: Mattias Walström Date: Wed May 5 00:55:48 2010 -0700 FEC: Fix kernel panic in fec_set_mac_address. Fix memory corruption that sometimes result in kernel panic. Signed-off-by: Mattias Walström Signed-off-by: David S. Miller commit c53666813813a0ea3d0391e1911eefc05a5e6b4f Author: Daniel T Chen Date: Tue May 4 22:07:58 2010 -0400 ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T BugLink: https://launchpad.net/bugs/549267 The OR verified that using the olpc-xo-1_5 model quirk allows the headphones to be audible when inserted into the jack. Capture was also verified to work correctly. Reported-by: Richard Gagne Tested-by: Richard Gagne Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 4442dd4613fe3795b4c8a5f42fc96b7ffb90d01a Author: Daniel T Chen Date: Mon May 3 20:39:31 2010 -0400 ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F BugLink: https://launchpad.net/bugs/573284 The OR verified that using the olpc-xo-1_5 model quirk allows the headphones to be audible when inserted into the jack. Capture was also verified to work correctly. Reported-by: Andy Couldrake Tested-by: Andy Couldrake Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 8dd34ab111dc6ccb35a1a7a59222cb9bb0160e6f Author: Brian J. Tarricone Date: Sun May 2 17:32:10 2010 -0700 ALSA: hda - fix array indexing while creating inputs for Cirrus codecs This fixes a problem where cards show up as only having a single mixer element, suppressing all sound output. Signed-off-by: Brian J. Tarricone Signed-off-by: Takashi Iwai commit 7ebd467551ed6ae200d7835a84bbda0dcadaa511 Merge: d7526f2 68b3adb Author: Linus Torvalds Date: Tue May 4 19:08:12 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/legacy: only enable load detection property on DVI-I drm/radeon/kms: fix panel scaling adjusted mode setup drivers/gpu/drm/drm_sysfs.c: sysfs files error handling drivers/gpu/drm/radeon/radeon_atombios.c: range check issues gpu: vga_switcheroo, fix lock imbalance drivers/gpu/drm/drm_memory.c: fix check for end of loop drivers/gpu/drm/via/via_video.c: fix off by one issue drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill commit d7526f271f2111684211fc7d27814e86a36336c9 Merge: 67bff7c b810e94 Author: Linus Torvalds Date: Tue May 4 19:07:35 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: powernow-k8: Fix frequency reporting x86: Fix parse_reservetop() build failure on certain configs x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests x86: Fix 'reservetop=' functionality commit 67bff7c087f91f79dfa97a33a3aeb147eb467093 Merge: 7572e56 cf8304e Author: Linus Torvalds Date: Tue May 4 18:49:34 2010 -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: KEYS: Fix RCU handling in key_gc_keyring() KEYS: Fix an RCU warning in the reading of user keys commit cf8304e8f380903de3a15dc6ebd551c9e6cf1a21 Author: David Howells Date: Tue May 4 14:16:10 2010 +0100 KEYS: Fix RCU handling in key_gc_keyring() key_gc_keyring() needs to either hold the RCU read lock or hold the keyring semaphore if it's going to scan the keyring's list. Given that it only needs to read the key list, and it's doing so under a spinlock, the RCU read lock is the thing to use. Furthermore, the RCU check added in e7b0a61b7929632d36cf052d9e2820ef0a9c1bfe is incorrect as holding the spinlock on key_serial_lock is not grounds for assuming a keyring's pointer list can be read safely. Instead, a simple rcu_dereference() inside of the previously mentioned RCU read lock is what we want. Reported-by: Serge E. Hallyn Signed-off-by: David Howells Acked-by: Serge Hallyn Acked-by: "Paul E. McKenney" Signed-off-by: James Morris commit d9a9b4aeea334e7912ce3d878d7f5cc6fdf1ffe4 Author: David Howells Date: Fri Apr 30 14:32:08 2010 +0100 KEYS: Fix an RCU warning in the reading of user keys Fix an RCU warning in the reading of user keys: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/user_defined.c:202 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 1 lock held by keyctl/3637: #0: (&key->sem){+++++.}, at: [] keyctl_read_key+0x9c/0xcf stack backtrace: Pid: 3637, comm: keyctl Not tainted 2.6.34-rc5-cachefs #18 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] user_read+0x47/0x91 [] keyctl_read_key+0xac/0xcf [] sys_keyctl+0x75/0xb7 [] system_call_fastpath+0x16/0x1b Signed-off-by: David Howells Acked-by: Serge Hallyn Signed-off-by: James Morris commit 68b3adb429e0abf5c0a3deb75d71671436b3af10 Author: Alex Deucher Date: Fri Apr 30 12:37:31 2010 -0400 drm/radeon/kms/legacy: only enable load detection property on DVI-I DVI-D doesn't have analog. This matches the avivo behavior. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3515387ba90ef2c38602f4d52c4d5ec5fc95ae5c Author: Alex Deucher Date: Fri Apr 30 12:00:44 2010 -0400 drm/radeon/kms: fix panel scaling adjusted mode setup This should duplicate exactly what the ddx does for both legacy and avivo. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7572e56314a7e2568f7196862222b45cfb9d6eda Merge: a66f637 d577632 Author: Linus Torvalds Date: Tue May 4 16:33:18 2010 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Avoid a gcc warning in ocfs2_wipe_inode(). ocfs2: Avoid direct write if we fall back to buffered I/O ocfs2_dlmfs: Fix math error when reading LVB. ocfs2: Update VFS inode's id info after reflink. ocfs2: potential ERR_PTR dereference on error paths ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error path ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error path ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe code ocfs2: Reset status if we want to restart file extension. ocfs2: Compute metaecc for superblocks during online resize. ocfs2: Check the owner of a lockres inside the spinlock ocfs2: one more warning fix in ocfs2_file_aio_write(), v2 ocfs2_dlmfs: User DLM_* when decoding file open flags. commit 5dfc589a8467470226feccdc50f1b32713318e7b Author: Sage Weil Date: Tue May 4 16:14:46 2010 -0700 ceph: unregister bdi before kill_anon_super releases device name Unregister and destroy the bdi in put_super, after mount is r/o, but before put_anon_super releases the device name. For symmetry, bdi_destroy in destroy_client (we bdi_init in create_client). Only set s_bdi if bdi_register succeeds, since we use it to decide whether to bdi_unregister. Signed-off-by: Sage Weil commit a66f6375bdeb64d7a56c532bda7c006358845820 Author: David Howells Date: Tue May 4 13:42:53 2010 +0100 Fix the x86_64 implementation of call_rwsem_wait() The x86_64 call_rwsem_wait() treats the active state counter part of the R/W semaphore state as being 16-bit when it's actually 32-bit (it's half of the 64-bit state). It should do "decl %edx" not "decw %dx". Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit c81406d6423416f1e18a8a41a3b7ac415fdf13d3 Merge: f5fa05d 6629dcf Author: Linus Torvalds Date: Tue May 4 15:20:37 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-core: Use per-adapter userspace device lists i2c: Fix probing of FSC hardware monitoring chips i2c-core: Erase pointer to clientdata on removal commit f5fa05d97252b23b12749a7cd02710870c0762b0 Merge: f2809d6 048c852 Author: Linus Torvalds Date: Tue May 4 15:16:15 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix resource leak in failure path of perf_event_open() commit f2809d61d6cf47c2ed2963ba3b4c59e709144ccb Merge: d93ac51 8b46f88 Author: Linus Torvalds Date: Tue May 4 15:15:43 2010 -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: rcu: Fix RCU lockdep splat on freezer_fork path rcu: Fix RCU lockdep splat in set_task_cpu on fork path mutex: Don't spin when the owner CPU is offline or other weird cases commit 15d0a873549ef0bdeaa04dacf29a3e15de886d03 Author: Marc Zyngier Date: Tue May 4 13:33:54 2010 +0200 pcmcia: fix compilation after 16bit state locking changes Commit 04de0816 (pcmcia: pcmcia_dev_present bugfix) broke the deprecated ioctl layer. Fix it by getting rid of references to unexisting fields. Signed-off-by: Marc Zyngier Reported-by: Pavel Machek Signed-off-by: Dominik Brodowski commit 43821242078aeced1d576b4b54d7b4a9bd76ec05 Author: Dominik Brodowski Date: Mon May 3 15:10:09 2010 +0200 pcmcia: order userspace suspend and resume requests Assert that userspace suspend and resume requests appearing (almost) immediately are executed in the following order: suspend, resume. This should result in "pccardctl reset" behaving the same as before. Signed-off-by: Dominik Brodowski commit ea056df7965fc46cfff28fd3808bf3ada23d5059 Author: Catalin Marinas Date: Tue May 4 17:27:43 2010 +0100 ARM: 6093/1: Fix kernel memory printing for sparsemem The show_mem() and mem_init() function are assuming that the page map is contiguous and calculates the start and end page of a bank using (map + pfn). This fails with SPARSEMEM where pfn_to_page() must be used. Tested-by: Will Deacon Tested-by: Marek Vasut Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit ad4ba375373937817404fd92239ef4cadbded23b Author: Paul E. McKenney Date: Fri Apr 23 12:26:38 2010 -0700 memcg: css_id() must be called under rcu_read_lock() This patch fixes task_in_mem_cgroup(), mem_cgroup_uncharge_swapcache(), mem_cgroup_move_swap_account(), and is_target_pte_for_mc() to protect calls to css_id(). An additional RCU lockdep splat was reported for memcg_oom_wake_function(), however, this function is not yet in mainline as of 2.6.34-rc5. Reported-by: Li Zefan Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: KAMEZAWA Hiroyuki Tested-by: Li Zefan Signed-off-by: Paul E. McKenney Cc: Andrew Morton commit 1ce7e4ff24fe338438bc7837e02780f202bf202b Author: Li Zefan Date: Fri Apr 23 10:35:52 2010 +0800 cgroup: Check task_lock in task_subsys_state() Expand task_subsys_state()'s rcu_dereference_check() to include the full locking rule as documented in Documentation/cgroups/cgroups.txt by adding a check for task->alloc_lock being held. This fixes an RCU false positive when resuming from suspend. The warning comes from freezer cgroup in cgroup_freezing_or_frozen(). Signed-off-by: Li Zefan Acked-by: Matt Helsley Signed-off-by: Paul E. McKenney commit b629317e66fb1c6066c550dded45ab85a936163c Author: Li Zefan Date: Thu Apr 22 17:30:40 2010 +0800 sched: Fix an RCU warning in print_task() With CONFIG_PROVE_RCU=y, a warning can be triggered: $ cat /proc/sched_debug ... kernel/cgroup.c:1649 invoked rcu_dereference_check() without protection! ... Both cgroup_path() and task_group() should be called with either rcu_read_lock or cgroup_mutex held. The rcu_dereference_check() does include cgroup_lock_is_held(), so we know that this lock is not held. Therefore, in a CONFIG_PREEMPT kernel, to say nothing of a CONFIG_PREEMPT_RT kernel, the original code could have ended up copying a string out of the freelist. This patch inserts RCU read-side primitives needed to prevent this scenario. Signed-off-by: Li Zefan Signed-off-by: Paul E. McKenney commit fae9c791703606636c1220e47f6690660042ce7f Author: Li Zefan Date: Thu Apr 22 17:30:00 2010 +0800 cgroup: Fix an RCU warning in alloc_css_id() With CONFIG_PROVE_RCU=y, a warning can be triggered: # mount -t cgroup -o memory xxx /mnt # mkdir /mnt/0 ... kernel/cgroup.c:4442 invoked rcu_dereference_check() without protection! ... This is a false-positive. It's safe to directly access parent_css->id. Signed-off-by: Li Zefan Signed-off-by: Paul E. McKenney commit 9a9686b634acc5cb6b7c601c171ae64af0318a24 Author: Li Zefan Date: Thu Apr 22 17:29:24 2010 +0800 cgroup: Fix an RCU warning in cgroup_path() with CONFIG_PROVE_RCU=y, a warning can be triggered: # mount -t cgroup -o debug xxx /mnt # cat /proc/$$/cgroup ... kernel/cgroup.c:1649 invoked rcu_dereference_check() without protection! ... This is a false-positive, because cgroup_path() can be called with either rcu_read_lock() held or cgroup_mutex held. Signed-off-by: Li Zefan Signed-off-by: Paul E. McKenney commit e35ec2d2c1fc45dd3e46dde74bb0c4c4366125bf Author: David Howells Date: Wed Apr 21 17:36:35 2010 +0100 KEYS: Fix an RCU warning in the reading of user keys Fix an RCU warning in the reading of user keys: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/user_defined.c:202 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 1 lock held by keyctl/3637: #0: (&key->sem){+++++.}, at: [] keyctl_read_key+0x9c/0xcf stack backtrace: Pid: 3637, comm: keyctl Not tainted 2.6.34-rc5-cachefs #18 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] user_read+0x47/0x91 [] keyctl_read_key+0xac/0xcf [] sys_keyctl+0x75/0xb7 [] system_call_fastpath+0x16/0x1b Signed-off-by: David Howells Signed-off-by: Paul E. McKenney commit bfeb0360de7713de8240cafd7ecf6058b6dbea0b Author: David Howells Date: Tue Apr 20 11:25:49 2010 +0100 KEYS: Fix an RCU warning Fix the following RCU warning: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/request_key.c:116 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 1 lock held by keyctl/5372: #0: (key_types_sem){.+.+.+}, at: [] key_type_lookup+0x1c/0x70 stack backtrace: Pid: 5372, comm: keyctl Not tainted 2.6.34-rc3-cachefs #150 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] call_sbin_request_key+0x156/0x2b6 [] ? __key_instantiate_and_link+0xb1/0xdc [] ? key_instantiate_and_link+0x42/0x5f [] ? request_key_auth_new+0x17b/0x1f3 [] ? request_key_and_link+0x271/0x400 [] ? kmem_cache_alloc+0xe1/0x118 [] request_key_and_link+0x38b/0x400 [] sys_request_key+0xf7/0x14a [] ? trace_hardirqs_on_caller+0x10c/0x130 [] ? trace_hardirqs_on_thunk+0x3a/0x3f [] system_call_fastpath+0x16/0x1b This was caused by doing: [root@andromeda ~]# keyctl newring fred @s 539196288 [root@andromeda ~]# keyctl request2 user a a 539196288 request_key: Required key not available Signed-off-by: David Howells Acked-by: Eric Dumazet Signed-off-by: Paul E. McKenney commit 6629dcff19470a894ce294d0adb9cbab94ee1fb9 Author: Jean Delvare Date: Tue May 4 11:09:28 2010 +0200 i2c-core: Use per-adapter userspace device lists Using a single list for all userspace devices leads to a dead lock on multiplexed buses in some circumstances (mux chip instantiated from userspace). This is solved by using a separate list for each bus segment. Signed-off-by: Jean Delvare Acked-by: Michael Lawnick commit b1d4b390ea4bb480e65974ce522a04022608a8df Author: Jean Delvare Date: Tue May 4 11:09:28 2010 +0200 i2c: Fix probing of FSC hardware monitoring chips Some FSC hardware monitoring chips (Syleus at least) doesn't like quick writes we typically use to probe for I2C chips. Use a regular byte read instead for the address they live at (0x73). These are the only known chips living at this address on PC systems. For clarity, this fix should not be needed for kernels 2.6.30 and later, as we started instantiating the hwmon devices explicitly based on DMI data. Still, this fix is valuable in the following two cases: * Support for recent FSC chips on older kernels. The DMI-based device instantiation is more difficult to backport than the device support itself. * Case where the DMI-based device instantiation fails, whatever the reason. We fall back to probing in that case, so it should work. This fixes kernel bug #15634: https://bugzilla.kernel.org/show_bug.cgi?id=15634 Signed-off-by: Jean Delvare Acked-by: Hans de Goede Cc: stable@kernel.org commit e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 Author: Wolfram Sang Date: Tue May 4 11:09:27 2010 +0200 i2c-core: Erase pointer to clientdata on removal After discovering that a lot of i2c-drivers leave the pointer to their clientdata dangling, it was decided to let the core handle this issue. It is assumed that the core may access the private data after remove() as there are no guarantees for the lifetime of such pointers anyhow (see thread starting at http://lkml.org/lkml/2010/3/21/68) Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 26a6931ba7656dc0ebebee615ba87db8a8e71f2b Author: Christoph Fritz Date: Sat Apr 24 21:41:05 2010 -0700 Input: joydev - allow binding to button-only devices Dance pads don't have an axis, so allow this kind of controllers to be used via legacy joystick interface. Signed-off-by: Christoph Fritz Signed-off-by: Dmitry Torokhov commit 6a7cc883d6ad95bb89282fc04e917c16d2b5584f Merge: be1066b 5c3c7e6 Author: Jens Axboe Date: Tue May 4 08:48:53 2010 +0200 Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus commit f935aa9e99d6ec74a50871c120e6b21de7256efb Author: David S. Miller Date: Mon May 3 23:42:27 2010 -0700 ipv6: Fix default multicast hops setting. As per RFC 3493 the default multicast hops setting for a socket should be "1" just like ipv4. Ironically we have a IPV6_DEFAULT_MCASTHOPS macro it just wasn't being used. Reported-by: Elliot Hughes Signed-off-by: David S. Miller commit e938fbfd4a7ac829d48b767c4dc365535d5c4f97 Author: Florian Ragwitz Date: Mon May 3 23:29:37 2010 -0700 Input: elantech - ignore high bits in the position coordinates In older versions of the elantech hardware/firmware those bits always were unset, so it didn't actually matter, but newer versions seem to use those high bits for something else, screwing up the coordinates we report to the input layer for those devices. Signed-off-by: Florian Ragwitz Signed-off-by: Dmitry Torokhov commit f81bc788ff91d4efd4baf88b2c29713838caa8e5 Author: Florian Ragwitz Date: Tue Apr 27 00:47:04 2010 -0700 Input: elantech - allow forcing Elantech protocol Apparently hardware vendors now ship elantech touchpads with different version magic. This options allows for them to be tested easier with the current driver in order to add their magic to the whitelist later. Signed-off-by: Florian Ragwitz Signed-off-by: Dmitry Torokhov commit 225c61aad38b12924b3df5f4ef43150c0d6bae8c Author: Florian Ragwitz Date: Tue Apr 27 00:45:10 2010 -0700 Input: elantech - fix firmware version check The check determining whether device should use 4- or 6-byte packets was trying to compare firmware with 2.48, but was failing on majors greater than 2. The new check ensures that versions like 4.1 are checked properly. Signed-off-by: Florian Ragwitz Signed-off-by: Dmitry Torokhov commit 5132088697fbfd1330facf723499091182f6ef91 Author: Jarod Wilson Date: Mon May 3 23:30:32 2010 -0700 Input: ati_remote - add some missing devices from lirc_atiusb The (out-of-tree) lirc_atiusb driver has a much longer list of devices it supports. Some of them look like they may just be guesses at possible device IDs, but a few are definitely confirmed devices. This adds the nVidia-branded RF receiver and the X10 Lola Wireless Video Sender device (which contains an RF receiver) to the list of devices in ati_remote. Signed-off-by: Jarod Wilson Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit b8b14c66765ccba884c5c4570bf8be361d211d95 Author: Kumar Gala Date: Mon May 3 07:36:22 2010 -0500 powerpc/swiotlb: Fix off by one in determining boundary of which ops to use When we compare the devices DMA mask to the amount of memory we need to make sure we treat the DMA mask as an address boundary. For example if the DMA_MASK(32) and we have 4G of memory we'd incorrectly set the dma ops to swiotlb. We need to add one to the dma mask when we convert it. Signed-off-by: Kumar Gala commit 1827d2e943eeb5cba0662f3e6edc342d6bd65ae6 Author: David S. Miller Date: Mon May 3 23:21:27 2010 -0700 net: ep93xx_eth stops receiving packets Receiving small packet(s) in a fast pace leads to not receiving any packets at all after some time. After ethernet packet(s) arrived the receive descriptor is incremented by the number of frames processed. If another packet arrives while processing, this is processed in another call of ep93xx_rx. This second call leads that too many receive descriptors getting released. This fix increments, even in these case, the right number of processed receive descriptors. Signed-off-by: Stefan Agner Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit d577632e65ea01fb3b124b652d7bd2381251da3c Author: Joel Becker Date: Mon May 3 19:15:49 2010 -0700 ocfs2: Avoid a gcc warning in ocfs2_wipe_inode(). gcc warns that a variable is uninitialized. It's actually handled, but an early return fools gcc. Let's just initialize the variable to a garbage value that will crash if the usage is ever broken. Signed-off-by: Joel Becker commit d93ac51c7a129db7a1431d859a3ef45a0b1f3fc5 Merge: 37e27e3 b0930f8 Author: Linus Torvalds Date: Mon May 3 16:36:19 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: remove bad auth_x kmem_cache ceph: fix lockless caps check ceph: clear dir complete, invalidate dentry on replayed rename ceph: fix direct io truncate offset ceph: discard incoming messages with bad seq # ceph: fix seq counting for skipped messages ceph: add missing #includes ceph: fix leaked spinlock during mds reconnect ceph: print more useful version info on module load ceph: fix snap realm splits ceph: clear dir complete on d_move commit d05070091849015f8c5b7d55cd75b86ebb61b3ec Author: David J. Choi Date: Thu Apr 29 06:12:41 2010 +0000 drivers/net/phy: micrel phy driver This is the first version of phy driver from Micrel Inc. Signed-off-by: David J. Choi Signed-off-by: David S. Miller commit e9162ab1610531d6ea6c1833daeb2613e44275e8 Author: Peter Korsgaard Date: Mon May 3 10:01:26 2010 +0000 dm9601: fix phy/eeprom write routine Use correct bit positions in DM_SHARED_CTRL register for writes. Michael Planes recently encountered a 'KY-RS9600 USB-LAN converter', which came with a driver CD containing a Linux driver. This driver turns out to be a copy of dm9601.c with symbols renamed and my copyright stripped. That aside, it did contain 1 functional change in dm_write_shared_word(), and after checking the datasheet the original value was indeed wrong (read versus write bits). On Michaels HW, this change bumps receive speed from ~30KB/s to ~900KB/s. On other devices the difference is less spectacular, but still significant (~30%). Reported-by: Michael Planes CC: stable@kernel.org Signed-off-by: Peter Korsgaard Signed-off-by: David S. Miller commit 5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30 Author: Lars Ellenberg Date: Sat Apr 10 02:10:09 2010 +0200 drbd: don't expose failed local READ to upper layers fix regression introduced in 8.3.3: commit a9b17323f2875f5d9b132c2b476a750bf44b10c7 Author: Lars Ellenberg Date: Wed Aug 12 15:18:33 2009 +0200 out-of-spinlock completion of master bio : (bio_rw(bio) == READA) ? read_completed_with_error : read_ahead_completed_with_error; is obviously not what was intended. No one noticed because of * page-cache at work, * local RAIDs Impact: Failed local READs are not retried remotely, but errored to upper layers, causing filesystems to remount read-only, or worse. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 19937d0482cfe194fe52e97e59aa58ec911de0d1 Author: Simon Arlott Date: Mon May 3 10:20:27 2010 +0000 ppp_generic: handle non-linear skbs when passing them to pppd Frequently when using PPPoE with an interface MTU greater than 1500, the skb is likely to be non-linear. If the skb needs to be passed to pppd then the skb data must be read correctly. The previous commit fixes an issue with accidentally sending skbs to pppd based on an invalid read of the protocol type. When that error occurred pppd was reading invalid skb data too. Signed-off-by: Simon Arlott Signed-off-by: David S. Miller commit ea8420e9f5dff7324607671f0b7ab7fbf726339d Author: Simon Arlott Date: Mon May 3 10:19:33 2010 +0000 ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid In ppp_input(), PPP_PROTO(skb) may refer to invalid data in the skb. If this happens and (proto >= 0xc000 || proto == PPP_CCPFRAG) then the packet is passed directly to pppd. This occurs frequently when using PPPoE with an interface MTU greater than 1500 because the skb is more likely to be non-linear. The next 2 bytes need to be pulled in ppp_input(). The pull of 2 bytes in ppp_receive_frame() has been removed as it is no longer required. Signed-off-by: Simon Arlott Signed-off-by: David S. Miller commit b0930f8d38c6ab76dc8222a5a910a21392d38208 Author: Sage Weil Date: Thu Apr 29 13:26:53 2010 -0700 ceph: remove bad auth_x kmem_cache It's useless, since our allocations are already a power of 2. And it was allocated per-instance (not globally), which caused a name collision when we tried to mount a second file system with auth_x enabled. Signed-off-by: Sage Weil commit 7ff899da02cb674211858fcd919f8b4511a4423f Author: Sage Weil Date: Fri Apr 23 10:25:33 2010 -0700 ceph: fix lockless caps check The __ variant requires caller to hold i_lock. Signed-off-by: Sage Weil commit ea1409f96197c1bffe5d7d5bc967b3445edcc1fa Author: Sage Weil Date: Wed Apr 28 16:12:06 2010 -0700 ceph: clear dir complete, invalidate dentry on replayed rename If a rename operation is resent to the MDS following an MDS restart, the client does not get a full reply (containing the resulting metadata) back. In that case, a ceph_rename() needs to compensate by doing anything useful that fill_inode() would have, like d_move(). It also needs to invalidate the dentry (to workaround the vfs_rename_dir() bug) and clear the dir complete flag, just like fill_trace(). Signed-off-by: Sage Weil commit 5c6a2cdb4fe8aaf6b54f022c14f13d2a12b45914 Author: Sage Weil Date: Thu Apr 22 13:48:59 2010 -0700 ceph: fix direct io truncate offset truncate_inode_pages_range wants the end offset to align with the last byte in a page. Signed-off-by: Sage Weil commit ae18756b9fa7bb93132cff06cd8575e3d46633f9 Author: Sage Weil Date: Thu Apr 22 07:47:01 2010 -0700 ceph: discard incoming messages with bad seq # We can get old message seq #'s after a tcp reconnect for stateful sessions (i.e., the MDS). If we get a higher seq #, that is an error, and we shouldn't see any bad seq #'s for stateless (mon, osd) connections. Signed-off-by: Sage Weil commit 684be25c52a1e43638ced160be0b0b46596e7f2b Author: Sage Weil Date: Wed Apr 21 20:45:59 2010 -0700 ceph: fix seq counting for skipped messages Increment in_seq even when the message is skipped for some reason. Signed-off-by: Sage Weil commit d45d0d970f495e04a4e4f46acd74e90f4a4564f9 Author: Sage Weil Date: Tue Apr 20 15:20:33 2010 -0700 ceph: add missing #includes Signed-off-by: Sage Weil commit 0b0c06d1476290cea248923c0ee7be9fd61cacea Author: Sage Weil Date: Tue Apr 20 10:27:13 2010 -0700 ceph: fix leaked spinlock during mds reconnect Signed-off-by: Sage Weil commit c8f16584ac85444d51d8753c5df502350cfc7bb7 Author: Sage Weil Date: Mon Apr 19 13:50:26 2010 -0700 ceph: print more useful version info on module load Decouple the client version from the server side. Print relevant protocol and map version info instead. Signed-off-by: Sage Weil commit 91dee39eebcfb47085c4d457a584b0e9723b6ca0 Author: Sage Weil Date: Mon Apr 19 10:15:44 2010 -0700 ceph: fix snap realm splits The snap realm split was checking i_snap_realm, not the list_head, to determine if an inode belonged in the new realm. The check always failed, which meant we always moved the inode, corrupting the old realm's list and causing various crashes. Also wait to release old realm reference to avoid possibility of use after free. Signed-off-by: Sage Weil commit c10f5e12bafde7f7a2f9b75d76f7a68d62154e91 Author: Sage Weil Date: Fri Apr 16 12:56:11 2010 -0700 ceph: clear dir complete on d_move d_move() reorders the d_subdirs list, breaking the readdir result caching. Unless/until d_move preserves that ordering, clear CEPH_I_COMPLETE on rename. Signed-off-by: Sage Weil commit fddb33f2e8872fa4857dd29f0b71a523c9ed5577 Author: Antonio Ospite Date: Mon May 3 17:19:03 2010 +0200 HID: sony: fix sony_set_operational_bt Don't send the report type as part of the data, this prevents the controller from going into the operational state at all. This is completely equivalent to what the code originally meant to accomplish: as per in net/bluetooth/hidp/core.c::hidp_output_raw_report(), by using HID_FEATURE_REPORT here, what will be actually sent is (HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE) which is exactly 0x53. Signed-off-by: Antonio Ospite Signed-off-by: Bastien Nocera Signed-off-by: Jiri Kosina commit 37e27e36bc416b07d853d493e6818d6a785507a2 Merge: 973bec3 d557f65 Author: Linus Torvalds Date: Mon May 3 07:54:08 2010 -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: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string. commit 973bec34bfc1bc2465646181653d67f767d418c8 Author: Ryusuke Konishi Date: Mon May 3 21:00:48 2010 +0900 nilfs2: fix sync silent failure As of 32a88aa1, __sync_filesystem() will return 0 if s_bdi is not set. And nilfs does not set s_bdi anywhere. I noticed this problem by the warning introduced by the recent commit 5129a469 ("Catch filesystem lacking s_bdi"). WARNING: at fs/super.c:959 vfs_kern_mount+0xc5/0x14e() Hardware name: PowerEdge 2850 Modules linked in: nilfs2 loop tpm_tis tpm tpm_bios video shpchp pci_hotplug output dcdbas Pid: 3773, comm: mount.nilfs2 Not tainted 2.6.34-rc6-debug #38 Call Trace: [] warn_slowpath_common+0x60/0x90 [] warn_slowpath_null+0xd/0x10 [] vfs_kern_mount+0xc5/0x14e [] do_kern_mount+0x32/0xbd [] do_mount+0x671/0x6d0 [] ? __get_free_pages+0x1f/0x21 [] ? copy_mount_options+0x2b/0xe2 [] ? strndup_user+0x48/0x67 [] sys_mount+0x61/0x8f [] sysenter_do_call+0x12/0x32 This ensures to set s_bdi for nilfs and fixes the sync silent failure. Signed-off-by: Ryusuke Konishi Acked-by: Jens Axboe Signed-off-by: Linus Torvalds commit ed7e2ca24bfff5c7a09de8a05c536f68560b34fb Author: Rafi Rubin Date: Mon May 3 05:08:30 2010 -0400 HID: ntrig: Remove unused macro, TripleTap and QuadTap Removing the higher number taps. Their usage was incorrect and even if correct they should not be used for a touch screen. _MT_ events should be used to communicate multiple fingers. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 250d377522fd81459a4ea2350a794b453f37ce7d Author: Rafi Rubin Date: Mon May 3 05:08:29 2010 -0400 HID: ntrig: TipSwitch for single touch mode touch. Include TipSwitch in the touch detection decision for some single touch firmwares. Confidence and InRange are high for all finger events including those used to indicate the finger is no longer in contact with the sensor. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit b810e94c9d8e3fff6741b66cd5a6f099a7887871 Author: Mark Langsdorf Date: Wed Mar 31 21:56:45 2010 +0200 powernow-k8: Fix frequency reporting With F10, model 10, all valid frequencies are in the ACPI _PST table. Cc: # 33.x 32.x Signed-off-by: Mark Langsdorf LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org> Signed-off-by: Borislav Petkov Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit cc83b08fc791045ac197e6f4a030599bcd7100c5 Author: Dominik Brodowski Date: Thu Apr 29 15:56:25 2010 +0200 pcmcia: avoid pccard_validate_cis failure in resume callpath If the PCMCIA CIS changed before a resume event (e.g. due to a card exchange while being suspended, possibly also during a call to "pccardctl reset"), also set the function count to zero so that the subsequent call to pccard_validate_cis() does not fail. Signed-off-by: Dominik Brodowski commit ab92e74f799a1cbc6b3c9bf90ed05403689ddecc Merge: ea5ce65 17807f9 Author: Russell King Date: Mon May 3 11:52:23 2010 +0100 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 commit d557f651b3617b46ed18d5bac48a851df1dbf684 Author: Wim Van Sebroeck Date: Mon May 3 08:58:56 2010 +0000 watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string. The WATCHDOG_TIMEOUT macro does not exist. The default timeout value is WDT_TIMEOUT. Fix the MODULE_PARM_DESC so that the code can compile again. reported-by: Randy Dunlap Signed-off-by: Wim Van Sebroeck commit 56f0e74c9cf98941af700b61466648a2d06277bb Author: Ingo Molnar Date: Mon May 3 09:19:43 2010 +0200 x86: Fix parse_reservetop() build failure on certain configs Commit e67a807 ("x86: Fix 'reservetop=' functionality") added a fixup_early_ioremap() call to parse_reservetop() and declared it in io.h. But asm/io.h was only included indirectly - and on some configs not at all, causing a build failure on those configs. Cc: Liang Li Cc: Konrad Rzeszutek Wilk Cc: Yinghai Lu Cc: Jeremy Fitzhardinge Cc: Wang Chen Cc: "H. Peter Anvin" Cc: Andrew Morton LKML-Reference: <1272621711-8683-1-git-send-email-liang.li@windriver.com> Signed-off-by: Ingo Molnar commit 1183f3838c588545592c042c0ce15015661ce7f2 Author: Jan Engelhardt Date: Sun May 2 13:42:39 2010 -0700 net: fix compile error due to double return type in SOCK_DEBUG Fix this one: include/net/sock.h: error: two or more data types in declaration specifiers Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 5447ed6c968e7270b656afa273c2b79d15d82edd Author: Douglas Gilbert Date: Sun Apr 25 12:30:23 2010 +0200 [SCSI] scsi_debug: virtual_gb ignores sector_size In the scsi_debug driver, the virtual_gb option ignores the sector_size, implicitly assuming that is 512 bytes. So if 'virtual_gb=1 sector_size=4096' the result is an 8 GB (virtual) disk. Signed-off-by: Douglas Gilbert Cc: Stable Tree Signed-off-by: James Bottomley commit 96b1f96dcab87756c0a1e7ba76bc5dc2add82b88 Author: Mike Christie Date: Sat Apr 24 16:21:19 2010 -0500 [SCSI] libiscsi: regression: fix header digest errors This fixes a regression introduced with this commit: commit d3305f3407fa3e9452079ec6cc8379067456e4aa Author: Mike Christie Date: Thu Aug 20 15:10:58 2009 -0500 [SCSI] libiscsi: don't increment cmdsn if cmd is not sent in 2.6.32. When I moved the hdr->cmdsn after init_task, I added a bug when header digests are used. The problem is that the LLD may calculate the header digest in init_task, so if we then set the cmdsn after the init_task call we change what the digest will be calculated by the target. Signed-off-by: Mike Christie Cc: Stable Tree Signed-off-by: James Bottomley commit 6f1464bf65fcaa57a4b32dae93de4e8bbdfaf7c5 Author: Elina Pasheva Date: Wed Apr 28 13:28:24 2010 +0000 net/usb: initiate sync sequence in sierra_net.c driver The following patch adds the initiation of the sync sequence to "sierra_net_bind()". If this step is omitted, the modem will never sync up with the host and it will not be possible to establish a data connection. Signed-off-by: Elina Pasheva Signed-off-by: Rory Filer Tested-by: Elina Pasheva Signed-off-by: David S. Miller commit 70b25f890ce9f0520c64075ce9225a5b020a513e Author: Tejun Heo Date: Thu Apr 15 09:00:08 2010 +0900 [SCSI] fix locking around blk_abort_request() blk_abort_request() expects queue lock to be held by the caller. Grab it before calling the function. Lack of this synchronization led to infinite loop on corrupt q->timeout_list. Signed-off-by: Tejun Heo Cc: stable@kernel.org Signed-off-by: James Bottomley commit 17d2c0a0c4d4e074f0a2a5c0090ff6d88f5e1d44 Author: David Howells Date: Sat May 1 12:37:18 2010 -0400 NFS: Fix RCU issues in the NFSv4 delegation code Fix a number of RCU issues in the NFSv4 delegation code. (1) delegation->cred doesn't need to be RCU protected as it's essentially an invariant refcounted structure. By the time we get to nfs_free_delegation(), the delegation is being released, so no one else should be attempting to use the saved credentials, and they can be cleared. However, since the list of delegations could still be under traversal at this point by such as nfs_client_return_marked_delegations(), the cred should be released in nfs_do_free_delegation() rather than in nfs_free_delegation(). Simply using rcu_assign_pointer() to clear it is insufficient as that doesn't stop the cred from being destroyed, and nor does calling put_rpccred() after call_rcu(), given that the latter is asynchronous. (2) nfs_detach_delegation_locked() and nfs_inode_set_delegation() should use rcu_derefence_protected() because they can only be called if nfs_client::cl_lock is held, and that guards against anyone changing nfsi->delegation under it. Furthermore, the barrier imposed by rcu_dereference() is superfluous, given that the spin_lock() is also a barrier. (3) nfs_detach_delegation_locked() is now passed a pointer to the nfs_client struct so that it can issue lockdep advice based on clp->cl_lock for (2). (4) nfs_inode_return_delegation_noreclaim() and nfs_inode_return_delegation() should use rcu_access_pointer() outside the spinlocked region as they merely examine the pointer and don't follow it, thus rendering unnecessary the need to impose a partial ordering over the one item of interest. These result in an RCU warning like the following: [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- fs/nfs/delegation.c:332 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by mount.nfs4/2281: #0: (&type->s_umount_key#34){+.+...}, at: [] deactivate_super+0x60/0x80 #1: (iprune_sem){+.+...}, at: [] invalidate_inodes+0x39/0x13a stack backtrace: Pid: 2281, comm: mount.nfs4 Not tainted 2.6.34-rc1-cachefs #110 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] nfs_inode_return_delegation_noreclaim+0x5b/0xa0 [nfs] [] nfs4_clear_inode+0x11/0x1e [nfs] [] clear_inode+0x9e/0xf8 [] dispose_list+0x67/0x10e [] invalidate_inodes+0x11c/0x13a [] generic_shutdown_super+0x42/0xf4 [] kill_anon_super+0x11/0x4f [] nfs4_kill_super+0x3f/0x72 [nfs] [] deactivate_super+0x68/0x80 [] mntput_no_expire+0xbb/0xf8 [] release_mounts+0x9a/0xb0 [] put_mnt_ns+0x6a/0x79 [] nfs_follow_remote_path+0x5a/0x146 [nfs] [] ? nfs_do_root_mount+0x82/0x95 [nfs] [] nfs4_try_mount+0x75/0xaf [nfs] [] nfs4_get_sb+0x291/0x31a [nfs] [] vfs_kern_mount+0xb8/0x177 [] do_kern_mount+0x48/0xe8 [] do_mount+0x782/0x7f9 [] sys_mount+0x83/0xbe [] system_call_fastpath+0x16/0x1b Also on: fs/nfs/delegation.c:215 invoked rcu_dereference_check() without protection! [] lockdep_rcu_dereference+0xaa/0xb2 [] nfs_inode_set_delegation+0xfe/0x219 [nfs] [] nfs4_opendata_to_nfs4_state+0x2c2/0x30d [nfs] [] nfs4_do_open+0x2a6/0x3a6 [nfs] ... And: fs/nfs/delegation.c:40 invoked rcu_dereference_check() without protection! [] lockdep_rcu_dereference+0xaa/0xb2 [] nfs_free_delegation+0x3d/0x6e [nfs] [] nfs_do_return_delegation+0x26/0x30 [nfs] [] __nfs_inode_return_delegation+0x1ef/0x1fe [nfs] [] nfs_client_return_marked_delegations+0xc9/0x124 [nfs] ... Signed-off-by: David Howells Signed-off-by: Paul E. McKenney Signed-off-by: Trond Myklebust commit 8f649c376254755f2261a693b3d48d09126218dc Author: Trond Myklebust Date: Sat May 1 12:36:18 2010 -0400 NFSv4: Fix the locking in nfs_inode_reclaim_delegation() Ensure that we correctly rcu-dereference the delegation itself, and that we protect against removal while we're changing the contents. Signed-off-by: Trond Myklebust Signed-off-by: David Howells Signed-off-by: Paul E. McKenney commit 9a908c1aa4d3898f62e2cb8af6936b16503ab3e6 Author: Herton Ronaldo Krzesinski Date: Tue Mar 30 13:35:38 2010 -0300 [SCSI] advansys: fix narrow board error path Error handling on advansys_board_found is fixed, because it's buggy in the case we have an ASC_NARROW_BOARD set and failure happens on AscInitAsc1000Driver step: it was freeing items of wrong struct in the dvc_var union of struct asc_board, which could lead to an oops in the case we set some of the fields in struct of narrow board as code was choosing to always freeing wide board fields, and not everything was being freed/released properly. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: James Bottomley commit 048c852051d2bd5da54a4488bc1f16b0fc74c695 Author: Tejun Heo Date: Sat May 1 10:11:35 2010 +0200 perf: Fix resource leak in failure path of perf_event_open() perf_event_open() kfrees event after init failure which doesn't release all resources allocated by perf_event_alloc(). Use free_event() instead. Signed-off-by: Tejun Heo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: LKML-Reference: <4BDBE237.1040809@kernel.org> Signed-off-by: Ingo Molnar commit ea5ce655b90f5debb7b9768284eaafcca218ddef Author: Andrew Morton Date: Tue Apr 27 14:09:12 2010 -0700 arch/arm/include/asm/elf.h: forward-declare the task-struct iop32x_defconfig: In file included from include/linux/elf.h:7, from kernel/elfcore.c:1: arch/arm/include/asm/elf.h:101: warning: "struct task_struct" declared inside parameter list arch/arm/include/asm/elf.h:101: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Andrew Morton Signed-off-by: Russell King commit d54690fec751aad3907b512e8eba0de11e250f87 Author: Julia Lawall Date: Tue Apr 27 14:09:11 2010 -0700 arch/arm/plat-pxa/dma.c: correct NULL test Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,y; statement S; @@ x = \(kmalloc\|kcalloc\|kzalloc\)(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // Signed-off-by: Julia Lawall Cc: Eric Miao Signed-off-by: Andrew Morton Signed-off-by: Russell King commit e5992c05ffaa405cd291aa9fbca042ad47d53632 Author: Dmitry Artamonow Date: Fri Apr 30 21:31:36 2010 +0100 ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver Just to make sure that this driver won't run on StrongArm SA1100 when both SA1100 and SA1110 cpufreq drivers are built in (usually in multimachine config). SA1100 driver already has similar check. Signed-off-by: Dmitry Artamonow Acked-by: Eric Miao Acked-by: Kristoffer Ericson Signed-off-by: Russell King commit d2ae1587b8283e58e18b31f7764592f462edaf31 Author: Dmitry Artamonow Date: Fri Apr 30 21:28:45 2010 +0100 ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600 They have StrongARM SA1110, not SA1100. Signed-off-by: Dmitry Artamonow Acked-by: Eric Miao Acked-by: Kristoffer Ericson Signed-off-by: Russell King commit 99a0099a8441d734580df7df07ab8dcfbf84e916 Author: Russell King Date: Sat May 1 10:36:43 2010 +0100 ARM: Update mach-types Signed-off-by: Russell King commit 13ea9cc82138691856d7cd855dff9aef1479adb9 Author: Santosh Shilimkar Date: Fri Apr 30 06:51:20 2010 +0100 ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002 This patch fixes the preempt leak in the cpuidle path invoked from cpu-hotplug. The fix is suggested by Russell King and is based on x86 idea of calling init_idle() on the idle task when it's re-used which also resets the preempt count amongst other things dump: BUG: scheduling while atomic: swapper/0/0x00000002 Modules linked in: Backtrace: [] (dump_backtrace+0x0/0x110) from [] (dump_stack+0x18/0x1c) r7:c02149e4 r6:c033df00 r5:c7836000 r4:00000000 [] (dump_stack+0x0/0x1c) from [] (__schedule_bug+0x60/0x70) [] (__schedule_bug+0x0/0x70) from [] (schedule+0x98/0x7b8) r5:c7836000 r4:c7836000 [] (schedule+0x0/0x7b8) from [] (cpu_idle+0xb4/0xd4) # [] (cpu_idle+0x0/0xd4) from [] (secondary_start_kernel+0xe0/0xf0) r5:c7836000 r4:c0205f40 [] (secondary_start_kernel+0x0/0xf0) from [] (prm_rmw_mod_reg_bits+0x88/0xa4) r7:c02149e4 r6:00000001 r5:00000001 r4:c7836000 Backtrace aborted due to bad frame pointer Cc: Catalin Marinas Signed-off-by: Santosh Shilimkar Signed-off-by: Russell King commit 124efc27a7090d4aaab68b28f7e7a5137f4ecec9 Author: Santosh Shilimkar Date: Fri Apr 30 10:45:46 2010 +0100 ARM: 6068/1: Fix build break with KPROBES enabled With CONFIG_KPROBES enabled two section are getting created which leads to below build break. LOG: AS arch/arm/kernel/entry-armv.o arch/arm/kernel/entry-armv.S: Assembler messages: arch/arm/kernel/entry-armv.S:431: Error: symbol ret_from_exception is in a different section arch/arm/kernel/entry-armv.S:490: Error: symbol ret_from_exception is in a different section arch/arm/kernel/entry-armv.S:491: Error: symbol __und_usr_unknown is in a different section This was introduced by commit 4260415f6a3b92c5c986398d96c314df37a4ccbf Reported-by: Anand Gadiyar Signed-off-by: Santosh Shilimkar Signed-off-by: Russell King commit 2fdc45c7c4c283bc6882de20d2d887dc3bfdd899 Author: Elina Pasheva Date: Fri Apr 30 19:05:28 2010 -0700 net/usb: remove default in Kconfig for sierra_net driver The following patch removes the default from the Kconfig entry for sierra_net driver as recommended. Signed-off-by: Elina Pasheva Signed-off-by: Rory Filer Signed-off-by: David S. Miller commit 6c3b9d3458a8272f1e4c6aed9e8325136f6380f9 Author: Eric Dumazet Date: Fri Apr 30 16:20:39 2010 -0700 r8169: Fix rtl8169_rx_interrupt() In case a reset is performed, rtl8169_rx_interrupt() is called from process context instead of softirq context. Special care must be taken to call appropriate network core services (netif_rx() instead of netif_receive_skb()). VLAN handling also corrected. Reported-by: Sergey Senozhatsky Tested-by: Sergey Senozhatsky Diagnosed-by: Oleg Nesterov Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 96ff56419504ac6a610ff1af42330e0423242e16 Author: Johannes Berg Date: Fri Apr 30 14:42:15 2010 -0700 iwlwifi: work around passive scan issue Some firmware versions don't behave properly when passive scanning is requested on radar channels without enabling active scanning on receiving a good frame. Work around that issue by asking the firmware to only enable the active scanning after receiving a huge number of good frames, a number that can never be reached during our dwell time. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit bbd391a15d82e14efe9d69ba64cadb855b061dba Author: Prarit Bhargava Date: Tue Apr 27 11:24:42 2010 -0400 x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests Upstream PV guests fail to boot because of a NULL pointer in irq_force_complete_move(). It is possible that xen guests have irq_desc->chip_data = NULL. Test for NULL chip_data pointer before attempting to complete an irq move. Signed-off-by: Prarit Bhargava LKML-Reference: <20100427152434.16193.49104.sendpatchset@prarit.bos.redhat.com> Acked-by: Suresh Siddha Signed-off-by: H. Peter Anvin Cc: [2.6.33] commit 6b933c8e6f1a2f3118082c455eef25f9b1ac7b45 Author: Li Dongyang Date: Sat Apr 17 17:49:10 2010 +0800 ocfs2: Avoid direct write if we fall back to buffered I/O when we fall back to buffered write from direct write, we call __generic_file_aio_write() but that will end up doing direct write even we are only prepared to do buffered write because the file has the O_DIRECT flag set. This is a fix for https://bugzilla.novell.com/show_bug.cgi?id=591039 revised with Joel's comments. Signed-off-by: Li Dongyang Acked-by: Mark Fasheh Signed-off-by: Joel Becker commit f9221fd80343285514568da6c5dbda0f87109de8 Merge: a36d515 a9743fc Author: Joel Becker Date: Fri Apr 30 13:37:29 2010 -0700 Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes commit 54413b825ca502b9384edabf972c512c29d64010 Merge: be1066b 64fc74f Author: Linus Torvalds Date: Fri Apr 30 13:04:14 2010 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (27 commits) MIPS: Loongson 2F: Fix of problems introduced by -mfix-loongson2f-jump MIPS: Loongson-2F: Use CONFIG_CPU_JUMP_WORKAROUNDS to control workarounds. MIPS: Loongson 2F: Enable fixups of the latest binutils MIPS: Loongson: Add CPU_LOONGSON2F_WORKAROUNDS MIPS: Kconfig: Make Broadcom SoC support naming consistent MIPS: BCM63xx: Update defconfig MIPS: oprofile: Fix breakage when CONFIG_OPROFILE=m STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware. NET: mdio-octeon: Enable the hardware before using it. I2C: Fix section mismatch errors in i2c-octeon.c MIPS: Loongson: Fix LOONGSON_ADDRWIN_CFG macro. MIPS: Loongson: Fix phys_mem_access_prot() check MIPS: Loongson: Fix find_vga_mem_init() MIPS: Loongson: Fix typo in gdium mach type string. MIPS: Use CKSEG1ADDR for uncached handler MIPS: Check for accesses beyond the end of the PGD. MIPS: Use uasm_i_ds{r,l}l_safe() instead of uasm_i_ds{r,l}l() in tlbex.c MIPS: Add uasm_i_dsrl_safe() and uasm_i_dsll_safe() to uasm. MIPS: die() does not call die notifier chain MIPS: Swarm, Littlesur: Enable PATA platform driver. ... commit 6c9ae016a8e2aff931391d3baa9ce6cb0ffa633c Merge: 0c75ba2 0250ece Author: David S. Miller Date: Fri Apr 30 12:54:15 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 64fc74f5f6055e8470208a7d9cfc8d3994fff34d Author: Wu Zhangjin Date: Sat Apr 10 20:07:13 2010 +0800 MIPS: Loongson 2F: Fix of problems introduced by -mfix-loongson2f-jump The -mfix-loongson2f-jump option provided by latest CVS binutils have fixed the out-of-order issue of Loongson-2F described in chapter 15 of the Loongson2F User Manual [1, 2], but introduced some problems. The option changes all of the jump target to "addr & 0xcfffffff" through the at($1) register, but for the reboot address of Loongson 2F 0xbfc00000 this is wrong. Avoids the problem via telling the assembler to not use the $at register. [1] Loongson2F User Manual (Chinese Version) http://www.loongson.cn/uploadfile/file/200808211 [2] English Version of Chapter 15: http://groups.google.com.hk/group/loongson-dev/msg/e0d2e220958f10a6?dmode=source Reported-and-tested-by: Liu Shiwei Signed-off-by: Wu Zhangjin Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1109/ Signed-off-by: Ralf Baechle commit b197b6286650feb9c991826519065aac6f4399b1 Author: Wu Zhangjin Date: Sat Apr 10 20:07:01 2010 +0800 MIPS: Loongson-2F: Use CONFIG_CPU_JUMP_WORKAROUNDS to control workarounds. Signed-off-by: Wu Zhangjin Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1106/ Signed-off-by: Ralf Baechle commit 8bbda428e90a2b638428fbb07abd80b9cb624a27 Author: Wu Zhangjin Date: Sat Apr 10 20:05:01 2010 +0800 MIPS: Loongson 2F: Enable fixups of the latest binutils With the "Fixups of Loongson2F" patch [1] having been applied to binutils for binutils 2.20.1 we now can use it's time to enable the options provided by the patch to compile the kernel. Without these fixups, the system may hang if the erratum is triggered. For more information on these fixups please refer to the following references. [1] "Fixups of Loongson2F" patch for binutils(actually for gas) http://sourceware.org/ml/binutils/2009-11/msg00387.html [2] Chapter 15 of "Loongson2F User Manual"(Chinese Version) http://www.loongson.cn/uploadfile/file/200808211 [3] Chapter 15 of the English version Loongson 2F User Manual http://groups.google.com.hk/group/loongson-dev/msg/e0d2e220958f10a6?dmode=source Signed-off-by: Zhang Le Signed-off-by: Wu Zhangjin Cc: Zhang Le Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1106/ Signed-off-by: Ralf Baechle commit 622844bf0b4cfa4f76d4a0ddc44266938385f5ab Author: Wu Zhangjin Date: Sat Apr 10 20:04:42 2010 +0800 MIPS: Loongson: Add CPU_LOONGSON2F_WORKAROUNDS As documented in the Loongson 2F User Manual [2, 3], the old Loongson2F series (2F01 / 2F02) have the NOP & JUMP issues which requires workarounds in the kernel and binutils. This issue has been rectified in Loongson 2F series 2F03 so no workarounds needed. Now that the workarounds [1] adding the the -mfix-loongson2f-nop and -mfix-loongson2f-jump options have been comitted to the binutils the CVS repository), we can add the workarounds in the kernel. The workarounds have no significant side effect on the system but may decrease performance so we control them through a a new CPU_LOONGSON2F_WORKAROUNDS config option allowing the users to only enable it as necessary. [1] "Fixups of Loongson2F" patch for binutils(actually for gas) http://sourceware.org/ml/binutils/2009-11/msg00387.html [2] Chapter 15 of "Loongson2F User Manual"(Chinese Version) http://www.loongson.cn/uploadfile/file/200808211 [3] English Version of the above chapter 15 http://groups.google.com.hk/group/loongson-dev/msg/e0d2e220958f10a6?dmode=source Signed-off-by: Wu Zhangjin Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1105/ Signed-off-by: Ralf Baechle commit c619366e36aa75beaaee630f3d6e468422ed9530 Author: Florian Fainelli Date: Thu Mar 25 11:42:41 2010 +0100 MIPS: Kconfig: Make Broadcom SoC support naming consistent Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1082/ Signed-off-by: Ralf Baechle commit a9af5a01cadc25a058ee1dfd3bd8abd8724a3ed8 Author: Florian Fainelli Date: Thu Mar 25 11:42:22 2010 +0100 MIPS: BCM63xx: Update defconfig the defconfig was out-of-sync since 2.6.30-rc6, update it with the new symbols and enable BCM6338, 6345, wireless, b43 driver and LEDs support. Signed-off-by: Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1081/ Signed-off-by: Ralf Baechle commit 922010ff7b75737e6dc361f8eae9c2784ac1872d Author: Wu Zhangjin Date: Mon Apr 26 20:01:54 2010 +0800 MIPS: oprofile: Fix breakage when CONFIG_OPROFILE=m When the oprofile is compiled as a module do_IRQ() is not called in arch/mips/loongson/lemote-2f/irq.c due to a wrong #ifdef there. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1143/ Signed-off-by: Ralf Baechle commit 9dd147467790932e2f630b67eec925745463ee11 Author: David Daney Date: Thu Apr 1 18:17:55 2010 -0700 STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/1091/ Acked-by: David S. Miller Acked-by: Greg Kroah-Hartman Signed-off-by: Ralf Baechle commit 6c17812d622a74950e2cd65f368f0518491cca61 Author: David Daney Date: Thu Apr 1 18:17:54 2010 -0700 NET: mdio-octeon: Enable the hardware before using it. In some cases the mdio bus is not enabled at the time of probing. This prevents anything from working, so we will enable it before trying to use it, and disable it when the driver is removed. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/1090/ Acked-by: David S. Miller Acked-by: Greg Kroah-Hartman Signed-off-by: Ralf Baechle commit 20f12160607c09e299a3e93c7bf4d75e8801c9b7 Author: David Daney Date: Mon Mar 8 11:04:21 2010 -0800 I2C: Fix section mismatch errors in i2c-octeon.c Signed-off-by: David Daney To: linux-i2c@vger.kernel.org To: ben-linux@fluff.org To: khali@linux-fr.org Cc: linux-mips@linux-mips.org Cc: rade.bozic.ext@nsn.com Patchwork: http://patchwork.linux-mips.org/patch/1037/ Signed-off-by: Ralf Baechle commit 94c26c9a66a35d4da3ab200864d1afd14c91fb71 Author: Arnaud Patard Date: Thu Apr 29 11:58:51 2010 +0200 MIPS: Loongson: Fix LOONGSON_ADDRWIN_CFG macro. There's a typo in the LOONGSON_ADDRWIN_CFG macro. The cpu window mmap register address should contain the destination parameters not the source one. This has not been noticed because the code is only using source = destination. Signed-off-by: Arnaud Patard To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1162/ Signed-off-by: Ralf Baechle commit 514b6d0c06a5d751259f145d9593b4d084c1cce3 Author: Arnaud Patard Date: Thu Apr 29 11:58:49 2010 +0200 MIPS: Loongson: Fix phys_mem_access_prot() check The check used to determine if uncached accelerated should be used or not is wrong. The parenthesis are misplaced and making the test fail. Signed-off-by: Arnaud Patard To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1161/ Signed-off-by: Ralf Baechle commit ff40ad72addb448c1285181820597a17685ee69a Author: Richard LIU Date: Thu Apr 29 11:58:47 2010 +0200 MIPS: Loongson: Fix find_vga_mem_init() This allows to use all display device for instance DISPLAY_OTHER like SM501. Signed-off-by: Arnaud Patard To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1160/ Signed-off-by: Ralf Baechle commit 1c6d541c23a92c1b74c9dc62b453f3ac5923fbe1 Author: Arnaud Patard Date: Thu Apr 29 11:58:46 2010 +0200 MIPS: Loongson: Fix typo in gdium mach type string. It's not "gidum" but "gdium". Signed-off-by: Arnaud Patard Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1159/ Signed-off-by: Ralf Baechle commit 4f81b01a30ffb338068d611e27da18c08db55464 Author: Sebastian Andrzej Siewior Date: Tue Apr 27 22:53:30 2010 +0200 MIPS: Use CKSEG1ADDR for uncached handler "MIPS: Calculate proper ebase value for 64-bit kernels" 9af43ea080dd5d6c7b34f38261780e5dd43537bc (lmo) rsp. f6be75d03c8870be91e6e2a195648ece04b6bb16 (kernel.org) broke some 64-bit MIPS systems. Before this we were using XKPHYS/cached as ebase and computed the uncached xphsys/unchached address for that area. After that commit ebase became a 32-bit compat address and convert does not work anymore. We now should use CKSEG1 for this. CKSEG1ADDR does just that in 32-bit and 64-bit. Signed-off-by: Sebastian Andrzej Siewior To: Ralf Baechle Patchwork: http://patchwork.linux-mips.org/patch/1149/ Signed-off-by: Ralf Baechle commit 1ec56329ff939aba29291c0dec1a28ceed660162 Author: David Daney Date: Wed Apr 28 12:16:18 2010 -0700 MIPS: Check for accesses beyond the end of the PGD. For some combinations of PAGE_SIZE and vmbits, it is possible to have userspace access that are beyond what is covered by the PGD, but within vmbits. Such an access would cause the TLB refill handler to load garbage values for PMD and PTE potentially giving userspace access to parts of the physical address space to which it is not entitled. In the TLB refill hot path, we add a single dsrl instruction so we can check if any bits outside of the range covered by the PGD are set. In the vmalloc side we then separate the bad case from the normal vmalloc case and call tlb_do_page_fault_0 if warranted. This slows us down a bit, but has the benefit of yielding deterministic behavior. [Ralf: Fixed build error for 32-bit kernels.] [Ralf: Folded lmo commit c8c0e22b2aa3982852b44279638ef37f9aa31b7d into this commit.] Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1152/ Signed-off-by: Ralf Baechle --- commit 3be6022c27ace1e3b4ba963e7ffd2e3b60cecd8a Author: David Daney Date: Wed Apr 28 12:16:17 2010 -0700 MIPS: Use uasm_i_ds{r,l}l_safe() instead of uasm_i_ds{r,l}l() in tlbex.c This makes the code somewhat cleaner while reducing the risk of shift amount overflows when various page table related options are changed. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1154/ Signed-off-by: Ralf Baechle commit 26b9e547e90db6b8b409084a9d4501124ff492b3 Author: David Daney Date: Wed Apr 28 12:16:16 2010 -0700 MIPS: Add uasm_i_dsrl_safe() and uasm_i_dsll_safe() to uasm. This allows us to clean up the code by not having to explicitly code checks for shift amounts greater than 32. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1153/ Signed-off-by: Ralf Baechle commit ce384d83d00ee457c3931d3fdb9fa2c38e345a3c Author: Yury Polyanskiy Date: Mon Apr 26 00:53:10 2010 -0400 MIPS: die() does not call die notifier chain The MIPS implementation of die() forgets to call notify_die() and thus notifiers registered via register_die_notifier() are not called. This results in kgdb not being activated on exceptions. The only subtlety is that notify_die declares its regs argument w/o const, so the const had to be removed from mips die() as well. [Ralf: Fixed build error for SGI IP22 and IP28 platforms.] Signed-off-by: Yury Polyanskiy Cc: linux-mips@linux-mips.org Patchworks: http://patchwork.linux-mips.org/patch/1142/ Acked-by: Jason Wessel Signed-off-by: Ralf Baechle --- commit fcf3ca4c3d6d911df8ee2b8f010ffe504d3aef71 Author: Sebastian Andrzej Siewior Date: Sun Apr 18 15:26:36 2010 +0200 MIPS: Swarm, Littlesur: Enable PATA platform driver. According to include/asm/sibyte/swarm.h both systems provide a platform device for the ide controler. Until now the IDE subsystem was used which is deprecated by now. The same structure can be used with the PATA driver. Signed-off-by: Sebastian Andrzej Siewior Cc: tbm@cyrius.com Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1127/ Signed-off-by: Ralf Baechle commit 0000a5390184af1459e82506fcfa7db96f3e6d33 Author: Manuel Lauss Date: Wed Apr 21 17:41:59 2010 +0200 MIPS: DB1200: PCMCIA card detection must not be auto-enabled. Same issues as SD card detection: One of both is always triggering and the handlers take care to shut it up and enable the other. To avoid messages about "unbalanced interrupt enable/disable" they must not be automatically enabled when initally requested. This was not an issue with the db1200_defconfig due to fortunate timings; on a build without network chip support the warnings appear. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1133/ Signed-off-by: Ralf Baechle commit 0dfeecacd8e4405209f217944818b90016bb4a9d Author: Sebastian Andrzej Siewior Date: Wed Apr 21 20:57:08 2010 +0200 MIPS: SB1250: Include correct header and fix a warning | arch/mips/pci/pci-sb1250.c: In function sb1250_pcibios_init: | arch/mips/pci/pci-sb1250.c:257: warning: assignment makes integer from pointer without a cast | arch/mips/pci/pci-sb1250.c:285: error: MAX_NR_CONSOLES undeclared (first use in this function) | arch/mips/pci/pci-sb1250.c:285: error: (Each undeclared identifier is reported only once | arch/mips/pci/pci-sb1250.c:285: error: for each function it appears in.) Signed-off-by: Sebastian Andrzej Siewior Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1136/ Signed-off-by: Ralf Baechle commit b20947aaa0026efd7355ae4bf70b56a13a3f98b1 Author: Sebastian Andrzej Siewior Date: Wed Apr 21 22:36:47 2010 +0200 MIPS: Fixup screen_info struct initializations |arch/mips/sibyte/swarm/setup.c:153: | warning: large integer implicitly truncated to unsigned type The field was changed in d9b26352 aka ("x86, setup: Store the boot cursor state"). This patch changes the values back they way they were before this extra field got introduced. While here, the other two boards are also converted to C99 initializer. Signed-off-by: Sebastian Andrzej Siewior Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1137/ Signed-off-by: Ralf Baechle commit 9eed4124c0d56d39b06224765c65eaa35f580edf Author: Ralf Baechle Date: Wed Apr 21 11:39:07 2010 +0100 MIPS: cmpxchg.h: Fix excessive indentation. Signed-off-by: Ralf Baechle commit c8f3cc0b65af00be5f84c6d4ee45007643322713 Author: David Daney Date: Mon Apr 19 11:43:10 2010 -0700 MIPS: Don't vmap things at address zero. In the 64-bit kernel we use swapper_pg_dir for three different things. 1) xuseg mappings for kernel threads. 2) vmap mappings for all kernel-space accesses in xkseg. 3) vmap mappings for kernel modules in ksseg (kseg2). Due to how the TLB refill handlers work, any mapping established in xkseg or ksseg will also establish a xuseg mapping that should never be used by the kernel. In order to be able to use exceptions to trap NULL pointer dereferences, we need to ensure that nothing is mapped at address zero. Since vmap mappings in xkseg are reflected in xuseg, this means we need to ensure that there are no vmap mappings established at the start of xkseg. So we move back VMALLOC_START to avoid establishing vmap mappings at the start of xkseg. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1129/ Signed-off-by: Ralf Baechle commit b0b4ce38a535ed3de5ec6fdd4f3c34435a1c1d1e Author: Geert Uytterhoeven Date: Thu Apr 8 20:52:00 2010 +0200 MIPS: TXx9: Add missing MODULE_ALIAS definitions for TXx9 platform devices This enables autoloading of the TXx9 sound driver on RBTX4927. Signed-off-by: Geert Uytterhoeven To: Atsushi Nemoto Cc: Linux MIPS Mailing List Patchwork: http://patchwork.linux-mips.org/patch/1101/ Signed-off-by: Ralf Baechle commit 7270be03bc300f67c0b9eccde730937e802892b6 Author: Ralf Baechle Date: Fri Apr 30 20:10:41 2010 +0100 MIPS: PNX8550: Fix build error, broken by: commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 Author: Tejun Heo Date: Wed Mar 24 17:04:11 2010 +0900 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h Since a while the few headers included don't drag in anymore, thus no more prototype of printk() resulting in: CC arch/mips/nxp/pnx8550/common/reset.o /home/ralf/src/linux/upstream-linus/arch/mips/nxp/pnx8550/common/reset.c: In function 'pnx8550_machine_restart': /home/ralf/src/linux/upstream-linus/arch/mips/nxp/pnx8550/common/reset.c:31: error: implicit declaration of function 'printk' /home/ralf/src/linux/upstream-linus/arch/mips/nxp/pnx8550/common/reset.c:33: error: 'NULL' undeclared (first use in this function) /home/ralf/src/linux/upstream-linus/arch/mips/nxp/pnx8550/common/reset.c:33: error: (Each undeclared identifier is reported only once /home/ralf/src/linux/upstream-linus/arch/mips/nxp/pnx8550/common/reset.c:33: error: for each function it appears in.) make[3]: *** [arch/mips/nxp/pnx8550/common/reset.o] Error 1 Fixed by including Signed-off-by: Ralf Baechle commit 0c75ba22541ccea88e89782373991109a7ec2a54 Author: Anton Blanchard Date: Wed Apr 28 21:46:06 2010 +0000 e1000e: Fix oops caused by ASPM patch. Commit 6f461f6c7c961f0b1b73c0f27becf472a0ac606b ("e1000e: enable/disable ASPM L0s and L1 and ERT according to hardware errata") oopses on one of my ppc64 boxes with a NULL pointer (0x4a): Unable to handle kernel paging request for data at address 0x0000004a Faulting instruction address: 0xc0000000004d2f1c cpu 0xe: Vector: 300 (Data Access) at [c000000bec1833a0] pc: c0000000004d2f1c: .e1000e_disable_aspm+0xe0/0x150 lr: c0000000004d2f0c: .e1000e_disable_aspm+0xd0/0x150 dar: 4a [c000000bec1836d0] c00000000069b9d8 .e1000_probe+0x84/0xe8c [c000000bec1837b0] c000000000386d90 .local_pci_probe+0x4c/0x68 [c000000bec183840] c0000000003872ac .pci_device_probe+0xfc/0x148 [c000000bec183900] c000000000409e8c .driver_probe_device+0xe4/0x1d0 [c000000bec1839a0] c00000000040a024 .__driver_attach+0xac/0xf4 [c000000bec183a40] c000000000409124 .bus_for_each_dev+0x9c/0x10c [c000000bec183b00] c000000000409c1c .driver_attach+0x40/0x60 [c000000bec183b90] c0000000004085dc .bus_add_driver+0x150/0x328 [c000000bec183c40] c00000000040a58c .driver_register+0x100/0x1c4 [c000000bec183cf0] c00000000038764c .__pci_register_driver+0x78/0x128 Seems like pdev->bus->self == NULL. I haven't touched pci in a long time so I'm trying to remember what this means (no pcie bridge perhaps?) The patch below fixes the oops for me. Signed-off-by: Anton Blanchard Reviewed-by: Bruce Allan Signed-off-by: David S. Miller commit be1066bbcd443a65df312fdecea7e4959adedb45 Merge: 87156d6 4839737 Author: Linus Torvalds Date: Fri Apr 30 10:16:55 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: vme: Re-introduce necessary brackets Staging: iio: fix up the iio_get_new_idr_val comment Staging: add Add Sitecom WL-349 to rtl8192su Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id staging: rtl8192su: add Support for Belkin F5D8053 v6 Staging: dt3155: fix 50Hz configuration staging: usbip: Fix deadlock Staging: rtl8192su: add USB ID for 0bda:8171 Staging: hv: name network device ethX rather than sethX Staging: hv: Fix up memory leak on HvCleanup Staging: hv: Fix a bug affecting IPv6 staging: iio: ring_sw: Fix incorrect test on successful read of last value, causes infinite loop staging: iio: Function iio_get_new_idr_val() return negative value if fails. Staging: iio: adc: fix dangling pointers Staging: iio: light: fix dangling pointers Staging: iio: test for failed allocation staging: iio: lis3l02dq - incorrect ws used in container of call. commit 87156d692afdc4c689e99380a263445217a4b76c Merge: e4049eb c61fae9 Author: Linus Torvalds Date: Fri Apr 30 10:16:42 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: drivers/serial/pmac_zilog.c: add missing unlock serial: 8250_pnp - add Fujitsu Wacom device tty: Fix regressions in the char driver conversion commit e4049eb8527668a6c7f97b944970b81d1316d5b0 Merge: 35d824b 8a3461e Author: Linus Torvalds Date: Fri Apr 30 10:16:11 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits) USB: sl811-hcd: Fix device disconnect USB: ohci-at91: fix power management hanging USB: rename usb_buffer_alloc() and usb_buffer_free() USB: ti_usb: fix printk format warning USB: gadget: s3c-hsotg: Add missing unlock USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set USB: oxu210hp: release spinlock on error path USB: serial: option: add cinterion device id USB: serial: option: ZTEAC8710 Support with Device ID 0xffff USB: serial: pl2303: Hybrid reader Uniform HCR331 USB: option: add ID for ZTE MF 330 USB: xhci: properly set endpoint context fields for periodic eps. USB: xhci: properly set the "Mult" field of the endpoint context. USB: OHCI: don't look at the root hub to get the number of ports USB: don't choose configs with no interfaces USB: cdc-acm: add another device quirk USB: fix testing the wrong variable in fs_create_by_name() usb: Fix tusb6010 for DMA API musb_core: fix musb_init_controller() error cleanup path MUSB: fix DaVinci glue layer dependency ... commit 35d824b28fc5544d1eb7c1e3db15a1740df8ec4b Author: Borislav Petkov Date: Fri Apr 30 15:19:02 2010 +0200 edac, mce: Fix wrong mask and macro usage Correct two mishaps which prevented reporting error type (CECC vs UECC) and extended error description. Cc: # 32.x, 33.x Signed-off-by: Borislav Petkov Signed-off-by: Linus Torvalds commit 12b1b321689cf92236fb216472744e39419fab30 Author: Ralf Baechle Date: Mon Mar 8 20:51:03 2010 +0100 Inotify: Fix build failure in inotify user support CONFIG_INOTIFY_USER defined but CONFIG_ANON_INODES undefined will result in the following build failure: LD vmlinux fs/built-in.o: In function 'sys_inotify_init1': (.text.sys_inotify_init1+0x22c): undefined reference to 'anon_inode_getfd' fs/built-in.o: In function `sys_inotify_init1': (.text.sys_inotify_init1+0x22c): relocation truncated to fit: R_MIPS_26 against 'anon_inode_getfd' make[2]: *** [vmlinux] Error 1 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 Signed-off-by: Ralf Baechle Cc: Al Viro Signed-off-by: Linus Torvalds commit 8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8 Merge: 66f41d4 95b1ed2 Author: Linus Torvalds Date: Fri Apr 30 09:57:55 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: spi: spidev_test gives error upon 1-byte transfer omap2_mcspi: small fixes of output data format omap2_mcspi: Flush posted writes spi: spi_device memory should be released instead of device. spi: release device claimed by bus_find_device_by_name of: check for IS_ERR() serial/mpc52xx_uart: Drop outdated comments gpio: potential null dereference commit 4839737b3b6af2a9b3b960584f08177fbc9bf118 Author: Martyn Welch Date: Mon Mar 22 14:58:43 2010 +0000 Staging: vme: Re-introduce necessary brackets Somehow I managed to remove a set of rather necessary brackets in commit 29848ac9f3b33bf171439ae2d66d40e6a71446c4. Put them back. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit f3cdc28520a059feb8b5001655f01536ab1e0167 Author: Andrew Morton Date: Tue Apr 27 11:29:54 2010 -0700 Staging: iio: fix up the iio_get_new_idr_val comment improve the comment a bit Cc: Greg KH Cc: Jonathan Cameron Cc: Sonic Zhang Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 64a5a09218626464be35e0229d85b2ab0fcf03fd Author: Rodrigo Linfati Date: Wed Apr 28 22:32:13 2010 +0200 Staging: add Add Sitecom WL-349 to rtl8192su Add usb id of Sitecom WL-349 to rtl8192su Signed-off-by: Rodrigo Linfati Signed-off-by: Greg Kroah-Hartman commit 12840c63b0679f7fab88ea1cc26b52db8b574ce7 Author: Chris Largret Date: Wed Mar 3 05:24:26 2010 -0600 Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id Add Belkin F5D8055 Wireless-N USB support to the rt2870 staging driver. Signed-off-by: Chris Largret Signed-off-by: Greg Kroah-Hartman commit d615da093eb0f691a73a754589e2a4a24a6f1ca7 Author: Richard Airlie Date: Mon Apr 5 22:22:46 2010 +0100 staging: rtl8192su: add Support for Belkin F5D8053 v6 Please find attached a patch which adds the device ID for the Belkin F5D8053 v6 to the rtl8192su driver. I've tested this in 2.6.34-rc3 (Ubuntu 9.10 amd64) and the network adapter is working flawlessly. Signed-off-by: Richard Airlie Signed-off-by: Greg Kroah-Hartman commit 6536560cabab170ed2969b005bf69a496e9c45bf Author: H Hartley Sweeten Date: Wed Apr 14 18:29:17 2010 -0500 Staging: dt3155: fix 50Hz configuration According to the header file, dt3155_io.h, the 50/60 Hz configuration is controlled by a bit in the I2C CSR2 register (bit 2). The function dt3155_init_isr actually reads the I2C CONFIG register into the global I2C_CSR union variable then modifies the bit. It then does a write to the I2C CONFIG register with the global I2C_CONFIG union variable which is not even set with a value anywhere in the driver. My guess is 50Hz operation doesn't even work as-is. Fix this by actually reading and writing the correct register with the correct value. Signed-off-by: H Hartley Sweeten Cc: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d01f42a22ef381ba973958e977209ac9a8667d57 Author: Eric Lescouet Date: Sat Apr 24 02:55:24 2010 +0200 staging: usbip: Fix deadlock When detaching a port from the client side (usbip --detach 0), the event thread, on the server side, is going to deadlock. The "eh" server thread is getting USBIP_EH_RESET event and calls: -> stub_device_reset() -> usb_reset_device() the USB framework is then calling back _in the same "eh" thread_ : -> stub_disconnect() -> usbip_stop_eh() -> wait_for_completion() the "eh" thread is being asleep forever, waiting for its own completion. This patch checks if "eh" is the current thread, in usbip_stop_eh(). Signed-off-by: Eric Lescouet Cc: stable Signed-off-by: Greg Kroah-Hartman commit c0087580b8d414f6874cfe93d2653212842fcb44 Author: Pavel Roskin Date: Tue Mar 9 23:11:07 2010 -0500 Staging: rtl8192su: add USB ID for 0bda:8171 Signed-off-by: Pavel Roskin Signed-off-by: Greg Kroah-Hartman commit 546d9e101e7a71e6202f47a13ddcd9b8fb05a52e Author: Stephen Hemminger Date: Thu Mar 11 09:11:37 2010 -0800 Staging: hv: name network device ethX rather than sethX This patch makes the HyperV network device use the same naming scheme as other virtual drivers (Xen, KVM). In an ideal world, userspace tools would not care what the name is, but some users and applications do care. Vyatta CLI is one of the tools that does depend on what the name is. Signed-off-by: Stephen Hemminger Cc: Hank Janssen Cc: stable Signed-off-by: Greg Kroah-Hartman commit fa8ad0257ea256381126ecf447694622216c600f Author: Cyrill Gorcunov Date: Mon Apr 5 20:56:57 2010 +0400 Staging: hv: Fix up memory leak on HvCleanup Don't assign NULL too early Signed-off-by: Cyrill Gorcunov Cc: Hank Janssen Cc: Haiyang Zhang Cc: stable Signed-off-by: Greg Kroah-Hartman commit 95beae90aa4afce57fb28e6f8238b78217bd7c98 Author: Haiyang Zhang Date: Mon Apr 19 15:32:11 2010 +0000 Staging: hv: Fix a bug affecting IPv6 Fix a bug affecting IPv6 Added the multicast flag for proper IPv6 function. Reported-by: Toshikazu Sakai Signed-off-by: Hank Janssen Signed-off-by: Haiyang Zhang Cc: stable Signed-off-by: Greg Kroah-Hartman commit 4845187b39b79e3c1d4474c2767ddc7fb493eb05 Author: Jonathan Cameron Date: Tue Mar 30 17:45:04 2010 +0100 staging: iio: ring_sw: Fix incorrect test on successful read of last value, causes infinite loop This is a bad one. The test means that almost no reads of the last value ever succeed! Result is an infinite loop. Another one for the 'oops' category. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit a8947fcf3bbeda9fc6ff1205e51f8ff1b0128cc4 Author: Sonic Zhang Date: Mon Mar 22 12:27:05 2010 +0000 staging: iio: Function iio_get_new_idr_val() return negative value if fails. Function iio_get_new_idr_val() return negative value if fails. So, only error when ret < 0 in iio_device_register_eventset(). Signed-off-by: Sonic Zhang Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit ee58cb2bcda99ae934176ad5ae66f7699d23cd3d Author: Wolfram Sang Date: Sat Mar 20 15:13:02 2010 +0100 Staging: iio: adc: fix dangling pointers Fix I2C-drivers which missed setting clientdata to NULL before freeing the structure it points to. Also fix drivers which do this _after_ the structure was freed already. Signed-off-by: Wolfram Sang Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit b36fc07dc3c742bd704c59d85c8cf12585a00e41 Author: Wolfram Sang Date: Sat Mar 20 15:13:03 2010 +0100 Staging: iio: light: fix dangling pointers Fix I2C-drivers which missed setting clientdata to NULL before freeing the structure it points to. Also fix drivers which do this _after_ the structure was freed already. Signed-off-by: Wolfram Sang Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit ef6d4f54cca5962127b47ee8a355611aafedd526 Author: Dan Carpenter Date: Tue Mar 16 13:03:49 2010 +0300 Staging: iio: test for failed allocation We should return test to see if iio_allocate_trigger() fails and return -ENOMEM. Signed-off-by: Dan Carpenter Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0b64c38b71d6e2c1049c75bb1d885031008700c1 Author: Jonathan Cameron Date: Thu Mar 11 17:29:48 2010 +0000 staging: iio: lis3l02dq - incorrect ws used in container of call. The word oops comes to mind. Original patch to merge the two work queues in here (prior to Greg taking them into staging) changed the top half to only use one of them and the bottom half to assume it was the other. Currently causes a NULL pointer dereference if you enable any of the events on an lis3l02dq. Just goes to show I need a few more regression tests. Signed-of-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 8a3461e2cdb719ae4796feb70054f1597005af28 Author: Michael Hennerich Date: Wed Apr 28 17:31:36 2010 -0400 USB: sl811-hcd: Fix device disconnect A while ago I provided a patch that fixed device detection after device removal (USB: sl811-hcd: Fix device disconnect). Chris Brissette pointed out that the detection/removal counter method to distinguish insert or remove my fail under certain conditions. Latest SL811HS datasheet (Document 38-08008 Rev. *D) indicates that bit 6 (SL11H_INTMASK_RD) of the Interrupt Status Register together with bit 5 (SL11H_INTMASK_INSRMV) can be used to determine whether a device has been inserted or removed. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 869aa98c1d6a03dd2078f8f8257a0bcc343cb8b9 Author: Patrice Vilchez Date: Wed Apr 28 13:45:40 2010 +0200 USB: ohci-at91: fix power management hanging A hanging has been detected in ohci-at91 while going in suspend to ram. This is due to asynchronous operations between ohci reset and ohci clocks shutdown. This patch adds the reading of the control register between the reset of the ohci and clocks stop. This "flush the writes" idea was taken from ohci-hcd.c file (ohci_shutdown() function). Signed-off-by: Patrice Vilchez Signed-off-by: Nicolas Ferre Signed-off-by: Greg Kroah-Hartman commit 073900a28d95c75a706bf40ebf092ea048c7b236 Author: Daniel Mack Date: Mon Apr 12 13:17:25 2010 +0200 USB: rename usb_buffer_alloc() and usb_buffer_free() For more clearance what the functions actually do, usb_buffer_alloc() is renamed to usb_alloc_coherent() usb_buffer_free() is renamed to usb_free_coherent() They should only be used in code which really needs DMA coherency. [added compatibility macros so we can convert things easier - gregkh] Signed-off-by: Daniel Mack Cc: Alan Stern Cc: Pedro Ribeiro Signed-off-by: Greg Kroah-Hartman commit 75181f386f9a80ed6f87763ac6cf05826e253ccd Author: Randy Dunlap Date: Thu Apr 15 11:38:56 2010 -0700 USB: ti_usb: fix printk format warning Fix printk format warning in usbserial/ti_usb: drivers/usb/serial/ti_usb_3410_5052.c:1738: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 19c190f9e0fe926db28122a804111a7538dc3498 Author: Julia Lawall Date: Mon Mar 29 17:36:44 2010 +0200 USB: gadget: s3c-hsotg: Add missing unlock In an error handling case the lock is not unlocked. The return is converted to a goto, to share the unlock at the end of the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irqsave (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 6d602610099632a9a15ef6d2bc9fd7b7d6aeb63e Author: Anand Gadiyar Date: Mon Mar 29 16:54:51 2010 +0530 USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set With patch as1329 (USB: convert to the runtime PM framework), we make USB_SUSPEND depend on PM_RUNTIME instead of CONFIG_PM. Also, CONFIG_USB_OTG selects CONFIG_USB_SUSPEND. If PM_RUNTIME is not enabled, and we try to enable USB_OTG, we will end up with CONFIG_USB_SUSPEND selected. This is due to a known bug with the select statement. This makes the build break on various OMAP configs (which have CONFIG_USB_OTG set by default, but do not yet have CONFIG_PM_RUNTIME enabled). Avoid this by changing the logic for CONFIG_USB_OTG from "select USB_SUSPEND" to "depends on USB_SUSPEND" Signed-off-by: Anand Gadiyar CC: Michal Marek CC: Tony Lindgren CC: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 82a5eeb9f486366ad1b6c3be2e0d328ca185aa7e Author: Dan Carpenter Date: Mon Mar 29 12:01:27 2010 +0300 USB: oxu210hp: release spinlock on error path Smatch complained about this missing spinlock. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 6f44bcb60bfa58590142545096b64f44144f0bc1 Author: Greg Kroah-Hartman Date: Tue Apr 27 09:38:51 2010 -0700 USB: serial: option: add cinterion device id This adds a device id for a Cinterion device. Reported-by: John Race Signed-off-by: Greg Kroah-Hartman commit fe30bc1b16dcfbbadf3f77bbad1c9014b23704cd Author: Mahesh Kuruganti Date: Mon Apr 12 22:37:02 2010 +0530 USB: serial: option: ZTEAC8710 Support with Device ID 0xffff PATCH TO EXTEND SUPPORT TO AC8710 WITH 0xFFFF Product ID. Signed-off-by: Mahesh Kuruganti Signed-off-by: Greg Kroah-Hartman commit 18344a1cd5889d48dac67229fcf024ed300030d5 Author: Simone Contini Date: Mon Apr 12 23:25:10 2010 +0200 USB: serial: pl2303: Hybrid reader Uniform HCR331 I tried a magnetic stripe reader (http://www.kimaldi.com/kimaldi_eng/productos/lectores_de_tarjetas/lectores_tarjeta_chip_y_dni/lector_hibrido_uniform_hcr_331) and I see that it is interfaced with a PL2303. I wrote a patch to use your driver which simply adds the product ID for the device and it seems working fine. From: Simone Contini Signed-off-by: Greg Kroah-Hartman commit a559d2c8c1bf652ea2d0ecd6ab4a250fcdb37db8 Author: Dominik Brodowski Date: Wed Apr 14 21:36:42 2010 +0200 USB: option: add ID for ZTE MF 330 Based on the information provided for by Paweł Drobek, add a second vendor ID and the correct product ID for ZTE MF 330. Reported-by: Paweł Drobek Signed-off: Dominik Brodowski Signed-off-by: Greg Kroah-Hartman commit 9238f25d5d32a435277eb234ec82bacdd5daed41 Author: Sarah Sharp Date: Fri Apr 16 08:07:27 2010 -0700 USB: xhci: properly set endpoint context fields for periodic eps. For periodic endpoints, we must let the xHCI hardware know the maximum payload an endpoint can transfer in one service interval. The xHCI specification refers to this as the Maximum Endpoint Service Interval Time Payload (Max ESIT Payload). This is used by the hardware for bandwidth management and scheduling of packets. For SuperSpeed endpoints, the maximum is calculated by multiplying the max packet size by the number of bursts and the number of opportunities to transfer within a service interval (the Mult field of the SuperSpeed Endpoint companion descriptor). Devices advertise this in the wBytesPerInterval field of their SuperSpeed Endpoint Companion Descriptor. For high speed devices, this is taken by multiplying the max packet size by the "number of additional transaction opportunities per microframe" (the high bits of the wMaxPacketSize field in the endpoint descriptor). For FS/LS devices, this is just the max packet size. The other thing we must set in the endpoint context is the Average TRB Length. This is supposed to be the average of the total bytes in the transfer descriptor (TD), divided by the number of transfer request blocks (TRBs) it takes to describe the TD. This gives the host controller an indication of whether the driver will be enqueuing a scatter gather list with many entries comprised of small buffers, or one contiguous buffer. It also takes into account the number of extra TRBs you need for every TD. This includes No-op TRBs and Link TRBs used to link ring segments together. Some drivers may choose to chain an Event Data TRB on the end of every TD, thus increasing the average number of TRBs per TD. The Linux xHCI driver does not use Event Data TRBs. In theory, if there was an API to allow drivers to state what their bandwidth requirements are, we could set this field accurately. For now, we set it to the same number as the Max ESIT payload. The Average TRB Length should also be set for bulk and control endpoints, but I have no idea how to guess what it should be. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1cf62246c0e394021e494e0a8f1013e80db1a1a9 Author: Sarah Sharp Date: Fri Apr 16 08:07:04 2010 -0700 USB: xhci: properly set the "Mult" field of the endpoint context. A SuperSpeed interrupt or isochronous endpoint can define the number of "burst transactions" it can handle in a service interval. This is indicated by the "Mult" bits in the bmAttributes of the SuperSpeed Endpoint Companion Descriptor. For example, if it has a max packet size of 1024, a max burst of 11, and a mult of 3, the host may send 33 1024-byte packets in one service interval. We must tell the xHCI host controller the number of multiple service opportunities (mults) the device can handle when the endpoint is installed. We do that by setting the Mult field of the Endpoint Context before a configure endpoint command is sent down. The Mult field is invalid for control or bulk SuperSpeed endpoints. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit fcf7d2141f4a363a4a8454c4a0f26bb69e766c5f Author: Alan Stern Date: Tue Apr 20 10:37:57 2010 -0400 USB: OHCI: don't look at the root hub to get the number of ports This patch (as1371) fixes a small bug in ohci-hcd. The HCD already knows how many ports the controller has; there's no need to go looking at the root hub's usb_device structure to find out. Especially since the root hub's maxchild value is set correctly only while the root hub is bound to the hub driver. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 62f9cfa3ece58268b3e92ca59c23b175f86205aa Author: Alan Stern Date: Tue Apr 20 10:40:59 2010 -0400 USB: don't choose configs with no interfaces This patch (as1372) fixes a bug in the routine that chooses the default configuration to install when a new USB device is detected. The algorithm is supposed to look for a config whose first interface is for a non-vendor-specific class. But the way it's currently written, it will also accept a config with no interfaces at all, which is not very useful. (Believe it or not, such things do exist.) Signed-off-by: Alan Stern Tested-by: Andrew Victor Cc: stable Signed-off-by: Greg Kroah-Hartman commit c3baa19b0a9b711b02cec81d9fea33b7b9628957 Author: Russ Nelson Date: Wed Apr 21 23:07:03 2010 -0400 USB: cdc-acm: add another device quirk The Maretron USB100 needs this quirk in order to work properly. Signed-off-by: Russ Nelson Signed-off-by: Greg Kroah-Hartman commit fa7fe7af146a7b613e36a311eefbbfb5555325d1 Author: Dan Carpenter Date: Thu Apr 22 12:00:52 2010 +0200 USB: fix testing the wrong variable in fs_create_by_name() There is a typo here. We should be testing "*dentry" which was just assigned instead of "dentry". This could result in dereferencing an ERR_PTR inside either usbfs_mkdir() or usbfs_create(). Signed-off-by: Dan Carpenter Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1d0f11b39728099100a768cab2d7a90389017e75 Author: Tony Lindgren Date: Fri Apr 23 17:41:15 2010 -0700 usb: Fix tusb6010 for DMA API Commit 18eabe2347ae7a11b3db768695913724166dfb0e introduced DMA buffer ownership. Fix tusb6010 accordingly. To compile, also dummy musb_platform_save and restore functions need to be added. Also change the order of musb_read_fifo() to happen after dma_cache_maint to have the DMA operations completed before moving the remaining unaligned bytes with PIO. The DMA access and PIO touch different areas of the FIFO, so this change only makes the code a bit easier to follow. Tested on n810 and g_ether with variable size ping test. The test seems to fail for some ping sizes, but that seems to be a different problem. Signed-off-by: Tony Lindgren Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 34e2beb2c883e0ea1b6135ad6f7713f7574a01aa Author: Sergei Shtylyov Date: Thu Mar 25 13:14:33 2010 +0200 musb_core: fix musb_init_controller() error cleanup path This function forgets to call usb_remove_hcd() or musb_gadget_cleanup() iff sysfs_create_group() fails. [ felipe.balbi@nokia.com : review the entire error path not only when we fail hcd or gadget ] Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c6a39eec9dcd5f205fd41a5c87a1f3e5d95ffaaa Author: Sergei Shtylyov Date: Thu Mar 25 13:14:24 2010 +0200 MUSB: fix DaVinci glue layer dependency CONFIG_ARCH_DAVINCI now embraces both the "real" DaVinci and DA8xx/OMAP-L1x -- on which the DaVinci glue layer won't work. Change the Makefile dependency to CONFIG_ARCH_DAVINCI_DMx which corresponds to "real" DaVinci. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 461972d8a4c94bc44f11a13046041c78a7cf18dd Author: Sergei Shtylyov Date: Thu Mar 25 13:14:32 2010 +0200 musb_core: don't call musb_platform_exit() twice musb_platform_exit() is called twice from musb_init_controller() iff controller initialization fails. Move the call (and the DevCtl register writes surrounding it) from musb_free() to musb_remove(). Fix mispalced and now incorrect 'goto's in musb_init_controller(). Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 7917a9df73c13822cc830f0ead0fb1b44a930616 Author: Sergei Shtylyov Date: Thu Mar 25 13:14:31 2010 +0200 MUSB: OMAP: don't call clk_put() Remove duplicate/unbalanced call to clk_put() from musb_platform_exit() -- clk_put() gets called from musb_core.c anyway... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 13962c747915e4d7ef4cf92c36bd06a7fe648f0b Author: Sergei Shtylyov Date: Thu Mar 25 13:14:30 2010 +0200 MUSB: DaVinci: fix musb_platform_init() error cleanup path This function forgets to call clk_disable() iff reading the USB module version register returns 0. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 3d0bfbf25957e04354389047f0e6ba520d58487c Author: Sergei Shtylyov Date: Thu Mar 25 13:14:29 2010 +0200 musb_core: don't prevent disabling clock on driver unload Resetting 'musb->clock' to NULL in musb_shutdown() prevents musb_platform_exit() from properly disabling the clock when unloading the driver -- don't do it. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 1fb48f4a96ef3d4eee0a13b92a3e8489171b47c9 Author: Sergei Shtylyov Date: Thu Mar 25 13:14:28 2010 +0200 musb_core: don't touch 'musb->clock' in musb_free() Remove duplicate/unbalanced calls to clk_disable()/clk_put() in musb_free(): - clk_disable() is called by musb_platform_exit() just prior to this call; - clk_put() is called by the callers of musb_free() prior to calling it... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 714bc5ef3edaec3ca0cf155fe01411760527c52e Author: Dan Carpenter Date: Thu Mar 25 13:14:27 2010 +0200 musb: potential use after free We assign "urb->hcpriv = qh;" a few lines down. I'm pretty sure we want it "urb->hcpriv" to be NULL not a freed value. Signed-off-by: Dan Carpenter Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 5e0e61afa5b342c0197fce2d4fd2a2b515e96b31 Author: Ajay Kumar Gupta Date: Thu Mar 25 13:14:26 2010 +0200 musb: save and restore missing bus control register Added the missing BUS_CONTROL register in musb save/restore routines. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 2f831751c5a0511fec6a9074643d9914eedabc83 Author: Sergei Shtylyov Date: Thu Mar 25 13:14:25 2010 +0200 MUSB: Blackfin: don't fake blackfin_interrupt() result Commit a5073b52833e4df8e16c93dc4cbb7e0c558c74a2 (musb_gadget: fix unhandled endpoint 0 IRQs) misses this change to blackfin.c: stop faking successful result of blackfin_interrupt() and emitting a debug message on an unhandled interrupt. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 1e753451eb1dc97ab8bdad3ae5278301e5b981bf Author: Ajay Kumar Gupta Date: Thu Mar 25 13:14:23 2010 +0200 musb: fix power field to hold all possible values MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus the 'power' field has to hold values above 255. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c61fae964a5ee04c4e4a01caecaf778c2e26e589 Author: Julia Lawall Date: Tue Apr 27 14:05:20 2010 -0700 serial: drivers/serial/pmac_zilog.c: add missing unlock In an error handling case the lock is not unlocked. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irqsave (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d9901660b53b92f0f3551c06588b8be38224b245 Author: Ping Cheng Date: Mon Mar 22 13:40:29 2010 -0700 serial: 8250_pnp - add Fujitsu Wacom device Add Fujitsu Wacom 1FGT Tablet PC device Signed-off-by: Ping Cheng Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a2d1e3516c80027b2da17fb0b7ccd36f0ac33aa7 Author: Alan Cox Date: Fri Apr 23 16:01:18 2010 +0100 tty: Fix regressions in the char driver conversion This forgot to update a field in the old char drivers. The fact nobody has basically noticed (except one mxser user) rather suggests most of these drivers could go into the bitbucket. Signed-off-by: Alan Cox Cc: Jiri Slaby Cc: Dan Carpenter Cc: Andreas Pretzsch Signed-off-by: Greg Kroah-Hartman commit e67a807f3d9a82fa91817871f1c0e2e04da993b8 Author: Liang Li Date: Fri Apr 30 18:01:51 2010 +0800 x86: Fix 'reservetop=' functionality When specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a early_ioremap bug that relates to commit 8827247ff. The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init(). But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified. The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly. Changelog since v0: -v1: When reservetop being handled then FIXADDR_TOP get adjusted, Hence check prev_map then re-initialize slot_virt and PMD based on new FIXADDR_TOP. -v2: place fixup_early_ioremap hence call early_ioremap_init in reserve_top_address to re-initialize slot_virt and corresponding PMD when parse_reservertop -v3: move fixup_early_ioremap out of reserve_top_address to make sure other clients of reserve_top_address like xen/lguest won't broken Signed-off-by: Liang Li Tested-by: Konrad Rzeszutek Wilk Acked-by: Yinghai Lu Acked-by: Jeremy Fitzhardinge Cc: Wang Chen Cc: "H. Peter Anvin" Cc: Andrew Morton LKML-Reference: <1272621711-8683-1-git-send-email-liang.li@windriver.com> [ fixed three small cleanliness details in fixup_early_ioremap() ] Signed-off-by: Ingo Molnar commit 8b46f880841aac821af8efa6581bb0e46b8b9845 Author: Paul E. McKenney Date: Wed Apr 21 13:02:08 2010 -0700 rcu: Fix RCU lockdep splat on freezer_fork path Add an RCU read-side critical section to suppress this false positive. Located-by: Eric Paris Signed-off-by: Paul E. McKenney Acked-by: Li Zefan Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <1271880131-3951-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 8b08ca52f5942c21564bbb90ccfb61053f2c26a1 Author: Peter Zijlstra Date: Wed Apr 21 13:02:07 2010 -0700 rcu: Fix RCU lockdep splat in set_task_cpu on fork path Add an RCU read-side critical section to suppress this false positive. Located-by: Eric Paris Signed-off-by: Peter Zijlstra Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <1271880131-3951-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 47dd5be2d6a82b8153e059a1d09eb3879d485bfd Author: Oleg Nesterov Date: Fri Apr 30 07:23:51 2010 +0200 workqueue: flush_delayed_work: keep the original workqueue for re-queueing flush_delayed_work() always uses keventd_wq for re-queueing, but it should use the workqueue this dwork was queued on. Signed-off-by: Oleg Nesterov Signed-off-by: Tejun Heo commit 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 Author: Linus Torvalds Date: Thu Apr 29 20:02:05 2010 -0700 Linux 2.6.34-rc6 commit b18262eda36e1f340e3c29a8da9a36b3452621f9 Merge: e97e712 56151e7 Author: Linus Torvalds Date: Thu Apr 29 20:01:42 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kgdb: don't needlessly skip PAGE_USER test for Fsl booke commit e97e7120eb24800cf8eb62c7da07b161cc2a8c73 Merge: fed0a9c 9bf729c Author: Linus Torvalds Date: Thu Apr 29 19:49:34 2010 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: add a shrinker to background inode reclaim commit 56151e753468e34aeb322af4b0309ab727c97d2e Author: Wufei Date: Wed Apr 28 17:42:32 2010 -0400 kgdb: don't needlessly skip PAGE_USER test for Fsl booke The bypassing of this test is a leftover from 2.4 vintage kernels, and is no longer appropriate, or even used by KGDB. Currently KGDB uses probe_kernel_write() for all access to memory via the KGDB core, so it can simply be deleted. This fixes CVE-2010-1446. CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Kumar Gala Signed-off-by: Wufei Signed-off-by: Jason Wessel commit fed0a9c644c7872f5bcaeb87a71103aef8e96761 Merge: 6bec119 3c2023d Author: Linus Torvalds Date: Thu Apr 29 17:18:07 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: exofs: Fix "add bdi backing to mount session" fall out fs: fs/super.c needs to include backing-dev.h for !CONFIG_BLOCK commit 6bec11921a7d7b11d0b1909596636632aece5a26 Merge: 553cbf0 db7e1bc Author: Linus Torvalds Date: Thu Apr 29 17:17:35 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working. ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB ARM: 6030/1: KS8695: enable console ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT. ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs. ARM: 6023/1: update bcmring_defconfig to latest version and fix build error ARM: fix build error in arch/arm/kernel/process.c commit 553cbf0a8f19c669bed82028988aa977558ef551 Merge: 27fb8d7 76ad4b8 Author: Linus Torvalds Date: Thu Apr 29 17:16:36 2010 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ps3: Update ps3_defconfig powerpc/ps3: Update platform maintainer powerpc/pseries: Flush lazy kernel mappings after unplug operations powerpc/numa: Add form 1 NUMA affinity powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32 powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig powerpc/83xx: enable EPOLL syscall in defconfig powerpc/83xx: add RTC drivers in 83xx defconfig powerpc/fsl-cpm: Configure clock correctly for SCC powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n commit 95b1ed2ac7ffe3205afc6f5a20320fbdb984da92 Author: Hector Palacios Date: Thu Apr 29 15:02:28 2010 -0700 spi: spidev_test gives error upon 1-byte transfer The sample application spidev_test.c is using SPI_IOC_MESSAGE ioctl to do an SPI transfer. This ioctl returns the number of bytes successfully transmitted or a negative error code upon erroneous completion. The application however is returning an error if the result of the ioclt if the return value is 1. This makes the application to fail upon 1-byte length transfers. Signed-off-by: Hector Palacios Signed-off-by: Andrew Morton Signed-off-by: Grant Likely commit db7e1bc479cc941c53839b18ff811c7def0c52e7 Author: viresh kumar Date: Thu Apr 29 12:22:52 2010 +0100 ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working. In current implementation of PL061, setting type of irq to HIGH_LEVEL is not working. This patch fixes this bug. Signed-off-by: Viresh Kumar Acked-by: Baruch Siach Signed-off-by: Russell King commit 9bf729c0af67897ea8498ce17c29b0683f7f2028 Author: Dave Chinner Date: Thu Apr 29 09:55:50 2010 +1000 xfs: add a shrinker to background inode reclaim On low memory boxes or those with highmem, kernel can OOM before the background reclaims inodes via xfssyncd. Add a shrinker to run inode reclaim so that it inode reclaim is expedited when memory is low. This is more complex than it needs to be because the VM folk don't want a context added to the shrinker infrastructure. Hence we need to add a global list of XFS mount structures so the shrinker can traverse them. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 3c2023dd8ed31e2ecfbb2d5aa20e8884d4b339e2 Author: Boaz Harrosh Date: Thu Apr 29 20:35:29 2010 +0200 exofs: Fix "add bdi backing to mount session" fall out The patch: add bdi backing to mount session (b3d0ab7e60d1865bb6f6a79a77aaba22f2543236) Has a bug in the placement of the bdi member at struct exofs_sb_info. The layout member must be kept last. Signed-off-by: Boaz Harrosh Signed-off-by: Jens Axboe commit 5477d0face8a3ba4e9a1e7283692fff9c92f8e5e Author: Jens Axboe Date: Thu Apr 29 20:33:35 2010 +0200 fs: fs/super.c needs to include backing-dev.h for !CONFIG_BLOCK When CONFIG_BLOCK is set, it ends up getting backing-dev.h included. But for !CONFIG_BLOCK, it isn't so lucky. The proper thing to do is include directly from the file it's used from, so do that. Signed-off-by: Jens Axboe commit 27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 Merge: f80a0ca 9699eda Author: Linus Torvalds Date: Thu Apr 29 10:23:44 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4 nfs: fix some issues in nfs41_proc_reclaim_complete() NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear NFS: Fix an unstable write data integrity race nfs: testing for null instead of ERR_PTR() NFS: rsize and wsize settings ignored on v4 mounts NFSv4: Don't attempt an atomic open if the file is a mountpoint SUNRPC: Fix a bug in rpcauth_prune_expired commit f80a0ca6ad8f2800453e819dafa09a0ed9e56850 Author: Arnd Bergmann Date: Wed Apr 28 14:36:41 2010 +0200 pktcdvd: improve BKL and compat_ioctl.c usage The pktcdvd driver uses proper locking and does not need the BKL in the ioctl and llseek functions of the character device, so kill both. Moving the compat_ioctl handling from common code into the driver itself fixes build problems when CONFIG_BLOCK is disabled. Acked-by: Randy Dunlap Signed-off-by: Arnd Bergmann Signed-off-by: Linus Torvalds commit a36fed12a4d980eebb2e67b87ea30ad090238cff Author: Boaz Harrosh Date: Thu Apr 29 13:38:00 2010 +0300 exofs: Fix "add bdi backing to mount session" fall out Commit b3d0ab7e60d1865bb6f6a79a77aaba22f2543236 ("exofs: add bdi backing to mount session") has a bug in the placement of the bdi member at struct exofs_sb_info. The layout member must be kept last. Signed-off-by: Boaz Harrosh Acked-by: Jens Axboe Signed-off-by: Linus Torvalds commit dfad53d48e32cd0e10eab98e986c76cdd957600f Merge: 79dba2e 7a0fc40 Author: Linus Torvalds Date: Wed Apr 28 20:41:55 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: x86: Disable large pages on CPUs with Atom erratum AAE44 x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero x86, mrst: Conditionally register cpu hotplug notifier for apbt commit 79dba2eaa771c3173957eccfd288e0e0d12e4d3f Merge: d9e80b7 48728e0 Author: Linus Torvalds Date: Wed Apr 28 20:40:17 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI: compute Address Space length rather than using _LEN x86/PCI: never allocate PCI MMIO resources below BIOS_END commit d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f Author: Al Viro Date: Thu Apr 29 03:10:43 2010 +0100 nfs d_revalidate() is too trigger-happy with d_drop() If dentry found stale happens to be a root of disconnected tree, we can't d_drop() it; its d_hash is actually part of s_anon and d_drop() would simply hide it from shrink_dcache_for_umount(), leading to all sorts of fun, including busy inodes on umount and oopsen after that. Bug had been there since at least 2006 (commit c636eb already has it), so it's definitely -stable fodder. Signed-off-by: Al Viro Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit f238b414a74a13c3d62e31a08e81b585d750df74 Author: Bjorn Helgaas Date: Tue Apr 27 14:45:38 2010 -0600 PNPACPI: compute Address Space length rather than using _LEN ACPI _CRS Address Space Descriptors have _MIN, _MAX, and _LEN. Linux has been computing Address Spaces as [_MIN to _MIN + _LEN - 1]. Based on the tests in the bug reports below, Windows apparently uses [_MIN to _MAX]. Per spec (ACPI 4.0, Table 6-40), for _CRS fixed-size, fixed location descriptors, "_LEN must be (_MAX - _MIN + 1)", and when that's true, it doesn't matter which way we compute the end. But of course, there are BIOSes that don't follow this rule, and we're better off if Linux handles those exceptions the same way as Windows. This patch makes Linux use [_MIN to _MAX], as Windows seems to do. This effectively reverts 3162b6f0c5e and replaces it with simpler code. https://bugzilla.kernel.org/show_bug.cgi?id=14337 (round) https://bugzilla.kernel.org/show_bug.cgi?id=15480 (truncate) Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 03f80cc3f24e1dcdbdba081ed5daf5575aac6180 Author: Sebastian Siewior Date: Wed Apr 28 09:57:01 2010 +0000 net/sb1250: register mdio bus in probe "ifconfig eth0 up && ifconfig eth0 down" triggers: | kobject (a8000000cfa5a480): tried to init an initialized object, something is seriously wrong. | Call Trace: | [] dump_stack+0x8/0x34 | [] kobject_init+0xe8/0xf0 | [] device_initialize+0x2c/0x98 | [] device_register+0x14/0x28 | [] mdiobus_register+0xdc/0x1e0 | [] sbmac_open+0x58/0x220 | [] __dev_open+0x11c/0x180 | [] __dev_change_flags+0x120/0x180 | [] dev_change_flags+0x20/0x78 | [] devinet_ioctl+0x7cc/0x820 | [] sock_do_ioctl+0x38/0x90 | [] compat_sock_ioctl_trans+0x408/0x1030 | [] compat_sock_ioctl+0xb0/0xd0 | [] compat_sys_ioctl+0xa0/0x18b8 | [] handle_sys+0x114/0x130 | | sb1250-mac-mdio: probed mdiobus_register() calls device_register() which initializes the kobj of the device. mdiobus_unregister() calls only device_del() so we have one reference left. That one is leaving with mdiobus_free() which is only called on remove. Since I don't see any reason why mdiobus_register()/mdiobus_unregister() should happen in ->open()/->close() I move them to probe & exit. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: David S. Miller commit 5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809 Author: Neil Horman Date: Wed Apr 28 10:30:59 2010 +0000 sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4) Ok, version 4 Change Notes: 1) Minor cleanups, from Vlads notes Summary: Hey- Recently, it was reported to me that the kernel could oops in the following way: <5> kernel BUG at net/core/skbuff.c:91! <5> invalid operand: 0000 [#1] <5> Modules linked in: sctp netconsole nls_utf8 autofs4 sunrpc iptable_filter ip_tables cpufreq_powersave parport_pc lp parport vmblock(U) vsock(U) vmci(U) vmxnet(U) vmmemctl(U) vmhgfs(U) acpiphp dm_mirror dm_mod button battery ac md5 ipv6 uhci_hcd ehci_hcd snd_ens1371 snd_rawmidi snd_seq_device snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd_page_alloc snd_ac97_codec snd soundcore pcnet32 mii floppy ext3 jbd ata_piix libata mptscsih mptsas mptspi mptscsi mptbase sd_mod scsi_mod <5> CPU: 0 <5> EIP: 0060:[] Not tainted VLI <5> EFLAGS: 00010216 (2.6.9-89.0.25.EL) <5> EIP is at skb_over_panic+0x1f/0x2d <5> eax: 0000002c ebx: c033f461 ecx: c0357d96 edx: c040fd44 <5> esi: c033f461 edi: df653280 ebp: 00000000 esp: c040fd40 <5> ds: 007b es: 007b ss: 0068 <5> Process swapper (pid: 0, threadinfo=c040f000 task=c0370be0) <5> Stack: c0357d96 e0c29478 00000084 00000004 c033f461 df653280 d7883180 e0c2947d <5> 00000000 00000080 df653490 00000004 de4f1ac0 de4f1ac0 00000004 df653490 <5> 00000001 e0c2877a 08000800 de4f1ac0 df653490 00000000 e0c29d2e 00000004 <5> Call Trace: <5> [] sctp_addto_chunk+0xb0/0x128 [sctp] <5> [] sctp_addto_chunk+0xb5/0x128 [sctp] <5> [] sctp_init_cause+0x3f/0x47 [sctp] <5> [] sctp_process_unk_param+0xac/0xb8 [sctp] <5> [] sctp_verify_init+0xcc/0x134 [sctp] <5> [] sctp_sf_do_5_1B_init+0x83/0x28e [sctp] <5> [] sctp_do_sm+0x41/0x77 [sctp] <5> [] cache_grow+0x140/0x233 <5> [] sctp_endpoint_bh_rcv+0xc5/0x108 [sctp] <5> [] sctp_inq_push+0xe/0x10 [sctp] <5> [] sctp_rcv+0x454/0x509 [sctp] <5> [] ipt_hook+0x17/0x1c [iptable_filter] <5> [] nf_iterate+0x40/0x81 <5> [] ip_local_deliver_finish+0x0/0x151 <5> [] ip_local_deliver_finish+0xc6/0x151 <5> [] nf_hook_slow+0x83/0xb5 <5> [] ip_local_deliver+0x1a2/0x1a9 <5> [] ip_local_deliver_finish+0x0/0x151 <5> [] ip_rcv+0x334/0x3b4 <5> [] netif_receive_skb+0x320/0x35b <5> [] init_stall_timer+0x67/0x6a [uhci_hcd] <5> [] process_backlog+0x6c/0xd9 <5> [] net_rx_action+0xfe/0x1f8 <5> [] __do_softirq+0x35/0x79 <5> [] handle_IRQ_event+0x0/0x4f <5> [] do_softirq+0x46/0x4d Its an skb_over_panic BUG halt that results from processing an init chunk in which too many of its variable length parameters are in some way malformed. The problem is in sctp_process_unk_param: if (NULL == *errp) *errp = sctp_make_op_error_space(asoc, chunk, ntohs(chunk->chunk_hdr->length)); if (*errp) { sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, WORD_ROUND(ntohs(param.p->length))); sctp_addto_chunk(*errp, WORD_ROUND(ntohs(param.p->length)), param.v); When we allocate an error chunk, we assume that the worst case scenario requires that we have chunk_hdr->length data allocated, which would be correct nominally, given that we call sctp_addto_chunk for the violating parameter. Unfortunately, we also, in sctp_init_cause insert a sctp_errhdr_t structure into the error chunk, so the worst case situation in which all parameters are in violation requires chunk_hdr->length+(sizeof(sctp_errhdr_t)*param_count) bytes of data. The result of this error is that a deliberately malformed packet sent to a listening host can cause a remote DOS, described in CVE-2010-1173: http://cve.mitre.org/cgi-bin/cvename.cgi?name=2010-1173 I've tested the below fix and confirmed that it fixes the issue. We move to a strategy whereby we allocate a fixed size error chunk and ignore errors we don't have space to report. Tested by me successfully Signed-off-by: Neil Horman Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit b56ba8aa6f3aeab23d3d4b1190ed1098463b2a9c Author: Colin Tuckley Date: Wed Feb 24 15:23:10 2010 +0100 ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB The switch to using GPIOLIB broke the sd/mmc card detection on the RealView development boards if GPIO_PL061 was not selected. This patch selects GPIO_PL061 if GPIOLIB is selected. The sense of the return value from mmc_status has also changed and is corrected. Signed-off-by: Colin Tuckley Acked-by: Catalin Marinas Signed-off-by: Russell King commit 1d16b0f2f3edf05f12a9e3960588e0d4854157bb Merge: 032b734 4b99fef Author: Linus Torvalds Date: Wed Apr 28 13:37:31 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix enabling regulator issue on max8925 commit 032b734d291e3532221b6cf7643a5f41c6261941 Merge: 3fb938b e41c11e Author: Linus Torvalds Date: Wed Apr 28 13:37:06 2010 -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: (27 commits) sfc: Change falcon_probe_board() to fail for unsupported boards sfc: Always close net device at the end of a disabling reset sfc: Wait at most 10ms for the MC to finish reading out MAC statistics sctp: Fix oops when sending queued ASCONF chunks sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set sctp: per_cpu variables should be in bh_disabled section sctp: fix potential reference of a freed pointer sctp: avoid irq lock inversion while call sk->sk_data_ready() Revert "tcp: bind() fix when many ports are bound" net/usb: add sierra_net.c driver cdc_ether: fix autosuspend for mbm devices bluetooth: handle l2cap_create_connless_pdu() errors gianfar: Wait for both RX and TX to stop ipheth: potential null dereferences on error path smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt() drivers/usb/net/kaweth.c: add device "Allied Telesyn AT-USB10 USB Ethernet Adapter" bnx2: Update version to 2.0.9. bnx2: Prevent "scheduling while atomic" warning with cnic, bonding and vlan. bnx2: Fix lost MSI-X problem on 5709 NICs. cxgb3: Wait longer for control packets on initialization ... commit e41c11ee0cc602bcde68916be85fb97d1a484324 Author: Ben Hutchings Date: Wed Apr 28 09:01:50 2010 +0000 sfc: Change falcon_probe_board() to fail for unsupported boards The driver needs specific PHY and board support code for each SFC4000 board; there is no point trying to continue if it is missing. Currently unsupported boards can trigger an 'oops'. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit f49a4589e9e25ef525da449b1ce5597cb659bbb5 Author: Ben Hutchings Date: Wed Apr 28 09:01:33 2010 +0000 sfc: Always close net device at the end of a disabling reset This fixes a regression introduced by commit eb9f6744cbfa97674c13263802259b5aa0034594 "sfc: Implement ethtool reset operation". Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit aabc5649078310094cbffb430fcbf9c25b6268f9 Author: Ben Hutchings Date: Wed Apr 28 09:00:35 2010 +0000 sfc: Wait at most 10ms for the MC to finish reading out MAC statistics The original code would wait indefinitely if MAC stats DMA failed. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit c0786693404cffd80ca3cb6e75ee7b35186b2825 Author: Vlad Yasevich Date: Wed Apr 28 08:47:22 2010 +0000 sctp: Fix oops when sending queued ASCONF chunks When we finish processing ASCONF_ACK chunk, we try to send the next queued ASCONF. This action runs the sctp state machine recursively and it's not prepared to do so. kernel BUG at kernel/timer.c:790! invalid opcode: 0000 [#1] SMP last sysfs file: /sys/module/ipv6/initstate Modules linked in: sha256_generic sctp libcrc32c ipv6 dm_multipath uinput 8139too i2c_piix4 8139cp mii i2c_core pcspkr virtio_net joydev floppy virtio_blk virtio_pci [last unloaded: scsi_wait_scan] Pid: 0, comm: swapper Not tainted 2.6.34-rc4 #15 /Bochs EIP: 0060:[] EFLAGS: 00010286 CPU: 0 EIP is at add_timer+0xd/0x1b EAX: cecbab14 EBX: 000000f0 ECX: c0957b1c EDX: 03595cf4 ESI: cecba800 EDI: cf276f00 EBP: c0957aa0 ESP: c0957aa0 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process swapper (pid: 0, ti=c0956000 task=c0988ba0 task.ti=c0956000) Stack: c0957ae0 d1851214 c0ab62e4 c0ab5f26 0500ffff 00000004 00000005 00000004 <0> 00000000 d18694fd 00000004 1666b892 cecba800 cecba800 c0957b14 00000004 <0> c0957b94 d1851b11 ceda8b00 cecba800 cf276f00 00000001 c0957b14 000000d0 Call Trace: [] ? sctp_side_effects+0x607/0xdfc [sctp] [] ? sctp_do_sm+0x108/0x159 [sctp] [] ? sctp_pname+0x0/0x1d [sctp] [] ? sctp_primitive_ASCONF+0x36/0x3b [sctp] [] ? sctp_process_asconf_ack+0x2a4/0x2d3 [sctp] [] ? sctp_sf_do_asconf_ack+0x1dd/0x2b4 [sctp] [] ? sctp_do_sm+0xb8/0x159 [sctp] [] ? sctp_cname+0x0/0x52 [sctp] [] ? sctp_assoc_bh_rcv+0xac/0xe1 [sctp] [] ? sctp_inq_push+0x2d/0x30 [sctp] [] ? sctp_rcv+0x797/0x82e [sctp] Tested-by: Wei Yongjun Signed-off-by: Yuansong Qiao Signed-off-by: Shuaijun Zhang Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit a8170c35e738d62e9919ce5b109cf4ed66e95bde Author: Wei Yongjun Date: Wed Apr 28 08:47:21 2010 +0000 sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set When calculating the INIT/INIT-ACK chunk length, we should not only account the length of parameters, but also the parameters zero padding length, such as AUTH HMACS parameter and CHUNKS parameter. Without the parameters zero padding length we may get following oops. skb_over_panic: text:ce2068d2 len:130 put:6 head:cac3fe00 data:cac3fe00 tail:0xcac3fe82 end:0xcac3fe80 dev: ------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:127! invalid opcode: 0000 [#2] SMP last sysfs file: /sys/module/aes_generic/initstate Modules linked in: authenc ...... Pid: 4102, comm: sctp_darn Tainted: G D 2.6.34-rc2 #6 EIP: 0060:[] EFLAGS: 00010282 CPU: 0 EIP is at skb_over_panic+0x37/0x3e EAX: 00000078 EBX: c07c024b ECX: c07c02b9 EDX: cb607b78 ESI: 00000000 EDI: cac3fe7a EBP: 00000002 ESP: cb607b74 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Process sctp_darn (pid: 4102, ti=cb607000 task=cabdc990 task.ti=cb607000) Stack: c07c02b9 ce2068d2 00000082 00000006 cac3fe00 cac3fe00 cac3fe82 cac3fe80 <0> c07c024b cac3fe7c cac3fe7a c0608dec ca986e80 ce2068d2 00000006 0000007a <0> cb8120ca ca986e80 cb812000 00000003 cb8120c4 ce208a25 cb8120ca cadd9400 Call Trace: [] ? sctp_addto_chunk+0x45/0x85 [sctp] [] ? skb_put+0x2e/0x32 [] ? sctp_addto_chunk+0x45/0x85 [sctp] [] ? sctp_make_init+0x279/0x28c [sctp] [] ? apic_timer_interrupt+0x2a/0x30 [] ? sctp_sf_do_prm_asoc+0x2b/0x7b [sctp] [] ? sctp_do_sm+0xa0/0x14a [sctp] [] ? sctp_pname+0x0/0x14 [sctp] [] ? sctp_primitive_ASSOCIATE+0x2b/0x31 [sctp] [] ? sctp_sendmsg+0x7a0/0x9eb [sctp] [] ? inet_sendmsg+0x3b/0x43 [] ? task_tick_fair+0x2d/0xd9 [] ? sock_sendmsg+0xa7/0xc1 [] ? smp_apic_timer_interrupt+0x6b/0x75 [] ? dequeue_task_fair+0x34/0x19b [] ? sched_clock_local+0x17/0x11e [] ? _copy_from_user+0x2b/0x10c [] ? verify_iovec+0x3c/0x6a [] ? sys_sendmsg+0x186/0x1e2 [] ? __wake_up_common+0x34/0x5b [] ? __wake_up+0x2c/0x3b [] ? tty_wakeup+0x43/0x47 [] ? remove_wait_queue+0x16/0x24 [] ? n_tty_read+0x5b8/0x65e [] ? default_wake_function+0x0/0x8 [] ? sys_socketcall+0x17f/0x1cd [] ? sysenter_do_call+0x12/0x22 Code: 0f 45 de 53 ff b0 98 00 00 00 ff b0 94 ...... EIP: [] skb_over_panic+0x37/0x3e SS:ESP 0068:cb607b74 To reproduce: # modprobe sctp # echo 1 > /proc/sys/net/sctp/addip_enable # echo 1 > /proc/sys/net/sctp/auth_enable # sctp_test -H 3ffe:501:ffff:100:20c:29ff:fe4d:f37e -P 800 -l # sctp_darn -H 3ffe:501:ffff:100:20c:29ff:fe4d:f37e -P 900 -h 192.168.0.21 -p 800 -I -s -t sctp_darn ready to send... 3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> bindx-add=192.168.0.21 3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> bindx-add=192.168.1.21 3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> snd=10 ------------------------------------------------------------------ eth0 has addresses: 3ffe:501:ffff:100:20c:29ff:fe4d:f37e and 192.168.0.21 eth1 has addresses: 192.168.1.21 ------------------------------------------------------------------ Reported-by: George Cheimonidis Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 81419d862db743fe4450a021893f24bab4698c1d Author: Vlad Yasevich Date: Wed Apr 28 08:47:20 2010 +0000 sctp: per_cpu variables should be in bh_disabled section Since the change of the atomics to percpu variables, we now have to disable BH in process context when touching percpu variables. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 0c42749cffbb4a06be86c5e5db6c7ebad548781f Author: Vlad Yasevich Date: Wed Apr 28 08:47:19 2010 +0000 sctp: fix potential reference of a freed pointer When sctp attempts to update an assocition, it removes any addresses that were not in the updated INITs. However, the loop may attempt to refrence a transport with address after removing it. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 561b1733a465cf9677356b40c27653dd45f1ac56 Author: Wei Yongjun Date: Wed Apr 28 08:47:18 2010 +0000 sctp: avoid irq lock inversion while call sk->sk_data_ready() sk->sk_data_ready() of sctp socket can be called from both BH and non-BH contexts, but the default sk->sk_data_ready(), sock_def_readable(), can not be used in this case. Therefore, we have to make a new function sctp_data_ready() to grab sk->sk_data_ready() with BH disabling. ========================================================= [ INFO: possible irq lock inversion dependency detected ] 2.6.33-rc6 #129 --------------------------------------------------------- sctp_darn/1517 just changed the state of lock: (clock-AF_INET){++.?..}, at: [] sock_def_readable+0x20/0x80 but this lock took another, SOFTIRQ-unsafe lock in the past: (slock-AF_INET){+.-...} and interrupts could create inverse lock ordering between them. other info that might help us debug this: 1 lock held by sctp_darn/1517: #0: (sk_lock-AF_INET){+.+.+.}, at: [] sctp_sendmsg+0x23d/0xc00 [sctp] Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 8d238b25b1ec22a73b1c2206f111df2faaff8285 Author: David S. Miller Date: Wed Apr 28 11:25:59 2010 -0700 Revert "tcp: bind() fix when many ports are bound" This reverts two commits: fda48a0d7a8412cedacda46a9c0bf8ef9cd13559 tcp: bind() fix when many ports are bound and a follow-on fix for it: 6443bb1fc2050ca2b6585a3fa77f7833b55329ed ipv6: Fix inet6_csk_bind_conflict() It causes problems with binding listening sockets when time-wait sockets from a previous instance still are alive. It's too late to keep fiddling with this so late in the -rc series, and we'll deal with it in net-next-2.6 instead. Signed-off-by: David S. Miller commit 9699eda6bc1f708a28acb716e1477aa351362fe2 Author: Xiaotian Feng Date: Thu Apr 22 18:56:17 2010 +0800 nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4 With CONFIG_NFS_V4 and data version 4, nfs_get_sb will allocate memory for export_path in nfs4_validate_text_mount_data, so we need to free it then. This is addressed in following kmemleak report: unreferenced object 0xffff88016bf48a50 (size 16): comm "mount.nfs", pid 22567, jiffies 4651574704 (age 175471.200s) hex dump (first 16 bytes): 2f 6f 70 74 2f 77 6f 72 6b 00 6b 6b 6b 6b 6b a5 /opt/work.kkkkk. backtrace: [] kmemleak_alloc+0x60/0xa7 [] kmemleak_alloc_recursive.clone.5+0x1b/0x1d [] __kmalloc_track_caller+0x18f/0x1b7 [] kstrndup+0x37/0x54 [] nfs_parse_devname+0x152/0x204 [nfs] [] nfs4_validate_text_mount_data+0xd0/0xdc [nfs] [] nfs_get_sb+0x325/0x736 [nfs] [] vfs_kern_mount+0xbd/0x17c [] do_kern_mount+0x4d/0xed [] do_mount+0x787/0x7fe [] sys_mount+0x88/0xc2 [] system_call_fastpath+0x16/0x1b Signed-off-by: Xiaotian Feng Cc: Trond Myklebust Cc: Chuck Lever Cc: Benny Halevy Cc: Al Viro Cc: Andy Adamson Signed-off-by: Trond Myklebust commit acf82b85a70f39786e3cbb1ffed8655bcc972424 Author: Dan Carpenter Date: Thu Apr 22 11:28:39 2010 +0200 nfs: fix some issues in nfs41_proc_reclaim_complete() The original code passed an ERR_PTR() to rpc_put_task() and instead of returning zero on success it returned -ENOMEM. Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust commit 48728e077480910df45baabc5f87b04276348c90 Author: Bjorn Helgaas Date: Tue Apr 27 14:45:43 2010 -0600 x86/PCI: compute Address Space length rather than using _LEN ACPI _CRS Address Space Descriptors have _MIN, _MAX, and _LEN. Linux has been computing Address Spaces as [_MIN to _MIN + _LEN - 1]. Based on the tests in the bug reports below, Windows apparently uses [_MIN to _MAX]. Per spec (ACPI 4.0, Table 6-40), for _CRS fixed-size, fixed location descriptors, "_LEN must be (_MAX - _MIN + 1)", and when that's true, it doesn't matter which way we compute the end. But of course, there are BIOSes that don't follow this rule, and we're better off if Linux handles those exceptions the same way as Windows. This patch makes Linux use [_MIN to _MAX], as Windows seems to do. This effectively reverts d558b483d5 and 03db42adfe and replaces them with simpler code. https://bugzilla.kernel.org/show_bug.cgi?id=14337 (round) https://bugzilla.kernel.org/show_bug.cgi?id=15480 (truncate) Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 3fb938b2a8bdbcf6086192d90fb7c73425e41fb9 Merge: 970b064 83bf6f1 Author: Linus Torvalds Date: Wed Apr 28 07:58:36 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix matching rules for pseudo-multi-function cards pcmcia: pcmcia_dev_present bugfix commit 970b06485ffee36aa3549dfe4c6b2a2c2118354d Merge: 696e65c 33f60e9 Author: Linus Torvalds Date: Wed Apr 28 07:56:05 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: coda: move backing-dev.h kernel include inside __KERNEL__ mtd: ensure that bdi entries are properly initialized and registered Move mtd_bdi_*mappable to mtdcore.c btrfs: convert to using bdi_setup_and_register() Catch filesystems lacking s_bdi drbd: Terminate a connection early if sending the protocol fails drbd: fix memory leak Fix JFFS2 sync silent failure smbfs: add bdi backing to mount session ncpfs: add bdi backing to mount session exofs: add bdi backing to mount session ecryptfs: add bdi backing to mount session coda: add bdi backing to mount session cifs: add bdi backing to mount session afs: add bdi backing to mount session. 9p: add bdi backing to mount session bdi: add helper function for doing init and register of a bdi for a file system block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer commit 696e65c3606aa3f587eeb181766baf49ea750cfc Merge: 1600f9d d8d8b63 Author: Linus Torvalds Date: Wed Apr 28 07:55:35 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: booke_wdt: fix build - unconstify watchdog_info watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug. watchdog: sbc_fitpc2_wdt: fixed I/O operations order Watchdog: sb_wdog.c: Fix sibyte watchdog initialization commit 4b99fef02510706a73c8400045b4c72514e581c4 Author: Haojian Zhuang Date: Tue Apr 6 06:19:15 2010 -0400 regulator: fix enabling regulator issue on max8925 Fix regulator enabling issue that is caused by typo error in is_enabled(). Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit a1c4560d4d8909cc4feb6f9e875d0b92083e05cf Author: Dan Carpenter Date: Tue Apr 27 14:11:05 2010 -0700 drivers/gpu/drm/drm_sysfs.c: sysfs files error handling In the original code we used "j" as an iterator but we used "i" as an index. - for (j = 0; j < i; j++) - device_remove_file(&connector->kdev, - &connector_attrs[i]); Smatch complained about that because "i" was potentially passed the end of the array. Which makes sense if we should be using "j" there. I also thought that we should remove the files for &connector_attrs_opt1 but to do that I had to add separate iterators for &connector_attrs and &connector_attrs_opt1. Signed-off-by: Dan Carpenter Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 0031c41be5c529f8329e327b63cde92ba1284842 Author: Dan Carpenter Date: Tue Apr 27 14:11:04 2010 -0700 drivers/gpu/drm/radeon/radeon_atombios.c: range check issues This change makes the array larger, "MAX_SUPPORTED_TV_TIMING_V1_2" is 3 and the original size "MAX_SUPPORTED_TV_TIMING" is 2. Also there were checks that were off by one. Signed-off-by: Dan Carpenter Acked-by: Alex Deucher Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 8c88e50bcf7f9f7e1b4987aaac3dfacc3ac6bd24 Author: Jiri Slaby Date: Tue Apr 27 14:11:03 2010 -0700 gpu: vga_switcheroo, fix lock imbalance Stanse found that one error path in vga_switcheroo_debugfs_write omits to unlock vgasr_mutex. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 404b017d00a9f472bdf725a06892d42f1cba5ed8 Author: Dan Carpenter Date: Tue Apr 27 14:11:05 2010 -0700 drivers/gpu/drm/drm_memory.c: fix check for end of loop "agpmem" is never NULL here. Signed-off-by: Dan Carpenter Cc: Eric Anholt Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 22fb573affe51845622c4763653f60e130f80586 Author: Dan Carpenter Date: Tue Apr 27 14:11:03 2010 -0700 drivers/gpu/drm/via/via_video.c: fix off by one issue "fx->lock" is used as the index in "dev_priv->decoder_queue[fx->lock]" which is an array of "VIA_NR_XVMC_LOCKS" elements. Signed-off-by: Dan Carpenter Acked-by: Thomas Hellstrom Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit dda04c7bcf58cb02ac796beb1cf483aa5277f2af Author: Roman Tereshonkov Date: Mon Mar 15 09:06:29 2010 +0000 omap2_mcspi: small fixes of output data format Replaces %04x by %08x for 32-bits data output. Signed-off-by: Roman Tereshonkov Signed-off-by: Grant Likely commit a330ce2001b290c59fe98c37e981683ef0a75fdf Author: Roman Tereshonkov Date: Mon Mar 15 09:06:28 2010 +0000 omap2_mcspi: Flush posted writes mcspi_write_chconf0 is used to control rx/tx triggering. Post-write flushing is needed to get the immediate effect. Signed-off-by: Roman Tereshonkov Signed-off-by: Grant Likely commit ccb2ad579f910e6146adf4eb3aa50325253ee8c9 Author: Robert Fitzsimons Date: Sat Apr 24 01:18:13 2010 +0100 drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference Selecting the wrong or no CONFIG_AGP_* chipset can cause a NULL pointer dereference when combined with CONFIG_DRM_RADEON_KMS and an old system with a R100 AGP card (should effect other cards too). The agp field will be set to NULL if no suitable AGP chipset driver is loaded, drm_agp_acquire already preforms a suitable NULL check so it can be used directly. Signed-off-by: Robert Fitzsimons Signed-off-by: Dave Airlie commit 797fd5b9dad12a100c81b5782573a41259728cb1 Author: Marek Olšák Date: Tue Apr 13 02:33:36 2010 +0200 drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill Signed-off-by: Marek Olšák commit 33f60e9640b2f60dde6735293d4aa5ecc5b1d5d5 Author: Jens Axboe Date: Wed Apr 28 09:20:33 2010 +0200 coda: move backing-dev.h kernel include inside __KERNEL__ Otherwise we must export backing-dev.h as well, which doesn't make any sense. Signed-off-by: Jens Axboe commit 07a389feefd79d41c8542cf31ce1cf25a1466e2c Author: Roman Tereshonkov Date: Mon Apr 12 09:56:35 2010 +0000 spi: spi_device memory should be released instead of device. The memory for dev variable is allocated as a part of spi_device structure memory which the dev belongs to. Thus when the memory is released the right pointer is used. Signed-off-by: Roman Tereshonkov Signed-off-by: Grant Likely commit 8ec130a017ebd8b931344edde7013ffb18fa1965 Author: Roman Tereshonkov Date: Fri Apr 16 09:52:59 2010 +0000 spi: release device claimed by bus_find_device_by_name In success case the function bus_find_device_by_name calls get_device. In our context put_device should be called to decrease the device count usage. Signed-off-by: Roman Tereshonkov Signed-off-by: Grant Likely commit 9bd73715a1f83f640937c121d22fa8dbaab73002 Author: Dan Carpenter Date: Wed Apr 28 01:07:29 2010 -0600 of: check for IS_ERR() get_phy_device() can return an ERR_PTR() Signed-off-by: Dan Carpenter Signed-off-by: Grant Likely commit b0c06027c7d18d99e6f5e81382a7f06a8080b084 Author: Wolfram Sang Date: Tue Apr 27 11:25:27 2010 +0200 serial/mpc52xx_uart: Drop outdated comments Most things mentioned are either obsolete (platform-support) or wrong (device numbering, DCD spport) these days. The remaining rest is obvious. Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 3913fd5ed42c990c20036ef5c90e7987a9dd1ad1 Author: Dan Carpenter Date: Tue Apr 27 14:12:03 2010 -0700 gpio: potential null dereference Smatch found a potential null dereference in gpio_setup_irq(). The "pdesc" variable is allocated with idr_find() that can return NULL. If gpio_setup_irq() is called with 0 as gpio_flags and "pdesc" is null, it would OOPs here. Signed-off-by: Dan Carpenter Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Grant Likely commit 76ad4b8ebd5c68c8bf490bdb1fb4dcbc266e5223 Author: Geoff Levand Date: Thu Apr 15 09:11:39 2010 +0000 powerpc/ps3: Update ps3_defconfig Refresh ps3_defconfig to latest kernel sources and change these kernel config options: o CONFIG_USB_ANNOUNCE_NEW_DEVICES: n -> y o CONFIG_USB_EHCI_TT_NEWSCHED: n -> y o CONFIG_CMDLINE_BOOL: n -> y o CONFIG_CMDLINE: n -> "" Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt commit b809b9ca3e6b47561514ae9767177cc482e90fc6 Author: Geoff Levand Date: Thu Apr 15 09:11:34 2010 +0000 powerpc/ps3: Update platform maintainer Update the PS3 entries in the MAINTAINERS file. Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt commit b4a26be9f6f8bb72998e445cc75fc6dc0c29513a Author: Benjamin Herrenschmidt Date: Tue Apr 6 15:03:40 2010 +0000 powerpc/pseries: Flush lazy kernel mappings after unplug operations This ensures that the translations for unmapped IO mappings or unmapped memory are properly removed from the MMU hash table before such an unplug. Without this, the hypervisor refuses the unplug operations due to those resources still being mapped by the partition. Signed-off-by: Benjamin Herrenschmidt commit 4b83c330b4d38e869111bda6e9077d4f61ed974a Author: Anton Blanchard Date: Wed Apr 7 15:33:44 2010 +0000 powerpc/numa: Add form 1 NUMA affinity Firmware changed the way it represents memory and cpu affinity on POWER7. Unfortunately the old method now caps the topology to work around issues with legacy operating systems. For Linux to get the correct topology we need to use the new form 1 affinity information. We set the form 1 field in the client architecture, and if we see "1" in the ibm,associativity-form property firmware supports form 1 affinity and we should look at the first field in the ibm,associativity-reference-points array. If not we use the second field as we always have. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit eb4fd8cd355c8ec425a12ec6cbdac614e8a4819d Author: Elina Pasheva Date: Tue Apr 27 18:06:41 2010 -0700 net/usb: add sierra_net.c driver Re-submitted based on comments from netdev community. Summary of the changes: 1. Improved error handling. 2. Added the missing timeout arguments to usb_control_msg(). The following is a new Linux driver which exposes certain models of Sierra Wireless modems to the operating system as Network Interface Cards (NICs). This driver requires a version of the sierra.c driver which supports blacklisting to work properly. The blacklist in sierra.c rejects the interfaces claimed by sierra_net.c. Likewise, the sierra_net.c driver only accepts (i.e. whitelists) the interface(s) used for USB-to-WWAN traffic. The version of sierra.c which supports blacklisting is available from the sierra wireless knowledge base page for older kernels. It is also available in Linux kernel starting from version 2.6.31. This driver works with all Sierra Wireless devices configured with PID=68A3 like USB305, USB306 provided the corresponding firmware version is I2.0 (for USB305) or M3.0 (for USB306) and later. This driver will not work with earlier firmware versions than the ones shown above. In this case the driver will issue an error message indicating incompatibility and will not serve the device's USB-to-WWAN interface. Sierra_net.c sits atop a pre-existing Linux driver called usbnet.c. A series of hook functions are provided in sierra_net.c which are called by usbnet.c in response to a particular condition such as receipt or transmission of a data packet. As such, usbnet.c does most of the work of making a modem appear to the system as a network device and for properly exchanging traffic between the USB subsystem and the Network card interface. Sierra_net.c is concerned with managing the data exchanged between the USB-to-WWAN interface and the upper layers of the operating system. Signed-off-by: Elina Pasheva Signed-off-by: Rory Filer Signed-off-by: David S. Miller commit 55964d72d63b15df49a5df11ef91dc8601270815 Author: Torgny Johansson Date: Tue Apr 27 17:07:40 2010 -0700 cdc_ether: fix autosuspend for mbm devices Autosuspend works until you bring the wwan interface up, then the device does not enter autosuspend anymore. The following patch fixes the problem by setting the .manage_power field in the mbm_info struct to the same as in the cdc_info struct (cdc_manager_power). Signed-off-by: Torgny Johansson Signed-off-by: David S. Miller commit 477fffb082920476cc26f238d65538ccb8d601e1 Author: Dan Carpenter Date: Wed Apr 21 23:52:01 2010 +0000 bluetooth: handle l2cap_create_connless_pdu() errors l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or ERR_PTR(-EFAULT). Signed-off-by: Dan Carpenter Acked-by: Marcel Holtmann Signed-off-by: David S. Miller commit 761ed01b35ca32bfd4166cc3862ae80ee33e3a4b Author: Andy Fleming Date: Tue Apr 27 16:43:31 2010 -0700 gianfar: Wait for both RX and TX to stop When gracefully stopping the controller, the driver was continuing if *either* RX or TX had stopped. We need to wait for both, or the controller could get into an invalid state. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 1600f9def09de07c5dbeb539e978fa73880690dd Merge: 11e39d9 b59ec78 Author: Linus Torvalds Date: Tue Apr 27 16:26:46 2010 -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: keys: don't need to use RCU in keyring_read() as semaphore is held commit 11e39d993dc693e0bfc5521d367b2494cb3bcd38 Merge: 03449cd 2bc3c11 Author: Linus Torvalds Date: Tue Apr 27 16:26:21 2010 -0700 Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: nfsd4: bug in read_buf commit 03449cd9eaa4fa3a7faa4a59474bafe2e90bd143 Author: David Howells Date: Tue Apr 27 13:13:08 2010 -0700 keys: the request_key() syscall should link an existing key to the dest keyring The request_key() system call and request_key_and_link() should make a link from an existing key to the destination keyring (if supplied), not just from a new key to the destination keyring. This can be tested by: ring=`keyctl newring fred @s` keyctl request2 user debug:a a keyctl request user debug:a $ring keyctl list $ring If it says: keyring is empty then it didn't work. If it shows something like: 1 key in keyring: 1070462727: --alswrv 0 0 user: debug:a then it did. request_key() system call is meant to recursively search all your keyrings for the key you desire, and, optionally, if it doesn't exist, call out to userspace to create one for you. If request_key() finds or creates a key, it should, optionally, create a link to that key from the destination keyring specified. Therefore, if, after a successful call to request_key() with a desination keyring specified, you see the destination keyring empty, the code didn't work correctly. If you see the found key in the keyring, then it did - which is what the patch is required for. Signed-off-by: David Howells Cc: James Morris Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2cb9aeb3c9b2475955cec328487484034f414e4 Author: Marc Zyngier Date: Tue Apr 27 13:13:07 2010 -0700 gpio: fix pca953x set_type 'scheduling while atomic' bug Bill Gatliff reported the following bug when using the irq_chip facility of the pca953x driver on a PPC platform: BUG: scheduling while atomic: insmod/1530/0x00000002 He traced it back to an i2c transaction in pca953x_irq_set_type(), which can be called with interrupt disabled (from __setup_irq()). As the i2c controller can sleep while sending a message, this qualifies as a bad idea. This patch moves the i2c transaction to pca953x_irq_bus_sync_unlock(), where it is actually safe to send an i2c message. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Marc Zyngier Reported-by: Bill Gatliff Cc: Eric Miao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3835541dd481091c4dbf5ef83c08aed12e50fd61 Author: Jerome Marchand Date: Tue Apr 27 13:13:06 2010 -0700 procfs: fix tid fdinfo Correct the file_operations struct in fdinfo entry of tid_base_stuff[]. Presently /proc/*/task/*/fdinfo contains symlinks to opened files like /proc/*/fd/. Signed-off-by: Jerome Marchand Cc: Alexander Viro Cc: Miklos Szeredi Cc: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e584fbbd9fd4f0f10b8aafc9982df8d0b553e35 Author: Peter Huewe Date: Tue Apr 27 13:13:04 2010 -0700 arch/avr32: fix build failure caused by wrong prototype This patch fixes a build failure introduced by 1d8393171 ("avr32: use generic ptrace_resume code") which had the static keyword as a leftover. arch/avr32/kernel/ptrace.c:32: error: static declaration of `user_enable_single_step' follows non-static declaration include/linux/ptrace.h:268: error: previous declaration of `user_enable_single_step' was here References: [1]http://kisskb.ellerman.id.au/kisskb/buildresult/2448162/ Signed-off-by: Peter Huewe Cc: Haavard Skinnemoen Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b59ec78cdcc57e02bc3dddfa7134a2f0fd15c34d Author: David Howells Date: Tue Apr 27 14:05:11 2010 -0700 keys: don't need to use RCU in keyring_read() as semaphore is held keyring_read() doesn't need to use rcu_dereference() to access the keyring payload as the caller holds the key semaphore to prevent modifications from happening whilst the data is read out. This should solve the following warning: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/keyring.c:204 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 1 lock held by keyctl/2144: #0: (&key->sem){+++++.}, at: [] keyctl_read_key+0x9c/0xcf stack backtrace: Pid: 2144, comm: keyctl Not tainted 2.6.34-rc2-cachefs #113 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] keyring_read+0x4d/0xe7 [] keyctl_read_key+0xac/0xcf [] sys_keyctl+0x75/0xb9 [] system_call_fastpath+0x16/0x1b Signed-off-by: David Howells Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: James Morris commit ba8b06e67ed7a560b0e7c80091bcadda4f4727a5 Author: Trond Myklebust Date: Tue Apr 27 18:33:54 2010 -0400 NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear Neil Brown reports that he is seeing the BUG_ON(ret == 0) trigger in nfs_page_async_flush. According to the trace in https://bugzilla.novell.com/show_bug.cgi?id=599628 the problem appears to be due to nfs_wb_page() not waiting for the PG_writeback flag to clear. There is a ditto problem in nfs_wb_page_cancel() Signed-off-by: Trond Myklebust commit d87ff58fda926fe5cb01214cccf1c72422ac776d Author: Dan Carpenter Date: Mon Apr 26 23:20:12 2010 +0000 ipheth: potential null dereferences on error path The calls to usb_free_buffer() dereference rx_urb and tx_urb in the parameter list but those could be NULL. Signed-off-by: Dan Carpenter Acked-by: L. Alberto Giménez Signed-off-by: David S. Miller commit 2a9151572224ad5fe808058097be94106470a6dc Author: Ken Kawasaki Date: Sat Apr 24 10:37:09 2010 +0000 smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt() smc91c92_cs: * spin_unlock_irqrestore before calling smc_interrupt() in media_check() to avoid lockup. * use spin_lock_irqsave for ethtool function. Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit dacf4fc85bbd063b8108b6c21275ae4a4fcce908 Author: Andreas Hartmann Date: Tue Apr 27 14:39:33 2010 -0700 drivers/usb/net/kaweth.c: add device "Allied Telesyn AT-USB10 USB Ethernet Adapter" akpm: reluctantly typed in from https://bugzilla.kernel.org/show_bug.cgi?id=15599 Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 587611d6e4d5c0fb5e9492cb06d9054744d69536 Author: Michael Chan Date: Tue Apr 27 11:28:11 2010 +0000 bnx2: Update version to 2.0.9. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 212f9934afccf9c97399216b694a7f452526d6da Author: Michael Chan Date: Tue Apr 27 11:28:10 2010 +0000 bnx2: Prevent "scheduling while atomic" warning with cnic, bonding and vlan. The bonding driver calls ndo_vlan_rx_register() while holding bond->lock. The bnx2 driver calls bnx2_netif_stop() to stop the rx handling while changing the vlgrp. The call also stops the cnic driver which sleeps while the bond->lock is held and cause the warning. This code path only needs to stop the NAPI rx handling while we are changing the vlgrp. Since no reset is going to occur, there is no need to stop cnic in this case. By adding a parameter to bnx2_netif_stop() to skip stopping cnic, we can avoid the warning. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c441b8d2cb2194b05550a558d6d95d8944e56a84 Author: Michael Chan Date: Tue Apr 27 11:28:09 2010 +0000 bnx2: Fix lost MSI-X problem on 5709 NICs. It has been reported that under certain heavy traffic conditions in MSI-X mode, the driver can lose an MSI-X vector causing all packets in the associated rx/tx ring pair to be dropped. The problem is caused by the chip dropping the write to unmask the MSI-X vector by the kernel (when migrating the IRQ for example). This can be prevented by increasing the GRC timeout value for these register read and write operations. Thanks to Dell for helping us debug this problem. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e95ef5d3f6bc60433883e1ef65dac747acd0bf1a Author: Andre Detsch Date: Mon Apr 26 05:38:27 2010 +0000 cxgb3: Wait longer for control packets on initialization In some Power7 platforms, when using VIOS (Virtual I/O Server), we need to wait longer for control packets to finish transfer during initialization. Without this change, initialization may fail prematurely. Signed-off-by: Wen Xiong Signed-off-by: Andre Detsch Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 6f461f6c7c961f0b1b73c0f27becf472a0ac606b Author: Bruce Allan Date: Tue Apr 27 03:33:04 2010 +0000 e1000e: enable/disable ASPM L0s and L1 and ERT according to hardware errata Prompted by a previous patch submitted by Matthew Garret , further digging into errata documentation reveals the current enabling or disabling of ASPM L0s and L1 states for certain parts supported by this driver are incorrect. 82571 and 82572 should always disable L1. For standard frames, 82573/82574/82583 can enable L1 but L0s must be disabled, and for jumbo frames 82573/82574 must disable L1. This allows for some parts to enable L1 in certain configurations leading to better power savings. Also according to the same errata, Early Receive (ERT) should be disabled on 82573 when using jumbo frames. Cc: Matthew Garret Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 61fac744dddb22d99c7b12250bc9bada7866df08 Author: Peter Waskiewicz Date: Tue Apr 27 00:38:15 2010 +0000 ixgbe: Power down PHY during driver resets The PHY laser is still on during driver init. It's allowing garbage to hit our FIFO, which eventually can cause the entire device to die. Power down the laser while setting up the device, and re-enable the laser before getting link. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 16a5b3c4143fc7f6cbe0ef9fd4e9a58376f91506 Author: Christoph Egger Date: Mon Apr 26 15:56:36 2010 +0100 Remove redundant check for CONFIG_MMU The checks for CONFIG_MMU at this location are duplicated as all the code is located inside a #ifndef CONFIG_MMU block. So the first conditional block will always be included while the second never will. Signed-off-by: Christoph Egger Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit bc113f151a73cb2195c2fb40d7d70acf8e2f9208 Merge: 93a9248 e0d1f70 Author: Linus Torvalds Date: Tue Apr 27 08:59:38 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: squashfs: fix potential buffer over-run on 4K block file systems squashfs: add missing buffer free squashfs: fix warn_on when root inode is corrupted squashfs: fix locking bug in zlib wrapper commit 93a9248af27aa83c08910d3e38b584678b1dc534 Merge: 17282b9 dd77ef9 Author: Linus Torvalds Date: Tue Apr 27 08:32:21 2010 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: more swap extent fixes for dynamic fork offsets commit 17282b9855574911622ff803b67dade7e64f6f8c Merge: 5892753 223e632 Author: Linus Torvalds Date: Tue Apr 27 08:27:26 2010 -0700 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (39 commits) omap: delete unused bootloader tag variables omap: Devkit8000: Remove unused pins omap: Devkit8000: Change position of init calls omap: Devkit8000: Remove unnecessary include file omap: Devkit8000: Fix typo in pin name omap: Devkit8000: Add missing package selection omap: Devkit8000: Fix typo in supplies n8x0_defconfig: remove CONFIG_NILFS2_FS override omap: board-sdp-flash.c: Fix typos in debug output omap4: Fix McBSP4 base address omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options omap: rx51_defconfig: Remove duplicate phonet omap: fix a gpmc nand problem AM3517: initialize i2c subsystem after mux subsystem omap: remove one of the define of INT_34XX_BENCH_MPU_EMUL omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled OMAP4: Clocks: Change SPI Instance Names omap: Devkit8000: Fix wrong usb port on Devkit8000 OMAP4: Fix for CONTROL register Base OMAP4-HSMMC: FIX for MMC5 Controller IRQ Base ... commit 5892753383090a3eddf0e1b043c95e3b2c7feda5 Author: Rik van Riel Date: Mon Apr 26 12:33:03 2010 -0400 mmap: check ->vm_ops before dereferencing Check whether the VMA has a vm_ops before calling close, just like we check vm_ops before calling open a few dozen lines higher up in the function. Signed-off-by: Rik van Riel Reported-by: Dan Carpenter Signed-off-by: Linus Torvalds commit a231a1f2714ce3b28445ac512a556d6c95517dab Merge: 0bfb824 180ce7e Author: Linus Torvalds Date: Tue Apr 27 08:26:09 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: authenc - Add EINPROGRESS check commit 0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a Merge: b91ce4d 88b0450 Author: Linus Torvalds Date: Tue Apr 27 08:22:50 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: Fix sparc regression in r300_scratch() drm: make sure vblank interrupts are disabled at DPMS time drm/radeon/kms/evergreen: No EnableYUV table drm/radeon: 9800 SE has only one quadpipe drm/radeon/kms: don't print error for legal crtcs. drm/radeon/kms/evergreen: fix LUT setup commit 5a38f2c7c4dd53d5be097930902c108e362584a3 Author: Alan Ott Date: Mon Apr 26 18:34:46 2010 -0400 HID: hidraw: fix numbered reports Make hidraw not stick an extra byte on the beginning of an IN transfer when a HID device contains multiple reports. Signed-off-by: Alan Ott Acked-by: Jiri Slaby Signed-off-by: Jiri Kosina commit d8d8b63b6dc413696ade040e52173c068df11702 Author: Anton Vorontsov Date: Mon Apr 26 15:59:53 2010 -0700 watchdog: booke_wdt: fix build - unconstify watchdog_info commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG] watchdog_info constify") introduced the following build failure: CC booke_wdt.o booke_wdt.c: In function 'booke_wdt_init': booke_wdt.c:220: error: assignment of read-only variable 'ident' Fix this by removing 'const' qualifier from watchdog_info struct. Signed-off-by: Anton Vorontsov Signed-off-by: Wim Van Sebroeck Cc: Kumar Gala Signed-off-by: Andrew Morton commit 0661b1ac5d48eb47c8a5948c0554fea25e0895ab Author: Jens Axboe Date: Tue Apr 27 09:49:47 2010 +0200 mtd: ensure that bdi entries are properly initialized and registered They will be holding dirty inodes and be responsible for flushing them out, so they need to be setup properly. Signed-off-by: Jens Axboe commit a33eb6b91034c95b9b08576f68be170f995b2c7d Author: Jörn Engel Date: Tue Apr 27 09:40:52 2010 +0200 Move mtd_bdi_*mappable to mtdcore.c Removes one .h and one .c file that are never used outside of mtdcore.c. Signed-off-by: Joern Engel Edited to remove on leftover debug define. Signed-off-by: Jens Axboe commit 5cc4a0f6b72878ea4e96fdb392d5d24c892a988e Author: Dan Carpenter Date: Tue Apr 27 00:23:37 2010 +0200 ACPI: silence kmemcheck false positive This addresses: https://bugzilla.kernel.org/show_bug.cgi?id=14998 We copy some strings into "event" but we leave the space after the NULL terminators uninitialized. Later in acpi_bus_receive_event() we copy the whole struct to another buffer with memcpy(). If the new buffer is stored on the stack, kmemcheck prints a warning about the unitialized space after the NULL terminators. It's true that the space is uninitialized, but it's harmless. The buffer is only used in acpi_system_read_event() and we don't read past the NULL terminators. This patch changes the kmalloc() to kzalloc() so that we initialize the memory and silence the kmemcheck warning. Reported-by: Christian Casteyde Signed-off-by: Dan Carpenter Signed-off-by: Len Brown commit 88b045077a1462a47503137fd4ca0c31772819ca Author: David Miller Date: Mon Apr 26 02:55:42 2010 -0700 drm/radeon: Fix sparc regression in r300_scratch() Commit b4fe945405e477cded91772b4fec854705443dd5 ("drm/radeon: Fix memory allocation failures in the preKMS command stream checking.") added a regression in that it completely tossed the get_unaligned() done by r300_scratch() which we added in commit 958a6f8ccb1964adc3eec84cf401c5baeb4fbca0 ("drm: radeon: Fix unaligned access in r300_scratch()."). Put it back. Signed-off-by: David S. Miller Acked-by: Matt Turner Signed-off-by: Dave Airlie commit e32ee7fa54e3172e6413cefaaee9222a3f521617 Author: Jesse Barnes Date: Fri Mar 26 18:07:15 2010 +0000 drm: make sure vblank interrupts are disabled at DPMS time When we call drm_vblank_off() at DPMS off time (to wake any clients so they don't hang) we need to make sure interrupts are actually disabled. If drm_vblank_off() gets called before the vblank usage timer expires, it'll prevent the timer from disabling interrupts since it also clears the vblank_enabled flag for the pipe. Signed-off-by: Jesse Barnes Signed-off-by: Dave Airlie commit dbc9632a8c25c6efcc1ca3f3a2177c855b6e053e Author: Kumar Gala Date: Wed Apr 21 02:12:58 2010 -0500 powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32 The following commit broke CONFIG_RELOCATABLE support on FSL Book-E parts: commit 549e8152de8039506f69c677a4546e5427aa6ae7 Author: Paul Mackerras Date: Sat Aug 30 11:43:47 2008 +1000 powerpc: Make the 64-bit kernel as a position-independent executable The change to __va and __pa to use PAGE_OFFSET & MEMORY_START causes problems on the Book-E parts because we don't know MEMORY_START until after we parse the device tree. We need __va to work properly to even parse the device tree so we have a chicken an egg. So go back to using he other definition of __va/__pa on CONFIG_BOOKE and use the PAGE_OFFSET/MEMORY_START version on "Classic" PPC64. Also updated casts to handle phys_addr_t being a different size from unsigned long (ie 36-bit physical on PPC32). Signed-off-by: Kumar Gala commit 908ba2bfd22253f26fa910cd855e4ccffb1467d0 Author: françois romieu Date: Mon Apr 26 11:42:58 2010 +0000 r8169: more broken register writes workaround 78f1cd02457252e1ffbc6caa44a17424a45286b8 ("fix broken register writes") does not work for Al Viro's r8169 (XID 18000000). Signed-off-by: Francois Romieu Signed-off-by: David S. Miller commit 87aeec767e1de60d7f76abbb44df5372b0932b7b Author: françois romieu Date: Mon Apr 26 11:42:06 2010 +0000 r8169: failure to enable mwi should not be fatal Few (6) network drivers enable mwi explicitly. Fewer worry about a failure. It is not a fix but it should avoid some annoyance like http://bugzilla.kernel.org/show_bug.cgi?id=15454 Signed-off-by: Francois Romieu Cc: Conrad Kostecki Signed-off-by: David S. Miller commit 2bc3c1179c781b359d4f2f3439cb3df72afc17fc Author: Neil Brown Date: Tue Apr 20 12:16:52 2010 +1000 nfsd4: bug in read_buf When read_buf is called to move over to the next page in the pagelist of an NFSv4 request, it sets argp->end to essentially a random number, certainly not an address within the page which argp->p now points to. So subsequent calls to READ_BUF will think there is much more than a page of spare space (the cast to u32 ensures an unsigned comparison) so we can expect to fall off the end of the second page. We never encountered thsi in testing because typically the only operations which use more than two pages are write-like operations, which have their own decoding logic. Something like a getattr after a write may cross a page boundary, but it would be very unusual for it to cross another boundary after that. Cc: stable@kernel.org Signed-off-by: J. Bruce Fields commit 55051feb57eba600b366006757304a0af3ada2bd Author: Bjorn Helgaas Date: Fri Apr 23 17:05:24 2010 -0600 x86/PCI: never allocate PCI MMIO resources below BIOS_END When we move a PCI device or assign resources to a device not configured by the BIOS, we want to avoid the BIOS region below 1MB. Note that if the BIOS places devices below 1MB, we leave them there. See https://bugzilla.kernel.org/show_bug.cgi?id=15744 and https://bugzilla.kernel.org/show_bug.cgi?id=15841 Tested-by: Andy Isaacson Tested-by: Andy Bailey Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 4eb8b9031a0314539605733597b1e30222d4da70 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Apr 25 08:59:07 2010 +0000 bridge br_multicast: Ensure to initialize BR_INPUT_SKB_CB(skb)->mrouters_only. Even with commit 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 ("bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping."), BR_INPUT_SKB_CB(skb)->mrouters_only is not appropriately initialized if IGMP snooping support is compiled and disabled, so we can see garbage. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 322af98c56c70b3ec6f637fb07d41a9591a6ff9a Author: Denis Turischev Date: Thu Apr 22 19:54:20 2010 +0300 watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug. spinlock need to be replaced by mutex because of sleep functions inside wdt_send_data. Signed-off-by: Denis Turischev Signed-off-by: Wim Van Sebroeck commit 93c0c8b4a5a174645550d444bd5c3ff0cccf74cb Author: Stefan Schmidt Date: Mon Apr 26 11:20:32 2010 -0700 ieee802154: Fix oops during ieee802154_sock_ioctl Trying to run izlisten (from lowpan-tools tests) on a device that does not exists I got the oops below. The problem is that we are using get_dev_by_name without checking if we really get a device back. We don't in this case and writing to dev->type generates this oops. [Oops code removed by Dmitry Eremin-Solenikov] If possible this patch should be applied to the current -rc fixes branch. Signed-off-by: Stefan Schmidt Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: David S. Miller commit 0250ececdf6813457c98719e2d33b3684881fde0 Author: Hans de Goede Date: Thu Apr 22 19:52:16 2010 +0200 p54pci: fix bugs in p54p_check_tx_ring Hans de Goede identified a bug in p54p_check_tx_ring: there are two ring indices. 1 => tx data and 3 => tx management. But the old code had a constant "1" and this resulted in spurious dma unmapping failures. Cc: stable@kernel.org Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=583623 Bug-Identified-by: Hans de Goede Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit fcf1dd7e68ceb6420478c8d89d35b4745d0b2f42 Author: Denis Turischev Date: Thu Apr 22 19:50:03 2010 +0300 watchdog: sbc_fitpc2_wdt: fixed I/O operations order There are fitpc2 compatible boards that hang with existent i/o operations order. Solution is to switch between writing to data and command ports. Signed-off-by: Denis Turischev Signed-off-by: Wim Van Sebroeck commit dc8bf1b1a6edfc92465526de19772061302f0929 Author: Andre Detsch Date: Mon Apr 26 07:27:07 2010 +0000 tg3: Fix INTx fallback when MSI fails tg3: Fix INTx fallback when MSI fails MSI setup changes the value of irq_vec in struct tg3 *tp. This attribute must be taken into account and restored before we try to do a new request_irq for INTx fallback. In powerpc, the original code was leading to an EINVAL return within request_irq, because the driver was trying to use the disabled MSI virtual irq number instead of tp->pdev->irq. Signed-off-by: Andre Detsch Acked-by: Michael Chan Signed-off-by: David S. Miller commit 86913315de5ed13debd1566dfea15c4179b1f0c0 Author: Guenter Roeck Date: Mon Apr 19 08:37:11 2010 -0700 Watchdog: sb_wdog.c: Fix sibyte watchdog initialization Watchdog configuration register and timer count register were interchanged, causing wrong values to be written into both registers. This caused watchdog triggered resets even if the watchdog was reset in time. Signed-off-by: Guenter Roeck Acked-by: Ralf Baechle Signed-off-by: Wim Van Sebroeck commit 83bf6f11e82eba8533f8dbd241b2c2825e42ae5d Author: Alexander Kurz Date: Sun Apr 25 13:44:35 2010 +0400 pcmcia: fix matching rules for pseudo-multi-function cards Prevent PCMCIA_DEV_ID_MATCH_FUNC_ID from grabbing PFC-cards: I changed the code, so that the first matching struct pcmcia_device_id _PFC_ entry will mark the card has_pfc, preventing PCMCIA_DEV_ID_MATCH_FUNC_ID to match. [linux-pcmcia@lists.infradead.org: re-order commit message] Signed-off-by: Alexander Kurz Signed-off-by: Dominik Brodowski commit dd77ef924c835c9813c3f4dc7e9c72e9cd88d238 Author: Dave Chinner Date: Tue Apr 20 17:00:37 2010 +1000 xfs: more swap extent fixes for dynamic fork offsets A new xfsqa test (226) with a prototype xfs_fsr change to try to handle dynamic fork offsets better triggers an assertion failure where the inode data fork is in btree format, yet there is room in the inode for it to be in extent format. The two inodes look like: before: ino 0x101 (target), num_extents 11, Max in-fork extents 6, broot size 40, fork offset 96 before: ino 0x115 (temp), num_extents 5, Max in-fork extents 3, broot size 40, fork offset 56 after: ino 0x101 (target), num_extents 5, Max in-fork extents 6, broot size 40, fork offset 96 after: ino 0x115 (temp), num_extents 11, Max in-fork extents 3, broot size 40, fork offset 56 Basically the target inode ends up with 5 extents in btree format, but it had space for 6 extents in extent format, so ends up incorrect. Notably here the broot size is the same, and that is where the kernel code is going wrong - the btree root will fit, so it lets the swap go ahead. The check should not allow the swap to take place if the number of extents while in btree format is less than the number of extents that can fit in the inode in extent format. Adding that check will prevent this swap and corruption from occurring. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e6d086d83cf7f102d48c006f58172a69ec0c15a4 Author: Jens Axboe Date: Mon Apr 26 10:27:54 2010 +0200 btrfs: convert to using bdi_setup_and_register() It's now a provided helper, so get rid of the internal setup and btrfs atomic_t bdi enumerator. Signed-off-by: Jens Axboe commit 867f1845c53f52e6b9822bea387c7b16740ba2f8 Author: Krzysztof Helt Date: Sun Apr 25 13:12:45 2010 +0200 ALSA: es968: fix wrong PnP dma index There is only one dma for the ESS ES968 based board. Its index is 0 and not 1. This make the es968 card working. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 83515bc7df812555e20cda48614674e2f346f9f5 Author: Guennadi Liakhovetski Date: Mon Apr 19 08:39:39 2010 +0000 SH: fix error paths in DMA driver If channel allocation is failing, mark the channel unused and give PM a chance to power down the hardware. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e3a4317e1d9970c56ba19d29393e4289809a1aa5 Author: Magnus Damm Date: Thu Apr 22 06:21:10 2010 +0000 sh: sh7751 pci controller io port fix This patch updates the sh7751 pci code to handle io ports correctly. The code is based on the sh7788x implementation. Tested on a R2D-1 board with CONFIG_8139TOO_PIO=y. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 43f5988c1853b1f6c4cd1fca1d4dccd7833d6a8e Author: Magnus Damm Date: Thu Apr 22 06:06:04 2010 +0000 sh: Fix maximum number of SCIF ports in R2D defconfigs Update the R2D defconfigs to bump up the maximum number of SCIF ports on the system. Fixes a broken serial console regression added by cd5f107628ab89c5dec5ad923f1c27f4cba41972. Reported-by: Shin-ichiro KAWASAKI Signed-off-by: Magnus Damm Tested-by: Alexandre Courbot Signed-off-by: Paul Mundt commit c2fe3092e5b85c8c65ebac88a3ffa4355e51a9b6 Author: Guennadi Liakhovetski Date: Wed Apr 21 15:14:19 2010 +0000 SH: fix TS field shift calculation for DMA drivers CHCR_TS_HIGH_SHIFT is defined as a shift of TS high bits in CHCR register, relative to low bits. The TS_INDEX2VAL() macro has to take this into account. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 180ce7e81030e1ef763d58f97f9ab840ff57d848 Author: Herbert Xu Date: Mon Apr 26 09:14:05 2010 +0800 crypto: authenc - Add EINPROGRESS check When Steffen originally wrote the authenc async hash patch, he correctly had EINPROGRESS checks in place so that we did not invoke the original completion handler with it. Unfortuantely I told him to remove it before the patch was applied. As only MAY_BACKLOG request completion handlers are required to handle EINPROGRESS completions, those checks are really needed. This patch restores them. Reported-by: Sebastian Andrzej Siewior Signed-off-by: Herbert Xu commit b91ce4d14a21fc04d165be30319541e0f9204f15 Merge: 202f2bb 6443bb1 Author: Linus Torvalds Date: Sun Apr 25 16:28:56 2010 -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: ipv6: Fix inet6_csk_bind_conflict() e100: Fix the TX workqueue race commit 6443bb1fc2050ca2b6585a3fa77f7833b55329ed Author: Eric Dumazet Date: Sun Apr 25 15:09:42 2010 -0700 ipv6: Fix inet6_csk_bind_conflict() Commit fda48a0d7a84 (tcp: bind() fix when many ports are bound) introduced a bug on IPV6 part. We should not call ipv6_addr_any(inet6_rcv_saddr(sk2)) but ipv6_addr_any(inet6_rcv_saddr(sk)) because sk2 can be IPV4, while sk is IPV6. Reported-by: Michael S. Tsirkin Signed-off-by: Eric Dumazet Tested-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit 202f2bb0708e968099a23fead4598a4c3f8f8637 Merge: ddc9b34 b90f687 Author: Linus Torvalds Date: Sun Apr 25 10:01:51 2010 -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: Issue the discard operation *before* releasing the blocks to be reused ext4: Fix buffer head leaks after calls to ext4_get_inode_loc() ext4: Fix possible lost inode write in no journal mode commit 5129a469a91a91427334c40e29e64c6d0ab68caf Author: Jörn Engel Date: Sun Apr 25 08:54:42 2010 +0200 Catch filesystems lacking s_bdi noop_backing_dev_info is used only as a flag to mark filesystems that don't have any backing store, like tmpfs, procfs, spufs, etc. Signed-off-by: Joern Engel Changed the BUG_ON() to a WARN_ON(). Note that adding dirty inodes to the noop_backing_dev_info is not legal and will not result in them being flushed, but we already catch this condition in __mark_inode_dirty() when checking for a registered bdi. Signed-off-by: Jens Axboe commit 401da6aea31ef69c2fcd260382adabdcf7ce820a Author: Alan Cox Date: Sat Apr 24 21:09:29 2010 -0700 e100: Fix the TX workqueue race Nothing stops the workqueue being left to run in parallel with close or a few other operations. This causes double unmaps and the like. See kerneloops.org #1041230 for an example Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit e0d1f70010dce062ccce1bbd940a661e60b82631 Author: Phillip Lougher Date: Fri Apr 23 02:32:02 2010 +0100 squashfs: fix potential buffer over-run on 4K block file systems Sizing the buffer based on block size is incorrect, leading to a potential buffer over-run on 4K block size file systems (because the metadata block size is always 8K). This bug doesn't seem have triggered because 4K block size file systems are not default, and also because metadata blocks after compression tend to be less than 4K. Signed-off-by: Phillip Lougher commit 370ec3d1ed9d76ba992e5b9b7d7d10700014d436 Author: Phillip Lougher Date: Fri Apr 23 00:24:22 2010 +0100 squashfs: add missing buffer free Signed-off-by: Phillip Lougher commit 1cb08e97389bb603e1b999312d9686c8faf0187a Author: Phillip Lougher Date: Fri Apr 16 01:01:36 2010 +0100 squashfs: fix warn_on when root inode is corrupted Fix warn_on triggered by mounting a fsfuzzer corrupted file system, where the root inode has been corrupted. Signed-off-by: Phillip Lougher Reported-by: Steve Grubb commit ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e Merge: 8e500ff fd187aa Author: Linus Torvalds Date: Sat Apr 24 11:35:21 2010 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] use max load in conservative governor [CPUFREQ] fix a lockdep warning commit 8e500ff8df1223dfb42d6c39d3de1fc216fba1a2 Merge: 383bee6 7ce97d4 Author: Linus Torvalds Date: Sat Apr 24 11:34:17 2010 -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: (22 commits) gianfar: Fix potential oops during OF address translation fsl_pq_mdio: Fix kernel oops during OF address translation tcp: bind() fix when many ports are bound rdma: potential ERR_PTR dereference rtnetlink: potential ERR_PTR dereference net: ipv6 bind to device issue ipv6: allow to send packet after receiving ICMPv6 Too Big message with MTU field less than IPV6_MIN_MTU drivers/net/usb: Add new driver ipheth cxgb3: fix linkup issue X25 fix dead unaccepted sockets KS8851: NULL pointer dereference if list is empty net: 3c574_cs fix stats.tx_bytes counter xfrm6: ensure to use the same dev when building a bundle can: Fix possible NULL pointer dereference in ems_usb.c net: Fix an RCU warning in dev_pick_tx() ipv6: Fix tcp_v6_send_response transport header setting. bridge: add a missing ntohs() 8139too: Fix a typo in the function name. mac80211: pass HT changes to driver when off channel mac80211: remove bogus TX agg state assignment ... commit 383bee6b54a1eeac3a286812be8a5c3f122fd834 Merge: b39c8be cc2893b Author: Linus Torvalds Date: Sat Apr 24 11:32:12 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Ensure we re-enable devices on resume x86/PCI: parse additional host bridge window resource types PCI: revert broken device warning PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions commit b39c8be6d5e38f4478be0c7aaf1d3a160a4dd330 Merge: df37bd1 c9db3ef Author: Linus Torvalds Date: Sat Apr 24 11:31:57 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: eeepc-laptop: add missing sparse_keymap_free eeepc-wmi: Build fix asus: don't modify bluetooth/wlan on boot dell-wmi: Fix memory leak eeepc-wmi: add backlight support eeepc-wmi: use a platform device as parent device of all sub-devices eeepc-wmi: add an eeepc_wmi context structure commit df37bd156dcb4f5441beaf5bde444adac974e9a0 Author: Phillip Lougher Date: Fri Apr 23 13:18:11 2010 -0400 initramfs: handle unrecognised decompressor when unpacking The unpack routine fails to handle the decompress_method() returning unrecognised decompressor (compress_name == NULL). This results in the routine looping eventually oopsing on an out of bounds memory access. Note this bug is usually hidden, only triggering on trailing junk after one or more correct compressed blocks. The case of the compressed archive being complete junk is (by accident?) caught by the if (state != Reset) check because state is initialised to Start, but not updated due to the decompressor not having been called. Obviously if the junk is trailing a correctly decompressed buffer, state == Reset from the previous call to the decompressor. Signed-off-by: Phillip Lougher Reported-by: Aaro Koskinen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22eccdd7d2d94be48ae9b01fef5f52ccbb81dcd5 Author: Dan Carpenter Date: Fri Apr 23 13:18:10 2010 -0400 ksm: check for ERR_PTR from follow_page() The follow_page() function can potentially return -EFAULT so I added checks for this. Also I silenced an uninitialized variable warning on my version of gcc (version 4.3.2). Signed-off-by: Dan Carpenter Acked-by: Rik van Riel Acked-by: Izik Eidus Cc: Andrea Arcangeli Cc: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 453dc65931915abc61f92e12bba1fc4747ff5542 Author: Dmitry Torokhov Date: Fri Apr 23 13:18:08 2010 -0400 VMware Balloon driver This is a standalone version of VMware Balloon driver. Ballooning is a technique that allows hypervisor dynamically limit the amount of memory available to the guest (with guest cooperation). In the overcommit scenario, when hypervisor set detects that it needs to shuffle some memory, it instructs the driver to allocate certain number of pages, and the underlying memory gets returned to the hypervisor. Later hypervisor may return memory to the guest by reattaching memory to the pageframes and instructing the driver to "deflate" balloon. We are submitting a standalone driver because KVM maintainer (Avi Kivity) expressed opinion (rightly) that our transport does not fit well into virtqueue paradigm and thus it does not make much sense to integrate with virtio. There were also some concerns whether current ballooning technique is the right thing. If there appears a better framework to achieve this we are prepared to evaluate and switch to using it, but in the meantime we'd like to get this driver upstream. We want to get the driver accepted in distributions so that users do not have to deal with an out-of-tree module and many distributions have "upstream first" requirement. The driver has been shipping for a number of years and users running on VMware platform will have it installed as part of VMware Tools even if it will not come from a distribution, thus there should not be additional risk in pulling the driver into mainline. The driver will only activate if host is VMware so everyone else should not be affected at all. Signed-off-by: Dmitry Torokhov Cc: Avi Kivity Cc: Jeremy Fitzhardinge Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8af67e2681c693a21f3933e3bdfce4cf66596d3 Author: Anton Blanchard Date: Fri Apr 23 13:18:06 2010 -0400 fs/block_dev.c: fix performance regression in O_DIRECT|O_SYNC writes to block devices We are seeing a large regression in database performance on recent kernels. The database opens a block device with O_DIRECT|O_SYNC and a number of threads write to different regions of the file at the same time. A simple test case is below. I haven't defined DEVICE since getting it wrong will destroy your data :) On an 3 disk LVM with a 64k chunk size we see about 17MB/sec and only a few threads in IO wait: procs -----io---- -system-- -----cpu------ r b bi bo in cs us sy id wa st 0 3 0 16170 656 2259 0 0 86 14 0 0 2 0 16704 695 2408 0 0 92 8 0 0 2 0 17308 744 2653 0 0 86 14 0 0 2 0 17933 759 2777 0 0 89 10 0 Most threads are blocking in vfs_fsync_range, which has: mutex_lock(&mapping->host->i_mutex); err = fop->fsync(file, dentry, datasync); if (!ret) ret = err; mutex_unlock(&mapping->host->i_mutex); commit 148f948ba877f4d3cdef036b1ff6d9f68986706a (vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode) offers some explanation of what is going on: Use these new helpers for syncing from generic VFS functions. This makes O_SYNC writes to block devices acquire i_mutex for syncing. If we really care about this, we can make block_fsync() drop the i_mutex and reacquire it before it returns. Thanks Jan for such a good commit message! As well as dropping i_mutex, Christoph suggests we should remove the call to sync_blockdev(): > sync_blockdev is an overcomplicated alias for filemap_write_and_wait on > the block device inode, which is exactly what we did just before calling > into ->fsync The patch below incorporates both suggestions. With it the testcase improves from 17MB/s to 68M/sec: procs -----io---- -system-- -----cpu------ r b bi bo in cs us sy id wa st 0 7 0 65536 1000 3878 0 0 70 30 0 0 34 0 69632 1016 3921 0 1 46 53 0 0 57 0 69632 1000 3921 0 0 55 45 0 0 53 0 69640 754 4111 0 0 81 19 0 Testcase: #define _GNU_SOURCE #include #include #include #include #include #include #include #include #define NR_THREADS 64 #define BUFSIZE (64 * 1024) #define DEVICE "/dev/mapper/XXXXXX" #define ALIGN(VAL, SIZE) (((VAL)+(SIZE)-1) & ~((SIZE)-1)) static int fd; static void *doit(void *arg) { unsigned long offset = (long)arg; char *b, *buf; b = malloc(BUFSIZE + 1024); buf = (char *)ALIGN((unsigned long)b, 1024); memset(buf, 0, BUFSIZE); while (1) pwrite(fd, buf, BUFSIZE, offset); } int main(int argc, char *argv[]) { int flags = O_RDWR|O_DIRECT; int i; unsigned long offset = 0; if (argc > 1 && !strcmp(argv[1], "O_SYNC")) flags |= O_SYNC; fd = open(DEVICE, flags); if (fd == -1) { perror("open"); exit(1); } for (i = 0; i < NR_THREADS-1; i++) { pthread_t tid; pthread_create(&tid, NULL, doit, (void *)offset); offset += BUFSIZE; } doit((void *)offset); return 0; } Signed-off-by: Anton Blanchard Acked-by: Jan Kara Cc: Christoph Hellwig Cc: Alexander Viro Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98d5ce0d0044666fc85a01915a1d22407eb546fd Author: Hans Verkuil Date: Fri Apr 23 13:18:04 2010 -0400 lib/vsprintf.c: add missing EXPORT_SYMBOL(simple_strtoll) Add a missing EXPORT_SYMBOL. I must be the first person that wants to use this function :-) Signed-off-by: Hans Verkuil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81fa08f25bd24fc51557a2d2364fa1ab5e7407b4 Author: Amit Kucheria Date: Fri Apr 23 13:18:03 2010 -0400 w1: fix omap 1-wire driver compilation Fixes the following error: drivers/w1/masters/omap_hdq.c: In function 'hdq_wait_for_flag': drivers/w1/masters/omap_hdq.c:137: error: implicit declaration of function 'schedule_timeout_uninterruptible' drivers/w1/masters/omap_hdq.c: In function 'hdq_write_byte': drivers/w1/masters/omap_hdq.c:177: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function) drivers/w1/masters/omap_hdq.c:177: error: (Each undeclared identifier is reported only once drivers/w1/masters/omap_hdq.c:177: error: for each function it appears in.) drivers/w1/masters/omap_hdq.c:177: error: implicit declaration of function 'schedule_timeout' drivers/w1/masters/omap_hdq.c: In function 'hdq_isr': drivers/w1/masters/omap_hdq.c:221: error: 'TASK_NORMAL' undeclared (first use in this function) drivers/w1/masters/omap_hdq.c: In function 'omap_hdq_break': drivers/w1/masters/omap_hdq.c:316: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function) Signed-off-by: Amit Kucheria Acked-by: Tony Lindgren Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31f2b0ebc01fd332cb0997f7ce9f9cde29af9e20 Author: Oleg Nesterov Date: Fri Apr 23 13:18:01 2010 -0400 rmap: anon_vma_prepare() can leak anon_vma_chain If find_mergeable_anon_vma() succeeds but another thread installs ->anon_vma before we take ptl, then allocated == NULL but avc should be freed. Change the code to check avc != NULL to detect this case. Also, a couple of whitespace changes to make the critical section more visible. Signed-off-by: Oleg Nesterov Reviewed-by: Rik van Riel Cc: Hugh Dickins Cc: Pete Zaitcev Cc: Borislav Petkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93b4a44f3ad69520d605aace3f3486b8eb754b96 Author: David Howells Date: Fri Apr 23 13:18:00 2010 -0400 keys: fix an RCU warning Fix the following RCU warning: =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- security/keys/request_key.c:116 invoked rcu_dereference_check() without protection! This was caused by doing: [root@andromeda ~]# keyctl newring fred @s 539196288 [root@andromeda ~]# keyctl request2 user a a 539196288 request_key: Required key not available Signed-off-by: David Howells Acked-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccdb40048b2972f10bdc944913c0e0ee26b5d1f2 Author: Albin Tonnerre Date: Fri Apr 23 13:17:58 2010 -0400 lib: fix the use of LZO to decompress initramfs images This patch fixes 2 issues with the LZO decompressor: - It doesn't handle the case where a block isn't compressed at all. In this case, calling lzo1x_decompress_safe will fail, so we need to just use memcpy() instead (the upstream LZO code does something similar) - Since commit 54291362d2a5738e1b0495df2abcb9e6b0563a3f ("initramfs: add missing decompressor error check") , the decompressor return code is checked in the init/initramfs.c The LZO decompressor didn't return the expected value, causing the initramfs code to falsely believe a decompression error occured Signed-off-by: Albin Tonnerre Tested-by: bert schulze Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23be7468e8802a2ac1de6ee3eecb3ec7f14dc703 Author: Mel Gorman Date: Fri Apr 23 13:17:56 2010 -0400 hugetlb: fix infinite loop in get_futex_key() when backed by huge pages If a futex key happens to be located within a huge page mapped MAP_PRIVATE, get_futex_key() can go into an infinite loop waiting for a page->mapping that will never exist. See https://bugzilla.redhat.com/show_bug.cgi?id=552257 for more details about the problem. This patch makes page->mapping a poisoned value that includes PAGE_MAPPING_ANON mapped MAP_PRIVATE. This is enough for futex to continue but because of PAGE_MAPPING_ANON, the poisoned value is not dereferenced or used by futex. No other part of the VM should be dereferencing the page->mapping of a hugetlbfs page as its page cache is not on the LRU. This patch fixes the problem with the test case described in the bugzilla. [akpm@linux-foundation.org: mel cant spel] Signed-off-by: Mel Gorman Acked-by: Peter Zijlstra Acked-by: Darren Hart Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a6a1ecd9e9b5d046a236da2f7eb6b6812f04229 Author: Ian Dall Date: Fri Apr 23 13:17:53 2010 -0400 w1: w1 temp: fix negative termperature calculation Fix regression caused by commit 507e2fbaaacb6f164b4125b87c5002f95143174b ("w1: w1 temp calculation overflow fix") whereby negative temperatures for the DS18B20 are not converted properly. When the temperature exceeds 32767 milli-degrees the temperature overflows to -32768 millidegrees. These are both well within the -55 - +125 degree range for the sensor. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=12646 Signed-of-by: Ian Dall Cc: Evgeniy Polyakov Tested-by: Karsten Elfenbein Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7716fa66034c408b0f59e8b9c62f793befa5b338 Author: KAMEZAWA Hiroyuki Date: Fri Apr 23 13:17:51 2010 -0400 cgroups: fix procs documentation Writing to cgroup.procs is not supported now. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Li Zefan Cc: Ben Blum Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a3bdfe6cd841880a5d849c40f90093b3817f6e0 Author: Thomas Gerlach Date: Fri Apr 23 13:17:50 2010 -0400 drivers/video/efifb.c: support framebuffer for NVIDIA 9400M in MacBook Pro 5,1 Description of patch: --------------------- This is a patch for the EFI framebuffer driver to enable the framebuffer of the NVIDIA 9400M as found in MacBook Pro (MBP) 5,1 and up. The framebuffer of the NVIDIA graphic cards are located at the following addresses in memory: 9400M: 0xC0010000 9600M GT: 0xB0030000 The patch delivered right here only provides the memory location of the framebuffer of the 9400M device. The 9600M GT is not covered. It is assumed that the 9400M is used when powered up the MBP. The information which device is currently powered and in use is stored in the 64 bytes large EFI variable "gpu-power-prefs". More specifically, byte 0x3B indicates whether 9600M GT (0x00) or 9400M (0x01) is online. The PCI bus IDs are the following: 9400M: PCI 03:00:00 9600M GT: PCI 02:00:00 The EFI variables can be easily read-out and manipulated with "rEFIt", an MBP specific bootloader tool. For more information on how handle rEFIt and EFI variables please consult "http://refit.sourceforge.net" and "http://ubuntuforums.org/archive/index.php/t-1076879.html". IMPORTANT NOTE: The information on how to activate the 9400M device given at "ubuntuforums.org" is not correct, since it states gpu-power-prefs[0x3B] = 0x00 -> 9400M (PCI 02:00:00) gpu-power-prefs[0x3B] = 0x01 -> 9600M GT (PCI 03:00:00) Actually, the assignment of the values and the PCI bus IDs are swapped. Suggestions: ------------ To cover framebuffers of both 9400M and 9600M GT, I would suggest to implement a conditional on "gpu-power-prefs". Depending on the value of byte 0x3B, the according framebuffer is selected. However, this requires kernel access to the EFI variables. [akpm@linux-foundation.org: rename optname, per Peter Jones] Signed-off-by: Thomas Gerlach Acked-by: Peter Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bd14a839d2ec703c56593a7209f2310c16d6478 Author: Takashi Iwai Date: Fri Apr 23 13:17:48 2010 -0400 lis3: add support for HP ProBook 432x/442x/452x/522x Correct axis-mappings for new HP ProBook laptops. Signed-off-by: Takashi Iwai Acked-by: Eric Piel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a88a2b886404b1cfc109125b1cba4775e8682955 Author: Paulius Zaleckas Date: Fri Apr 23 13:17:47 2010 -0400 mtd: fix Orion NAND driver compilation with ARM OABI We must tell GCC to use even register for variable passed to ldrd instruction. Without this patch GCC 4.2.1 puts this variable to r2/r3 on EABI and r3/r4 on OABI, so force it to r2/r3. This does not change anything when EABI and OABI compilation works OK. Without this patch and with OABI I get: CC drivers/mtd/nand/orion_nand.o /tmp/ccMkwOCs.s: Assembler messages: /tmp/ccMkwOCs.s:63: Error: first destination register must be even -- `ldrd r3,[ip]' make[5]: *** [drivers/mtd/nand/orion_nand.o] Error 1 Signed-off-by: Paulius Zaleckas Acked-by: Nicolas Pitre Acked-by: Artem Bityutskiy Cc: David Woodhouse Cc: Jamie Lokier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e59464c735db19619cde2aa331609adb02005f5b Author: Changli Gao Date: Fri Apr 23 13:17:45 2010 -0400 flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO memset() is called with the wrong address and the kernel panics. Signed-off-by: Changli Gao Cc: Patrick McHardy Acked-by: David Rientjes Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46da27664887fb95cedba53eafcf876de812c8c1 Author: Andreas Schwab Date: Fri Apr 23 13:17:44 2010 -0400 kernel/sys.c: fix compat uname machine On ppc64 you get this error: $ setarch ppc -R true setarch: ppc: Unrecognized architecture because uname still reports ppc64 as the machine. So mask off the personality flags when checking for PER_LINUX32. Signed-off-by: Andreas Schwab Reviewed-by: Christoph Hellwig Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb2162df74bb19552db3d988fd11c787cf5fad56 Author: Jeff Mahoney Date: Fri Apr 23 13:17:41 2010 -0400 reiserfs: fix corruption during shrinking of xattrs Commit 48b32a3553a54740d236b79a90f20147a25875e3 ("reiserfs: use generic xattr handlers") introduced a problem that causes corruption when extended attributes are replaced with a smaller value. The issue is that the reiserfs_setattr to shrink the xattr file was moved from before the write to after the write. The root issue has always been in the reiserfs xattr code, but was papered over by the fact that in the shrink case, the file would just be expanded again while the xattr was written. The end result is that the last 8 bytes of xattr data are lost. This patch fixes it to use new_size. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=14826 Signed-off-by: Jeff Mahoney Reported-by: Christian Kujau Tested-by: Christian Kujau Cc: Edward Shishkin Cc: Jethro Beekman Cc: Greg Surbey Cc: Marco Gatti Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93d5c9be1ddd57d4063ce463c9ac2be1e5ee14f1 Author: Andrea Arcangeli Date: Fri Apr 23 13:17:39 2010 -0400 memcg: fix prepare migration If a signal is pending (task being killed by sigkill) __mem_cgroup_try_charge will write NULL into &mem, and css_put will oops on null pointer dereference. BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 IP: [] mem_cgroup_prepare_migration+0x7c/0xc0 PGD a5d89067 PUD a5d8a067 PMD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/platform/microcode/firmware/microcode/loading CPU 0 Modules linked in: nfs lockd nfs_acl auth_rpcgss sunrpc acpi_cpufreq pcspkr sg [last unloaded: microcode] Pid: 5299, comm: largepages Tainted: G W 2.6.34-rc3 #3 Penryn1600SLI-110dB/To Be Filled By O.E.M. RIP: 0010:[] [] mem_cgroup_prepare_migration+0x7c/0xc0 [nishimura@mxp.nes.nec.co.jp: fix merge issues] Signed-off-by: Andrea Arcangeli Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Signed-off-by: Daisuke Nishimura Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cac36f707119b792b2396aed371d6b5cdc194890 Author: Jeff Mahoney Date: Fri Apr 23 13:17:37 2010 -0400 reiserfs: fix permissions on .reiserfs_priv Commit 677c9b2e393a0cd203bd54e9c18b012b2c73305a ("reiserfs: remove privroot hiding in lookup") removed the magic from the lookup code to hide the .reiserfs_priv directory since it was getting loaded at mount-time instead. The intent was that the entry would be hidden from the user via a poisoned d_compare, but this was faulty. This introduced a security issue where unprivileged users could access and modify extended attributes or ACLs belonging to other users, including root. This patch resolves the issue by properly hiding .reiserfs_priv. This was the intent of the xattr poisoning code, but it appears to have never worked as expected. This is fixed by using d_revalidate instead of d_compare. This patch makes -oexpose_privroot a no-op. I'm fine leaving it this way. The effort involved in working out the corner cases wrt permissions and caching outweigh the benefit of the feature. Signed-off-by: Jeff Mahoney Acked-by: Edward Shishkin Reported-by: Matt McCutchen Tested-by: Matt McCutchen Cc: Frederic Weisbecker Cc: Al Viro Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a0fc404ae663776e96db43879a0fa24fec1fa3a Author: H. Peter Anvin Date: Tue Apr 13 14:40:54 2010 -0700 x86: Disable large pages on CPUs with Atom erratum AAE44 Atom erratum AAE44/AAF40/AAG38/AAH41: "If software clears the PS (page size) bit in a present PDE (page directory entry), that will cause linear addresses mapped through this PDE to use 4-KByte pages instead of using a large page after old TLB entries are invalidated. Due to this erratum, if a code fetch uses this PDE before the TLB entry for the large page is invalidated then it may fetch from a different physical address than specified by either the old large page translation or the new 4-KByte page translation. This erratum may also cause speculative code fetches from incorrect addresses." [http://download.intel.com/design/processor/specupdt/319536.pdf] Where as commit 211b3d03c7400f48a781977a50104c9d12f4e229 seems to workaround errata AAH41 (mixed 4K TLBs) it reduces the window of opportunity for the bug to occur and does not totally remove it. This patch disables mixed 4K/4MB page tables totally avoiding the page splitting and not tripping this processor issue. This is based on an original patch by Colin King. Originally-by: Colin Ian King Cc: Colin Ian King Cc: Ingo Molnar Signed-off-by: H. Peter Anvin LKML-Reference: <1269271251-19775-1-git-send-email-colin.king@canonical.com> Cc: commit 7ce5a2b9bb2e92902230e3121d8c3047fab9cb47 Author: H. Peter Anvin Date: Fri Apr 23 16:17:40 2010 -0700 x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero When we do a thread switch, we clear the outgoing FS/GS base if the corresponding selector is nonzero. This is taken by __switch_to() as an entry invariant; it does not verify that it is true on entry. However, copy_thread() doesn't enforce this constraint, which can result in inconsistent results after fork(). Make copy_thread() match the behavior of __switch_to(). Reported-and-tested-by: Samuel Thibault Signed-off-by: H. Peter Anvin LKML-Reference: <4BD1E061.8030605@zytor.com> Cc: commit 7ce97d4f78b62e3af24cdd4df953d777e7efb2f6 Author: Anton Vorontsov Date: Fri Apr 23 07:12:44 2010 +0000 gianfar: Fix potential oops during OF address translation gianfar driver may pass NULL pointer to the of_translate_address(), which may lead to a kernel oops. Fix this by using of_iomap(), which is also much simpler and shorter. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 3b1fd3e55a39824e68bc8dd055d14892476e3671 Author: Anton Vorontsov Date: Fri Apr 23 07:12:35 2010 +0000 fsl_pq_mdio: Fix kernel oops during OF address translation Old P1020RDB device trees were not specifing tbipa address for MDIO nodes, which is now causing this kernel oops: ... eth2: TX BD ring size for Q[6]: 256 eth2: TX BD ring size for Q[7]: 256 Unable to handle kernel paging request for data at address 0x00000000 Faulting instruction address: 0xc0015504 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c0015504] memcpy+0x3c/0x9c LR [c000a9f8] __of_translate_address+0xfc/0x21c Call Trace: [df839e00] [c000a94c] __of_translate_address+0x50/0x21c (unreliable) [df839e50] [c01a33e8] get_gfar_tbipa+0xb0/0xe0 ... The old device trees are buggy, though having a dead ethernet is better than a dead kernel, so fix the issue by using of_iomap(). Also, a somewhat similar issue exist in the probe() routine, though there the oops is only a possibility. Nonetheless, fix it too. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 223e632c7a26c0424d658c35ef8c5e06bc28bf96 Author: Aaro Koskinen Date: Mon Mar 22 17:28:19 2010 +0000 omap: delete unused bootloader tag variables They are not needed and add over 512 bytes to kernel data. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit cf25eb950d0d8ada0db33c1d99d61bce620c128f Author: Thomas Weber Date: Wed Mar 24 12:52:15 2010 +0000 omap: Devkit8000: Remove unused pins Old code from original patch contains beagle board pins that are not available on the Devkit8000. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit faec32e5bfe699e40adcf30df82ec1db8fe8e43b Author: Thomas Weber Date: Wed Mar 24 12:52:14 2010 +0000 omap: Devkit8000: Change position of init calls Change position of calling serial and ethernet initialization. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 184644a633d1b8cf5f2f7cf0debc4ee3917adc44 Author: Thomas Weber Date: Wed Mar 24 12:52:13 2010 +0000 omap: Devkit8000: Remove unnecessary include file Remove include otg.h. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 3cdc6ee54a491003b583b47a56c4052c76c965e6 Author: Thomas Weber Date: Wed Mar 24 12:52:12 2010 +0000 omap: Devkit8000: Fix typo in pin name Replace wrong sdr_cke[01] with sdrc_cke[01]. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 51824c5f5ecf6175c1cc913cb5c7d6d6213e96aa Author: Thomas Weber Date: Wed Mar 24 12:52:11 2010 +0000 omap: Devkit8000: Add missing package selection Devkit8000 uses the CUS package for OMAP3530. This patch adds missing package selection for CUS and enables CONFIG_MUX. Replace whitespace with tab in Kconfig. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 6057db52a2c85659821feac4d3a86ada711893a4 Author: Thomas Weber Date: Wed Mar 24 12:52:10 2010 +0000 omap: Devkit8000: Fix typo in supplies Replace wrong vdss_dsi with vdds_dsi. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 57ed0e7b72e9b472c5ce862eaba5435b36233fab Author: Francisco Alecrim Date: Wed Mar 17 19:46:42 2010 +0000 n8x0_defconfig: remove CONFIG_NILFS2_FS override arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to symbol NILFS2_FS Signed-off-by: Francisco Alecrim Signed-off-by: Tony Lindgren commit 31849483f17dd76d48341dfc6dfc38261b630d26 Author: Thomas Weber Date: Thu Mar 25 20:21:54 2010 +0000 omap: board-sdp-flash.c: Fix typos in debug output Corrected type of flash in output (OneNAND => NOR). Removed whitespace after newline in output. Removed double whitespace in output. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit aee44c30e33bf8126773d1e2963e330b784ccd7c Author: Santosh Shilimkar Date: Wed Apr 7 07:47:23 2010 +0000 omap4: Fix McBSP4 base address This patch fixes the McBSP4 base address for OMAP4 Signed-off-by: Balaji T K Signed-off-by: Tony Lindgren commit cc352a3432abffb590b447fef89b4b5026387302 Author: Jarkko Nikula Date: Mon Apr 19 13:52:10 2010 +0000 omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and it seems also that the Maemo release works without when testing with the Maemo 2.6.28 kernel. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit c8fa4d2738bc747e417a220e6ceb21e8c148266f Author: Jarkko Nikula Date: Mon Apr 19 13:52:09 2010 +0000 omap: rx51_defconfig: Remove duplicate phonet Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42 and this duplicate gives a warning when doing make rx51_defconfig. Signed-off-by: Jarkko Nikula Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 11e1ef2d105900a302b7ca92bcaf96a96d0274a1 Author: stanley.miao Date: Tue Apr 20 06:33:30 2010 +0000 omap: fix a gpmc nand problem If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause a Oops. Signed-off-by: Stanley.Miao Signed-off-by: Tony Lindgren commit 5241b6b3bfa7be3661398cf93cb3dd187aeb65c6 Author: stanley.miao Date: Tue Apr 20 06:33:29 2010 +0000 AM3517: initialize i2c subsystem after mux subsystem The initialize of i2c subsystem will set pinmux, so it should be done after the initialize of mux subsystem initialization. Signed-off-by: Stanley.Miao Signed-off-by: Tony Lindgren commit 908c08d523f432a1b52298e2a50b21f4eebe6707 Author: stanley.miao Date: Tue Apr 20 06:33:27 2010 +0000 omap: remove one of the define of INT_34XX_BENCH_MPU_EMUL INT_34XX_BENCH_MPU_EMUL was defined twice, another is at Line 312. Signed-off-by: Stanley.Miao Signed-off-by: Tony Lindgren commit 562468bd697a88ad78a751823dc92f027f8c179c Author: stanley.miao Date: Tue Apr 20 06:33:26 2010 +0000 omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error, "gpmc_nand_init() is not defined". Add a inline noop function to fix it. Signed-off-by: Stanley.Miao Signed-off-by: Tony Lindgren commit c8334810db6e74019048cb3fc17c5e0b4d0c8c68 Author: Abraham Arce Date: Thu Apr 22 14:42:15 2010 +0000 OMAP4: Clocks: Change SPI Instance Names Change the name for the spi instances on omap44xx_clks to match the names omap2 spi driver gives: omap-mcspi.1 -> omap2_mcspi.1 omap-mcspi.2 -> omap2_mcspi.2 omap-mcspi.3 -> omap2_mcspi.3 omap-mcspi.4 -> omap2_mcspi.4 Signed-off-by: Abraham Arce Signed-off-by: Tony Lindgren commit 2135bb53fb6c9a4b2ed7901b2b176a6100e29f6b Author: Thomas Weber Date: Wed Mar 24 12:52:16 2010 +0000 omap: Devkit8000: Fix wrong usb port on Devkit8000 Disable the nonexistent ehci port on Devkit8000. Signed-off-by: Thomas Weber Acked-by: Anand Gadiyar Signed-off-by: Tony Lindgren commit 3655e0b415506a4d162ed4b2b12408c80dcfa4a2 Author: Santosh Shilimkar Date: Wed Apr 21 18:21:04 2010 +0000 OMAP4: Fix for CONTROL register Base This patch fixes the base address of CONTROL register on OMAP4430SDP. The control base is used by peripherals like MMC1 for PBIAS configuration. Signed-off-by: Santosh Shilimkar Signed-off-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit 9df76b7f179538903dfb4660ae27c807dd27535a Author: kishore kadiyala Date: Wed Apr 21 18:19:37 2010 +0000 OMAP4-HSMMC: FIX for MMC5 Controller IRQ Base This patch fixes HSMMC Controller5 IRQ Base. Signed-off-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit f6b74535b5286ddb7a8c86a48ec372615cffbc4c Author: Enric Balletbo i Serra Date: Mon Mar 1 15:02:36 2010 +0000 omap3: Fix EHCI port for IGEP v2 board IGEP v2 uses EHCI port 1 instead of EHCI port 2. Signed-off-by: Enric Balletbo i Serra Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 1dea5c6b5876ea917a082e95a76c10aac307d4ec Author: Tony Lindgren Date: Wed Apr 21 15:27:24 2010 -0700 omap: Fix n8x0 mmc_mmc_init compile warnings and typos Fix warning: 'return' with a value, in function returning void in n8x0_mmc_init. Also fix a search and replace typo. Signed-off-by: Tony Lindgren commit 67d24820c2f8e4df26e2ce6c7463db3f9d187f1f Author: Tony Lindgren Date: Wed Apr 21 15:27:25 2010 -0700 omap2: Fix ARM processor check for 24xx The value to check is 7 for V6 instead. The code has been working as it falls through to 24xx code if the other checks fail. Signed-off-by: Tony Lindgren commit df571c4ab32da9bc05a7db98516fc06ef3cdc5d1 Author: Richard Woodruff Date: Wed Apr 7 07:47:21 2010 +0000 omap4: Fix build break when used with gcc-4.4.1 (2009-q3) This patch adds argument to smc calls as gcc-4.4.1 requires it otherwise the build breaks with 2009-q3 toolchanin. arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc' make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 Signed-off-by: Richard Woodruff Signed-off-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit a36d515c7a2dfacebcf41729f6812dbc424ebcf0 Author: Joel Becker Date: Fri Apr 23 15:24:59 2010 -0700 ocfs2_dlmfs: Fix math error when reading LVB. When asked for a partial read of the LVB in a dlmfs file, we can accidentally calculate a negative count. Reported-by: Dan Carpenter Cc: Signed-off-by: Joel Becker commit c21a534e2f24968cf74976a4e721ac194db30ded Author: Tao Ma Date: Wed Apr 21 14:05:55 2010 +0800 ocfs2: Update VFS inode's id info after reflink. In reflink we update the id info on the disk but forgot to update the corresponding information in the VFS inode. Update them accordingly when we want to preserve the attributes. Reported-by: Jeff Liu Signed-off-by: Tao Ma Cc: Signed-off-by: Joel Becker commit 0350cb078f5035716ebdad4ad4709d02fe466a8a Author: Dan Carpenter Date: Thu Apr 22 11:39:29 2010 +0200 ocfs2: potential ERR_PTR dereference on error paths If "handle" is non null at the end of the function then we assume it's a valid pointer and pass it to ocfs2_commit_trans(); Signed-off-by: Dan Carpenter Cc: Signed-off-by: Joel Becker commit c9db3efee16add57ea459a00dfa00610fcbce931 Author: Corentin Chary Date: Sat Apr 10 11:02:51 2010 +0200 eeepc-laptop: add missing sparse_keymap_free Also remove legacy keymap which was not used since we use sparse_keymap. Signed-off-by: Corentin Chary commit a9743fcdc0eb43d028b71267438076e1b0112ba0 Author: Mark Fasheh Date: Fri Apr 23 11:42:22 2010 -0700 ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() If we get a failure during creation of an inode we'll allow the orphan code to remove the inode, which is correct. However, we need to ensure that we don't get any errors after the call to ocfs2_add_entry(), otherwise we could leave a dangling directory reference. The solution is simple - in both cases, all I had to do was move ocfs2_dentry_attach_lock() above the ocfs2_add_entry() call. Signed-off-by: Mark Fasheh commit 062d340384dcf77dfd8de0a082b5da571de3925a Author: Li Dongyang Date: Thu Apr 22 16:11:29 2010 +0800 ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error path Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod, so we can kill the inode in case of error. [ Fixed up comment style -Mark ] Signed-off-by: Li Dongyang Signed-off-by: Mark Fasheh commit ab41fdc8fdd9f0942430941c1e2b516fd481371d Author: Li Dongyang Date: Thu Apr 22 16:11:25 2010 +0800 ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error path Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR when we get an error after allocating one, so that we can kill the inode. Signed-off-by: Li Dongyang Signed-off-by: Mark Fasheh commit d4cd1871cff68e188dadcf6d1280762522b643eb Author: Li Dongyang Date: Thu Apr 22 16:11:19 2010 +0800 ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe code Currently in the error path of ocfs2_symlink and ocfs2_mknod, we just call iput with the inode we failed with, but the inode wipe code will complain because we don't add the inode to orphan dir. One solution would be to lock the orphan dir during the entire transaction, but that's too heavy for a rare error path. Instead, we add a flag, OCFS2_INODE_SKIP_ORPHAN_DIR which tells the inode wipe code that it won't find this inode in the orphan dir. [ Merge fixes and comment style cleanups -Mark ] Signed-off-by: Li Dongyang Signed-off-by: Mark Fasheh commit 33eaf788345c0311ab48ae62673c05f59fb09bb3 Merge: 3a3076f 227c4ed Author: Linus Torvalds Date: Fri Apr 23 10:40:36 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558 ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203 ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526 ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645 ALSA: hda - Fix resume from StR of HP 2510p with docking-station commit 3a3076f4d6e2fa31338a0b007df42a3b32f079e0 Author: Josef Bacik Date: Fri Apr 23 12:17:17 2010 -0400 Cleanup generic block based fiemap This cleans up a few of the complaints of __generic_block_fiemap. I've fixed all the typing stuff, used inline functions instead of macros, gotten rid of a couple of variables, and made sure the size and block requests are all block aligned. It also fixes a problem where sometimes FIEMAP_EXTENT_LAST wasn't being set properly. Signed-off-by: Josef Bacik Signed-off-by: Linus Torvalds commit 1918ad77f7f908ed67cf37c505c6ad4ac52f1ecf Author: Jesse Barnes Date: Fri Apr 23 09:32:23 2010 -0700 drm/i915: fix non-Ironlake 965 class crashes My PIPE_CONTROL fix (just sent via Eric's tree) was buggy; I was testing a whole set of patches together and missed a conversion to the new HAS_PIPE_CONTROL macro, which will cause breakage on non-Ironlake 965 class chips. Fortunately, the fix is trivial and has been tested. Be sure to use the HAS_PIPE_CONTROL macro in i915_get_gem_seqno, or we'll end up reading the wrong graphics memory, likely causing hangs, crashes, or worse. Reported-by: Zdenek Kabelac Reported-by: Toralf Förster Tested-by: Toralf Förster Signed-off-by: Jesse Barnes Signed-off-by: Linus Torvalds commit 227c4edb729790960f5f4991a703a398e925184c Merge: 1f10cd3 715aa67 Author: Takashi Iwai Date: Fri Apr 23 17:10:48 2010 +0200 Merge branch 'fix/misc' into for-linus commit 1f10cd34d9b347106cb34ef91c8ff76f12ee67a8 Merge: 923125c 5c1bccf Author: Takashi Iwai Date: Fri Apr 23 17:10:44 2010 +0200 Merge branch 'fix/hda' into for-linus commit 0ad707407d933841a0f337d6edccbc1d6c83e186 Author: Yegor Yefremov Date: Wed Apr 7 09:34:56 2010 +0100 ARM: 6030/1: KS8695: enable console Add add_preferred_console() to ks8695_console_init() to enable the console Signed-off-by: Yegor Yefremov Acked-by: Andrew Victor Signed-off-by: Russell King commit 4b402210486c6414fe5fbfd85934a0a22da56b04 Author: Benjamin Herrenschmidt Date: Fri Apr 16 23:20:00 2010 +0200 mutex: Don't spin when the owner CPU is offline or other weird cases Due to recent load-balancer changes that delay the task migration to the next wakeup, the adaptive mutex spinning ends up in a live lock when the owner's CPU gets offlined because the cpu_online() check lives before the owner running check. This patch changes mutex_spin_on_owner() to return 0 (don't spin) in any case where we aren't sure about the owner struct validity or CPU number, and if the said CPU is offline. There is no point going back & re-evaluate spinning in corner cases like that, let's just go to sleep. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Peter Zijlstra LKML-Reference: <1271212509.13059.135.camel@pasglop> Signed-off-by: Ingo Molnar commit c6f8505e4627ba8ca46cbcb602ad82e7f17a7122 Author: Alex Deucher Date: Fri Apr 23 02:26:55 2010 -0400 drm/radeon/kms/evergreen: No EnableYUV table DCE4 cards don't have an EnableYUV table. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 5c1bccf645d4ab65e4c7502acb42e8b9afdb5bdc Author: Daniel T Chen Date: Thu Apr 22 17:54:45 2010 -0400 ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558 BugLink: https://launchpad.net/bugs/568600 The OR has verified that the dell-m6 model quirk is necessary for audio to be audible by default on the Dell Studio XPS 1645. This change is necessary for 2.6.32.11 and 2.6.33.2 alike. Reported-by: Andy Ross Tested-by: Andy Ross Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 0e0280dc2b0c7395a880d25544b47f3e3e3f79db Author: Daniel T Chen Date: Wed Apr 21 19:55:43 2010 -0400 ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203 BugLink: https://launchpad.net/bugs/459083 The OR has verified with 2.6.32.11 and the latest alsa-driver stable daily snapshot that position_fix=1 is necessary for the external mic to work and for PulseAudio not to crash constantly. This patch is necessary also for 2.6.32.11 and 2.6.33.2. Reported-by: Tested-by: Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 94f7bf647315472c80b8368c849739038e5620a3 Author: Tormod Volden Date: Thu Apr 22 16:57:32 2010 -0400 drm/radeon: 9800 SE has only one quadpipe Although these cards have 2 pipelines on the silicon only the first passed the QA and the other should be disabled. http://www.digital-daily.com/video/ati-radeon9800se/ http://www.rojakpot.com/showarticle.aspx?artno=101&pgno=1 agd5f: add some other SE cards as well; fix up kms Signed-off-by: Tormod Volden Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9c950a43dd4d1e22a4b893c991871bac26930f97 Author: Dave Airlie Date: Fri Apr 23 13:21:58 2010 +1000 drm/radeon/kms: don't print error for legal crtcs. With evergreen this is bounded by num_crtc not by 0,1. Signed-off-by: Dave Airlie commit 677d07683ea826c19ddcb156e9c1337cd7bd8539 Author: Alex Deucher Date: Thu Apr 22 22:58:50 2010 -0400 drm/radeon/kms/evergreen: fix LUT setup Must have gotten broken during an earlier rebase. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5a30458a90597915977f06e79406b664a41b8ac Merge: a4b7d3b a09bf4c Author: Linus Torvalds Date: Thu Apr 22 19:46:29 2010 -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: libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. libata: fix docs, RE port and device of libata.force ID separated by point pata_pcmcia/ide-cs: add IDs for transcend and kingston cards libata: fix locking around blk_abort_request() commit fda48a0d7a8412cedacda46a9c0bf8ef9cd13559 Author: Eric Dumazet Date: Wed Apr 21 09:26:15 2010 +0000 tcp: bind() fix when many ports are bound Port autoselection done by kernel only works when number of bound sockets is under a threshold (typically 30000). When this threshold is over, we must check if there is a conflict before exiting first loop in inet_csk_get_port() Change inet_csk_bind_conflict() to forbid two reuse-enabled sockets to bind on same (address,port) tuple (with a non ANY address) Same change for inet6_csk_bind_conflict() Reported-by: Gaspar Chilingarov Signed-off-by: Eric Dumazet Acked-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit a09bf4cd53b8ab000197ef81f15d50f29ecf973c Author: Jeff Garzik Date: Thu Apr 22 21:59:13 2010 -0400 libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit 792590c72376649b4e315df386fd208b83db05b9 Author: Phillip Lougher Date: Sun Apr 4 22:20:58 2010 +0100 squashfs: fix locking bug in zlib wrapper Fix locking bug in zlib wrapper introduced by recent decompressor changes. Signed-off-by: Phillip Lougher commit 4c44f309cd396c18b096d31f03126824c685dbe2 Author: Roman Fietze Date: Wed Apr 21 12:17:12 2010 +0200 libata: fix docs, RE port and device of libata.force ID separated by point According to libata-core correctly around line 6572: /* parse id */ p = strchr(id, '.'); ... the optional device is separated from the port in the libata.force ID by a point or dot instead of by a colon. Fix documentation to reflect this. Signed-off-by: Roman Fietze Signed-off-by: Jeff Garzik commit f25798eda66c753aeaaec15244e0c919cf1d31e0 Author: Kristoffer Ericson Date: Mon Apr 19 19:54:11 2010 +0200 pata_pcmcia/ide-cs: add IDs for transcend and kingston cards This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB. Signed-off-by: Kristoffer Ericson Signed-off-by: Jeff Garzik commit fa41efdae7de61191a7bda3a00e88ef69afb5bb9 Author: Tejun Heo Date: Thu Apr 15 08:57:37 2010 +0900 libata: fix locking around blk_abort_request() blk_abort_request() expectes queue lock to be held by the caller. Grab it before calling the function. Lack of this synchronization led to infinite loop on corrupt q->timeout_list. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit a4b7d3bb744bbaaceb94a9aaf6b5cbc6e5d230f0 Merge: a2340be 6307e09 Author: Linus Torvalds Date: Thu Apr 22 18:24:37 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: usb: Increase timeout value for device reset USB: put claimed interfaces in the "suspended" state USB: EHCI: defer reclamation of siTDs USB: fix remote wakeup settings during system sleep USB: pl2303: add AdLink ND-6530 USB IDs USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem. USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs usb: wusb: don't overflow the Keep Alive IE buffer USB: ehci: omap: fix kernel panic with rmmod USB: fixed bug in usbsevseg using USB autosuspend incorrectly USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices commit a2340be047aaf026cbec6ee649c3f1eaf2bc7bd7 Merge: 7db2ccd a30dcb4 Author: Linus Torvalds Date: Thu Apr 22 18:24:27 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: sysfs: use sysfs_attr_init in ASUS atk0110 driver Documentation/HOWTO: update git home URL Documentation: -stable rules: upstream commit ID requirement reworded commit 7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb Merge: a2b297f e552eb7 Author: Linus Torvalds Date: Thu Apr 22 18:24:06 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge drm/i915: cleanup FBC buffers at unload time drm/i915: fix tiling limits for i915 class hw v2 drm/i915: set DIDL using the ACPI video output device _ADR method return. drm/i915: Fix 82854 PCI ID, and treat it like other 85X drm/i915: Attempt to fix watermark setup on 85x (v2) commit a2b297ff56b9bad251d11a476880a5e4614cd92f Merge: cfc94b2 6e3b96e Author: Linus Torvalds Date: Thu Apr 22 18:21:38 2010 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: fix previous patch. commit 519e61666f4030426fc539d4e7102dc2bad41113 Author: manjugk manjugk Date: Thu Mar 4 07:11:56 2010 +0000 omap: DMA: Init CDAC to zero The register DMA4_CDAC needs to be initialized to zero before starting DMA transfer. Cc: Santosh Shilimkar Cc: Govindraj R Cc: Kevin Hilman Reported-by:S, Venkatraman Signed-off-by: Manjunatha GK Signed-off-by: Tony Lindgren commit 29501577a7f3c925d5273064752ce3dc356ccfad Author: Janusz Krzysztofik Date: Mon Apr 5 11:38:06 2010 +0000 omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTH Since IRQ_TYPE_EDGE_BOTH is defined as (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING), testing against it with a bitwise AND also matches both single-edge cases in addition to the intended both edges case. Fix it, replacing with a more accurate expression. Created and tested againts linux-2.6.34-rc3. Applicable to 2.6.33-stable as well. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit 46cdc4e431536c279b1ce00520d6fe6e9ca42b04 Author: Felipe Balbi Date: Wed Apr 7 09:57:23 2010 +0000 arm: omap1: remove dead code from timer32k.c Trivial patch, no functional changes Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 2decb12e3ebec556520dd92178572449af8ed617 Author: Aaro Koskinen Date: Wed Apr 7 09:57:22 2010 +0000 omap: fix clocksource_32k to start from zero When the 32k sync timer is used for sched_clock(), it should count time from the kernel boot (clocksource init) instead of the last HW reset. Otherwise printk.time values will jump suddenly during the boot: [ 0.000000] calling omap2_clk_arch_init+0x0/0x138 @ 1 [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned -22 after 0 usecs [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned with error code -22 [ 0.000000] calling omap_init_clocksource_32k+0x0/0x98 @ 1 [ 508.697937] initcall omap_init_clocksource_32k+0x0/0x98 returned 0 after 0 usecs [ 508.697967] calling omap_init_devices+0x0/0x38 @ 1 [ 508.698425] initcall omap_init_devices+0x0/0x38 returned 0 after 0 usecs This will confuse tools such as scripts/bootgraph.pl. Signed-off-by: Aaro Koskinen Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit cc2893b6af5265baa1d68b17b136cffca9e40cfa Author: Matthew Garrett Date: Thu Apr 22 09:30:51 2010 -0400 PCI: Ensure we re-enable devices on resume If the firmware puts a device back into D0 state at resume time, we'll update its state in resume_noirq and thus skip the platform resume code. Calling that code twice should be safe and we ought to avoid getting to that point anyway, so remove the check and also allow the platform pci code to be called for D0. Fixes USB not being powered after resume on recent Lenovo machines. Acked-by: Alex Chiang Acked-by: Rafael J. Wysocki Signed-off-by: Matthew Garrett Signed-off-by: Jesse Barnes commit 66528fdd45b082bf7c74687d72ae08afa4a446f8 Author: Bjorn Helgaas Date: Tue Apr 20 13:52:41 2010 -0600 x86/PCI: parse additional host bridge window resource types This adds support for Memory24, Memory32, and Memory32Fixed descriptors in PCI host bridge _CRS. I experimentally determined that Windows (2008 R2) accepts these descriptors and treats them as windows that are forwarded to the PCI bus, e.g., if it finds any PCI devices with BARs outside the windows, it moves them into the windows. I don't know whether any machines actually use these descriptors in PCI host bridge _CRS methods, but if any exist and they're new enough that we automatically turn on "pci=use_crs", they will work with Windows but not with Linux. Here are the details: https://bugzilla.kernel.org/show_bug.cgi?id=15817 Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 45aa23b4cbd37408678c96cd113241860d3321f6 Author: Bjorn Helgaas Date: Thu Apr 22 09:02:43 2010 -0600 PCI: revert broken device warning This reverts c519a5a7dab2d. That change added a warning about devices that didn't respond correctly when sizing BARs, which helped diagnose broken devices. But the test wasn't specific enough, so it also complained about working devices with zero-size BARs, e.g., https://bugzilla.kernel.org/show_bug.cgi?id=15822 Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 24acc6895616b373475e92e49925efc3ef591563 Author: Dan Carpenter Date: Wed Apr 21 23:55:27 2010 +0000 rdma: potential ERR_PTR dereference In the original code, the "goto out" calls "rdma_destroy_id(cm_id);" That isn't needed here and would cause problems because "cm_id" is an ERR_PTR. The new code just returns directly. Signed-off-by: Dan Carpenter Acked-by: Andy Grover Signed-off-by: David S. Miller commit 80032cffb95edff4fc216b1cb21682257be326b7 Author: Dan Carpenter Date: Wed Apr 21 23:53:27 2010 +0000 rtnetlink: potential ERR_PTR dereference In the original code, if rtnl_create_link() returned an ERR_PTR then that would get passed to rtnl_configure_link() which dereferences it. Signed-off-by: Dan Carpenter Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit a30dcb4f68fb60440f71b3e62bc5c15f631d14f9 Author: Jiri Kosina Date: Thu Apr 15 02:45:25 2010 +0200 sysfs: use sysfs_attr_init in ASUS atk0110 driver Annotate dynamic sysfs attribute in atk_create_files(). This gets rid of the following lockdep warning: BUG: key ffff8800379ca670 not in .data! ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:2696 lockdep_init_map+0xd2/0x108() Hardware name: P5K PRO Modules linked in: asus_atk0110(+) pata_acpi firewire_ohci ata_generic dm_multipath firewire_core crc_itu_t pata_marvell floppy Pid: 599, comm: modprobe Not tainted 2.6.34-rc4 #27 Call Trace: [] warn_slowpath_common+0x7c/0x94 [] warn_slowpath_null+0x14/0x16 [] lockdep_init_map+0xd2/0x108 [] sysfs_add_file_mode+0x66/0xa2 [] sysfs_add_file+0x11/0x13 [] sysfs_create_file+0x2a/0x2c [] device_create_file+0x19/0x1b [] atk_add+0x58b/0x72e [asus_atk0110] [] acpi_device_probe+0x50/0x122 [] driver_probe_device+0xa2/0x127 [] __driver_attach+0x4f/0x6b [] ? __driver_attach+0x0/0x6b [] bus_for_each_dev+0x59/0x8e [] driver_attach+0x1e/0x20 [] bus_add_driver+0xb9/0x207 [] driver_register+0x9d/0x10e [] ? atk0110_init+0x0/0x31 [asus_atk0110] [] acpi_bus_register_driver+0x43/0x45 [] atk0110_init+0x15/0x31 [asus_atk0110] [] ? atk0110_init+0x0/0x31 [asus_atk0110] [] do_one_initcall+0x5e/0x15e [] sys_init_module+0xd8/0x239 [] system_call_fastpath+0x16/0x1b ---[ end trace 4d0c84007055efb9 ]--- BUG: key ffff8800379ca638 not in .data! BUG: key ffff8800379ca6a8 not in .data! BUG: key ffff8800379ca6e0 not in .data! BUG: key ffff880036f73670 not in .data! BUG: key ffff880036f73638 not in .data! BUG: key ffff880036f736a8 not in .data! BUG: key ffff880036f736e0 not in .data! BUG: key ffff880036f76c70 not in .data! BUG: key ffff880036f76c38 not in .data! BUG: key ffff880036f76ca8 not in .data! BUG: key ffff880036f76ce0 not in .data! BUG: key ffff8800368e7670 not in .data! BUG: key ffff8800368e7638 not in .data! BUG: key ffff8800368e76a8 not in .data! BUG: key ffff8800368e76e0 not in .data! BUG: key ffff880036ef7670 not in .data! BUG: key ffff880036ef7638 not in .data! BUG: key ffff880036ef76a8 not in .data! BUG: key ffff880036ef76e0 not in .data! BUG: key ffff8800373ccc70 not in .data! BUG: key ffff8800373ccc38 not in .data! BUG: key ffff8800373ccca8 not in .data! BUG: key ffff8800373ccce0 not in .data! BUG: key ffff880037a60870 not in .data! BUG: key ffff880037a60838 not in .data! BUG: key ffff880037a608a8 not in .data! BUG: key ffff880037a608e0 not in .data! BUG: key ffff880037355070 not in .data! BUG: key ffff880037355038 not in .data! BUG: key ffff8800373550a8 not in .data! BUG: key ffff8800373550e0 not in .data! BUG: key ffff8800378c2670 not in .data! BUG: key ffff8800378c2638 not in .data! BUG: key ffff8800378c26a8 not in .data! BUG: key ffff8800378c26e0 not in .data! BUG: key ffff880036ef7e70 not in .data! BUG: key ffff880036ef7e38 not in .data! BUG: key ffff880036ef7ea8 not in .data! BUG: key ffff880036ef7ee0 not in .data! Cc: Eric W. Biederman Reported-by: Dhaval Giani Signed-off-by: Jiri Kosina Tested-by: Dhaval Giani Signed-off-by: Greg Kroah-Hartman commit e234ebf7881c013b654113f0a208977ac3ce1d01 Author: Randy Dunlap Date: Tue Apr 6 16:16:59 2010 -0700 Documentation/HOWTO: update git home URL Update git home page info. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 959fb1c5075c2dcdbe879e6dafbc59eb1e1192d6 Author: Stefan Richter Date: Thu Apr 1 22:01:52 2010 +0200 Documentation: -stable rules: upstream commit ID requirement reworded It is a hard requirement to include the upstream commit ID in the changelog of a -stable submission, not just a courtesy to the stable team. This concerns only mail submission though, which is no longer the only way into stable. (Also, fix a double "the".) Signed-off-by: Stefan Richter Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 6307e0961205c50a8a9b6e8e3e4dfd178a944ba9 Author: Dinh Nguyen Date: Tue Apr 13 11:13:15 2010 -0500 usb: Increase timeout value for device reset It seems that for USB IP on Freescale MX5x processors, it needs >750 usec for the reset to complete. This change should not hurt any other EHCI hardware. Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman commit 571dc79d62a163fd043de47d7d39bae58831e81e Author: Alan Stern Date: Fri Apr 9 16:03:43 2010 -0400 USB: put claimed interfaces in the "suspended" state This patch (as1370) fixes a bug in the USB runtime power management code. When a driver claims an interface, it doesn't expect to need to call usb_autopm_get_interface() or usb_autopm_put_interface() for runtime PM to work. Runtime PM can be controlled by the driver's primary interface; the additional interfaces it claims shouldn't interfere. As things stand, the claimed interfaces will prevent the device from autosuspending. To fix this problem, the patch sets interfaces to the suspended state when they are claimed. Also, although in theory this shouldn't matter, the patch changes the suspend code so that interfaces are suspended in reverse order from detection and resuming. This is how the PM core works, and we ought to use the same approach. Signed-off-by: Alan Stern Debugged-and-tested-by: Dominik Brodowski Signed-off-by: Greg Kroah-Hartman commit 0e5f231bc16ff9910882fa5b9d64d80e7691cfab Author: Alan Stern Date: Thu Apr 8 16:56:37 2010 -0400 USB: EHCI: defer reclamation of siTDs This patch (as1369) fixes a problem in ehci-hcd. Some controllers occasionally run into trouble when the driver reclaims siTDs too quickly. This can happen while streaming audio; it causes the controller to crash. The patch changes siTD reclamation to work the same way as iTD reclamation: Completed siTDs are stored on a list and not reused until at least one frame has passed. Signed-off-by: Alan Stern Tested-by: Nate Case CC: Signed-off-by: Greg Kroah-Hartman commit 5f677f1d45b2bf08085bbba7394392dfa586fa8e Author: Alan Stern Date: Fri Apr 2 13:20:11 2010 -0400 USB: fix remote wakeup settings during system sleep This patch (as1363) changes the way USB remote wakeup is handled during system sleeps. It won't be enabled unless an interface driver specifically needs it. Also, it won't be enabled during the FREEZE or QUIESCE phases of hibernation, when the system doesn't respond to wakeup events anyway. Finally, if the device is already runtime-suspended with remote wakeup enabled, but wakeup is supposed to be disabled for the system sleep, the device gets woken up so that it can be suspended again with the proper wakeup setting. This will fix problems people have reported with certain USB webcams that generate wakeup requests when they shouldn't, and as a result cause system suspends to fail. See https://bugs.launchpad.net/ubuntu/+source/linux/+bug/515109 Signed-off-by: Alan Stern Tested-by: Erik Andrén CC: Signed-off-by: Greg Kroah-Hartman commit 9a61d72602771906e11a5944e8571f8006387b39 Author: Manuel Jander Date: Mon Mar 29 23:51:57 2010 +0200 USB: pl2303: add AdLink ND-6530 USB IDs I read a rumor that the AdLink ND6530 USB RS232, RS422 and RS485 isolated adapter is actually a PL2303 based usb serial adapter. I tried it out, and as far as I can tell it works. Signed-off-by: Manuel Jander Signed-off-by: Greg Kroah-Hartman commit cfbaa39347b34837f26e01fe8f4f8dbbae60b520 Author: William Lightning Date: Fri Mar 26 10:51:20 2010 -0700 USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem. Signed-off-by: William Lightning Signed-off-by: Greg Kroah-Hartman commit 9600cbb24b3937dc6ebf470211d8908354ca3b0c Author: Sergei Shtylyov Date: Fri Mar 26 17:37:14 2010 +0300 USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename It appears that the DA8xx/OMAP-L1x glue layer went into the kernel uncompilable: commit 1960e693ac12ae5fe518309d6a63a44c93fad9e7 (davinci: da8xx/omapl1: add support for the second sysconfig module) has renamed DA8XX_SYSCFG_* macros to DA8XX_SYSCFG0_* and it's been committed before the glue layer... Signed-off-by: Sergei Shtylyov Signed-off-by: Greg Kroah-Hartman commit 898f89c388534e5fe4b05b760d7f737cc352bad3 Author: Dan Williams Date: Tue Mar 23 03:08:48 2010 -0700 USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs These phones also have the familiar ttyACM0/ttyUSB0 schizophrenia when placed into "Dial-up Networking" mode after connecting a USB cable. Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit a23b64845f1ed0c090e30a70ca747a379674e006 Author: David Vrabel Date: Mon Mar 22 14:50:14 2010 +0000 usb: wusb: don't overflow the Keep Alive IE buffer The Keep Alive IE only has space for WUIE_ELT_MAX (== 4) device addresses. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 18f91196b6e7994bd694a96a6c3b0ac1f3e81d82 Author: Ajay Kumar Gupta Date: Thu Mar 18 16:58:35 2010 +0530 USB: ehci: omap: fix kernel panic with rmmod Sets the regulator values to NULL if they are not defined. This is required to fix the kernel panic in exit path when EHCI module is removed on the platforms where EHCI regulator are not set. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Greg Kroah-Hartman commit 4c1f5c88aaffacb2831353b6d3c1557be52071a2 Author: Harrison Metzger Date: Tue Mar 9 15:12:10 2010 -0500 USB: fixed bug in usbsevseg using USB autosuspend incorrectly This patch fixes a bug with the usbsevseg driver which assumed that USB autosuspend will always be used. Signed-off-by: Harrison Metzger Signed-off-by: Greg Kroah-Hartman commit cdc04834ce70343aa6f87c5332ec66c35d968967 Author: Alex Manoussakis Date: Thu Apr 22 15:18:20 2010 -0700 USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices The following patch adds support for Multitech Systems' MT9234MU and MT9234ZBA usb dialup fax modems. It is based on a patch and firmware provided to me by Multitech Systems' support, after I reported to them that my MT9234MU modem was not working with recent linux kernels. Signed-off-by: Alex Manoussakis Signed-off-by: Greg Kroah-Hartman commit e552eb7038a36d9b18860f525aa02875e313fe16 Author: Jesse Barnes Date: Wed Apr 21 11:39:23 2010 -0700 drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge Since 965, the hardware has supported the PIPE_CONTROL command, which provides fine grained GPU cache flushing control. On recent chipsets, this instruction is required for reliable interrupt and sequence number reporting in the driver. So add support for this instruction, including workarounds, on Ironlake and Sandy Bridge hardware. https://bugs.freedesktop.org/show_bug.cgi?id=27108 Signed-off-by: Jesse Barnes Tested-by: Chris Wilson Signed-off-by: Eric Anholt commit 6e3b96ed610e5a1838e62ddae9fa0c3463f235fa Author: NeilBrown Date: Fri Apr 23 07:08:28 2010 +1000 md/raid5: fix previous patch. Previous patch changes stripe and chunk_number to sector_t but mistakenly did not update all of the divisions to use sector_dev(). This patch changes all the those divisions (actually the '%' operator) to sector_div. Signed-off-by: NeilBrown Cc: stable@kernel.org Tested-by: Stefan Lippers-Hollmann commit 20bf377e679208ba9ae0edcb8c70a8f6d33d17f9 Author: Jesse Barnes Date: Wed Apr 21 11:39:22 2010 -0700 drm/i915: cleanup FBC buffers at unload time This keeps the memory manager from complaining when we take it down. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit cfc94b2c9ac603b20db54225408df6ed80188dcd Merge: 4c6a399 e139366 Author: Linus Torvalds Date: Thu Apr 22 12:54:54 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: wait for local CSR lock access to finish firewire: ohci: prevent aliasing of locally handled register addresses firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources firewire: core: fix retries calculation in iso manage_channel() firewire: cdev: fix cut+paste mistake in disclaimer commit 71d0a6112a363e703e383ae5b12c492485c39701 Author: Trond Myklebust Date: Thu Apr 22 15:35:57 2010 -0400 NFS: Fix an unstable write data integrity race Commit 2c61be0a9478258f77b66208a0c4b1f5f8161c3c (NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible) exposed a race on file close. In order to ensure correct close-to-open behaviour, we want to wait for all outstanding background commit operations to complete. This patch adds an inode flag that indicates if a commit operation is under way, and provides a mechanism to allow ->write_inode() to wait for its completion if this is a data integrity flush. Signed-off-by: Trond Myklebust commit cdd29ecfcb9554132cd94b82ae8b69ba37adb3b5 Author: Dan Carpenter Date: Thu Apr 22 15:35:56 2010 -0400 nfs: testing for null instead of ERR_PTR() nfs_path() returns an ERR_PTR(), it doesn't return null. Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust commit 356e76b855bdbfd8d1c5e75bcf0c6bf0dfe83496 Author: Chuck Lever Date: Thu Apr 22 15:35:56 2010 -0400 NFS: rsize and wsize settings ignored on v4 mounts NFSv4 mounts ignore the rsize and wsize mount options, and always use the default transfer size for both. This seems to be because all NFSv4 mounts are now cloned, and the cloning logic doesn't copy the rsize and wsize settings from the parent nfs_server. I tested Fedora's 2.6.32.11-99 and it seems to have this problem as well, so I'm guessing that .33, .32, and perhaps older kernels have this issue as well. Signed-off-by: Chuck Lever Cc: Stable Signed-off-by: Trond Myklebust commit 1f063d2cdf332a8a5722006b1345d15d16007c6e Author: Trond Myklebust Date: Thu Apr 22 15:35:55 2010 -0400 NFSv4: Don't attempt an atomic open if the file is a mountpoint Fix https://bugzilla.kernel.org/show_bug.cgi?id=15789 Signed-off-by: Trond Myklebust commit 3d7b08945e54a3a5358d5890240619a013cb7388 Author: Trond Myklebust Date: Thu Apr 22 15:35:55 2010 -0400 SUNRPC: Fix a bug in rpcauth_prune_expired Don't want to evict a credential if cred->cr_expire == jiffies, since that means that it was just placed on the cred_unused list. We therefore need to use time_in_range() rather than time_in_range_open(). Signed-off-by: Trond Myklebust commit 4c6a3999651741419cd3cc4303cf0c2be07d89bc Author: Valdis.Kletnieks@vt.edu Date: Thu Apr 22 14:29:10 2010 -0400 dri-devel mailing list moved - update MAINTAINERS I posted to dri-devel@lists.sourceforge.net, and got a bounce back: The dri-devel list has moved to freedesktop.org (see http://lists.freedesktop.org/mailman/listinfo/dri-devel). If you were subscribed to the list here, the subscription should have been transferred to the new location. Please only post to the new list. Fix MAINTAINERS to correspond. Signed-off-by: Valdis Kletnieks Signed-off-by: Linus Torvalds commit 36c48f8cc5fc0558c1109a84b0832a26c384d8f1 Merge: 1482338 7f3c1fa Author: Linus Torvalds Date: Thu Apr 22 11:15:33 2010 -0700 Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: uml: Fix build breakage after slab.h changes commit 1482338f6242dbaea46039c5f1b4604a472b364b Author: Randy Dunlap Date: Thu Apr 22 11:02:14 2010 -0700 scsi: fix operator precedence warning Fix operator precedence warning (from sparse), which results in the data value always being 0: drivers/scsi/qla4xxx/ql4_mbx.c:470:66: warning: right shift by bigger than source value Signed-off-by: Randy Dunlap Acked-by: Ravi Anand Cc: David C Somayajulu Cc: Karen Higgins Cc: Vikas Chaudhary Signed-off-by: Linus Torvalds commit c81eddb0e3728661d1585fbc564449c94165cc36 Merge: a28ca3f 76ef964 Author: Linus Torvalds Date: Thu Apr 22 08:43:59 2010 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] zcore: Fix reipl device detection [S390] vdso: use ntp adjusted clock multiplier [S390] cio: use exception-save stsch [S390] add hook to reenable mss after hibernation [S390] cio: allow enable_facility from outside init functions [S390] dasd: fix endless loop in erp commit 76ef964c78797f9baed7c2f9a58f696e86d8a048 Author: Michael Holzheu Date: Thu Apr 22 17:17:07 2010 +0200 [S390] zcore: Fix reipl device detection The reipl device information is passed from the kernel to zfcpdump using a pointer in the lowcore (0xe00) that points to the reipl information Currently if that pointer is not zero, we copy the reipl information. If the pointer is not initialized and points outside the accessible memory, it can happen that the memory copy fails. In that case we currently stop the initialization of zcore which leads to a failing kernel dump. The correct behavior is to disable the reipl after dump and continue with zcore intialization. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 157a1a27d5921fc94db8c14e0d01363d13de99b5 Author: Hendrik Brueckner Date: Thu Apr 22 17:17:06 2010 +0200 [S390] vdso: use ntp adjusted clock multiplier Commit "timekeeping: Fix clock_gettime vsyscall time warp" (0696b711e) introduced the new parameter "mult" to update_vsyscall(). This parameter contains the internal NTP adjusted clock multiplier. The s390x vdso did not use this adjusted multiplier. Instead, it used the constant clock multiplier for gettimeofday() and clock_gettime() variants. This may result in observable time warps as explained in commit 0696b711e. Make the NTP adjusted clock multiplier available to the s390x vdso implementation and use it for time calculations. Cc: Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 8821d24cd261aede9b0436cd3252b17a60ccc33a Author: Sebastian Ott Date: Thu Apr 22 17:17:05 2010 +0200 [S390] cio: use exception-save stsch Using stsch on schids with ssid != 0 can lead to an operand exception. Use stsch_err to handle potential exceptions if we fail to reenable mss after hibernation. Cc: Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 889ee9556c89a877b8343b6bbe6ac8dc5d57e433 Author: Sebastian Ott Date: Thu Apr 22 17:17:04 2010 +0200 [S390] add hook to reenable mss after hibernation Reenable multiple subchannel sets after hibernation, prior to the device callbacks. Cc: Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 818c272bd74b834c3ca9347c6a540c2ec880afdc Author: Sebastian Ott Date: Thu Apr 22 17:17:03 2010 +0200 [S390] cio: allow enable_facility from outside init functions Prepare chsc_enable_facility to be used from outside init functions. Use static memory for the chsc call and protect its access by a spinlock (although there is no concurrent usage). Cc: Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 6a5176c474e3e722ab273d940442238e554e5e58 Author: Stefan Haberland Date: Thu Apr 22 17:17:02 2010 +0200 [S390] dasd: fix endless loop in erp If not enough memory is available to build a new erp request it ended up in an endless loop trying to build erp requests. Fixed the loop to proceed the next request instead. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 715aa675338ce6e1a3b4f77cf87ea611f93058a8 Author: Hans de Goede Date: Wed Apr 21 11:04:08 2010 -0400 ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume Ignore spurious HV interrupts during suspend / resume, this avoids mistaking them for a mute button press. This is not very pretty but it seems the only way to fix the master volume control gets muted after suspend issue I'm seeing. Note that the es1968 driver is doing exactly the same. Signed-off-by: Hans de Goede Cc: Signed-off-by: Takashi Iwai commit 7efbfd1ae98ef9efe06352e2a1ad83e8c14ceeb1 Author: Hans de Goede Date: Wed Apr 21 11:04:06 2010 -0400 ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C Without this quirk sound stops working after suspend resume. With this quirk, one still needs to manually unmute the master volume control after a suspend / / resume cycle. That is fixed in another patch in this set. Note that this patch was submitted to the alsa bug tracker a long time ago: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4319 Signed-off-by: Hans de Goede CC: Signed-off-by: Takashi Iwai commit a28ca3f3244dfe05d16c67f2c0636ce6bf2b4e0a Merge: 61fb06c 490475a Author: Linus Torvalds Date: Thu Apr 22 07:50:11 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] bnx2i: Bug fixes related to MTU change issue when there are active iscsi sessions [SCSI] ibmvscsi: fix DMA API misuse [SCSI] wd7000: fix reset handler typo spin_unlock_irq() => spin_lock_irq() [SCSI] zfcp: Fix tracing of requests with error status [SCSI] zfcp: Update MAINTAINERS entry [SCSI] iscsi_tcp: fix relogin/shutdown hang [SCSI] qla2xxx: fix lock imbalance [SCSI] lpfc: fix lock imbalances [SCSI] be2iscsi: fix lock imbalance [SCSI] dpt_i2o: several use after free issues commit 61fb06cc8e68906fb29d67bd5b6c2d50a95fc9e5 Author: Balbir Singh Date: Thu Apr 22 12:22:34 2010 +0930 virtio: Fix GFP flags passed from the virtio balloon driver The virtio balloon driver can dig into the reservation pools of the OS to satisfy a balloon request. This is not advisable and other balloon drivers (drivers/xen/balloon.c) avoid this as well. The patch also adds changes to avoid printing a warning if allocation fails, since we retry after sometime anyway. Signed-off-by: Balbir Singh Signed-off-by: Rusty Russell Cc: kvm Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b Merge: 74a9201 42df64b Author: Linus Torvalds Date: Thu Apr 22 07:20:30 2010 -0700 Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c-stu300: off by one issue i2c-pnx: Add stop conditions for end of transfer i2c-pnx: Limit maximum divider to 1023 i2c-omap: fix OOPS in omap_i2c_unidle() during probe i2c-imx: fix error handling commit 74a920139a0f1119c5a604cef0ce5d6f591dc782 Author: Randy Dunlap Date: Wed Apr 21 14:32:47 2010 -0700 staging: fix dt3155 build When the dt3155 driver is built-in (not as a loadable module), these build errors happen: drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq' drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function) drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function) drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq' so remove the #ifdef MODULE check since it's not needed. Also remove the CONFIG_PCI check since the Kconfig file already requires that. Signed-off-by: Randy Dunlap Cc: Scott Smedley Tested-by: Jan III Sobieski Signed-off-by: Linus Torvalds commit 5e31877b647bf41ad080adad6100a617ed4c6be4 Merge: 1ef6ce7 b338cc8 Author: Linus Torvalds Date: Thu Apr 22 07:17:09 2010 -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: security: testing the wrong variable in create_by_name() CRED: Fix a race in creds_are_invalid() in credentials debugging CRED: Fix double free in prepare_usermodehelper_creds() error handling commit 3353541fe533350a22a03e2fb7dc085b35912575 Author: Daniel T Chen Date: Thu Apr 22 07:15:26 2010 -0400 ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526 BugLink: https://launchpad.net/bugs/567494 The OR has verified that the existing model quirk, ALC880_UNIWILL, is insufficient for audible playback and capture by default. Instead, the ALC880_F1734 model quirk needs to be used. This change is necessary for both 2.6.32.11 and 2.6.33.2. Reported-by: Arnaud Malpeyre Tested-by: Arnaud Malpeyre Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 7e2455c1a123ceadbb35150a610d61e8443fd340 Author: Philipp Reisner Date: Thu Apr 22 14:50:23 2010 +0200 drbd: Terminate a connection early if sending the protocol fails Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 7ac314c82f552eefebaa91c9fffe8c0d435641b9 Author: Dan Carpenter Date: Thu Apr 22 14:27:23 2010 +0200 drbd: fix memory leak We leak memory if "--dry-run" is not supported by the peer. Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe commit 6de9400250f95f82da432c28b9b43823f4154c58 Author: Jörn Engel Date: Thu Apr 22 14:11:43 2010 +0200 Fix JFFS2 sync silent failure JFFS2 does not appear to set s_bdi anywhere. And as of 32a88aa1, __sync_filesystem() will return 0 if s_bdi is not set. As a result, sync_fs() is never called for jffs2 and whatever remains in the wbuf will not make it to the device. Fix that up by assigning the mtd bdi. Signed-off-by: Jörn Engel Acked-By: David Woodhouse Signed-off-by: Jens Axboe commit 64b997c5142a13373857de09599afd2f079c2f7a Author: viresh kumar Date: Wed Apr 21 09:42:05 2010 +0100 ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT. pl061_direction_output doesn't set value of gpio to value passed to it. This patch sets value of GPIO pin to requested value after changing direction to OUT. Signed-off-by: Viresh Kumar Acked-by: Baruch Siach Signed-off-by: Russell King commit 9a99d55514d3c6bfc03e41536659d781af6998f5 Author: viresh kumar Date: Wed Apr 21 09:41:54 2010 +0100 ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs. PL061 driver is using set_irq_chip_data and get_irq_chip_data for real irq lines. It must be using *_irq_data functions instead. As chip_data is used by interrupt controllers also, which makes vic write at incorrect addresses. Signed-off-by: Viresh Kumar Acked-by: Baruch Siach Signed-off-by: Russell King commit 313af42b5b3ea105567e8a62b01f35a9245c3fb3 Author: Leo Chen Date: Thu Apr 1 19:10:47 2010 +0100 ARM: 6023/1: update bcmring_defconfig to latest version and fix build error update bcmring_defconfig to the latest kernel version, this will fix the KAutobuild error. Signed-off-by: Leo Hao Chen Signed-off-by: Russell King commit b338cc8207eae46640a8d534738fda7b5e48511d Author: Dan Carpenter Date: Thu Apr 22 12:05:35 2010 +0200 security: testing the wrong variable in create_by_name() There is a typo here. We should be testing "*dentry" instead of "dentry". If "*dentry" is an ERR_PTR, it gets dereferenced in either mkdir() or create() which would cause an OOPs. Signed-off-by: Dan Carpenter Signed-off-by: James Morris commit 424264b7b220e8eee165dc3080ae48692af73dec Author: Jens Axboe Date: Thu Apr 22 12:37:07 2010 +0200 smbfs: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit f1970c73cbb6b884152207e4dfe90639f5029905 Author: Jens Axboe Date: Thu Apr 22 12:31:11 2010 +0200 ncpfs: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit b3d0ab7e60d1865bb6f6a79a77aaba22f2543236 Author: Jens Axboe Date: Thu Apr 22 12:26:04 2010 +0200 exofs: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit 9df9c8b930156a2f9ce2b2ae66acb14bee2663f5 Author: Jens Axboe Date: Thu Apr 22 12:22:04 2010 +0200 ecryptfs: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit 5163d90076729413cb882d3dd5c3d3cfb5b9f035 Author: Jens Axboe Date: Thu Apr 22 12:12:40 2010 +0200 coda: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit 8044f7f468469c80031611206d554f86fcdfe704 Author: Jens Axboe Date: Thu Apr 22 12:09:48 2010 +0200 cifs: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit e1da0222753a2322d76c97fc02396fb83143c7ac Author: Jens Axboe Date: Thu Apr 22 11:58:18 2010 +0200 afs: add bdi backing to mount session. This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit 0ed07ddb56d1348e5ce33f3b8de20d730351983a Author: Jens Axboe Date: Thu Apr 22 11:42:00 2010 +0200 9p: add bdi backing to mount session This ensures that dirty data gets flushed properly. Signed-off-by: Jens Axboe commit c3c532061e46156e8aab1268f38d66cfb63aeb2d Author: Jens Axboe Date: Thu Apr 22 11:37:01 2010 +0200 bdi: add helper function for doing init and register of a bdi for a file system Pretty trivial helper, just sets up the bdi and registers it. An atomic sequence count is used to ensure that the registered sysfs names are unique. Signed-off-by: Jens Axboe commit aac78daf8f37256283f56820ae858add7139c56c Author: Daniel T Chen Date: Wed Apr 21 20:41:52 2010 -0400 ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645 BugLink: https://launchpad.net/bugs/553002 The OR has verified that the dell-m6 model quirk is necessary for audio to be audible by default on the Dell Studio XPS 1645. This change is necessary for 2.6.32.11 and 2.6.33.2 alike. Reported-by: Robert Chambers Tested-by: Robert Chambers Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit f4f914b58019f0e50d521bbbadfaee260d766f95 Author: Jiri Olsa Date: Tue Apr 20 21:21:26 2010 +0000 net: ipv6 bind to device issue The issue raises when having 2 NICs both assigned the same IPv6 global address. If a sender binds to a particular NIC (SO_BINDTODEVICE), the outgoing traffic is being sent via the first found. The bonded device is thus not taken into an account during the routing. From the ip6_route_output function: If the binding address is multicast, linklocal or loopback, the RT6_LOOKUP_F_IFACE bit is set, but not for global address. So binding global address will neglect SO_BINDTODEVICE-binded device, because the fib6_rule_lookup function path won't check for the flowi::oif field and take first route that fits. Signed-off-by: Jiri Olsa Signed-off-by: Scott Otto Signed-off-by: David S. Miller commit f2228f785a9d97307aa8ba709088cfda6c3df73f Author: Shan Wei Date: Sun Apr 18 16:58:22 2010 +0000 ipv6: allow to send packet after receiving ICMPv6 Too Big message with MTU field less than IPV6_MIN_MTU According to RFC2460, PMTU is set to the IPv6 Minimum Link MTU (1280) and a fragment header should always be included after a node receiving Too Big message reporting PMTU is less than the IPv6 Minimum Link MTU. After receiving a ICMPv6 Too Big message reporting PMTU is less than the IPv6 Minimum Link MTU, sctp *can't* send any data/control chunk that total length including IPv6 head and IPv6 extend head is less than IPV6_MIN_MTU(1280 bytes). The failure occured in p6_fragment(), about reason see following(take SHUTDOWN chunk for example): sctp_packet_transmit (SHUTDOWN chunk, len=16 byte) |------sctp_v6_xmit (local_df=0) |------ip6_xmit |------ip6_output (dst_allfrag is ture) |------ip6_fragment In ip6_fragment(), for local_df=0, drops the the packet and returns EMSGSIZE. The patch fixes it with adding check length of skb->len. In this case, Ipv6 not to fragment upper protocol data, just only add a fragment header before it. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a19259c3d589a014e5f47f148f74dfc44422c82b Author: Diego Giagio Date: Sun Apr 18 08:35:16 2010 +0000 drivers/net/usb: Add new driver ipheth Add new driver to use tethering with an iPhone device. After initial submission, apply fixes to fit the new driver into the kernel standards. There are still a couple of minor (almost cosmetic-level) issues, but the driver is fully functional right now. Signed-off-by: L. Alberto Giménez Signed-off-by: Diego Giagio Signed-off-by: David S. Miller commit 9441cad99b4b09d6b627351c2d282833868c116c Author: Hiroshi Shimamoto Date: Mon Apr 19 15:32:20 2010 +0000 cxgb3: fix linkup issue I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed. Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep(). Signed-off-by: Hiroshi Shimamoto Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 2cec6b014da6fb4a40ba1c6556cdf9681ed3f89e Author: andrew hendry Date: Sat Apr 17 14:17:32 2010 +0000 X25 fix dead unaccepted sockets 1, An X25 program binds and listens 2, calls arrive waiting to be accepted 3, Program exits without accepting 4, Sockets time out but don't get correctly cleaned up 5, cat /proc/net/x25/socket shows the dead sockets with bad inode fields. This line borrowed from AX25 sets the dying socket so the timers clean up later. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 761172fbf672c5784b2a0d71ca2f4389eb7a2c21 Author: Abraham Arce Date: Fri Apr 16 14:48:43 2010 +0000 KS8851: NULL pointer dereference if list is empty Fix NULL pointer dereference in ks8851_tx_work by checking if dequeued list is already empty before writing the packet to TX FIFO Unable to handle kernel NULL pointer dereference at virtual address 00000050 PC is at ks8851_tx_work+0xdc/0x1b0 LR is at wait_for_common+0x148/0x164 pc : [] lr : [] psr: 20000013 Backtrace: ks8851_tx_work+0x0/0x1b0 worker_thread+0x0/0x190 kthread+0x0/0x90 Signed-off-by: Abraham Arce Signed-off-by: David S. Miller commit df245dce572bc22b230a05532a3f9daee50effb5 Author: Alexander Kurz Date: Fri Apr 16 03:01:01 2010 +0000 net: 3c574_cs fix stats.tx_bytes counter Update the stats counter calculation in 3c574_cs, similar to the method used in 3c589_cs. This corrects the contents of the counter on tests using a "Megahertz 574B" card. [linux@dominikbrodowski.net: clean up commit message] Signed-off-by: Alexander Kurz Signed-off-by: Dominik Brodowski Signed-off-by: David S. Miller commit bc8e4b954e463716a57d8113dd50ae9d47b682a7 Author: Nicolas Dichtel Date: Wed Apr 21 16:25:30 2010 -0700 xfrm6: ensure to use the same dev when building a bundle When building a bundle, we set dst.dev and rt6.rt6i_idev. We must ensure to set the same device for both fields. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit 1c0b28b1ee90261a0a27194e6684dd2837785064 Author: Hans J. Koch Date: Wed Apr 21 00:18:06 2010 +0000 can: Fix possible NULL pointer dereference in ems_usb.c In ems_usb_probe(), a pointer is dereferenced after making sure it is NULL... This patch replaces netdev->dev.parent with &intf->dev in dev_err() calls to avoid this. Signed-off-by: "Hans J. Koch" Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit e134d200d57d43b171dcb0b55c178a1a0c7db14a Author: David Howells Date: Wed Apr 21 10:28:25 2010 +0100 CRED: Fix a race in creds_are_invalid() in credentials debugging creds_are_invalid() reads both cred->usage and cred->subscribers and then compares them to make sure the number of processes subscribed to a cred struct never exceeds the refcount of that cred struct. The problem is that this can cause a race with both copy_creds() and exit_creds() as the two counters, whilst they are of atomic_t type, are only atomic with respect to themselves, and not atomic with respect to each other. This means that if creds_are_invalid() can read the values on one CPU whilst they're being modified on another CPU, and so can observe an evolving state in which the subscribers count now is greater than the usage count a moment before. Switching the order in which the counts are read cannot help, so the thing to do is to remove that particular check. I had considered rechecking the values to see if they're in flux if the test fails, but I can't guarantee they won't appear the same, even if they've changed several times in the meantime. Note that this can only happen if CONFIG_DEBUG_CREDENTIALS is enabled. The problem is only likely to occur with multithreaded programs, and can be tested by the tst-eintr1 program from glibc's "make check". The symptoms look like: CRED: Invalid credentials CRED: At include/linux/cred.h:240 CRED: Specified credentials: ffff88003dda5878 [real][eff] CRED: ->magic=43736564, put_addr=(null) CRED: ->usage=766, subscr=766 CRED: ->*uid = { 0,0,0,0 } CRED: ->*gid = { 0,0,0,0 } CRED: ->security is ffff88003d72f538 CRED: ->security {359, 359} ------------[ cut here ]------------ kernel BUG at kernel/cred.c:850! ... RIP: 0010:[] [] __invalid_creds+0x4e/0x52 ... Call Trace: [] copy_creds+0x6b/0x23f Note the ->usage=766 and subscr=766. The values appear the same because they've been re-read since the check was made. Reported-by: Roland McGrath Signed-off-by: David Howells Signed-off-by: James Morris commit e2bca7c76a79b68506bfc3699beb74c0d41fe230 Merge: b3c7740 d54a45e Author: Tony Lindgren Date: Wed Apr 21 15:26:56 2010 -0700 Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus commit c85b86a6dc7b5b4607c3a14fdbda78df06b5c79f Author: Cory Fields Date: Wed Apr 21 17:08:24 2010 -0400 HID: wacom: remove annoying non-error printk This is the only line printed on my "quiet" boot and seems completely unnecessary. Signed-off-by: Cory Fields Signed-off-by: Bastien Nocera Signed-off-by: Jiri Kosina commit 1ef6ce7a340f9ed139a73147ff9cf7ad56889414 Merge: 458f8c8 2545cf6 Author: Linus Torvalds Date: Wed Apr 21 12:33:12 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: allow 4 coldfire serial ports m68knommu: fix coldfire tcdrain m68knommu: remove a duplicate vector setting line for 68360 Fix m68k-uclinux's rt_sigreturn trampoline m68knommu: correct the CC flags for Coldfire M5272 targets uclinux: error message when FLAT reloc symbol is invalid, v2 commit 458f8c895beba63851281dcdac3773685f0fae09 Merge: 255f41c 58d5765 Author: Linus Torvalds Date: Wed Apr 21 12:31:52 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: mc13783-regulator: fix a memory leak in mc13783_regulator_remove regulator: Let drivers know when they use the stub API commit 255f41c59558a346d65a2012420a7573e36dc584 Merge: 9befb55 b6349ac Author: Linus Torvalds Date: Wed Apr 21 12:31:12 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Split large truncated into smaller chunks [LogFS] Set s_bdi [LogFS] Prevent mempool_destroy NULL pointer dereference [LogFS] Move assertion [LogFS] Plug 8 byte information leak [LogFS] Prevent memory corruption on large deletes [LogFS] Remove unused method Fix trivial conflict with added header includes in fs/logfs/super.c commit 9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0 Merge: a486b0a c7f2e1f Author: Linus Torvalds Date: Wed Apr 21 12:30:07 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: add jfs specific ->setattr call jfs: fix diAllocExt error in resizing filesystem jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g commit a486b0af797e19ff79c6943cc8986111f2569fe8 Merge: 1519ae4 e8861cf Author: Linus Torvalds Date: Wed Apr 21 12:29:46 2010 -0700 Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: Fix TSS size check for 16-bit tasks KVM: Add missing srcu_read_lock() for kvm_mmu_notifier_release() KVM: Increase NR_IOBUS_DEVS limit to 200 KVM: fix the handling of dirty bitmaps to avoid overflows KVM: MMU: fix kvm_mmu_zap_page() and its calling path KVM: VMX: Save/restore rflags.vm correctly in real mode KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL KVM: Don't spam kernel log when injecting exceptions due to bad cr writes KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails KVM: take srcu lock before call to complete_pio() commit 1519ae4dc785995c548bca98b75190b9f0667dde Merge: 083fd8b 35f2a59 Author: Linus Torvalds Date: Wed Apr 21 12:28:44 2010 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: allow for more than 2^31 chunks. commit 083fd8b21a13742b37ab347089c73f895a896672 Author: David Howells Date: Wed Apr 21 12:01:23 2010 +0100 AFS: Don't pass error value to page_cache_release() in error handling In the error handling in afs_mntpt_do_automount(), we pass an error pointer to page_cache_release() if read_mapping_page() failed. Instead, we should extend the gotos around the error handling we don't need. Reported-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit a534dbe96e9929c7245924d8252d89048c23d569 Author: Richard Kennedy Date: Wed Apr 14 20:54:03 2010 +0200 block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer blk_rq_timed_out_timer() relied on blk_add_timer() never returning a timer value of zero, but commit 7838c15b8dd18e78a523513749e5b54bda07b0cb removed the code that bumped this value when it was zero. Therefore when jiffies is near wrap we could get unlucky & not set the timeout value correctly. This patch uses a flag to indicate that the timeout value was set and so handles jiffies wrap correctly, and it keeps all the logic in one function so should be easier to maintain in the future. Signed-off-by: Richard Kennedy Cc: stable@kernel.org Signed-off-by: Jens Axboe commit e8861cfe2c75bdce36655b64d7ce02c2b31b604d Author: Jan Kiszka Date: Wed Apr 14 16:57:11 2010 +0200 KVM: x86: Fix TSS size check for 16-bit tasks A 16-bit TSS is only 44 bytes long. So make sure to test for the correct size on task switch. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit eda2beda835697878e309b6049aa0a3bad051590 Author: Lai Jiangshan Date: Tue Apr 20 14:29:29 2010 +0800 KVM: Add missing srcu_read_lock() for kvm_mmu_notifier_release() I got this dmesg due to srcu_read_lock() is missing in kvm_mmu_notifier_release(). =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- arch/x86/kvm/x86.h:72 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by qemu-system-x86/3100: #0: (rcu_read_lock){.+.+..}, at: [] __mmu_notifier_release+0x38/0xdf #1: (&(&kvm->mmu_lock)->rlock){+.+...}, at: [] kvm_mmu_zap_all+0x21/0x5e [kvm] stack backtrace: Pid: 3100, comm: qemu-system-x86 Not tainted 2.6.34-rc3-22949-gbc8a97a-dirty #2 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb3 [] unalias_gfn+0x56/0xab [kvm] [] gfn_to_memslot+0x16/0x25 [kvm] [] gfn_to_rmap+0x17/0x6e [kvm] [] rmap_remove+0xa0/0x19d [kvm] [] kvm_mmu_zap_page+0x109/0x34d [kvm] [] kvm_mmu_zap_all+0x35/0x5e [kvm] [] kvm_arch_flush_shadow+0x16/0x22 [kvm] [] kvm_mmu_notifier_release+0x15/0x17 [kvm] [] __mmu_notifier_release+0x88/0xdf [] ? __mmu_notifier_release+0x38/0xdf [] ? exit_mm+0xe0/0x115 [] exit_mmap+0x2c/0x17e [] mmput+0x2d/0xd4 [] exit_mm+0x108/0x115 [...] Signed-off-by: Lai Jiangshan Signed-off-by: Avi Kivity commit 05d17608a69b3ae653ea5c9857283bef3439c733 Author: David Howells Date: Tue Apr 20 00:25:58 2010 +0000 net: Fix an RCU warning in dev_pick_tx() Fix the following RCU warning in dev_pick_tx(): =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- net/core/dev.c:1993 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by swapper/0: #0: (&idev->mc_ifc_timer){+.-...}, at: [] run_timer_softirq+0x17b/0x278 #1: (rcu_read_lock_bh){.+....}, at: [] dev_queue_xmit+0x14e/0x4dc stack backtrace: Pid: 0, comm: swapper Not tainted 2.6.34-rc5-cachefs #4 Call Trace: [] lockdep_rcu_dereference+0xaa/0xb2 [] dev_queue_xmit+0x259/0x4dc [] ? dev_queue_xmit+0x14e/0x4dc [] ? trace_hardirqs_on+0xd/0xf [] ? local_bh_enable_ip+0xbc/0xc1 [] neigh_resolve_output+0x24b/0x27c [] ip6_output_finish+0x7c/0xb4 [] ip6_output2+0x256/0x261 [] ? trace_hardirqs_on+0xd/0xf [] ip6_output+0xbbc/0xbcb [] ? fib6_force_start_gc+0x2b/0x2d [] mld_sendpack+0x273/0x39d [] ? mld_sendpack+0x0/0x39d [] ? mark_held_locks+0x52/0x70 [] mld_ifc_timer_expire+0x24f/0x288 [] run_timer_softirq+0x1ec/0x278 [] ? run_timer_softirq+0x17b/0x278 [] ? mld_ifc_timer_expire+0x0/0x288 [] ? __do_softirq+0x69/0x140 [] __do_softirq+0xa2/0x140 [] call_softirq+0x1c/0x28 [] do_softirq+0x38/0x80 [] irq_exit+0x45/0x47 [] smp_apic_timer_interrupt+0x88/0x96 [] apic_timer_interrupt+0x13/0x20 [] ? __atomic_notifier_call_chain+0x0/0x86 [] ? mwait_idle+0x6e/0x78 [] ? mwait_idle+0x65/0x78 [] cpu_idle+0x4d/0x83 [] rest_init+0xb9/0xc0 [] ? rest_init+0x0/0xc0 [] start_kernel+0x392/0x39d [] x86_64_start_reservations+0xb3/0xb7 [] x86_64_start_kernel+0xe4/0xeb An rcu_dereference() should be an rcu_dereference_bh(). Signed-off-by: David Howells Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit e04997b13a2c2fc93af970fe95fd29a74db113e8 Merge: 6651ffc 05ce7bf Author: David S. Miller Date: Wed Apr 21 00:50:39 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c Author: Herbert Xu Date: Wed Apr 21 00:47:15 2010 -0700 ipv6: Fix tcp_v6_send_response transport header setting. My recent patch to remove the open-coded checksum sequence in tcp_v6_send_response broke it as we did not set the transport header pointer on the new packet. Actually, there is code there trying to set the transport header properly, but it sets it for the wrong skb ('skb' instead of 'buff'). This bug was introduced by commit a8fdf2b331b38d61fb5f11f3aec4a4f9fb2dedcb ("ipv6: Fix tcp_v6_send_response(): it didn't set skb transport header") Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4260415f6a3b92c5c986398d96c314df37a4ccbf Author: Russell King Date: Mon Apr 19 10:15:03 2010 +0100 ARM: fix build error in arch/arm/kernel/process.c /tmp/ccJ3ssZW.s: Assembler messages: /tmp/ccJ3ssZW.s:1952: Error: can't resolve `.text' {.text section} - `.LFB1077' This is caused because: .section .data .section .text .section .text .previous does not return us to the .text section, but the .data section; this makes use of .previous dangerous if the ordering of previous sections is not known. Fix up the other users of .previous; .pushsection and .popsection are a safer pairing to use than .section and .previous. Signed-off-by: Russell King commit 04de0816173c86948b75da93a6344a0a02bbec4d Author: Dominik Brodowski Date: Tue Apr 20 14:49:01 2010 +0200 pcmcia: pcmcia_dev_present bugfix pcmcia_dev_present is in and by itself buggy. Add a note specifying why it is broken, and replace the broken locking -- taking a mutex is a bad idea in IRQ context, from which this function is rarely called -- by an atomic_t. Signed-off-by: Dominik Brodowski commit 2545cf6e94b4eb5a2c48dd55751aa9a70ff1ff9d Author: Philippe De Muyter Date: Thu Mar 18 11:37:13 2010 +0100 m68knommu: allow 4 coldfire serial ports Fix driver/serial/mcf.c for 4-ports coldfire's (e.g. MCF5484). Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit 3732b68f22857201fa09cb82b128f295096a2375 Author: Philippe De Muyter Date: Fri Apr 2 17:56:08 2010 +0200 m68knommu: fix coldfire tcdrain Fix tcdrain on coldfire uarts. Currently with coldfire uarts tcdrain returns without waiting for txempty, because (tx)fifosize is 0. Fix that and call uart_update_timeout when setting the baud rate, otherwise tcdrain will wait for an half our :) Also constify mcf_uart_ops. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit 6ecaf44e62274cd3496341ee0189bbbc0ae00976 Author: Greg Ungerer Date: Fri Feb 19 11:27:37 2010 +1000 m68knommu: remove a duplicate vector setting line for 68360 Remove a duplicate vector setting line for the 68360 interrupt setup. Pointed out by Roel Kluin Signed-off-by: Greg Ungerer commit 760d6e7861f245599e0ca1e98ba524a77d401a51 Author: Maxim Kuvyrkov Date: Wed Sep 23 01:25:44 2009 +0400 Fix m68k-uclinux's rt_sigreturn trampoline Signed-off-by: Maxim Kuvyrkov Signed-off-by: Greg Ungerer commit eb79cbe23055a8919a32d19456fa06fbaa16cc1a Author: Philip Nye Date: Tue Jan 12 10:18:03 2010 +1000 m68knommu: correct the CC flags for Coldfire M5272 targets Signed-off-by: Philip Nye Signed-off-by: Greg Ungerer commit d7dfee3f5db5575b1d838744559c3c9bb351f74f Author: Jun Sun Date: Thu Dec 31 17:28:52 2009 -0800 uclinux: error message when FLAT reloc symbol is invalid, v2 This patch fixes a cosmetic error in printk. Text segment and data/bss segment are allocated from two different areas. It is not meaningful to give the diff between them in the error reporting messages. Signed-off-by: Jun Sun Signed-off-by: Greg Ungerer commit 8eabf95cb17253a3ac72b1a62ce8a80b3efecd62 Author: Eric Dumazet Date: Tue Apr 20 03:20:05 2010 +0000 bridge: add a missing ntohs() grec_nsrcs is in network order, we should convert to host horder in br_multicast_igmp3_report() Signed-off-by: Eric Dumazet Acked-by: Herbert Xu Signed-off-by: David S. Miller commit e46754f8c9333170f11780d8e3a70da1b1a88338 Merge: ef9e83c fe6f212 Author: David S. Miller Date: Tue Apr 20 17:57:56 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit eff30363c0b8b057f773108589bfd8881659fe74 Author: David Howells Date: Tue Apr 20 22:41:18 2010 +0100 CRED: Fix double free in prepare_usermodehelper_creds() error handling Patch 570b8fb505896e007fd3bb07573ba6640e51851d: Author: Mathieu Desnoyers Date: Tue Mar 30 00:04:00 2010 +0100 Subject: CRED: Fix memory leak in error handling attempts to fix a memory leak in the error handling by making the offending return statement into a jump down to the bottom of the function where a kfree(tgcred) is inserted. This is, however, incorrect, as it does a kfree() after doing put_cred() if security_prepare_creds() fails. That will result in a double free if 'error' is jumped to as put_cred() will also attempt to free the new tgcred record by virtue of it being pointed to by the new cred record. Signed-off-by: David Howells Signed-off-by: James Morris commit ae7c9b70dcb4313ea3dbcc9a2f240dae6c2b50c0 Author: Jacob Pan Date: Mon Apr 19 11:23:43 2010 -0700 x86, mrst: Conditionally register cpu hotplug notifier for apbt APB timer is used on Moorestown platforms but not on a standard PC. If APB timer code is compiled in but not initialized at run-time due to lack of FW reported SFI table, kernel would panic when the non-boot CPUs are offlined and notifier is called. https://bugzilla.kernel.org/show_bug.cgi?id=15786 This patch ensures CPU hotplug notifier for APB timer is only registered when the APBT timer block is initialized. Signed-off-by: Jacob Pan LKML-Reference: <1271701423-1162-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin commit b90f687018e6d6c77d981b09203780f7001407e5 Author: Theodore Ts'o Date: Tue Apr 20 16:51:59 2010 -0400 ext4: Issue the discard operation *before* releasing the blocks to be reused Otherwise, we can end up having data corruption because the blocks could get reused and then discarded! https://bugzilla.kernel.org/show_bug.cgi?id=15579 Signed-off-by: "Theodore Ts'o" commit b6349ac89eacb813f6963f7263da05bc3f483351 Author: Joern Engel Date: Tue Apr 20 21:44:10 2010 +0200 [LogFS] Split large truncated into smaller chunks Truncate would do an almost limitless amount of work without invoking the garbage collector in between. Split it up into more manageable, though still large, chunks. Signed-off-by: Joern Engel commit 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa Merge: 27ee896 62af9b5 Author: Linus Torvalds Date: Tue Apr 20 09:39:40 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Convert __DQUOT_PARANOIA symbol to standard config option commit 62af9b520513d78484f22f874916dfacbc889ce0 Author: Jan Kara Date: Mon Apr 19 16:47:20 2010 +0200 quota: Convert __DQUOT_PARANOIA symbol to standard config option Make __DQUOT_PARANOIA define from the old days a standard config option and turn it off by default. This gets rid of a quota warning about writes before quota is turned on for systems with ext4 root filesystem. Currently there's no way to legally solve this because /etc/mtab has to be written before quota is turned on on most systems. Signed-off-by: Jan Kara commit 27ee8963708185b96bc84a149eb5336a249a7497 Merge: ac8bf56 07a7141 Author: Linus Torvalds Date: Tue Apr 20 09:21:19 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix error handling in cm4000_cs.c drivers/pcmcia: Add missing local_irq_restore serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33) pcmcia: avoid late calls to pccard_validate_cis pcmcia: fix ioport size calculation in rsrc_nonstatic pcmcia: re-start on MFC override pcmcia: fix io_probe due to parent (PCI) resources pcmcia: use previously assigned IRQ for all card functions commit ac8bf564307962a763a52b34e771205c58b76ec8 Merge: 34388d1 28a1f53 Author: Linus Torvalds Date: Tue Apr 20 09:20:55 2010 -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: sparc64: Fix hardirq tracing in trap return path. sparc64: Use correct pt_regs in decode_access_size() error paths. sparc64: Fix PREEMPT_ACTIVE value. sparc64: Run NMIs on the hardirq stack. sparc64: Allocate sufficient stack space in ftrace stubs. sparc: Fix forgotten kmemleak headers inclusion commit 34388d1c4feae50d61d6f4ec7594b9076d6d24db Merge: 186837c ab285f2 Author: Linus Torvalds Date: Tue Apr 20 09:20:23 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix unsafe frame rewinding with hot regs fetching commit 186837ca3a6dd6b422a5ea316ed38eea183dca5d Merge: 4cecd93 b78315f Author: Linus Torvalds Date: Tue Apr 20 09:20:11 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: delay vblank cleanup until after driver unload commit 4cecd935f67bf46a9fe8037c710dd86651fcafe4 Author: Christoph Hellwig Date: Tue Apr 20 05:31:02 2010 +0200 x86: correctly wire up the newuname system call Before commit e28cbf22933d0c0ccaf3c4c27a1a263b41f73859 ("improve sys_newuname() for compat architectures") 64-bit x86 had a private implementation of sys_uname which was just called sys_uname, which other architectures used for the old uname. Due to some merge issues with the uname refactoring patches we ended up calling the old uname version for both the old and new system call slots, which lead to the domainname filed never be set which caused failures with libnss_nis. Reported-and-tested-by: Andy Isaacson Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit e80e2a60ff7914dae691345a976c80bbbff3ec74 Author: Sridhar Samudrala Date: Tue Mar 30 16:48:25 2010 -0700 KVM: Increase NR_IOBUS_DEVS limit to 200 This patch increases the current hardcoded limit of NR_IOBUS_DEVS from 6 to 200. We are hitting this limit when creating a guest with more than 1 virtio-net device using vhost-net backend. Each virtio-net device requires 2 such devices to service notifications from rx/tx queues. Signed-off-by: Sridhar Samudrala Signed-off-by: Avi Kivity commit 87bf6e7de1134f48681fd2ce4b7c1ec45458cb6d Author: Takuya Yoshikawa Date: Mon Apr 12 19:35:35 2010 +0900 KVM: fix the handling of dirty bitmaps to avoid overflows Int is not long enough to store the size of a dirty bitmap. This patch fixes this problem with the introduction of a wrapper function to calculate the sizes of dirty bitmaps. Note: in mark_page_dirty(), we have to consider the fact that __set_bit() takes the offset as int, not long. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit 77662e0028c7c63e34257fda03ff9625c59d939d Author: Xiao Guangrong Date: Fri Apr 16 16:34:42 2010 +0800 KVM: MMU: fix kvm_mmu_zap_page() and its calling path This patch fix: - calculate zapped page number properly in mmu_zap_unsync_children() - calculate freeed page number properly kvm_mmu_change_mmu_pages() - if zapped children page it shoud restart hlist walking KVM-Stable-Tag. Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 78ac8b47c566dd6177a3b9b291b756ccb70670b7 Author: Avi Kivity Date: Thu Apr 8 18:19:35 2010 +0300 KVM: VMX: Save/restore rflags.vm correctly in real mode Currently we set eflags.vm unconditionally when entering real mode emulation through virtual-8086 mode, and clear it unconditionally when we enter protected mode. The means that the following sequence KVM_SET_REGS (rflags.vm=1) KVM_SET_SREGS (cr0.pe=1) Ends up with rflags.vm clear due to KVM_SET_SREGS triggering enter_pmode(). Fix by shadowing rflags.vm (and rflags.iopl) correctly while in real mode: reads and writes to those bits access a shadow register instead of the actual register. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 114be429c8cd44e57f312af2bbd6734e5a185b0d Author: Andre Przywara Date: Wed Mar 24 17:46:42 2010 +0100 KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL There is a quirk for AMD K8 CPUs in many Linux kernels (see arch/x86/kernel/cpu/mcheck/mce.c:__mcheck_cpu_apply_quirks()) that clears bit 10 in that MCE related MSR. KVM can only cope with all zeros or all ones, so it will inject a #GP into the guest, which will let it panic. So lets add a quirk to the quirk and ignore this single cleared bit. This fixes -cpu kvm64 on all machines and -cpu host on K8 machines with some guest Linux kernels. Signed-off-by: Andre Przywara Signed-off-by: Avi Kivity commit d6a23895aa82353788a1cc5a1d9a1c963465463e Author: Avi Kivity Date: Thu Mar 11 12:20:03 2010 +0200 KVM: Don't spam kernel log when injecting exceptions due to bad cr writes These are guest-triggerable. Signed-off-by: Avi Kivity commit b7af40433870aa0636932ad39b0c48a0cb319057 Author: Takuya Yoshikawa Date: Tue Mar 9 14:55:19 2010 +0900 KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails svm_create_vcpu() does not free the pages allocated during the creation when it fails to complete the allocations. This patch fixes it. Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit 7567cae105e435b53e5a3e778546dd3ec53e3204 Author: Gleb Natapov Date: Tue Mar 9 12:01:10 2010 +0200 KVM: take srcu lock before call to complete_pio() complete_pio() may use slot table which is protected by srcu. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 28a1f533ae8606020238b840b82ae70a3f87609e Author: David S. Miller Date: Tue Apr 20 00:48:37 2010 -0700 sparc64: Fix hardirq tracing in trap return path. We can overflow the hardirq stack if we set the %pil here so early, just let the normal control flow do it. This is fine as we are allowed to do the actual IRQ enable at any point after we call trace_hardirqs_on. Signed-off-by: David S. Miller commit 7fbef0d1e278a0a8c803a4d2b1e2bd5740bffa52 Author: Daniel Mack Date: Mon Apr 19 00:42:16 2010 -0700 Input: eeti_ts - cancel pending work when going to suspend This fixes a race between the suspend code and input events. Signed-off-by: Daniel Mack Signed-off-by: Dmitry Torokhov commit 5f57d67da87332a9a1ba8fa7a33bf0680e1c76e7 Author: Takashi Iwai Date: Mon Apr 19 10:37:21 2010 -0700 Input: Add support of Synaptics Clickpad device The new type of touchpads can be detected via a new query command 0x0c. The clickpad flags are in cap[0]:4 and cap[1]:0 bits. When the device is detected, the driver now reports only the left button as the supported buttons so that X11 driver can detect that the device is Clickpad. A Clickpad device gives the button events only as the middle button. The kernel driver morphs to the left button. The real handling of Clickpad is done rather in X driver side. Signed-off-by: Takashi Iwai Signed-off-by: Dmitry Torokhov commit 6d327cb03fbc64cac36571c9bc8a1576d2b3ea00 Author: Dmitry Torokhov Date: Tue Apr 20 00:37:21 2010 -0700 Revert "Input: ALPS - add signature for HP Pavilion dm3 laptops" This reverts commit 5e28d8eb68c12eab9c4a47b42ba993a6420d71d3 since the magic knock does not work for this model of the touchpad and the device stays in PS/2 compatibility mode. commit b78315f051de8d207bead90470aa216c0617572b Author: Jesse Barnes Date: Fri Mar 26 11:07:16 2010 -0700 drm: delay vblank cleanup until after driver unload Drivers may use vblank calls now (e.g. drm_vblank_off) in their unload paths, so don't clean up the vblank related structures until after driver unload. Signed-off-by: Jesse Barnes Reviewed-by: Kristian Høgsberg Signed-off-by: Dave Airlie commit b4d0a038e0f856313ca26fd3872bc209a2e616ad Author: Kumar Gala Date: Mon Apr 19 23:17:27 2010 -0500 powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx Signed-off-by: Kumar Gala commit e3c8a02743002757de53226b1b9f019c6769fd9b Author: Kim Phillips Date: Thu Apr 15 18:59:18 2010 -0500 powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED a recent fc11 udev update on an 83xx board made root console login disappear: Updating : udev-141-8.fc11.ppc 32/83 udev: starting version 141 udev: deprecated sysfs layout; update the kernel or disable CONFIG_SYSFS_DEPRECATED; some udev features will not work correctly and sure enough, turning off SYSFS_DEPRECATED brings the login prompt back. Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit acbcba908dd271253a9661dde1f0087c0f789e8c Author: Kim Phillips Date: Thu Apr 15 18:59:13 2010 -0500 powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig to enable the storage controller on earlier rev. mpc834x itx boards. Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit 35f2a591192d0a5d9f7fc696869c76f0b8e49c3d Author: NeilBrown Date: Tue Apr 20 14:13:34 2010 +1000 md/raid5: allow for more than 2^31 chunks. With many large drives and small chunk sizes it is possible to create a RAID5 with more than 2^31 chunks. Make sure this works. Reported-by: Brett King Signed-off-by: NeilBrown Cc: stable@kernel.org commit f5b0959fec5d2e1aee383963a6000bb87222b78d Author: Kim Phillips Date: Mon Apr 5 11:14:04 2010 -0500 powerpc/83xx: enable EPOLL syscall in defconfig 83xx users looking to run apache will experience this error: /var/log/apache2/error.log: [emerg] (38)Function not implemented: Couldn't create pollset in child; check system or user limits enabling CONFIG_EPOLL in kernel config fixes this so apache can run. Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit 5bfb3fdca308df9e9ea0830b43d3d75d0920fd7e Author: Kim Phillips Date: Mon Apr 5 11:13:51 2010 -0500 powerpc/83xx: add RTC drivers in 83xx defconfig 83xx boards typically have the DS1307 or DS1374: git grep RTC_DRV arch/powerpc/configs/*83* | grep "=y" arch/powerpc/configs/83xx/asp8347_defconfig:CONFIG_RTC_DRV_DS1374=y arch/powerpc/configs/83xx/mpc8313_rdb_defconfig:CONFIG_RTC_DRV_DS1307=y arch/powerpc/configs/83xx/mpc8315_rdb_defconfig:CONFIG_RTC_DRV_DS1307=y arch/powerpc/configs/83xx/mpc832x_mds_defconfig:CONFIG_RTC_DRV_DS1374=y arch/powerpc/configs/83xx/mpc834x_itx_defconfig:CONFIG_RTC_DRV_DS1307=y arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig:CONFIG_RTC_DRV_DS1307=y arch/powerpc/configs/83xx/mpc834x_mds_defconfig:CONFIG_RTC_DRV_DS1374=y arch/powerpc/configs/83xx/mpc836x_mds_defconfig:CONFIG_RTC_DRV_DS1374=y Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit 1cca2d2b99f3d7eea6aa627b96bffc3b0999eca2 Author: Wolfgang Ocker Date: Sat Apr 3 16:11:43 2010 +0200 powerpc/fsl-cpm: Configure clock correctly for SCC Some board setup functions call cpm1_clk_setup() or cmp2_clk_setup() to configure the clock source. If CPM_CLK_RTX has been used for the parameter mode, the clock has been configured only for TX but not for RX. With this patch CPM_CLK_RTX configures the clock for both directions correctly. Signed-off-by: Wolfgang Ocker Acked-by: Scott Wood Signed-off-by: Kumar Gala commit e8137341b1bb9bbdc29d9fd8980485ec7dcb4109 Author: Becky Bruce Date: Mon Apr 12 11:21:50 2010 -0500 powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS The code was looking for this in cpu_features, not mmu_features. Fix this. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit e0f278adc29e8986531a51e5ed33db42e34bf952 Author: Anton Vorontsov Date: Fri Apr 16 23:07:24 2010 +0400 powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n Currently some MPC85xx and MPC86xx boards fail to build without CONFIG_PCI: arch/powerpc/platforms/fsl_uli1575.c: In function 'quirk_final_uli5249': arch/powerpc/platforms/fsl_uli1575.c:234: error: implicit declaration of function 'pci_bus_for_each_resource' arch/powerpc/platforms/fsl_uli1575.c:234: error: expected ';' before '{' token cc1: warnings being treated as errors arch/powerpc/platforms/fsl_uli1575.c:223: warning: unused variable 'dummy' make[1]: *** [arch/powerpc/platforms/fsl_uli1575.o] Error 1 This patch fixes the issue by appending 'if PCI' condition when selecting FSL_ULI1575 Kconfig symbol. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 42df64b1f83fa9b786067a0b5a3aca0fbb2d8db8 Author: Dan Carpenter Date: Wed Apr 7 12:22:58 2010 +0300 i2c-stu300: off by one issue If we don't find the correct rate, we want to end the loop with "i" pointing to the last element in the array. Signed-off-by: Dan Carpenter Signed-off-by: Ben Dooks commit 28ad3321a1ac732c7fe37d5be85f67fe40ef18a9 Author: Kevin Wells Date: Tue Mar 16 15:55:37 2010 -0700 i2c-pnx: Add stop conditions for end of transfer Add a stop condition bit flag to the last byte in the transfer. This will generate an extra clock to handle the stop condition and prevent devices from staying in an ACK'd state. Signed-off-by: Kevin Wells Signed-off-by: Ben Dooks commit be80dbaa3ed64337693be58fb2f3808e78911ba6 Author: Kevin Wells Date: Tue Mar 16 15:55:36 2010 -0700 i2c-pnx: Limit maximum divider to 1023 Limit maximum divider to 0x3ff to divider computations. On high I2C parent clock rates, the divider can exceed 0x3ff. This will help prevent some very odd clock rates. Signed-off-by: Kevin Wells Signed-off-by: Ben Dooks commit 7c6bd2010fced38444c9fd658f4c6ce61bd185bf Author: Mika Westerberg Date: Tue Mar 23 12:12:56 2010 +0200 i2c-omap: fix OOPS in omap_i2c_unidle() during probe Commit d84d3ea317ce0db89ce0903b4037f800c5d4c477 added register shift to allow also 16-bit register access. However, omap_i2c_unidle() is called before these are set which causes the following OOPS: Unhandled fault: alignment exception (0x801) at 0xfa070009 Internal error: : 801 [#1] last sysfs file: Modules linked in: CPU: 0 Not tainted (2.6.34-rc2-00052-gae6be51 #3) PC is at omap_i2c_unidle+0x44/0x138 LR is at trace_hardirqs_on_caller+0x158/0x18c pc : [] lr : [] psr: 20000013 sp : cfc2bf10 ip : 00000009 fp : 00000000 r10: 00000000 r9 : 00000000 r8 : c0378560 r7 : c0378b88 r6 : c0378558 r5 : cfcadc00 r4 : cfcadc00 r3 : 00000009 r2 : fa070000 r1 : 00000000 r0 : 00000000 Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387f Table: 80004019 DAC: 00000017 Process swapper (pid: 1, stack limit = 0xcfc2a2e8) Stack: (0xcfc2bf10 to 0xcfc2c000) bf00: c0372cf8 c027225c 00000000 c0a69678 bf20: cfc3e508 c0500898 c0378560 c0378560 c0500898 cfcac8c0 c04fc280 c017d4f4 bf40: c0378560 c017c63c c0378560 c0378594 c0500898 cfcac8c0 c04fc280 c017c754 bf60: 00000000 c017c6f4 c0500898 c017beac cfc16a5c cfc3fd94 c0023448 c0500898 bf80: c0500898 c017b7d4 c032dc7f 00000093 cfc28d40 c0023448 00000000 c0500898 bfa0: 00000000 00000000 00000000 c017ca48 c0023448 00000000 c001d274 00000000 bfc0: 00000000 c002b344 00000031 00000000 00000000 00000192 00000000 c0023448 bfe0: 00000000 00000000 00000000 c0008578 00000000 c002c304 ffdfffff ffffffff [] (omap_i2c_unidle+0x44/0x138) from [] (omap_i2c_probe+0x1a4/0x398) [] (omap_i2c_probe+0x1a4/0x398) from [] (platform_drv_probe+0x18/0x1c) [] (platform_drv_probe+0x18/0x1c) from [] (driver_probe_device+0xc0/0x178) [] (driver_probe_device+0xc0/0x178) from [] (__driver_attach+0x60/0x84) [] (__driver_attach+0x60/0x84) from [] (bus_for_each_dev+0x44/0x74) [] (bus_for_each_dev+0x44/0x74) from [] (bus_add_driver+0x9c/0x218) [] (bus_add_driver+0x9c/0x218) from [] (driver_register+0xa8/0x130) [] (driver_register+0xa8/0x130) from [] (do_one_initcall+0x5c/0x1b8) [] (do_one_initcall+0x5c/0x1b8) from [] (kernel_init+0x90/0x144) [] (kernel_init+0x90/0x144) from [] (kernel_thread_exit+0x0/0x8) Code: e5942004 e3a0c009 e1a0331c e3a01000 (e18210b3) ---[ end trace 1b75b31a2719ed1c ]--- This patch moves register shift setting before any register accesses are done. Signed-off-by: Mika Westerberg Cc: Cory Maccarrone Signed-off-by: Ben Dooks commit da9c99fc32e2d84f80672d192a7aaf7239057a2e Author: Arnaud Patard Date: Tue Mar 23 17:28:28 2010 +0100 i2c-imx: fix error handling - Return -ETIMEDOUT on bus busy error - Fix timeout test "time_after(jiffies, orig_jiffies + HZ / 1000)" : By default, HZ=100 on arm. This means that this test has no chances to work and may result in a dead loop. Set timeout to 500ms. - Don't try to send a new message if we failed to transmit previous one. This was preventing to recover from error on my system Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks commit 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f Author: Linus Torvalds Date: Mon Apr 19 16:29:56 2010 -0700 Linux 2.6.34-rc5 commit e8a03feb54ca7f1768bbdc2b491f9ef654e6d01d Author: Rik van Riel Date: Wed Apr 14 17:59:28 2010 -0400 rmap: add exclusively owned pages to the newest anon_vma The recent anon_vma fixes cause many anonymous pages to end up in the parent process anon_vma, even when the page is exclusively owned by the current process. Adding exclusively owned anonymous pages to the top anon_vma reduces rmap scanning overhead, especially in workloads with forking servers. This patch adds a parameter to __page_set_anon_rmap that can be used to indicate whether or not the added page is exclusively owned by the current process. Pages added through page_add_new_anon_rmap are exclusively owned by the current process, and can be added to the top anon_vma. Pages added through page_add_anon_rmap can be either shared or exclusively owned, so we do the conservative thing and add it to the oldest anon_vma. A next step would be to add the exclusive parameter to page_add_anon_rmap, to be used from functions where we do know for sure whether a page is exclusively owned. Signed-off-by: Rik van Riel Reviewed-by: Johannes Weiner Lightly-tested-by: Borislav Petkov Reviewed-by: Minchan Kim [ Edited to look nicer - Linus ] Signed-off-by: Linus Torvalds commit 9b030e2006546366c832911ca5eb9e785408795b Merge: 76e506a 9f37622 Author: Linus Torvalds Date: Mon Apr 19 14:20:32 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: eCryptfs: Turn lower lookup error messages into debug messages eCryptfs: Copy lower directory inode times and size on link ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode ecryptfs: fix error code for missing xattrs in lower fs eCryptfs: Decrypt symlink target for stat size eCryptfs: Strip metadata in xattr flag in encrypted view eCryptfs: Clear buffer before reading in metadata xattr eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front eCryptfs: Fix metadata in xattr feature regression commit ef9e83c1ab2981769f16e626179dd56895041b38 Author: Alexander Kuznetsov Date: Mon Apr 19 14:17:43 2010 -0700 8139too: Fix a typo in the function name. Signed-off-by: Alexander Kuznetsov Signed-off-by: David S. Miller commit baa06775e224e9f74e5c2de894c95cd49678beff Author: David S. Miller Date: Mon Apr 19 13:46:48 2010 -0700 sparc64: Use correct pt_regs in decode_access_size() error paths. Signed-off-by: David S. Miller commit fe6f212ce12341df18ef9b890bea739b4547157b Author: Reinette Chatre Date: Mon Apr 19 10:46:31 2010 -0700 mac80211: pass HT changes to driver when off channel Since "mac80211: make off-channel work generic" drivers have not been notified of configuration changes after association or authentication. This caused more dependence on current state to ensure driver will be notified when configuration changes occur. One such problem arises if off-channel is in progress when HT information changes. Since HT is only enabled on the "oper_channel" the driver will never be notified of this change. Usually the driver is notified soon after of a BSS information change (BSS_CHANGED_HT) ... but since the driver did not get a notification that this is a HT channel the new BSS information does not make sense. Fix this by also changing the off-channel information when HT is enabled and thus cause driver to be notified correctly. This fixes a problem in 4965 when associated with 5GHz 40MHz channel. Without this patch the system can associate but is unable to transfer any data, not even ping. See http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2158 Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit b4bb5c3fd9333024044362df67e23e96158489ed Author: Johannes Berg Date: Mon Apr 19 10:48:38 2010 +0200 mac80211: remove bogus TX agg state assignment When the addba timer expires but has no work to do, it should not affect the state machine. If it does, TX will not see the successfully established and we can also crash trying to re-establish the session. Cc: stable@kernel.org [2.6.32, 2.6.33] Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9f37622f897a90ad3c3da5c14d94d8f3ffc62b70 Author: Tyler Hicks Date: Thu Mar 25 11:16:56 2010 -0500 eCryptfs: Turn lower lookup error messages into debug messages Vaugue warnings about ENAMETOOLONG errors when looking up an encrypted file name have caused many users to become concerned about their data. Since this is a rather harmless condition, I'm moving this warning to only be printed when the ecryptfs_verbosity module param is 1. Signed-off-by: Tyler Hicks commit 3a8380c0754a7972668a46f645930910e304095c Author: Tyler Hicks Date: Tue Mar 23 18:09:02 2010 -0500 eCryptfs: Copy lower directory inode times and size on link The timestamps and size of a lower inode involved in a link() call was being copied to the upper parent inode. Instead, we should be copying lower parent inode's timestamps and size to the upper parent inode. I discovered this bug using the POSIX test suite at Tuxera. Signed-off-by: Tyler Hicks commit 133b8f9d632cc23715c6d72d1c5ac449e054a12a Author: Jeff Mahoney Date: Fri Mar 19 15:35:46 2010 -0400 ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode Since tmpfs has no persistent storage, it pins all its dentries in memory so they have d_count=1 when other file systems would have d_count=0. ->lookup is only used to create new dentries. If the caller doesn't instantiate it, it's freed immediately at dput(). ->readdir reads directly from the dcache and depends on the dentries being hashed. When an ecryptfs mount is mounted, it associates the lower file and dentry with the ecryptfs files as they're accessed. When it's umounted and destroys all the in-memory ecryptfs inodes, it fput's the lower_files and d_drop's the lower_dentries. Commit 4981e081 added this and a d_delete in 2008 and several months later commit caeeeecf removed the d_delete. I believe the d_drop() needs to be removed as well. The d_drop effectively hides any file that has been accessed via ecryptfs from the underlying tmpfs since it depends on it being hashed for it to be accessible. I've removed the d_drop on my development node and see no ill effects with basic testing on both tmpfs and persistent storage. As a side effect, after ecryptfs d_drops the dentries on tmpfs, tmpfs BUGs on umount. This is due to the dentries being unhashed. tmpfs->kill_sb is kill_litter_super which calls d_genocide to drop the reference pinning the dentry. It skips unhashed and negative dentries, but shrink_dcache_for_umount_subtree doesn't. Since those dentries still have an elevated d_count, we get a BUG(). This patch removes the d_drop call and fixes both issues. This issue was reported at: https://bugzilla.novell.com/show_bug.cgi?id=567887 Reported-by: Árpád Bíró Signed-off-by: Jeff Mahoney Cc: Dustin Kirkland Cc: stable@kernel.org Signed-off-by: Tyler Hicks commit cfce08c6bdfb20ade979284e55001ca1f100ed51 Author: Christian Pulvermacher Date: Tue Mar 23 11:51:38 2010 -0500 ecryptfs: fix error code for missing xattrs in lower fs If the lower file system driver has extended attributes disabled, ecryptfs' own access functions return -ENOSYS instead of -EOPNOTSUPP. This breaks execution of programs in the ecryptfs mount, since the kernel expects the latter error when checking for security capabilities in xattrs. Signed-off-by: Christian Pulvermacher Cc: stable@kernel.org Signed-off-by: Tyler Hicks commit 3a60a1686f0d51c99bd0df8ac93050fb6dfce647 Author: Tyler Hicks Date: Mon Mar 22 00:41:35 2010 -0500 eCryptfs: Decrypt symlink target for stat size Create a getattr handler for eCryptfs symlinks that is capable of reading the lower target and decrypting its path. Prior to this patch, a stat's st_size field would represent the strlen of the encrypted path, while readlink() would return the strlen of the decrypted path. This could lead to confusion in some userspace applications, since the two values should be equal. https://bugs.launchpad.net/bugs/524919 Reported-by: Loïc Minier Cc: stable@kernel.org Signed-off-by: Tyler Hicks commit 76e506a754c9519ba0a948b475a62f31fac8b599 Author: Linus Torvalds Date: Mon Apr 19 11:53:17 2010 -0700 Fix ISDN/Gigaset build failure Commit b91ecb00 ("gigaset: include cleanup cleanup") removed an implicit sched.h inclusion that came in via slab.h, and caused various compile problems as a result. This should fix it. Reported-by: Ingo Molnar Signed-off-by: Linus Torvalds commit e1393667be574807a13bfaf1bb471f5fd1a5287b Author: Clemens Ladisch Date: Mon Apr 12 10:35:44 2010 +0200 firewire: ohci: wait for local CSR lock access to finish Add a loop to wait for the controller to finish a locally-initiated CSR lock operation. Google shows some occurrences of the "swap not done yet" message which might indicate that some OHCI controllers are not fast enough to do the lock/swap in the time needed for one PCI access. This also correctly handles the case where the lock operation did not finish, instead of silently returning an uninitialized value. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 2608203daf5f87311c6e5d36e5de5efcb14aab24 Author: Clemens Ladisch Date: Mon Apr 12 10:35:30 2010 +0200 firewire: ohci: prevent aliasing of locally handled register addresses We must compute the offset from the CSR register base with the full 48 address bits to prevent matching with addresses whose lower 32 bits happen to be equal with one of the specially handled registers. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit d6372b6e7c6142e6cc2108b3b850584cd7ade106 Author: Clemens Ladisch Date: Mon Apr 12 10:35:18 2010 +0200 firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources Returning -EIO for all errors would not allow clients to determine if the resource allocation process itself failed, or if the resources are not available. (The latter information is needed by CMP to synchronize restoring of overlayed connections after a bus reset.) Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 3a1f0a0e3d871e3d3e08a1429009992151becda8 Author: Clemens Ladisch Date: Mon Apr 12 10:35:05 2010 +0200 firewire: core: fix retries calculation in iso manage_channel() If there is a permanent error condition when communicating with the IRM, after the sixth error, the retry variable will be decremented to -1. If, in this case, the bits in channels_mask are not yet exhausted, the next channel is retried 2^32 times. To fix this, check that retry is never decremented beyond zero. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit b7d2526f5c20385894a5e57b1a4292f5a1741f1b Author: Takashi Iwai Date: Mon Apr 19 18:11:29 2010 +0200 ALSA: hda - Fix resume from StR of HP 2510p with docking-station When HP laptop with AD1981 codec is suspended and the docking-station is connected before the resume, the outputs get confused, and wrongly routed still to the speaker. This is because of a change in 2.6.34-rc1 ea52bf260ecbb175339af3178c15788df21b7516 ALSA: hda: Add powerdown for Analog Devices HDA codecs The problem was the added resume callback that doesn't consider the modified init hook. The fix is simply remove the resume callback here and make the resume normally. This doesn't change any behavior intended in the commit above (for shutting down the sound at suspend) but only fixes the resume. Reported-and-tested-by: Frans Pop Signed-off-by: Takashi Iwai commit 85341c61361cc45a9cc0e11c01e8f4479ef460ac Merge: 375db48 bc293d6 Author: Linus Torvalds Date: Mon Apr 19 08:35:47 2010 -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: rcu: Make RCU lockdep check the lockdep_recursion variable rcu: Update docs for rcu_access_pointer and rcu_dereference_protected rcu: Better explain the condition parameter of rcu_dereference_check() rcu: Add rcu_access_pointer and rcu_dereference_protected commit 375db4810b27306ea400ab39d3d6f7a063ac9ff6 Merge: 73c6c7f b91ecb0 Author: Linus Torvalds Date: Mon Apr 19 07:27:45 2010 -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: gigaset: include cleanup cleanup packet : remove init_net restriction WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver. ip: Fix ip_dev_loopback_xmit() net: dev_pick_tx() fix fib: suppress lockdep-RCU false positive in FIB trie. tun: orphan an skb on tx forcedeth: fix tx limit2 flag check iwlwifi: work around bogus active chains detection commit 73c6c7fbb74d07a80fee41ce4ca3976547519e42 Merge: eb3e5cc 79b9517 Author: Linus Torvalds Date: Mon Apr 19 07:27:06 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: add FireMV 2400 PCI ID. drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET drivers/gpu/radeon: Add MSPOS regs to safe list. drm/radeon/kms: disable the tv encoder when tv/cv is not in use drm/radeon/kms: adjust pll settings for tv drm/radeon/kms: fix tv dac conflict resolver drm/radeon/kms/evergreen: don't enable hdmi audio stuff drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0 drm/radeon/kms: fix rs600 tlb flush drm/radeon/kms: print GPU family and device id when loading drm/radeon/kms: fix calculation of mipmapped 3D texture sizes drm/radeon/kms: only change mode when coherent value changes. drm/radeon/kms: more atom parser fixes (v2) commit eb3e5cce2b39a266a1a167fa4290939db20ef5d6 Merge: 13bd8e4 b1cdbb5 Author: Linus Torvalds Date: Mon Apr 19 07:26:21 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 5974/1: arm/mach-at91 Makefile: remove two blanks. ARM: 6052/1: kdump: make kexec work in interrupt context ARM: 6051/1: VFP: preserve the HW context when calling signal handlers ARM: 6050/1: VFP: fix the SMP versions of vfp_{sync,flush}_hwstate ARM: 6007/1: fix highmem with VIPT cache and DMA ARM: 5975/1: AT91 slow-clock suspend: don't wait when turning PLLs off commit 07a71415d5f790385695784a9b0e554412ee95c3 Author: Dan Carpenter Date: Sun Apr 18 22:07:33 2010 +0300 pcmcia: fix error handling in cm4000_cs.c In the original code we used -ENODEV as the number of bytes to copy_to_user() and we didn't release the locks. Signed-off-by: Dan Carpenter Acked-by: Harald Welte Signed-off-by: Dominik Brodowski commit 58d57658834faa0c19da35e84632f7b78846f69f Author: Axel Lin Date: Mon Apr 19 09:58:02 2010 +0800 mc13783-regulator: fix a memory leak in mc13783_regulator_remove This patch fixes a memory leak by freeing priv in mc13783_regulator_remove Signed-off-by: Axel Lin Cc: Sascha Hauer Cc: Liam Girdwood Cc: Mark Brown Cc: Samuel Ortiz Signed-off-by: Liam Girdwood commit be1a50d4eba4cdb3ebf9d97a0a8693c153436775 Author: Jean Delvare Date: Sat Apr 3 17:37:45 2010 +0200 regulator: Let drivers know when they use the stub API Have the stub variant of regulator_get() return NULL, so that drivers can (but still don't have to) handle this case specifically. Signed-off-by: Jean Delvare Cc: Mark Brown Cc: Jerome Oufella Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 79b9517a33a283c5d9db875c263670ed1e055f7e Author: Dave Airlie Date: Mon Apr 19 17:54:31 2010 +1000 drm/radeon/kms: add FireMV 2400 PCI ID. This is an M24/X600 chip. From RH# 581927 cc: stable@kernel.org Signed-off-by: Dave Airlie commit 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c Author: Jan Kiszka Date: Mon Apr 19 17:46:23 2010 +0900 uml: Fix build breakage after slab.h changes We now have to to include linux/slab.h explicitly for kmalloc & friends. Files that build against host headers already get their prototypes via um_malloc.h, linux/slab.h may even be unavailable. Signed-off-by: Jan Kiszka Signed-off-by: Tejun Heo commit 6c94b1ee0ca2bfb526d779c088ec20da6a3761db Author: David S. Miller Date: Mon Apr 19 01:30:51 2010 -0700 sparc64: Fix PREEMPT_ACTIVE value. It currently overlaps the NMI bit. Signed-off-by: David S. Miller commit 6b9d363c49d22395d0cf8729c5963f83cfbb6d69 Author: Dmitry Torokhov Date: Mon Apr 19 00:42:16 2010 -0700 Input: psmouse - ignore parity error for basic protocols Observing behavior of the other OS it appears that parity errors reported by the keyboard controller are being ignored and the data is processed as usual. Let's do the same for standard PS/2 protocols (bare, Intellimouse and Intellimouse Explorer) to provide better compatibility. Thsi should fix teh following bug: https://bugzilla.kernel.org/show_bug.cgi?id=6105 Thanks for Damjan Jovanovic for locating the source of issue and ideas for the patch. Tested-by: Damjan Jovanovic Signed-off-by: Dmitry Torokhov commit bc293d62b26ec590afc90a9e0a31c45d355b7bd8 Author: Paul E. McKenney Date: Thu Apr 15 12:50:39 2010 -0700 rcu: Make RCU lockdep check the lockdep_recursion variable The lockdep facility temporarily disables lockdep checking by incrementing the current->lockdep_recursion variable. Such disabling happens in NMIs and in other situations where lockdep might expect to recurse on itself. This patch therefore checks current->lockdep_recursion, disabling RCU lockdep splats when this variable is non-zero. In addition, this patch removes the "likely()", as suggested by Lai Jiangshan. Reported-by: Frederic Weisbecker Reported-by: David Miller Tested-by: Frederic Weisbecker Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <20100415195039.GA22623@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit cae94b0ad9d147152af77b971a7234faf20027a9 Author: Marek Olšák Date: Sun Feb 21 21:24:15 2010 +0100 drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET [airlied: fix V_A_N_V to not be safe and fix check to make sure only r500 - bump userspace version] Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit f12eebb0acbaa6dcb60ed34451f5b159f509b2c0 Author: Corbin Simpson Date: Sun Apr 11 12:34:00 2010 -0700 drivers/gpu/radeon: Add MSPOS regs to safe list. Permits MSAA and D3D-style rasterization. [airlied: add rs600] Signed-off-by: Corbin Simpson Signed-off-by: Dave Airlie commit d3a67a43b0460bae3e2ac14092497833344ac10d Author: Alex Deucher Date: Tue Apr 13 11:21:59 2010 -0400 drm/radeon/kms: disable the tv encoder when tv/cv is not in use Switching between TV and VGA caused VGA to break on some systems since the TV encoder was left enabled when VGA was used. fixes fdo bug 25520. Signed-off-by: Alex Deucher Cc: stable Signed-off-by: Dave Airlie commit a1a4b23b66039c814c3d3a9a28d76d34800eadc5 Author: Alex Deucher Date: Fri Apr 9 15:31:56 2010 -0400 drm/radeon/kms: adjust pll settings for tv May fix fdo bug 26582. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 08d075116db3592db218bfe0f554cd93c9e12505 Author: Alex Deucher Date: Thu Apr 15 13:31:12 2010 -0400 drm/radeon/kms: fix tv dac conflict resolver On systems with the tv dac shared between DVI and TV, we can only use the dac for one of the connectors. However, when using a digital monitor on the DVI port, you can use the dac for the TV connector just fine. Check the use_digital status when resolving the conflict. Fixes fdo bug 27649, possibly others. Signed-off-by: Alex Deucher Cc: stable Signed-off-by: Dave Airlie commit 16823d16f55afc303af7864b9a055d8a1c012e1b Author: Alex Deucher Date: Fri Apr 16 11:35:30 2010 -0400 drm/radeon/kms/evergreen: don't enable hdmi audio stuff Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b317a9ce2259e64258a802a5ca70dec45ac15dda Author: Alex Deucher Date: Thu Apr 15 16:54:38 2010 -0400 drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0 Got broken during the evergreen merge. Fixes fdo bug 27001. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 30f69f3fb20bd719b5e1bf879339914063d38f47 Author: Jerome Glisse Date: Fri Apr 16 18:46:35 2010 +0200 drm/radeon/kms: fix rs600 tlb flush Typo in in flush leaded to no flush of the RS600 tlb which ultimately leaded to massive system ram corruption, with this patch everythings seems to work properly. Signed-off-by: Jerome Glisse Cc: stable Signed-off-by: Dave Airlie commit 1b5331d9c6ae1f68db6359d227531ec42bc40d47 Author: Jerome Glisse Date: Mon Apr 12 20:21:53 2010 +0000 drm/radeon/kms: print GPU family and device id when loading This will help figuring out GPU when looking at bugs log. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit c36a2a6de59e4a141a68b7575de837d3b0bd96b3 Author: Daniel Vetter Date: Sat Apr 17 15:12:03 2010 +0200 drm/i915: fix tiling limits for i915 class hw v2 Current code is definitely crap: Largest pitch allowed spills into the TILING_Y bit of the fence registers ... :( I've rewritten the limits check under the assumption that 3rd gen hw has a 3d pitch limit of 8kb (like 2nd gen). This is supported by an otherwise totally misleading XXX comment. This bug mostly resulted in tiling-corrupted pixmaps because the kernel allowed too wide buffers to be tiled. Bug brought to the light by the xf86-video-intel 2.11 release because that unconditionally enabled tiling for pixmaps, relying on the kernel to check things. Tiling for the framebuffer was not affected because the ddx does some additional checks there ensure the buffer is within hw-limits. v2: Instead of computing the value that would be written into the hw fence registers and then checking the limits simply check whether the stride is above the 8kb limit. To better document the hw, add some WARN_ONs in i915_write_fence_reg like I've done for the i830 case (using the right limits). Signed-off-by: Daniel Vetter Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27449 Tested-by: Alexander Lam Cc: stable@kernel.org Signed-off-by: Eric Anholt commit 3143751ff51a163b77f7efd389043e038f3e008e Author: Zhang Rui Date: Mon Mar 29 15:12:16 2010 +0800 drm/i915: set DIDL using the ACPI video output device _ADR method return. we used to set the DIDL in the output device detected order. But some BIOSes requires it to be initialized in the ACPI device order. e.g. the value of the first field in DIDL stands for the first ACPI video output device in ACPI namespace. Now we initialize the DIDL using the device id, i.e. _ADR return value, of each ACPI video device, if it is not 0. https://bugzilla.kernel.org/show_bug.cgi?id=15054 Signed-off-by: Zhang Rui Signed-off-by: Eric Anholt commit 5ce8ba7c9279a63f99e1f131602580472b8af968 Author: Adam Jackson Date: Thu Apr 15 14:03:30 2010 -0400 drm/i915: Fix 82854 PCI ID, and treat it like other 85X pci.ids and the datasheet both say it's 358e, not 35e8. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 8f4695ed1c9e068772bcce4cd4ff03f88d57a008 Author: Adam Jackson Date: Fri Apr 16 18:20:57 2010 -0400 drm/i915: Attempt to fix watermark setup on 85x (v2) IS_MOBILE() catches 85x, so we'd always try to use the 9xx FIFO sizing; since there's an explicit 85x version, this seems wrong. v2: Handle 830m correctly too. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Signed-off-by: Eric Anholt commit b91ecb0027c7171c83d7cf443a22c39b1fde6d83 Author: Tilman Schmidt Date: Fri Apr 16 12:08:58 2010 +0000 gigaset: include cleanup cleanup Commit 5a0e3ad causes slab.h to be included twice in many of the Gigaset driver's source files, first via the common include file gigaset.h and then a second time directly. Drop the spares, and use the opportunity to clean up a few more similar cases. Impact: cleanup, no functional change Signed-off-by: Tilman Schmidt CC: Tejun Heo Acked-by: Tejun Heo Signed-off-by: David S. Miller commit 13bd8e4673d527a9e48f41956b11d391e7c2cfe0 Merge: d6f533c bfac4d6 Author: Linus Torvalds Date: Sat Apr 17 14:28:50 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Ignore LVDS EDID when it is unavailabe or invalid drm/i915: Add no_lvds entry for the Clientron U800 drm/i915: Rename many remaining uses of "output" to encoder or connector. drm/i915: Rename intel_output to intel_encoder. agp/intel: intel_845_driver is an agp driver! drm/i915: introduce to_intel_bo helper drm/i915: Disable FBC on 915GM and 945GM. commit d6f533c8c7a4d83ed1c075f919a68031b9c67185 Merge: 6583294 bc39669 Author: Linus Torvalds Date: Sat Apr 17 10:58:38 2010 -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: ACPI: EC: Limit burst to 64 bits commit 65832940eb74dca5ef1c8df086540825a00ad0c8 Merge: 1c1ec9c f1d486a Author: Linus Torvalds Date: Sat Apr 17 10:57:56 2010 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: don't warn on EAGAIN in inode reclaim xfs: ensure that sync updates the log tail correctly commit b8639077abf034824046ed09e779b74c4393031f Author: Joern Engel Date: Sat Apr 17 19:54:27 2010 +0200 [LogFS] Set s_bdi Since 32a88aa1 sync() was turned into a NOP for logfs. Worse, sync() would not return an error, giving the illusion that writeout had actually happened. Afaics jffs2 was broken as well. Signed-off-by: Joern Engel commit 42d284b986105a6ed5ac386818cae093532b2c55 Author: Julia Lawall Date: Mon Mar 29 17:35:24 2010 +0200 drivers/pcmcia: Add missing local_irq_restore Use local_irq_restore in this error-handling case just like in the one just below. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * local_irq_save (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Signed-off-by: Dominik Brodowski commit 6f4567c8cf64d1887c8e993bbf066465262b392f Author: Timur Maximov Date: Wed Apr 14 19:06:57 2010 +0400 serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33) Many PCMCIA GPRS modems like: Onda Edge N100E, Novaway PC98 (OEM SPC98Z), Rovermate Edgus Adaptmate-039 and others have same construction and identification: lspcmcia -vvv Product Name: Generic Modem: MD55x 1.00 Serial number: xxxxx-xxx Identification: manf_id: 0x015d card_id: 0x4c45 function: 2 (serial) prod_id(1): "Generic" (0xc49e4731) prod_id(2): "Modem: MD55x" (0x8913b110) prod_id(3): "1.00" (0x83dbf271) prod_id(4): "Serial number: xxxxx-xxx" (0x73ee9514) Serial connection to GSM module based on Elan VPU16551 PCMCIA UART with datasheet recommeded 14.7456MHz crystal oscillator. By default serial_cs set UART clock == 1843200 Hz For correct work need set clock 14745600 Hz. This quirk already present in driver, only need add device in quirk list. Signed-off-by: Timur Maximov Acked-by: Alan Cox Signed-off-by: Dominik Brodowski commit a8408c17d0038b76a83affb1b56dc18fa1e7ed86 Author: Dominik Brodowski Date: Sat Apr 17 17:37:33 2010 +0200 pcmcia: avoid late calls to pccard_validate_cis pccard_validate_cis() nowadays destroys the CIS cache. Therefore, calling it after card setup should be avoided. We can't control the deprecated PCMCIA ioctl (which is only used on ARM nowadays), but we can avoid -- and report -- any other calls. Signed-off-by: Dominik Brodowski commit 1c4f0197323254e463b642abf2c8361e2a924859 Author: Daniel Lezcano Date: Wed Apr 14 23:11:14 2010 +0000 packet : remove init_net restriction The af_packet protocol is used by Perl to do ioctls as reported by Stephane Riviere: "Net::RawIP relies on SIOCGIFADDR et SIOCGIFHWADDR to get the IP and MAC addresses of the network interface." But in a new network namespace these ioctl fail because it is disabled for a namespace different from the init_net_ns. These two lines should not be there as af_inet and af_packet are namespace aware since a long time now. I suppose we forget to remove these lines because we sent the af_packet first, before af_inet was supported. Signed-off-by: Daniel Lezcano Reported-by: Stephane Riviere Signed-off-by: David S. Miller commit 31f634a63de7068c6a5dcb0d7b09b24b61a5cf88 Author: Krzysztof Halasa Date: Wed Apr 14 14:09:52 2010 +0000 WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver. tx_queue is used as a temporary queue when not allowed to queue skb directly to the hw device driver (which may sleep). Most paths flush it before returning, but ppp_start() currently cannot. Make sure we don't leave skbs pointing to a non-existent device. Thanks to Michael Barkowski for reporting this problem. Signed-off-by: Krzysztof Hałasa Signed-off-by: David S. Miller commit f2fa1b015e9c199e45c836c769d94db595150731 Author: Shanyu Zhao Date: Wed Apr 7 18:37:52 2010 -0700 iwlwifi: correct 6000 EEPROM regulatory address For 6000 series, the 2.4G HT40 band regulatory settings address in EEPROM was off by 2. Before the fix, you'll see this in dmesg: [79535.788877] ieee80211 phy8: U iwl_mod_ht40_chan_info HT40 Ch. 7 [2.4GHz] WIDE (0x61 0dBm): Ad-Hoc not supported [79535.788880] ieee80211 phy8: U iwl_mod_ht40_chan_info HT40 Ch. 11 [2.4GHz] WIDE (0x61 0dBm): Ad-Hoc not supported And after the fix: [91132.688706] ieee80211 phy14: U iwl_mod_ht40_chan_info HT40 Ch. 7 [2.4GHz] IBSS ACTIVE WIDE (0x6f 0dBm): Ad-Hoc supported [91132.688709] ieee80211 phy14: U iwl_mod_ht40_chan_info HT40 Ch. 11 [2.4GHz] IBSS ACTIVE WIDE (0x6f 0dBm): Ad-Hoc supported Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit 88be026490ed89c2ffead81a52531fbac5507e01 Author: Johannes Berg Date: Wed Apr 7 00:21:36 2010 -0700 iwlwifi: fix scan races When an internal scan is started, nothing protects the is_internal_short_scan variable which can cause crashes, cf. https://bugzilla.kernel.org/show_bug.cgi?id=15667. Fix this by making the short scan request use the mutex for locking, which requires making the request go to a work struct so that it can sleep. Reported-by: Peter Zijlstra Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit bc3966921ff9528ae44a4a108085ab06107c1e7d Merge: dc57da3 2060c44 Author: Len Brown Date: Fri Apr 16 16:08:07 2010 -0400 Merge branch 'bugzilla-15749' into release commit 2060c44576c79086ff24718878d7edaa7384a985 Author: Alexey Starikovskiy Date: Fri Apr 16 15:36:40 2010 -0400 ACPI: EC: Limit burst to 64 bits access_bit_width field is u8 in ACPICA, thus 256 value written to it becomes 0, causing divide by zero later. Proper fix would be to remove access_bit_width at all, just because we already have access_byte_width, which is access_bit_width / 8. Limit access width to 64 bit for now. https://bugzilla.kernel.org/show_bug.cgi?id=15749 fixes regression caused by the fix for: https://bugzilla.kernel.org/show_bug.cgi?id=14667 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit f1d486a3617a2f620b31224e4ace1496c4627e39 Author: Dave Chinner Date: Tue Apr 13 15:06:45 2010 +1000 xfs: don't warn on EAGAIN in inode reclaim Any inode reclaim flush that returns EAGAIN will result in the inode reclaim being attempted again later. There is no need to issue a warning into the logs about this situation. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Signed-off-by: Alex Elder commit b6f8dd49dbdbfa60a33bba3d4b766fe341109b4b Author: Dave Chinner Date: Tue Apr 13 15:06:44 2010 +1000 xfs: ensure that sync updates the log tail correctly Updates to the VFS layer removed an extra ->sync_fs call into the filesystem during the sync process (from the quota code). Unfortunately the sync code was unknowingly relying on this call to make sure metadata buffers were flushed via a xfs_buftarg_flush() call to move the tail of the log forward in memory before the final transactions of the sync process were issued. As a result, the old code would write a very recent log tail value to the log by the end of the sync process, and so a subsequent crash would leave nothing for log recovery to do. Hence in qa test 182, log recovery only replayed a small handle for inode fsync transactions in this case. However, with the removal of the extra ->sync_fs call, the log tail was now not moved forward with the inode fsync transactions near the end of the sync procese the first (and only) buftarg flush occurred after these transactions went to disk. The result is that log recovery now sees a large number of transactions for metadata that is already on disk. This usually isn't a problem, but when the transactions include inode chunk allocation, the inode create transactions and all subsequent changes are replayed as we cannt rely on what is on disk is valid. As a result, if the inode was written and contains unlogged changes, the unlogged changes are lost, thereby violating sync semantics. The fix is to always issue a transaction after the buftarg flush occurs is the log iѕ not idle or covered. This results in a dummy transaction being written that contains the up-to-date log tail value, which will be very recent. Indeed, it will be at least as recent as the old code would have left on disk, so log recovery will behave exactly as it used to in this situation. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 1c1ec9c03efce5853f75e244ff368339767f7b9e Merge: 1f82982 aebaec9 Author: Linus Torvalds Date: Fri Apr 16 07:26:31 2010 -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] max63xx driver depends on ioremap() [WATCHDOG] max63xx: be careful when disabling the watchdog [WATCHDOG] fixed book E watchdog period register mask. [WATCHDOG] omap4: Fix WDT Kconfig commit 1f829825f21755c48de075cd7722fcd19438f587 Merge: dc57da3 923125c Author: Linus Torvalds Date: Fri Apr 16 07:25:48 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: imx-ssi: do not call hrtimer_disable in trigger function ALSA: hda - Add position_fix quirk for Biostar mobo ALSA: hda - add a quirk for Clevo M570U laptop ASoC: imx-ssi: increase minimum periods to 4 ALSA: hda - Avoid invalid "Independent HP" control for VIA codecs ALSA: hda - Fix control element allocations in VIA codec parser ALSA: aaci - Fix alignment faults on ARM Cortex introduced by commit 29a4f2d3 ALSA: hda - Add fix-up for Sony VAIO with ALC269 ALSA: hda - Enhance fix-up table for Realtek codecs ALSA: usb - Fix Oops after usb-midi disconnection ALSA: hda - Fix initial capture source connections of ALC880/260 ALSA: hda - Fix setup for ALC269vb amic and dmic models ALSA: hda - Fix auto-parser of ALC269vb for HP pin NID 0x21 ASoC: imx-ssi: Use a hrtimer in FIQ mode ASoC: imx-pcm-dma-mx2: restart DMA after an error ASoC: imx-ssi: honor IMX_SSI_DMA flag ASoC: wm2000: remove unused #include ALSA: hda: Add support for Medion WIM2160 commit c7f2e1f0ac142a657a1de00d404e1c8345b20598 Author: Dmitry Monakhov Date: Fri Apr 16 08:05:50 2010 -0500 jfs: add jfs specific ->setattr call generic setattr not longer responsible for quota transfer. use jfs_setattr for all jfs's inodes. Signed-off-by: Dmitry Monakhov Signed-off-by: Dave Kleikamp commit 2b0b39517d1af5294128dbc2fd7ed39c8effa540 Author: Bill Pemberton Date: Fri Apr 16 08:01:20 2010 -0500 jfs: fix diAllocExt error in resizing filesystem Resizing the filesystem would result in an diAllocExt error in some instances because changes in bmp->db_agsize would not get noticed if goto extendBmap was called. Signed-off-by: Bill Pemberton Signed-off-by: Dave Kleikamp Cc: jfs-discussion@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org commit aebaec975f30c4db40bb418fe9117bb6b4655b1b Author: Geert Uytterhoeven Date: Wed Apr 7 19:57:02 2010 +0200 [WATCHDOG] max63xx driver depends on ioremap() Correct fix for the "ioremap() causes build failure on S390" should have been a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver in the ARM section for now). Signed-off-by: Geert Uytterhoeven Signed-off-by: Wim Van Sebroeck commit b1183e064a3f95d27351b2d2c811b50bf4d770a4 Author: Marc Zyngier Date: Fri Apr 9 17:43:33 2010 +0100 [WATCHDOG] max63xx: be careful when disabling the watchdog When shutting down the watchdog timer, special care must be taken not to overwrite other bits in the register, as it may be shared with other peripherals. For example, on the Arcom Vulcan, the register is shared between the watchdog and the PCI reset line... Signed-off-by: Marc Zyngier Signed-off-by: Wim Van Sebroeck commit 0fb06571bbb5c72b4663c20f721323260ea802bf Author: Luuk Paulussen Date: Thu Apr 15 15:59:10 2010 +1200 [WATCHDOG] fixed book E watchdog period register mask. A previous fix changed the WDTP function to use the period directly, rather than subtracting from 63. However the mask generation was not changed, so the mask was coming out as 0. This patch fixes it. Signed-off-by: Luuk Paulussen Signed-off-by: Wim Van Sebroeck commit 77165a48edeaf4758588563c0592af6559e8b256 Author: Santosh Shilimkar Date: Wed Apr 7 13:17:22 2010 +0530 [WATCHDOG] omap4: Fix WDT Kconfig This patch allows Watchdog timer to be selected for OMAP4 by fixing Kconfig entry Signed-off-by: Santosh Shilimkar Signed-off-by: Wim Van Sebroeck commit 79681842e160c3211eeeb47ea31b061038d1e41e Author: Tao Ma Date: Fri Apr 16 13:59:25 2010 +0800 ocfs2: Reset status if we want to restart file extension. In __ocfs2_extend_allocation, we will restart our file extension if ((!status) && restart_func). But there is a bug that the status is still left as -EGAIN. This is really an old bug, but it is masked by the return value of ocfs2_journal_dirty. So it show up when we make ocfs2_journal_dirty void. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 923125c6503efd3b8779e0df9ec5fcac6acda0b4 Merge: 872d65f 8815cd0 Author: Takashi Iwai Date: Fri Apr 16 10:03:48 2010 +0200 Merge branch 'fix/hda' into for-linus commit 872d65f674a8a420fdfe656cd66d1fa8e60f41a7 Merge: d336905 b68b58f Author: Takashi Iwai Date: Fri Apr 16 10:03:42 2010 +0200 Merge branch 'fix/misc' into for-linus commit d336905e00f208bcb89c719022c11dd3d976597a Merge: 0d0fb0f 8392609 Author: Takashi Iwai Date: Fri Apr 16 10:03:36 2010 +0200 Merge branch 'fix/asoc' into for-linus commit 334656f33c43921cf383dfd0220dfd34376bcd98 Merge: e30b38c 8b9fce7 Author: David S. Miller Date: Thu Apr 15 14:28:46 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit e30b38c298b55e09456d3ccbc1df2f3e2e8dc6e9 Author: Eric Dumazet Date: Thu Apr 15 09:13:03 2010 +0000 ip: Fix ip_dev_loopback_xmit() Eric Paris got following trace with a linux-next kernel [ 14.203970] BUG: using smp_processor_id() in preemptible [00000000] code: avahi-daemon/2093 [ 14.204025] caller is netif_rx+0xfa/0x110 [ 14.204035] Call Trace: [ 14.204064] [] debug_smp_processor_id+0x105/0x110 [ 14.204070] [] netif_rx+0xfa/0x110 [ 14.204090] [] ip_dev_loopback_xmit+0x71/0xa0 [ 14.204095] [] ip_mc_output+0x192/0x2c0 [ 14.204099] [] ip_local_out+0x20/0x30 [ 14.204105] [] ip_push_pending_frames+0x28d/0x3d0 [ 14.204119] [] udp_push_pending_frames+0x14c/0x400 [ 14.204125] [] udp_sendmsg+0x39c/0x790 [ 14.204137] [] inet_sendmsg+0x45/0x80 [ 14.204149] [] sock_sendmsg+0xf1/0x110 [ 14.204189] [] sys_sendmsg+0x20c/0x380 [ 14.204233] [] system_call_fastpath+0x16/0x1b While current linux-2.6 kernel doesnt emit this warning, bug is latent and might cause unexpected failures. ip_dev_loopback_xmit() runs in process context, preemption enabled, so must call netif_rx_ni() instead of netif_rx(), to make sure that we process pending software interrupt. Same change for ip6_dev_loopback_xmit() Reported-by: Eric Paris Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a2612cb16d4d8447793609cbdd2a2f4f156c0020 Author: Stefan Richter Date: Thu Apr 15 22:16:04 2010 +0200 firewire: cdev: fix cut+paste mistake in disclaimer This was supposed to be generic "authors or copyright holders"; I mistakenly picked up text from a wrong file. Reported-by: Daniel K. Signed-off-by: Stefan Richter commit dc57da3875f527b1cc195ea4ce5bd32e1e68433d Merge: 2fed94c 2b2f862 Author: Linus Torvalds Date: Thu Apr 15 12:20:56 2010 -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/gart: Disable GART explicitly before initialization dma-debug: Cleanup for copy-loop in filter_write() x86/amd-iommu: Remove obsolete parameter documentation x86/amd-iommu: use for_each_pci_dev Revert "x86: disable IOMMUs on kernel crash" x86/amd-iommu: warn when issuing command to uninitialized cmd buffer x86/amd-iommu: enable iommu before attaching devices x86/amd-iommu: Use helper function to destroy domain x86/amd-iommu: Report errors in acpi parsing functions upstream x86/amd-iommu: Pt mode fix for domain_destroy x86/amd-iommu: Protect IOMMU-API map/unmap path x86/amd-iommu: Remove double NULL check in check_device commit 2fed94c032316d89422d4abfca2a882897489b94 Merge: 00eef7b 19b3eec Author: Linus Torvalds Date: Thu Apr 15 11:56:20 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: cdev: change license of exported header files to MIT license firewire: cdev: comment fixlet firewire: cdev: iso packet documentation firewire: cdev: fix information leak firewire: cdev: require quadlet-aligned headers for transmit packets firewire: cdev: disallow receive packets without header commit 00eef7bd01c7598d195699983c5290d901df19ad Merge: 250541f 014f615 Author: Linus Torvalds Date: Thu Apr 15 11:49:55 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - switch mode upon system resume Revert "Input: wacom - merge out and in prox events" Input: matrix_keypad - allow platform to disable key autorepeat Input: ALPS - add signature for HP Pavilion dm3 laptops Input: i8042 - spelling fix Input: sparse-keymap - implement safer freeing of the keymap Input: update the status of the Multitouch X driver project Input: clarify the no-finger event in multitouch protocol Input: bcm5974 - retract efi-broken suspend_resume Input: sparse-keymap - free the right keymap on error commit 014f61504af276ba9d9544d8a7401d8f8526eb73 Author: Ping Cheng Date: Tue Apr 13 23:07:52 2010 -0700 Input: wacom - switch mode upon system resume When Wacom devices wake up from a sleep, the switch mode command (wacom_query_tablet_data) is needed before wacom_open is called. wacom_query_tablet_data should not be executed inside wacom_open since wacom_open is called more than once during probe. wacom_retrieve_hid_descriptor is removed from wacom_resume due to the fact that the required descriptors are stored properly upon system resume. Reported-and-tested-by: Anton Anikin Signed-off-by: Ping Cheng Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit 41b97ab5050088cd23692d578e7294c7be26109a Author: Dominik Brodowski Date: Thu Apr 15 19:01:53 2010 +0200 pcmcia: fix ioport size calculation in rsrc_nonstatic Size needs to be calculated after manipulating with the start value. Reported-by: Komuro Signed-off-by: Dominik Brodowski commit 8392609969b3b37a4da5cff08161661f7a8c16af Author: Sascha Hauer Date: Wed Apr 14 09:17:30 2010 +0200 ASoC: imx-ssi: do not call hrtimer_disable in trigger function Doing so causes a deadlock, so just signal the timer to stop using an atomic variable. Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 19b3eecc21b65a24b0aae2684ca0c8e1b99ef802 Author: Stefan Richter Date: Sun Apr 11 11:52:12 2010 +0200 firewire: cdev: change license of exported header files to MIT license Among else, this allows projects like libdc1394 to carry copies of the ABI related header files without them or distributors having to worry about effects on the project's overall license terms. Switch to MIT license as suggested by Kristian. Also update the year in the copyright statement according to source history. Cc: Jay Fenlason Acked-by: Clemens Ladisch Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 8728c544a9cbdcb0034aa5c45706c5f953f030ee Author: Eric Dumazet Date: Sun Apr 11 21:18:17 2010 +0000 net: dev_pick_tx() fix When dev_pick_tx() caches tx queue_index on a socket, we must check socket dst_entry matches skb one, or risk a crash later, as reported by Denys Fedorysychenko, if old packets are in flight during a route change, involving devices with different number of queues. Bug introduced by commit a4ee3ce3 (net: Use sk_tx_queue_mapping for connected sockets) Reported-by: Denys Fedorysychenko Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8815cd030fdd73932a791d1f06194c8db807cde7 Author: Takashi Iwai Date: Thu Apr 15 09:02:41 2010 +0200 ALSA: hda - Add position_fix quirk for Biostar mobo The Biostar mobo seems to give a wrong DMA position, resulting in stuttering or skipping sounds on 2.6.34. Since the commit 7b3a177b0d4f92b3431b8dca777313a07533a710, "ALSA: pcm_lib: fix "something must be really wrong" condition", makes the position check more strictly, the DMA position problem is revealed more clearly now. The fix is to use only LPIB for obtaining the position, i.e. passing position_fix=1. This patch adds a static quirk to achieve it as default. Reported-by: Frank Griffin Cc: Eric Piel Signed-off-by: Takashi Iwai commit d1501ea844eefdf925f6b711875b4b2b928fddf8 Author: Joerg Schirottke Date: Thu Apr 15 08:37:41 2010 +0200 ALSA: hda - add a quirk for Clevo M570U laptop Added the matching model for Clevo laptop M570U. Signed-off-by: Joerg Schirottke Tested-by: Maximilian Gerhard Cc: Signed-off-by: Takashi Iwai commit 1f1b0008e8dd1930d6e89522c70f4a438374302a Author: Joern Engel Date: Thu Apr 15 08:03:57 2010 +0200 [LogFS] Prevent mempool_destroy NULL pointer dereference It would probably be better to just accept NULL pointers in mempool_destroy(). But for the current -rc series let's keep things simple. This patch was lost in the cracks for a while. Kevin Cernekee had to rediscover the problem and send a similar patch because of it. :( Signed-off-by: Joern Engel commit 250541fca717a5c9b0d3710e737b2ca32ebb6fbc Merge: 96e35b4 6c9ff10 Author: Linus Torvalds Date: Wed Apr 14 18:46:03 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: Reduce max avtab size to avoid page allocation failures commit 96e35b40c0d6206f56370f937f6f4722739eb273 Merge: f5c07a2 a6a5349 Author: Linus Torvalds Date: Wed Apr 14 18:45:31 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: use separate class for ceph sockets' sk_lock ceph: reserve one more caps space when doing readdir ceph: queue_cap_snap should always queue dirty context ceph: fix dentry reference leak in dcache readdir ceph: decode v5 of osdmap (pool names) [protocol change] ceph: fix ack counter reset on connection reset ceph: fix leaked inode ref due to snap metadata writeback race ceph: fix snap context reference leaks ceph: allow writeback of snapped pages older than 'oldest' snapc ceph: fix dentry rehashing on virtual .snap dir commit f5c07a2d8acfc98e00d3be6298f979e5b3175953 Merge: 7223b91 d618540 Author: Linus Torvalds Date: Wed Apr 14 18:45:14 2010 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (applesmc) Switch maintainers hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support hwmon: (it87) Invalidate cache on temperature sensor change hwmon: (it87) Properly handle wrong sensor type requests hwmon: (it87) Don't arbitrarily enable temperature channels hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n hwmon: (sht15) Fix sht15_calc_temp interpolation function commit 7223b915421716b4e57ffb7e13f41f1b926db55c Merge: d471a4b 091ebf0 Author: Linus Torvalds Date: Wed Apr 14 18:44:29 2010 -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: lguest: stop using KVM hypercall mechanism lguest: workaround cmpxchg8b_emu by ignoring cli in the guest. commit d471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc Merge: 4e310fd b560177 Author: Linus Torvalds Date: Wed Apr 14 18:44:00 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative() m68k: Fix `struct sigcontext' for ColdFire commit 565a79f74af96ae90dfec411da14dc38d2cd56bc Author: Sascha Hauer Date: Wed Apr 14 09:17:31 2010 +0200 ASoC: imx-ssi: increase minimum periods to 4 Currently the notification of elapsed periods is not very exact. Increase minimum periods to 4 as suggested by Liam Girdwood. Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6c9ff1013b7a21099da838eeef7c3f23ee347957 Author: Stephen Smalley Date: Mon Mar 15 10:42:11 2010 -0400 SELinux: Reduce max avtab size to avoid page allocation failures Reduce MAX_AVTAB_HASH_BITS so that the avtab allocation is an order 2 allocation rather than an order 4 allocation on x86_64. This addresses reports of page allocation failures: http://marc.info/?l=selinux&m=126757230625867&w=2 https://bugzilla.redhat.com/show_bug.cgi?id=570433 Reported-by: Russell Coker Signed-off-by: Stephen D. Smalley Acked-by: Eric Paris Signed-off-by: James Morris commit 4eaa0e3c869acd5dbc7c2e3818a9ae9cbf221d27 Author: Eric Dumazet Date: Wed Apr 14 16:13:29 2010 -0700 fib: suppress lockdep-RCU false positive in FIB trie. Followup of commit 634a4b20 Allow tnode_get_child_rcu() to be called either under rcu_read_lock() protection or with RTNL held. Signed-off-by: Eric Dumazet Signed-off-by: Paul E. McKenney Signed-off-by: David S. Miller commit b560177f3e1c6b2d75b220d41ae72636243475c4 Author: Geert Uytterhoeven Date: Sun Mar 21 10:52:21 2010 +0100 m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative() Recently, we started seeing this on allmodconfig builds: CC mm/memcontrol.o {standard input}: Assembler messages: {standard input}:4076: Error: operands mismatch -- statement `subl 12(%fp),170(%a0)' ignored Correct the asm constraint, like done for m68knommu. Signed-off-by: Geert Uytterhoeven commit 1aac4effad4ea52da94eb13b12e0ca1731407ee4 Author: Maxim Kuvyrkov Date: Wed Mar 3 16:53:45 2010 +0300 m68k: Fix `struct sigcontext' for ColdFire LibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext' and this patch avoids LibSegFault overflowing this field. Also this removes an unnecessary divergence from classic m68k. Signed-off-by: Maxim Kuvyrkov Signed-off-by: Geert Uytterhoeven commit 4e310fda91cb095915395f811d10b2c900c9589e Author: Joe Perches Date: Wed Apr 14 09:27:40 2010 -0700 vsprintf: Change struct printf_spec.precision from s8 to s16 Commit ef0658f3de484bf9b173639cd47544584e01efa5 changed precision from int to s8. There is existing kernel code that uses a larger precision. An example from the audit code: vsnprintf(...,..., " msg='%.1024s'", (char *)data); which overflows precision and truncates to nothing. Extending precision size fixes the audit system issue. Other changes: Change the size of the struct printf_spec.type from u16 to u8 so sizeof(struct printf_spec) stays as small as possible. Reorder the struct members so sizeof(struct printf_spec) remains 64 bits without alignment holes. Document the struct members a bit more. Original-patch-by: Eric Paris Signed-off-by: Joe Perches Tested-by: Justin P. Mattock Signed-off-by: Linus Torvalds commit d618540fb3e5b74e16aec8201d2d0de6f02633cb Author: Henrik Rydberg Date: Wed Apr 14 16:14:11 2010 +0200 hwmon: (applesmc) Switch maintainers Nicolas has expressed a wish to be relieved from the maintenance of applesmc, so we simply switch maintainer with this patch. Signed-off-by: Henrik Rydberg Acked-by: Nicolas Boichat Signed-off-by: Jean Delvare commit e1741712e85cec8004c7eeeea81186618f78eff1 Author: Justin P. Mattock Date: Wed Apr 14 16:14:10 2010 +0200 hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support Add the iMac9,1 and the MacBookPro2,2 temperature sensors to hwmon driver applesmc to fix kernel bug #14429: https://bugzilla.kernel.org/show_bug.cgi?id=14429 Signed-off-by: Justin P. Mattock Acked-by: Nicolas Boichat Signed-off-by: Jean Delvare commit 2b3d1d87eaabf422a42440351ff3be1792d35852 Author: Jean Delvare Date: Wed Apr 14 16:14:10 2010 +0200 hwmon: (it87) Invalidate cache on temperature sensor change When any temperature sensor type is changed, the corresponding temperature value needs to be updated. The register caching mechanism may delay this update, so we want to invalidate the cache to force an immediate update. Signed-off-by: Jean Delvare commit 8acf07c5a7674e53f2d320d540aec5d714b105cf Author: Jean Delvare Date: Wed Apr 14 16:14:09 2010 +0200 hwmon: (it87) Properly handle wrong sensor type requests Currently, if someone tries to set the thermal sensor type to an unsupported value, subsequent accesses to the chip may temporarily show the sensor in question as disabled. Use a temporary variable and only update the cached value on success, to prevent such confusion. Signed-off-by: Jean Delvare commit a00afb97e23fd904b12a3f4de3237d8ab2f68738 Author: Jean Delvare Date: Wed Apr 14 16:14:09 2010 +0200 hwmon: (it87) Don't arbitrarily enable temperature channels Temperature channels can be used in 2 different modes (thermistor and thermal diode) and we don't know which one, if any, is correct for every given board. So don't arbitrarily choose one. Instead, leave the temperature channels untouched. They can be configured from user-space if needed anyway. Signed-off-by: Jean Delvare commit c7a78d2c2e2537fd24903e966f34aae50319d587 Author: Jean Delvare Date: Wed Apr 14 16:14:08 2010 +0200 hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n When CONFIG_REGULATOR isn't set, regulator_get_voltage() returns 0. Properly handle this case by not trusting the value. Reported-by: Jerome Oufella Signed-off-by: Jean Delvare Cc: Jonathan Cameron Acked-by: Mark Brown Cc: stable@kernel.org commit 328a2c22abd08911e37fa66f1358f829cecd72e9 Author: Jerome Oufella Date: Wed Apr 14 16:14:07 2010 +0200 hwmon: (sht15) Fix sht15_calc_temp interpolation function I discovered two issues. First the previous sht15_calc_temp() loop did not iterate through the temppoints array since the (data->supply_uV > temppoints[i - 1].vdd) test is always true in this direction. Also the two-points linear interpolation function was returning biased values due to a stray division by 1000 which shouldn't be there. [JD: Also change the default value for d1 from 0 to something saner.] Signed-off-by: Jerome Oufella Acked-by: Jonathan Cameron Signed-off-by: Jean Delvare Cc: stable@kernel.org commit 3d83e577a8206f0f3822a3840e12f76477142ba2 Author: Takashi Iwai Date: Wed Apr 14 14:36:23 2010 +0200 ALSA: hda - Avoid invalid "Independent HP" control for VIA codecs Some VIA codecs have no multiple source selection for headphone pins, thus it's useless (and wrong) to create "Independent HP" control on them. This patch adds the check of connections to skip the control in such a case. Signed-off-by: Takashi Iwai commit b331439dfd41dc813b3557ca5927a3a644f35792 Author: Takashi Iwai Date: Wed Apr 14 14:33:57 2010 +0200 ALSA: hda - Fix control element allocations in VIA codec parser The commit 5b0cb1d850c26893b1468b3a519433a1b7a176be ALSA: hda - add more NID->Control mapping breaks the control element allocation by returning a wrong value. Let's fix it. Signed-off-by: Takashi Iwai commit 091ebf07a2408f9a56634caa0f86d9360e9af23b Author: Rusty Russell Date: Wed Apr 14 21:43:54 2010 -0600 lguest: stop using KVM hypercall mechanism This is a partial revert of 4cd8b5e2a159 "lguest: use KVM hypercalls"; we revert to using (just as questionable but more reliable) int $15 for hypercalls. I didn't revert the register mapping, so we still use the same calling convention as kvm. KVM in more recent incarnations stopped injecting a fault when a guest tried to use the VMCALL instruction from ring 1, so lguest under kvm fails to make hypercalls. It was nice to share code with our KVM cousins, but this was overreach. Signed-off-by: Rusty Russell Cc: Matias Zabaljauregui Cc: Avi Kivity commit 5094aeafbbd500509f648e3cd102b053bc7926b3 Author: Rusty Russell Date: Wed Apr 14 21:43:53 2010 -0600 lguest: workaround cmpxchg8b_emu by ignoring cli in the guest. It's only used by cmpxchg8b_emu (see db677ffa5f5a for the gory details), and fixing that to be paravirt aware would be more work than simply ignoring it (and AFAICT only help lguest). This makes lguest work on machines which have cmpxchg8b, for kernels compiled for older processors. (We can't emulate it properly: the popf which expects to restore interrupts does not trap). Signed-off-by: Rusty Russell Cc: Jeremy Fitzhardinge Cc: virtualization@lists.osdl.org commit 0110d6f22f392f976e84ab49da1b42f85b64a3c5 Author: Michael S. Tsirkin Date: Tue Apr 13 04:59:44 2010 +0000 tun: orphan an skb on tx The following situation was observed in the field: tap1 sends packets, tap2 does not consume them, as a result tap1 can not be closed. This happens because tun/tap devices can hang on to skbs undefinitely. As noted by Herbert, possible solutions include a timeout followed by a copy/change of ownership of the skb, or always copying/changing ownership if we're going into a hostile device. This patch implements the second approach. Note: one issue still remaining is that since skbs keep reference to tun socket and tun socket has a reference to tun device, we won't flush backlog, instead simply waiting for all skbs to get transmitted. At least this is not user-triggerable, and this was not reported in practice, my assumption is other devices besides tap complete an skb within finite time after it has been queued. A possible solution for the second issue would not to have socket reference the device, instead, implement dev->destructor for tun, and wait for all skbs to complete there, but this needs some thought, probably too risky for 2.6.34. Signed-off-by: Michael S. Tsirkin Tested-by: Yan Vugenfirer Acked-by: Herbert Xu Signed-off-by: David S. Miller commit b1cdbb5f8342d99b732c5535ee7d2de8e7b2cc2e Author: Ernst Schwab Date: Thu Mar 4 10:15:39 2010 +0100 ARM: 5974/1: arm/mach-at91 Makefile: remove two blanks. Cosmetic change to mach-at91 Makefile: remove two blanks introduced by earlier patches. Signed-off-by: Ernst Schwab Signed-off-by: Russell King commit 50aec0024eccb1d5f540ab64a1958eebcdb9340c Author: Paul E. McKenney Date: Fri Apr 9 15:39:12 2010 -0700 rcu: Update docs for rcu_access_pointer and rcu_dereference_protected Update examples and lists of APIs to include these new primitives. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <1270852752-25278-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit c08c68dd76bd6b776bc0eb45a5e8f354ed772cdf Author: David Howells Date: Fri Apr 9 15:39:11 2010 -0700 rcu: Better explain the condition parameter of rcu_dereference_check() Better explain the condition parameter of rcu_dereference_check() that describes the conditions under which the dereference is permitted to take place (and incorporate Yong Zhang's suggestion). This condition is only checked under lockdep proving. Signed-off-by: David Howells Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: eric.dumazet@gmail.com LKML-Reference: <1270852752-25278-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit b62730baea32f86fe91a7930e4b7ee8d82778b79 Author: Paul E. McKenney Date: Fri Apr 9 15:39:10 2010 -0700 rcu: Add rcu_access_pointer and rcu_dereference_protected This patch adds variants of rcu_dereference() that handle situations where the RCU-protected data structure cannot change, perhaps due to our holding the update-side lock, or where the RCU-protected pointer is only to be fetched, not dereferenced. These are needed due to some performance concerns with using rcu_dereference() where it is not required, aside from the need for lockdep/sparse checking. The new rcu_access_pointer() primitive is for the case where the pointer is be fetch and not dereferenced. This primitive may be used without protection, RCU or otherwise, due to the fact that it uses ACCESS_ONCE(). The new rcu_dereference_protected() primitive is for the case where updates are prevented, for example, due to holding the update-side lock. This primitive does neither ACCESS_ONCE() nor smp_read_barrier_depends(), so can only be used when updates are somehow prevented. Suggested-by: David Howells Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <1270852752-25278-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3f2d4f561fab4588344cc519fd323382ab950928 Author: Mika Westerberg Date: Tue Apr 13 07:01:46 2010 +0100 ARM: 6052/1: kdump: make kexec work in interrupt context When crash happens in interrupt context there is no userspace context. We always use current->active_mm in those cases. Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 82c6f5a5b3e91ef4d2fb8725de4b8cf7affd4d61 Author: Imre Deak Date: Sun Apr 11 15:58:27 2010 +0100 ARM: 6051/1: VFP: preserve the HW context when calling signal handlers From: Imre Deak Signal handlers can use floating point, so prevent them to corrupt the main thread's VFP context. So far there were two signal stack frame formats defined based on the VFP implementation, but the user struct used for ptrace covers all posibilities, so use it for the signal stack too. Introduce also a new user struct for VFP exception registers. In this too fields not relevant to the current VFP architecture are ignored. Support to save / restore the exception registers was added by Will Deacon. Signed-off-by: Imre Deak Signed-off-by: Will Deacon Signed-off-by: Russell King commit 5c5cac63851f347d8308d69f1892c4af51d7c1a4 Author: Imre Deak Date: Sun Apr 11 15:57:07 2010 +0100 ARM: 6050/1: VFP: fix the SMP versions of vfp_{sync,flush}_hwstate From: Imre Deak Recently the UP versions of these functions were refactored and as a side effect it became possible to call them for the current thread. This isn't true for the SMP versions however, so fix this up. Signed-off-by: Imre Deak Signed-off-by: Russell King commit 7e5a69e83ba7a0d5917ad830f417cba8b8d6aa72 Author: Nicolas Pitre Date: Mon Mar 29 21:46:02 2010 +0100 ARM: 6007/1: fix highmem with VIPT cache and DMA The VIVT cache of a highmem page is always flushed before the page is unmapped. This cache flush is explicit through flush_cache_kmaps() in flush_all_zero_pkmaps(), or through __cpuc_flush_dcache_area() in kunmap_atomic(). There is also an implicit flush of those highmem pages that were part of a process that just terminated making those pages free as the whole VIVT cache has to be flushed on every task switch. Hence unmapped highmem pages need no cache maintenance in that case. However unmapped pages may still be cached with a VIPT cache because the cache is tagged with physical addresses. There is no need for a whole cache flush during task switching for that reason, and despite the explicit cache flushes in flush_all_zero_pkmaps() and kunmap_atomic(), some highmem pages that were mapped in user space end up still cached even when they become unmapped. So, we do have to perform cache maintenance on those unmapped highmem pages in the context of DMA when using a VIPT cache. Unfortunately, it is not possible to perform that cache maintenance using physical addresses as all the L1 cache maintenance coprocessor functions accept virtual addresses only. Therefore we have no choice but to set up a temporary virtual mapping for that purpose. And of course the explicit cache flushing when unmapping a highmem page on a system with a VIPT cache now can go, which should increase performance. While at it, because the code in __flush_dcache_page() has to be modified anyway, let's also make sure the mapped highmem pages are pinned with kmap_high_get() for the duration of the cache maintenance operation. Because kunmap() does unmap highmem pages lazily, it was reported by Gary King that those pages ended up being unmapped during cache maintenance on SMP causing segmentation faults. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 317aa408d69a5b833a116317c18c7e957989ce44 Author: Anders Larsen Date: Thu Mar 4 11:22:53 2010 +0100 ARM: 5975/1: AT91 slow-clock suspend: don't wait when turning PLLs off From: Julien Langer AT91: when turning off the PLLs during suspend, don't wait for the lock flag to be set. Previously the code would always run into the loop limitation of 1000 iterations because the flag is never set when turning the PLLs off. Comments from Anders Larsen: (in http://marc.info/?l=linux-kernel&m=127058929724193&w=2) Signed-off-by: Julien Langer Signed-off-by: Anders Larsen Acked-by: Andrew Victor Signed-off-by: Russell King commit ec687886de00e1e63f3d821ccade9a61590408ed Author: David S. Miller Date: Wed Apr 14 02:04:29 2010 -0700 sparc64: Run NMIs on the hardirq stack. Otherwise we can overflow the main stack with the function tracer enabled. Signed-off-by: David S. Miller commit 17807f913bdbb2c5b4d0f6b168b4f68d5cece7e3 Author: Dinh Nguyen Date: Tue Apr 13 14:05:08 2010 -0500 mx5: Fix build error for mx51_defconfig Need to include for do_div calls. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit afb567e3fdd2ee43b243cb4f6fe772ab921b2ada Author: Dmitry Torokhov Date: Tue Apr 13 23:08:58 2010 -0700 Revert "Input: wacom - merge out and in prox events" This reverts commit 776943fd6f104a6e8457dc95a17282e69e963666 as it causes issues with ISDv4 E3 touchscreens: https://bugzilla.kernel.org/show_bug.cgi?id=15670 Signed-off-by: Dmitry Torokhov commit 035df35d968323f6f463c8789553e8589efcbcd4 Author: David S. Miller Date: Tue Apr 13 18:59:02 2010 -0700 sparc64: Allocate sufficient stack space in ftrace stubs. 128 bytes is sufficient for the register window save area, but the calling conventions allow the callee to save up to 6 incoming argument registers into the stack frame after the register window save area. This means a minimal stack frame is 176 bytes (128 + (6 * 8)). This fixes random crashes when using the function tracer. Reported-by: Frederic Weisbecker Signed-off-by: David S. Miller commit 5c659322a904a7cc0265e7b183372b9bdebec6db Author: Ayaz Abdulla Date: Tue Apr 13 18:49:51 2010 -0700 forcedeth: fix tx limit2 flag check This is a fix for bug 572201 @ bugs.debian.org This patch fixes the TX_LIMIT feature flag. The previous logic check for TX_LIMIT2 also took into account a device that only had TX_LIMIT set. Reported-by: Stephen Mulcahu Reported-by: Ben Huchings Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 2ba3abd8186f24c7fb418927025b4e2120e3a362 Merge: 0fdfe5a d88d405 Author: Linus Torvalds Date: Tue Apr 13 17:49:48 2010 -0700 Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling commit 0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 Merge: 44d2d37 0df5dd4 Author: Linus Torvalds Date: Tue Apr 13 15:10:16 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFSv4: fix delegated locking NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible NFS: Fix a race with the new commit code NFS: Ensure that writeback_single_inode() calls write_inode() when syncing NFS: Fix the mode calculation in nfs_find_open_context NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR commit 2e2dc1d755cc5609d0c46d47f7d171318b3bffcd Author: Frederic Weisbecker Date: Tue Apr 13 14:28:24 2010 -0700 sparc: Fix forgotten kmemleak headers inclusion Fix forgotten kmemleak headers inclusion for kmemleak_not_leak() declaration. This fixes the following build error: arch/sparc/kernel/irq_64.c: In function ‘sun4v_build_virq’: arch/sparc/kernel/irq_64.c:657: error: implicit declaration of function ‘kmemleak_not_leak’ Signed-off-by: Frederic Weisbecker Signed-off-by: David S. Miller commit a6a5349d17f2a5c37079826f1a1474c3d08c6b53 Author: Sage Weil Date: Tue Apr 13 14:07:07 2010 -0700 ceph: use separate class for ceph sockets' sk_lock Use a separate class for ceph sockets to prevent lockdep confusion. Because ceph sockets only get passed kernel pointers, there is no dependency from sk_lock -> mmap_sem. If we share the same class as other sockets, lockdep detects a circular dependency from mmap_sem (page fault) -> fs mutex -> sk_lock -> mmap_sem because dependencies are noted from both ceph and user contexts. Using a separate class prevents the sk_lock(ceph) -> mmap_sem dependency and makes lockdep happy. Signed-off-by: Sage Weil commit e1e4dd0caa63e166afa46a1ccc947bebb4f66bcf Author: Yehuda Sadeh Date: Tue Apr 13 11:45:56 2010 -0700 ceph: reserve one more caps space when doing readdir We were missing space for the directory cap. The result was a BUG at fs/ceph/caps.c:2178. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit fc837c8f0446b73a1661339db406c0238dd1d184 Author: Sage Weil Date: Tue Apr 13 11:41:22 2010 -0700 ceph: queue_cap_snap should always queue dirty context This simplifies the calling convention, and fixes a bug where we queue a capsnap with a context other than i_head_snapc (the one that matches the dirty pages). The result was a BUG at fs/ceph/caps.c:2178 on writeback completion when a capsnap matching the writeback snapc could not be found. Signed-off-by: Sage Weil commit 44d2d371d250b44cbe40f8d47e329c97668d7594 Merge: 465de2b c011f80 Author: Linus Torvalds Date: Tue Apr 13 11:34:05 2010 -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: sparc64: Add some more commentary to __raw_local_irq_save() sparc64: Fix memory leak in pci_register_iommu_region(). sparc64: Add kmemleak annotation to sun4v_build_virq() sparc64: Support kmemleak. sparc64: Add function graph tracer support. sparc64: Give a stack frame to the ftrace call sites. sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86. sparc64: Remove profiling from some low-level bits. sparc64: Kill unnecessary static on local var in ftrace_call_replace(). sparc64: Kill CONFIG_STACK_DEBUG code. sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up. sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs. sparc64: Use kstack_valid() in die_if_kernel(). commit 465de2ba71f5048341e0109f3f6c4d7dc65d9754 Merge: 0d0fb0f a6d3702 Author: Linus Torvalds Date: Tue Apr 13 11:32:48 2010 -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: (25 commits) smc91c92_cs: define multicast_table as unsigned char can: avoids a false warning e1000e: stop cleaning when we reach tx_ring->next_to_use igb: restrict WoL for 82576 ET2 Quad Port Server Adapter virtio_net: missing sg_init_table Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb" iwlwifi: need check for valid qos packet before free tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb udp: fix for unicast RX path optimization myri10ge: fix rx_pause in myri10ge_set_pauseparam net: corrected documentation for hardware time stamping stmmac: use resource_size() x.25 attempts to negotiate invalid throughput x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet. bridge: Fix IGMP3 report parsing cnic: Fix crash during bnx2x MTU change. qlcnic: fix set mac addr r6040: fix r6040_multicast_list vhost-net: fix vq_memory_access_ok error checking ath9k: fix double calls to ath_radio_enable ... commit ead88af5f577fd2b399a0fcdfe52605116fac489 Author: Joern Engel Date: Tue Apr 13 17:57:21 2010 +0200 [LogFS] Move assertion The assertion is valid independently of the condition. Signed-off-by: Joern Engel commit d3a03f8031000f8297823b80e36db536fd020884 Author: Joern Engel Date: Tue Apr 13 17:54:27 2010 +0200 [LogFS] Plug 8 byte information leak Within each journal segment, 8 bytes at offset 24 would remain uninitialized. Signed-off-by: Joern Engel commit 032d8f7268444a0f5d4ee02d9513d682d5b8edfc Author: Joern Engel Date: Tue Apr 13 17:46:37 2010 +0200 [LogFS] Prevent memory corruption on large deletes Removing sufficiently large files would create aliases for a large number of segments. This in turn results in a large number of journal entries and an overflow of s_je_array. Cheap fix is to add a BUG_ON, turning memory corruption into something annoying, but less dangerous. Real fix is to count the number of affected segments and prevent the problem completely. Signed-off-by: Joern Engel commit 2170c5a8ae4b952e517e7b0565528914ddc11320 Author: Rafi Rubin Date: Fri Apr 9 17:58:25 2010 -0400 HID: ntrig: Emit TOUCH with DOUBLETAP for single touch I squelched TipSwitch in a recent patch which resulted in the loss of Touch events for single touch firmwares. This patch just puts Touch back in for single touch, and bundles it with DoubleTap (like the multitouch code). The two events are used to convey the same message to different drivers. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 2b2f862ee6ef8ae8f913fee6af2112c5ffeedf94 Merge: 0d0fb0f 4b83873 Author: Ingo Molnar Date: Tue Apr 13 13:24:54 2010 +0200 Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent commit a6d37024de02e7cb2b2333e438e71355a9c32a0a Author: Ken Kawasaki Date: Sat Apr 10 12:50:14 2010 +0000 smc91c92_cs: define multicast_table as unsigned char smc91c92_cs: * define multicast_table as unsigned char * remove unnecessary "#ifndef final_version" Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit 4ffa87012efd7b664762b579213d4663560ef4a3 Author: Eric Dumazet Date: Fri Apr 9 23:47:31 2010 +0000 can: avoids a false warning At this point optlen == sizeof(sfilter) but some compilers are dumb. Reported-by: Németh Márton Acked-by: Oliver Hartkopp Signed-off-by: David S. Miller commit dac876193cd79ced36d0462749ea47c05844fb49 Author: Terry Loftin Date: Fri Apr 9 10:29:49 2010 +0000 e1000e: stop cleaning when we reach tx_ring->next_to_use Tx ring buffers after tx_ring->next_to_use are volatile and could change, possibly causing a crash. Stop cleaning when we hit tx_ring->next_to_use. Signed-off-by: Terry Loftin Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d5aa22520dbb49e726420ca56b3dcfe56724d33e Author: Stefan Assmann Date: Fri Apr 9 09:51:34 2010 +0000 igb: restrict WoL for 82576 ET2 Quad Port Server Adapter Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is only supported there. Signed-off-by: Stefan Assmann Acked-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c011f80ba0912486fe51dd2b3f71d9b33a151188 Author: David S. Miller Date: Tue Apr 13 01:50:43 2010 -0700 sparc64: Add some more commentary to __raw_local_irq_save() Suggested by Peter Zijlstra Signed-off-by: David S. Miller commit b68b58fd6a341c2115ff5fb466fe9fc0b581980e Author: Philby John Date: Fri Mar 26 21:37:51 2010 +0530 ALSA: aaci - Fix alignment faults on ARM Cortex introduced by commit 29a4f2d3 The commit 29a4f2d3 used writel() at offset 0x26 which is half-word aligned causing unaligned exceptions on a Cortex-A8. The original patch solved the "aaci-pl041 fpga:04: ac97 read back fail" issue on a soft reset. Reading from any arbitrary aaci register seems to solve this issue. Signed-off-by: Philby John Acked-by: Russell King Signed-off-by: Takashi Iwai commit 9343af084c7e8911897b0883042ee690cee3aaef Merge: e182c77 0d0fb0f Author: David S. Miller Date: Tue Apr 13 00:28:45 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: lib/Kconfig.debug commit e182c77cc291456eed127b1472952ddb59a81a9d Author: David S. Miller Date: Sat Apr 10 20:26:55 2010 -0700 sparc64: Fix memory leak in pci_register_iommu_region(). Found by kmemleak. If request_resource() fails, we leak the struct resource we allocated to represent the IOMMU mapping area. This actually happens on sun4v machines because the IOMEM area is only reported sans the IOMMU region, unlike all previous systems. I'll need to fix that at some point, but for now fix the leak. Signed-off-by: David S. Miller commit 25ad403f67d7673f38a473ec138d240804785ae3 Author: David S. Miller Date: Sat Apr 10 20:24:22 2010 -0700 sparc64: Add kmemleak annotation to sun4v_build_virq() The only reference we store to this memory is in the form of a physical address, so kmemleak can't see it. Add a kmemleak_not_leak() annotation. It's probably useful to be able to look at a dump of these things either via debugfs or similar, and thus we could at some point store them in some kind of table and therefore get rid of this annotation. Signed-off-by: David S. Miller commit 8b8d8e2840a440d62e8dc0ef36ba433b26f70d32 Author: David S. Miller Date: Fri Apr 9 00:14:35 2010 -0700 sparc64: Support kmemleak. Only missing thing was an _sdata marker in vmlinux.lds.S Signed-off-by: David S. Miller commit 9960e9e8944f9b1ca6af5f7d26400ca45b429600 Author: David S. Miller Date: Wed Apr 7 04:41:33 2010 -0700 sparc64: Add function graph tracer support. Signed-off-by: David S. Miller commit a71d1d6bb1b26e566e5c06c37857f4cdc1664780 Author: David S. Miller Date: Tue Apr 6 19:59:46 2010 -0700 sparc64: Give a stack frame to the ftrace call sites. It's the only way we'll be able to implement the function graph tracer properly. A positive is that we no longer have to worry about the linker over-optimizing the tail call, since we don't use a tail call any more. Signed-off-by: David S. Miller commit daecbf58a509bc27c112647e825df763c3e3b0f4 Author: David S. Miller Date: Tue Apr 6 17:38:52 2010 -0700 sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86. This keeps us from having to use kstat_irqs_cpu() from the NMI handler, the former of which is a profiled function. Instead we use a currently empty slot in the cpu_data Signed-off-by: David S. Miller commit f8e8a8e8cba3359df2a16c17d59eedb08adf3b43 Author: David S. Miller Date: Tue Apr 6 17:34:15 2010 -0700 sparc64: Remove profiling from some low-level bits. These include the timer implementation, perf events support, and the performance counter register (pcr) programming layer. Signed-off-by: David S. Miller commit d96478d5a2dcfa3aba1ca4d71b07fef62b27d9c8 Author: David S. Miller Date: Tue Apr 6 17:32:08 2010 -0700 sparc64: Kill unnecessary static on local var in ftrace_call_replace(). Signed-off-by: David S. Miller commit ddacd0bc70fe724eba2b5967dd5b68e10d41486c Author: David S. Miller Date: Mon Apr 12 22:36:03 2010 -0700 sparc64: Kill CONFIG_STACK_DEBUG code. The generic stack tracer does this job just as well. Signed-off-by: David S. Miller commit 63b754957371c23b7515399a977a2e1d361a036c Author: David S. Miller Date: Mon Apr 12 22:35:24 2010 -0700 sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up. Check function_trace_stop at ftrace_caller Toss mcount_call and dummy call of ftrace_stub, unnecessary. Document problems we'll have if the final kernel image link ever turns on relaxation. Properly size 'ftrace_call' so it looks right when inspecting instructions under gdb et al. Signed-off-by: David S. Miller commit 0c25e9e6cbe7b233bb91d14d0e2c258bf8e6ec83 Author: David S. Miller Date: Mon Apr 12 22:21:52 2010 -0700 sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs. If we are in an NMI then doing a plain raw_local_irq_disable() will write PIL_NORMAL_MAX into %pil, which is lower than PIL_NMI, and thus we'll re-enable NMIs and recurse. Doing a simple: %pil = %pil | PIL_NORMAL_MAX does what we want, if we're already at PIL_NMI (15) we leave it at that setting, else we set it to PIL_NORMAL_MAX (14). This should get the function tracer working on sparc64. Signed-off-by: David S. Miller commit cb256aa60409efd803806cfb0528a4b3f8397dba Author: David S. Miller Date: Mon Apr 12 22:16:22 2010 -0700 sparc64: Use kstack_valid() in die_if_kernel(). This gets rid of a local function (is_kernel_stack()) which tries to do the same thing, yet poorly in that it doesn't handle IRQ stacks properly. Signed-off-by: David S. Miller commit 0e413f22e4c1cbfe12907e462a7d739a2e316f2b Author: Shirley Ma Date: Mon Mar 29 15:19:15 2010 +0000 virtio_net: missing sg_init_table Add missing sg_init_table for sg_set_buf in virtio_net which induced in defer skb patch. Reported-by: Thomas Müller Tested-by: Thomas Müller Signed-off-by: Shirley Ma Signed-off-by: David S. Miller commit 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 Author: Linus Torvalds Date: Mon Apr 12 18:41:35 2010 -0700 Linux 2.6.34-rc4 commit 64a8920fab962fb581bbe67856cb4740fc37d743 Merge: 50b88c4 ea90002 Author: Linus Torvalds Date: Mon Apr 12 18:39:58 2010 -0700 Merge branch 'anonvma' * anonvma: anonvma: when setting up page->mapping, we need to pick the _oldest_ anonvma anon_vma: clone the anon_vma chain in the right order vma_adjust: fix the copying of anon_vma chains Simplify and comment on anon_vma re-use for anon_vma_prepare() commit 50b88c46f01939d19d4cdd30ad563d29265b6c59 Merge: d6cf853 85b3cce Author: Linus Torvalds Date: Mon Apr 12 18:37:34 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits) ARM: Fix ioremap_cached()/ioremap_wc() for SMP platforms ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock ARM: 6031/1: fix Thumb-2 decompressor ARM: 6029/1: ep93xx: gpio.c: local functions should be static ARM: 6028/1: ARM: add MAINTAINERS for U300 ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c MXC: mach_armadillo5x0: Add USB Host support. ARM mach-mx3: duplicated include ARM mach-mx3: duplicated include imx31: add watchdog device on litekit board. imx3: Add watchdog platform device support MXC: mach-mx31_3ds: add support for freescale mc13783 power management device. MXC: mach-mx31_3ds: Add SPI1 device support. MXC: mach-mx31_3ds: Add support for on board NAND Flash. MXC: mach-mx31_3ds: Update variable names over recent mach name modification. imx31: fix parent clock for rtc i.MX51: remove NFC AXI static mapping i.MX51: determine silicon revision dynamically i.MX51: map TZIC dynamically i.MX51: Use correct clock for gpt ... commit d6cf853d4d73c268fc8920ac4e812ee26a12847c Merge: 6a945f3 9f680ce Author: Linus Torvalds Date: Mon Apr 12 18:37:04 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: make sure the chunk allocator doesn't create zero length chunks Btrfs: fix data enospc check overflow commit 6a945f38be5f2c198853069a336c887a51d1a238 Merge: 50fc88c 0826167 Author: Linus Torvalds Date: Mon Apr 12 18:36:49 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Fix possible dq_flags corruption quota: Hide warnings about writes to the filesystem before quota was turned on ext3: symlink must be handled via filesystem specific operation ext2: symlink must be handled via filesystem specific operation commit 50fc88cb03786a79e9982d9d8dfb3fd225de9099 Merge: 4505a49 c15d0fc Author: Linus Torvalds Date: Mon Apr 12 18:36:34 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: add speciffic ->setattr callback udf: potential integer overflow commit 4505a4938917f4872efcc90bc1e5f4f0ce903b47 Merge: fedfb94 f6be75d Author: Linus Torvalds Date: Mon Apr 12 18:36:11 2010 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (36 commits) MIPS: Calculate proper ebase value for 64-bit kernels MIPS: Alchemy: DB1200: Remove custom wait implementation MIPS: Big Sur: Make defconfig more useful. MIPS: Fix __vmalloc() etc. on MIPS for non-GPL modules MIPS: Sibyte: Fix M3 TLB exception handler workaround. MIPS: BCM63xx: Fix build failure in board_bcm963xx.c MIPS: uasm: Add OR instruction. MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions. MIPS: BCM63xx: Initialize gpio_out_low & out_high to current value at boot. MIPS: BCM63xx: Register SSB SPROM fallback in board's first stage callback MIPS: BCM63xx: Fix typo in cpu-feature-overrides file. MIPS: BCM63xx: Add support for second uart. MIPS: BCM63xx: Fix double gpio registration. MIPS: BCM63xx: Add DWVS0 board MIPS: BCM63xx: Add the RTA1025W-16 BCM6348-based board to suppported boards. MIPS: BCM63xx: Fix BCM6338 and BCM6345 gpio count MIPS: libgcc.h: Checkpatch cleanup MIPS: Loongson-2F: Flush the branch target history in BTB and RAS MIPS: Move signal trampolines off of the stack. MIPS: Preliminary VDSO ... commit fedfb947b2235c1085df97cf52f688b808c3a515 Merge: 44fa2b4 bade732 Author: Linus Torvalds Date: Mon Apr 12 18:34:56 2010 -0700 Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: svcrdma: RDMA support not yet compatible with RPC6 commit 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0 Merge: 0eddb51 be3bd22 Author: Linus Torvalds Date: Mon Apr 12 18:34:25 2010 -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 typo "numer" -> "number" in alloc.c nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v() nilfs2: fix a wrong type conversion in nilfs_ioctl() commit ea90002b0fa7bdee86ec22eba1d951f30bf043a6 Author: Linus Torvalds Date: Mon Apr 12 12:44:29 2010 -0700 anonvma: when setting up page->mapping, we need to pick the _oldest_ anonvma Otherwise we might be mapping in a page in a new mapping, but that page (through the swapcache) would later be mapped into an old mapping too. The page->mapping must be the case that works for everybody, not just the mapping that happened to page it in first. Here's the scenario: - page gets allocated/mapped by process A. Let's call the anon_vma we associate the page with 'A' to keep it easy to track. - Process A forks, creating process B. The anon_vma in B is 'B', and has a chain that looks like 'B' -> 'A'. Everything is fine. - Swapping happens. The page (with mapping pointing to 'A') gets swapped out (perhaps not to disk - it's enough to assume that it's just not mapped any more, and lives entirely in the swap-cache) - Process B pages it in, which goes like this: do_swap_page -> page = lookup_swap_cache(entry); ... set_pte_at(mm, address, page_table, pte); page_add_anon_rmap(page, vma, address); And think about what happens here! In particular, what happens is that this will now be the "first" mapping of that page, so page_add_anon_rmap() used to do if (first) __page_set_anon_rmap(page, vma, address); and notice what anon_vma it will use? It will use the anon_vma for process B! What happens then? Trivial: process 'A' also pages it in (nothing happens, it's not the first mapping), and then process 'B' execve's or exits or unmaps, making anon_vma B go away. End result: process A has a page that points to anon_vma B, but anon_vma B does not exist any more. This can go on forever. Forget about RCU grace periods, forget about locking, forget anything like that. The bug is simply that page->mapping points to an anon_vma that was correct at one point, but was _not_ the one that was shared by all users of that possible mapping. Changing it to always use the deepest anon_vma in the anonvma chain gets us to the safest model. This can be improved in certain cases: if we know the page is private to just this particular mapping (for example, it's a new page, or it is the only swapcache entry), we could pick the top (most specific) anon_vma. But that's a future optimization. Make it _work_ reliably first. Reviewed-by: Rik van Riel Acked-by: Johannes Weiner Tested-by: Borislav Petkov [ "What do you know, I think you fixed it!" ] Signed-off-by: Linus Torvalds commit 646d87b481dab4ba8301716600dfd276605b0ab0 Author: Linus Torvalds Date: Sun Apr 11 17:15:03 2010 -0700 anon_vma: clone the anon_vma chain in the right order We want to walk the chain in reverse order when cloning it, so that the order of the result chain will be the same as the order in the source chain. When we add entries to the chain, they go at the head of the chain, so we want to add the source head last. Reviewed-by: Rik van Riel Acked-by: Johannes Weiner Tested-by: Borislav Petkov [ "No, it still oopses" ] Signed-off-by: Linus Torvalds commit 287d97ac032136724143cde8d5964b414d562ee3 Author: Linus Torvalds Date: Sat Apr 10 15:22:30 2010 -0700 vma_adjust: fix the copying of anon_vma chains When we move the boundaries between two vma's due to things like mprotect, we need to make sure that the anon_vma of the pages that got moved from one vma to another gets properly copied around. And that was not always the case, in this rather hard-to-follow code sequence. Clarify the code, and fix it so that it copies the anon_vma from the right source. Reviewed-by: Rik van Riel Acked-by: Johannes Weiner Tested-by: Borislav Petkov [ "Yeah, not so much this one either" ] Signed-off-by: Linus Torvalds commit d0e9fe1758f222f13ec893f856552d81a10d266d Author: Linus Torvalds Date: Sat Apr 10 10:36:19 2010 -0700 Simplify and comment on anon_vma re-use for anon_vma_prepare() This changes the anon_vma reuse case to require that we only reuse simple anon_vma's - ie the case when the vma only has a single anon_vma associated with it. This means that a reuse of an anon_vma from an adjacent vma will always guarantee that both vma's are associated not only with the same anon_vma, they will also have the same anon_vma chain (of just a single entry in this case). And since anon_vma re-use was the only case where the same anon_vma might be associated with different chains of anon_vma's, we now have the case that every vma that shares the same anon_vma will always also have the same chain. That makes it much easier to think about merging vma's that share the same anon_vma's: you can always just drop the other anon_vma chain in anon_vma_merge() since you know that they are always identical. This also splits up the function to validate the anon_vma re-use, and adds a lot of commentary about the possible races. Reviewed-by: Rik van Riel Acked-by: Johannes Weiner Tested-by: Borislav Petkov [ "That didn't fix it" ] Signed-off-by: Linus Torvalds commit f5b066287c74b624583b993395a65d03a6487b3a Author: Sage Weil Date: Mon Apr 12 14:24:28 2010 -0700 ceph: fix dentry reference leak in dcache readdir When filldir returned an error (e.g. buffer full for a large directory), we would leak a dentry reference, causing an oops on umount. Signed-off-by: Sage Weil commit 08261673cb6dc638c39f44d69b76fffb57b92a8b Author: Andrew Perepechko Date: Mon Apr 12 22:16:50 2010 +0400 quota: Fix possible dq_flags corruption dq_flags are modified non-atomically in do_set_dqblk via __set_bit calls and atomically for example in mark_dquot_dirty or clear_dquot_dirty. Hence a change done by an atomic operation can be overwritten by a change done by a non-atomic one. Fix the problem by using atomic bitops even in do_set_dqblk. Signed-off-by: Andrew Perepechko Signed-off-by: Jan Kara commit 4c5e6c0e70fd6ca2fa67184fd36a261b3b7b38d0 Author: Jan Kara Date: Tue Apr 6 18:52:47 2010 +0200 quota: Hide warnings about writes to the filesystem before quota was turned on For a root filesystem write to the filesystem before quota is turned on happens regularly and there's no way around it because of writes to syslog, /etc/mtab, and similar. So the warning is rather pointless for ordinary users. It's still useful during development so we just hide the warning behind __DQUOT_PARANOIA config option. Signed-off-by: Jan Kara commit 774f03fb2cf89951b5f5f363b7739a2835d5924e Author: Dmitry Monakhov Date: Fri Mar 26 19:29:55 2010 +0300 ext3: symlink must be handled via filesystem specific operation generic setattr implementation is no longer responsible for quota transfer so synlinks must be handled via ext3_setattr. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit fc7683a3c30c22131b1651271d6bf9ea113b77c5 Author: Dmitry Monakhov Date: Fri Mar 26 19:29:54 2010 +0300 ext2: symlink must be handled via filesystem specific operation generic setattr implementation is no longer responsible for quota transfer so synlinks must be handled via ext2_setattr. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit fb48aef7c3e53231cddccc1e43721543bc033ae9 Author: Ingo Molnar Date: Wed Apr 7 16:22:45 2010 +0200 eeepc-wmi: Build fix -tip testing found: eeepc-wmi.c:(.text+0x36673c): undefined reference to `sparse_keymap_report_event' drivers/built-in.o: In function `eeepc_wmi_init': eeepc-wmi.c:(.init.text+0x19cd0): undefined reference to `sparse_keymap_setup' eeepc-wmi.c:(.init.text+0x19cf0): undefined reference to `sparse_keymap_free' eeepc-wmi.c:(.init.text+0x19d0b): undefined reference to `sparse_keymap_free' drivers/built-in.o: In function `eeepc_wmi_exit': eeepc-wmi.c:(.exit.text+0x2e87): undefined reference to `sparse_keymap_free' To fix this select INPUT_SPARSEKMAP, like the ASUS driver does. Signed-off-by: Ingo Molnar Signed-off-by: Matthew Garrett commit 668f4a03211ace7aa57dece90bd835b4f9b9dd30 Author: Dan Carpenter Date: Tue Apr 6 13:44:29 2010 +0300 asus: don't modify bluetooth/wlan on boot We were storing -1 as an unsigned int and as a result the effect of passing -1 was the same as using 1. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett Acked-by: Corentin Chary commit a0624a90a2bea97e0d65187b4b53ad400226c3f1 Author: Yong Wang Date: Mon Apr 5 21:09:40 2010 +0800 dell-wmi: Fix memory leak The output of wmi_get_event_data shall be freed before return. Signed-off-by: Matthew Garrett Signed-off-by: Yong Wang commit 3d7b165539d4174b0b8396bd52ee37ba21bd0dfb Author: Yong Wang Date: Sun Apr 11 09:27:54 2010 +0800 eeepc-wmi: add backlight support Add backlight support for WMI based Eee PC laptops. Signed-off-by: Yong Wang Signed-off-by: Matthew Garrett Reviewed-by: Corentin Chary commit 45f2c6937ed6066c9a177c4d37f6bd76daa607c0 Author: Yong Wang Date: Sun Apr 11 09:27:19 2010 +0800 eeepc-wmi: use a platform device as parent device of all sub-devices Add a platform device and use it as the parent device of all sub-devices. Signed-off-by: Yong Wang Signed-off-by: Matthew Garrett Reviewed-by: Corentin Chary commit 8124888940be5d9d73a6e04970d73eaec7c582b7 Author: Yong Wang Date: Sun Apr 11 09:26:33 2010 +0800 eeepc-wmi: add an eeepc_wmi context structure Add an eeepc_wmi context structure to manage all the sub-devices that will be implemented later on. Put input device into it first. Signed-off-by: Yong Wang Signed-off-by: Matthew Garrett Reviewed-by: Corentin Chary commit f6be75d03c8870be91e6e2a195648ece04b6bb16 Author: David Daney Date: Tue Apr 6 13:29:50 2010 -0700 MIPS: Calculate proper ebase value for 64-bit kernels The ebase is relative to CKSEG0 not CAC_BASE. On a 32-bit kernel they are the same thing, for a 64-bit kernel they are not. It happens to kind of work on a 64-bit kernel as they both reference the same physical memory. However since the CPU uses the CKSEG0 base, determining if a J instruction will reach always gives the wrong result unless we use the same number the CPU uses. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1093/ Signed-off-by: Ralf Baechle commit d8000beef2cd10c16dc5f66af715f692f5992652 Author: Manuel Lauss Date: Sat Apr 3 17:07:03 2010 +0200 MIPS: Alchemy: DB1200: Remove custom wait implementation While playing with the out-of-tree MAE driver module, the system would panic after a while in the db1200 custom wait code after wakeup due to a clobbered k0 register being used as target address of a store op. Remove the custom wait implementation and revert back to the Alchemy- recommended implementation already set as default. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1092/ Signed-off-by: Ralf Baechle commit 2844e49f5ea1ae75d2026ff128b145e3bd44134c Author: Ralf Baechle Date: Sat Apr 3 10:59:52 2010 +0100 MIPS: Big Sur: Make defconfig more useful. Signed-off-by: Ralf Baechle commit 7b3e543ddb39b69b75c9c24bb54180eca152f541 Author: Anton Altaparmakov Date: Thu Mar 25 20:48:12 2010 +0000 MIPS: Fix __vmalloc() etc. on MIPS for non-GPL modules Commit b3594a089f1c17ff919f8f78505c3f20e1f6f8ce (lmo) rsp. 351336929ccf222ae38ff0cb7a8dd5fd5c6236a0 (kernel.org) break non-GPL modules that use __vmalloc() or any of the vmap(), vm_map_ram(), etc functions on MIPS. All those functions are EXPORT_SYMBOL() so are meant to be allowed to be used by non-GPL kernel modules. These calls all take page protection as an argument which is normally a constant like PAGE_KERNEL. This commit causes all protection constants like PAGE_KERNEL to not be constants and instead to contain the GPL-only symbol _page_cachable_default. This means that all calls to __vmalloc(), vmap(), etc, cause non-GPL modules to fail to link with the complaint that they are trying to use the GPL-only symbol _page_cachable_default... Change EXPORT_SYMBOL_GPL(_page_cachable_default) to EXPORT_SYMBOL() for non-GPL modules that call __vmalloc(), vmap(), vm_map_ram() etc. Signed-off-by: Anton Altaparmakov Cc: Chris Dearman Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/1084/ Signed-off-by: Ralf Baechle commit 3d45285dd1ff4d4a1361b95e2d6508579a4402b5 Author: Ralf Baechle Date: Tue Mar 23 17:56:38 2010 +0100 MIPS: Sibyte: Fix M3 TLB exception handler workaround. The M3 workaround needs to cmpare the region and VPN2 fields only. Signed-off-by: Ralf Baechle commit 5e3644a95db11e2e582ae3765ffad6e0cce5376e Author: Florian Fainelli Date: Tue Mar 23 10:30:08 2010 +0100 MIPS: BCM63xx: Fix build failure in board_bcm963xx.c Since 2083e8327aeeaf818b0e4522a9d2539835c60423, the SPROM is now registered in the board_prom_init callback, but it references variables and functions which are declared below. Move the variables and functions above board_prom_init. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1077/ Signed-off-by: Ralf Baechle commit 5808184f1b2fe06ef8a54a2b7fb1596d58098acf Author: Ralf Baechle Date: Tue Mar 23 15:54:50 2010 +0100 MIPS: uasm: Add OR instruction. This is needed for the fix of the M3 workaround. Signed-off-by: Ralf Baechle commit 8d9df29db273ab9a330828f4f4f6669d293a730a Author: Ralf Baechle Date: Tue Mar 23 00:02:43 2010 +0100 MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions. Previously it was unconditionally used on all Sibyte family SOCs. The M3 bug has to be handled in the TLB exception handler which is extremly performance sensitive, so this modification is expected to deliver around 2-3% performance improvment. This is important as required changes to the M3 workaround will make it more costly. Signed-off-by: Ralf Baechle commit 9538ca636f2fa28ae1514327328e2869f0215981 Author: Maxime Bizon Date: Sat Jan 30 18:34:58 2010 +0100 MIPS: BCM63xx: Initialize gpio_out_low & out_high to current value at boot. To avoid a glitch during GPIO initialisation read GPIO output register values left by the firmware. Signed-off-by: Maxime Bizon To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/903/ Signed-off-by: Ralf Baechle commit e23a90eb736b18c16fd6d59e8c1fa6a16ac3bc0b Author: Florian Fainelli Date: Tue Mar 2 14:38:47 2010 +0100 MIPS: BCM63xx: Register SSB SPROM fallback in board's first stage callback Signed-off-by: Florian Fainelli To: Maxime Bizon Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1017/ Signed-off-by: Ralf Baechle commit 4fe67e44a0e0cb6281cbaaf603111187d87fce57 Author: Maxime Bizon Date: Sat Jan 30 18:34:56 2010 +0100 MIPS: BCM63xx: Fix typo in cpu-feature-overrides file. Fix typo: CONFIG_BCMCPU_IS_63xx does not exist; CONFIG_BCM63XX_CPU_63xx is the valid config option. Signed-off-by: Maxime Bizon To: linux-mips@linux-mips.org Cc: Maxime Bizon Patchwork: http://patchwork.linux-mips.org/patch/901/ Signed-off-by: Ralf Baechle commit 524ef29cff593ab6635cda2a17b331bede58a396 Author: Maxime Bizon Date: Sat Jan 30 18:34:55 2010 +0100 MIPS: BCM63xx: Add support for second uart. The BCm63xx SOC has two uarts. Some boards use the second one for bluetooth. This patch changes platform device registration code to handle this. Changes to the UART driver were already merged in 6a2c7eabfd09ca7986bf96b8958a87ca041a19d8. Signed-off-by: Maxime Bizon To: linux-mips@linux-mips.org Cc: Maxime Bizon Patchwork: http://patchwork.linux-mips.org/patch/900/ Signed-off-by: Ralf Baechle commit 97befcf4f0f42b1644b4b164ddc363685546edcd Author: Maxime Bizon Date: Sat Jan 30 18:34:54 2010 +0100 MIPS: BCM63xx: Fix double gpio registration. bcm63xx_gpio_init is already called from prom_init to allow board to use them early, so we can remove the unneeded arch_initcall. Signed-off-by: Maxime Bizon To: linux-mips@linux-mips.org Cc: Maxime Bizon Patchwork: http://patchwork.linux-mips.org/patch/899/ Signed-off-by: Ralf Baechle commit f29b7cac19ef5aa093fc9403d10735fa72cabf99 Author: Florian Fainelli Date: Mon Mar 1 23:36:27 2010 +0100 MIPS: BCM63xx: Add DWVS0 board The DWVS0 board is a BCM6358-based board with an on-board OHCI controler. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1015/ Signed-off-by: Ralf Baechle commit 2e6ad9a9585b5520cddda4743bfbfdf7f11c5a50 Author: Florian Fainelli Date: Mon Mar 1 23:36:22 2010 +0100 MIPS: BCM63xx: Add the RTA1025W-16 BCM6348-based board to suppported boards. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1014/ Signed-off-by: Ralf Baechle commit d1b28758c6b46f6d04ef6017b51f614aecdb4abe Author: Florian Fainelli Date: Mon Mar 1 23:36:32 2010 +0100 MIPS: BCM63xx: Fix BCM6338 and BCM6345 gpio count The number of GPIOs on BCM6338 is 8, while BCM6345 has only 16 GPIOs available. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1016/ Signed-off-by: Ralf Baechle commit b44c779ae0dedf3a6503c253954e570361b33f2b Author: Andrea Gelmini Date: Sat Feb 27 17:51:23 2010 +0100 MIPS: libgcc.h: Checkpatch cleanup arch/mips/lib/libgcc.h:21: ERROR: open brace '{' following union go on the same line Signed-off-by: Andrea Gelmini To: linux-kernel@vger.kernel.org Cc: Paul Mundt Cc: linux-mips@linux-mips.org Cc: linux-sh@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/1007/ Signed-off-by: Ralf Baechle commit f1df323924e2fde14cbcd51209a8cbfc33e0c232 Author: Wu Zhangjin Date: Sat Mar 13 12:34:15 2010 +0800 MIPS: Loongson-2F: Flush the branch target history in BTB and RAS As per chapter 15 "Errata: Issue of Out-of-order in loongson"[1] to work around the Loongson 2F erratum we need to do: "When switching from user mode to kernel mode, you should flush the branch target history such as BTB and RAS." [1] Chinese version: http://www.loongson.cn/uploadfile/file/200808211 [2] English version of chapter 15: http://groups.google.com.hk/group/loongson-dev/msg/e0d2e220958f10a6?dmode=source Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Shinya Kuribayashi Patchwork: http://patchwork.linux-mips.org/patch/1066/ Signed-off-by: Ralf Baechle commit d814c28ceca8f659c0012eaec8e21eee43710716 Author: David Daney Date: Thu Feb 18 16:13:05 2010 -0800 MIPS: Move signal trampolines off of the stack. This is a follow on to the vdso patch. Since all processes now have signal trampolines permanently mapped, we can use those instead of putting the trampoline on the stack and invalidating the corresponding icache across all CPUs. We also get rid of a bunch of ICACHE_REFILLS_WORKAROUND_WAR code. [Ralf: GDB 7.1 which has the necessary modifications to allow backtracing over signal frames will supposedly be released tomorrow. The old signal frame format obsoleted by this patch exists in two variations, for sane processors and for those requiring ICACHE_REFILLS_WORKAROUND_WAR. So there was never a GDB which did support backtracing over signal frames on all MIPS systems. This convinved me this series should be applied and pushed upstream as soon as possible.] Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/974/ Signed-off-by: Ralf Baechle commit c52d0d30aef84aa8893b34e5254716c8ab5c4472 Author: David Daney Date: Thu Feb 18 16:13:04 2010 -0800 MIPS: Preliminary VDSO This is a preliminary patch to add a vdso to all user processes. Still missing are ELF headers and .eh_frame information. But it is enough to allow us to move signal trampolines off of the stack. Note that emulation of branch delay slots in the FPU emulator still requires the stack. We allocate a single page (the vdso) and write all possible signal trampolines into it. The stack is moved down by one page and the vdso is mapped into this space. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/975/ Signed-off-by: Ralf Baechle commit 58b9e2239fa63c7c470acb4a77e9da17e6a6fa4f Author: David Daney Date: Thu Feb 18 16:13:03 2010 -0800 MIPS: Add SYSCALL to uasm. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/976/ Signed-off-by: Ralf Baechle commit 847253b9483f713b3797877034e0940fd45ce375 Author: Andreas Ferber Date: Tue Mar 16 12:35:51 2010 +0100 MIPS: Fix SSB PCIcore IO resource management The SSB PCIcore code reused the IO resource fixup code from the original 2.4.x Broadcom patch for BCM47xx based devices, which was a quick hack for doing PCI IO resource configuration back then (the boot loader doesn't configure PCI devices on this platform). However, this code is no longer necessary since the kernel now can do PCI resource management fine all by itself, so remove the old code. When removing the code, it becomes obvious that the mem_offset setting in the PCIcore driver was wrong, however this was masked by the fixup code before, except in a few cases involving yenta_socket. For BCM47xx, the correct offset is 0, and since this is the only device using PCIcore in host mode, the offset can simply be removed unconditionally. Signed-off-by: Andreas Ferber Signed-off-by: Michael Buesch Cc: Markus Wigge Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1070/ Signed-off-by: Ralf Baechle commit 86f7d75eb7c43a54a7b37a2287787004f4310de6 Author: Florian Fainelli Date: Wed Mar 10 09:51:09 2010 +0100 MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET On AR7, we already redefine PHYS_OFFSET to match the system specifities, it is however not sufficient when unsing dma_{map,unmap}_single, specifically in the ethernet driver, we must also adjust CAC_ADDR and UNCAC_ADDR for DMA to work correctly. This patch fixes the following issue, seen in cpmac_open: ops[#1]: Cpu 0 $ 0 : 00000000 10008400 a0f5b120 00000000 $ 4 : 94c59000 94270f64 00000020 00000010 $ 8 : 00000010 94103ce0 0000000a 94c03400 $12 : ffffffff 94c03408 94c03410 00000001 $16 : a0f5ba20 00000041 94c592c0 94c59200 $20 : 94c59000 000005ee 00002000 9438c8f0 $24 : 00000010 00000000 $28 : 94fac000 94fadd58 94390000 942724a8 Hi : 00000000 Lo : 00000001 epc : 94272518 cpmac_open+0x208/0x3f8 Not tainted ra : 942724a8 cpmac_open+0x198/0x3f8 Status: 10008403 KERNEL EXL IE Cause : 3080000c BadVA : 00000000 PrId : 00018448 (MIPS 4KEc) Modules linked in: Process ifconfig (pid: 278, threadinfo=94fac000, task=94e79590, tls=00000000) Stack : 7f8da120 2ab05cb0 94c59000 943356f0 00000000 943d0000 94c59000 943356f0 94c59030 943d0000 943c27c0 94fade10 00000000 94fade20 94c59000 9428e5a4 00000000 94c59000 00000041 94289768 94c59000 00000041 00001002 00001043 00000000 9428d810 00000000 94fade10 7f8da4e8 9428e6b8 00000000 7f8da4a8 7f8da4e8 00008914 00000000 942f7f2c 00000000 00000008 00408000 00008913 ... Call Trace: [<94272518>] cpmac_open+0x208/0x3f8 [<9428e5a4>] dev_open+0x164/0x264 [<9428d810>] dev_change_flags+0xd0/0x1bc [<942f7f2c>] devinet_ioctl+0x2d8/0x908 [<942771f8>] sock_ioctl+0x29c/0x2fc [<941a0fb4>] vfs_ioctl+0x2c/0x7c [<941a16ec>] do_vfs_ioctl+0x5dc/0x630 [<941a1790>] sys_ioctl+0x50/0x88 [<94101e10>] stack_done+0x20/0x3c Signed-off-by: peter fuerst Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1050/ Signed-off-by: Ralf Baechle commit 727c0075c80005e2012be113a91e5976abec4f9d Author: Alexander Clouter Date: Sat Mar 13 00:09:15 2010 +0000 MIPS: AR7: Fix phat finger of cpmac fixed_phy_add Seems I trimmed one too many lines in 29ca2d81bd2a62fa86bc9a72ddadcf03d7daf795 (lmo) rsp 7084338eb8eb0cc021ba86c340157bad397f3f0b (kernel.org) which led to no functioning Ethernet on my WAG54Gv2. This patch restores the AWOL line. Signed-off-by: Alexander Clouter To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1065/ Signed-off-by: Ralf Baechle commit 1e3fb3778be3c0a56626eba4a84f7d2fa991aa93 Author: Alexander Clouter Date: Fri Mar 12 19:39:48 2010 +0000 MIPS: AR7: Fix phat finger of reset bit in vlynq_high_data Seems in my whitespace cleanup 0f2536082d01448daeced8d9e82c3ba1751fefa3 (lmo) rsp. 8c2961da46abd85a71d20f2b169bf80618e (kernel.org) caused AR7 to no longer get as far as init. Fixed my phat fingering. Signed-off-by: Alexander Clouter To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1064/ Signed-off-by: Ralf Baechle commit 582b65e4d3f9664f87661359af99def304bc68bb Author: Wu Zhangjin Date: Wed Mar 10 00:53:21 2010 +0800 MIPS: Loongson: Add module info to the loongson2_clock driver This patch fixes a kernel warning when loading the the loongson2_clock driver: "Feb 25 23:42:27 localhost kernel: [ 4.965000] loongson2_clock: module license 'unspecified' taints kernel." Signed-off-by: Wu Zhangjin Reported-by: Liu Shiwei Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1045/ Signed-off-by: Ralf Baechle commit b846c10da5d6a5c159ab4dea92c1080d5add9fb1 Author: Wu Zhangjin Date: Thu Mar 11 11:30:50 2010 +0800 MIPS: Lemote 2F: Ensure atomic execution of _rdmsr and _wrmsr On Lemote 2F CS5536 MSRs are accessed through a index / data register pair. The access sequence must be protected by a spinlock to be atomic. Without this rebooting in fs2f_reboot() may fail. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1058/ Signed-off-by: Ralf Baechle commit 52553664033078102f5f430c861ccd0863b1b708 Author: Robert P. J. Day Date: Sat Feb 27 12:02:51 2010 -0500 MIPS: Initialize an atomic_t properly with ATOMIC_INIT(0). Signed-off-by: Robert P. J. Day To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1008/ Signed-off-by: Ralf Baechle commit d5d3102b9adec0a34eb5899324b62a4a3d34183e Author: Ralf Baechle Date: Thu Mar 11 08:48:14 2010 +0100 MIPS: Fix elfcore.c build warning kernel/elfcore.c includes which includes the . In , struct pt_regs is declared inside the parameter list of the elf_dump_regs function which causes a kernel build warning. Fixed by adding a forward declaration of struct pt_regs. Signed-off-by: Ralf Baechle commit 7ea4a6891b68fe60bf4eee41a7ef38d524b0aebd Author: Yang Shi Date: Wed Mar 3 16:43:20 2010 +0800 MIPS: Octeon: Remove redundant declaration of octeon_reserve32_memory octeon_reserve32_memory is defined In Octeon's setup.c, so remove the redundant extern declaration of this variable. Signed-off-by: Yang Shi To: f.fainelli@gmail.com Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1022/ Acked-by: David Daney Signed-off-by: Ralf Baechle commit 7a7ac952d5217b2f568e5ef91ac39b572e166f24 Author: Wu Zhangjin Date: Wed Mar 10 00:27:28 2010 +0800 MIPS: Trace: Don't trace irqsoff for the idle process Like x86 did in arch/x86/kernel/{process_32.c,process_64.c}, also don't trace irqsoff for idle. If there's no useful work to be done, we don't care about the irqsoff duration. If we trace the idle process, the max duration of irqsoff will be the idle time and make the irqsoff tracer useless. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Ingo Molnar Patchwork: http://patchwork.linux-mips.org/patch/1044/ Signed-off-by: Ralf Baechle commit abe5b417fb4a52e9510fdb5a16e722e91bf89e92 Author: Ralf Baechle Date: Wed Mar 10 16:16:04 2010 +0100 MIPS: delay: Fix use of current_cpu_data in preemptable code. This may lead to warnings like: BUG: using smp_processor_id() in preemptible [00000000] code: reboot/1989 caller is __udelay+0x14/0x70 Call Trace: [] dump_stack+0x8/0x34 [] debug_smp_processor_id+0xf4/0x110 [] __udelay+0x14/0x70 [] md_notify_reboot+0x12c/0x148 [] notifier_call_chain+0x64/0xc8 [] __blocking_notifier_call_chain+0x64/0xc0 [] kernel_restart_prepare+0x1c/0x38 [] kernel_restart+0x14/0x50 [] SyS_reboot+0x10c/0x1f0 [] handle_sysn32+0x44/0x84 Signed-off-by: Ralf Baechle commit b1cea3bab575af386618baba0db3c5fae7ce521f Author: David Daney Date: Wed Mar 3 11:07:43 2010 -0800 MIPS: Octeon: Remove #if 0 code. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1029/ Signed-off-by: Ralf Baechle commit 1ef2887030dbeb42282a99f8a8e3d7ad07ef70ee Author: David Daney Date: Wed Mar 3 11:07:07 2010 -0800 MIPS: Octeon: Remove vestiges of CONFIG_CAVIUM_RESERVE32_USE_WIRED_TLB The config option CAVIUM_RESERVE32_USE_WIRED_TLB is not supported. Remove the dead code controlled by it. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1028/ Signed-off-by: Ralf Baechle commit 1874a0886076fbb26665f93a8999c05e389bae22 Author: Ralf Baechle Date: Tue Mar 9 20:16:15 2010 +0100 MIPS: Cavium: Remove unused watchdog code. Signed-off-by: Ralf Baechle commit c948aca4f49d94b08c425f65acdaca1d679d6fa7 Author: Ralf Baechle Date: Mon Mar 8 19:38:13 2010 +0100 MIPS: Fix build breakage if CONFIG_DEBUG_FS is enabled. Caused by 38b7827fcdd660f591d645bd3ae6644456a4773c - no, cpu_local_* was not unused. Signed-off-by: Ralf Baechle Cc: Christoph Lameter Acked-by: David Daney commit 0df5dd4aae211edeeeb84f7f84f6d093406d7c22 Author: Trond Myklebust Date: Sun Apr 11 16:48:44 2010 -0400 NFSv4: fix delegated locking Arnaud Giersch reports that NFSv4 locking is broken when we hold a delegation since commit 8e469ebd6dc32cbaf620e134d79f740bf0ebab79 (NFSv4: Don't allow posix locking against servers that don't support it). According to Arnaud, the lock succeeds the first time he opens the file (since we cannot do a delegated open) but then fails after we start using delegated opens. The following patch fixes it by ensuring that locking behaviour is governed by a per-filesystem capability flag that is initially set, but gets cleared if the server ever returns an OPEN without the NFS4_OPEN_RESULT_LOCKTYPE_POSIX flag being set. Reported-by: Arnaud Giersch Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit ff818c24c2af370153646d302d831b69b023816f Author: Takashi Iwai Date: Mon Apr 12 08:59:25 2010 +0200 ALSA: hda - Add fix-up for Sony VAIO with ALC269 Sony VAIO models with ALC269 need to initialize the pin 0x19 to VREF ground or Hi-Z to make the headphone working. Other than that, model=auto works fine, so let's use model=auto with a specific fix-up table. Signed-off-by: Takashi Iwai commit 7fa90e873f520dad5ec58f47340996cda083e875 Author: Takashi Iwai Date: Mon Apr 12 08:49:00 2010 +0200 ALSA: hda - Enhance fix-up table for Realtek codecs A few enhancement / fixes for fix-up table of some Realtek codecs: - Apply fix-ups only for the auto model - Apply additional verbs after normal init verbs - Add a debug print to show the fix-up application This is basically a preliminary work for the next fix for Sony VAIO. Signed-off-by: Takashi Iwai commit b73c5f8b2f85a7041e045e0009d046780416948d Author: Marek Olšák Date: Sun Apr 11 03:18:52 2010 +0200 drm/radeon/kms: fix calculation of mipmapped 3D texture sizes The 3rd dimension should be minified too. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit ce227c4183a2c18c9e5467b7e92d47140e763ab9 Author: Dave Airlie Date: Fri Apr 9 06:27:00 2010 +0000 drm/radeon/kms: only change mode when coherent value changes. On X startup we were getting a flicker where there shouldn't have been one. the X DDX calls the kernel to set the properties to the same values (yes it could be smarter), however the kernel was doing a pointless modeset then, making my nice smooth boot ugly. Signed-off-by: Dave Airlie commit 490475a9938f3480e1ab3a67063e547cea41c295 Author: Anil Veerabhadrappa Date: Thu Apr 8 15:59:15 2010 -0700 [SCSI] bnx2i: Bug fixes related to MTU change issue when there are active iscsi sessions bnx2i driver has to wait and cleanup all iscsi endpoints before returning from bnx2i_stop(). This is to make sure all chip resources are freed before chip is reset. As the requirements for 1G and 10G chipsets is different, added per-device 'hba_shutdown_tmo' parameter to adapter structure If the connections are not torn down by the daemon within this timeout period, 'cid's will be leaked in 10G device. 1G devices are more flexible and do not leak any resources because the whole chip ports gets reset when MTU is changed or ethtool selftest is run fixed a minor issue in bnx2i_ep_poll() which unnecessarily forced error return code when driver timed out waiting for TCP connect request to complete Signed-off-by: Anil Veerabhadrappa Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit a71fa1fc43a29133f13ae6ada1a389ca298c0934 Author: FUJITA Tomonori Date: Fri Apr 2 15:50:24 2010 +0900 [SCSI] ibmvscsi: fix DMA API misuse ibmvscsi uses dma_unmap_single() for buffers mapped via dma_map_sg(). It works however it's the API violation. The DMA debug facility complains about it: http://marc.info/?l=linux-scsi&m=127018555013151&w=2 Reported-by: Sachin Sant Tested-by: Sachin Sant Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit a8f23b03535359c5afeb77d937b89b8a4d87b2b2 Author: Dan Carpenter Date: Thu Apr 1 18:55:16 2010 +0300 [SCSI] wd7000: fix reset handler typo spin_unlock_irq() => spin_lock_irq() This was introduced back in 2005 at the very start of the git era by: df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 [SCSI] allow sleeping in ->eh_host_reset_handler() Signed-off-by: Dan Carpenter Signed-off-by: James Bottomley commit 5bbf297cc652713a0a6511004b8d4c1cc21a3b02 Author: Christof Schmitt Date: Thu Apr 1 13:04:08 2010 +0200 [SCSI] zfcp: Fix tracing of requests with error status When a FSF request is returned with an error it should be reported through blktrace for the ziomon tools, but the latency information should not be read. Fix this by also calling zfcp_fsf_req_trace for the error case, but skip reading the latencies inside the function. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 07bbd0facdcda64f2c77fc6a505afd32e45fa506 Author: Christof Schmitt Date: Thu Apr 1 13:04:07 2010 +0200 [SCSI] zfcp: Update MAINTAINERS entry Martin no longer works on zfcp, remove his entry from the MAINTAINERS file and add Swen as co-maintainer. Also remove the reference to the zfcpdump.txt file, zfcpdump is not part of the zfcp device driver. Signed-off-by: Christof Schmitt Acked-by: Martin Peschke Signed-off-by: James Bottomley commit d7d05548a62c87ee55b0c81933669177f885aa8d Author: Mike Christie Date: Wed Mar 31 14:41:35 2010 -0500 [SCSI] iscsi_tcp: fix relogin/shutdown hang When I made this patch: b64e77f70b8c11766e967e3485331a9e6ef01390 it was to solve a problem where we were already on the waitqueue becuase a connection problem/logout caused us to be on there when we were cleaning up the session. If we happen to get on queue for more normal reasons like their just does not happen to be any send space at the same time we are closing the connection we hit a race and get stuck in the wait. We should not check if the waitqueue is active because we could race with the network code. If the network xmit code is just about to enter the prepare to wait when we check for the waitqueue to be active then we will miss each other and the network code will fall into the wait and we will not run wake_up. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit be3bd2223b89d270853302ab0a5909fa875fd831 Author: Ryusuke Konishi Date: Mon Apr 12 01:51:03 2010 +0900 nilfs2: fix typo "numer" -> "number" in alloc.c Fixes the typo found in a warning message of a persistent object allocator function. Signed-off-by: Ryusuke Konishi commit b1095afe6fd6ea4c0d9e75489b955f898d6617d9 Author: Dominik Brodowski Date: Thu Apr 8 20:10:21 2010 +0200 pcmcia: re-start on MFC override If there are changes to the number of socket devices, we need to start over in all cases: else pcmcia_request_configuration() might get confused. Reported-by: Alexander Kurz Signed-off-by: Dominik Brodowski commit 509b0865fbd8ab6c820397706dde980c1c285538 Author: Dominik Brodowski Date: Thu Apr 8 19:23:07 2010 +0200 pcmcia: fix io_probe due to parent (PCI) resources Similar to commit 7a96e87d, we need to be aware of any parent PCI device when requesting IO regions, even only for testing ("probing"). Reported-by: Komuro Signed-off-by: Dominik Brodowski commit d3e03f4ea81456d52810a03a17dd88f78a080818 Author: Dominik Brodowski Date: Wed Apr 7 14:12:56 2010 +0200 pcmcia: use previously assigned IRQ for all card functions Use a previously assigned IRQ for all card functions, not only if CONFIG_PCMCIA_PROBE is set. Reported-by: Alexander Kurz Signed-off-by: Dominik Brodowski commit 4a1032faac94ebbf647460ae3e06fc21146eb280 Merge: ae4e8d6 0eddb51 Author: David S. Miller Date: Sun Apr 11 02:44:30 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 Author: David S. Miller Date: Sun Apr 11 02:40:49 2010 -0700 Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb" This reverts commit 2626419ad5be1a054d350786b684b41d23de1538. It causes regressions for people with IGB cards. Connection requests don't complete etc. The true cause of the issue is still not known, but we should sort this out in net-next-2.6 not net-2.6 Signed-off-by: David S. Miller commit d88d4050dcaf09e417aaa9a5024dd9449ef71b2e Author: Jiri Slaby Date: Sat Apr 10 22:28:56 2010 +0200 PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling When CONFIG_DEBUG_BLOCK_EXT_DEVT is set we decode the device improperly by old_decode_dev and it results in an error while hibernating with s2disk. All users already pass the new device number, so switch to new_decode_dev(). Signed-off-by: Jiri Slaby Reported-and-tested-by: Jiri Kosina Signed-off-by: "Rafael J. Wysocki" commit 29aac005ff4dc8a5f50b80f4e5c4f59b21c0fb50 Author: Takashi Iwai Date: Sat Apr 10 21:27:23 2010 +0200 ALSA: usb - Fix Oops after usb-midi disconnection usb-midi causes sometimes Oops at snd_usbmidi_output_drain() after disconnection. This is due to the access to the endpoints which have been already released at disconnection while the files are still alive. This patch fixes the problem by checking disconnection state at snd_usbmidi_output_drain() and by releasing urbs but keeping the endpoint instances until really all freed. Tested-by: Tvrtko Ursulin Cc: Signed-off-by: Takashi Iwai commit ca658b1e29d6be939207532e337fb640eb697f71 Author: Stefan Richter Date: Sat Apr 10 12:23:09 2010 +0200 firewire: cdev: comment fixlet Signed-off-by: Stefan Richter commit aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d Author: Clemens Ladisch Date: Wed Mar 31 16:26:52 2010 +0200 firewire: cdev: iso packet documentation Add the missing documentation for iso packets. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 9cac00b8f0079d5d3d54ec4dae453d58dec30e7c Author: Stefan Richter Date: Wed Apr 7 08:30:50 2010 +0200 firewire: cdev: fix information leak A userspace client got to see uninitialized stack-allocated memory if it specified an _IOC_READ type of ioctl and an argument size larger than expected by firewire-core's ioctl handlers (but not larger than the core's union ioctl_arg). Fix this by clearing the requested buffer size to zero, but only at _IOR ioctls. This way, there is almost no runtime penalty to legitimate ioctls. The only legitimate _IOR is FW_CDEV_IOC_GET_CYCLE_TIMER with 12 or 16 bytes to memset. [Another way to fix this would be strict checking of argument size (and possibly direction) vs. command number. However, we then need a lookup table, and we need to allow for slight size deviations in case of 32bit userland on 64bit kernel.] Reported-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 385ab5bcd4be586dffdba550b310308d89eade71 Author: Clemens Ladisch Date: Wed Mar 31 16:26:46 2010 +0200 firewire: cdev: require quadlet-aligned headers for transmit packets The definition of struct fw_cdev_iso_packet seems to imply that the header_length must be quadlet-aligned, and in fact, specifying an unaligned header has never really worked when using multiple packet structures, because the position of the next control word is computed by rounding the header_length _down_, so the last one to three bytes of the header would overlap the next control word. To avoid this problem, check that the header length is properly aligned. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 4ba1d9c0c22947a9207029e7184733252e6135f1 Author: Clemens Ladisch Date: Wed Mar 31 16:26:39 2010 +0200 firewire: cdev: disallow receive packets without header In receive contexts, reject packets with header_length==0. This would be an instruction to queue zero packets which would not make sense. This prevents a division by zero in the OHCI driver. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit bfac4d6725baacbfc085c38e231b8582a1b8f62b Author: Zhao Yakui Date: Wed Apr 7 17:11:22 2010 +0800 drm/i915: Ignore LVDS EDID when it is unavailabe or invalid This trys to shut up complains about invalid LVDS EDID during mode probe, but uses fixed panel mode directly for panels with broken EDID. https://bugs.freedesktop.org/show_bug.cgi?id=23099 https://bugs.freedesktop.org/show_bug.cgi?id=26395 Signed-off-by: Zhao Yakui Tested-by: Sitsofe Wheeler Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 2c61be0a9478258f77b66208a0c4b1f5f8161c3c Author: Trond Myklebust Date: Fri Apr 9 19:54:50 2010 -0400 NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible We always want to ensure that WRITE and COMMIT completes, whether or not the user presses ^C. Do this by making the call asynchronous, and allowing the user to do an interruptible wait for rpc_task completion. Signed-off-by: Trond Myklebust commit a6305ddb080fb483ca41ca56cacb6f96089f0c8e Author: Trond Myklebust Date: Fri Apr 9 19:07:08 2010 -0400 NFS: Fix a race with the new commit code This patch fixes a race which occurs due to the fact that we release the PG_writeback flag while still holding the nfs_page locked. Signed-off-by: Trond Myklebust commit b80c3cb628f0ebc241b02e38dd028969fb8026a2 Author: Trond Myklebust Date: Fri Apr 9 19:07:07 2010 -0400 NFS: Ensure that writeback_single_inode() calls write_inode() when syncing Since writeback_single_inode() checks the inode->i_state flags _before_ it flushes out the data, we need to ensure that the I_DIRTY_DATASYNC flag is already set. Otherwise we risk not seeing a call to write_inode(), which again means that we break fsync() et al... Signed-off-by: Trond Myklebust commit 1544fa0f7a46241582abc48f07b74f3d846379e4 Author: Trond Myklebust Date: Thu Mar 25 13:54:49 2010 -0400 NFS: Fix the mode calculation in nfs_find_open_context Signed-off-by: Trond Myklebust commit 80e60639f1b7c121a7fea53920c5a4b94009361a Author: Trond Myklebust Date: Thu Mar 25 13:51:05 2010 -0400 NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 65384a1d41c4e91f0b49d90d11b7f424d6e5c58e Author: Alex Deucher Date: Fri Apr 9 15:01:25 2010 -0400 drm/radeon/kms: more atom parser fixes (v2) shr/shl ops need the full dst rather than the pre-masked version. Fixes fdo bug 27478 and kernel bug 15738. v2: remove some unsed vars, add comments Signed-off-by: Alex Deucher Cc: stable Signed-off-by: Dave Airlie commit 2844a76a25a2fc2f5025cf128c95a14d86146d33 Author: Sage Weil Date: Fri Apr 9 15:46:42 2010 -0700 ceph: decode v5 of osdmap (pool names) [protocol change] Teach the client to decode an updated format for the osdmap. The new format includes pool names, which will be useful shortly. Get this change in earlier rather than later. Signed-off-by: Sage Weil commit 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 Merge: f163937 5091b35 Author: Linus Torvalds Date: Fri Apr 9 11:53:06 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mlx4: Check correct variable for allocation failure RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp() RDMA/cm: Set num_paths when manually assigning path records IB/cm: Fix device_create() return value check commit f16393776fc133d95fe3b3ba7118df579ed90af5 Merge: 2f40842 8e7fccc Author: Linus Torvalds Date: Fri Apr 9 11:52:48 2010 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] nss: add missing .previous statement to asm function [S390] increase default size of vmalloc area [S390] s390: disable change bit override [S390] fix io_return critical section cleanup [S390] sclp_async: potential buffer overflow [S390] arch/s390/kernel: Add missing unlock commit 2f4084209adc77f9a1c9f38db3019a509e167882 Merge: 2f10ffc 3440c49 Author: Linus Torvalds Date: Fri Apr 9 11:50:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (34 commits) cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch loop: Update mtime when writing using aops block: expose the statistics in blkio.time and blkio.sectors for the root cgroup backing-dev: Handle class_create() failure Block: Fix block/elevator.c elevator_get() off-by-one error drbd: lc_element_by_index() never returns NULL cciss: unlock on error path cfq-iosched: Do not merge queues of BE and IDLE classes cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging i2o: Remove the dangerous kobj_to_i2o_device macro block: remove 16 bytes of padding from struct request on 64bits cfq-iosched: fix a kbuild regression block: make CONFIG_BLK_CGROUP visible Remove GENHD_FL_DRIVERFS block: Export max number of segments and max segment size in sysfs block: Finalize conversion of block limits functions block: Fix overrun in lcm() and move it to lib vfs: improve writeback_inodes_wb() paride: fix off-by-one test drbd: fix al-to-on-disk-bitmap for 4k logical_block_size ... commit 2f10ffcfb28beb35137d9e86992c771b4a6c5f2a Merge: ce82653 930b9d9 Author: Linus Torvalds Date: Fri Apr 9 11:50:01 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (29 commits) drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers drm/nv50: implement gpio set/get routines drm/nv50: parse/use some more de-magiced parts of gpio table entries drm/nouveau: store raw gpio table entry in bios gpio structs drm/nv40: Init some tiling-related PGRAPH state. drm/nv50: Add NVA3 support in ctxprog/ctxvals generator. drm/nv50: another dodgy DP hack drm/nv50: punt hotplug irq handling out to workqueue drm/nv50: preserve an unknown SOR_MODECTRL value for DP encoders drm/nv50: Allow using the NVA3 new compute class. drm/nv50: cleanup properly if PDISPLAY init fails drm/nouveau: fixup the init failure paths some more drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB mark drm/nv40: add LVDS table quirk for Dell Latitude D620 drm/nv40: rework lvds table parsing drm/nouveau: detect vram amount once, and save the value drm/nouveau: remove some unused members from drm_nouveau_private drm/nouveau: Make use of TTM busy_placements. drm/nv50: add more 0x100c80 flushy magic drm/nv50: fix fbcon when framebuffer above 4GiB mark ... commit 8b9fce77737ae9983f61ec56cd53f52fb738b2c7 Author: Johannes Berg Date: Thu Apr 1 11:24:23 2010 -0700 iwlwifi: work around bogus active chains detection The current algorithm will sometimes "detect" that more chains are enabled than are really present in the device because, for unknown reasons, the ucode sends up all-zeroes signal values. The simplest way of solving this is to restrict the active chains mask to the chains we know are really present on the device. This fixes a bug with some devices where, since sometimes more chains are enabled than really present, the system would hang. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit ce82653d6cfcc95ba88c25908664878459fb1b8d Author: David Howells Date: Tue Apr 6 22:36:20 2010 +0100 radix_tree_tag_get() is not as safe as the docs make out [ver #2] radix_tree_tag_get() is not safe to use concurrently with radix_tree_tag_set() or radix_tree_tag_clear(). The problem is that the double tag_get() in radix_tree_tag_get(): if (!tag_get(node, tag, offset)) saw_unset_tag = 1; if (height == 1) { int ret = tag_get(node, tag, offset); may see the value change due to the action of set/clear. RCU is no protection against this as no pointers are being changed, no nodes are being replaced according to a COW protocol - set/clear alter the node directly. The documentation in linux/radix-tree.h, however, says that radix_tree_tag_get() is an exception to the rule that "any function modifying the tree or tags (...) must exclude other modifications, and exclude any functions reading the tree". The problem is that the next statement in radix_tree_tag_get() checks that the tag doesn't vary over time: BUG_ON(ret && saw_unset_tag); This has been seen happening in FS-Cache: https://www.redhat.com/archives/linux-cachefs/2010-April/msg00013.html To this end, remove the BUG_ON() from radix_tree_tag_get() and note in various comments that the value of the tag may change whilst the RCU read lock is held, and thus that the return value of radix_tree_tag_get() may not be relied upon unless radix_tree_tag_set/clear() and radix_tree_delete() are excluded from running concurrently with it. Reported-by: Romain DEGEZ Signed-off-by: David Howells Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit d3e06e2b15590b70ea73733fc4612e4741ff46e0 Author: Pekka Enberg Date: Wed Apr 7 19:23:41 2010 +0300 slub: Fix kmem_ptr_validate() for non-kernel pointers As suggested by Linus, fix up kmem_ptr_validate() to handle non-kernel pointers more graciously. The patch changes kmem_ptr_validate() to use the newly introduced kern_ptr_validate() helper to check that a pointer is a valid kernel pointer before we attempt to convert it into a 'struct page'. Cc: Andrew Morton Cc: Ingo Molnar Cc: Matt Mackall Cc: Nick Piggin Signed-off-by: Pekka Enberg Acked-by: Christoph Lameter Acked-by: David Rientjes Signed-off-by: Linus Torvalds commit fc1c183353a113c71675fecd0485e5aa0fe68d72 Author: Pekka Enberg Date: Wed Apr 7 19:23:40 2010 +0300 slab: Generify kernel pointer validation As suggested by Linus, introduce a kern_ptr_validate() helper that does some sanity checks to make sure a pointer is a valid kernel pointer. This is a preparational step for fixing SLUB kmem_ptr_validate(). Cc: Andrew Morton Cc: Christoph Lameter Cc: David Rientjes Cc: Ingo Molnar Cc: Matt Mackall Cc: Nick Piggin Signed-off-by: Pekka Enberg Signed-off-by: Linus Torvalds commit 4dc86ae1f925b2121d4e75058675895f83e54c71 Author: Linus Torvalds Date: Fri Apr 9 10:05:33 2010 -0700 Revert "memory-hotplug: add 0x prefix to HEX block_size_bytes" This reverts commit ba168fc37dea145deeb8fa9e7e71c748d2e00d74. It changes user-visible sysfs interfaces, and breaks some existing user space applications which apparently rely on the fact that the output does not contain the "0x" prefix. Requested-by: Heiko Carstens Acked-by: KOSAKI Motohiro Acked-by: Wu Fengguang Signed-off-by: Linus Torvalds commit e3237e3c60c1f4a790b4e521e406b3ffff74f9bc Merge: 2626419 ece6444 Author: David S. Miller Date: Fri Apr 9 10:03:35 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 5091b353883ba3358998797efb284f82344531f3 Merge: ae2d929 3e340c0 7bd9129 eadde3a Author: Roland Dreier Date: Fri Apr 9 09:14:21 2010 -0700 Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus commit 7f311a46916a3be00a1a8e3f1bdf461d08f1d263 Author: Takashi Iwai Date: Fri Apr 9 17:32:23 2010 +0200 ALSA: hda - Fix initial capture source connections of ALC880/260 The widget connections of ADC of ALC880 and ALC2260 aren't initialized, thus it might point to invalid pin. This can be a problem when mode=auto and there is only one input pin. Then user can't change the connection at all. This patch adds the code to initialize the input pin connection of these codecs. Reference: Novell bnc#594363 https://bugzilla.novell.com/show_bug.cgi?id=594363 Signed-off-by: Takashi Iwai commit 85b3cce880a19e78286570d5fd004cc3cac06f57 Author: Russell King Date: Fri Apr 9 15:00:11 2010 +0100 ARM: Fix ioremap_cached()/ioremap_wc() for SMP platforms Write combining/cached device mappings are not setting the shared bit, which could potentially cause problems on SMP systems since the cache lines won't participate in the cache coherency protocol. Signed-off-by: Russell King Tested-by: Santosh Shilimkar commit 8e7fcccee990acd8135db447ad01cb3b22bce620 Author: Martin Schwidefsky Date: Fri Apr 9 13:43:04 2010 +0200 [S390] Update default configuration. Signed-off-by: Martin Schwidefsky commit 187644636ea79aa4bdc04757ebca919c4fd546e0 Author: Heiko Carstens Date: Fri Apr 9 13:43:03 2010 +0200 [S390] nss: add missing .previous statement to asm function The savesys_ipl_nss asm function is put into the .init.text section however it is missing a ".previous" section which would restore the previous section. Luckily all functions in early.c are init functions so it doesn't matter currently. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7d3f661e5757e84f1fb2e10093cfa2f7b057bc2f Author: Martin Schwidefsky Date: Fri Apr 9 13:43:02 2010 +0200 [S390] increase default size of vmalloc area The default size of the vmalloc area is currently 1 GB. The memory resource controller uses about 10 MB of vmalloc space per gigabyte of memory. That turns a system with more than ~100 GB memory unbootable with the default vmalloc size. It costs us nothing to increase the default size to some more adequate value, e.g. 128 GB. Signed-off-by: Martin Schwidefsky commit 6af7eea2aee57b869f34eba0a94ef122fe90fbfd Author: Christian Borntraeger Date: Fri Apr 9 13:43:01 2010 +0200 [S390] s390: disable change bit override commit 6a985c6194017de2c062916ad1cd00dee0302c40 ([S390] s390: use change recording override for kernel mapping) deactivated the change bit recording for the kernel mapping to improve the performance. This works most of the time, but there are cases (e.g. kernel runs in home space, futex atomic compare xcmg) where we modify user memory with the kernel mapping instead of the user mapping. Instead of fixing these cases, this patch just deactivates change bit override to avoid future problems with other kernel code that might use the kernel mapping for user memory. CC: stable@kernel.org Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 176b1803ce4690d0dd94e16f118dbd14af045034 Author: Martin Schwidefsky Date: Fri Apr 9 13:43:00 2010 +0200 [S390] fix io_return critical section cleanup If a machine check interrupts the io interrupt handler on one of the instructions between io_return and io_leave the critical section cleanup code will move the return psw to io_work_loop. By doing that the switch from the asynchronous interrupt stack to the process stack is skipped. If e.g. TIF_NEED_RESCHED is set things break because the scheduler is called with the asynchronous interrupts stack. Moving the psw back to io_return instead fixes the problem. Signed-off-by: Martin Schwidefsky commit 35ac734f72d846f250c0344913a91f954ea764c3 Author: Dan Carpenter Date: Fri Apr 9 13:42:59 2010 +0200 [S390] sclp_async: potential buffer overflow "len" hasn't been properly range checked so we shouldn't use it as an array offset. This can only be written to by root but it would still be annoying to accidentally write more than 3 characters and corrupt your memory. Signed-off-by: Dan Carpenter Signed-off-by: Martin Schwidefsky commit d7015c120e0ac55d86cabbe7a14997b99f39e282 Author: Julia Lawall Date: Fri Apr 9 13:42:58 2010 +0200 [S390] arch/s390/kernel: Add missing unlock In the default case the lock is not unlocked. The return is converted to a goto, to share the unlock at the end of the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irq (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 226b1ec8c18bcb6d1aa448a29b2c8aeae1946228 Author: Kailang Yang Date: Fri Apr 9 11:01:20 2010 +0200 ALSA: hda - Fix setup for ALC269vb amic and dmic models Corrected HP and mic pins for ALC269vb amic and dmic models. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 531d8791accf1464bc6854ff69d08dd866189d17 Author: Kailang Yang Date: Fri Apr 9 10:57:33 2010 +0200 ALSA: hda - Fix auto-parser of ALC269vb for HP pin NID 0x21 ALC269vb has an alternative HP pin 0x21 in addition. Fix the parser to recognize it. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 9823f1a8463fb631fe965110fe19adeb3df239c4 Author: Anders Larsen Date: Thu Apr 8 11:48:16 2010 +0100 ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock at91 slow-clock resume: Don't wait for a disabled PLL to lock. We run into this problem with the PLLB on the at91: ohci-at91 disables the PLLB when going to suspend. The slowclock code however tries to do the same: It saves the PLLB register value and when restoring the value during resume, it waits for the PLLB to lock again. However the PLL will never lock and the loop would run into its timeout because the slowclock code just stored and restored an empty register. This fixes the problem by only restoring PLLA/PLLB when they were enabled at suspend time. Cc: Andrew Victor Signed-off-by: Anders Larsen Signed-off-by: Russell King commit 3440c49f5c5ecb4f29b0544aa87da71888404f8f Author: Divyesh Shah Date: Fri Apr 9 09:29:57 2010 +0200 cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch When CFQ dispatches requests forcefully due to a barrier or changing iosched, it runs through all cfqq's dispatching requests and then expires each queue. However, it does not activate a cfqq before flushing its IOs resulting in using stale values for computing slice_used. This patch fixes it by calling activate queue before flushing reuqests from each queue. This is useful mostly for barrier requests because when the iosched is changing it really doesnt matter if we have incorrect accounting since we're going to break down all structures anyway. We also now expire the current timeslice before moving on with the dispatch to accurately account slice used for that cfqq. Signed-off-by: Divyesh Shah Signed-off-by: Jens Axboe commit 930b9d94579fa1ea9604cbf7ba56cedf99ba9b5c Merge: 3a89b4a 8e024f1 Author: Dave Airlie Date: Fri Apr 9 14:27:51 2010 +1000 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus * 'nouveau/for-airlied' of ../drm-nouveau-next: (21 commits) drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers drm/nv50: implement gpio set/get routines drm/nv50: parse/use some more de-magiced parts of gpio table entries drm/nouveau: store raw gpio table entry in bios gpio structs drm/nv40: Init some tiling-related PGRAPH state. drm/nv50: Add NVA3 support in ctxprog/ctxvals generator. drm/nv50: another dodgy DP hack drm/nv50: punt hotplug irq handling out to workqueue drm/nv50: preserve an unknown SOR_MODECTRL value for DP encoders drm/nv50: Allow using the NVA3 new compute class. drm/nv50: cleanup properly if PDISPLAY init fails drm/nouveau: fixup the init failure paths some more drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB mark drm/nv40: add LVDS table quirk for Dell Latitude D620 drm/nv40: rework lvds table parsing drm/nouveau: detect vram amount once, and save the value drm/nouveau: remove some unused members from drm_nouveau_private drm/nouveau: Make use of TTM busy_placements. drm/nv50: add more 0x100c80 flushy magic drm/nv50: fix fbcon when framebuffer above 4GiB mark ... commit 8e024f13142fbbca5fbe14a6926516a45bd70c3a Author: Ben Skeggs Date: Tue Mar 16 08:45:07 2010 +1000 drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers There's one known case where we never stop recieving DEFER, and loop here forever. Lets not do that.. Signed-off-by: Ben Skeggs commit 4528416291e26456e68f7217576e40e589d276bf Author: Ben Skeggs Date: Wed Apr 7 12:57:35 2010 +1000 drm/nv50: implement gpio set/get routines Signed-off-by: Ben Skeggs commit 02faec09b2814b6ad3fd202e2f28b3c4b712a3f1 Author: Ben Skeggs Date: Wed Apr 7 12:05:32 2010 +1000 drm/nv50: parse/use some more de-magiced parts of gpio table entries Signed-off-by: Ben Skeggs commit 2535d71c80b3d79090c9d44ec6d35342e2d258f0 Author: Ben Skeggs Date: Wed Apr 7 12:00:14 2010 +1000 drm/nouveau: store raw gpio table entry in bios gpio structs And use our own version of the GPIO table for the INIT_GPIO opcode. Signed-off-by: Ben Skeggs commit 2295e17a4a0c339ca8507deb2cab5f339007e5e5 Author: Francisco Jerez Date: Tue Apr 6 21:11:58 2010 +0200 drm/nv40: Init some tiling-related PGRAPH state. Fixes garbled 3D on an nv46 card. Reported-by: Francesco Marella Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit eaeefba154a19aeab9037b1d29478e5303a992fe Author: Marcin Kościelnicki Date: Fri Apr 2 10:28:18 2010 +0000 drm/nv50: Add NVA3 support in ctxprog/ctxvals generator. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit e60a9df3a8e60e5f16707897467b36702e8c4cdc Author: Ben Skeggs Date: Tue Mar 30 16:01:41 2010 +1000 drm/nv50: another dodgy DP hack Allows *some* DP cards to keep working in some corner cases that most people shouldn't hit. I hit it all the time with development, so this can stay for now. Signed-off-by: Ben Skeggs commit a5acac66685397a73bed8638114262520565e41c Author: Ben Skeggs Date: Tue Mar 30 15:14:41 2010 +1000 drm/nv50: punt hotplug irq handling out to workqueue On DP outputs we'll likely end up running vbios init tables here, which may sleep. Signed-off-by: Ben Skeggs commit 6f335a7afa6bc57603f39430dc6f9e57de288a91 Author: Ben Skeggs Date: Mon Mar 29 10:06:09 2010 +1000 drm/nv50: preserve an unknown SOR_MODECTRL value for DP encoders This value interacts with some registers we don't currently know how to program properly ourselves. The default of 5 that we were using matches what the VBIOS on early DP cards do, but later ones use 6, which would cause nouveau to program an incorrect mode on these chips. Signed-off-by: Ben Skeggs commit d327dd4e771b5820743aeba0622116c5c8806388 Author: Marcin Kościelnicki Date: Wed Mar 24 13:43:16 2010 +0000 drm/nv50: Allow using the NVA3 new compute class. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit a1663ed3412f4b94edcf30b271c9db3ace533605 Author: Ben Skeggs Date: Thu Mar 25 16:01:04 2010 +1000 drm/nv50: cleanup properly if PDISPLAY init fails Signed-off-by: Ben Skeggs commit 78bb35129e9400fb50580e971d964563fc8e0218 Author: Ben Skeggs Date: Thu Mar 25 16:00:09 2010 +1000 drm/nouveau: fixup the init failure paths some more Signed-off-by: Ben Skeggs commit 494ab824f179ddeb2022cbb1d25aee41ab46ee9b Author: Ben Skeggs Date: Fri Mar 19 12:49:59 2010 +1000 drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB mark Signed-off-by: Ben Skeggs commit 2eb92c80074ecfbc691741720382007417f64523 Author: Ben Skeggs Date: Thu Mar 18 13:38:04 2010 +1000 drm/nv40: add LVDS table quirk for Dell Latitude D620 Should fix: https://bugzilla.redhat.com/show_bug.cgi?id=505132 https://bugzilla.redhat.com/show_bug.cgi?id=543091 https://bugzilla.redhat.com/show_bug.cgi?id=530425 https://bugs.edge.launchpad.net/ubuntu/+source/xserver-xorg-video-nouveau/ +bug/539730 Signed-off-by: Ben Skeggs commit f3bbb9ccbf2a0362363ce6d7e4e57dbf34a5cef1 Author: Ben Skeggs Date: Thu Mar 18 12:05:43 2010 +1000 drm/nv40: rework lvds table parsing All indications seem to be that the version 0x30 table should be handled the same way as 0x40 (as used on G80), at least for the parts that we currently try use. This commit cleans up the parsing to make it clearer about what we're actually trying to achieve, and unifies the 0x30/0x40 parsing. Signed-off-by: Ben Skeggs commit a76fb4e8ffe42144529e21fe1e609b762e8eb5cc Author: Ben Skeggs Date: Thu Mar 18 09:45:20 2010 +1000 drm/nouveau: detect vram amount once, and save the value As opposed to repeatedly reading the amount back from the GPU every time we need to know the VRAM size. We should now fail to load gracefully on detecting no VRAM, rather than something potentially messy happening. Signed-off-by: Ben Skeggs commit 952eb63543552deb1bf1113739d59d29172d7755 Author: Ben Skeggs Date: Thu Mar 18 09:23:19 2010 +1000 drm/nouveau: remove some unused members from drm_nouveau_private Signed-off-by: Ben Skeggs commit 78ad0f7bf2bb667729581f099781fc0b7ae58fcc Author: Francisco Jerez Date: Thu Mar 18 13:07:47 2010 +0100 drm/nouveau: Make use of TTM busy_placements. Previously we were filling it the same as "placements", but in some cases there're valid alternatives that we were ignoring completely. Keeping a back-up memory type helps on several low-mem situations. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 40b2a687bd92827ca144d3623cf48377d8f7680d Author: Ben Skeggs Date: Mon Mar 15 16:43:47 2010 +1000 drm/nv50: add more 0x100c80 flushy magic Fixes the !vbo_fifo path in the 3D driver on certain chipsets. Still not really any good idea of what exactly the magic achieves, but it makes things work. While we're at it, in the PCIEGART path, flush on unbinding also. Signed-off-by: Ben Skeggs commit 0c324971986f1498ccd289cb2b4927a6fd3efbe5 Author: Ben Skeggs Date: Tue Mar 16 13:20:58 2010 +1000 drm/nv50: fix fbcon when framebuffer above 4GiB mark This can't actually happen right now, but lets fix it anyway. Signed-off-by: Ben Skeggs commit 0dd8c3f093e3d0cab2cc967f9620b41a125f1f56 Author: Marcin Kościelnicki Date: Wed Mar 17 00:58:47 2010 +0000 drm/nv50: Fix NEWCTX_DONE flag number Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit bc0beb44f27dc068c1daefc79826c07e0b22ef6c Author: Jiri Slaby Date: Tue Mar 16 16:23:59 2010 +0100 [SCSI] qla2xxx: fix lock imbalance Stanse found that one error path in qla24xx_bsg_timeout omits to unlock ha->hardware_lock. Fix that. Signed-off-by: Jiri Slaby Acked-by: Giridhar Malavali Signed-off-by: James Bottomley commit 67221a4226a5fc48e413e2050db266bb171753c4 Author: Jiri Slaby Date: Tue Mar 16 16:23:58 2010 +0100 [SCSI] lpfc: fix lock imbalances Stanse found that two error paths in lpfc_bsg_rport_els_cmp and lpfc_issue_ct_rsp_cmp omits to unlock phba->ct_ev_lock. It is because they wrongly unlock phba->hbalock instead. Fix that. Signed-off-by: Jiri Slaby Acked-by: James Smart Signed-off-by: James Bottomley commit 4ec3fdbef17d0266826b56b33735dc9dada58c27 Author: Jiri Slaby Date: Tue Mar 16 16:23:57 2010 +0100 [SCSI] be2iscsi: fix lock imbalance Stanse found that one error path in mgmt_invalidate_icds omits to unlock ctrl->mbox_lock. Fix that. Added in 756d29c8c7ed8887ed7d752371ce2f (Enable async mode for mcc rings) where the spinlock was moved. Signed-off-by: Jiri Slaby Acked-by: Jayamohan Kallickal Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 229bab6bacc42295f13c0434772381a88ce2308b Author: Dan Carpenter Date: Mon Mar 15 11:26:56 2010 +0300 [SCSI] dpt_i2o: several use after free issues adpt_i2o_delete_hba() calls kfree() so we have to save "pHba->next" before calling it. Also inside adpt_i2o_delete_hba() itself, there was another use after free bug which I fixed by moving the kfree() down a line. Signed-off-by: Dan Carpenter Signed-off-by: James Bottomley commit ece6444c2fe80dab679beb5f0d58b091f1933b00 Author: Wey-Yi Guy Date: Thu Apr 8 13:17:37 2010 -0700 iwlwifi: need check for valid qos packet before free For 4965, need to check it is valid qos frame before free, only valid QoS frame has the tid used to free the packets. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 02246c41171097ceab3246f6dc251ac89de6004b Author: Nikanth Karthikesan Date: Thu Apr 8 21:39:31 2010 +0200 loop: Update mtime when writing using aops Update mtime when writing to backing filesystem using the address space operations write_begin and write_end. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 9ddd3a31aedcdb55d5509b595c04b187041c8adb Merge: d620a7c f05337c Author: Linus Torvalds Date: Thu Apr 8 11:58:14 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: not overwriting file_lock structure after GET_LK cifs: Fix a kernel BUG with remote OS/2 server (try #3) [CIFS] initialize nbytes at the beginning of CIFSSMBWrite() [CIFS] Add mmap for direct, nobrl cifs mount types commit 2626419ad5be1a054d350786b684b41d23de1538 Author: David S. Miller Date: Thu Apr 8 11:32:30 2010 -0700 tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb Back in commit 04a0551c87363f100b04d28d7a15a632b70e18e7 ("loopback: Drop obsolete ip_summed setting") we stopped setting CHECKSUM_UNNECESSARY in the loopback xmit. This is because such a setting was a lie since it implies that the checksum field of the packet is properly filled in. Instead what happens normally is that CHECKSUM_PARTIAL is set and skb->csum is calculated as needed. But this was only happening for TCP data packets (via the skb->ip_summed assignment done in tcp_sendmsg()). It doesn't happen for non-data packets like ACKs etc. Fix this by setting skb->ip_summed in the common non-data packet constructor. It already is setting skb->csum to zero. But this reminds us that we still have things like ip_output.c's ip_dev_loopback_xmit() which sets skb->ip_summed to the value CHECKSUM_UNNECESSARY, which Herbert's patch teaches us is not valid. So we'll have to address that at some point too. Signed-off-by: David S. Miller commit 1223c67c0938d2df309fde618bd82c87c8c1af04 Author: Jorge Boncompte [DTI2] Date: Thu Apr 8 04:56:48 2010 +0000 udp: fix for unicast RX path optimization Commits 5051ebd275de672b807c28d93002c2fb0514a3c9 and 5051ebd275de672b807c28d93002c2fb0514a3c9 ("ipv[46]: udp: optimize unicast RX path") broke some programs. After upgrading a L2TP server to 2.6.33 it started to fail, tunnels going up an down, after the 10th tunnel came up. My modified rp-l2tp uses a global unconnected socket bound to (INADDR_ANY, 1701) and one connected socket per tunnel after parameter negotiation. After ten sockets were open and due to mixed parameters to udp[46]_lib_lookup2() kernel started to drop packets. Signed-off-by: Jorge Boncompte [DTI2] Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ab285f2b5290d92b7ec1a6f9aad54308dadf6157 Author: Frederic Weisbecker Date: Thu Apr 8 14:05:50 2010 +0200 perf: Fix unsafe frame rewinding with hot regs fetching When we fetch the hot regs and rewind to the nth caller, it might happen that we dereference a frame pointer outside the kernel stack boundaries, like in this example: perf_trace_sched_switch+0xd5/0x120 schedule+0x6b5/0x860 retint_careful+0xd/0x21 Since we directly dereference a userspace frame pointer here while rewinding behind retint_careful, this may end up in a crash. Fix this by simply using probe_kernel_address() when we rewind the frame pointer. This issue will have a much more proper fix in the next version of the perf_arch_fetch_caller_regs() API that will only need to rewind to the first caller. Reported-by: Eric Dumazet Signed-off-by: Frederic Weisbecker Tested-by: Eric Dumazet Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: David Miller Cc: Archs commit d620a7cf05d4f12f5bbb1060d766e8139ab31458 Merge: 2aedd19 45c4d01 Author: Linus Torvalds Date: Thu Apr 8 10:02:02 2010 -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: libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2) commit 45c4d015a92f72ec47acd0c7557abdc0c8a6499d Author: Mark Lord Date: Wed Apr 7 13:52:08 2010 -0400 libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2) Most drives from Seagate, Hitachi, and possibly other brands, do not allow LBA28 access to sector number 0x0fffffff (2^28 - 1). So instead use LBA48 for such accesses. This bug could bite a lot of systems, especially when the user has taken care to align partitions to 4KB boundaries. On misaligned systems, it is less likely to be encountered, since a 4KB read would end at 0x10000000 rather than at 0x0fffffff. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 4352aa5bbf1d0080c2dcf904ce1e4be0a1cb5937 Author: Alexander Duyck Date: Thu Mar 25 13:03:30 2010 -0700 PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset While testing completion timeouts I found that hardware was not recovering. It looks like the hot reset was never being propagated to the endpoint devices on the bus due to the fact that we were clearing the bit too quickly. The documentation I have states that we should be transmitting hot reset TS1s for 2ms. To achieve this I have added a 2ms delay from the time we set the secondary bus reset bit to the time we clear it. In addition I changed the define used for the secondary bus reset bit to match the register define that was being used. Reviewed-by: Hidetoshi Seto Signed-off-by: Alexander Duyck Signed-off-by: Jesse Barnes commit 73a0e614580fb650846be1e9315f6b7b6069b9cc Author: Bjorn Helgaas Date: Tue Apr 6 13:24:08 2010 -0600 x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions ACPI Address Space Descriptors (used in _CRS) have a Consumer/Producer bit that is supposed to distinguish regions that are consumed directly by a device from those that are forwarded ("produced") by a bridge. But BIOSes have apparently not used this consistently, and Windows seems to ignore it, so I think Linux should ignore it as well. I can't point to any of these supposed broken BIOSes, but since we now rely on _CRS by default, I think it's safer to ignore this bit from the start. Here are details of my experiments with how Windows handles it: https://bugzilla.kernel.org/show_bug.cgi?id=15701 Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2aedd192f799c362ccefc3c316f0c4bd5154126b Merge: cf90bfe 84fba5e Author: Linus Torvalds Date: Thu Apr 8 08:37:05 2010 -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: Fix sched_getaffinity() commit cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 Merge: 0a2851b 720fc22 Author: Linus Torvalds Date: Thu Apr 8 07:45:36 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide: Fix IDE taskfile with cfq scheduler ide: Must hold queue lock when requeueing ide: Requeue request after DMA timeout commit 0a2851b9a837cb025d48bb8118f35ebd12bce4b5 Merge: f5284e7 c25f7cf Author: Linus Torvalds Date: Thu Apr 8 07:44:53 2010 -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: ACPI / PM: Move ACPI video resume to a PM notifier ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup ACPI: battery drivers should call power_supply_changed() ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 ACPI: Don't send KEY_UNKNOWN for random video notifications ACPI: NUMA: map pxms to low node ids ACPI: use _HID when supplied by root-level devices ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe() ACPI: fixes a false alarm from lockdep ACPI dock: support multiple ACPI dock devices ACPI: EC: Allow multibyte access to EC commit 43a3cec01354573517f1348383e0ab6e6067076b Author: Sascha Hauer Date: Thu Apr 8 11:31:26 2010 +0200 ASoC: imx-ssi: Use a hrtimer in FIQ mode Using a regular timer results in poll times < 1 jiffie with small buffers, so we loaded the timer with the actual jiffie value. We can be more accurate using a hrtimer. Also, we have to call snd_pcm_period_elapsed after playing period_bytes and not runtime->period_size (which is in samples and not in bytes). Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 671999cb5d8817611f865f3877f5a5b81372f61e Author: Sascha Hauer Date: Thu Apr 8 11:31:25 2010 +0200 ASoC: imx-pcm-dma-mx2: restart DMA after an error Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 206b60e189c7cc2b4675687d66f167299a13a4d4 Author: Sascha Hauer Date: Thu Apr 8 11:31:24 2010 +0200 ASoC: imx-ssi: honor IMX_SSI_DMA flag When checking if we are DMA capable we have to check for the IMX_SSI_DMA flag which is already set from platform_data instead of setting it again when we want to do DMA. Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 78e4fd26ef8b85c8cbb6803e18b6b1f970420e06 Author: Huang Weiyi Date: Thu Apr 8 19:50:08 2010 +0800 ASoC: wm2000: remove unused #include Remove unused #include ('s) in sound/soc/codecs/wm2000.c Signed-off-by: Huang Weiyi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c15d0fc0fc399d2639240b35ad7ed93ed5a59412 Author: Dmitry Monakhov Date: Mon Mar 29 11:05:21 2010 +0400 udf: add speciffic ->setattr callback generic setattr not longer responsible for quota transfer. use udf_setattr for all udf's inodes. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 69ecbbedac8e353bbd924fad16fed0c7c54e6382 Author: Dan Carpenter Date: Mon Mar 15 11:21:13 2010 +0300 udf: potential integer overflow bloc->logicalBlockNum is unsigned so it's never less than zero. When I saw that, it made me worry that "bloc->logicalBlockNum + count" could overflow. That's why I changed the check for less than zero to an overflow check. (The test works because "count" is also unsigned.) Signed-off-by: Dan Carpenter Signed-off-by: Jan Kara commit 1ce31b255cf8b06470dfbd469055b6fd8d2274bc Author: Raphaël Doursenaud Date: Thu Apr 8 13:40:52 2010 +0200 HID: add support for cymotion master solar keyboard Support the solar version of the Cherry's cymotion keyboard line using existing cherry driver. Signed-off-by: Raphaël Doursenaud Signed-off-by: Jiri Kosina commit bb3c9d4f851d51bb6302ef0df830dcec88d7c529 Merge: d4d9959 b3aa111 Author: Russell King Date: Thu Apr 8 10:47:05 2010 +0100 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 Conflicts: arch/arm/mach-mx3/mach-pcm037.c commit 2488f56d3699b84ee51d2940d1347345b8f9b0e1 Author: Brice Goglin Date: Wed Apr 7 22:23:45 2010 -0700 myri10ge: fix rx_pause in myri10ge_set_pauseparam Fix rx_pause management in myri10ge_set_pauseparam(). Signed-off-by: Brice Goglin Signed-off-by: David S. Miller commit 69298698c2453c2f8cd1d7d2a4cae39eeec3b66e Author: Patrick Loschmidt Date: Wed Apr 7 21:52:07 2010 -0700 net: corrected documentation for hardware time stamping The current documentation for hardware time stamping does not correctly specify the available kernel functions since the implementation was changed later on. Signed-off-by: Patrick Loschmidt Signed-off-by: David S. Miller commit b62226826b4ea1926b644b5a337ffa6b637d4870 Author: Dan Carpenter Date: Wed Apr 7 21:50:08 2010 -0700 stmmac: use resource_size() Resource size should be calculated as end - start + 1 because we start counting at zero. I changed the code to resource_size() to do the calculation. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit ddd0451fc8dbf94446c81500ff0dcee06c4057cb Author: John Hughes Date: Sun Apr 4 06:48:10 2010 +0000 x.25 attempts to negotiate invalid throughput The current X.25 code has some bugs in throughput negotiation: 1. It does negotiation in all cases, usually there is no need 2. It incorrectly attempts to negotiate the throughput class in one direction only. There are separate throughput classes for input and output and if either is negotiated both mist be negotiates. This is bug https://bugzilla.kernel.org/show_bug.cgi?id=15681 This bug was first reported by Daniel Ferenci to the linux-x25 mailing list on 6/8/2004, but is still present. The current (2.6.34) x.25 code doesn't seem to know that the X.25 throughput facility includes two values, one for the required throughput outbound, one for inbound. This causes it to attempt to negotiate throughput 0x0A, which is throughput 9600 inbound and the illegal value "0" for inbound throughput. Because of this some X.25 devices (e.g. Cisco 1600) refuse to connect to Linux X.25. The following patch fixes this behaviour. Unless the user specifies a required throughput it does not attempt to negotiate. If the user does not specify a throughput it accepts the suggestion of the remote X.25 system. If the user requests a throughput then it validates both the input and output throughputs and correctly negotiates them with the remote end. Signed-off-by: John Hughes Tested-by: Andrew Hendry Signed-off-by: David S. Miller commit f5eb917b861828da18dc28854308068c66d1449a Author: John Hughes Date: Wed Apr 7 21:29:25 2010 -0700 x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet. Here is a patch to stop X.25 examining fields beyond the end of the packet. For example, when a simple CALL ACCEPTED was received: 10 10 0f x25_parse_facilities was attempting to decode the FACILITIES field, but this packet contains no facilities field. Signed-off-by: John Hughes Signed-off-by: David S. Miller commit fd218cf9557b9bf7061365a8fe7020a56d3f767c Author: Herbert Xu Date: Wed Apr 7 21:20:47 2010 -0700 bridge: Fix IGMP3 report parsing The IGMP3 report parsing is looking at the wrong address for group records. This patch fixes it. Reported-by: Banyeer Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 94824f3dbe0d3f62470603bbb18efb5510aaf07c Author: Michael Chan Date: Wed Apr 7 20:53:54 2010 -0700 cnic: Fix crash during bnx2x MTU change. cnic_service_bnx2x() irq handler can be called during chip reset from MTU change. Need to check that the cnic's device state is up before handling the irq. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f5284e7635787224dda1a2bf82a4c56b1c75671f Merge: 3eac4ab 320718e Author: Linus Torvalds Date: Wed Apr 7 18:49:20 2010 -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: hvc_console: Fix race between hvc_close and hvc_remove virtio: disable multiport console support. virtio: console makes incorrect assumption about virtio API virtio: console: Fix early_put_chars usage MAINTAINERS: Put the virtio-console entry in correct alphabetical order commit 320718ee074acce5ffced6506cb51af1388942aa Author: Anton Blanchard Date: Tue Apr 6 21:42:38 2010 +1000 hvc_console: Fix race between hvc_close and hvc_remove I don't claim to understand the tty layer, but it seems like hvc_open and hvc_close should be balanced in their kref reference counting. Right now we get a kref every call to hvc_open: if (hp->count++ > 0) { tty_kref_get(tty); <----- here spin_unlock_irqrestore(&hp->lock, flags); hvc_kick(); return 0; } /* else count == 0 */ tty->driver_data = hp; hp->tty = tty_kref_get(tty); <------ or here if hp->count was 0 But hvc_close has: tty_kref_get(tty); if (--hp->count == 0) { ... /* Put the ref obtained in hvc_open() */ tty_kref_put(tty); ... } tty_kref_put(tty); Since the outside kref get/put balance we only do a single kref_put when count reaches 0. The patch below changes things to call tty_kref_put once for every hvc_close call, and with that my machine boots fine. Signed-off-by: Anton Blanchard Acked-by: Amit Shah Signed-off-by: Rusty Russell commit b7a413015d2986edf020fba765c906cc9cbcbfc9 Author: Michael S. Tsirkin Date: Wed Mar 31 21:56:42 2010 +0300 virtio: disable multiport console support. Move MULTIPORT feature and related config changes out of exported headers, and disable the feature at runtime. At this point, it seems less risky to keep code around until we can enable it than rip it out completely. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell commit 9ff4cfab82d27e9fda72315f911bbaa9516e04bc Author: Rusty Russell Date: Thu Apr 8 09:46:16 2010 -0600 virtio: console makes incorrect assumption about virtio API The get_buf() API sets the second arg to the number of bytes *written* by the other side; in this case it should be zero as these are output buffers. lguest gets this right (obviously kvm's console doesn't), resulting in continual buildup of console writes. Signed-off-by: Rusty Russell Acked-by: Amit Shah commit 162a689a13ed61c0752726edb75427b2cd4186c1 Author: François Diakhaté Date: Tue Mar 23 18:23:15 2010 +0530 virtio: console: Fix early_put_chars usage Currently early_put_chars is not used by virtio_console because it can only be used once a port has been found, at which point it's too late because it is no longer needed. This patch should fix it. Acked-by: Christian Borntraeger Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 9a82446bd269b130a9ac270e720e65c3843d4d0c Author: Amit Shah Date: Tue Mar 23 18:23:09 2010 +0530 MAINTAINERS: Put the virtio-console entry in correct alphabetical order Move around the entry for virtio-console to keep the file sorted. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 04b1a22350e1e6464c3109886385178d119dbbb4 Merge: a55cb18 179b284 Author: David S. Miller Date: Wed Apr 7 16:52:29 2010 -0700 Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit a55cb185b4a8f84cd05b66bb00b267ea455ecdc8 Author: Amit Kumar Salecha Date: Wed Apr 7 16:51:49 2010 -0700 qlcnic: fix set mac addr If interface is down, mac address request are not sent to fw but it is getting add in driver mac list. Driver mac list should be in sync with fw i.e addresses communicated to fw. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 3bcf8229a8c49769e48d3e0bd1e20d8e003f8106 Author: Florian Fainelli Date: Wed Apr 7 16:50:58 2010 -0700 r6040: fix r6040_multicast_list As reported in , r6040_ multicast_list currently crashes. This is due a wrong maximum of multicast entries. This patch fixes the following issues with multicast: - number of maximum entries if off-by-one (4 instead of 3) - the writing of the hash table index is not necessary and leads to invalid values being written into the MCR1 register, so the MAC is simply put in a non coherent state - when we exceed the maximum number of mutlticast address, writing the broadcast address should be done in registers MID_1{L,M,H} instead of MID_O{L,M,H}, otherwise we would loose the adapter's MAC address Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 005c93b5d876edf670b4c71d8dd79dc4e845a099 Merge: fb9e2d8 1144601 Author: David S. Miller Date: Wed Apr 7 16:41:03 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 3eac4abaa69949af0e2f64e5c55ee8a22bbdd3e7 Author: Kevin Hilman Date: Wed Apr 7 11:52:46 2010 -0700 rwsem generic spinlock: use IRQ save/restore spinlocks rwsems can be used with IRQs disabled, particularily in early boot before IRQs are enabled. Currently the spin_unlock_irq() usage in the slow-patch will unconditionally enable interrupts and cause problems since interrupts are not yet initialized or enabled. This patch uses save/restore versions of IRQ spinlocks in the slowpath to ensure interrupts are not unintentionally disabled. Signed-off-by: Kevin Hilman Signed-off-by: Linus Torvalds commit 04287f975e68038051eb9c79896866d36610b8e0 Author: Al Viro Date: Thu Apr 8 00:06:07 2010 +0100 Have nfs ->d_revalidate() report errors properly If nfs atomic open implementation ends up doing open request from ->d_revalidate() codepath and gets an error from server, return that error to caller explicitly and don't bother with lookup_instantiate_filp() at all. ->d_revalidate() can return an error itself just fine... See http://bugzilla.kernel.org/show_bug.cgi?id=15674 http://marc.info/?l=linux-kernel&m=126988782722711&w=2 for original report. Reported-by: Daniel J Blueman Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7bd912998ec9cdbb0268138b6b51f28adf7865f4 Author: Dan Carpenter Date: Wed Apr 7 09:39:01 2010 +0000 IB/mlx4: Check correct variable for allocation failure The intent here is to check the "mfrpl->mapped_page_list" allocation. We checked "mfrpl->ibfrpl.page_list" earlier. Signed-off-by: Dan Carpenter Signed-off-by: Roland Dreier commit eadde3a1a5291492098e8b0b6435d075fc22486b Author: Chien Tung Date: Thu Mar 25 13:39:50 2010 +0000 RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp() cap.max_inline_data is incorrectly set in init_attr instead of attr. Set it in attr so subsequent init_attr.cap assignment will get the correct value. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit ae2d9293d7cfba70f44f59cfedb44122828c73b8 Author: Sean Hefty Date: Thu Mar 25 19:12:36 2010 +0000 RDMA/cm: Set num_paths when manually assigning path records When manually assigning the path records to use for a connection, save the number of paths that were set. Otherwise, checks against num_path will show 0, even though path record data is available. This was discovered by manually setting the path records from user space, then querying the kernel to see if the correct path records were assigned, only to discover that the kernel returned 0 path records to the query. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 48de8cb7847d040c8892701c1ff3c55eff1f46b4 Merge: 63634c8 134fbad Author: Linus Torvalds Date: Wed Apr 7 14:01:51 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf, x86: Enable Nehalem-EX support perf kmem: Fix breakage introduced by 5a0e3ad slab.h script commit d4d9959c099751158c5cf14813fe378e206339c6 Author: Rabin Vincent Date: Wed Apr 7 18:10:20 2010 +0100 ARM: 6031/1: fix Thumb-2 decompressor 98e12b5a6e05413 ("ARM: Fix decompressor's kernel size estimation for ROM=y") broke the Thumb-2 decompressor because it added an entry in the LC0 table but didn't adjust the offset the Thumb-2 code uses to load the SP from that table. Fix it. Cc: stable Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 4742723cbce519773e4560f5cab11163eaa0c889 Author: Hartley Sweeten Date: Tue Apr 6 22:46:16 2010 +0100 ARM: 6029/1: ep93xx: gpio.c: local functions should be static The functions ep93xx_gpio_update_int_params and ep93xx_gpio_int_mask are not exported and should be static. This was overlooked when moving the code from core.c. Also, change a comment to better indicate what the code is for. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 54274d71d9358321f7773b820de37496a05fae7f Author: Linus Walleij Date: Sun Apr 4 10:58:03 2010 +0100 ARM: 6028/1: ARM: add MAINTAINERS for U300 This adds myself as maintainer of the U300 machine and associated system-on-chip drivers. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 76708ab83962732ba3191ce8a61d8410406c8358 Author: Leo Chen Date: Thu Apr 1 19:13:19 2010 +0100 ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c Added missing down on the memMap->lock semaphore. Also fixed a return statement so that we always exit with an up (i.e. early exit via return is not allowed) Signed-off-by: Leo Hao Chen Signed-off-by: Russell King commit 63634c86365b530af5026d409fd403801abe1e75 Merge: fb1ae63 75392dd Author: Linus Torvalds Date: Wed Apr 7 11:03:06 2010 -0700 Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: davinci: fix compile warning: : #include davinci: DM365: fix duplicate default IRQ priorities davinci: edma: clear events in edma_start() davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined davinci: timers: don't enable timer until clocksource is initialized commit fb1ae635772d679eb312fa447290fc02cd0e4cf1 Merge: addb2d6 472a474 Author: Linus Torvalds Date: Wed Apr 7 11:02:23 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards x86: Increase CONFIG_NODES_SHIFT max to 10 ibft, x86: Change reserve_ibft_region() to find_ibft_region() x86, hpet: Fix bug in RTC emulation x86, hpet: Erratum workaround for read after write of HPET comparator bootmem, x86: Fix 32bit numa system without RAM on node 0 nobootmem, x86: Fix 32bit numa system without RAM on node 0 x86: Handle overlapping mptables x86: Make e820_remove_range to handle all covered case x86-32, resume: do a global tlb flush in S4 resume commit 75392dd3041b8fb7ee4cef6bd9b71154ae34f4e1 Author: Sergei Shtylyov Date: Fri Mar 26 17:56:58 2010 +0300 davinci: fix compile warning: : #include This hushes the following warning: arch/arm/mach-davinci/include/mach/da8xx.h:104: warning: ‘struct platform_device’ declared inside parameter list arch/arm/mach-davinci/include/mach/da8xx.h:104: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman commit addb2d6c13993060ae75f5005815b19dd2abdd64 Merge: 84db18b af2b021 Author: Linus Torvalds Date: Wed Apr 7 08:48:39 2010 -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: microblaze: Remove unused variable from ptrace microblaze: io.h: Add io big-endian function microblaze: Enable memory leak detector microblaze: Fix futex code microblaze: Fix ftrace_update_ftrace_func panic commit 84db18bbeb5c9c1a9c86e38a89d76ee526fd2c6f Merge: 6948ec7 55b371d Author: Linus Torvalds Date: Wed Apr 7 08:42:25 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: mixart: range checking proc file ALSA: hda - Fix a wrong array range check in patch_realtek.c ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream ALSA: hda - Enable amplifiers on Acer Inspire 6530G ASoC: Only do WM8994 bias off transition from standby ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction ASoC: Support second DC servo readback method for wm_hubs ASoC: Avoid wraparound in wm_hubs DC servo correction ALSA: echoaudio - Eliminate use after free ALSA: i2c: cleanup: change parameter to pointer ALSA: hda - Add MSI blacklist for Aopen MZ915-M ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code ALSA: hda - Update document about MSI and interrupts ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981 ALSA: hda - Add missing printk argument in previous patch ASoC: Fix passing platform_data to ac97 bus users and fix a leak ALSA: hda - Fix ADC/MUX assignment of ALC269 codec ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo() ASoC: wm8994: playback => capture commit 6948ec70355ae6cf6082519e3d76b280373dade1 Merge: cc4fc29 18e5b53 Author: Linus Torvalds Date: Wed Apr 7 08:38:27 2010 -0700 Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: nodemask: include slab.h from drivers/base/node.c commit cc4fc29e59c386919a7674e203be7822dc968dc0 Author: David Howells Date: Tue Apr 6 14:35:09 2010 -0700 fs-cache: order the debugfs stats correctly Order the debugfs statistics correctly. The values displayed through a seq_printf() statement should be in the same order as the names in the format string. In the 'Lookups' line, objects created ('crt=') and lookups timed out ('tmo=') have their values transposed. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08dc179b9b00cfbed006ae6f5d0e471ef79dc69c Author: David Howells Date: Tue Apr 6 14:35:09 2010 -0700 frv: fix kernel/user segment handling in NOMMU mode In NOMMU mode, the FRV segment handling is broken because KERNEL_DS == USER_DS. This causes tests of the following sort: /* don't pin down non-user-based iovecs */ if (segment_eq(get_fs(), KERNEL_DS)) return NULL; to malfunction. To fix this, make USER_DS the top of RAM instead of the top of the non-IO address space, and make KERNEL_DS one more than the top of the non-IO address space. Also get rid of FRV's __addr_ok() as nothing uses it. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea56f411ec2d4d8689eb7f3bcd24e860acf87c47 Author: David Howells Date: Tue Apr 6 14:35:08 2010 -0700 frv: hide uncached_access() when pgprot_noncached is not #defined Hide uncached_access() when pgprot_noncached is not #defined. This prevents the following warning: CC drivers/char/mem.o drivers/char/mem.c:229: warning: 'uncached_access' defined but not used Repairs d7d4d849b4e3acc405ec222884936800ffb26d48 ("drivers/char/mem.c: cleanups"). Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c783a29efcbc90a90ccfec8956c7ff0854301c34 Author: Vladimir Zapolskiy Date: Tue Apr 6 14:35:07 2010 -0700 rtc-mxc: multiple fixes in rtc-mxc probe method On exit paths in mxc_rtc_probe() method some resources are not freed correctly. This patch fixes: * unrequested memory region containing imx RTC registers * iounmap() isn't called on exit_free_pdata branch * clock get rate is called for freed clock source * clock isn't disabled on exit_put_clk branch To simplify the fix managed device resources are used. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Vladimir Zapolskiy Cc: Alessandro Zummo Cc: Daniel Mack Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8725d5416213a145ccc9c236dbd26830ba409e00 Author: KAMEZAWA Hiroyuki Date: Tue Apr 6 14:35:05 2010 -0700 memcg: fix race in file_mapped accounting Presently, memcg's FILE_MAPPED accounting has following race with move_account (happens at rmdir()). increment page->mapcount (rmap.c) mem_cgroup_update_file_mapped() move_account() lock_page_cgroup() check page_mapped() if page_mapped(page)>1 { FILE_MAPPED -1 from old memcg FILE_MAPPED +1 to old memcg } ..... overwrite pc->mem_cgroup unlock_page_cgroup() lock_page_cgroup() FILE_MAPPED + 1 to pc->mem_cgroup unlock_page_cgroup() Then, old memcg (-1 file mapped) new memcg (+2 file mapped) This happens because move_account see page_mapped() which is not guarded by lock_page_cgroup(). This patch adds FILE_MAPPED flag to page_cgroup and move account information based on it. Now, all checks are synchronous with lock_page_cgroup(). Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Balbir Singh Reviewed-by: Daisuke Nishimura Cc: Andrea Righi Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 116354d177ba2da37e91cf884e3d11e67f825efd Author: Naoya Horiguchi Date: Tue Apr 6 14:35:04 2010 -0700 pagemap: fix pfn calculation for hugepage When we look into pagemap using page-types with option -p, the value of pfn for hugepages looks wrong (see below.) This is because pte was evaluated only once for one vma although it should be updated for each hugepage. This patch fixes it. $ page-types -p 3277 -Nl -b huge voffset offset len flags 7f21e8a00 11e400 1 ___U___________H_G________________ 7f21e8a01 11e401 1ff ________________TG________________ ^^^ 7f21e8c00 11e400 1 ___U___________H_G________________ 7f21e8c01 11e401 1ff ________________TG________________ ^^^ One hugepage contains 1 head page and 511 tail pages in x86_64 and each two lines represent each hugepage. Voffset and offset mean virtual address and physical address in the page unit, respectively. The different hugepages should not have the same offset value. With this patch applied: $ page-types -p 3386 -Nl -b huge voffset offset len flags 7fec7a600 112c00 1 ___UD__________H_G________________ 7fec7a601 112c01 1ff ________________TG________________ ^^^ 7fec7a800 113200 1 ___UD__________H_G________________ 7fec7a801 113201 1ff ________________TG________________ ^^^ OK More info: - This patch modifies walk_page_range()'s hugepage walker. But the change only affects pagemap_read(), which is the only caller of hugepage callback. - Without this patch, hugetlb_entry() callback is called per vma, that doesn't match the natural expectation from its name. - With this patch, hugetlb_entry() is called per hugepte entry and the callback can become much simpler. Signed-off-by: Naoya Horiguchi Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57119c34e53bbb8d244c3ff1335ef5145768538f Author: Yong Zhang Date: Tue Apr 6 14:35:03 2010 -0700 ratelimit: fix the return value when __ratelimit() fails to acquire the lock The log of commit edaac8e3167501cda336231d00611bf59c164346 ("ratelimit: Fix/allow use in atomic contexts"), indicates that we want to suppress the callback when the trylock fails. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Christian Borntraeger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb1dc0bacb8ddd7ba6a5906c678a5a5a110cf695 Author: Yong Zhang Date: Tue Apr 6 14:35:02 2010 -0700 kernel.h: fix wrong usage of __ratelimit() When __ratelimit() returns 1 this means that we can go ahead. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7268abc48c8009b284bd88605d14fcb65772ec Author: Yong Zhang Date: Tue Apr 6 14:35:01 2010 -0700 ratelimit: annotate ___ratelimit() To prevent from wrongly using the return value. [akpm@linux-foundation.org: fix spello] Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee5d2acd5ca1534f40e06d4f0d41a940b17beb54 Author: Eric Dumazet Date: Tue Apr 6 14:35:01 2010 -0700 /dev/mem: allow rewinding commit dcefafb6 ("/dev/mem: dont allow seek to last page") inadvertently disabled rewinding on /dev/mem. This broke x86info for example. Signed-off-by: Eric Dumazet Acked-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1dd3b2843b3b73b7fc2ee47d96310cd1c051371 Author: Andrew Morton Date: Tue Apr 6 14:35:00 2010 -0700 vfs: rename block_fsync() to blkdev_fsync() Requested by hch, for consistency now it is exported. Cc: Alexander Viro Cc: Anton Blanchard Cc: Christoph Hellwig Cc: Jan Kara Cc: Jeff Moyer Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55ab3a1ff843e3f0e24d2da44e71bffa5d853010 Author: Anton Blanchard Date: Tue Apr 6 14:34:58 2010 -0700 raw: fsync method is now required Commit 148f948ba877f4d3cdef036b1ff6d9f68986706a (vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode) broke the raw driver. We now call through generic_file_aio_write -> generic_write_sync -> vfs_fsync_range. vfs_fsync_range has: if (!fop || !fop->fsync) { ret = -EINVAL; goto out; } But drivers/char/raw.c doesn't set an fsync method. We have two options: fix it or remove the raw driver completely. I'm happy to do either, the fact this has been broken for so long suggests it is rarely used. The patch below adds an fsync method to the raw driver. My knowledge of the block layer is pretty sketchy so this could do with a once over. If we instead decide to remove the raw driver, this patch might still be useful as a backport to 2.6.33 and 2.6.32. Signed-off-by: Anton Blanchard Reviewed-by: Jan Kara Cc: Christoph Hellwig Cc: Alexander Viro Cc: Jens Axboe Reviewed-by: Jeff Moyer Tested-by: Jeff Moyer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da258016293f5e82b36db67ac3db3931a4fbbc4d Author: Alexander Shishkin Date: Tue Apr 6 14:34:57 2010 -0700 mb862xxfb: update Valentin's email address Since Valentin's email address @siemens.com is no longer valid, it's time to change it to the one that actually works so that I don't have to manually forward patches against mb862xx to him every time. Signed-off-by: Alexander Shishkin Acked-by: Valentin Sitdikov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a71dc148c2674bbb5988ea924702137993b3305a Author: Randy Dunlap Date: Tue Apr 6 14:34:57 2010 -0700 mb862xxfb: fix acceleration module license mb862xxfb_accel built as a separate module, but it does not have a MODULE_LICENSE, so it taints the kernel. Add a MODULE_LICENSE to it (same as mb862xxfb license). mb862xxfb_accel: module license 'unspecified' taints kernel. Or should mb862xxfb_accel be built into the mb862xxfb binary file instead? Signed-off-by: Randy Dunlap Acked-by: Alexander Shishkin Cc: Valentin Sitdikov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6da1a5abc2bf3a06a5bda08e0f6833409234666 Author: KOSAKI Motohiro Date: Tue Apr 6 14:34:56 2010 -0700 mm: revert "vmscan: get_scan_ratio() cleanup" Shaohua Li reported his tmpfs streaming I/O test can lead to make oom. The test uses a 6G tmpfs in a system with 3G memory. In the tmpfs, there are 6 copies of kernel source and the test does kbuild for each copy. His investigation shows the test has a lot of rotated anon pages and quite few file pages, so get_scan_ratio calculates percent[0] (i.e. scanning percent for anon) to be zero. Actually the percent[0] shoule be a big value, but our calculation round it to zero. Although before commit 84b18490 ("vmscan: get_scan_ratio() cleanup") , we have the same problem too. But the old logic can rescue percent[0]==0 case only when priority==0. It had hided the real issue. I didn't think merely streaming io can makes percent[0]==0 && priority==0 situation. but I was wrong. So, definitely we have to fix such tmpfs streaming io issue. but anyway I revert the regression commit at first. This reverts commit 84b18490d1f1bc7ed5095c929f78bc002eb70f26. Signed-off-by: KOSAKI Motohiro Reported-by: Shaohua Li Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e191f7bb083544dc4fa3879ff81caf97c65d197 Author: Anton Blanchard Date: Tue Apr 6 14:34:55 2010 -0700 devmem: handle class_create() failure I hit this when we had a bug in IDR for a few days. Basically sysfs would fail to create new inodes since it uses an IDR and therefore class_create would fail. While we are unlikely to see this fail we may as well handle it instead of oopsing. Signed-off-by: Anton Blanchard Reviewed-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70655c06bd3f25111312d63985888112aed15ac5 Author: Wu Fengguang Date: Tue Apr 6 14:34:53 2010 -0700 readahead: fix NULL filp dereference btrfs relocate_file_extent_cluster() calls us with NULL filp: [ 4005.426805] BUG: unable to handle kernel NULL pointer dereference at 00000021 [ 4005.426818] IP: [] page_cache_sync_readahead+0x18/0x3e Signed-off-by: Wu Fengguang Cc: Yan Zheng Reported-by: Kirill A. Shutemov Tested-by: Kirill A. Shutemov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12765517d9dbb477a2432375938f1eb5bdbcb532 Author: Wolfram Sang Date: Tue Apr 6 14:34:52 2010 -0700 device_attributes: add sysfs_attr_init() for dynamic attributes Made necessary by 6992f5334995af474c2b58d010d08bc597f0f2fe ("sysfs: Use one lockdep class per sysfs attribute"). Prevents further "key xxx not in .data" bug-reports. Although some attributes could probably be converted to static ones, this is left for people having hardware to test. Found by this semantic patch: @ init @ type T; identifier A; @@ T { ... struct device_attribute A; ... }; @ main extends init @ expression E; statement S; identifier err; T *name; @@ ... when != sysfs_attr_init(&name->A.attr); ( + sysfs_attr_init(&name->A.attr); if (device_create_file(E, &name->A)) S | + sysfs_attr_init(&name->A.attr); err = device_create_file(E, &name->A); ) While reviewing, I put the initialization to apropriate places. Signed-off-by: Wolfram Sang Cc: Eric W. Biederman Cc: Greg KH Cc: Benjamin Herrenschmidt Cc: Grant Likely Cc: Mike Isely Cc: Mauro Carvalho Chehab Cc: Sujith Thomas Cc: Matthew Garrett Cc: Len Brown Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 975f8c5653acba461229e671202113da69b87be1 Author: Sergey Senozhatsky Date: Tue Apr 6 14:34:51 2010 -0700 drivers/thermal/thermal_sys.c: fix 'key f70f4b50 not in .data' in thermal_sys Initialize sysfs attributes before device_create_file call. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15548 Signed-off-by: Wolfram Sang Signed-off-by: Sergey Senozhatsky Cc: "Eric W. Biederman" Cc: Greg KH Cc: Zhang Rui Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829f46af39d50a43e260adaa9e7bbdff74a9f696 Author: Dan Carpenter Date: Tue Apr 6 14:34:50 2010 -0700 cciss: unlock on error path We take the spin_lock again in fail_all_cmds() so we need to unlock here. Signed-off-by: Dan Carpenter Acked-by: Steve Cameron Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6eb69acfdfe258b4a3f69fa5ced8928bbebdba9 Author: Dan Carpenter Date: Tue Apr 6 14:34:50 2010 -0700 mxser: spin_lock() => spin_lock_irq() This should be spin_lock_irq() to match the spin_unlock_irq(). Originally it was a lock_kernel() but we switched everything to spin_lock_irq() last November. [akpm@linux-foundation.org: fix the MOXA_ASPP_MON case too (per Jiri)] Signed-off-by: Dan Carpenter Cc: Jiri Slaby Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdeebaddb7f97298c73df4d43d31e164fc8aa0e4 Author: Madhusudhan Chikkature Date: Tue Apr 6 14:34:49 2010 -0700 omap hsmmc: fix a bug in card remove scenario The reset of data lines when the card is removed from the cage results in a failure.The failure is seen if the card is removed from the cage when TC is pending after a CMD with data received CC.The reset logic leaves the controller in a state where niether a TC is received nor DTO. The rest code can be safely removed here since it is taken care in the IRQ handler. Signed-off-by: Madhusudhan Chikkature Cc: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a481800caf78f4750cc673c8baed12b5d703ff6 Author: Julia Lawall Date: Tue Apr 6 14:34:48 2010 -0700 drivers/gpio/timbgpio.c: add missing unlock In an error handling case the lock is not unlocked. The return is converted to a goto, to share the unlock at the end of the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irqsave (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c70c036f04b7b74282477d6a51bbcc8bb8897e03 Author: Julia Lawall Date: Tue Apr 6 14:34:46 2010 -0700 drivers/char/amiserial.c: add missing local_irq_restore rs_init() is failing to restore interrupts on two error paths, and is incorrectly calling tty_unregister_driver() with local interrupts disabled. Fix these things by disabling interrupts later, after the reauest_irq() calls. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * local_irq_save (E1,...); ... when != E1 * return ...; ...+> } // [akpm@linux-foundation.org: reimplement the fix] Signed-off-by: Julia Lawall Cc: Thadeu Lima de Souza Cascardo Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8557dc71949e80c298ec298b902ac6ebbc5d9dd Author: Justin P. Mattock Date: Tue Apr 6 14:34:45 2010 -0700 fbdev: rename imacfb.txt to efifb.txt and change imacfb to efifb. Rename imacfb.txt to efifb.txt since imacfb was moved to efifb,and change imacfb to efifb. Signed-off-by: Justin P. Mattock Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc95c6d9b4433525ed9484089b6e092f3516a92b Author: Jan Beulich Date: Tue Apr 6 14:34:44 2010 -0700 vesafb: use platform_driver_probe() instead of platform_driver_register() Commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b ("platform-drivers: move probe to .devinit.text in drivers/video") introduced a huge amount of section mismatch warnings in vesafb code. Rather than converting all of the annotations, do the obvious and revert the __init -> __devinit change, and use the recommended (in that patch) alternative to calling platform_driver_register(): vesafb depends on information obtained from by kernel at boot time, cannot be a module, and no post-boot devices can ever show up. Signed-off-by: Jan Beulich Cc: Greg KH Acked-by: Uwe Kleine-König Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 530cd330dc3865e3107304a6e84fdc332aa72f7d Author: David Härdeman Date: Tue Apr 6 14:34:43 2010 -0700 include/linux/kfifo.h: fix INIT_KFIFO() DECLARE_KFIFO creates a union with a struct kfifo and a buffer array with size [size + sizeof(struct kfifo)]. INIT_KFIFO then sets the buffer pointer in struct kfifo to point to the beginning of the buffer array which means that the first call to kfifo_in will overwrite members of the struct kfifo. Signed-off-by: David Härdeman Acked-by: Stefani Seibold Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3a2e76c77fa22b114e421ac11dec0c56c3503fb Author: KAMEZAWA Hiroyuki Date: Tue Apr 6 14:34:42 2010 -0700 mm: avoid null-pointer deref in sync_mm_rss() - We weren't zeroing p->rss_stat[] at fork() - Consequently sync_mm_rss() was dereferencing tsk->mm for kernel threads and was oopsing. - Make __sync_task_rss_stat() static, too. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15648 [akpm@linux-foundation.org: remove the BUG_ON(!mm->rss)] Reported-by: Troels Liebe Bentsen Signed-off-by: KAMEZAWA Hiroyuki "Michael S. Tsirkin" Cc: Andrea Arcangeli Cc: Rik van Riel Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b01d0942c2b7a3026d2b7d38b5773d3d00420e06 Author: Andrew Morton Date: Tue Apr 6 14:34:41 2010 -0700 bitops: remove temporary for_each_bit() Migration has been completed so remove this now. There's one straggler in linux-next's drivers/mtd/sm_ftl.c. A patch has been sent. Cc: Akinobu Mita Cc: Stephen Rothwell Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 179b284e2fc0c638035843968f7d7ab8ab701525 Author: Jeff Dike Date: Wed Apr 7 09:59:10 2010 -0400 vhost-net: fix vq_memory_access_ok error checking vq_memory_access_ok needs to check whether mem == NULL Signed-off-by: Jeff Dike Signed-off-by: Michael S. Tsirkin commit af2b021fd6dc3e145d20f5eb927af9590c80bc44 Author: Michal Simek Date: Wed Apr 7 11:44:00 2010 +0200 microblaze: Remove unused variable from ptrace Patch b3c1e01a09d6af2dd7811a066ffcfc5171be2bed should do it. Signed-off-by: Michal Simek commit 7a325aa26cf8eb367b5d8b675a9425bef18d351a Author: John Linn Date: Wed Apr 7 11:03:15 2010 +0200 microblaze: io.h: Add io big-endian function Add new io big-endian function. They will be used for uartlite and spi driver. Signed-off-by: John Linn Signed-off-by: Michal Simek commit 7ad7b218f4aae4f395b3b4cef261572556bbd20a Author: Maurus Cuelenaere Date: Tue Apr 6 18:12:52 2010 +0200 ALSA: hda: Add support for Medion WIM2160 This adds support for the Medion WIM2160 soundcard. There's no PCI quirk added because it has the same PCI id as the Medion MD2. Signed-off-by: Maurus Cuelenaere Signed-off-by: Takashi Iwai commit 4b83873d3da0704987cb116833818ed96214ee29 Author: Joerg Roedel Date: Wed Apr 7 12:57:35 2010 +0200 x86/gart: Disable GART explicitly before initialization If we boot into a crash-kernel the gart might still be enabled and its caches might be dirty. This can result in undefined behavior later. Fix it by explicitly disabling the gart hardware before initialization and flushing the caches after enablement. Signed-off-by: Joerg Roedel commit 39a37ce1cc5eef420604fa68b776ff5dab400340 Author: Dan Carpenter Date: Tue Apr 6 19:45:12 2010 +0300 dma-debug: Cleanup for copy-loop in filter_write() Earlier in this function we set the last byte of "buf" to NULL so we always hit the break statement and "i" is never equal to NAME_MAX_LEN. This patch doesn't change how the driver works but it silences a Smatch warning and it makes it clearer that we don't write past the end of the array. Signed-off-by: Dan Carpenter Signed-off-by: Joerg Roedel commit 12ff4bf58b64ad3b8fb8e27889c99dcd5aa6fb0b Merge: 2eaa9cf 20a1cfb Author: Joerg Roedel Date: Wed Apr 7 14:36:20 2010 +0200 Merge branch 'amd-iommu/fixes' into iommu/fixes commit 20a1cfba340f23a7ca62391e199c40c86b762ea3 Author: Joerg Roedel Date: Wed Apr 7 14:28:26 2010 +0200 x86/amd-iommu: Remove obsolete parameter documentation Support for the share and fullflush parameters was removed. Remove the documentation about them too. Signed-off-by: Joerg Roedel commit c0858552c088616c18879c347d9e0daa98cf2b15 Author: Jiri Kosina Date: Wed Apr 7 12:10:29 2010 +0200 HID: ntrig: explain firmware quirk Commit 6549981bc54777c ("HID: fix N-trig touch panel with recent firmware") adds a quirk that is needed for devices with more recent firmware so that they become operational. As it's not directly obvious from the code why is it needed, a comment is worthwile. Signed-off-by: Jiri Kosina commit d18c69d3898985c66cd6e878b8f576fd9a21ab39 Author: Chris Wright Date: Fri Apr 2 18:27:55 2010 -0700 x86/amd-iommu: use for_each_pci_dev Replace open coded version with for_each_pci_dev Signed-off-by: Chris Wright Signed-off-by: Joerg Roedel commit 8f9f55e83e939724490d7cde3833c4883c6d1310 Author: Chris Wright Date: Fri Apr 2 18:27:54 2010 -0700 Revert "x86: disable IOMMUs on kernel crash" This effectively reverts commit 61d047be99757fd9b0af900d7abce9a13a337488. Disabling the IOMMU can potetially allow DMA transactions to complete without being translated. Leave it enabled, and allow crash kernel to do the IOMMU reinitialization properly. Cc: stable@kernel.org Cc: Joerg Roedel Cc: Eric Biederman Cc: Neil Horman Cc: Vivek Goyal Signed-off-by: Chris Wright Signed-off-by: Joerg Roedel commit 549c90dc9a6d659e792b2a42a0930c7da015ea4a Author: Chris Wright Date: Fri Apr 2 18:27:53 2010 -0700 x86/amd-iommu: warn when issuing command to uninitialized cmd buffer To catch future potential issues we can add a warning whenever we issue a command before the command buffer is fully initialized. Signed-off-by: Chris Wright Signed-off-by: Joerg Roedel commit 75f66533bc883f761a7adcab3281fe3323efbc90 Author: Chris Wright Date: Fri Apr 2 18:27:52 2010 -0700 x86/amd-iommu: enable iommu before attaching devices Hit another kdump problem as reported by Neil Horman. When initializaing the IOMMU, we attach devices to their domains before the IOMMU is fully (re)initialized. Attaching a device will issue some important invalidations. In the context of the newly kexec'd kdump kernel, the IOMMU may have stale cached data from the original kernel. Because we do the attach too early, the invalidation commands are placed in the new command buffer before the IOMMU is updated w/ that buffer. This leaves the stale entries in the kdump context and can renders device unusable. Simply enable the IOMMU before we do the attach. Cc: stable@kernel.org Cc: Neil Horman Cc: Vivek Goyal Signed-off-by: Chris Wright Signed-off-by: Joerg Roedel commit 55b371d4ac5ed6f3338a398fbf9f2eb9ace78799 Merge: 7445c99 f9700d5 Author: Takashi Iwai Date: Wed Apr 7 09:54:46 2010 +0200 Merge branch 'fix/hda' into for-linus commit 7445c995b06f2a999541ccf127886d24a2a7d012 Merge: 1172234 5f712b2 Author: Takashi Iwai Date: Wed Apr 7 09:54:41 2010 +0200 Merge branch 'fix/asoc' into for-linus commit 1172234cbe94658c16bc83e50ca57b5a47085209 Merge: 85255c0 b0cc58a Author: Takashi Iwai Date: Wed Apr 7 09:54:33 2010 +0200 Merge branch 'fix/misc' into for-linus commit 47c4c864af60d14926f4017d23968a8341b8ab9f Author: Michal Simek Date: Tue Apr 6 10:19:30 2010 +0200 microblaze: Enable memory leak detector Enable DEBUG_KMEMLEAK for microblaze Signed-off-by: Michal Simek commit 4bb30baa6d5e7660c06e3b50d8a8a76d402c7170 Author: Michal Simek Date: Tue Apr 6 18:51:37 2010 +0200 microblaze: Fix futex code Use logical and NOT for ANDN. It was likely type fault. Signed-off-by: Michal Simek commit d2bf98e6fc2612cbd2fc40f75a1e2c5d60262331 Author: Steven J. Magnani Date: Fri Apr 2 13:29:39 2010 -0500 microblaze: Fix ftrace_update_ftrace_func panic The Microblaze dynamic ftrace code assumes a call ordering that is not met in all scenarios. Specifically, executing a command similar to: echo 105 > /sys/kernel/debug/tracing/set_ftrace_pid before any other tracing-related commands results in a kernel panic: BUG: failure at arch/microblaze/kernel/ftrace.c:198/ftrace_update_ftrace_func()! Recoding ftrace_update_ftrace_func() to use &ftrace_caller directly eliminates the need to capture its address elsewhere (and thus rely on a particular call sequence). Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit 3a89b4a9ca7ce11e3b7d5119aea917b9fc29a302 Author: Alex Deucher Date: Tue Apr 6 12:35:26 2010 -0400 drm/radeon/kms/combios: verify dac_adj values are valid Some vbios dac_adj tables are all zeros. Check for that case and use the default table if so. Should fix fdo bug 27478. Signed-off-by: Alex Deucher Cc: stable Signed-off-by: Dave Airlie commit affd858907aae7bf7d7d7fa02ff19f35de2ff1d8 Author: Alex Deucher Date: Tue Apr 6 01:22:41 2010 -0400 drm/radeon/kms: clean up atom dac handling - make sure legacy dac1 has an enc priv - remove unused num var - no need for extra tv_dac var in atom dac functions Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7741618766417e77f49013400d3672d65578928a Author: Alex Deucher Date: Tue Apr 6 00:05:46 2010 -0400 drm/radeon/kms: legacy tv dac cleanup - fix formatting - clean up tv_dac_cntl handling for tv Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 01a356fd2a5f5e72e783312037ace05df4ab4e32 Author: Dan Carpenter Date: Tue Apr 6 10:55:33 2010 +0000 drm/radeon/kms: small memory leak in atom exit code This is an unlikely memory leak, but we may as well fix it. It's easy to fix and every static checker will complain if we don't. Signed-off-by: Dan Carpenter Reviewed-by: Matt Turner Signed-off-by: Dave Airlie commit ba1163de2f74d624e7b0e530c4104c98ede0045a Author: Adam Jackson Date: Tue Apr 6 16:11:00 2010 +0000 drm/edid/quirks: Envision EN2028 Claims 1280x1024 preferred, physically 1600x1200 cf. http://bugzilla.redhat.com/530399 Signed-off-by: Adam Jackson Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 720fc22a7af79d91ec460c80efa92c65c12d105e Author: Mikulas Patocka Date: Tue Apr 6 16:43:33 2010 -0700 ide: Fix IDE taskfile with cfq scheduler When ide taskfile access is being used (for example with hdparm --security commands) and cfq scheduler is selected, the scheduler crashes on BUG in cfq_put_request. The reason is that the cfq scheduler is tracking counts of read and write requests separately; the ide-taskfile subsystem allocates a read request and then flips the flag to make it a write request. The counters in cfq will mismatch. This patch changes ide-taskfile to allocate the READ or WRITE request as required and don't change the flag later. Signed-off-by: Mikulas Patocka Signed-off-by: David S. Miller commit 18e5b539b451158be7aae6c390a20f0d3e5b9213 Author: Tejun Heo Date: Tue Apr 6 19:23:33 2010 +0900 nodemask: include slab.h from drivers/base/node.c NODEMASK_ALLOC/FREE are mapped to kmalloc/free if NODES_SHIFT > 8. Among its several users, drivers/base/node.c wasn't including slab.h leading to build failure if NODES_SHIFT > 8. Include slab.h from drivers/base/node.c. This isn't an ideal solution but including slab.h directly from nodemask.h is not an option because nodemask.h gets included everywhere. For now, make it work by including slab.h from its users. Signed-off-by: Tejun Heo Reported-by: Ingo Molnar commit 6549981bc54777c37eccf987e227aff47022ab7c Author: Stephane Chatty Date: Tue Apr 6 22:22:58 2010 +0200 HID: fix N-trig touch panel with recent firmware Added an init message that avoids device freeze with recent firmware. Signed-off-by: Stephane Chatty Tested-by: Rafi Rubin Signed-off-by: Jiri Kosina commit c25f7cf2032aaac9bd50d6eee982719878538082 Merge: f79e1ce dadf28a ac7729d 3162b6f bc73675 b7b30de bf02bd2 1638bca 0f9b75e 17c452f Author: Len Brown Date: Tue Apr 6 17:06:22 2010 -0400 Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release commit ac7729da880e742613129ee6dea0045328670d2d Author: Rafael J. Wysocki Date: Mon Apr 5 01:43:51 2010 +0200 ACPI / PM: Move ACPI video resume to a PM notifier There is a problem with the ACPI video resume routine that it's executed before the GPU that may be accessed by it. To fix this issue, move the ACPI video resume to a power management notifier, so that's executed after resuming all devices, including the GPU. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15096, which is a listed regression from 2.6.31. Signed-off-by: Rafael J. Wysocki Tested-by: Rafał Miłecki Acked-by: Matthew Garrett Signed-off-by: Len Brown commit 0fdf86754f70e813845af4abaa805165ce57a0bb Merge: 94c4fce 147a274 Author: Linus Torvalds Date: Tue Apr 6 13:03:52 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix up alignf issues commit 94c4fcec0144e032ef7d4ec761ab81d570b0bc2a Merge: 14e71e4 753649d Author: Linus Torvalds Date: Tue Apr 6 13:03:22 2010 -0700 Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Force MSI irq handlers to run with interrupts disabled commit 1144601118507f8b3b676a9a392584d216d3f2cc Author: Felix Fietkau Date: Tue Apr 6 12:05:01 2010 -0700 ath9k: fix double calls to ath_radio_enable With the enable_radio being uninitialized, ath_radio_enable() might be called twice, which can leave some hardware in an undefined state. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 0379185b6c0d1e8252023698cf1091da92a3dc03 Author: Johannes Berg Date: Tue Apr 6 11:18:42 2010 +0200 mac80211: annotate station rcu dereferences The new RCU lockdep support warns about these in some contexts -- make it aware of the locks used to protect all this. Different locks are used in different contexts which unfortunately means we can't get perfect checking. Also remove rcu_dereference() from two places that don't actually dereference the pointers. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1cb561f83793191cf86a2db3948d28f5f42df9ff Author: Javier Cardona Date: Mon Mar 29 11:00:20 2010 -0700 mac80211: Handle mesh action frames in ieee80211_rx_h_action This fixes the problem introduced in commit 8404080568613d93ad7cf0a16dfb68 which broke mesh peer link establishment. changes: v2 Added missing break (Johannes) v3 Broke original patch into two (Johannes) Signed-off-by: Javier Cardona Cc: stable@kernel.org Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit f05337c6ac48d19d354e0640a8eb8fc884f82bcc Author: Pavel Shilovsky Date: Mon Apr 5 09:59:14 2010 +0400 not overwriting file_lock structure after GET_LK If we have preventing lock, cifs should overwrite file_lock structure with info about preventing lock. If we haven't preventing lock, cifs should leave it unchanged except for the lock type (change it to F_UNLCK). Signed-off-by: Pavel Shilovsky Reviewed-by: Jeff Layton Signed-off-by: Steve French commit 14e71e4fb94c340273534a6d7f210aa82a3ca717 Merge: ab195c5 8ba42bd Author: Linus Torvalds Date: Tue Apr 6 09:56:40 2010 -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] hpwdt - fix lower timeout limit [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl. [WATCHDOG] doc: watchdog simple example: don't fail on fsync() [WATCHDOG] set max63xx driver as ARM only [WATCHDOG] powerpc: pika_wdt ident cannot be const commit b0cc58a25d04160d39a80e436847eaa2fbc5aa09 Author: Dan Carpenter Date: Tue Apr 6 19:31:26 2010 +0300 ALSA: mixart: range checking proc file The original code doesn't take into consideration that the value of MIXART_BA0_SIZE - pos can be less than zero which would lead to a large unsigned value for "count". Also I moved the check that read size is a multiple of 4 bytes below the code that adjusts "count". Signed-off-by: Dan Carpenter Cc: Acked-by: Linus Torvalds Signed-off-by: Takashi Iwai commit 134fbadf028a5977a1b06b0253d3ee33e6f0c642 Author: Vince Weaver Date: Tue Apr 6 10:01:19 2010 -0400 perf, x86: Enable Nehalem-EX support According to Intel Software Devel Manual Volume 3B, the Nehalem-EX PMU is just like regular Nehalem (except for the uncore support, which is completely different). Signed-off-by: Vince Weaver Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: "H. Peter Anvin" Cc: Arjan van de Ven Cc: Lin Ming LKML-Reference: Signed-off-by: Ingo Molnar commit 8c40041f75a202ed6a3b38143b823cb80f6d6b7c Author: Arnaldo Carvalho de Melo Date: Tue Apr 6 10:37:33 2010 -0300 perf kmem: Fix breakage introduced by 5a0e3ad slab.h script Commit 5a0e3ad ("include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h") added a '#include ' to tools/perf/builtin-kmem.h because: that tool has lines like this: if (!strcmp(event->name, "kmalloc") || !strcmp(event->name, "kmem_cache_alloc")) { process_alloc_event(data, event, cpu, timestamp, thread, 0); return; } So, using the script regex: >>> import re >>> s = re.compile(r'^(|.*[^a-zA-Z0-9_])_*(slab_is_available|kmem_cache_|k[mzc]alloc|krealloc|kz?free|ksize|__getname|putname)') >>> l = ' !strcmp(event->name, "kmem_cache_alloc")) {' >>> s.search(l) <_sre.SRE_Match object at 0xb77b1ad0> >>> Remove that file that is not available in the tools/perf include path and thus builtin-kmem.c couldn't be compiled. Reported-by: Peter Zijlstra Cc: Christoph Lameter Cc: Frédéric Weisbecker Cc: Lee Schermerhorn Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Tejun Heo Cc: Linus Torvalds LKML-Reference: <1270561053-14308-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ab195c58b864802c15e494f06ae109413e12d50b Merge: cb4361c 445d211 Author: Linus Torvalds Date: Tue Apr 6 08:36:31 2010 -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: libata: unlock HPA if device shrunk libata: disable NCQ on Crucial C300 SSD libata: don't whine on spurious IRQ commit cb4361c1dc29cd870f664c004b1817106fbce0fa Merge: 309361e fb9e2d8 Author: Linus Torvalds Date: Tue Apr 6 08:34:06 2010 -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: (37 commits) smc91c92_cs: fix the problem of "Unable to find hardware address" r8169: clean up my printk uglyness net: Hook up cxgb4 to Kconfig and Makefile cxgb4: Add main driver file and driver Makefile cxgb4: Add remaining driver headers and L2T management cxgb4: Add packet queues and packet DMA code cxgb4: Add HW and FW support code cxgb4: Add register, message, and FW definitions netlabel: Fix several rcu_dereference() calls used without RCU read locks bonding: fix potential deadlock in bond_uninit() net: check the length of the socket address passed to connect(2) stmmac: add documentation for the driver. stmmac: fix kconfig for crc32 build error be2net: fix bug in vlan rx path for big endian architecture be2net: fix flashing on big endian architectures be2net: fix a bug in flashing the redboot section bonding: bond_xmit_roundrobin() fix drivers/net: Add missing unlock net: gianfar - align BD ring size console messages net: gianfar - initialize per-queue statistics ... commit 309361e09ca9e9670dc8664e5d14125bf82078af Author: Dan Carpenter Date: Tue Apr 6 13:45:39 2010 +0300 proc: copy_to_user() returns unsigned copy_to_user() returns the number of bytes left to be copied. This was a typo from: d82ef020cf31 "proc: pagemap: Hold mmap_sem during page walk". Signed-off-by: Dan Carpenter Acked-by: Matt Mackall Signed-off-by: Linus Torvalds commit 445d211b0da4e9a6e6d576edff85085c2aaf53df Author: Tejun Heo Date: Mon Apr 5 10:33:13 2010 +0900 libata: unlock HPA if device shrunk Some BIOSes don't configure HPA during boot but do so while resuming. This causes harddrives to shrink during resume making libata detach and reattach them. This can be worked around by unlocking HPA if old size equals native size. Add ATA_DFLAG_UNLOCK_HPA so that HPA unlocking can be controlled per-device and update ata_dev_revalidate() such that it sets ATA_DFLAG_UNLOCK_HPA and fails with -EIO when the above condition is detected. This patch fixes the following bug. https://bugzilla.kernel.org/show_bug.cgi?id=15396 Signed-off-by: Tejun Heo Reported-by: Oleksandr Yermolenko Signed-off-by: Jeff Garzik commit 68b0ddb289220b6d4d865be128939663be34959d Author: Tejun Heo Date: Mon Apr 5 10:51:26 2010 +0900 libata: disable NCQ on Crucial C300 SSD Crucial said, Thank you for contacting us. We know that with our M225 line of SSDs you sometimes need to disable NCQ (native command queuing) to avoid just the type of errors you're seeing. Our recommendation for the M225 is to add libata.force=noncq to your Linux kernel boot options, under the kernel ATA library option. I have sent your feedback to the engineers working on the C300, and asked them to please pass it on to the firmware team. I have been notified that they are in the process of testing and finalizing a new firmware version, that you can expect to see released around the end of April. We’ll keep you posted as to when it will be available for download. So, turn off NCQ on the drive w/ the current firmware revision. Reported in the following bug. https://bugzilla.kernel.org/show_bug.cgi?id=15573 Signed-off-by: Tejun Heo Reported-by: lethalwp@scarlet.be Reported-by: Luke Macken Signed-off-by: Jeff Garzik commit c710f785329aa751e6cf3b901c1cef167ea0648d Author: Tejun Heo Date: Wed Mar 31 16:41:18 2010 +0900 libata: don't whine on spurious IRQ On configurations where IRQ line is shared with a different controller, spurious IRQs may happen continuously. The message was put there primarily for debugging anyway. Kill it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8ba42bd88c6982fe224b09c33151c797b0fdf1a5 Author: Thomas Mingarelli Date: Wed Mar 17 15:33:31 2010 +0000 [WATCHDOG] hpwdt - fix lower timeout limit [Novell Bug 581103] HP Watchdog driver has arbitrary (wrong) timeout limits. Fix the lower timeout limit to a more appropriate value. Signed-off-by: Thomas Mingarelli Signed-off-by: Wim Van Sebroeck Cc: stable commit 4c7d849204341dea19be941a3c1eb4bdffac9cc4 Author: Seth Heasley Date: Thu Mar 25 16:14:41 2010 -0700 [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs This patch adds the Intel Cougar Point PCH LPC Controller DeviceIDs for iTCO Watchdog. Signed-off-by: Seth Heasley Signed-off-by: Wim Van Sebroeck Cc: stable commit dfc333834cb86805485920dc77ee0f2fbb484462 Author: James Hogan Date: Mon Apr 5 11:31:29 2010 +0100 [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl. In the watchdog-test program and watchdog-api.txt, pass the values to the WDIOC_SETOPTIONS ioctl as a pointer to an integer containing the values intead of directly in the third ioctl argument. The actual watchdog drivers in drivers/watchdog don't read the options directly from the argument but use get_user and copy_from_user. Signed-off-by: James Hogan Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 9f680ce04ea19dabbbafe01b57b61930a9b70741 Author: Chris Mason Date: Tue Apr 6 09:37:47 2010 -0400 Btrfs: make sure the chunk allocator doesn't create zero length chunks A recent commit allowed for smaller chunks to be created, but didn't make sure they were always bigger than a stripe. After some divides, this led to zero length stripes. Signed-off-by: Chris Mason commit 84fba5ec91f11c0efb27d0ed6098f7447491f0df Author: Anton Blanchard Date: Tue Apr 6 17:02:19 2010 +1000 sched: Fix sched_getaffinity() taskset on 2.6.34-rc3 fails on one of my ppc64 test boxes with the following error: sched_getaffinity(0, 16, 0x10029650030) = -1 EINVAL (Invalid argument) This box has 128 threads and 16 bytes is enough to cover it. Commit cd3d8031eb4311e516329aee03c79a08333141f1 (sched: sched_getaffinity(): Allow less than NR_CPUS length) is comparing this 16 bytes agains nr_cpu_ids. Fix it by comparing nr_cpu_ids to the number of bits in the cpumask we pass in. Signed-off-by: Anton Blanchard Reviewed-by: KOSAKI Motohiro Cc: Sharyathi Nagesh Cc: Ulrich Drepper Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Jack Steiner Cc: Russ Anderson Cc: Mike Travis LKML-Reference: <20100406070218.GM5594@kryten> Signed-off-by: Ingo Molnar commit 9d32c30542f9ecdb4b96a1a960924c9f403e3562 Author: H Hartley Sweeten Date: Mon Apr 5 22:29:09 2010 -0700 Input: matrix_keypad - allow platform to disable key autorepeat In an embedded system the matrix_keypad driver might be used to interface with an external control panel and not an actual keyboard. On the control panel some of the keys could be used to turn on/off various functions. If key autorepeat is enabled this causes the function to quickly toggle between the on and off states and makes operation difficult. Add an option in the platform-specific data to disable the key autorepeat. Signed-off-by: H Hartley Sweeten Signed-off-by: Dmitry Torokhov commit 5e28d8eb68c12eab9c4a47b42ba993a6420d71d3 Author: Chase Douglas Date: Mon Apr 5 22:29:08 2010 -0700 Input: ALPS - add signature for HP Pavilion dm3 laptops Tested by a user running Ubuntu 9.10 in the following bug report. BugLink: http://bugs.launchpad.net/bugs/545307 Signed-off-by: Chase Douglas Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit 2c860a1101471a69f7a6778b7b1fb43344c38619 Author: Dominik Brodowski Date: Mon Apr 5 22:29:09 2010 -0700 Input: i8042 - spelling fix Signed-off-by: Dominik Brodowski Signed-off-by: Dmitry Torokhov commit 643acacf02679befd0f98ac3c5fecb805f1c9548 Author: Alex Deucher Date: Mon Apr 5 23:57:52 2010 -0400 drm/radeon/kms: fix washed out image on legacy tv dac bad cast was overwriting the tvdac adj values Fixes fdo bug 27478 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 5fbfb18d7a5b846946d52c4a10e3aaa213ec31b6 Author: Nick Piggin Date: Thu Apr 1 19:09:40 2010 +1100 Fix up possibly racy module refcounting Module refcounting is implemented with a per-cpu counter for speed. However there is a race when tallying the counter where a reference may be taken by one CPU and released by another. Reference count summation may then see the decrement without having seen the previous increment, leading to lower than expected count. A module which never has its actual reference drop below 1 may return a reference count of 0 due to this race. Module removal generally runs under stop_machine, which prevents this race causing bugs due to removal of in-use modules. However there are other real bugs in module.c code and driver code (module_refcount is exported) where the callers do not run under stop_machine. Fix this by maintaining running per-cpu counters for the number of module refcount increments and the number of refcount decrements. The increments are tallied after the decrements, so any decrement seen will always have its corresponding increment counted. The final refcount is the difference of the total increments and decrements, preventing a low-refcount from being returned. Signed-off-by: Nick Piggin Acked-by: Rusty Russell Signed-off-by: Linus Torvalds commit 95beb690170e6ce918fe53c73a0fcc7cf64d704a Author: Alex Deucher Date: Thu Apr 1 19:08:47 2010 +0000 drm/radeon/kms/atom: fix gpio i2c table overrun (v2) The GPIO_I2C_INFO table does not always have ATOM_MAX_SUPPORTED_DEVICE entries. Limit the number of indices to the size of the table. Should fix Novell bug 589022. v2: fix typo Signed-off-by: Alex Deucher Cc: Stable Signed-off-by: Dave Airlie commit 57b54ea6b7863ccfeb41851b5f58f9fd1b83c79e Author: Michel Dänzer Date: Fri Apr 2 16:59:06 2010 +0000 drm/radeon: R300 AD only has one quad pipe. Gleaned from the Mesa code. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27355 . Signed-off-by: Michel Dänzer Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 7da23b86e14b77c094b11a9fa5ef5b3758fc9193 Merge: 749d229 421e33d Author: Linus Torvalds Date: Mon Apr 5 15:37:12 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] qla1280: retain firmware for error recovery [SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init [SCSI] advansys: fix regression with request_firmware change [SCSI] qla2xxx: Updated version number to 8.03.02-k2. [SCSI] qla2xxx: Prevent sending mbx commands from sysfs during isp reset. [SCSI] qla2xxx: Disable MSI on qla24xx chips other than QLA2432. [SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time. [SCSI] qla2xxx: Correct vp_idx checking during PORT_UPDATE processing. [SCSI] qla2xxx: Honour "Extended BB credits" bit for CNAs. [SCSI] scsi_transport_fc: Make sure commands are completed when rport is offline [SCSI] libiscsi: Fix recovery slowdown regression commit c8e42de6efcf4e9bed79a8b030261d799ea1960a Author: Kevin Hilman Date: Thu Feb 25 16:24:41 2010 -0800 davinci: DM365: fix duplicate default IRQ priorities IRQ 29 has two possible interrupts DDRINT and RTC, but having both in the default priority table is confusing (and triggers a warning from sparse.) This patch removes the lower priority DDRINT from the default priority table leaving the RTC setting as the default. Signed-off-by: Kevin Hilman commit bb17ef102b72e38557bfa829511e06c4bd3bb972 Author: Brian Niebuhr Date: Tue Mar 9 16:48:03 2010 -0600 davinci: edma: clear events in edma_start() This patch fixes an issue where a DMA channel can erroneously process an event generated by a previous transfer. A failure case is where DMA is being used for SPI transmit and receive channels on OMAP L138. In this case there is a single bit that controls all event generation from the SPI peripheral. Therefore it is possible that between when edma_stop() has been called for the transmit channel on a previous transfer and edma_start() is called for the transmit channel on a subsequent transfer, that a transmit event has been generated. The fix is to clear events in edma_start(). This prevents false events from being processed when events are enabled for that channel. Signed-off-by: Brian Niebuhr Signed-off-by: Kevin Hilman commit 5eb2e891f038c8e04757f4536b9693faf35978a3 Author: Sekhar Nori Date: Wed Mar 10 15:11:24 2010 +0530 davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined The da8xx/omap-l1 boards refuse to build when CONFIG_DAVINCI_MUX is undefined because arch/arm/mach-davinci/mux.c:da8xx_pinmux_setup() is not defined. This patch fixes this issue. This is build tested with davinci_all_defconfig and da8xx_omapl_defconfig and boot tested on DA830 EVM. Reported-by: Shanmuga Sundaram Mahendran Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit d99c3871148cb643cffe138e9427b7a743aca367 Author: Kevin Hilman Date: Thu Mar 11 14:57:35 2010 -0800 davinci: timers: don't enable timer until clocksource is initialized On da830, when the same timer is used for clocksource and clockevent, the timer can be started before the clockevent is registered/initialzed. This creates a window where a timer interrupt might fire before the clockevent handler has been setup and causes a crash. This patch moves the actual enable/start of the timer after the clockevent has ben registered. Signed-off-by: Kevin Hilman commit f9700d5a4575e7fb343df10a1d29d425e4b81082 Author: Takashi Iwai Date: Mon Apr 5 23:25:13 2010 +0200 ALSA: hda - Fix a wrong array range check in patch_realtek.c The commit 6a4f2ccb467e00281470cde2dee08fe5ecde62d1 introduced a wrong comparision for the array range check, which effectively skips the whole initialization of DAC connections. Fixed now. Reference: bko#15689 https://bugzilla.kernel.org/show_bug.cgi?id=15689 Reported-by: Adrian Ulrich Signed-off-by: Takashi Iwai commit 749d229761ff0135cc4e16b8a28b41ae2f6b2c35 Merge: 795d580 3dc9fef Author: Linus Torvalds Date: Mon Apr 5 13:42:54 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: saving negative to unsigned char 9p: return on mutex_lock_interruptible() 9p: Creating files with names too long should fail with ENAMETOOLONG. 9p: Make sure we are able to clunk the cached fid on umount 9p: drop nlink remove fs/9p: Clunk the fid resulting from partial walk of the name 9p: documentation update 9p: Fix setting of protocol flags in v9fs_session_info structure. commit 795d580baec0d5386b83a8b557df47c20810e86b Merge: 449cedf 109f6ae Author: Linus Torvalds Date: Mon Apr 5 13:21:15 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: add check for changed leaves in setup_leaf_for_split Btrfs: create snapshot references in same commit as snapshot Btrfs: fix small race with delalloc flushing waitqueue's Btrfs: use add_to_page_cache_lru, use __page_cache_alloc Btrfs: fix chunk allocate size calculation Btrfs: kill max_extent mount option Btrfs: fail to mount if we have problems reading the block groups Btrfs: check btrfs_get_extent return for IS_ERR() Btrfs: handle kmalloc() failure in inode lookup ioctl Btrfs: dereferencing freed memory Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk() Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree() Btrfs: Remove unnecessary finish_wait() in wait_current_trans() Btrfs: add NULL check for do_walk_down() Btrfs: remove duplicate include in ioctl.c Fix trivial conflict in fs/btrfs/compression.c due to slab.h include cleanups. commit 449cedf099b23a250e7d61982e35555ccb871182 Author: Eric Paris Date: Mon Apr 5 16:16:26 2010 -0400 audit: preface audit printk with audit There have been a number of reports of people seeing the message: "name_count maxed, losing inode data: dev=00:05, inode=3185" in dmesg. These usually lead to people reporting problems to the filesystem group who are in turn clueless what they mean. Eventually someone finds me and I explain what is going on and that these come from the audit system. The basics of the problem is that the audit subsystem never expects a single syscall to 'interact' (for some wish washy meaning of interact) with more than 20 inodes. But in fact some operations like loading kernel modules can cause changes to lots of inodes in debugfs. There are a couple real fixes being bandied about including removing the fixed compile time limit of 20 or not auditing changes in debugfs (or both) but neither are small and obvious so I am not sending them for immediate inclusion (I hope Al forwards a real solution next devel window). In the meantime this patch simply adds 'audit' to the beginning of the crap message so if a user sees it, they come blame me first and we can talk about what it means and make sure we understand all of the reasons it can happen and make sure this gets solved correctly in the long run. Signed-off-by: Eric Paris Signed-off-by: Linus Torvalds commit ab6e24103cbd215e922938a4f58c75194761a60e Author: Josef Bacik Date: Fri Mar 19 14:38:13 2010 +0000 Btrfs: fix data enospc check overflow Because we account for reserved space we get from the allocator before we actually account for allocating delalloc space, we can have a small window where the amount of "used" space in a space_info is more than the total amount of space in the space_info. This will cause a overflow in our check, so it will seem like we have _tons_ of free space, and we'll allow reservations to occur that will end up larger than the amount of space we have. I've seen users report ENOSPC panic's in cow_file_range a few times recently, so I tried to reproduce this problem and found I could reproduce it if I ran one of my tests in a loop for like 20 minutes. With this patch my test ran all night without issues. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 3dc9fef67f6292692dba181a6d0fd0211bd0a607 Author: Dan Carpenter Date: Mon Apr 5 14:37:28 2010 -0500 9p: saving negative to unsigned char Saving -EINVAL as unsigned char truncates the high bits and changes it into 234 instead of -22. This breaks the test for "if (ret == -EINVAL)" in parse_opts(). Signed-off-by: Dan Carpenter Signed-off-by: Eric Van Hensbergen commit 85a770a8889035625466a4cfb1393cd7d2ffd165 Author: Dan Carpenter Date: Tue Mar 30 09:41:25 2010 +0000 9p: return on mutex_lock_interruptible() If "err" is -EINTR here the original code calls mutex_unlock() and then returns, but it should just return directly. Signed-off-by: Dan Carpenter Signed-off-by: Eric Van Hensbergen ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev commit 109f6aef5fc436f355ad027f4d97bd696df2049a Author: Chris Mason Date: Fri Apr 2 09:20:18 2010 -0400 Btrfs: add check for changed leaves in setup_leaf_for_split setup_leaf_for_split needs to drop the path and search again, and has checks to see if the item we want to split changed size. But, it misses the case where the leaf changed and now has enough room for the item we want to insert. This adds an extra check to make sure the leaf really needs splitting before we call btrfs_split_leaf(), which keeps us from trying to split a leaf with a single item. btrfs_split_leaf() will blindly split the single item leaf, leaving us with one good leaf and one empty leaf and then a crash. Signed-off-by: Chris Mason commit 6bdb72ded1e281cd8844918c39d00cdd0e59f655 Author: Sage Weil Date: Mon Mar 15 17:27:13 2010 +0000 Btrfs: create snapshot references in same commit as snapshot This creates the reference to a new snapshot in the same commit as the snapshot itself. This avoids the need for a second commit in order for a snapshot to be persistent, and also avoids the problem of "leaking" a new snapshot tree root if the host crashes before the second commit takes place. It is not at all clear to me why it wasn't always done this way. If there is still a reason for the two-stage {create,finish}_pending_snapshots() approach I'm missing something! :) I've been running this for a couple weeks under pretty heavy usage (a few snapshots per minute) without obvious problems. Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit b5cb160084fad438c513d0952849e597ffe9e3d9 Author: Josef Bacik Date: Fri Mar 12 19:28:18 2010 +0000 Btrfs: fix small race with delalloc flushing waitqueue's Everytime we start a new flushing thread, we init the waitqueue if there isn't a flushing thread running. The problem with this is we check space_info->flushing, which we clear right before doing a wake_up on the flushing waitqueue, which causes problems if we init the waitqueue in the middle of clearing the flushing flagh and calling wake_up. This is hard to hit, but the code is wrong anyway, so init the flushing/allocating waitqueue when creating the space info and let it be. I haven't seen the panic since I've been using this patch. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 28ecb60906e86e74e9ad4ac7e0218d8631e73a94 Author: Nick Piggin Date: Wed Mar 17 13:31:04 2010 +0000 Btrfs: use add_to_page_cache_lru, use __page_cache_alloc Pagecache pages should be allocated with __page_cache_alloc, so they obey pagecache memory policies. add_to_page_cache_lru is exported, so it should be used. Benefits over using a private pagevec: neater code, 128 bytes fewer stack used, percpu lru ordering is preserved, and finally don't need to flush pagevec before returning so batching may be shared with other LRU insertions. Signed-off-by: Nick Piggin : Signed-off-by: Chris Mason commit 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 Author: Daniel Mack Date: Mon Mar 22 10:11:15 2010 +0100 ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream This fixes a memory corruption when ASoC devices are used in full-duplex mode. Specifically for pxa-ssp code, where this pointer is dynamically allocated for each direction and destroyed upon each stream start. All other platforms are fixed blindly, I couldn't even compile-test them. Sorry for any breakage I may have caused. [Note that this is a backported version for 2.6.34. Upstream commit is fd23b7dee] Signed-off-by: Daniel Mack Reported-by: Sven Neumann Reported-by: Michael Hirsch Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b66696e3c0d8fc01efdbc701eba1276618332cb3 Merge: 9e74e7c a32f392 Author: Linus Torvalds Date: Mon Apr 5 09:39:11 2010 -0700 Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: eeepc-wmi: include slab.h staging/otus: include slab.h from usbdrv.h percpu: don't implicitly include slab.h from percpu.h kmemcheck: Fix build errors due to missing slab.h include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h iwlwifi: don't include iwl-dev.h from iwl-devtrace.h x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h Fix up trivial conflicts in include/linux/percpu.h due to is_kernel_percpu_address() having been introduced since the slab.h cleanup with the percpu_up.c splitup. commit d12841827a6de120199609dadb6ff4ec99bd90ea Author: Tony Vroon Date: Mon Apr 5 16:30:43 2010 +0100 ALSA: hda - Enable amplifiers on Acer Inspire 6530G After more tests it appears that EAPD needs to be enabled on both the 0x14 and 0x15 NIDs to enable the main speaker and headphone amplifiers. The maximum volume setting is now equal to what the machine achieves under other operating systems. Disabling Front or LFE playback triggers EAPD and disables the amplifier. As such, these two playback switches have been removed from the mixer. Signed-off-by: Tony Vroon Signed-off-by: Takashi Iwai commit a74b2adae06265b8cfa335d7d40d4a5abd11e977 Author: Ricky Benitez Date: Mon Apr 5 18:22:17 2010 +0200 block: expose the statistics in blkio.time and blkio.sectors for the root cgroup Currently, the io statistics for the root cgroup are maintained, but they are not shown because the device information is not available at the point that the root blkio cgroup is created. This patch updates the device information when the statistics are updated so that the statistics become visible. Signed-off-by: Ricky Benitez Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 9e74e7c81a24aee66024fc477786bd1de84e293b Merge: 4946d54 d5e50da Author: Linus Torvalds Date: Mon Apr 5 09:16:37 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: module: add stub for is_module_percpu_address percpu, module: implement and use is_kernel/module_percpu_address() module: encapsulate percpu handling better and record percpu_size commit 4946d54cb55e86a156216fcfeed5568514b0830f Author: Rik van Riel Date: Mon Apr 5 12:13:33 2010 -0400 rmap: fix anon_vma_fork() memory leak Fix a memory leak in anon_vma_fork(), where we fail to tear down the anon_vmas attached to the new VMA in case setting up the new anon_vma fails. This bug also has the potential to leave behind anon_vma_chain structs with pointers to invalid memory. Reported-by: Minchan Kim Signed-off-by: Rik van Riel Signed-off-by: Linus Torvalds commit bade732a2848e640482c1e99629a90e085d574dd Author: Tom Tucker Date: Sat Apr 3 08:27:29 2010 -0500 svcrdma: RDMA support not yet compatible with RPC6 RPC6 requires that it be possible to create endpoints that listen exclusively for IPv4 or IPv6 connection requests. This is not currently supported by the RDMA API. This fixes a server RDMA regression introduced by 37498292a "NFSD: Create PF_INET6 listener in write_ports". Signed-off-by: Tom Tucker Tested-by: Steve Wise Reviewed-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 11e9b49b7fa056bfc00a56de8956d1d5fe8b84ea Author: Sripathi Kodi Date: Mon Mar 29 18:13:59 2010 -0500 9p: Creating files with names too long should fail with ENAMETOOLONG. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 6d96d3ab7aea5f0e75205a0c97f8d1fdf82c5287 Author: Aneesh Kumar K.V Date: Mon Mar 29 18:13:59 2010 -0500 9p: Make sure we are able to clunk the cached fid on umount dcache prune happen on umount. So we cannot mark the client satus disconnect. That will prevent a 9p call to the server Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit d994f4058d9f9be7e44529b55fc6be6552901ead Author: Aneesh Kumar K.V Date: Mon Mar 29 18:14:50 2010 -0500 9p: drop nlink remove We need to drop the link count on the inode of a sucessfull remove Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 5b0fa207d1a6f27c9a2f2d707147dce01af21db7 Author: Aneesh Kumar K.V Date: Fri Mar 19 12:47:26 2010 +0000 fs/9p: Clunk the fid resulting from partial walk of the name Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 9208d24253e5e644f8cb1b87b69de44897668303 Author: Sripathi Kodi Date: Thu Mar 18 08:01:33 2010 +0000 9p: documentation update This patch adds documentation for new 9P options introduced in 2.6.34. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 476ada0436351672fbf482db54cb94b8ba877709 Author: Sripathi Kodi Date: Wed Mar 17 17:02:38 2010 +0000 9p: Fix setting of protocol flags in v9fs_session_info structure. This patch fixes a simple bug I left behind in my earlier protocol negotiation patch. Thanks, Sripathi. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit d522ffbfb9fccf6eca283cd2e8b03cf3d21fb616 Author: Mark Brown Date: Tue Mar 30 14:29:14 2010 +0100 ASoC: Only do WM8994 bias off transition from standby Otherwise we may try to power down multiple times when the using idle bias off and the driver is removed. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4dcc93d0ede49fae32dd0ee41c685db1be14c529 Author: Mark Brown Date: Mon Mar 29 17:18:41 2010 +0100 ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices The DCS_DATAPATH_BUSY bit used to monitor the completion of DC servo operations has been deprecated and with some more recente revisions may perform incorrectly, especially when only analogue bypass paths are in use. Switch to using readback from the DC servo command register instead, which is supported for all devices. Without this unacceptably long timeouts may be observed in some circumstances. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ae9d8607fe24253efc9f14b696f51cfd683801be Author: Mark Brown Date: Mon Mar 29 16:34:42 2010 +0100 ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction If we need to offset correct the DC servo then don't use runtime recalibration since that is likely to introduce further offsets which will be evident on powerdown. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 8437f7006b9cfa249791e2fd57596683d4561843 Author: Mark Brown Date: Mon Mar 29 17:09:45 2010 +0100 ASoC: Support second DC servo readback method for wm_hubs More recent Wolfson hubs devices add the ability to read back the DC servo calibration information from the register used to write offsets, and later still ones remove the old readback registers. Add support for the new scheme, and use it for WM8994 device revisions that support it. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3fa49e3ad9ac20b15edfb0c51bbad36e45a84b17 Author: Mark Brown Date: Mon Mar 29 15:24:40 2010 +0100 ASoC: Avoid wraparound in wm_hubs DC servo correction If the correction wraps around then a substantial offset would be introduced. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a32f3926632e71c8aa23ce32fe2625f8d5f792c2 Author: Tejun Heo Date: Mon Apr 5 11:37:59 2010 +0900 eeepc-wmi: include slab.h eeepc-wmi uses kfree() but doesn't include slab.h. Include it. Signed-off-by: Tejun Heo Cc: Yong Wang commit 336f5899d287f06d8329e208fc14ce50f7ec9698 Merge: a4ab277 db217de Author: Tejun Heo Date: Mon Apr 5 11:37:28 2010 +0900 Merge branch 'master' into export-slabh commit a4ab2773205e8b94c18625455f85e3b6bb9d7ad6 Author: Tejun Heo Date: Mon Apr 5 11:23:16 2010 +0900 staging/otus: include slab.h from usbdrv.h drivers/staging/otus/usbdrv.h users use slab facilities. Include linux/slab.h from usbdrv.h. Signed-off-by: Tejun Heo commit 1638bca898e55f1c89f18b2e5accfac8591fed61 Author: Chase Douglas Date: Mon Mar 22 15:08:09 2010 -0400 ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup By default, ACPI resource conflict messages are logged at level KERN_ERR. This is a rather high level for a message that is more a warning than an indication of a real kernel error. Also, KERN_ERR level messages can appear over some boot splash screens, and this message is not serious enough to warrant such treatment. Thus, the log level has been reduced to KERN_WARNING. [lenb changed to KERN_WARNING rather than all the way to KERN_INFO] Also, cleanup message to use %pR resource printing format. Signed-off-by: Chase Douglas Signed-off-by: Len Brown commit f79e1cec8c8aa64895fd7b595dc7b48157df0754 Author: Alan Jenkins Date: Tue Jun 30 14:36:16 2009 +0000 ACPI: battery drivers should call power_supply_changed() Calling kobject_uevent() directly is a layering violation. In particular, it means we'll miss updating the generic LED trigger. Signed-off-by: Alan Jenkins Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit e363a755e8033e18f733fc0d1687039df8efade0 Author: Alan Jenkins Date: Tue Jun 30 14:35:05 2009 +0000 ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n Disabling CONFIG_ACPI_SYSFS_POWER changes the behaviour of acpi_battery_update(). It will call acpi_battery_get_info() even if the battery is not present. I haven't noticed this causing any problem, but it does look like a bad idea. Signed-off-by: Alan Jenkins Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit db217dece3003df0841bacf9556b5c06aa097dae Merge: 8ce42c8 bdd32ce Author: Linus Torvalds Date: Sun Apr 4 12:14:44 2010 -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: sunxvr500: Ignore secondary output PCI devices. sparc64: Implement perf_arch_fetch_caller_regs sparc64: Update defconfig. sparc64: Fix array size reported by vmemmap_populate() sparc: Fix regset register window handling. drivers/serial/sunsu.c: Correct use after free commit 8ce42c8b7fdf4fc008a6fc7349beb8f4dd5cb774 Merge: 0121b0c 6e03bb5 Author: Linus Torvalds Date: Sun Apr 4 12:13:10 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Always build the powerpc perf_arch_fetch_caller_regs version perf: Always build the stub perf_arch_fetch_caller_regs version perf, probe-finder: Build fix on Debian perf/scripts: Tuple was set from long in both branches in python_process_event() perf: Fix 'perf sched record' deadlock perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels perf, x86: Fix AMD hotplug & constraint initialization x86: Move notify_cpu_starting() callback to a later stage x86,kgdb: Always initialize the hw breakpoint attribute perf: Use hot regs with software sched switch/migrate events perf: Correctly align perf event tracing buffer commit 0121b0c771f929bb5298554b70843ab46280c298 Merge: a8941b0 47a7098 Author: Linus Torvalds Date: Sun Apr 4 12:12:31 2010 -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: set_cpus_allowed_ptr(): Don't use rq->migration_thread after unlock sched: Fix proc_sched_set_task() commit a8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10 Merge: d82ef02 292f60c Author: Linus Torvalds Date: Sun Apr 4 12:12:19 2010 -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: ring-buffer: Add missing unlock tracing: Fix lockdep warning in global_clock() commit d82ef020cf31504c816803b1def94eb5ff173363 Author: KAMEZAWA Hiroyuki Date: Fri Apr 2 09:11:29 2010 +0900 proc: pagemap: Hold mmap_sem during page walk In initial design, walk_page_range() was designed just for walking page table and it didn't require mmap_sem. Now, find_vma() etc.. are used in walk_page_range() and we need mmap_sem around it. This patch adds mmap_sem around walk_page_range(). Because /proc//pagemap's callback routine use put_user(), we have to get rid of it to do sane fix. Changelog: 2010/Apr/2 - fixed start_vaddr and end overflow Changelog: 2010/Apr/1 - fixed start_vaddr calculation - removed unnecessary cast. - removed unnecessary change in smaps. - use GFP_TEMPORARY instead of GFP_KERNEL Signed-off-by: KAMEZAWA Hiroyuki Cc: Matt Mackall Cc: KOSAKI Motohiro Cc: San Mehat Cc: Brian Swetland Cc: Dave Hansen Cc: Andrew Morton [ Fixed kmalloc failure return code as per Matt ] Signed-off-by: Linus Torvalds commit 147a27460366ecd35f1425f593cb42d52166c7ff Author: Dominik Brodowski Date: Sun Apr 4 18:10:35 2010 +0200 pcmcia: fix up alignf issues - pcmcia_align() used a "start" variable twice. That's obviously a bad idea. - pcmcia_common_resource() needs the current "start" parameter being passed, instead of res->start. - pcmcia_common_resource() doesn't use the size and align parameters, so get rid of those. Signed-off-by: Dominik Brodowski commit a0fd4345f928d72a56e27b23e4cd28c94bf36be5 Author: Julia Lawall Date: Fri Apr 2 14:47:59 2010 +0200 ALSA: echoaudio - Eliminate use after free Use the call to snd_card_free in the error handling code at the end of the function, as in the other error cases. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E,E2; @@ snd_card_free(E) ... ( E = E2 | * E ) // Signed-off-by: Julia Lawall Signed-off-by: Takashi Iwai commit f11947c7c5b8abffd328739996dfdffef2b3e03f Author: Dan Carpenter Date: Fri Apr 2 14:29:23 2010 +0300 ALSA: i2c: cleanup: change parameter to pointer We actually pass an array of 7 chars not 5. This silences a smatch warning. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 3815595e78d2baae6feb866e737f92d8ef48b337 Author: Takashi Iwai Date: Sun Apr 4 12:14:03 2010 +0200 ALSA: hda - Add MSI blacklist for Aopen MZ915-M The device needs MSI disablement. Added to the quirk list. Reported-by: Harald Dunkel Cc: Signed-off-by: Takashi Iwai commit bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f Author: David S. Miller Date: Sun Apr 4 01:12:50 2010 -0700 sunxvr500: Ignore secondary output PCI devices. These just represent the secondary and further heads attached to the card, and they have different sets of PCI bar registers to map. So don't try to drive them in the main driver. Reported-by: Frans van Berckel Tested-by: Frans van Berckel Signed-off-by: David S. Miller commit 954fbc8985328a3b59b5881243d3aa04a8f8da7c Author: David S. Miller Date: Sat Apr 3 23:50:59 2010 -0700 sparc64: Implement perf_arch_fetch_caller_regs We provide regs->tstate, regs->tpc, regs->tnpc and regs->u_regs[UREG_FP]. regs->tstate is necessary for: user_mode() (via perf_exclude_event()) perf_misc_flags() (via perf_prepare_sample()) regs->tpc is necessary for: perf_instruction_pointer() (via perf_prepare_sample()) and regs->u_regs[UREG_FP] is necessary for: perf_callchain() (via perf_prepare_sample()) The regs->tnpc value is provided just to be tidy. Signed-off-by: David S. Miller commit 3162b6f0c5e1fcad372d64194fb3cb968941b428 Author: Bjorn Helgaas Date: Thu Mar 25 10:32:49 2010 -0600 PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 The ACPI spec (sec 6.4.3.5 in v4.0) requires that for Address Space Resource Descriptors, _LEN <= _MAX - _MIN + 1 in all cases, but there are BIOSes that violate this. We experimentally determined that Windows truncates the resource so it doesn't extend past _MAX, so let's do the same thing in Linux. http://bugzilla.kernel.org/show_bug.cgi?id=15480 Signed-off-by: Bjorn Helgaas Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 17c452f99cf5e073b219a069a419b7b8ab3cfa97 Author: Matthew Garrett Date: Fri Dec 11 17:40:46 2009 -0500 ACPI: Don't send KEY_UNKNOWN for random video notifications I have a machine here that's sending 0xD1 notifications on the video device once every second or so. I have no idea why (it's a prototype, it may be broken), but sending KEY_UNKNOWN is unhelpful and results in the console becoming unusable. Let's not report keys unless we have something useful to say about them. Signed-off-by: Matthew Garrett Acked-by: Zhang Rui Signed-off-by: Len Brown commit 0f9b75ef3722814134f307f51c19e0791da40e69 Author: David Rientjes Date: Thu Mar 25 16:33:04 2010 -0700 ACPI: NUMA: map pxms to low node ids pxms are mapped to low node ids to maintain generic kernel use of functions such as pxm_to_node() that are used to determine device affinity. Otherwise, there is no pxm-to-node and node-to-pxm matching rule for x86_64 users of NUMA emulation where a single pxm may be bound to multiple NUMA nodes. Signed-off-by: David Rientjes Signed-off-by: Len Brown commit b7b30de53aef6ce773d34837ba7d8422bd3baeec Author: Bjorn Helgaas Date: Wed Mar 24 10:44:33 2010 -0600 ACPI: use _HID when supplied by root-level devices Previously, we assumed the only Device object immediately below the root was the \_SB Scope (which the ACPI CA treats as a Device), so we forced the HID of all such objects to ACPI_BUS_HID ("LNXSYBUS"). However, there are DSDTs that supply root-level Device objects with _HIDs. This patch makes us pay attention to those _HIDs and only add the synthetic ACPI_BUS_HID for root-level objects that do not supply their own _HID. For example, this DSDT: https://bugzilla.kernel.org/show_bug.cgi?id=15605 contains: Scope (_SB) { ... } Device (AMW0) { Name (_HID, EisaId ("PNP0C14")) ... } and we should use "PNP0C14" for the AMW0 device, not "LNXSYBUS". Signed-off-by: Bjorn Helgaas Acked-by: Zhang Rui Tested-by: Yong Wang Signed-off-by: Len Brown commit 3f6c148df42d98f0991baf4353497d380a30bc19 Author: David S. Miller Date: Sat Apr 3 16:18:32 2010 -0700 sparc64: Update defconfig. Signed-off-by: David S. Miller commit cf9cf9aed19f529ff313c3e0901ae3b2972eaf4e Author: Giel van Schijndel Date: Mon Mar 29 21:12:09 2010 +0200 [WATCHDOG] doc: watchdog simple example: don't fail on fsync() Don't terminate the watchdog daemon when fsync() fails because no watchdog driver actually implements the fsync() syscall. Signed-off-by: Giel van Schijndel Signed-off-by: Wim Van Sebroeck commit 87e8b821ed8db3dab03d96cd542e29666bf210aa Merge: 33cd9df 5e11611 Author: David S. Miller Date: Sat Apr 3 15:49:14 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 5e8037166497f8a1aa46325ed7febf0408d45caa Author: Marc Zyngier Date: Mon Mar 29 20:09:14 2010 +0100 [WATCHDOG] set max63xx driver as ARM only Use of ioremap() causes build failure on S390. Restrict the driver to ARM until another architecture comes along and enables the driver for its own use. Signed-off-by: Marc Zyngier Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 35c79780064976cf9d7537a00e59f97c2061fa7d Author: Sean MacLennan Date: Mon Mar 8 19:46:41 2010 -0500 [WATCHDOG] powerpc: pika_wdt ident cannot be const The watchdog_info struct cannot be a const since we dynamically fill in the firmware version. Signed-off-by: Sean MacLennan Signed-off-by: Wim Van Sebroeck commit fb9e2d887243499b8d28efcf80821c4f6a092395 Author: Ken Kawasaki Date: Sat Apr 3 15:07:10 2010 -0700 smc91c92_cs: fix the problem of "Unable to find hardware address" smc91c92_cs: *cvt_ascii_address returns 0, if success. *call free_netdev, if we can't find hardware address. Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit fd2dd9fbaf9e498ec63eef298921e36556f7214c Author: Curt Wohlgemuth Date: Sat Apr 3 17:44:16 2010 -0400 ext4: Fix buffer head leaks after calls to ext4_get_inode_loc() Calls to ext4_get_inode_loc() returns with a reference to a buffer head in iloc->bh. The callers of this function in ext4_write_inode() when in no journal mode and in ext4_xattr_fiemap() don't release the buffer head after using it. Addresses-Google-Bug: #2548165 Signed-off-by: Curt Wohlgemuth Signed-off-by: "Theodore Ts'o" commit 33cd9dfa3a13e3d8e41aef225a9f98169816723b Author: Ben Hutchings Date: Sat Apr 3 13:58:45 2010 -0700 sparc64: Fix array size reported by vmemmap_populate() vmemmap_populate() attempts to report the used index and total size of vmemmap_table, but it wrongly shifts the total size so that it is always shown as 0. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 8b472d739b2ddd8ab7fb278874f696cd95b25a5e Author: Curt Wohlgemuth Date: Sat Apr 3 16:45:06 2010 -0400 ext4: Fix possible lost inode write in no journal mode In the no-journal case, ext4_write_inode() will fetch the bh and call sync_dirty_buffer() on it. However, if the bh has already been written and the bh reclaimed for some other purpose, AND if the inode is the only one in the inode table block in use, then ext4_get_inode_loc() will not read the inode table block from disk, but as an optimization, fill the block with zero's assuming that its caller will copy in the on-disk version of the inode. This is not done by ext4_write_inode(), so the contents of the inode can simply get lost. The fix is to use __ext4_get_inode_loc() with in_mem set to 0, instead of ext4_get_inode_loc(). Long term the API needs to be fixed so it's obvious why latter is not safe. Addresses-Google-Bug: #2526446 Signed-off-by: Curt Wohlgemuth Signed-off-by: "Theodore Ts'o" commit 6513a81e9325d712f1bfb9a1d7b750134e49ff18 Author: Suresh Jayaraman Date: Wed Mar 31 12:00:03 2010 +0530 cifs: Fix a kernel BUG with remote OS/2 server (try #3) While chasing a bug report involving a OS/2 server, I noticed the server sets pSMBr->CountHigh to a incorrect value even in case of normal writes. This results in 'nbytes' being computed wrongly and triggers a kernel BUG at mm/filemap.c. void iov_iter_advance(struct iov_iter *i, size_t bytes) { BUG_ON(i->count < bytes); <--- BUG here Why the server is setting 'CountHigh' is not clear but only does so after writing 64k bytes. Though this looks like the server bug, the client side crash may not be acceptable. The workaround is to mask off high 16 bits if the number of bytes written as returned by the server is greater than the bytes requested by the client as suggested by Jeff Layton. CC: Stable Reviewed-by: Jeff Layton Signed-off-by: Suresh Jayaraman Signed-off-by: Steve French commit a24e2d7d8f512340991ef0a59cb5d08d491b8e98 Author: Steve French Date: Sat Apr 3 17:20:21 2010 +0000 [CIFS] initialize nbytes at the beginning of CIFSSMBWrite() By doing this we always overwrite nbytes value that is being passed on to CIFSSMBWrite() and need not rely on the callers to initialize. CIFSSMBWrite2 is doing this already. CC: Stable Reviewed-by: Shirish Pargaonkar Reviewed-by: Jeff Layton Signed-off-by: Suresh Jayaraman Signed-off-by: Steve French commit 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 Author: Frederic Weisbecker Date: Sat Apr 3 12:22:05 2010 +0200 perf: Always build the powerpc perf_arch_fetch_caller_regs version Now that software events use perf_arch_fetch_caller_regs() too, we need the powerpc version to be always built. Fixes the following build error: (.text+0x3210): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x3324): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x33bc): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x33ec): undefined reference to `perf_arch_fetch_caller_regs' (.text+0xd4a0): undefined reference to `perf_arch_fetch_caller_regs' arch/powerpc/kernel/built-in.o:(.text+0xd528): more undefined references to `perf_arch_fetch_caller_regs' follow make[1]: *** [.tmp_vmlinux1] Error 1 make: *** [sub-make] Error 2 Reported-by: Michael Ellerman Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras commit 26d80aa782e708c380a47601779d42d30bf016d6 Author: Frederic Weisbecker Date: Sat Apr 3 12:22:05 2010 +0200 perf: Always build the stub perf_arch_fetch_caller_regs version Now that software events use perf_arch_fetch_caller_regs() too, we need the stub version to be always built in for archs that don't implement it. Fixes the following build error in PARISC: kernel/built-in.o: In function `perf_event_task_sched_out': (.text.perf_event_task_sched_out+0x54): undefined reference to `perf_arch_fetch_caller_regs' Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras commit 9875557ee8247c3f7390d378c027b45c7535a224 Author: Stefan Bader Date: Mon Mar 29 17:53:12 2010 +0200 drm/i915: Add no_lvds entry for the Clientron U800 BugLink: http://bugs.launchpad.net/ubuntu/bugs/544671 This system claims to have a LVDS but has not. Signed-off-by: Stephane Graber Signed-off-by: Stefan Bader CC: stable@kernel.org Signed-off-by: Eric Anholt commit 5e11611a5d22252f3f9c169a3c9377eac0c32033 Merge: d4509e5 c6c3523 Author: Linus Torvalds Date: Fri Apr 2 19:50:11 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 5965/1: Fix soft lockup in at91 udc driver ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds ARM: 6005/1: arm: kprobes: fix register corruption with jprobes ARM: 6003/1: removing compilation warning from pl061.h ARM: 6001/1: removing compilation warning comming from clkdev.h ARM: 6000/1: removing compilation warning comming from ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h ARM: 5997/1: ARM: Correct the VFPv3 detection ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4) ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4) ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4) ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4) commit d4509e5a6edf8862c18d887a642ce4994bde297d Merge: 0afa80a ed01f64 Author: Linus Torvalds Date: Fri Apr 2 19:49:50 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them powerpc/fsl: add device tree binding for QE firmware of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree commit 0afa80ab6ff9aac57f118463699cee306ad6ed8a Merge: 5193d7a b7b7fa4 Author: Linus Torvalds Date: Fri Apr 2 19:48:54 2010 -0700 Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: reiserfs: Fix locking BUG during mount failure commit 5193d7a7f500cfbbfc0de221e808208199723521 Author: Clemens Ladisch Date: Fri Apr 2 18:46:06 2010 +0200 PCI quirk: RS780/RS880: disable MSI behind the PCI bridge The missing initialization of the nb_cntl.strap_msi_enable does not seem to be the only problem that prevents MSI, so that quirk is not sufficient to enable MSI on all machines. To be safe, disable MSI unconditionally for the internal graphics and HDMI audio on these chipsets. [rjw: Added the PCI_VENDOR_ID_AI quirk.] Signed-off-by: Clemens Ladisch Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 5e123e5d9bf8c4ae44121ffe5e844adeb30ff21b Merge: 24b99d1 4da75b9 Author: Linus Torvalds Date: Fri Apr 2 19:45:05 2010 -0700 Merge branch 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kgdb: Turn off tracing while in the debugger kgdb: use atomic_inc and atomic_dec instead of atomic_set kgdb: eliminate kgdb_wait(), all cpus enter the same way kgdbts,sh: Add in breakpoint pc offset for superh kgdb: have ebin2mem call probe_kernel_write once commit 24b99d1576e6e330c2eba534a793b6e6dcb37f6b Merge: 6da8d86 5a7aadf Author: Linus Torvalds Date: Fri Apr 2 19:44:42 2010 -0700 Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: Freezer: Fix buggy resume test for tasks frozen with cgroup freezer Freezer: Only show the state of tasks refusing to freeze commit 6da8d866d0d39e9509ff826660f6a86a6757c966 Author: Oleg Nesterov Date: Fri Apr 2 18:05:12 2010 +0200 tty: release_one_tty() forgets to put pids release_one_tty(tty) can be called when tty still has a reference to pgrp/session. In this case we leak the pid. Signed-off-by: Oleg Nesterov Reported-by: Catalin Marinas Reported-and-tested-by: Tetsuo Handa Acked-by: Linus Torvalds Acked-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 0e0d5e0c4bb0476d53a43bfc87d03a25ec4b5579 Author: Sage Weil Date: Fri Apr 2 16:07:19 2010 -0700 ceph: fix ack counter reset on connection reset If in_seq_acked isn't reset along with in_seq, we don't ack received messages until we reach the old count, consuming gobs memory on the other end of the connection and introducing a large delay when those messages are eventually deleted. Signed-off-by: Sage Weil commit b0f86f5a169c758a82b0e23eef6795356f6d5a25 Author: Borislav Petkov Date: Mon Mar 29 18:47:55 2010 +0200 perf, probe-finder: Build fix on Debian Building chokes with: In file included from /usr/include/gelf.h:53, from /usr/include/elfutils/libdw.h:53, from util/probe-finder.h:61, from util/probe-finder.c:39: /usr/include/libelf.h:98: error: expected specifier-qualifier-list before 'off64_t' [...] Signed-off-by: Borislav Petkov Acked-by: Masami Hiramatsu LKML-Reference: <20100329164755.GA16034@aftab> Signed-off-by: Ingo Molnar commit 4da75b9ceac6939cd76830ec9581bef5bb398ad3 Author: Jason Wessel Date: Fri Apr 2 11:57:18 2010 -0500 kgdb: Turn off tracing while in the debugger The kernel debugger should turn off kernel tracing any time the debugger is active and restore it on resume. Signed-off-by: Jason Wessel Reviewed-by: Steven Rostedt commit ae6bf53e0255c8ab04b6fe31806e318432570e3c Author: Jason Wessel Date: Fri Apr 2 14:58:18 2010 -0500 kgdb: use atomic_inc and atomic_dec instead of atomic_set Memory barriers should be used for the kgdb cpu synchronization. The atomic_set() does not imply a memory barrier. Reported-by: Will Deacon Signed-off-by: Jason Wessel commit 62fae312197a8fbcd3727261d59f5a6bd0dbf158 Author: Jason Wessel Date: Fri Apr 2 11:47:02 2010 -0500 kgdb: eliminate kgdb_wait(), all cpus enter the same way This is a kgdb architectural change to have all the cpus (master or slave) enter the same function. A cpu that hits an exception (wants to be the master cpu) will call kgdb_handle_exception() from the trap handler and then invoke a kgdb_roundup_cpu() to synchronize the other cpus and bring them into the kgdb_handle_exception() as well. A slave cpu will enter kgdb_handle_exception() from the kgdb_nmicallback() and set the exception state to note that the processor is a slave. Previously the salve cpu would have called kgdb_wait(). This change allows the debug core to change cpus without resuming the system in order to inspect arch specific cpu information. Signed-off-by: Jason Wessel commit cad08acebf4b7d993b0cefb9af67208c48fb9a5e Author: Jason Wessel Date: Fri Apr 2 11:31:35 2010 -0500 kgdbts,sh: Add in breakpoint pc offset for superh The kgdb test suite mimics the behavior of gdb. For the sh architecture the pc must be decremented by 2 for software breakpoint. Signed-off-by: Jason Wessel Acked-by: Paul Mundt commit a0279bd58060ccedbd414edf97d50cfa3778c370 Author: Jason Wessel Date: Fri Apr 2 11:33:29 2010 -0500 kgdb: have ebin2mem call probe_kernel_write once Rather than call probe_kernel_write() one byte at a time, process the whole buffer locally and pass the entire result in one go. This way, architectures that need to do special handling based on the length can do so, or we only end up calling memcpy() once. [sonic.zhang@analog.com: Reported original problem and preliminary patch] Signed-off-by: Jason Wessel Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit b1dcc03cb8ee0f5718491e8c518257238dc64e00 Author: Tom Zanussi Date: Thu Apr 1 23:58:25 2010 -0500 perf/scripts: Tuple was set from long in both branches in python_process_event() This is a fix to the signed/unsigned field handling in the Python scripting engine, based on a patch from Roel Kluin. Basically, Python wants to use a PyInt (which is internally a long) if it can i.e. if the value will fit into that type. If not, it stores it into a PyLong, which isn't actually a long, but an arbitrary-precision integer variable. The code below is similar to to what Python does internally, and it seems to work as expected on the x86 and x86_64 sytems I tested it on. Signed-off-by: Tom Zanussi Cc: Arnaldo Carvalho de Melo Cc: Roel Kluin Cc: Frederic Weisbecker Cc: rostedt@goodmis.org LKML-Reference: <1270184305.6422.10.camel@tropicana> Signed-off-by: Ingo Molnar commit de0f60ea94e132c858caa64a44b2012e1e8580b0 Author: Zhu Yi Date: Tue Mar 23 00:45:03 2010 -0700 iwlwifi: avoid Tx queue memory allocation in interface down We used to free all the Tx queues memory when interface is brought down and reallocate them again in interface up. This requires order-4 allocation for txq->cmd[]. In situations like s2ram, this usually leads to allocation failure in the memory subsystem. The patch fixed this problem by allocating the Tx queues memory only at the first time. Later iwl_down/iwl_up only initialize but don't free and reallocate them. The memory is freed at the device removal time. BTW, we have already done this for the Rx queue. This fixed bug https://bugzilla.kernel.org/show_bug.cgi?id=15551 Signed-off-by: Zhu Yi Acked-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 472a474c6630efd195d3738339fd1bdc8aa3b1aa Author: Suresh Siddha Date: Wed Mar 31 18:04:47 2010 -0700 x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards Jan Grossmann reported kernel boot panic while booting SMP kernel on his system with a single core cpu. SMP kernels call enable_IR_x2apic() from native_smp_prepare_cpus() and on platforms where the kernel doesn't find SMP configuration we ended up again calling enable_IR_x2apic() from the APIC_init_uniprocessor() call in the smp_sanity_check(). Thus leading to kernel panic. Don't call enable_IR_x2apic() and default_setup_apic_routing() from APIC_init_uniprocessor() in CONFIG_SMP case. NOTE: this kind of non-idempotent and assymetric initialization sequence is rather fragile and unclean, we'll clean that up in v2.6.35. This is the minimal fix for v2.6.34. Reported-by: Jan.Grossmann@kielnet.net Signed-off-by: Suresh Siddha Cc: Cc: Cc: Cc: Cc: Cc: # [v2.6.32.x, v2.6.33.x] LKML-Reference: <1270083887.7835.78.camel@sbs-t61.sc.intel.com> Signed-off-by: Ingo Molnar commit 04f2dec1c3d375c4072613880f28f43b66524876 Author: Shanyu Zhao Date: Fri Mar 19 13:34:45 2010 -0700 iwlwifi: use consistent table for tx data collect When collecting tx data for non-aggregation packets in rate scaling, if the tx data matches "other table", it still uses current table to update the stats and calculate average throughput in function rs_collect_tx_data(). This can mess up the rate scaling data structure and cause a kernel panic in a BUG_ON statement in rs_rate_scale_perform(). To fix this bug, we pass table pointer instead of window pointer (pointed to by table pointer) to function rs_collect_tx_data() so that the table being used is consistent. Signed-off-by: Shanyu Zhao Signed-off-by: Henry Zhang Signed-off-by: Reinette Chatre commit dd48744964296b5713032ea1d66eb9e3d990e287 Author: Zhu Yi Date: Mon Mar 22 02:28:41 2010 -0700 iwlwifi: fix DMA allocation warnings Below warning is triggered sometimes at module removal time when CONFIG_DMA_API_DEBUG is enabled. This should be caused by we didn't unmap pending commands (enqueued, but no complete notification received) for the Tx command queue. [ 1583.107469] ------------[ cut here ]------------ [ 1583.107539] WARNING: at lib/dma-debug.c:688 dma_debug_device_change+0x13c/0x180() [ 1583.107617] Hardware name: ... [ 1583.107664] pci 0000:04:00.0: DMA-API: device driver has pending DMA allocations while released from device [count=1] [ 1583.107713] Modules linked in: ... [ 1583.111661] Pid: 16970, comm: modprobe Tainted: G W 2.6.34-rc1-wl #33 [ 1583.111727] Call Trace: [ 1583.111779] [] ? dma_debug_device_change+0x13c/0x180 [ 1583.111833] [] ? dma_debug_device_change+0x13c/0x180 [ 1583.111908] [] warn_slowpath_common+0x71/0xd0 [ 1583.111963] [] ? dma_debug_device_change+0x13c/0x180 [ 1583.112016] [] warn_slowpath_fmt+0x2b/0x30 [ 1583.112086] [] dma_debug_device_change+0x13c/0x180 [ 1583.112142] [] notifier_call_chain+0x53/0x90 [ 1583.112198] [] ? down_read+0x6e/0x90 [ 1583.112271] [] __blocking_notifier_call_chain+0x49/0x70 [ 1583.112326] [] blocking_notifier_call_chain+0x1f/0x30 [ 1583.112380] [] __device_release_driver+0x8c/0xa0 [ 1583.112451] [] driver_detach+0x8f/0xa0 [ 1583.112538] [] bus_remove_driver+0x82/0x100 [ 1583.112595] [] driver_unregister+0x49/0x80 [ 1583.112671] [] ? sysfs_remove_file+0x12/0x20 [ 1583.112727] [] pci_unregister_driver+0x32/0x80 [ 1583.112791] [] iwl_exit+0x12/0x19 [iwlagn] [ 1583.112848] [] sys_delete_module+0x15a/0x210 [ 1583.112870] [] ? up_read+0x1b/0x30 [ 1583.112893] [] ? trace_hardirqs_off_thunk+0xc/0x10 [ 1583.112924] [] ? trace_hardirqs_on_thunk+0xc/0x10 [ 1583.112947] [] ? do_page_fault+0x1ff/0x3c0 [ 1583.112978] [] ? restore_all_notrace+0x0/0x18 [ 1583.113002] [] ? trace_hardirqs_on_caller+0x20/0x190 [ 1583.113025] [] sysenter_do_call+0x12/0x38 [ 1583.113054] ---[ end trace fc23e059cc4c2ced ]--- Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre commit 47a70985e5c093ae03d8ccf633c70a93761d86f2 Author: Oleg Nesterov Date: Tue Mar 30 18:58:29 2010 +0200 sched: set_cpus_allowed_ptr(): Don't use rq->migration_thread after unlock Trivial typo fix. rq->migration_thread can be NULL after task_rq_unlock(), this is why we have "mt" which should be used instead. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100330165829.GA18284@redhat.com> Signed-off-by: Ingo Molnar commit 269484a492d9177072ee11ec8c9bff71d256837a Author: Mike Galbraith Date: Tue Mar 30 11:09:53 2010 +0200 sched: Fix proc_sched_set_task() Latencytop clearing sum_exec_runtime via proc_sched_set_task() breaks task_times(). Other places in kernel use nvcsw and nivcsw, which are being cleared as well, Clear task statistics only. Reported-by: Török Edwin Signed-off-by: Mike Galbraith Cc: Hidetoshi Seto Cc: Arjan van de Ven Signed-off-by: Peter Zijlstra LKML-Reference: <1269940193.19286.14.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 8bb39f9aa068262732fe44b965d7a6eb5a5a7d67 Author: Mike Galbraith Date: Fri Mar 26 11:11:33 2010 +0100 perf: Fix 'perf sched record' deadlock perf sched record can deadlock a box should the holder of handle->data->lock take an interrupt, and then attempt to acquire an rq lock held by a CPU trying to acquire the same lock. Disable interrupts. CPU0 CPU1 sched event with rq->lock held grab handle->data->lock spin on handle->data->lock interrupt try to grab rq->lock Reported-by: Li Zefan Signed-off-by: Mike Galbraith Tested-by: Li Zefan Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1269598293.6174.8.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 257ef9d21f1b008a6c7425544b36641c4325a922 Author: Torok Edwin Date: Wed Mar 17 12:07:16 2010 +0200 perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels When profiling a 32-bit process on a 64-bit kernel, callgraph tracing stopped after the first function, because it has seen a garbage memory address (tried to interpret the frame pointer, and return address as a 64-bit pointer). Fix this by using a struct stack_frame with 32-bit pointers when the TIF_IA32 flag is set. Note that TIF_IA32 flag must be used, and not is_compat_task(), because the latter is only set when the 32-bit process is executing a syscall, which may not always be the case (when tracing page fault events for example). Signed-off-by: Török Edwin Signed-off-by: Peter Zijlstra Acked-by: Frederic Weisbecker Cc: "H. Peter Anvin" Cc: Paul Mackerras Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org LKML-Reference: <1268820436-13145-1-git-send-email-edwintorok@gmail.com> Signed-off-by: Ingo Molnar commit b38b24ead33417146e051453d04bf60b8d2d7e25 Author: Peter Zijlstra Date: Tue Mar 23 19:31:15 2010 +0100 perf, x86: Fix AMD hotplug & constraint initialization Commit 3f6da39 ("perf: Rework and fix the arch CPU-hotplug hooks") moved the amd northbridge allocation from CPUS_ONLINE to CPUS_PREPARE_UP however amd_nb_id() doesn't work yet on prepare so it would simply bail basically reverting to a state where we do not properly track node wide constraints - causing weird perf results. Fix up the AMD NorthBridge initialization code by allocating from CPU_UP_PREPARE and installing it from CPU_STARTING once we have the proper nb_id. It also properly deals with the allocation failing. Signed-off-by: Peter Zijlstra [ robustify using amd_has_nb() ] Signed-off-by: Stephane Eranian LKML-Reference: <1269353485.5109.48.camel@twins> Signed-off-by: Ingo Molnar commit 85257024096a96fc5c00ce59d685f62bbed3ad95 Author: Peter Zijlstra Date: Tue Mar 23 19:30:52 2010 +0100 x86: Move notify_cpu_starting() callback to a later stage Because we need to have cpu identification things done by the time we run CPU_STARTING notifiers. ( This init ordering will be relied on by the next fix. ) Signed-off-by: Peter Zijlstra LKML-Reference: <1269353485.5109.48.camel@twins> Signed-off-by: Ingo Molnar commit 50d11d190afa4e21284b735bb0a092036f298f0b Merge: 42be79e ab310b5 Author: Ingo Molnar Date: Fri Apr 2 19:29:17 2010 +0200 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent commit 51591e31dcb3716f03f962e26ec36a029aa46340 Author: David Rientjes Date: Thu Mar 25 15:39:27 2010 -0700 x86: Increase CONFIG_NODES_SHIFT max to 10 Some larger systems require more than 512 nodes, so increase the maximum CONFIG_NODES_SHIFT to 10 for a new max of 1024 nodes. This was tested with numa=fake=64M on systems with more than 64GB of RAM. A total of 1022 nodes were initialized. Successfully builds with no additional warnings on x86_64 allyesconfig. ( No effect on any existing config. Newly enabled CONFIG_MAXSMP=y will see the new default. ) Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: Ingo Molnar commit b5442a75deee293d10c2ab8f4a77013973c4c9e0 Author: Janusz Krzysztofik Date: Sun Mar 28 22:29:29 2010 +0200 ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code With recent (2.6.34) chnages in PCM handling, capture stopped working on my OMAP1510 based Amstrad Delta videophone. Using 2.6.34-rc2, I was able to correct the problem in 3 different ways: 1. reverting commit 7b3a177b0d4f92b3431b8dca777313a07533a710, 2. enabling additional jiffies check with echo 4 >/proc/asound/card0/pcm0c0/xrun_debug 3. applying the patch below. Since I wasn't able to reproduce the problem on my i686 PC, I guess the problem is probably machine specific. The patch reuses the method for software emulation of missing hardware pointer, already implemented for playback on OMAP1510. It's possible that event if a hardware pointer is available for capture on this machine, its behaviour may be not compatible with what upper layer expects. If you think the problem may be more general and should be solved differently, on a higher level, I can try to work more on it if you give me a hint. If the patch gets accepted, I suggest it goes as a fix in the current release cycle. Created and tested against linux-2.6.34-rc2. Signed-off-by: Janusz Krzysztofik Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 483f64c430ad981188d865ee635f3f7a469f0b12 Merge: bc53ba2 c565c54 Author: Linus Torvalds Date: Fri Apr 2 08:18:02 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Add NOGET quirk for Quanta Pixart touchscreen HID: fix oops in gyration_event() commit bc53ba2918bef821dec3528397bc49cd55291e56 Merge: 42be79e be97d75 Author: Linus Torvalds Date: Fri Apr 2 07:33:38 2010 -0700 Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix up the SH-3 build for recent TLB changes. sh: export return_address() symbol. sh: Enable the mmu in start_secondary() sh: Fix FDPIC binary loader arch/sh/kernel: Use set_cpus_allowed_ptr sh: Update ecovec_defconfig USB gadget r8a66597-udc.c: duplicated include sh: update the TLB replacement counter for entry wiring. commit 308f44193f796b1c522b3b87760e43d8d8e316d2 Author: Li Hong Date: Fri Apr 2 18:40:39 2010 +0800 nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v() `make CONFIG_NILFS2_FS=m M=fs/nilfs2/` will give the following warnings: fs/nilfs2/btree.c: In function 'nilfs_btree_propagate': fs/nilfs2/btree.c:1882: warning: 'maxlevel' may be used uninitialized in this function fs/nilfs2/btree.c:1882: note: 'maxlevel' was declared here Set maxlevel = 0 to fix it. Signed-off-by: Li Hong Signed-off-by: Ryusuke Konishi commit 144214537370b4f133a735446ebe86e90cfb2501 Author: Anton Blanchard Date: Fri Apr 2 09:46:55 2010 +0200 backing-dev: Handle class_create() failure I hit this when we had a bug in IDR for a few days. Basically sysfs would fail to create new inodes since it uses an IDR and therefore class_create would fail. While we are unlikely to see this fail we may as well handle it instead of oopsing. Signed-off-by: Anton Blanchard Signed-off-by: Jens Axboe commit be97d758e5728099e95fe229866d5c6c900d3092 Author: Paul Mundt Date: Fri Apr 2 16:13:27 2010 +0900 sh: Fix up the SH-3 build for recent TLB changes. While the MMUCR.URB and ITLB/UTLB differentiation works fine for all SH-4 and later TLBs, these features are absent on SH-3. This splits out local_flush_tlb_all() in to SH-4 and PTEAEX copies while restoring the old SH-3 one, subsequently fixing up the build. This will probably want some further reordering and tidying in the future, but that's out of scope at present. Signed-off-by: Paul Mundt commit 5dd6ef5050c5012267e2b84f3d82ba85cdb5ca32 Author: Paul Mundt Date: Fri Apr 2 16:02:33 2010 +0900 sh: export return_address() symbol. This is needed with some of the tracing code built as modules, so provide the export. Signed-off-by: Paul Mundt commit a506aedc51093544ff0f9610af6066d18cb6abbe Author: wzt.wzt@gmail.com Date: Fri Apr 2 08:41:14 2010 +0200 Block: Fix block/elevator.c elevator_get() off-by-one error elevator_get() not check the name length, if the name length > sizeof(elv), elv will miss the '\0'. And elv buffer will be replace "-iosched" as something like aaaaaaaaa, then call request_module() can load an not trust module. Signed-off-by: Zhitong Wang Signed-off-by: Jens Axboe commit b2b163dd47024e445410b72d0c5df6d819c14dfd Author: Philipp Reisner Date: Fri Apr 2 08:40:33 2010 +0200 drbd: lc_element_by_index() never returns NULL Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 61917bdaaf6bea4b885525cf63f65272914f6be2 Author: Dan Carpenter Date: Fri Apr 2 08:39:40 2010 +0200 cciss: unlock on error path We take the spin_lock again in fail_all_cmds() so we need to unlock here. Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e Author: Neil Horman Date: Thu Apr 1 07:30:07 2010 +0000 r8169: clean up my printk uglyness Fix formatting on r8169 printk Brandon Philips noted that I had a spacing issue in my printk for the last r8169 patch that made it quite ugly. Fix that up and add the PFX macro to it as well so it looks like the other r8169 printks Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 43e9da8d782b8a40d5127fcc59ac2e543cf16d7d Author: Dimitris Michailidis Date: Thu Apr 1 15:28:27 2010 +0000 net: Hook up cxgb4 to Kconfig and Makefile Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 Author: Dimitris Michailidis Date: Thu Apr 1 15:28:26 2010 +0000 cxgb4: Add main driver file and driver Makefile Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 625ba2c2eed763fad9c3f51318cbe8e1917b9fc8 Author: Dimitris Michailidis Date: Thu Apr 1 15:28:25 2010 +0000 cxgb4: Add remaining driver headers and L2T management Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit fd3a47900b6f9fa72a4074ecb630f9dae62f1a95 Author: Dimitris Michailidis Date: Thu Apr 1 15:28:24 2010 +0000 cxgb4: Add packet queues and packet DMA code Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 56d36be4dd5fc7b33bff7986737aff79c790184a Author: Dimitris Michailidis Date: Thu Apr 1 15:28:23 2010 +0000 cxgb4: Add HW and FW support code Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit bbc02c7e9d343c521f17dc06e8d8d7468639d154 Author: Dimitris Michailidis Date: Thu Apr 1 15:28:22 2010 +0000 cxgb4: Add register, message, and FW definitions Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b914f3a2a35812545f773645f340d7c075e5b64d Author: Paul Moore Date: Thu Apr 1 10:43:57 2010 +0000 netlabel: Fix several rcu_dereference() calls used without RCU read locks The recent changes to add RCU lock verification to rcu_dereference() calls caught out a problem with netlbl_unlhsh_hash(), see below. =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- net/netlabel/netlabel_unlabeled.c:246 invoked rcu_dereference_check() without protection! This patch fixes this problem as well as others like it in the NetLabel code. Also included in this patch is the identification of future work to eliminate the RCU read lock in netlbl_domhsh_add(), but in the interest of getting this patch out quickly that work will happen in another patch to be finished later. Thanks to Eric Dumazet and Paul McKenney for their help in understanding the recent RCU changes. Signed-off-by: Paul Moore Reported-by: David Howells CC: Eric Dumazet CC: Paul E. McKenney Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 9e2e61fbf8ad016d24e4af0afff13505f3dd2a2a Author: Amerigo Wang Date: Wed Mar 31 21:30:52 2010 +0000 bonding: fix potential deadlock in bond_uninit() bond_uninit() is invoked with rtnl_lock held, when it does destroy_workqueue() which will potentially flush all works in this workqueue, if we hold rtnl_lock again in the work function, it will deadlock. So move destroy_workqueue() to destructor where rtnl_lock is not held any more, suggested by Eric. Signed-off-by: WANG Cong Cc: Jay Vosburgh Cc: "David S. Miller" Cc: Stephen Hemminger Cc: Jiri Pirko Cc: "Eric W. Biederman" Signed-off-by: David S. Miller commit 6503d96168f891ffa3b70ae6c9698a1a722025a0 Author: Changli Gao Date: Wed Mar 31 22:58:26 2010 +0000 net: check the length of the socket address passed to connect(2) check the length of the socket address passed to connect(2). Check the length of the socket address passed to connect(2). If the length is invalid, -EINVAL will be returned. Signed-off-by: Changli Gao ---- net/bluetooth/l2cap.c | 3 ++- net/bluetooth/rfcomm/sock.c | 3 ++- net/bluetooth/sco.c | 3 ++- net/can/bcm.c | 3 +++ net/ieee802154/af_ieee802154.c | 3 +++ net/ipv4/af_inet.c | 5 +++++ net/netlink/af_netlink.c | 3 +++ 7 files changed, 20 insertions(+), 3 deletions(-) Signed-off-by: David S. Miller commit a1d6f3f65512cc90a636e6ec653b7bc9e2238753 Author: Giuseppe CAVALLARO Date: Wed Mar 31 21:44:04 2010 +0000 stmmac: add documentation for the driver. Add Documentation/networking/stmmac.txt for the stmmac network driver. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 7ba8a9b4f92e9559933af305c9b11e9beb97f9ea Author: Carmelo AMOROSO Date: Wed Mar 31 21:44:03 2010 +0000 stmmac: fix kconfig for crc32 build error stmmac uses crc32 functions so it needs to select CRC32. Fixes build error: drivers/built-in.o: In function `dwmac1000_set_filter': dwmac1000_core.c:(.text+0x3c380): undefined reference to `crc32_le' dwmac1000_core.c:(.text+0x3c384): undefined reference to `bitrev32' Signed-off-by: Carmelo Amoroso Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 9cae9e4f8b5887d8ef46fc56c7ca97814ae741ce Author: Ajit Khaparde Date: Wed Mar 31 02:00:32 2010 +0000 be2net: fix bug in vlan rx path for big endian architecture vlan traffic on big endian architecture is broken. Need to swap the vid before giving packet to stack. This patch fixes it. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 8b93b710a9cd70d67013b4b0f00df7dfda058064 Author: Ajit Khaparde Date: Wed Mar 31 01:57:10 2010 +0000 be2net: fix flashing on big endian architectures Flashing is broken on big endian architectures like ppc. This patch fixes it. From: Naresh G Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit f510fc64cce4646a1fd3c7e5ba7e36cad7e98f02 Author: Ajit Khaparde Date: Wed Mar 31 01:47:45 2010 +0000 be2net: fix a bug in flashing the redboot section Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 042be38e6106ed70b42d096ab4a1ed4187e510e6 Author: Yinghai Lu Date: Thu Apr 1 14:32:43 2010 -0700 ibft, x86: Change reserve_ibft_region() to find_ibft_region() This allows arch code could decide the way to reserve the ibft. And we should reserve ibft as early as possible, instead of BOOTMEM stage, in case the table is in RAM range and is not reserved by BIOS (this will often be the case.) Move to just after find_smp_config(). Also when CONFIG_NO_BOOTMEM=y, We will not have reserve_bootmem() anymore. -v2: fix typo about ibft pointed by Konrad Rzeszutek Wilk Signed-off-by: Yinghai Lu LKML-Reference: <4BB510FB.80601@kernel.org> Cc: Pekka Enberg Cc: Peter Jones Cc: Konrad Rzeszutek Wilk CC: Jan Beulich Signed-off-by: H. Peter Anvin commit b4a5e8a1deca7e61ebaffb37344766b0f0e9f327 Author: Alok Kataria Date: Thu Mar 11 14:00:16 2010 -0800 x86, hpet: Fix bug in RTC emulation We think there exists a bug in the HPET code that emulates the RTC. In the normal case, when the RTC frequency is set, the rtc driver tells the hpet code about it here: int hpet_set_periodic_freq(unsigned long freq) { uint64_t clc; if (!is_hpet_enabled()) return 0; if (freq <= DEFAULT_RTC_INT_FREQ) hpet_pie_limit = DEFAULT_RTC_INT_FREQ / freq; else { clc = (uint64_t) hpet_clockevent.mult * NSEC_PER_SEC; do_div(clc, freq); clc >>= hpet_clockevent.shift; hpet_pie_delta = (unsigned long) clc; } return 1; } If freq is set to 64Hz (DEFAULT_RTC_INT_FREQ) or lower, then hpet_pie_limit (a static) is set to non-zero. Then, on every one-shot HPET interrupt, hpet_rtc_timer_reinit is called to compute the next timeout. Well, that function has this logic: if (!(hpet_rtc_flags & RTC_PIE) || hpet_pie_limit) delta = hpet_default_delta; else delta = hpet_pie_delta; Since hpet_pie_limit is not 0, hpet_default_delta is used. That corresponds to 64Hz. Now, if you set a different rtc frequency, you'll take the else path through hpet_set_periodic_freq, but unfortunately no one resets hpet_pie_limit back to 0. Boom....now you are stuck with 64Hz RTC interrupts forever. The patch below just resets the hpet_pie_limit value when requested freq is greater than DEFAULT_RTC_INT_FREQ, which we think fixes this problem. Signed-off-by: Alok N Kataria LKML-Reference: <201003112200.o2BM0Hre012875@imap1.linux-foundation.org> Signed-off-by: Daniel Hecht Cc: Venkatesh Pallipadi Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 8da854cb02156c90028233ae1e85ce46a1d3f82c Author: Pallipadi, Venkatesh Date: Thu Feb 25 10:53:48 2010 -0800 x86, hpet: Erratum workaround for read after write of HPET comparator On Wed, Feb 24, 2010 at 03:37:04PM -0800, Justin Piszcz wrote: > Hello, > > Again, on the Intel DP55KG board: > > # uname -a > Linux host 2.6.33 #1 SMP Wed Feb 24 18:31:00 EST 2010 x86_64 GNU/Linux > > [ 1.237600] ------------[ cut here ]------------ > [ 1.237890] WARNING: at arch/x86/kernel/hpet.c:404 hpet_next_event+0x70/0x80() > [ 1.238221] Hardware name: > [ 1.238504] hpet: compare register read back failed. > [ 1.238793] Modules linked in: > [ 1.239315] Pid: 0, comm: swapper Not tainted 2.6.33 #1 > [ 1.239605] Call Trace: > [ 1.239886] [] ? warn_slowpath_common+0x73/0xb0 > [ 1.240409] [] ? tick_dev_program_event+0x38/0xc0 > [ 1.240699] [] ? warn_slowpath_fmt+0x40/0x50 > [ 1.240992] [] ? tick_dev_program_event+0x38/0xc0 > [ 1.241281] [] ? hpet_next_event+0x70/0x80 > [ 1.241573] [] ? tick_dev_program_event+0x38/0xc0 > [ 1.241859] [] ? tick_handle_oneshot_broadcast+0xe2/0x100 > [ 1.246533] [] ? timer_interrupt+0x1a/0x30 > [ 1.246826] [] ? handle_IRQ_event+0x39/0xd0 > [ 1.247118] [] ? handle_edge_irq+0xb8/0x160 > [ 1.247407] [] ? handle_irq+0x15/0x20 > [ 1.247689] [] ? do_IRQ+0x62/0xe0 > [ 1.247976] [] ? ret_from_intr+0x0/0xa > [ 1.248262] [] ? mwait_idle+0x57/0x80 > [ 1.248796] [] ? cpu_idle+0x5c/0xb0 > [ 1.249080] ---[ end trace db7f668fb6fef4e1 ]--- > > Is this something Intel has to fix or is it a bug in the kernel? This is a chipset erratum. Thomas: You mentioned we can retain this check only for known-buggy and hpet debug kind of options. But here is the simple workaround patch for this particular erratum. Some chipsets have a erratum due to which read immediately following a write of HPET comparator returns old comparator value instead of most recently written value. Erratum 15 in "Intel I/O Controller Hub 9 (ICH9) Family Specification Update" (http://www.intel.com/assets/pdf/specupdate/316973.pdf) Workaround for the errata is to read the comparator twice if the first one fails. Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20100225185348.GA9674@linux-os.sc.intel.com> Signed-off-by: H. Peter Anvin Cc: Venkatesh Pallipadi Cc: commit aa235fc712f379d4194cff9217f07026c452c141 Author: Yinghai Lu Date: Wed Mar 31 20:45:27 2010 -0700 bootmem, x86: Fix 32bit numa system without RAM on node 0 When 32bit numa is used, free_all_bootmem() will still only go over with node id 0. If node 0 doesn't have RAM installed, the lowest populated node becomes low RAM. This one fixes BOOTMEM path by iterating over the bdata_list. -v3: add more comments, and fix bootmem path too. -v4: seperate from one big patch Signed-off-by: Yinghai Lu LKML-Reference: <4BB416D7.6090203@kernel.org> Signed-off-by: H. Peter Anvin commit 337998587f802535896e9ed16d19f97915ccd368 Author: Yinghai Lu Date: Wed Mar 31 20:44:09 2010 -0700 nobootmem, x86: Fix 32bit numa system without RAM on node 0 On one system without RAM on node0, got following boot dump with a 32 bit NUMA kernel: early_node_map[4] active PFN ranges 1: 0x00000010 -> 0x00000099 1: 0x00000100 -> 0x0007da00 1: 0x0007e800 -> 0x0007ffa0 1: 0x0007ffae -> 0x0007ffb0 ... Subtract (29 early reservations) #000 [0000001000 - 0000002000] #001 [0000089000 - 000008f000] #002 [0000091000 - 0000093500] ... #027 [007cbfef40 - 007e800000] #028 [007e9ca000 - 007ff95000] (0 free memory ranges) Initializing HighMem for node 0 (00000000:00000000) Initializing HighMem for node 1 (00000000:00000000) Memory: 0k/2096832k available (6662k kernel code, 2096300k reserved, 4829k data, 484k init, 0k highmem) ... Checking if this processor honours the WP bit even in supervisor mode...Ok. swapper: page allocation failure. order:0, mode:0x0 Pid: 0, comm: swapper Not tainted 2.6.34-rc3-tip-03818-g4b1ea6c-dirty #35 Call Trace: [<4087a5dc>] ? printk+0xf/0x11 [<40286728>] __alloc_pages_nodemask+0x417/0x487 [<402a9ce1>] new_slab+0xe2/0x1fe [<402aa5b2>] kmem_cache_open+0x185/0x358 [<402abbc0>] T.954+0x1c/0x60 [<40d52a29>] kmem_cache_init+0x24/0x113 [<40d39738>] start_kernel+0x166/0x2e4 [<40d3940e>] ? unknown_bootoption+0x0/0x18e [<40d390ce>] i386_start_kernel+0xce/0xd5 Mem-Info: Node 1 DMA per-cpu: CPU 0: hi: 0, btch: 1 usd: 0 Node 1 Normal per-cpu: CPU 0: hi: 0, btch: 1 usd: 0 active_anon:0 inactive_anon:0 isolated_anon:0 active_file:0 inactive_file:0 isolated_file:0 unevictable:0 dirty:0 writeback:0 unstable:0 free:0 slab_reclaimable:0 slab_unreclaimable:0 mapped:0 shmem:0 pagetables:0 bounce:0 When 32bit NUMA is used, free_all_bootmem() will still only go over with node id 0. If node 0 doesn't have RAM installed, We need to go with node1 because early_node_map still use 1 for all ranges, and ram from node1 become low ram. Use MAX_NUMNODES like 64-bit NUMA does. Note: BOOTMEM path has the same problem. this bug exist before We have NO_BOOTMEM support. -v3: add more comments, and fix bootmem path too. -v4: seperate bootmem path fix Signed-off-by: Yinghai Lu LKML-Reference: <4BB41689.9090502@kernel.org> Signed-off-by: H. Peter Anvin commit 909fc87b32b3b9e3f0b87dcc5d98319c41900c58 Author: Andi Kleen Date: Mon Mar 29 09:41:11 2010 +0200 x86: Handle overlapping mptables We found a system where the MP table MPC and MPF structures overlap. That doesn't really matter because the mptable is not used anyways with ACPI, but it leads to a panic in the early allocator due to the overlapping reservations in 2.6.33. Earlier kernels handled this without problems. Simply change these reservations to reserve_early_overlap_ok to avoid the panic. Reported-by: Thomas Renninger Tested-by: Thomas Renninger Signed-off-by: Andi Kleen LKML-Reference: <20100329074111.GA22821@basil.fritz.box> Signed-off-by: H. Peter Anvin Cc: commit 819ccbfa448403992ceafc05d6d7097aaa74d4c3 Author: Sage Weil Date: Thu Apr 1 09:33:46 2010 -0700 ceph: fix leaked inode ref due to snap metadata writeback race We create a ceph_cap_snap if there is dirty cap metadata (for writeback to mds) OR dirty pages (for writeback to osd). It is thus possible that the metadata has been written back to the MDS but the OSD data has not when the cap_snap is created. This results in a cap_snap with dirty(caps) == 0. The problem is that cap writeback to the MDS isn't necessary, and a FLUSHSNAP cap op gets no ack from the MDS. This leaves the cap_snap attached to the inode along with its inode reference. Fix the problem by dropping the cap_snap if it becomes 'complete' (all pages written out) and dirty(caps) == 0 in ceph_put_wrbuffer_cap_refs(). Also, BUG() in __ceph_flush_snaps() if we encounter a cap_snap with dirty(caps) == 0. Signed-off-by: Sage Weil commit 6298a33757ba7361bb8f506c106daad77e5ac8cf Author: Sage Weil Date: Wed Mar 31 22:01:38 2010 -0700 ceph: fix snap context reference leaks The get_oldest_context() helper takes a reference to the returned snap context, but most callers weren't dropping that reference. Fix them. Also drop the unused locked __get_oldest_context() variant. Signed-off-by: Sage Weil commit 80e755fedebc8de0599a79efad2c656503df2e62 Author: Sage Weil Date: Wed Mar 31 21:52:10 2010 -0700 ceph: allow writeback of snapped pages older than 'oldest' snapc On snap deletion, we don't regenerate ceph_cap_snaps for inodes with dirty pages because deletion does not affect metadata writeback. However, we did run into problems when we went to write back the pages because the 'oldest' snapc is determined by the oldest cap_snap, and that may be the newer snapc that reflects the deletion. This caused confusion and an infinite loop in ceph_update_writeable_page(). Change the snapc checks to allow writeback of any snapc that is equal to OR older than the 'oldest' snapc. When there are no cap_snaps, we were also using the realm's latest snapc for writeback, which complicates ceph_put_wrbufffer_cap_refs(). Instead, use i_head_snapc, the most snapc used for the most recent ('head') data. This makes the writeback snapc (ceph_osd_request.r_snapc) _always_ match a capsnap or i_head_snapc. Also, in writepags_finish(), drop the snapc referenced by the _page_ and do not assume it matches the request snapc (it may not anymore). Signed-off-by: Sage Weil commit 42be79e37e264557f12860fa4cc84b4de3685954 Merge: 445c682 d668046 Author: Linus Torvalds Date: Thu Apr 1 09:19:42 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits) drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus. drm/radeon/kms: rs400/480 should set common registers. drm/radeon/kms: add sanity check to wptr. drm/radeon/kms/evergreen: get DP working drm/radeon/kms: add hw_i2c module option drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks drm/radeon/kms: disable MSI on IGP chips drm/radeon/kms: display watermark updates (v2) drm/radeon/kms/dp: disable training pattern on the sink at the end of link training drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2) drm/radeon/kms/dp: remove extraneous training complete call drm/radeon/kms/atom: minor fixes to transmitter setup drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM. drm: fix build error when SYSRQ is disabled drm/radeon/kms: fix macbookpro connector quirk drm/radeon/r6xx/r7xx: further safe reg clean up drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support drm/radeon/kms: bump the version for r6xx/r7xx const buffer support drm/radeon/r6xx/r7xx: CS parser fixes drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup ... Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c commit 445c682b93479c06d1b062b63ed79202f3ed5503 Merge: c7681f4 ca3865b Author: Linus Torvalds Date: Thu Apr 1 09:14:20 2010 -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: (35 commits) microblaze: Support word copying in copy_tofrom_user microblaze: Print early printk information to log buffer microblaze: head.S typo fix microblaze: Use MICROBLAZE_TLB_SIZE in asm code microblaze: Kconfig Fix - pci microblaze: Adding likely macros microblaze: Add .type and .size to ASM functions microblaze: Fix TLB macros microblaze: Use instruction with delay slot microblaze: Remove additional resr and rear loading microblaze: Change register usage for ESR and EAR microblaze: Prepare work for optimization in exception code microblaze: Add DEBUG option microblaze: Support systems without lmb bram microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user microblaze: uaccess: Unify __copy_tofrom_user microblaze: uaccess: Move functions to generic location microblaze: uaccess: Fix put_user for noMMU microblaze: uaccess: Fix get_user macro for noMMU microblaze: uaccess: fix clear_user for noMMU kernel ... commit c7681f4637df65082aeee1ea1ff0479607d71982 Merge: b95c35e ee027e4 Author: Linus Torvalds Date: Thu Apr 1 09:13:57 2010 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops asus-laptop: fix warning in asus_handle_init commit 91cb17314e74d0e5ab572b4b84b9398c61b71abb Author: Takashi Iwai Date: Thu Apr 1 18:08:29 2010 +0200 ALSA: hda - Update document about MSI and interrupts Signed-off-by: Takashi Iwai commit b95c35e76b29ba812e5dabdd91592e25ec640e93 Author: Oleg Nesterov Date: Thu Apr 1 15:13:57 2010 +0200 oom: fix the unsafe usage of badness() in proc_oom_score() proc_oom_score(task) has a reference to task_struct, but that is all. If this task was already released before we take tasklist_lock - we can't use task->group_leader, it points to nowhere - it is not safe to call badness() even if this task is ->group_leader, has_intersects_mems_allowed() assumes it is safe to iterate over ->thread_group list. - even worse, badness() can hit ->signal == NULL Add the pid_alive() check to ensure __unhash_process() was not called. Also, use "task" instead of task->group_leader. badness() should return the same result for any sub-thread. Currently this is not true, but this should be changed anyway. Signed-off-by: Oleg Nesterov Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 1af185034662b75279f90e1c7cb958271d4121e2 Author: Herbert Xu Date: Wed Mar 31 20:13:39 2010 +0000 ide: Must hold queue lock when requeueing ide-atapi requeues requests without holding the queue lock. This patch fixes it by using ide_requeue_and_plug. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6072f7491f5ef391a575e18a1165e72a3eef1601 Author: Herbert Xu Date: Wed Mar 31 20:11:59 2010 +0000 ide: Requeue request after DMA timeout I noticed that my KVM virtual machines were experiencing IDE issues resulting in processes stuck on waiting for buffers to complete. The root cause is of course race conditions in the ancient qemu backend that I'm using. However, the fact that the guest isn't recovering is a bug. I've tracked it down to the change made last year to dequeue requests at the start rather than at the end in the IDE layer. commit 8f6205cd572fece673da0255d74843680f67f879 Author: Tejun Heo Date: Fri May 8 11:53:59 2009 +0900 ide: dequeue in-flight request The problem is that the function ide_dma_timeout_retry does not requeue the current request, causing one request to be lost for each DMA timeout. This patch fixes this by requeueing the request. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit ca3865bae5ff86f5670edc9beebbd1f58c29de85 Author: Michal Simek Date: Mon Mar 22 20:31:26 2010 +0100 microblaze: Support word copying in copy_tofrom_user Word copying is used only for aligned addresses. Here is space for improving to use any better copying technique. Look at memcpy implementation. Signed-off-by: Michal Simek commit 6059b3cbeb27a38e3ca9ac9d2827f7b5be32e2ba Author: Michal Simek Date: Wed Mar 24 11:07:10 2010 +0100 microblaze: Print early printk information to log buffer If early printk console is not enabled then all messages are written to log buffer. Signed-off-by: Michal Simek commit 3f2189358666b6fa09d41f527be07b3cc8026050 Author: Michal Simek Date: Wed Mar 24 11:06:23 2010 +0100 microblaze: head.S typo fix I forget to change register name in comments. Signed-off-by: Michal Simek commit 0691c97d74cbdfd49333ef01939ecaef158ebe1b Author: Michal Simek Date: Wed Mar 24 10:09:17 2010 +0100 microblaze: Use MICROBLAZE_TLB_SIZE in asm code TLB size was hardcoded in asm code. This patch brings ability to change TLB size only in one place. (mmu.h). Signed-off-by: Michal Simek commit 9373dd6ab140f1e6f2e62a9f0bf473987a0b62dc Author: Michal Simek Date: Tue Mar 23 15:46:10 2010 +0100 microblaze: Kconfig Fix - pci I forget to remove pci Kconfig option. Signed-off-by: Michal Simek commit 78ebfa884bcef125464399f8d1cb05937bfeb6e1 Author: Michal Simek Date: Tue Mar 23 15:37:02 2010 +0100 microblaze: Adding likely macros On the base on GCOV analytics is helpful to add likely/unlikely macros. Signed-off-by: Michal Simek commit 13851966da54be8e37863aa93ee2c8f3d3a3186a Author: Michal Simek Date: Tue Mar 23 08:09:32 2010 +0100 microblaze: Add .type and .size to ASM functions Cachegrind analysis need this fix to be able to log asm functions. Signed-off-by: Michal Simek commit e84452dd9ff517bd3028f6444d000727cd39e783 Author: Michal Simek Date: Mon Mar 22 14:54:35 2010 +0100 microblaze: Fix TLB macros To be able to do trace TLB operations. Signed-off-by: Michal Simek commit 3765d6958dfff34a15588e23c5d1274e1f6ba200 Author: Michal Simek Date: Mon Mar 22 20:43:27 2010 +0100 microblaze: Use instruction with delay slot Sync labels. Signed-off-by: Michal Simek commit bd1637d63e82aaf732ffbe907ba887fa12e82df4 Author: Michal Simek Date: Fri Mar 19 12:50:35 2010 +0100 microblaze: Remove additional resr and rear loading RESR and REAR uses the same regs in whole file. Signed-off-by: Michal Simek commit b175bcfe31cba846d8bfa35a3a4820667f7af383 Author: Michal Simek Date: Fri Mar 19 12:44:40 2010 +0100 microblaze: Change register usage for ESR and EAR This change synchronize register usage in code. ESR = R4 EAR = R3 Signed-off-by: Michal Simek commit 7a6bbdc9304b45cc759e03623cbe63d81aff7337 Author: Michal Simek Date: Mon Mar 22 20:37:23 2010 +0100 microblaze: Prepare work for optimization in exception code Any sync branch must follow mts instructions not mfs. Signed-off-by: Michal Simek commit 708e7153d6fc4d2e5fe15c6ccc5d2907fe8a9c8d Author: Michal Simek Date: Thu Mar 18 07:23:04 2010 +0100 microblaze: Add DEBUG option Disable debug option in asm code. Signed-off-by: Michal Simek commit ee68f1745e7734a55c8bf680f6f464205f1f15da Author: Michal Simek Date: Mon Mar 15 08:48:27 2010 +0100 microblaze: Support systems without lmb bram When the system has no lmb bram, main memory should be start from zero because of microblaze vectors. DTS fragment could look like: DDR2_SDRAM: memory@0 { device_type = "memory"; reg = < 0x0 0x10000000 >; } ; Then you have to setup CONFIG_KERNEL_BASE_ADDR=0 which caused that kernel physical start address will be zero. On reset vector place will be jump to 0x100 and on 0x100 starts kernel text. You have to solve how to load the kernel before cpu starts. Tested with XMD. Signed-off-by: Michal Simek commit 89ae9753aef160c2f7bcecec21a7c4a6bc4c9b9b Author: Michal Simek Date: Mon Mar 22 18:49:45 2010 +0100 microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user Last sync. Signed-off-by: Michal Simek commit 94804a9b3d0e62096a52fb62afcea32b899380c5 Author: Michal Simek Date: Mon Mar 22 18:39:20 2010 +0100 microblaze: uaccess: Unify __copy_tofrom_user Move to generic location. Signed-off-by: Michal Simek commit cca79120c253451220e589a104bdeb57e4901871 Author: Michal Simek Date: Mon Mar 22 18:23:45 2010 +0100 microblaze: uaccess: Move functions to generic location noMMU and MMU use them. Signed-off-by: Michal Simek commit ef4e277b5d86e56db650137de0b1cd16ded32498 Author: Michal Simek Date: Mon Mar 22 16:22:41 2010 +0100 microblaze: uaccess: Fix put_user for noMMU Here is small regression on dhrystone tests and I think that on all benchmarking tests. It is due to better checking mechanism in put_user macro Signed-off-by: Michal Simek commit 3a6d77245efe062993284fd1c2f7510d9a90efe1 Author: Michal Simek Date: Mon Mar 8 10:52:24 2010 +0100 microblaze: uaccess: Fix get_user macro for noMMU Use unified version. Signed-off-by: Michal Simek commit 527bdb52d50ddbc8dd64369e464d7a08bc7eb83c Author: Michal Simek Date: Mon Mar 22 16:02:59 2010 +0100 microblaze: uaccess: fix clear_user for noMMU kernel Previous patches fixed only MMU version and this is the first patch for noMMU kernel Signed-off-by: Michal Simek commit 40e11e3380d4bd14bb3d85c7e7b863075a6a8d86 Author: Michal Simek Date: Mon Mar 8 09:38:02 2010 +0100 microblaze: uaccess: Fix strncpy_from_user function Generic implementation for noMMU and MMU version Signed-off-by: Michal Simek commit 4270690bd4b1420a8d634ea31953a1c4def2a44a Author: Michal Simek Date: Mon Mar 22 15:56:32 2010 +0100 microblaze: uaccess: fix copy_from_user macro copy_from_user macro also use copy_tofrom_user function Signed-off-by: Michal Simek commit cc5a428b7ae9c2d6233b5bf6b3e6fbb24ddd1ed5 Author: Michal Simek Date: Mon Mar 22 15:52:53 2010 +0100 microblaze: uaccess: copy_to_user unification noMMU and MMU kernel will use copy copy_tofrom_user asm implementation. Signed-off-by: Michal Simek commit 0dcb409de73edeb221aed38d9ff8640cf41ff0de Author: Michal Simek Date: Mon Mar 22 15:46:56 2010 +0100 microblaze: uaccess: sync put/get/clear_user macros Add macro description and resort. Signed-off-by: Michal Simek commit 8b651aa4a7c047b848f3a7bdf0aba9449e6dc3d3 Author: Michal Simek Date: Mon Mar 22 15:25:12 2010 +0100 microblaze: uaccess: fix put_user and get_user macros Use FIXUP macros and resort them. Signed-off-by: Michal Simek commit c77a9c4bb7b6e26400853c92d74ccc697c5e2f7e Author: Michal Simek Date: Fri Mar 5 18:03:53 2010 +0100 microblaze: uaccess: fix __get_user_asm macro It is used __FIXUP_SECTION and __EX_TABLE_SECTION macros. Signed-off-by: Michal Simek commit 40b1156db09ab2df48aa4970ddf4a27a17246f1f Author: Michal Simek Date: Fri Mar 5 16:50:01 2010 +0100 microblaze: uaccess: fix clean user macro This is the first patch which does uaccess unification. I choosed to do several patches to be able to use bisect in future if any fault happens. Signed-off-by: Michal Simek commit 60a729f7bb936a9ab82b430de70a1952f560adf3 Author: Michal Simek Date: Fri Mar 5 15:49:53 2010 +0100 microblaze: move noMMU __range_ok function to uaccess.h The same noMMU and MMU functions should be placed in one file. Signed-off-by: Michal Simek commit 357bc3c9284b2fb201786176e8187d2273323bc1 Author: Michal Simek Date: Fri Mar 5 15:37:57 2010 +0100 microblaze: Move exception_table_entry upward Just sort to be able remove whole block. Signed-off-by: Michal Simek commit 40db0834337ef0cde586feeb5588e45f0349098b Author: Michal Simek Date: Fri Mar 5 15:34:12 2010 +0100 microblaze: Remove segment.h I would like to use asm-generic uaccess.h where are segment macros defined. This is just first step. Signed-off-by: Michal Simek commit 4009819cf90c26e3ec7b0ed949d5ff37c568e197 Author: Michal Simek Date: Wed Mar 3 17:03:21 2010 +0100 microblaze: Remove memset in free_init_pages We don't need to do it. Signed-off-by: Michal Simek commit 6fa114e0f18fb33b66fd5ee9037052830198a8c4 Author: Arun Bhanu Date: Wed Mar 17 16:06:04 2010 +0800 microblaze: Makefile cleanups If CONFIG_INITRAMFS_SOURCE is set, "scripts/gen_initramfs_list.sh" checks if the cpio image exists. Remove the duplicate check from the Makefile. Remove the "clean-kernel" variable which is unused in the Makefile and is not used by the Kbuild. Signed-off-by: Arun Bhanu Signed-off-by: Michal Simek commit 8a8804f1ab2d3226bfa9f9a64c4316f9a01f8ee9 Author: Arun Bhanu Date: Wed Mar 17 16:06:03 2010 +0800 microblaze: Fix Makefile to delete build generated files 'make clean' does not to delete the following build generated file: arch/microblaze/boot/linux.bin.ub 'make mrproper' does not to delete the following build generated files: arch/microblaze/boot/simpleImage.* Fix the Makefile to delete these build generated files. See [1] for a discussion on why simpleImage.* files are deleted with 'make mrproper' and not with 'make clean'. [1] http://lkml.org/lkml/2010/3/12/96 Signed-off-by: Arun Bhanu Signed-off-by: Michal Simek commit 699d17bc14edceb710998349fa74e66be3042372 Author: Arun Bhanu Date: Fri Mar 12 16:31:40 2010 +0800 microblaze: Add a missing single quote to make 'make help' happy 'make ARCH=microblaze help' fails with the following error due to a missing single quote. /bin/sh: -c: line 0: unexpected EOF while looking for matching `'' /bin/sh: -c: line 1: syntax error: unexpected end of file make: *** [help] Error 2 Signed-off-by: Arun Bhanu Signed-off-by: Michal Simek commit 0c4ec16b86e6a823bc6e9fbe08a724d517eb3c24 Author: Steven J. Magnani Date: Wed Feb 24 14:54:15 2010 -0600 microblaze: Fix "kstack=" parsing The "kstack=" command line parameter is not parsed correctly. All proper values are interpreted as zero. Signed-off-by: Steven J. Magnani Signed-off-by: Michal Simek commit ab310b5edb8b601bcb02491ed6f7676da4fd1757 Author: Jason Wessel Date: Tue Mar 30 14:05:07 2010 -0500 x86,kgdb: Always initialize the hw breakpoint attribute It is required to call hw_breakpoint_init() on an attr before using it in any other calls. This fixes the problem where kgdb will sometimes fail to initialize on x86_64. Signed-off-by: Jason Wessel Cc: Ingo Molnar Cc: 2.6.33 LKML-Reference: <1269975907-27602-1-git-send-email-jason.wessel@windriver.com> Signed-off-by: Frederic Weisbecker commit e49a5bd38159dfb1928fd25b173bc9de4bbadb21 Author: Frederic Weisbecker Date: Mon Mar 22 19:40:03 2010 +0100 perf: Use hot regs with software sched switch/migrate events Scheduler's task migration events don't work because they always pass NULL regs perf_sw_event(). The event hence gets filtered in perf_swevent_add(). Scheduler's context switches events use task_pt_regs() to get the context when the event occured which is a wrong thing to do as this won't give us the place in the kernel where we went to sleep but the place where we left userspace. The result is even more wrong if we switch from a kernel thread. Use the hot regs snapshot for both events as they belong to the non-interrupt/exception based events family. Unlike page faults or so that provide the regs matching the exact origin of the event, we need to save the current context. This makes the task migration event working and fix the context switch callchains and origin ip. Example: perf record -a -e cs Before: 10.91% ksoftirqd/0 0 [k] 0000000000000000 | --- (nil) perf_callchain perf_prepare_sample __perf_event_overflow perf_swevent_overflow perf_swevent_add perf_swevent_ctx_event do_perf_sw_event __perf_sw_event perf_event_task_sched_out schedule run_ksoftirqd kthread kernel_thread_helper After: 23.77% hald-addon-stor [kernel.kallsyms] [k] schedule | --- schedule | |--60.00%-- schedule_timeout | wait_for_common | wait_for_completion | blk_execute_rq | scsi_execute | scsi_execute_req | sr_test_unit_ready | | | |--66.67%-- sr_media_change | | media_changed | | cdrom_media_changed | | sr_block_media_changed | | check_disk_change | | cdrom_open v2: Always build perf_arch_fetch_caller_regs() now that software events need that too. They don't need it from modules, unlike trace events, so we keep the EXPORT_SYMBOL in trace_event_perf.c Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar Cc: David Miller commit eb1e79611cc9bfe21978230e3521e77ea2d7874a Author: Frederic Weisbecker Date: Tue Mar 23 00:08:59 2010 +0100 perf: Correctly align perf event tracing buffer The trace event buffer used by perf to record raw sample events is typed as an array of char and may then not be aligned to 8 by alloc_percpu(). But we need it to be aligned to 8 in sparc64 because we cast this buffer into a random structure type built by the TRACE_EVENT() macro to store the traces. So if a random 64 bits field is accessed inside, it may be not under an expected good alignment. Use an array of long instead to force the appropriate alignment, and perform a compile time check to ensure the size in byte of the buffer is a multiple of sizeof(long) so that its actual size doesn't get shrinked under us. This fixes unaligned accesses reported while using perf lock in sparc 64. Suggested-by: David Miller Suggested-by: Tejun Heo Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar Cc: David Miller Cc: Steven Rostedt commit d668046c13024d74af7d04a124ba55f406380fe7 Author: Dave Airlie Date: Wed Mar 31 13:41:35 2010 +1000 drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus. Some GPUs have an APM/ACPI PM mode selection switch and some BIOSes set this to APM. We really want this in ACPI mode for Linux. Signed-off-by: Dave Airlie commit 08a370fa758fae7e387274ca3571ce625d7f829b Author: Dave Airlie Date: Wed Mar 31 13:42:50 2010 +1000 drm/radeon/kms: rs400/480 should set common registers. These GPUs should be setting these registers up also. Signed-off-by: Dave Airlie commit 9e5786bd14cb9ffe29ebe66d41cedf03311b0d30 Author: Dave Airlie Date: Wed Mar 31 13:38:56 2010 +1000 drm/radeon/kms: add sanity check to wptr. If we resume in a bad way, we'll get 0xffffffff in wptr, and then oops with no console. This just adds a sanity check so that we can avoid the oops and hopefully get more details out of people's systems. Signed-off-by: Dave Airlie commit fb668c2fed628179c7aa409a0de39a2b96bed18c Author: Alex Deucher Date: Wed Mar 31 14:42:11 2010 -0400 drm/radeon/kms/evergreen: get DP working Need to enable the VID stream after link training Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5dc056cce9e60528d5eac64efed623d26ffe46f Merge: 00ae702 7371400 Author: David S. Miller Date: Wed Mar 31 19:32:50 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit a42ab8e1a37257da37e0f018e707bf365ac24531 Author: Joel Becker Date: Wed Mar 31 18:25:44 2010 -0700 ocfs2: Compute metaecc for superblocks during online resize. Online resize writes out the new superblock and its backups directly. The metaecc data wasn't being recomputed. Let's do that directly. Signed-off-by: Joel Becker Acked-by: Mark Fasheh [ Cc: stable@kernel.org commit b857bd292223f54aaae3693c82fa7299a99991cd Author: David S. Miller Date: Wed Mar 31 18:05:05 2010 -0700 sparc: Fix regset register window handling. We have to adjust 'reg_window' down by 16 becuase the 'pos' iterator we'll use to index into the stack slots will be between 16 and 32. Signed-off-by: David S. Miller commit 9f3a5f52aa63d3aa4c64a7245153549bb66bad8c Author: Yinghai Lu Date: Mon Mar 29 22:38:29 2010 -0700 x86: Make e820_remove_range to handle all covered case Rusty found on lguest with trim_bios_range, max_pfn is not right anymore, and looks e820_remove_range does not work right. [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] LGUEST: 0000000000000000 - 0000000004000000 (usable) [ 0.000000] Notice: NX (Execute Disable) protection missing in CPU or disabled in BIOS! [ 0.000000] DMI not present or invalid. [ 0.000000] last_pfn = 0x3fa0 max_arch_pfn = 0x100000 [ 0.000000] init_memory_mapping: 0000000000000000-0000000003fa0000 root cause is: the e820_remove_range doesn't handle the all covered case. e820_remove_range(BIOS_START, BIOS_END - BIOS_START, ...) produces a bogus range as a result. Make it match e820_update_range() by handling that case too. Reported-by: Rusty Russell Signed-off-by: Yinghai Lu Tested-by: Rusty Russell LKML-Reference: <4BB18E55.6090903@kernel.org> Signed-off-by: H. Peter Anvin commit 3e340c05c0def3bb68db6751299b7821c2ba0621 Author: Jani Nikula Date: Thu Mar 11 16:17:28 2010 +0000 IB/cm: Fix device_create() return value check Use IS_ERR() instead of comparing to NULL. Signed-off-by: Jani Nikula Signed-off-by: Roland Dreier commit ee027e4aed3077c4bb3b585c67528eec0e7222df Author: Yong Wang Date: Sun Mar 21 10:26:34 2010 +0800 eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops Add a WMI driver for Eee PC laptops. Currently it only supports hotkeys. Signed-off-by: Yong Wang Signed-off-by: Matthew Garrett Acked-by: Dmitry Torokhov commit 167215118a88dd56a1ab8c8d33e279d6d40f57b6 Author: Corentin Chary Date: Tue Mar 2 22:24:12 2010 +0100 asus-laptop: fix warning in asus_handle_init In function 'asus_laptop_get_info': warning: passing argument 3 of 'asus_handle_init' from incompatible pointer type note: expected 'char **' but argument is of type 'const char **' Introduced by commit c21085108a02e1b838c34f3650c8cc9fbd178615 ("asus-laptop: fix style problems reported by checkpath.pl"). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 30d1872d9eb3663b4cf7bdebcbf5cd465674cced Author: Nikolaus Schulz Date: Thu Apr 1 02:21:10 2010 +0900 fat: fix buffer overflow in vfat_create_shortname() When using the string representation of a random counter as part of the base name, ensure that it is no longer than 4 bytes. Since we are repeatedly decrementing the counter in a loop until we have found a unique base name, the counter may wrap around zero; therefore, it is not enough to mask its higher bits before entering the loop, this must be done inside the loop. [hirofumi@mail.parknet.co.jp: use snprintf()] Signed-off-by: Nikolaus Schulz Cc: stable@kernel.org Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit fd187aaf980c45f1d16a94a846faa68e24de03c8 Author: Dominik Brodowski Date: Fri Mar 26 10:01:34 2010 +0100 [CPUFREQ] use max load in conservative governor Instead of using the load of the last CPU in a package, use the maximum load of all CPUs in a package. Reported-by: Jean-Christian Goussard Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 499bca9b6d3243f9278a1f5a22d00e67acdd844d Author: Amerigo Wang Date: Thu Mar 4 03:23:46 2010 -0500 [CPUFREQ] fix a lockdep warning There is no need to do sysfs_remove_link() or kobject_put() etc. when policy_rwsem_write is held, move them after releasing the lock. This fixes the lockdep warning: halt/4071 is trying to acquire lock: (s_active){++++.+}, at: [] .sysfs_addrm_finish+0x58/0xc0 but task is already holding lock: (&per_cpu(cpu_policy_rwsem, cpu)){+.+.+.}, at: [] .lock_policy_rwsem_write+0x84/0xf4 Reported-by: Benjamin Herrenschmidt Signed-off-by: WANG Cong Cc: Johannes Berg Cc: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 753649dbc49345a73a2454c770a3f2d54d11aec6 Author: Thomas Gleixner Date: Wed Mar 31 13:30:19 2010 +0200 genirq: Force MSI irq handlers to run with interrupts disabled Network folks reported that directing all MSI-X vectors of their multi queue NICs to a single core can cause interrupt stack overflows when enough interrupts fire at the same time. This is caused by the fact that we run interrupt handlers by default with interrupts enabled unless the driver reuqests the interrupt with the IRQF_DISABLED set. The NIC handlers do not set this flag, so simultaneous interrupts can nest unlimited and cause the stack overflow. The only safe counter measure is to run the interrupt handlers with interrupts disabled. We can't switch to this mode in general right now, but it is safe to do so for MSI interrupts. Force IRQF_DISABLED for MSI interrupt handlers. Signed-off-by: Thomas Gleixner Cc: Andi Kleen Cc: Linus Torvalds Cc: Andrew Morton Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Alan Cox Cc: David Miller Cc: Greg Kroah-Hartman Cc: Arnaldo Carvalho de Melo Cc: stable@kernel.org commit 00ae702847df5566ce9182e9c895185e2ad1c181 Author: Eric Dumazet Date: Tue Mar 30 23:08:37 2010 +0000 bonding: bond_xmit_roundrobin() fix Commit a2fd940f (bonding: fix broken multicast with round-robin mode) added a problem on litle endian machines. drivers/net/bonding/bond_main.c:4159: warning: comparison is always false due to limited range of data type Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d54a45e2533ef33678dc340298b022a289d2b3e3 Author: Ranjith Lohithakshan Date: Wed Mar 31 04:16:30 2010 -0600 OMAP3: clock: fix enable bit used for dpll4_m4x2 clock The enable bit for dpll4_m4x2 clock should be OMAP3430_PWRDN_DSS1_SHIFT. The code erroneously uses OMAP3430_PWRDN_CAM_SHIFT which is meant for dpll4_m5x2 clock. This came into notice during a recent review of the clock tree. Signed-off-by: Ranjith Lohithakshan Signed-off-by: Paul Walmsley commit 766d305fead341889e7b9611fdc97236075a29fb Author: Rajendra Nayak Date: Wed Mar 31 04:16:30 2010 -0600 OMAP4: prcm: Use logical OR instead of bitwise OR This patch fixes usage of bitwise OR in if conditions, and instead uses logical OR. Signed-off-by: Rajendra Nayak Cc: Abhijit Pagare Cc: Tony Lindgren Signed-off-by: Paul Walmsley commit 56dc79aba14bad1b73508df9e210e93bbd81a577 Author: Thara Gopinath Date: Wed Mar 31 04:16:29 2010 -0600 OMAP: HWMOD: Bug fixes in hwmod structure definitions This patch corrects the width of sysc_flags in hwmod sysconfig structure where the values to be stored to this variable exceed the current field width. Signed-off-by: Thara Gopinath [paul@pwsan.com: edited to apply; rearranged structure members to pack] Signed-off-by: Paul Walmsley commit d5647c18eac9a313a89a3049a9fff51b20021a44 Author: Thara Gopinath Date: Wed Mar 31 04:16:29 2010 -0600 OMAP: HWMOD: Adding clockdomain check This patch adds check for presence of clockdomain structure in the API omap_hwmod_get_pwrdm before trying to access the powerdomain structure. This will prevent unnecessary crashing of the system in case of a clock node with out an associated clockdomain. Signed-off-by: Thara Gopinath Signed-off-by: Paul Walmsley commit b8e80cf386419453678b01bef830f53445ebb15d Author: Daniel T Chen Date: Tue Mar 30 13:29:28 2010 -0400 ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981 BugLink: https://launchpad.net/bugs/551606 The OR's hardware distorts at PCM 100% because it does not correspond to 0 dB. Fix this in patch_ad1981() for all models using the Thinkpad quirk. Reported-by: Jane Silber Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 753234007f4ac2c96921cfb19ec1ba535ac29790 Author: Li Hong Date: Wed Mar 31 15:41:00 2010 +0800 nilfs2: fix a wrong type conversion in nilfs_ioctl() (void * __user *) should be (void __user *) Signed-off-by: Li Hong Signed-off-by: Ryusuke Konishi commit ce6fbdefb68d46db88170494b277551f955b48e2 Author: Julia Lawall Date: Mon Mar 29 05:35:05 2010 +0000 drivers/net: Add missing unlock Unlock the lock before leaving the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irqsave (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit ddc01b3b8ab224b346daf61976078b166f36b7e8 Author: Kim Phillips Date: Tue Mar 30 11:54:22 2010 +0000 net: gianfar - align BD ring size console messages fix this: eth2: :RX BD ring size for Q[0]: 256 eth2:TX BD ring size for Q[0]: 256 to look like: eth2: RX BD ring size for Q[0]: 256 eth2: TX BD ring size for Q[0]: 256 Signed-off-by: Kim Phillips Signed-off-by: David S. Miller commit ed130589d9afa3238c94b9537f2024355b9638e1 Author: Kim Phillips Date: Tue Mar 30 11:54:21 2010 +0000 net: gianfar - initialize per-queue statistics Interfaces come up claiming having already received 3.0 GiB. Use kzalloc to properly initialize per-queue data. Signed-off-by: Kim Phillips Signed-off-by: David S. Miller commit 7c0d10d35f7f47d00cc5f2b85ee5e95c2b1fdb7e Author: Andy Fleming Date: Mon Mar 29 15:42:23 2010 +0000 gianfar: Fix a memory leak in gianfar close code gianfar needed to ensure existence of the *skbuff arrays before freeing the skbs in them, rather than ensuring their nonexistence. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit e2b0a8e1e697dbcd62574a32f4f96151d21bdd36 Author: Alex Deucher Date: Wed Mar 17 02:07:37 2010 -0400 drm/radeon/kms: add hw_i2c module option Turn off hw i2c by default except for mm i2c which is hw only until we sort out the remaining prescale issues on older chips. hw i2c can be enabled with hw_i2c=1. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit ac1aade6876465060ebf9a71675dcb7305f0bafa Author: Alex Deucher Date: Sun Mar 14 12:22:44 2010 -0400 drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks This allows us to remove the internal bit algo bus used by the radeon i2c algo. We now register a radeon algo adapter if the gpio line is hw capable and the hw inplementation is available, otherwise we register a bit algo adapter. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3595be778d8cb887f0e0575ef0a0c1a094d120bb Merge: c414a11 220bf99 Author: Dave Airlie Date: Wed Mar 31 14:55:14 2010 +1000 Merge branch 'v2.6.34-rc2' into drm-linus commit c414a117c6094c3f86b533f97beaf45ef9075f03 Author: Alex Deucher Date: Tue Mar 30 17:22:32 2010 -0400 drm/radeon/kms: disable MSI on IGP chips Doesn't seem to work reliably and the pci quirks don't always work. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f46c01208da1881591e3f55ca77d37f54469f8e4 Author: Alex Deucher Date: Wed Mar 31 00:33:27 2010 -0400 drm/radeon/kms: display watermark updates (v2) - Add module option to force the display priority 0 = auto, 1 = normal, 2 = high - Default to high on r3xx/r4xx/rv515 chips Fixes flickering problems during heavy acceleration due to underflow to the display controllers - Fill in minimal support for RS600 v2 - update display priority when bandwidth is updated so the user can change the parameter at runtime and it will take affect on the next modeset. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3b01a1191fe76bd11e5743eceed7c25d8157239e Author: Alex Deucher Date: Tue Mar 30 02:03:48 2010 -0400 drm/radeon/kms/dp: disable training pattern on the sink at the end of link training Seems to have gotten lost in the evergreen merge. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9f998ad7e92a1653b6b396b1278e75560a8be519 Author: Alex Deucher Date: Mon Mar 29 21:37:08 2010 -0400 drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2) Some systems have LCD* rather than DFP* device tags in the bios for eDP connectors; notably the new apple iMac. This fixes things up so eDP connectors with either tag will work. v2: fix typo Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7f768957f407f7b8c8793eedaf7512049d092f29 Author: Alex Deucher Date: Mon Mar 29 14:06:10 2010 -0400 drm/radeon/kms/dp: remove extraneous training complete call Looks like a copy/paste typo from when evergreen support was added. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d9c9fe3622d15e7e84121ffedef60f4080ab4f03 Author: Alex Deucher Date: Mon Mar 29 17:39:44 2010 -0400 drm/radeon/kms/atom: minor fixes to transmitter setup - 8 lane links are not valid for DP - remove unused num var Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3ca82da3ebe019facd611184385897fa614e6b9e Author: Michel Dänzer Date: Fri Mar 26 19:18:55 2010 +0000 drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM. This prevented radeon.test=1 from testing transfers from/to GTT beyond the visible VRAM size. Signed-off-by: Michel Dänzer Signed-off-by: Dave Airlie commit b8c40d6269d5e515341599b2e395f2dab4490d74 Author: Randy Dunlap Date: Thu Mar 25 18:29:05 2010 +0000 drm: fix build error when SYSRQ is disabled Fix build error when CONFIG_MAGIC_SYSRQ is not enabled: drivers/gpu/drm/drm_fb_helper.c:915: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function) drivers/gpu/drm/drm_fb_helper.c:929: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function) Signed-off-by: Randy Dunlap Signed-off-by: Dave Airlie commit e1e8a5dd4faf356b5d31c620c5787eaa83ee831d Author: Alex Deucher Date: Fri Mar 26 17:14:37 2010 -0400 drm/radeon/kms: fix macbookpro connector quirk Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 97586c422b38c4c12e2b5011d59c401d03d09ed6 Author: Alex Deucher Date: Fri Mar 26 19:36:33 2010 -0400 drm/radeon/r6xx/r7xx: further safe reg clean up - remove a few more drm only regs - remove sampler, alu, bool, loop constant regs. They are set via separate packet3's already Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6bb118012ab0462d5ebc3ab17eb278416532cf15 Author: Alex Deucher Date: Fri Mar 26 15:26:51 2010 -0400 drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit fdb43528d4697b0e81e27a0d6539e744c2965cf2 Author: Alex Deucher Date: Fri Mar 26 15:24:14 2010 -0400 drm/radeon/kms: bump the version for r6xx/r7xx const buffer support Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 5f77df368c84d0a4a5913c8c78f0c6fa0b0db674 Author: Alex Deucher Date: Fri Mar 26 14:52:32 2010 -0400 drm/radeon/r6xx/r7xx: CS parser fixes - Drop some more safe regs taht userspace shouldn't hit - Constant base regs need relocs. This allows us to use constant buffers rather than the constant register file. Also we don't want userspace to be able to set arbitrary mc base values for the const caches. - Track SQ_CONFIG so we know whether userspace is using the cfile or constant buffers. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 5898b1f33c881fe1352464efd15faf7d26513b98 Author: Alex Deucher Date: Wed Mar 24 13:57:29 2010 -0400 drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d8fe2fa90ea9df694dcc022271391e7547772e1b Author: Alex Deucher Date: Wed Mar 24 18:45:32 2010 -0400 drm/radeon/r600: remove some regs are not safe regs for command buffers Only the drm should be touching them. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit da58405860b992d2bb21ebae5d685fe3204dd3f0 Author: Chris Wilson Date: Thu Mar 18 11:56:54 2010 +0000 drm: Return ENODEV if the inode mapping changes Replace a BUG_ON with an error code in the event that the inode mapping changes between calls to drm_open. This may happen for instance if udev is loaded subsequent to the original opening of the device: [ 644.291870] kernel BUG at drivers/gpu/drm/drm_fops.c:146! [ 644.291876] invalid opcode: 0000 [#1] SMP [ 644.291882] last sysfs file: /sys/kernel/uevent_seqnum [ 644.291888] [ 644.291895] Pid: 7276, comm: lt-cairo-test-s Not tainted 2.6.34-rc1 #2 N150/N210/N220 /N150/N210/N220 [ 644.291903] EIP: 0060:[] EFLAGS: 00210283 CPU: 0 [ 644.291912] EIP is at drm_open+0x4b1/0x4e2 [ 644.291918] EAX: f72d8d18 EBX: f790a400 ECX: f73176b8 EDX: 00000000 [ 644.291923] ESI: f790a414 EDI: f790a414 EBP: f647ae20 ESP: f647adfc [ 644.291929] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 644.291937] Process lt-cairo-test-s (pid: 7276, ti=f647a000 task=f73f5c80 task.ti=f647a000) [ 644.291941] Stack: [ 644.291945] 00000000 f7bb7400 00000080 f6451100 f73176b8 f6479214 f6451100 f73176b8 [ 644.291957] <0> c1297ce0 f647ae34 c11c6c04 f73176b8 f7949800 00000000 f647ae54 c1080ac5 [ 644.291969] <0> f7949800 f6451100 00000000 f6451100 f73176b8 f6452780 f647ae70 c107d1e6 [ 644.291982] Call Trace: [ 644.291991] [] ? drm_stub_open+0x8a/0xb8 [ 644.292000] [] ? chrdev_open+0xef/0x106 [ 644.292008] [] ? __dentry_open+0xd4/0x1a6 [ 644.292015] [] ? nameidata_to_filp+0x31/0x45 [ 644.292022] [] ? chrdev_open+0x0/0x106 [ 644.292030] [] ? do_last+0x346/0x423 [ 644.292037] [] ? do_filp_open+0x190/0x415 [ 644.292046] [] ? handle_mm_fault+0x214/0x710 [ 644.292053] [] ? do_sys_open+0x4d/0xe9 [ 644.292061] [] ? do_page_fault+0x211/0x23f [ 644.292068] [] ? sys_open+0x23/0x2b [ 644.292075] [] ? sysenter_do_call+0x12/0x26 [ 644.292079] Code: 89 f0 89 55 dc e8 8d 96 0a 00 8b 45 e0 8b 55 dc 83 78 04 01 75 28 8b 83 18 02 00 00 85 c0 74 0f 8b 4d ec 3b 81 ac 00 00 00 74 13 <0f> 0b eb fe 8b 4d ec 8b 81 ac 00 00 00 89 83 18 02 00 00 89 f0 [ 644.292143] EIP: [] drm_open+0x4b1/0x4e2 SS:ESP 0068:f647adfc [ 644.292175] ---[ end trace 2ddd476af89a60fa ]--- Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Dave Airlie commit fcbc451ba1948fba967198bd150ecbd10bbb7075 Author: Pauli Nieminen Date: Fri Mar 19 07:44:33 2010 +0000 drm/radeon/kms: Fix NULL pointer dereference if memory allocation failed. When there is allocation failure in radeon_cs_parser_relocs parser->nrelocs is not cleaned. This causes NULL pointer defeference in radeon_cs_parser_fini when clean up code is trying to loop over the relocation array and free the objects. Fix adds a check for a possible NULL pointer in clean up code. Signed-off-by: Pauli Nieminen Cc: stable@kernel.org Signed-off-by: Dave Airlie commit f9274562026558ab54a29331cf13e9ebec8cc890 Author: Jerome Glisse Date: Wed Mar 17 14:44:29 2010 +0000 drm/radeon/kms: avoid possible oops (call gart_fini before gart_disable) radeon_gart_fini might call GART unbind callback function which might try to access GART table but if gart_disable is call first the GART table will be unmapped so any access to it will oops. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 97f23b3d85a4d734a8584dade3a34579931c8f8d Author: Dave Airlie Date: Fri Mar 19 10:33:44 2010 +1000 drm/radeon/kms: don't print error on -ERESTARTSYS. We can get this if the user moves the mouse when we are waiting to move some stuff around in the validate. Don't fail. Cc: stable@kernel.org Signed-off-by: Dave Airlie commit a084e6ee6e64a76f1a9665d527203cdab7d6048f Author: Alex Deucher Date: Thu Mar 18 01:04:01 2010 -0400 drm/radeon/kms/atom: make sure tables are valid (v2) Check that atom cmd and data tables are valid before using them. (v2) - fix some whitespace errors noticed by Rafał Miłecki - check a few more cases Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c1bcad9d16831859373d8f579fa1e146409f9960 Author: Alex Deucher Date: Wed Mar 17 19:50:59 2010 -0400 drm/radeon/kms: remove lvds quirks - no longer needed with the latest new pll algo fixes. - also don't use lcd pll limits. They don't seem to work well for all systems. If we have a case where they are useful, we can set the flag for that case. fixes fdo bug 27083 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b2f8ccd84059f7d0c3e4f67d577abca391bc1868 Author: Alex Deucher Date: Sun Mar 21 11:09:24 2010 -0400 drm/radeon/kms: fix display bandwidth setup on rs4xx I missed rs4xx in 7f1e613daf0fdd0884316ab25a749db3c671329e Fixes fdo bug 27219. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f95df9ca6896978108201a77422a1ae2cdc595ec Author: Alex Deucher Date: Sun Mar 21 14:02:25 2010 -0400 drm/radeon/kms: never treat rs4xx as AGP RS4xx+ IGP chips use an internal gart, however, some of them have the agp cap bits set in their pci configs. Make sure to clear the AGP flag as AGP will not work with them. Should fix fdo bug 27225 Signed-off-by: Alex Deucher cc: stable@kernel.org Signed-off-by: Dave Airlie commit f47299c55a837af1727bc601e1fc0fa33adaeda5 Author: Alex Deucher Date: Tue Mar 16 20:54:38 2010 -0400 drm/radeon/kms: display watermark fixes - rs780/880 were using the wrong bandwidth functions - convert r1xx-r4xx to use the same pm sclk/mclk structs as r5xx+ - move bandwidth setup to a common function Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5e50daf92df8afcb701fd717b301985691e802f Author: Randy Dunlap Date: Wed Mar 31 11:33:42 2010 +0900 module: add stub for is_module_percpu_address Fix build for CONFIG_MODULES not enabled by providing a stub for is_module_percpu_address(). kernel/lockdep.c:605: error: implicit declaration of function 'is_module_percpu_address' Signed-off-by: Randy Dunlap Signed-off-by: Tejun Heo commit 0cad8a1130f77c7c445e3298c0e3593b3c0ef439 Author: Josef Bacik Date: Wed Mar 17 20:45:56 2010 +0000 Btrfs: fix chunk allocate size calculation If the amount of free space left in a device is less than what we think should be the minimum size, just ignore the minimum size and use the amount we have. I ran into this running tests on a 600mb volume, the chunk allocator wouldn't let me allocate the last 52mb of the disk for data because we want to have at least 64mb chunks for data. This patch fixes that problem. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 287a0ab91d25ca982f895a76402e5893b47ed7a6 Author: Josef Bacik Date: Fri Mar 19 18:07:23 2010 +0000 Btrfs: kill max_extent mount option As Yan pointed out, theres not much reason for all this complicated math to account for file extents being split up into max_extent chunks, since they are likely to all end up in the same leaf anyway. Since there isn't much reason to use max_extent, just remove the option altogether so we have one less thing we need to test. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 1b1d1f6625e517a08640ddb4b8f8a0e025243fe3 Author: Josef Bacik Date: Fri Mar 19 20:49:55 2010 +0000 Btrfs: fail to mount if we have problems reading the block groups We don't actually check the return value of btrfs_read_block_groups, so we can possibly succeed to mount, but then fail to say read the superblock xattr for selinux which will cause the vfs code to deactivate the super. This is a problem because in find_free_extent we just assume that we will find the right space_info for the allocation we want. But if we failed to read the block groups, we won't have setup any space_info's, and we'll hit a NULL pointer deref in find_free_extent. This patch fixes that problem by checking the return value of btrfs_read_block_groups, and failing out properly. I've also added a check in find_free_extent so if for some reason we don't find an appropriate space_info, we just return -ENOSPC. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 6cf8bfbf5e88edfb09a2bf0631a067060f534592 Author: Dan Carpenter Date: Sat Mar 20 11:22:10 2010 +0000 Btrfs: check btrfs_get_extent return for IS_ERR() btrfs_get_extent() never returns NULL, only a valid pointer or ERR_PTR() Signed-off-by: Dan Carpenter Signed-off-by: Chris Mason commit c2b96929e2ca6914cf4a66cd8fe2a34c4a98277f Author: Dan Carpenter Date: Sat Mar 20 11:24:15 2010 +0000 Btrfs: handle kmalloc() failure in inode lookup ioctl Return -ENOMEM if kmalloc() fails. Signed-off-by: Dan Carpenter Signed-off-by: Chris Mason commit 683be16eb6e19a35aca2473668652259ed074094 Author: Dan Carpenter Date: Sat Mar 20 11:24:48 2010 +0000 Btrfs: dereferencing freed memory The original code dereferenced range on the next line. Signed-off-by: Dan Carpenter Signed-off-by: Chris Mason commit f3eae7e8a5ed124bbc781e18ea10c21856017322 Author: Zhao Lei Date: Thu Mar 25 12:32:59 2010 +0000 Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk() We can use this simple method to make source more readable. Signed-off-by: Zhao Lei Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit ab59381ea43f81c977cbd09add26950aaf6cb9fe Author: Zhao Lei Date: Thu Mar 25 12:34:49 2010 +0000 Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree() We need to check return value of btrfs_search_slot() in btrfs_read_chunk_tree() and do corresponding error handing. Signed-off-by: Zhao Lei Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 471fa17dff556ad38caf26de097c0630530d8cbe Author: Zhao Lei Date: Thu Mar 25 12:35:14 2010 +0000 Btrfs: Remove unnecessary finish_wait() in wait_current_trans() We only need to call finish_wait() after wait loop. By the way, this patch makes code of waiting loop similar to example in wait.h(no functional change) Signed-off-by: Zhao Lei Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 90d2c51dbb4db05c040bc7db264bb7ab35e35455 Author: Miao Xie Date: Thu Mar 25 12:37:12 2010 +0000 Btrfs: add NULL check for do_walk_down() btrfs_find_create_tree_block() may return NULL, so we must check the returned value, or we will access a NULL pointer. Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 2f3014fc2ab1e25c36531e19164c48182c168995 Author: Andrea Gelmini Date: Thu Mar 25 17:22:45 2010 +0000 Btrfs: remove duplicate include in ioctl.c fs/btrfs/ioctl.c: ctree.h is included more than once. Signed-off-by: Andrea Gelmini Signed-off-by: Chris Mason commit 9e7b414edbf5e037c1462bbd8676465ed2ae0ac3 Author: Alex Deucher Date: Tue Mar 16 17:08:06 2010 -0400 drm/radeon/kms: init rdev->num_crtc at asic init Replace hardcoded numbers with rdev->num_crtc. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 06abdb0ec6b91f634631404012c4d646389e9e0b Author: Alex Deucher Date: Mon Mar 15 01:36:32 2010 -0400 drm/radeon/kms/pm: fix typo in power table parsing Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f867c60def7a8dcd86657fd38a8920a4354f305e Author: Alex Deucher Date: Fri Mar 5 14:50:37 2010 -0500 drm/radeon/kms: gfx init fixes for r6xx/r7xx This fixes some issues with the last gfx init patch. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 57f50d70e27f99a9a785c760b2123cdf6a68e2de Author: Alex Deucher Date: Sun Mar 14 16:31:36 2010 -0400 drm/radeon/kms/pm: fix segfault in clock code Make sure we have a crtc assigned to the encoder before dereferencing it. Signed-off-by: Alex Deucher commit 29fb52ca78b4e265ec6c626b0c7b2927953949cf Author: Alex Deucher Date: Thu Mar 11 10:01:17 2010 -0500 drm/radeon/kms: expose thermal/fan i2c buses Look up i2c bus in the power table and expose it. You'll need to load a hwmon driver for any chips on the bus, this patch just exposes the bus. Signed-off-by: Alex Deucher commit baff42ab1494528907bf4d5870359e31711746ae Author: Steven J. Magnani Date: Tue Mar 30 13:56:01 2010 -0700 net: Fix oops from tcp_collapse() when using splice() tcp_read_sock() can have a eat skbs without immediately advancing copied_seq. This can cause a panic in tcp_collapse() if it is called as a result of the recv_actor dropping the socket lock. A userspace program that splices data from a socket to either another socket or to a file can trigger this bug. Signed-off-by: Steven J. Magnani Signed-off-by: David S. Miller commit 9358c6d4c0264b1572554c49c4b92673ea9a5c72 Author: Sage Weil Date: Tue Mar 30 13:54:41 2010 -0700 ceph: fix dentry rehashing on virtual .snap dir If a lookup fails on the magic .snap directory, we bind it to a magic snap directory inode in ceph_lookup_finish(). That code assumes the dentry is unhashed, but a recent server-side change started returning NULL leases on lookup failure, causing the .snap dentry to be hashed and NULL by ceph_fill_trace(). This causes dentry hash chain corruption, or a dies when d_rehash() includes BUG_ON(!d_unhashed(entry)); So, avoid processing the NULL dentry lease if it the dentry matches the snapdir name in ceph_fill_trace(). That allows the lookup completion to properly bind it to the snapdir inode. BUG there if dentry is hashed to be sure. Signed-off-by: Sage Weil commit b7b7fa43103a9fb30dbcc60cbd5161fdfc25f904 Author: Jeff Mahoney Date: Mon Mar 29 15:12:39 2010 -0400 reiserfs: Fix locking BUG during mount failure Commit 8ebc423238341b52912c7295b045a32477b33f09 (reiserfs: kill-the-BKL) introduced a bug in the mount failure case. The error label releases the lock before calling journal_release_error, but it requires that the lock be held. do_journal_release unlocks and retakes it. When it releases it without it held, we trigger a BUG(). The error_alloc label skips the unlock since the lock isn't held yet but none of the other conditions that are clean up exist yet either. This patch returns immediately after the kzalloc failure and moves the reiserfs_write_unlock after the journal_release_error call. This was reported in https://bugzilla.novell.com/show_bug.cgi?id=591807 Reported-by: Thomas Siedentopf Signed-off-by: Jeff Mahoney Cc: Thomas Siedentopf Cc: Andrew Morton Cc: 2.6.33.x Signed-off-by: Frederic Weisbecker commit 428257f8870f0e72e85ce782d091fa1f366de7df Author: Wengang Wang Date: Wed Mar 24 22:40:44 2010 +0800 ocfs2: Check the owner of a lockres inside the spinlock The checking of lockres owner in dlm_update_lvb() is not inside spinlock protection. I don't see problem in current call path of dlm_update_lvb(). But just for code robustness. Signed-off-by: Wengang Wang Signed-off-by: Joel Becker commit a03ab788d070c256eff1ac24cf0e3bc2ca148096 Author: Coly Li Date: Fri Mar 26 05:15:12 2010 +0800 ocfs2: one more warning fix in ocfs2_file_aio_write(), v2 This patch fixes another compiling warning in ocfs2_file_aio_write() like this, fs/ocfs2/file.c: In function ‘ocfs2_file_aio_write’: fs/ocfs2/file.c:2026: warning: suggest parentheses around ‘&&’ within ‘||’ As Joel suggested, '!ret' is unary, this version removes the wrap from '!ret'. Signed-off-by: Coly Li Signed-off-by: Joel Becker commit efd647f744f3cf504ed83580274bd4b6918139fe Author: Tao Ma Date: Tue Mar 30 13:21:31 2010 +0800 ocfs2_dlmfs: User DLM_* when decoding file open flags. In commit 0016eedc4185a3cd7e578b027a6e69001b85d6c4, we have changed dlmfs to use stackglue. So when use DLM* when we decode dlm flags from open level. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 7371400431389e1df6a2a05ab9882055b8a6ff2c Author: Daniel Mack Date: Mon Mar 29 17:14:18 2010 +0200 net/wireless/libertas: do not call wiphy_unregister() w/o wiphy_register() The libertas driver calls wiphy_unregister() without a prior wiphy_register() when a devices fails initialization. Fix this by introducing a private flag. [ 9.310000] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [...] [ 9.330000] [] (wiphy_unregister+0xfc/0x19c) from [] (lbs_cfg_free+0x70/0x9c [libertas]) [ 9.330000] [] (lbs_cfg_free+0x70/0x9c [libertas]) from [] (lbs_remove_card+0x180/0x210 [libertas]) [ 9.330000] [] (lbs_remove_card+0x180/0x210 [libertas]) from [] (if_sdio_probe+0xdc4/0xef4 [libertas_sdio]) [ 9.330000] [] (if_sdio_probe+0xdc4/0xef4 [libertas_sdio]) from [] (sdio_bus_probe+0xd4/0xf0) [ 9.330000] [] (sdio_bus_probe+0xd4/0xf0) from [] (driver_probe_device+0xa4/0x174) [ 9.330000] [] (driver_probe_device+0xa4/0x174) from [] (__driver_attach+0x60/0x84) [ 9.330000] [] (__driver_attach+0x60/0x84) from [] (bus_for_each_dev+0x4c/0x8c) [ 9.330000] [] (bus_for_each_dev+0x4c/0x8c) from [] (bus_add_driver+0xa0/0x228) [ 9.330000] [] (bus_add_driver+0xa0/0x228) from [] (driver_register+0xc0/0x150) [ 9.330000] [] (driver_register+0xc0/0x150) from [] (if_sdio_init_module+0x6c/0x108 [libertas_sdio]) [ 9.330000] [] (if_sdio_init_module+0x6c/0x108 [libertas_sdio]) from [] (do_one_initcall+0x5c/0x1bc) [ 9.330000] [] (do_one_initcall+0x5c/0x1bc) from [] (sys_init_module+0xc0/0x1f0) [ 9.330000] [] (sys_init_module+0xc0/0x1f0) from [] (ret_fast_syscall+0x0/0x30) Signed-off-by: Daniel Mack Cc: Dan Williams Cc: John W. Linville Cc: Holger Schurig Cc: Bing Zhao Cc: libertas-dev@lists.infradead.org Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: John W. Linville commit 8e1a53c615e8efe0fac670f2973da64758748a8a Author: Dan Carpenter Date: Sun Mar 28 14:55:00 2010 +0300 iwlwifi: range checking issue IWL_RATE_COUNT is 13 and IWL_RATE_COUNT_LEGACY is 12. IWL_RATE_COUNT_LEGACY is the right one here because iwl3945_rates doesn't support 60M and also that's how "rates" is defined in iwlcore_init_geos() from drivers/net/wireless/iwlwifi/iwl-core.c. rates = kzalloc((sizeof(struct ieee80211_rate) * IWL_RATE_COUNT_LEGACY), GFP_KERNEL); Signed-off-by: Dan Carpenter Cc: stable@kernel.org Acked-by: Zhu Yi Signed-off-by: John W. Linville commit 2d20c72c021d96f8b9230396c8e3782f204214ec Author: Valentin Longchamp Date: Fri Mar 26 11:44:33 2010 +0100 setup correct int pipe type in ar9170_usb_exec_cmd An int urb is constructed but we fill it in with a bulk pipe type. Commit f661c6f8c67bd55e93348f160d590ff9edf08904 implemented a pipe type check when CONFIG_USB_DEBUG is enabled. The check failed for all the ar9170 usb transfers and the driver could not configure the wifi dongle. This went unnoticed until now because most people don't have CONFIG_USB_DEBUG enabled. Signed-off-by: Valentin Longchamp Cc: Stable Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit 9e76ad2a27f592c1390248867391880c7efe78b3 Author: Gertjan van Wingerde Date: Wed Mar 24 21:42:37 2010 +0100 rt2x00: Disable powersaving by default in rt2500usb. Recent bug reports have shown that rt2500usb also suffers from the powersave problems that the PCI rt2x00 drivers suffer from. So disable powersaving by default for rt2500usb as well. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 71976907842abb71a0e6fda081e1d16e00420849 Author: Gertjan van Wingerde Date: Wed Mar 24 21:42:36 2010 +0100 rt2x00: Fix typo in RF register programming of rt2800. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 48a6be6a0dd3982bb2d48e82b3e6f5458d9f3c63 Author: Shanyu Zhao Date: Tue Mar 16 10:22:26 2010 -0700 iwlwifi: clear unattended interrupts in tasklet Previously in interrupt handling tasklet, iwlwifi driver only clear/ack those interrupts that are enabled by the driver through inta_mask. If the hardware generates unattended interrupts, driver will not ack them, defeating the interrupt coalescing feature. This results in high number of interrupts per second and high CPU utilization. This patch addresses this issue by acking those unattended interrupts in the tasklet. Local test showed an order of magnitude improvement in terms of the number of interrupts without sacrificing networking throughput. This is a workaround for hardware issue. Signed-off-by: Shanyu Zhao Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre commit be6b38bcb175613f239e0b302607db346472c6b6 Author: Wey-Yi Guy Date: Thu Mar 18 09:05:00 2010 -0700 iwlwifi: counting number of tfds can be free for 4965 Forget one hunk in 4965 during "iwlwifi: error checking for number of tfds in queue" patch. Reported-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre CC: stable@kernel.org commit f6c8f1523a2de3b84340e45913cbcee8bee74570 Author: Reinette Chatre Date: Fri Mar 12 11:13:26 2010 -0800 iwlwifi: fix regulatory Commit "cfg80211: convert bools into flags" mistakenly modified iwlwifi's regulatory settings instead of just converting it. Fix this. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2172 Signed-off-by: Reinette Chatre CC: stable@kernel.org commit 7236fe29fd72d17074574ba312e7f1bb9d10abaa Author: Johannes Berg Date: Mon Mar 22 13:42:43 2010 -0700 mac80211: move netdev queue enabling to correct spot "mac80211: fix skb buffering issue" still left a race between enabling the hardware queues and the virtual interface queues. In hindsight it's totally obvious that enabling the netdev queues for a hardware queue when the hardware queue is enabled is wrong, because it could well possible that we can fill the hw queue with packets we already have pending. Thus, we must only enable the netdev queues once all the pending packets have been processed and sent off to the device. In testing, I haven't been able to trigger this race condition, but it's clearly there, possibly only when aggregation is being enabled. Signed-off-by: Johannes Berg Cc: stable@kernel.org Signed-off-by: John W. Linville commit 05a9a1617026977422c7c5ed3aeac6f46fa2132c Author: Hans de Goede Date: Wed Mar 17 14:37:16 2010 +0100 Add USB ID for Thomson SpeedTouch 120g to p54usb id table Thanks to Chris Chabot for giving his old wireless usb dongle to me to test it under Linux. Signed-off-by: Hans de Goede Signed-off-by: John W. Linville commit e5868ba10c3c5d8a56c06bbafe098103356ac03f Author: Benjamin Larsson Date: Fri Mar 19 01:46:10 2010 +0100 Add a pci-id to the mwl8k driver Signed-off-by: Benjamin Larsson Signed-off-by: John W. Linville commit eb3d72c8b7e6bb6a55e15272c52eb4eadf7fb1f1 Author: Ben Konrath Date: Thu Mar 18 19:06:57 2010 -0400 ar9170: add support for NEC WL300NU-G USB dongle This patch adds support for the NEC WL300NU-G USB wifi dongle. Signed-off-by: Ben Konrath Signed-off-by: John W. Linville commit 533866b12cce484994163b1e201778cbac4c04c5 Author: Porsch, Marco Date: Wed Feb 24 09:53:13 2010 +0100 mac80211: fix PREQ processing and one small bug 1st) a PREQ should only be processed, if it has the same SN and better metric (instead of better or equal). 2nd) next_hop[ETH_ALEN] now actually used to buffer mpath->next_hop->sta.addr for use out of lock. Signed-off-by: Marco Porsch Acked-by: Javier Cardona Cc: stable@kernel.org Signed-off-by: John W. Linville commit c7a00dc73b7185ab2ebd1aa7ce710c7b4edc77a4 Author: John W. Linville Date: Wed Mar 17 11:28:18 2010 -0400 mac80211: correct typos in "unavailable upon resume" warning Signed-off-by: John W. Linville commit 368d06f5b0eefcbf37d677d3b65381310a251f03 Author: John W. Linville Date: Tue Mar 16 15:40:59 2010 -0400 wireless: convert reg_regdb_search_lock to mutex Stanse discovered that kmalloc is being called with GFP_KERNEL while holding this spinlock. The spinlock can be a mutex instead, which also enables the removal of the unlock/lock around the lock/unlock of cfg80211_mutex and the call to set_regdom. Reported-by: Jiri Slaby Cc: stable@kernel.org Signed-off-by: John W. Linville commit 8ae06d223f8203c72104e5c0c4ee49a000aedb42 Author: Shaohua Li Date: Fri Mar 5 08:59:32 2010 +0800 x86-32, resume: do a global tlb flush in S4 resume Colin King reported a strange oops in S4 resume code path (see below). The test system has i5/i7 CPU. The kernel doesn't open PAE, so 4M page table is used. The oops always happen a virtual address 0xc03ff000, which is mapped to the last 4k of first 4M memory. Doing a global tlb flush fixes the issue. EIP: 0060:[] EFLAGS: 00010086 CPU: 0 EIP is at copy_loop+0xe/0x15 EAX: 36aeb000 EBX: 00000000 ECX: 00000400 EDX: f55ad46c ESI: 0f800000 EDI: c03ff000 EBP: f67fbec4 ESP: f67fbea8 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 ... ... CR2: 00000000c03ff000 Tested-by: Colin Ian King Signed-off-by: Shaohua Li LKML-Reference: <20100305005932.GA22675@sli10-desk.sh.intel.com> Acked-by: Rafael J. Wysocki Signed-off-by: H. Peter Anvin Cc: commit e05c378f4973674a16d5b9636f2310cf88aca5f2 Author: Joern Engel Date: Tue Mar 30 18:25:17 2010 +0200 [LogFS] Remove unused method All callers are long gone. Signed-off-by: Joern Engel commit 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 Author: Linus Torvalds Date: Tue Mar 30 09:24:39 2010 -0700 Linux 2.6.34-rc3 commit e971461fc59e3823e1b8a01379ce55c3d2d89c31 Author: David Howells Date: Mon Mar 29 23:42:09 2010 +0100 KEYS: Add MAINTAINERS record Add a MAINTAINERS record for the key management facility. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 246750ffa1b26335df4e485b4e4d28d83756ac43 Merge: 4660d3d 570b8fb Author: Linus Torvalds Date: Tue Mar 30 07:26:30 2010 -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: CRED: Fix memory leak in error handling commit 4660d3d240ac6c92cd3ad33657ca302026bdc24b Merge: be3fd3c 6be7fa0 Author: Linus Torvalds Date: Tue Mar 30 07:24:55 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Erase new journal segments [LogFS] Move reserved segments with journal [LogFS] Clear PagePrivate when moving journal Simplify and fix pad_wbuf Prevent data corruption in logfs_rewrite_block() Use deactivate_locked_super Fix logfs_get_sb_final error path Write out both superblocks on mismatch Prevent schedule while atomic in __logfs_readdir Plug memory leak in writeseg_end_io Limit max_pages for insane devices Open segment file before using it commit be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca Merge: 9623e5a eed6351 Author: Linus Torvalds Date: Tue Mar 30 07:22:38 2010 -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: Do not free zero sized per cpu areas x86: Make sure free_init_pages() frees pages on page boundary x86: Make smp_locks end with page alignment commit de380b55f92986c1a84198149cb71b7228d15fbd Author: Tejun Heo Date: Wed Mar 24 17:06:43 2010 +0900 percpu: don't implicitly include slab.h from percpu.h percpu.h has always been including slab.h to get k[mz]alloc/free() for UP inline implementation. percpu.h being used by very low level headers including module.h and sched.h, this meant that a lot files unintentionally got slab.h inclusion. Lee Schermerhorn was trying to make topology.h use percpu.h and got bitten by this implicit inclusion. The right thing to do is break this ultimately unnecessary dependency. The previous patch added explicit inclusion of either gfp.h or slab.h to the source files using them. This patch updates percpu.h such that slab.h is no longer included from percpu.h. Signed-off-by: Tejun Heo Reviewed-by: Christoph Lameter Cc: Ingo Molnar Cc: Lee Schermerhorn commit ea5a9f0c3447889abceb7482c391bb977472eab9 Author: Randy Dunlap Date: Tue Mar 30 03:01:14 2010 +0900 kmemcheck: Fix build errors due to missing slab.h mm/kmemcheck.c:69: error: dereferencing pointer to incomplete type mm/kmemcheck.c:69: error: 'SLAB_NOTRACK' undeclared (first use in this function) mm/kmemcheck.c:82: error: dereferencing pointer to incomplete type mm/kmemcheck.c:94: error: dereferencing pointer to incomplete type mm/kmemcheck.c:94: error: dereferencing pointer to incomplete type mm/kmemcheck.c:94: error: 'SLAB_DESTROY_BY_RCU' undeclared (first use in this function) Signed-off-by: Randy Dunlap Signed-off-by: Tejun Heo commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 Author: Tejun Heo Date: Wed Mar 24 17:04:11 2010 +0900 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo Guess-its-ok-by: Christoph Lameter Cc: Ingo Molnar Cc: Lee Schermerhorn commit ed391f4ebf8f701d3566423ce8f17e614cde9806 Author: Tejun Heo Date: Tue Mar 23 15:55:39 2010 +0900 iwlwifi: don't include iwl-dev.h from iwl-devtrace.h iwl-devtrace.h is used to declare and define trace points and including iwl-dev.h from the file, which in turn includes other generic headers, can lead to problems like generating duplicate copies of generic trace points depending on the order of includes. Don't include iwl-dev.h from iwl-devtrace.h but include it from its users - iwl-io.h and iwl-devtrace.c. Signed-off-by: Tejun Heo Acked-by: Reinette Chatre Cc: Zhu Yi Cc: Intel Linux Wireless Cc: Ingo Molnar commit 57f4c226d1e095a2db20c691c3cf089188fe1c5d Author: Tejun Heo Date: Tue Mar 23 15:32:53 2010 +0900 x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h Including slab.h from x86 pgtable_32.h creates a troublesome dependency chain w/ ftrace enabled. The following chain leads to inclusion of pgtable_32.h from define_trace.h. trace/define_trace.h trace/ftrace.h linux/ftrace_event.h linux/ring_buffer.h linux/mm.h asm/pgtable.h asm/pgtable_32.h slab.h itself defines trace hooks via linux/sl[aou]b_def.h linux/kmemtrace.h trace/events/kmem.h If slab.h is not included before define_trace.h is included, this leads to duplicate definitions of kmemtrace hooks or other include dependency problems. pgtable_32.h doesn't need slab.h to begin with. Don't include it from there. Signed-off-by: Tejun Heo Acked-by: Pekka Enberg Acked-by: Christoph Lameter Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin commit b3aa111f7ac1ad07009081a824b5ce7a71462c4c Author: Alberto Panizzo Date: Fri Feb 26 18:36:32 2010 +0100 MXC: mach_armadillo5x0: Add USB Host support. This add USB Host capability. The Armadillo 500 board is supplied with two USB Host connectors driven by the USB OTG and USB Host 2 ports, through two NXP isp 1504 transceivers. Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit 17669fd60e6b245945cdd4bbe87d1186a07a03b6 Author: Andrea Gelmini Date: Thu Mar 25 18:22:34 2010 +0100 ARM mach-mx3: duplicated include arch/arm/mach-mx3/mx31lite-db.c: linux/platform_device.h is included more than once. Signed-off-by: Andrea Gelmini Signed-off-by: Sascha Hauer commit 034cf2362af85259718c4930bc7b548fa4165c1c Author: Andrea Gelmini Date: Thu Mar 25 18:22:33 2010 +0100 ARM mach-mx3: duplicated include arch/arm/mach-mx3/mach-pcm037.c: linux/fsl_devices.h is included more than once. Signed-off-by: Andrea Gelmini Signed-off-by: Sascha Hauer commit 7d7a77e56744bb32b8a97a9903fd12433af1c4b2 Author: Vladimir Zapolskiy Date: Fri Mar 19 18:16:59 2010 +0300 imx31: add watchdog device on litekit board. This patch adds support for SoC build-in watchdog device on litekit board. Signed-off-by: Vladimir Zapolskiy Cc: Uwe Kleine-König Cc: Sascha Hauer Signed-off-by: Sascha Hauer commit a7dc12ba756021a95866730b482c6e34b13f84ee Author: Vladimir Zapolskiy Date: Fri Mar 19 18:16:37 2010 +0300 imx3: Add watchdog platform device support This patch adds support for build-in watchdog device found on Freescale imx31 and imx35 SoCs. Signed-off-by: Vladimir Zapolskiy Cc: Sascha Hauer Cc: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 570b8fb505896e007fd3bb07573ba6640e51851d Author: Mathieu Desnoyers Date: Tue Mar 30 00:04:00 2010 +0100 CRED: Fix memory leak in error handling Fix a memory leak on an OOM condition in prepare_usermodehelper_creds(). Signed-off-by: Mathieu Desnoyers Signed-off-by: David Howells Signed-off-by: James Morris commit 1f85d72d2c9c9a1d6d32cf325936bc224ad5d591 Author: Takashi Iwai Date: Tue Mar 30 07:48:05 2010 +0200 ALSA: hda - Add missing printk argument in previous patch Signed-off-by: Takashi Iwai commit c4a3987fa075b2d15ebc3d59b01fb7ed403cd3e1 Author: Julia Lawall Date: Mon Mar 29 22:33:28 2010 -0700 drivers/serial/sunsu.c: Correct use after free The of_iounmap is at the out_unmap label, but at that point up has already been freed. The free cannot be moved to the out_unmap label, because that label is reachable from cases where up should not be freed. So the call to of_iounmap is just duplicated, and the goto converted to a return. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x->f // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 9623e5a23724d09283c238960946ec6f65733afe Merge: 9f32160 1474147 Author: Linus Torvalds Date: Mon Mar 29 14:42:39 2010 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Fix a race in o2dlm lockres mastery Ocfs2: Handle deletion of reflinked oprhan inodes correctly. Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir. ocfs2: Clear undo bits when local alloc is freed ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block. ocfs2: Fix the update of name_offset when removing xattrs ocfs2: Always try for maximum bits with new local alloc windows ocfs2: set i_mode on disk during acl operations ocfs2: Update i_blocks in reflink operations. ocfs2: Change bg_chain check for ocfs2_validate_gd_parent. [PATCH] Skip check for mandatory locks when unlocking commit 9f321603724be7386ea39ea41fd885954db60a4a Merge: 9d54e2c 82593f8 Author: Linus Torvalds Date: Mon Mar 29 14:42:25 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits) ceph: update discussion list address in MAINTAINERS ceph: some documentations fixes ceph: fix use after free on mds __unregister_request ceph: avoid loaded term 'OSD' in documention ceph: fix possible double-free of mds request reference ceph: fix session check on mds reply ceph: handle kmalloc() failure ceph: propagate mds session allocation failures to caller ceph: make write_begin wait propagate ERESTARTSYS ceph: fix snap rebuild condition ceph: avoid reopening osd connections when address hasn't changed ceph: rename r_sent_stamp r_stamp ceph: fix connection fault con_work reentrancy problem ceph: prevent dup stale messages to console for restarting mds ceph: fix pg pool decoding from incremental osdmap update ceph: fix mds sync() race with completing requests ceph: only release unused caps with mds requests ceph: clean up handle_cap_grant, handle_caps wrt session mutex ceph: fix session locking in handle_caps, ceph_check_caps ceph: drop unnecessary WARN_ON in caps migration ... commit 9d54e2c0b0a03b0f05fc4f988323c858ec9d7740 Merge: 7b12887 b00d8a7 Author: Linus Torvalds Date: Mon Mar 29 14:42:08 2010 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (asc7621) Add X58 entry in Kconfig hwmon: (w83793) Saving negative errors in unsigned hwmon: (coretemp) Add missing newline to dev_warn() message hwmon: (coretemp) Fix cpu model output commit 7b12887244293eb54acd07c6296b830b3af0f6da Merge: 6631424 bc8a673 Author: Linus Torvalds Date: Mon Mar 29 14:41:48 2010 -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: pata_via: fix VT6410/6415/6330 detection issue commit 6631424fd2efd75e7394b318ad2a8597327857a9 Merge: c45140a c0cd884 Author: Linus Torvalds Date: Mon Mar 29 14:41:18 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits) r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) ipv6: Don't drop cache route entry unless timer actually expired. tulip: Add missing parens. r8169: fix broken register writes pcnet_cs: add new id bonding: fix broken multicast with round-robin mode drivers/net: Fix continuation lines e1000: do not modify tx_queue_len on link speed change net: ipmr/ip6mr: prevent out-of-bounds vif_table access ixgbe: Do not run all Diagnostic offline tests when VFs are active igb: use correct bits to identify if managability is enabled benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c net: Add MSG_WAITFORONE flag to recvmmsg e1000e: do not modify tx_queue_len on link speed change igbvf: do not modify tx_queue_len on link speed change ipv4: Restart rt_intern_hash after emergency rebuild (v2) ipv4: Cleanup struct net dereference in rt_intern_hash net: fix netlink address dumping in IPv4/IPv6 tulip: Fix null dereference in uli526x_rx_packet() gianfar: fix undo of reserve() ... commit c45140a996b511bccdcbbdbea7e36f001826bdf2 Merge: de32982 9e8307e Author: Linus Torvalds Date: Mon Mar 29 14:41:00 2010 -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: sparc64: Properly truncate pt_regs framepointer in perf callback. arch/sparc/kernel: Use set_cpus_allowed_ptr sparc: Fix use of uid16_t and gid16_t in asm/stat.h commit de329820e920cd9cfbc2127cad26a37026260cce Author: Linus Torvalds Date: Mon Mar 29 14:30:19 2010 -0700 ext3: fix broken handling of EXT3_STATE_NEW In commit 9df93939b735 ("ext3: Use bitops to read/modify EXT3_I(inode)->i_state") ext3 changed its internal 'i_state' variable to use bitops for its state handling. However, unline the same ext4 change, it didn't actually change the name of the field when it changed the semantics of it. As a result, an old use of 'i_state' remained in fs/ext3/ialloc.c that initialized the field to EXT3_STATE_NEW. And that does not work _at_all_ when we're now working with individually named bits rather than values that get masked. So the code tried to mark the state to be new, but in actual fact set the field to EXT3_STATE_JDATA. Which makes no sense at all, and screws up all the code that checks whether the inode was newly allocated. In particular, it made the xattr code unhappy, and caused various random behavior, like apparently https://bugzilla.redhat.com/show_bug.cgi?id=577911 So fix the initialization, and rename the field to match ext4 so that we don't have this happen again. Cc: James Morris Cc: Stephen Smalley Cc: Daniel J Walsh Cc: Eric Paris Cc: Jan Kara Signed-off-by: Linus Torvalds commit c0cd884af045338476b8e69a61fceb3f34ff22f1 Author: Neil Horman Date: Mon Mar 29 13:16:02 2010 -0700 r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) Official patch to fix the r8169 frame length check error. Based on this initial thread: http://marc.info/?l=linux-netdev&m=126202972828626&w=1 This is the official patch to fix the frame length problems in the r8169 driver. As noted in the previous thread, while this patch incurs a performance hit on the driver, its possible to improve performance dynamically by updating the mtu and rx_copybreak values at runtime to return performance to what it was for those NICS which are unaffected by the ideosyncracy (if there are any). Summary: A while back Eric submitted a patch for r8169 in which the proper allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A long time prior to that however, Francois posted 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize setting due to the fact that the hardware behaved in odd ways when overlong frames were received on NIC's supported by this driver. This was mentioned in a security conference recently: http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html It seems that if we can't enable frame size filtering, then, as Eric correctly noticed, we can find ourselves DMA-ing too much data to a buffer, causing corruption. As a result is seems that we are forced to allocate a frame which is ready to handle a maximally sized receive. This obviously has performance issues with it, so to mitigate that issue, this patch does two things: 1) Raises the copybreak value to the frame allocation size, which should force appropriately sized packets to get allocated on rx, rather than a full new 16k buffer. 2) This patch only disables frame filtering initially (i.e., during the NIC open), changing the MTU results in ring buffer allocation of a size in relation to the new mtu (along with a warning indicating that this is dangerous). Because of item (2), individuals who can't cope with the performance hit (or can otherwise filter frames to prevent the bug), or who have hardware they are sure is unaffected by this issue, can manually lower the copybreak and reset the mtu such that performance is restored easily. Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 9e8307ecaf9f8c8b5b3b22145021204c4e73114a Author: David S. Miller Date: Mon Mar 29 13:08:52 2010 -0700 sparc64: Properly truncate pt_regs framepointer in perf callback. For 32-bit processes, we save the full 64-bits of the regs in pt_regs. But unlike when the userspace actually does load and store instructions, the top 32-bits don't get automatically truncated by the cpu in kernel mode (because the kernel doesn't execute with PSTATE_AM address masking enabled). So we have to do it by hand. Reported-by: Frederic Weisbecker Signed-off-by: David S. Miller commit b00d8a7e299eab9970b0ba75a4e2ea1df39059ad Author: Jaswinder Singh Rajput Date: Mon Mar 29 22:03:06 2010 +0200 hwmon: (asc7621) Add X58 entry in Kconfig Intel X58 have asc7621a chip. So added X58 entry in Kconfig for asc7621. Also arranged existing models in ascending order. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Jean Delvare commit 3f7cd7ea9383755eef53f92667c520489165667f Author: Dan Carpenter Date: Mon Mar 29 22:03:03 2010 +0200 hwmon: (w83793) Saving negative errors in unsigned "ret" is used to store the return value for watchdog_trigger() and it should be signed for the error handling to work. Signed-off-by: Dan Carpenter Acked-by: Hans de Goede Signed-off-by: Jean Delvare commit 4d7a5644e4adfafe76c2bd8ee168e3f3b5dae3a8 Author: Dean Nelson Date: Mon Mar 29 22:03:00 2010 +0200 hwmon: (coretemp) Add missing newline to dev_warn() message Add missing newline to dev_warn() message string. This is more of an issue with older kernels that don't automatically add a newline if it was missing from the end of the previous line. Signed-off-by: Dean Nelson Cc: stable@kernel.org Signed-off-by: Jean Delvare commit fcc6a7462ec8d8a7d63ec59559e91f8fd6991160 Author: Prarit Bhargava Date: Mon Mar 29 22:02:59 2010 +0200 hwmon: (coretemp) Fix cpu model output Avoid hex and decimal confusion when printing out the cpu model. Signed-off-by: Prarit Bhargava Signed-off-by: Jean Delvare commit fb48e3c6a4d8888aff61fbf567aadac7d206e973 Author: Graham Gower Date: Thu Mar 25 10:52:12 2010 +1030 ASoC: Fix passing platform_data to ac97 bus users and fix a leak [The issue is an attempt to write the pdata without the AC97 device allocated when using ac97.c - also added a comment in soc-core.c for the special case for ac97. -- broonie] Signed-off-by: Graham Gower Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 292f60c0c4ab44aa2d589ba03c12e64a3b3c5e38 Author: Julia Lawall Date: Mon Mar 29 17:37:02 2010 +0200 ring-buffer: Add missing unlock In some error handling cases the lock is not unlocked. The return is converted to a goto, to share the unlock at the end of the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irq (E1,...); ... when != E1 * return ...; ...+> } // Signed-off-by: Julia Lawall LKML-Reference: Signed-off-by: Steven Rostedt commit e36673ec5126f15a8cddf6049aede7bdcf484c26 Author: Li Zefan Date: Wed Mar 24 10:57:37 2010 +0800 tracing: Fix lockdep warning in global_clock() # echo 1 > events/enable # echo global > trace_clock ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190() ... ---[ end trace 3f86734a89416623 ]--- possible reason: unannotated irqs-on. ... There's no reason to use the raw_local_irq_save() in trace_clock_global. The local_irq_save() version is fine, and does not cause the bug in lockdep. Acked-by: Peter Zijlstra Signed-off-by: Li Zefan LKML-Reference: <4BA97FA1.7030606@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 6be7fa06eb4d721df734bd0946b5e63b27c0589b Author: Joern Engel Date: Mon Mar 29 21:14:52 2010 +0200 [LogFS] Erase new journal segments If the device contains on old logfs image and the journal is moved to segment that have never been used by the current logfs and not all journal segments are erased before the next mount, the old content can confuse mount code. To prevent this, always erase the new journal segments. Signed-off-by: Joern Engel commit 0943846ae05603efd98550f2d475e9c98191bde8 Author: Joern Engel Date: Mon Mar 29 21:13:28 2010 +0200 [LogFS] Move reserved segments with journal Fixes a GC livelock. Signed-off-by: Joern Engel commit eed63519e3e74d515d2007ecd895338d0ba2a85c Author: Ian Campbell Date: Sun Mar 28 19:42:56 2010 -0700 x86: Do not free zero sized per cpu areas This avoids an infinite loop in free_early_partial(). Add a warning to free_early_partial() to catch future problems. -v5: put back start > end back into WARN_ONCE() -v6: use one line for warning, suggested by Linus -v7: more tests -v8: remove the function name as suggested by Johannes WARN_ONCE() will print out that function name. Signed-off-by: Ian Campbell Signed-off-by: Yinghai Lu Tested-by: Konrad Rzeszutek Wilk Tested-by: Joel Becker Tested-by: Stanislaw Gruszka Acked-by: Johannes Weiner Cc: Peter Zijlstra Cc: David Miller Cc: Benjamin Herrenschmidt Cc: Linus Torvalds LKML-Reference: <1269830604-26214-4-git-send-email-yinghai@kernel.org> Signed-off-by: Ingo Molnar commit c967da6a0ba837f762042e931d4afcf72045547c Author: Yinghai Lu Date: Sun Mar 28 19:42:55 2010 -0700 x86: Make sure free_init_pages() frees pages on page boundary When CONFIG_NO_BOOTMEM=y, it could use memory more effiently, or in a more compact fashion. Example: Allocated new RAMDISK: 00ec2000 - 0248ce57 Move RAMDISK from 000000002ea04000 - 000000002ffcee56 to 00ec2000 - 0248ce56 The new RAMDISK's end is not page aligned. Last page could be shared with other users. When free_init_pages are called for initrd or .init, the page could be freed and we could corrupt other data. code segment in free_init_pages(): | for (; addr < end; addr += PAGE_SIZE) { | ClearPageReserved(virt_to_page(addr)); | init_page_count(virt_to_page(addr)); | memset((void *)(addr & ~(PAGE_SIZE-1)), | POISON_FREE_INITMEM, PAGE_SIZE); | free_page(addr); | totalram_pages++; | } last half page could be used as one whole free page. So page align the boundaries. -v2: make the original initramdisk to be aligned, according to Johannes, otherwise we have the chance to lose one page. we still need to keep initrd_end not aligned, otherwise it could confuse decompressor. -v3: change to WARN_ON instead, suggested by Johannes. -v4: use PAGE_ALIGN, suggested by Johannes. We may fix that macro name later to PAGE_ALIGN_UP, and PAGE_ALIGN_DOWN Add comments about assuming ramdisk start is aligned in relocate_initrd(), change to re get ramdisk_image instead of save it to make diff smaller. Add warning for wrong range, suggested by Johannes. -v6: remove one WARN() We need to align beginning in free_init_pages() do not copy more than ramdisk_size, noticed by Johannes Reported-by: Stanislaw Gruszka Tested-by: Stanislaw Gruszka Signed-off-by: Yinghai Lu Acked-by: Johannes Weiner Cc: David Miller Cc: Benjamin Herrenschmidt Cc: Linus Torvalds LKML-Reference: <1269830604-26214-3-git-send-email-yinghai@kernel.org> Signed-off-by: Ingo Molnar commit 82593f87b6c1922a8f8317bb165c6c7794fa4639 Author: Sage Weil Date: Mon Mar 29 09:53:23 2010 -0700 ceph: update discussion list address in MAINTAINERS Signed-off-by: Sage Weil commit 8136b58dd0fce0b4cb649ac690e0493fb6fdacdb Author: Cheng Renquan Date: Mon Mar 29 19:05:57 2010 +0800 ceph: some documentations fixes New documentation should have an entry in the 00-INDEX. Correct git urls. Signed-off-by: Cheng Renquan Signed-off-by: Sage Weil commit 596b711ed6b5235f8545680ef38ace00f9898c32 Author: Yinghai Lu Date: Sun Mar 28 19:42:54 2010 -0700 x86: Make smp_locks end with page alignment Fix: ------------[ cut here ]------------ WARNING: at arch/x86/mm/init.c:342 free_init_pages+0x4c/0xfa() free_init_pages: range [0x40daf000, 0x40db5c24] is not aligned Modules linked in: Pid: 0, comm: swapper Not tainted 2.6.34-rc2-tip-03946-g4f16b23-dirty #50 Call Trace: [<40232e9f>] warn_slowpath_common+0x65/0x7c [<4021c9f0>] ? free_init_pages+0x4c/0xfa [<40881434>] ? _etext+0x0/0x24 [<40232eea>] warn_slowpath_fmt+0x24/0x27 [<4021c9f0>] free_init_pages+0x4c/0xfa [<40881434>] ? _etext+0x0/0x24 [<40d3f4bd>] alternative_instructions+0xf6/0x100 [<40d3fe4f>] check_bugs+0xbd/0xbf [<40d398a7>] start_kernel+0x2d5/0x2e4 [<40d390ce>] i386_start_kernel+0xce/0xd5 ---[ end trace 4eaa2a86a8e2da22 ]--- Comments in vmlinux.lds.S already said: | /* | * smp_locks might be freed after init | * start/end must be page aligned | */ Signed-off-by: Yinghai Lu Acked-by: Johannes Weiner Cc: David Miller Cc: Benjamin Herrenschmidt Cc: Linus Torvalds LKML-Reference: <1269830604-26214-2-git-send-email-yinghai@kernel.org> Signed-off-by: Ingo Molnar commit ad4ba059005f18ec9e274966c16d99fc5ce8b2cd Merge: f7454c5 9ce41ae Author: Linus Torvalds Date: Mon Mar 29 09:37:57 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "ide: skip probe if there are no devices on the port (v2)" Revert "via82cxxx: workaround h/w bugs" commit f7454c5d5c33b84fdbb957b7ad4a432e333b2550 Author: David Howells Date: Wed Mar 24 16:59:36 2010 +0000 frv/chris: fix lines with a missing semicolons Commit b26b2d494b659f9 ("resource/PCI: align functions now return start of resource") added lines with missing semicolons. Add the missing semicolons to the FRV and CRIS arch code. Signed-off-by: David Howells Cc: linux@dominikbrodowski.net Signed-off-by: Linus Torvalds commit c6c352371c1ce486a62f4eb92e545b05cfcef76b Author: Harro Haan Date: Mon Mar 1 17:38:37 2010 +0100 ARM: 5965/1: Fix soft lockup in at91 udc driver Fix a potential soft lockup in the AT91 UDC driver by ensuring that the UDC clock is enabled inside the interrupt handler. If the UDC clock is not enabled then the UDC registers cannot be written to and the interrupt cannot be cleared or masked. Note that this patch (and other parts of the existing AT91 UDC driver) is potentially racy for preempt-rt kernels, but is okay for mainline. For more info see: http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100203/09cdb3b4/attachment.el http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100203/8443a1e4/attachment.el Signed-off-by: Ryan Mallon Acked-by: Harro Haan Tested-by: Remy Bohmer Acked-by: Andrew Victor Cc: David Brownell Signed-off-by: Russell King commit fd522a8dec11a08b5fdd23982193808e268be19e Author: Catalin Marinas Date: Mon Mar 29 10:29:46 2010 +0100 ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds When compiling the kernel to Thumb-2, using a 16-bit NOP in the memmove() implementation causes the preceding ADD PC instruction to branch incorrectly in the middle of a 32-bit LDR or STR instruction. The memmove() code is now similar to the memcpy() template. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 782a0fd16723bfc0e765d789e82853d5dc424e76 Author: Mika Westerberg Date: Mon Mar 29 06:59:16 2010 +0100 ARM: 6005/1: arm: kprobes: fix register corruption with jprobes Current implementation of jprobes allocates empty pt_regs from the stack which is then passed to kprobe_handler() and eventually to singlestep(). Now when instruction being simulated is STMFD (like in normal function prologues without CONFIG_FRAME_POINTER), stores using SP actually write over top of the fabricated pt_regs structure. This can be reproduced for example by using LKDTM module: # modprobe lkdtm # mount -t debugfs none /sys/kernel/debug # echo PANIC > /sys/kernel/debug/provoke-crash/INT_HW_IRQ_EN after this, it fails with corrupted registers (before the requested crash would occur): lkdtm: Crash point INT_HW_IRQ_EN of type PANIC hit, trigger in 9 rounds lkdtm: Crash point INT_HW_IRQ_EN of type PANIC hit, trigger in 8 rounds Internal error: Oops - undefined instruction: 0 [#1] last sysfs file: /sys/devices/platform/serial8250.0/sleep_timeout Modules linked in: lkdtm CPU: 0 Not tainted (2.6.34-rc2 #69) PC is at irq_desc+0x1638/0xeeb0 LR is at 0x25 pc : [] lr : [<00000025>] psr: c80a0013 sp : ce94bd60 ip : c050b3e8 fp : a0000013 r10: c0aa453c r9 : cf5d4000 r8 : ce9a1822 r7 : c050b424 r6 : 00000025 r5 : c039d8f8 r4 : c050b3e8 r3 : 00000001 r2 : cf4d0440 r1 : c039d8f8 r0 : 00000020 Flags: NZcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c5387d Table: 8e804019 DAC: 00000015 Process sh (pid: 496, stack limit = 0xce94a2e8) Stack: (0xce94bd60 to 0xce94c000) [...] Code: 000002cd 00000000 00000000 00000001 (dead4ead) ---[ end trace 2b46d5f2b682f370 ]--- Kernel panic - not syncing: Fatal exception in interrupt This patch allocates enough space (2 * sizeof(struct pt_regs)) from the stack to prevent such corruption. Signed-off-by: Mika Westerberg Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 367d6acceaacff1adc44f121543effb9c060e575 Author: viresh kumar Date: Mon Mar 29 05:29:56 2010 +0100 ARM: 6003/1: removing compilation warning from pl061.h pl061.h is using u8 type. including in pl061.h to avoid warning. Signed-off-by: Viresh Kumar Acked-by: Baruch Siach Signed-off-by: Russell King commit 55a07517edbf15b83f323644edf346726eccd7e0 Author: viresh kumar Date: Mon Mar 29 05:58:51 2010 +0100 ARM: 6001/1: removing compilation warning comming from clkdev.h clkdev.h is using struct device *. Due to this compilation warning is comming. Removing this warning. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit aedceb2a490bae56f9d7e80be480421e1cf22ce0 Author: viresh kumar Date: Mon Mar 29 05:29:57 2010 +0100 ARM: 6000/1: removing compilation warning comming from irq.h is using struct pt_regs *. Due to this compilation warning is comming. Removing this warning by adding declaration of struct pt_regs. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit c36207a4624f15020f2918324405c1c88a5d4cbc Author: viresh kumar Date: Mon Mar 29 05:28:32 2010 +0100 ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h linux/amba/bus.h have dependencies on linux/device.h and linux/resource.h, but it doesn't include them. We get compilation errors in our files which include bus.h but doesn't include device.h and resource.h. This patch includes device.h and resource.h in linux/amba/bus.h file. Signed-off-by: Viresh Kumar Acked-by: Linux Walleij Signed-off-by: Russell King commit a53f4f9efaeb1d87cfae066346979d4d70e1abe9 Author: David Howells Date: Mon Mar 29 13:08:52 2010 +0100 SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG CONFIG_SLOW_WORK_PROC was changed to CONFIG_SLOW_WORK_DEBUG, but not in all instances. Change the remaining instances. This makes the debugfs file display the time mark and the owner's description again. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 88be12c440cfa2fa3f5be83507360aac9ea1c54e Author: Dave Airlie Date: Mon Mar 29 12:01:50 2010 +0100 slow-work: use get_ref wrapper instead of directly calling get_ref Otherwise we can get an oops if the user has no get_ref/put_ref requirement. Signed-off-by: Dave Airlie Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 376a21ff42ba71167afe7a47aeb1ca19470cf580 Merge: 05ad62a 85255c0 Author: Linus Torvalds Date: Mon Mar 29 09:12:14 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Use LPIB for ga-ma770-ud3 board ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist ALSA: pcm_lib - fix xrun functionality ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist ALSA: hda - Don't set invalid connection index in Realtek initialiaiton commit 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590 Author: Nick Bowler Date: Wed Mar 10 00:10:46 2010 -0500 Staging: et131x: Properly disable FC in txmac. FC disable is bit 3 of the txmac ctl register, but commit 6720949d5562 ("Staging: et131x: Kil the txmac type") accidentally changed the code to set bit 2 instead. Signed-off-by: Nick Bowler Signed-off-by: Linus Torvalds commit 6694635d3ae1b038d7a0e38b80637db867c7c8e2 Author: Takashi Iwai Date: Mon Mar 29 17:21:45 2010 +0200 ALSA: hda - Fix ADC/MUX assignment of ALC269 codec ALC269 codec has a few different variants, and each of them may have different ADC and MUX widgets. For example, one model has ADC 0x08 with MUX 0x23 while others has ADC 0x09 or ADC 0x07 with MUX 022 or 0x24. The difference of ADC appears usually as the capability of the digital mic pin (0x12), and the current driver sometimes misses the internal mic pin due to the mismatching ADC. This patch adds a bit more clever way to find the matching ADC instead of the static list. Now the driver checks all active input pins and fills only the ADC/MUX's that contain all of them. Signed-off-by: Takashi Iwai commit c565c54d9bf336ec9cd22288d3aa4fb6e372e727 Author: Anisse Astier Date: Mon Mar 29 16:20:06 2010 +0200 HID: Add NOGET quirk for Quanta Pixart touchscreen Add the NOGET quirk for the Quanta optical touchscreen present on MSI AE2220, Otherwise, the hid-quanta driver timeouts at load time: drivers/hid/usbhid/hid-core.c: usb_submit_urb(ctrl) failed quanta-touch 0003:0408:3001.0003: timeout initializing reports input: PixArt Imaging Inc. Optical Touch Screen as /class/input/input7 quanta-touch 0003:0408:3001.0003: input: USB HID v1.10 Device [PixArt Imaging Inc. Optical Touch Screen] on usb-0000:00:06.0-2/input0 Signed-off-by: Anisse Astier Signed-off-by: Jiri Kosina commit 10fad5e46f6c7bdfb01b1a012380a38e3c6ab346 Author: Tejun Heo Date: Wed Mar 10 18:57:54 2010 +0900 percpu, module: implement and use is_kernel/module_percpu_address() lockdep has custom code to check whether a pointer belongs to static percpu area which is somewhat broken. Implement proper is_kernel/module_percpu_address() and replace the custom code. On UP, percpu variables are regular static variables and can't be distinguished from them. Always return %false on UP. Signed-off-by: Tejun Heo Acked-by: Peter Zijlstra Cc: Rusty Russell Cc: Ingo Molnar commit 259354deaaf03d49a02dbb9975d6ec2a54675672 Author: Tejun Heo Date: Wed Mar 10 18:56:10 2010 +0900 module: encapsulate percpu handling better and record percpu_size Better encapsulate module static percpu area handling so that code outsidef of CONFIG_SMP ifdef doesn't deal with mod->percpu directly and add mod->percpu_size and record percpu_size in it. Both percpu fields are compiled out on UP. While at it, mark mod->percpu w/ __percpu. This is to prepare for is_module_percpu_address(). Signed-off-by: Tejun Heo Acked-by: Rusty Russell commit 5dbd5ec6e1cf2e49128025d80813a275744a7ac5 Author: Takashi Iwai Date: Mon Mar 29 09:16:24 2010 +0200 ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo() The mask and value parameters passed to snd_hda_codec_amp_stereo() should be 8-bit values for mute and volume. Passing AMP_IN_MUTE() is wrong, which is found in many places in patch_realtek.c as a left-over from the conversion to snd_hda_codec_amp_stereo(). Reported-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 85255c0e078158ede61ff8bd296e306db6f7ed19 Merge: f30c14b 9ec8dda Author: Takashi Iwai Date: Mon Mar 29 08:40:57 2010 +0200 Merge branch 'fix/hda' into for-linus commit f30c14b64e0eb62319e7a3e930fb7ea2bee9d919 Merge: 1218002 5cd165e Author: Takashi Iwai Date: Mon Mar 29 08:40:50 2010 +0200 Merge branch 'fix/misc' into for-linus commit 9ec8ddad59fadd8021adfea4cb716a49b0e232e9 Author: Daniel T Chen Date: Sun Mar 28 02:34:40 2010 -0400 ALSA: hda: Use LPIB for ga-ma770-ud3 board BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669 The OR states that position_fix=1 is necessary to work around glitching during volume adjustments using PulseAudio. Reported-by: Carlos Laviola Tested-by: Carlos Laviola Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 5cd165e7057020884e430941c24454d3df9a799d Author: Daniel Chen Date: Sun Mar 28 13:32:34 2010 -0700 ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist BugLink: https://launchpad.net/bugs/481058 The OR has verified that both 'Headphone Jack Sense' and 'Line Jack Sense' need to be muted for sound to be audible, so just add the machine's SSID to the ac97 jack sense blacklist. Reported-by: Richard Gagne Tested-by: Richard Gagne Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 94aa8ae13db2ecf2ec1b4e65a65d3fe92b468e0e Author: Sage Weil Date: Sun Mar 28 21:22:50 2010 -0700 ceph: fix use after free on mds __unregister_request There was a use after free in __unregister_request that would trigger whenever the request map held the last reference. This appears to have triggered an oops during 'umount -f' when requests are being torn down. Signed-off-by: Sage Weil commit 4bea3418c737891894b9d3d3e9f8bbd67d66fa38 Author: Matt Fleming Date: Sun Mar 28 20:08:25 2010 +0000 sh: Enable the mmu in start_secondary() For the boot, enable_mmu() is called from setup_arch() but we don't call setup_arch() for any of the other cpus. So turn on the non-boot cpu's mmu inside of start_secondary(). I noticed this bug on an SMP board when trying to map I/O memory (smsc911x registers) into the kernel address space. Since the Address Translation bit in MMUCR wasn't set, accessing the virtual address where the smsc911x registers were supposedly mapped actually performed a physical address access. Signed-off-by: Matt Fleming Cc: stable@kernel.org Signed-off-by: Paul Mundt commit d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1 Author: Andrew Stubbs Date: Mon Mar 29 12:04:19 2010 +0900 sh: Fix FDPIC binary loader Ensure that the aux table is properly initialized, even when optional features are missing. Without this, the FDPIC loader did not work. Signed-off-by: Andrew Stubbs Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 59a2f7d9fd41c68b7013797e82b8f40fc154ccae Author: Julia Lawall Date: Fri Mar 26 22:03:49 2010 +0000 arch/sh/kernel: Use set_cpus_allowed_ptr Use set_cpus_allowed_ptr rather than set_cpus_allowed. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1,E2; @@ - set_cpus_allowed(E1, cpumask_of_cpu(E2)) + set_cpus_allowed_ptr(E1, cpumask_of(E2)) @@ expression E; identifier I; @@ - set_cpus_allowed(E, I) + set_cpus_allowed_ptr(E, &I) // Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 5f6c477a35852c6bfa42474537c582f65bdcf9db Author: Yusuke Goda Date: Mon Mar 29 02:36:54 2010 +0000 sh: Update ecovec_defconfig Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 54c1a859efd9fd6cda05bc700315ba2519c14eba Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Mar 28 07:15:45 2010 +0000 ipv6: Don't drop cache route entry unless timer actually expired. This is ipv6 variant of the commit 5e016cbf6.. ("ipv4: Don't drop redirected route cache entry unless PTMU actually expired") by Guenter Roeck . Remove cache route entry in ipv6_negative_advice() only if the timer is expired. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 9ce41aed0d392246eb788786253f242e829fd5e1 Author: David S. Miller Date: Sun Mar 28 18:58:28 2010 -0700 Revert "ide: skip probe if there are no devices on the port (v2)" This reverts commit a20b2a44eca52818ef52a94959480b7e6ea2f528. As requested by David Fries. This makes CDROMs which are slave drives on a ribbon without a master disappear and causes other similar kinds of badness. Signed-off-by: David S. Miller commit 7855f761998893bb6bf861d55df95036fc9e36ab Author: David S. Miller Date: Sun Mar 28 18:56:34 2010 -0700 tulip: Add missing parens. As reported by Stephen Rothwell. drivers/net/tulip/uli526x.c: In function 'uli526x_rx_packet': drivers/net/tulip/uli526x.c:861: warning: assignment makes pointer from integer without a cast Signed-off-by: David S. Miller commit 723b2ff40876678b49e61df34fb1d8001e34639d Author: Joern Engel Date: Sun Mar 28 18:10:07 2010 +0200 [LogFS] Clear PagePrivate when moving journal do_logfs_journal_wl_pass() must call freeseg(), thereby clear PagePrivate on all pages of the current journal segment. Signed-off-by: Joern Engel commit 81def6b9862764924a99ac1b680e73ac8c80ac64 Author: Joern Engel Date: Sun Mar 28 12:47:09 2010 +0200 Simplify and fix pad_wbuf A comment in the old code read: /* The math in this function can surely use some love */ And indeed it did. In the case that area->a_used_bytes is exactly 4096 bytes below segment size it fell apart. pad_wbuf is now split into two helpers that are significantly less complicated. Signed-off-by: Joern Engel commit 193219172691e29813821dc8433317768c6ed1a3 Author: Joern Engel Date: Sat Mar 27 09:56:58 2010 +0100 Prevent data corruption in logfs_rewrite_block() The comment was correct, so make the code match the comment. As the new comment indicates, we might be able to do a little less work. But for the current -rc series let's keep it simple and just fix the bug. Signed-off-by: Joern Engel commit 325ffc3633f1c30ef89d98d619f7e1497366e77c Author: Catalin Marinas Date: Fri Mar 26 15:44:57 2010 +0100 ARM: 5997/1: ARM: Correct the VFPv3 detection A CPU has VFPv3 hardware if the FPSID[19:16] bits are 2 or more. Currently Linux was only checking for 3 or more. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit bc8a67386fd462914269fa93446e1891955a8bb3 Author: JosephChan@via.com.tw Date: Thu Mar 25 20:51:47 2010 +0800 pata_via: fix VT6410/6415/6330 detection issue When using VT6410/6415/6330 chips on some VIA's platforms, the HDD connection to VT6410/6415/6330 cannot be detected. It is because the driver detects wrong via_isa_bridge ID, and then causes this issue to happen. Signed-off-by: Joseph Chan Signed-off-by: Jeff Garzik commit d2566af8c4860a03ca685ef0910de406679c3e4e Author: Julia Lawall Date: Sat Mar 27 21:11:56 2010 -0700 arch/sparc/kernel: Use set_cpus_allowed_ptr Use set_cpus_allowed_ptr rather than set_cpus_allowed. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1,E2; @@ - set_cpus_allowed(E1, cpumask_of_cpu(E2)) + set_cpus_allowed_ptr(E1, cpumask_of(E2)) @@ expression E; identifier I; @@ - set_cpus_allowed(E, I) + set_cpus_allowed_ptr(E, &I) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 78f1cd02457252e1ffbc6caa44a17424a45286b8 Author: Francois Romieu Date: Sat Mar 27 19:35:46 2010 -0700 r8169: fix broken register writes This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7 though said registers are not even documented as 64-bit registers - as opposed to the initial TxDescStartAddress ones - but as single bytes which must be combined into 32 bits at the MMIO read/write level before being merged into a 64 bit logical entity. Credits go to Ben Hutchings for the MAR registers (aka "multicast is broken for ages on ARM) and to Timo Teräs for the MAC registers. Signed-off-by: Francois Romieu Signed-off-by: David S. Miller commit 1546a713ae1f066f83469cdd99ebdf500d6a65e4 Author: Ken Kawasaki Date: Sat Mar 27 10:55:37 2010 +0000 pcnet_cs: add new id pcnet_cs: *add new id (Allied Telesis LM33-PCM-T Lan&Modem multifunction card) *use PROD_ID for LA-PCM.(because LA-PCM and LM33-PCM-T use the same MANF_ID). Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit a2fd940f4cff74b932728bd6ca12848da21a0234 Author: Andy Gospodarek Date: Thu Mar 25 14:49:05 2010 +0000 bonding: fix broken multicast with round-robin mode Round-robin (mode 0) does nothing to ensure that any multicast traffic originally destined for the host will continue to arrive at the host when the link that sent the IGMP join or membership report goes down. One of the benefits of absolute round-robin transmit. Keeping track of subscribed multicast groups for each slave did not seem like a good use of resources, so I decided to simply send on the curr_active slave of the bond (typically the first enslaved device that is up). This makes failover management simple as IGMP membership reports only need to be sent when the curr_active_slave changes. I tested this patch and it appears to work as expected. Originally reported by Lon Hohberger . Signed-off-by: Andy Gospodarek CC: Lon Hohberger CC: Jay Vosburgh Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 421e33d0045ac0aa119c033b78742e0fbf4c3b21 Author: Michael Reed Date: Tue Mar 23 15:00:58 2010 -0500 [SCSI] qla1280: retain firmware for error recovery The qla1280 driver acquires its firmware via udev. During boot the firmware is located in the initrd. If, after root is mounted, the adapter needs to reload firmware (host reset), the firmware load may fail if the root device is on the adapter being reset. This patch modifies qla1280 to retain the firmware loaded via the initial request_firmware() for use during error recovery. [jejb: fix up checkpatch issues] Signed-off-by: Michael Reed Acked-by: Jes Sorensen Signed-off-by: James Bottomley commit ebd09ec93c90c8ec571d7e166832fb1fc705bf5e Author: James Bottomley Date: Sat Mar 20 12:44:12 2010 -0500 [SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init All of the SCSI transport classes are suddenly spitting lockdep warnings. According to Eric Biderman this is because lockdep needs static initialisers and the attribute container way of doing things end up with dynamic sysfs attributes. Fix this by calling sysfs_attr_init which sets the lockdep key correctly. Tested-by: Christof Schmitt Signed-off-by: James Bottomley commit cf7474451c3a3cf07811abbf2a39536d33046c36 Author: Herton Ronaldo Krzesinski Date: Fri Mar 19 19:37:26 2010 -0300 [SCSI] advansys: fix regression with request_firmware change On newer kernels users of advansys module are reporting system hang when trying to load it without firmware files present. After looking closely at description on https://qa.mandriva.com/show_bug.cgi?id=53220, I think this is related to commit "[SCSI] advansys: use request_firmware". The problem is that after switch to request_firmware, asc_dvc->err_code isn't being set when firmware files aren't found or loading fails. err_code is used by the driver to judge if there was a fatal error or not, as can be seen for example on advansys_board_found, which will only return -ENODEV when err_code is set. Because err_code isn't being set when request_firmware fails, this is a change of behaviour of the code before request_firmware addition, making it continue to load and it fails later as the firmware wasn't really loaded. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: James Bottomley commit 89162e9c21de3cb3b7e9e29d50cb7c3e88a09e2b Author: Giridhar Malavali Date: Fri Mar 19 16:59:21 2010 -0700 [SCSI] qla2xxx: Updated version number to 8.03.02-k2. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit d6136f3f749cf68c3295c883cea612afd9919100 Author: Santosh Vernekar Date: Fri Mar 19 16:59:20 2010 -0700 [SCSI] qla2xxx: Prevent sending mbx commands from sysfs during isp reset. The fix prevents application path from sending get-firmware-state mbx command during as isp reset. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 6377a7ae1ab82859edccdbc8eaea63782efb134d Author: Ben Hutchings Date: Fri Mar 19 16:59:19 2010 -0700 [SCSI] qla2xxx: Disable MSI on qla24xx chips other than QLA2432. On specific platforms, MSI is unreliable on some of the QLA24xx chips, resulting in fatal I/O errors under load, as reported in and by some RHEL customers. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit d84a47c2e8d8880d068f23f3033f6f6987717b17 Author: Michael Hernandez Date: Fri Mar 19 16:59:18 2010 -0700 [SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time. The logic is changed to detect this condition based on following 1) both module parameters are off (ql2xmaxqueues and ql2xmultique_tag). 2) both module parameters are on (ql2xmaxqueues and ql2xmultique_tag). 3) The HBA does not support multi queue. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 12cec63e40f9b9c2a4766a0f43404a9642062f35 Author: Andrew Vasquez Date: Fri Mar 19 16:59:17 2010 -0700 [SCSI] qla2xxx: Correct vp_idx checking during PORT_UPDATE processing. Checks should only be done for NPIV-capable ISPs. Original code could result in PORT_UPDATEs being missed on non-NPIV-capable ISPs. Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit cad454b12a23c24fd7f409402cf51434655e76c1 Author: Santosh Vernekar Date: Fri Mar 19 16:59:16 2010 -0700 [SCSI] qla2xxx: Honour "Extended BB credits" bit for CNAs. We now enable/disable "Additional Receive Credits" in f/w based on nvram parameter "Extended_BB_Credits" bit (i.e. Enhanced-Features: at offset 0x196). This is applicable only for GEN2 CNAs. Signed-off-by: Santosh Vernekar Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit d88a714bfefa7aed7b9cb6c3721707fcd056b472 Author: Sarang Radke Date: Wed Mar 10 04:03:04 2010 -0600 [SCSI] scsi_transport_fc: Make sure commands are completed when rport is offline blk_end_request doesn't complete a bidi request successfully The unfinished request eventually triggers a panic in timeout handling routine fc_bsg_job_timeout as req->special is NULL Use blk_end_request_all to end the request unconditionally Signed-off-by: Lalit Chandivade Acked-by: James Smart Signed-off-by: James Bottomley commit 4ae0a6c15efcc37e94e3f30e3533bdec03c53126 Author: Mike Christie Date: Tue Mar 9 14:14:51 2010 -0600 [SCSI] libiscsi: Fix recovery slowdown regression We could be failing/stopping a connection due to libiscsi starting recovery/cleanup, but the xmit path or scsi eh thread path could be dropping the connection at the same time. As a result the session->state gets set to failed instead of in recovery. We end up not blocking the session and so the replacement timeout never gets started and we only end up failing the IO when scsi_softirq_done sees that the cmd has been running for (cmd->allowed + 1) * rq->timeout secs. We used to fail the IO right away so users are seeing a long delay when using dm-multipath. This problem was added in 2.6.28. Signed-off-by: Mike Christie Cc: stable@kernel.org Signed-off-by: James Bottomley commit 7469a9acf919d36836f6c635099d8edc9be4528a Author: Rob Landley Date: Sat Mar 27 08:36:18 2010 -0700 sparc: Fix use of uid16_t and gid16_t in asm/stat.h Signed-off-by: Rob Landley Signed-off-by: David S. Miller commit 44ebb95290afcc687511ad3f7fd6434e867c270a Author: Joe Perches Date: Fri Mar 26 16:27:55 2010 +0000 drivers/net: Fix continuation lines Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 39ca5f033bb2ea18877632809185268eebbb37a9 Author: Emil Tantilov Date: Fri Mar 26 11:25:58 2010 +0000 e1000: do not modify tx_queue_len on link speed change Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex. This patch removes all instances of tx_queue_len in the driver. Based on e1000e patch by Franco Fichtner CC: Franco Fichtner Signed-off-by: Emil Tantilov Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7438189baa0a2fe30084bdc97e3d540ebc5444f3 Author: Nicolas Dichtel Date: Thu Mar 25 23:45:35 2010 +0000 net: ipmr/ip6mr: prevent out-of-bounds vif_table access When cache is unresolved, c->mf[6]c_parent is set to 65535 and minvif, maxvif are not initialized, hence we must avoid to parse IIF and OIF. A second problem can happen when the user dumps a cache entry where a VIF, that was referenced at creation time, has been removed. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit e7d481a6f3c13041446b7bb8f98ab861460076a3 Author: Greg Rose Date: Thu Mar 25 17:06:48 2010 +0000 ixgbe: Do not run all Diagnostic offline tests when VFs are active When running the offline diagnostic tests check to see if any VFs are online. If so then only run the link test. This is necessary because the VFs running in guest VMs aren't aware of when the PF is taken offline for a diagnostic test. Also put a message to the system log telling the system administrator to take the VFs offline manually if (s)he wants to run a full diagnostic. Return 1 on each of the tests not run to alert the user of the condition. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e017b60316468f21a63bdd4affefaf81a7f988fd Author: Alexander Duyck Date: Thu Mar 25 17:15:06 2010 +0000 igb: use correct bits to identify if managability is enabled igb was previously checking the wrong bits in the MANC register to determine if managability was enabled. As a result it was incorrectly powering down and resetting the phy when it didn't need to. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c0e4d4bad4e8cf0aa787a3045392f949d76b5886 Author: wzt wzt Date: Thu Mar 25 20:12:59 2010 +0000 benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c Fix the following warnings: be_ethtool.c:493: warning: integer constant is too large for 'long' type be_ethtool.c:493: warning: integer constant is too large for 'long' type Signed-off-by: Zhitong Wang Acked-by: Ajit Khaparde Signed-off-by: David S. Miller commit 71c5c1595c04852d6fbf3c4882b47b30b61a4d32 Author: Brandon L Black Date: Fri Mar 26 16:18:03 2010 +0000 net: Add MSG_WAITFORONE flag to recvmmsg Add new flag MSG_WAITFORONE for the recvmmsg() syscall. When this flag is specified for a blocking socket, recvmmsg() will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination with MSG_DONTWAIT. Signed-off-by: Brandon L Black Acked-by: Ulrich Drepper Acked-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e4afb29fa3ea759d408fa537ab6a81800708396e Author: David S. Miller Date: Sat Mar 27 07:55:58 2010 -0700 Revert "via82cxxx: workaround h/w bugs" This reverts commit f931a5d5785d7b7c44871bd7ad2762e29dfddf29. It causes regressions for some users. Signed-off-by: David S. Miller commit 6f2e9e6a950a165a7d2c399ab7557e6745ef2bfd Author: Joern Engel Date: Fri Mar 26 14:50:08 2010 +0100 Use deactivate_locked_super Found by Al Viro. Signed-off-by: Joern Engel commit 7db8064c17b92e95aec2e333096c035db9ddd4fe Author: Joern Engel Date: Fri Mar 26 14:45:55 2010 +0100 Fix logfs_get_sb_final error path rootdir was already allocated, so we must iput it again. Found by Al Viro. Signed-off-by: Joern Engel commit faaa27ab919799929732c356a92a160f8657ecc6 Author: Joern Engel Date: Fri Mar 26 10:18:36 2010 +0100 Write out both superblocks on mismatch If the first superblock is wrong and the second gets written, there will still be a mismatch on next mount. Write both to make sure they match. Signed-off-by: Joern Engel commit e326068806ee044cc617b1dc24be1293fca3fbf6 Author: Joern Engel Date: Wed Mar 17 16:00:07 2010 +0100 Prevent schedule while atomic in __logfs_readdir Apparently filldir can sleep, which forbids kmap_atomic. Signed-off-by: Joern Engel commit e07bf553f37cd4fa470b499ff34d800956df2d48 Author: Joern Engel Date: Wed Mar 17 15:29:38 2010 +0100 Plug memory leak in writeseg_end_io Signed-off-by: Joern Engel commit 59fe27c0a8173a74b105debc803b97582028c90b Author: Joern Engel Date: Wed Mar 17 13:47:45 2010 +0100 Limit max_pages for insane devices Intel SSDs have a limit of 0xffff as queue_max_hw_sectors(q). Such a limit may make sense from a hardware pov, but it causes bio_alloc() to return NULL. Signed-off-by: Joern Engel commit 49137f2efb5cf68724bccaba531ab3d59acd71f9 Author: Joern Engel Date: Tue Mar 16 21:46:15 2010 +0100 Open segment file before using it logfs_recover_sb() needs it open. Signed-off-by: Joern Engel commit ed01f64b831481762437c8eedddcca8481dc7f67 Author: Roman Fietze Date: Fri Mar 26 22:09:57 2010 -0600 powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them This patch avoids unbalanced enable/disable messages for the DMA interrupts when running the 5200 platform SCLPC/BestComm driver in DMA mode. Signed-off-by: Roman Fietze Signed-off-by: Grant Likely commit 95d2c8ef08a902953d1ea2cad14928909e91e5d1 Author: Timur Tabi Date: Fri Mar 26 22:09:57 2010 -0600 powerpc/fsl: add device tree binding for QE firmware Define a binding for embedding a QE firmware blob into the device tree. Also define a new property for the QE node that links to a firmware node. Signed-off-by: Timur Tabi Signed-off-by: Grant Likely commit 7f809e1f8e2f46c486bfe529579a16a28daacd62 Author: Jason Gunthorpe Date: Fri Mar 26 22:09:56 2010 -0600 of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree NOPs within the property section are skipped, but NOPs between OF_DT_END_NODE and OF_DT_BEGIN_NODE were not. My firmware NOPs out entire nodes depending on various environment parameters. of_scan_flat_dt already handles NOP more generally. Signed-off-by: Jason Gunthorpe Signed-off-by: Grant Likely commit f49c57e141c7f53353e4265a31dc2324e6215037 Author: Emil Tantilov Date: Wed Mar 24 12:55:02 2010 +0000 e1000e: do not modify tx_queue_len on link speed change Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex. This patch removes all instances of tx_queue_len in the driver. Originally reported and patched by Franco Fichtner CC: Franco Fichtner Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a08af745e4c711d22aeadc2adade36958fe03ce8 Author: Emil Tantilov Date: Thu Mar 25 12:11:48 2010 +0000 igbvf: do not modify tx_queue_len on link speed change Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex. Based on e1000e patch by Franco Fichtner CC: Franco Fichtner Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 6a2bad70d546cf30a46bc6d9ec0cb9a0891a38eb Author: Pavel Emelyanov Date: Wed Mar 24 21:51:22 2010 +0000 ipv4: Restart rt_intern_hash after emergency rebuild (v2) The the rebuild changes the genid which in turn is used at the hash calculation. Thus if we don't restart and go on with inserting the rt will happen in wrong chain. (Fixed Neil's comment about the index passed into the rt_intern_hash) Signed-off-by: Pavel Emelyanov Reviewed-by: Neil Horman Signed-off-by: David S. Miller commit b35ecb5d404c00f2420221ccbb1bbba1139353a4 Author: Pavel Emelyanov Date: Wed Mar 24 07:43:17 2010 +0000 ipv4: Cleanup struct net dereference in rt_intern_hash There's no need in getting it 3 times and gcc isn't smart enough to understand this himself. This is just a cleanup before the fix (next patch). Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 4b97efdf392563bf03b4917a0b5add2df65de39a Author: Patrick McHardy Date: Fri Mar 26 20:27:49 2010 -0700 net: fix netlink address dumping in IPv4/IPv6 When a dump is interrupted at the last device in a hash chain and then continued, "idx" won't get incremented past s_idx, so s_ip_idx is not reset when moving on to the next device. This means of all following devices only the last n - s_ip_idx addresses are dumped. Tested-by: Pawel Staszewski Signed-off-by: Patrick McHardy commit ac90a149361a331f697d5aa500bedcff22054669 Author: Kyle McMartin Date: Fri Mar 27 17:23:32 2009 +0000 tulip: Fix null dereference in uli526x_rx_packet() Acked-by: Grant Grundler Signed-off-by: David S. Miller commit a6d36d5689b1806a3365c909192e9f03a43a632b Author: Ben Menchaca Date: Wed Mar 24 05:05:02 2010 +0000 gianfar: fix undo of reserve() Fix undo of reserve() before RX recycle gfar_new_skb reserve()s space in the SKB to align it. If an error occurs, and the skb needs to be returned to the RX recycle queue, the current code attempts to reset head, but did not reset tail. This patch remembers the alignment amount, and reverses the reserve() when needed. Signed-off-by: Ben Menchaca Signed-off-by: David S. Miller commit 810627a013163cd294762d57c0ea2ec055ffe4f6 Author: Pavel Shilovsky Date: Sat Mar 27 02:00:49 2010 +0000 [CIFS] Add mmap for direct, nobrl cifs mount types without mmap functions in file_ops OpenOffice can't save changes in existing document. The same situation you can see with gedit. Also, a.out format of files can't be executed without mmap. Signed-off-by: Pavel Shilovsky Reviewed-by: Jeff Layton Signed-off-by: Steve French commit b72c40949b0f04728f2993a1434598d3bad094ea Merge: e4d5042 d558b48 Author: Linus Torvalds Date: Fri Mar 26 16:34:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 x86/PCI: for host bridge address space collisions, show conflicting resource frv/PCI: remove redundant warnings x86/PCI: remove redundant warnings PCI: don't say we claimed a resource if we failed PCI quirk: Disable MSI on VIA K8T890 systems PCI quirk: RS780/RS880: work around missing MSI initialization PCI quirk: only apply CX700 PCI bus parking quirk if external VT6212L is present PCI: complain about devices that seem to be broken PCI: print resources consistently with %pR PCI: make disabled window printk style match the enabled ones PCI: break out primary/secondary/subordinate for readability PCI: for address space collisions, show conflicting resource resources: add interfaces that return conflict information PCI: cleanup error return for pcix get and set mmrbc functions PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions PCI: kill off pci_register_set_vga_state() symbol export. PCI: fix return value from pcix_get_max_mmrbc() commit 5a7aadfe2fcb0f69e2acc1fbefe22a096e792fc9 Author: Matt Helsley Date: Fri Mar 26 23:51:44 2010 +0100 Freezer: Fix buggy resume test for tasks frozen with cgroup freezer When the cgroup freezer is used to freeze tasks we do not want to thaw those tasks during resume. Currently we test the cgroup freezer state of the resuming tasks to see if the cgroup is FROZEN. If so then we don't thaw the task. However, the FREEZING state also indicates that the task should remain frozen. This also avoids a problem pointed out by Oren Ladaan: the freezer state transition from FREEZING to FROZEN is updated lazily when userspace reads or writes the freezer.state file in the cgroup filesystem. This means that resume will thaw tasks in cgroups which should be in the FROZEN state if there is no read/write of the freezer.state file to trigger this transition before suspend. NOTE: Another "simple" solution would be to always update the cgroup freezer state during resume. However it's a bad choice for several reasons: Updating the cgroup freezer state is somewhat expensive because it requires walking all the tasks in the cgroup and checking if they are each frozen. Worse, this could easily make resume run in N^2 time where N is the number of tasks in the cgroup. Finally, updating the freezer state from this code path requires trickier locking because of the way locks must be ordered. Instead of updating the freezer state we rely on the fact that lazy updates only manage the transition from FREEZING to FROZEN. We know that a cgroup with the FREEZING state may actually be FROZEN so test for that state too. This makes sense in the resume path even for partially-frozen cgroups -- those that really are FREEZING but not FROZEN. Reported-by: Oren Ladaan Signed-off-by: Matt Helsley Cc: stable@kernel.org Signed-off-by: Rafael J. Wysocki commit 4f598458ea4450f53e8ed929ee4e66b3404a7286 Author: Xiaotian Feng Date: Wed Mar 10 22:59:13 2010 +0100 Freezer: Only show the state of tasks refusing to freeze show_state will dump all tasks state, so if freezer failed to freeze any task, kernel will dump all tasks state and flood the dmesg log. This patch makes freezer only show state of tasks refusing to freeze. Signed-off-by: Xiaotian Feng Acked-by: Pavel Machek Acked-by: David Rientjes Signed-off-by: Rafael J. Wysocki commit e4d50423d773fb8d5b714430ba5358e8a1b87c14 Merge: 6f063ae d067633 Author: Linus Torvalds Date: Fri Mar 26 15:14:29 2010 -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 imperfect completion wait in nilfs_wait_on_logs nilfs2: fix hang-up of cleaner after log writer returned with error nilfs2: fix duplicate call to nilfs_segctor_cancel_freev commit 6f063aea557f66eea8c35034a25df85cae5ced33 Merge: f3845f3 d7646f7 Author: Linus Torvalds Date: Fri Mar 26 15:11:20 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: use dev_pm_ops for class pcmcia_socket_class power: support _noirq actions on device types and classes pcmcia: allow for four multifunction subdevices (again) pcmcia: do not use ioports < 0x100 on x86 pd6729: Coding Style fixes commit f3845f3f6081b97ebc4dc905e097c07e868017b5 Merge: 054319b 035a02c Author: Linus Torvalds Date: Fri Mar 26 15:10:56 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, amd: Restrict usage of c1e_idle() x86: Fix placement of FIX_OHCI1394_BASE x86: Handle legacy PIC interrupts on all the cpu's commit 054319b5e255c0671012a5a89b344a7d55cda80c Merge: 833961d 830ec04 Author: Linus Torvalds Date: Fri Mar 26 15:10:38 2010 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: time: Fix accumulation bug triggered by long delay. posix-cpu-timers: Reset expire cache when no timer is running timer stats: Fix del_timer_sync() and try_to_del_timer_sync() clockevents: Sanitize min_delta_ns adjustment and prevent overflows commit 833961d81f0ece46b7884f988cc65509e2c49646 Merge: 3cacf42 2271048 Author: Linus Torvalds Date: Fri Mar 26 15:10:13 2010 -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: ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte align commit 3cacf42462c8c97e045a07a5fc92aa357489c8b5 Merge: 6fa4136 8bc037f Author: Linus Torvalds Date: Fri Mar 26 15:09:59 2010 -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: Use proper type in sched_getaffinity() kernel/sched.c: Suppress unused var warning sched: sched_getaffinity(): Allow less than NR_CPUS length commit 6fa41366c1c5e8b9640baba22d2b90ec9035a889 Merge: 309d1dc 9eff26e Author: Linus Torvalds Date: Fri Mar 26 15:09:33 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: powerpc/perf_events: Fix call-graph recording, add perf_arch_fetch_caller_regs perf top: Add missing initialization to zero perf probe: Use original address instead of CU-based address perf probe: Fix offset to allow signed value perf top: Improve the autosizing of column lenghts perf probe: Fix need_dwarf flag if lazy matching is used perf probe: Fix probe_point buffer overrun commit 309d1dcb5b73ab1f8212aff3037a7bcb46afe819 Merge: 8128f55 860652b Author: Linus Torvalds Date: Fri Mar 26 15:09:06 2010 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Move two IRQ functions from .init.text to .text genirq: Protect access to irq_desc->action in can_request_irq() genirq: Prevent oneshot irq thread race commit 8128f55a0bc60cf3779135a1f837c4323e77c582 Merge: 50da567 c26f91a Author: Linus Torvalds Date: Fri Mar 26 15:08:31 2010 -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: x86: Remove excessive early_res debug output softlockup: Stop spurious softlockup messages due to overflow rcu: Fix local_irq_disable() CONFIG_PROVE_RCU=y false positives rcu: Fix tracepoints & lockdep false positive rcu: Make rcu_read_lock_bh_held() allow for disabled BH commit 50da56706b989b99edb20f9c03172df193240c78 Merge: e0df9c0 fe43d6d Author: Linus Torvalds Date: Fri Mar 26 15:07:46 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: align driver match with modalias firewire: core: fix Model_ID in modalias firewire: ohci: add cycle timer quirk for the TI TSB12LV22 firewire: core: fw_iso_resource_manage: fix error handling commit e0df9c0b42cc8cb48b801f7a0f54382f6a89ca16 Merge: e1ee65d 3e297b6 Author: Linus Torvalds Date: Fri Mar 26 15:06:02 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Restore LOOKUP_DIRECTORY hint handling in final lookup on open() commit af06393bbde6e8d474622a0517cffc662676e3fe Author: Chris Leech Date: Wed Mar 24 12:45:21 2010 +0000 ixgbe: filter FIP frames into the FCoE offload queues During FCF solicitation, the switch is supposed to pad the solicited advertisement out to the endpoints specified maximum FCoE frame size. That means that we need to receive FIP frames that are larger than the standard MTU. To make sure the receive queue is configured correctly, we should be filtering FIP traffic into the FCoE queues. Signed-off-by: Chris Leech Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ca77cd59d28456b4061afa5254972ec47fa8baf5 Author: Robert Love Date: Wed Mar 24 12:45:00 2010 +0000 ixgbe: Priority tag FIP frames Currently FIP (FCoE Initialization Protocol) frames are going untagged. This causes various problems with FCFs (switches) that have negotiated a priority over dcbx. This patch tags FIP frames with the same priority as the FCoE frames. Signed-off-by: Robert Love Signed-off-by: Chris Leech Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a7551b75fe47fb6fb70f679935845e741c5e0855 Author: Robert Love Date: Wed Mar 24 10:02:04 2010 +0000 ixgbe: Don't allow user buffer count to exceed 256 If the user buffer count was 256 the shift would place a 1 in the offset region leading to errors. It also overwrites the uers buffer list. This patch makes sure that at most 256 user buffers are allowed for DDP and the buffer count is masked properly such that it doesn't overwrite the offset when shifting the bits. Signed-off-by: Robert Love Signed-off-by: Yi Zou Signed-off-by: Frank Zhang Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e0fce6950b822aba7840d82c2d2018f1e1b8276b Author: John Fastabend Date: Wed Mar 24 10:01:45 2010 +0000 ixgbe: cleanup maximum number of tx queues In the last patch I missed an unecessary min_t comparison. This patch removes it, the path allocates at most 72 tx queues for 82599 and 24 for 82598 there is no need for this check. Additionally this sets MAX_[TX|RX]_QUEUES to 72. Which is used as the size for the tx/rx_ring arrays. There is no reason to have more tx_rings/rx_rings then num_tx_queues. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 581d1aa777580c1c22169538ffb46676b13c408e Author: Greg Rose Date: Wed Mar 24 09:36:27 2010 +0000 ixgbe: Change where clear_to_send_flag is reset to zero. The clear_to_send flag is being cleared before the call to ping all the VFs. It should be called after pinging all the VFs. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5809a1ae77721931ca7bd7aeacb37fdabe6f07c0 Author: Greg Rose Date: Wed Mar 24 09:36:08 2010 +0000 ixgbe: In SR-IOV mode insert delay before bring the adapter up VFs running in guest VMs do not respond in as timely a manner to PF indication it is going down as they do when running in the host domain. If the adapter is in SR-IOV mode insert a two second delay to guarantee that all VFs have had time to respond to the PF reset. In any case resetting the PF while VFs are active should be discouraged but if it must be done then there will be a two second delay to help synchronize resets among the PF and all the VFs. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 65deeed7b34bc5b8d3cbff495e8fa2ae7b563480 Author: Greg Rose Date: Wed Mar 24 09:35:42 2010 +0000 ixgbevf: Fix signed/unsigned int error In the Tx mapping function if a DMA error occurred then the unwind of previously mapped sections would improperly check an unsigned int if it was less than zero. Changed the index variable to signed to avoid the error. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 48c11a59c4c1d9926be34920d45da037516eb7b8 Author: Amit Kumar Salecha Date: Fri Mar 26 00:30:10 2010 +0000 netxen: update version to 4.0.73 Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit afbe5cd6c40e0f20fa8832d17fa44ae605591ce1 Author: Amit Kumar Salecha Date: Fri Mar 26 00:30:09 2010 +0000 netxen: added sanity check for pci map Signed-off-by: Amit Kumar Salecha Return value of ioremap is not checked, NULL check added. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 77c553900c58c3e4f475e233ad4ff6aeb282deb4 Author: Amit Kumar Salecha Date: Fri Mar 26 00:30:08 2010 +0000 netxen: fix warning in ioaddr for NX3031 chip Signed-off-by: Amit Kumar Salecha crb_intr_mask/crb_sts_consumer is predefined for NX2031 not for NX3031. For NX3031, these values get defined in rx context creation. Signed-off-by: David S. Miller commit bb2792e0383793d5135ba777e93f0a918371394b Author: Amit Kumar Salecha Date: Fri Mar 26 00:30:07 2010 +0000 netxen: fix bios version calculation Bios sub version from unified fw image is calculated incorrect. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 4300e8c7f64d95a80ffa7d98d98738f41546bc30 Author: David S. Miller Date: Fri Mar 26 10:23:30 2010 -0700 Revert "r8169: enable 64-bit DMA by default for PCI Express devices (v2)" This reverts commit 353176888386d9025062a12dcec08d49af10cf2c. People are reporting problems due to this change and there is no anticipation that the cause will be tracked down any time soon. We can try next time to selectively re-enable this based upon chip type, or have a black list of some sort. Signed-off-by: David S. Miller commit 3e297b613491f0d4928aa652a2cd266aa06dc409 Author: Al Viro Date: Fri Mar 26 12:40:13 2010 -0400 Restore LOOKUP_DIRECTORY hint handling in final lookup on open() Lose want_dir argument, while we are at it - since now nd->flags & LOOKUP_DIRECTORY is equivalent to it. Signed-off-by: Al Viro commit 0f17014b340b98465fcf0de4c0d6c84a002ec53b Author: Jarkko Nikula Date: Fri Mar 26 16:07:25 2010 +0200 ALSA: pcm_lib - fix xrun functionality The commit 4d96eb255c53ab5e39b37fd4d484ea3dc39ab456 broke the interrupt time xrun functionality (stream stop etc.) if the CONFIG_SND_PCM_XRUN_DEBUG is not set. This is because the xrun() is null defined without it. Fix this by letting the function xrun() to be always defined as it was before. Signed-off-by: Jarkko Nikula Cc: Jaroslav Kysela Signed-off-by: Takashi Iwai commit e1f7f02b45cf33a774d56e505ce1718af9392f5e Author: Daniel T Chen Date: Thu Mar 25 22:38:15 2010 -0700 ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist BugLink: https://launchpad.net/bugs/303789 This model needs both 'Headphone Jack Sense' and 'Line Jack Sense' muted for audible audio, so just add its SSID to the blacklist and don't enumerate the controls. Signed-off-by: Daniel T Chen Cc: Signed-off-by: Takashi Iwai commit 3da0ae6298fa10d4f5e2855ae400b2470bc6693d Author: David S. Miller Date: Thu Mar 25 20:32:39 2010 -0700 isdn: Add netdev to lists in MAINTAINERS entry. Signed-off-by: David S. Miller commit 72f878cc6f324ecc2ca00ff2f9c0dc2c168cd4cc Author: Andrea Gelmini Date: Thu Mar 25 18:22:40 2010 +0100 USB gadget r8a66597-udc.c: duplicated include drivers/usb/gadget/r8a66597-udc.c: linux/err.h is included more than once. Signed-off-by: Andrea Gelmini Signed-off-by: Paul Mundt commit 4539282dbc20fe612113c8f267d51a90d46a7f50 Author: Matt Fleming Date: Fri Mar 26 11:37:16 2010 +0900 sh: update the TLB replacement counter for entry wiring. Presently the TLB wiring code depends on MMUCR.URB for working out where to place the wired entry, but fails to take the replacment counter in to consideration. This fixes up the wiring logic and ensures that wired entries remain so. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit e7c5650f6067f65f8e961394f376d4862808d0d2 Author: Catalin Marinas Date: Wed Mar 24 16:49:54 2010 +0100 ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4) The mandatory barriers (mb, rmb, wmb) are used even on uniprocessor systems for things like ordering Normal Non-cacheable memory accesses with DMA transfer (via Device memory writes). The current implementation uses dmb() for mb() and friends but this is not sufficient. The DMB only ensures the relative ordering of the observability of accesses by other processors or devices acting as masters. In case of DMA transfers started by writes to device memory, the relative ordering is not ensured because accesses to slave ports of a device are not considered observable by the DMB definition. A DSB is required for the data to reach the main memory (even if mapped as Normal Non-cacheable) before the device receives the notification to begin the transfer. Furthermore, some L2 cache controllers (like L2x0 or PL310) buffer stores to Normal Non-cacheable memory and this would need to be drained with the outer_sync() function call. The patch also allows platforms to define their own mandatory barriers implementation by selecting CONFIG_ARCH_HAS_BARRIERS and providing a mach/barriers.h file. Note that the SMP barriers are unchanged (being DMBs as before) since they are only guaranteed to work with Normal Cacheable memory. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 23107c542068b2b94390aa333f6b330af64961e4 Author: Catalin Marinas Date: Wed Mar 24 16:48:53 2010 +0100 ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4) The L2x0 cache controllers need to explicitly drain their write buffer even for Normal Noncacheable memory accesses. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 319f551a0a167b49b5bbb4a9ff4802046a572bc5 Author: Catalin Marinas Date: Wed Mar 24 16:47:53 2010 +0100 ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4) This patch introduces the outer_cache_fns.sync function pointer together with the OUTER_CACHE_SYNC config option that can be used to drain the write buffer of the outer cache. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 33f663ff9186da1bcc88dc7830b3a632bd472da5 Author: Catalin Marinas Date: Wed Mar 24 16:46:52 2010 +0100 ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4) To avoid #include collisions with subsequent patches in the series, this patch moves the outer_cache definitions to a separate asm/outercache.h file. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit e1ee65d85904c5dd4b9cea1b15d5e85e20eae8a1 Author: David Howells Date: Thu Mar 25 16:48:44 2010 +0000 NOMMU: Fix __get_user_pages() to pin last page on offset buffers Fix __get_user_pages() to make it pin the last page on a buffer that doesn't begin at the start of a page, but is a multiple of PAGE_SIZE in size. The problem is that __get_user_pages() advances the pointer too much when it iterates to the next page if the page it's currently looking at isn't used from the first byte. This can cause the end of a short VMA to be reached prematurely, resulting in the last page being lost. Signed-off-by: Steven J. Magnani Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 7561e8ca0dfaf6fca3feef982830de3b65300e5b Author: David Howells Date: Thu Mar 25 16:48:38 2010 +0000 NOMMU: Revert 'nommu: get_user_pages(): pin last page on non-page-aligned start' Revert the following patch: commit c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d Author: Steven J. Magnani Date: Fri Mar 5 13:42:24 2010 -0800 nommu: get_user_pages(): pin last page on non-page-aligned start As it assumes that the mappings begin at the start of pages - something that isn't necessarily true on NOMMU systems. On NOMMU systems, it is possible for a mapping to only occupy part of the page, and not necessarily touch either end of it; in fact it's also possible for multiple non-overlapping mappings to coexist on one page (consider direct mappings of ROMFS files, for example). Signed-off-by: David Howells Acked-by: Steven J. Magnani Signed-off-by: Linus Torvalds commit 39f1cd635cbe8a42c3c74fa6bf9f61c1156bd27b Merge: 126a031 c4caae2 Author: Linus Torvalds Date: Thu Mar 25 14:10:53 2010 -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: Fixed inode allocator to correctly track a flex_bg's used_dirs ext4: Don't use delayed allocation by default when used instead of ext3 ext4: Fix spelling of CONTIG_FS_EXT3 to CONFIG_FS_EXT3 ext4: Fix estimate of # of blocks needed to write indirect-mapped files commit 126a031e437a4ab56a162e9cff7fc04b9f7efeec Merge: 01e7770 7c9f757 Author: Linus Torvalds Date: Thu Mar 25 14:06:29 2010 -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: (25 commits) TIPC: Removed inactive maintainer isdn: Cleanup Sections in PCMCIA driver elsa isdn: Cleanup Sections in PCMCIA driver avma1 isdn: Cleanup Sections in PCMCIA driver teles isdn: Cleanup Sections in PCMCIA driver sedlbauer via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control() netfilter: xt_hashlimit: IPV6 bugfix netfilter: ip6table_raw: fix table priority netfilter: xt_hashlimit: dl_seq_stop() fix af_key: return error if pfkey_xfrm_policy2msg_prep() fails skbuff: remove unused dma_head & dma_maps fields vlan: updates vlan real_num_tx_queues vlan: adds vlan_dev_select_queue igb: only use vlan_gro_receive if vlans are registered igb: do not modify tx_queue_len on link speed change igb: count Rx FIFO errors correctly bnx2: Use proper handler during netpoll. bnx2: Fix netpoll crash. ksz884x: fix return value of netdev_set_eeprom cgroups: net_cls as module ... commit 7c9f757319ccf7a47ce167b86eda671c87b5b917 Author: Jon Maloy Date: Thu Mar 25 12:40:09 2010 -0700 TIPC: Removed inactive maintainer Signed-off-by: Jon Maloy Signed-off-by: David S. Miller commit c751ce4f52b11ea93764a7cd44e6ae9c098d361b Author: Eric Anholt Date: Thu Mar 25 11:48:48 2010 -0700 drm/i915: Rename many remaining uses of "output" to encoder or connector. Signed-off-by: Eric Anholt commit 21d40d37eca86872f2bf0af995809ebdef25c9d9 Author: Eric Anholt Date: Thu Mar 25 11:11:14 2010 -0700 drm/i915: Rename intel_output to intel_encoder. The intel_output naming is inherited from the UMS code, which had a structure of screen -> CRTC -> output. The DRM code has an additional notion of encoder/connector, so the structure is screen -> CRTC -> encoder -> connector. This is a useful structure for SDVO encoders which can support multiple connectors (each of which requires different programming in the one encoder and could be connected to different CRTCs), or for DVI-I, where multiple encoders feed into the connector for whether it's used for digital or analog. Most of our code is encoder-related, so transition it to talking about encoders before we start trying to distinguish connectors. This patch is produced by sed s/intel_output/intel_encoder/ over the driver. Signed-off-by: Eric Anholt commit f61bb62e3ed7634fe5b7dfd8c9a52e6b799f4023 Author: Henne Date: Thu Mar 25 12:05:32 2010 +0000 isdn: Cleanup Sections in PCMCIA driver elsa Compiling this driver gave a section mismatch, so I reviewed the init/exit paths of the driver and made the correct changes. WARNING: drivers/isdn/hisax/built-in.o(.text+0x55e37): Section mismatch in reference from the function elsa_cs_config() to the function .devinit.text:hisax_init_pcmcia() The function elsa_cs_config() references the function __devinit hisax_init_pcmcia(). This is often because elsa_cs_config lacks a __devinit annotation or the annotation of hisax_init_pcmcia is wrong. Signed-off-by: Henrik Kretzschmar Acked-by: Karsten Keil Signed-off-by: David S. Miller commit a465870a808bccba63bf6da30a0b56a2a7abfa5c Author: Henne Date: Thu Mar 25 12:05:31 2010 +0000 isdn: Cleanup Sections in PCMCIA driver avma1 Compiling this driver gave a section mismatch, so I reviewed the init/exit paths of the driver and made the correct changes. WARNING: drivers/isdn/hisax/built-in.o(.text+0x56512): Section mismatch in reference from the function avma1cs_config() to the function .devinit.text:hisax_init_pcmcia() The function avma1cs_config() references the function __devinit hisax_init_pcmcia(). This is often because avma1cs_config lacks a __devinit annotation or the annotation of hisax_init_pcmcia is wrong. Signed-off-by: Henrik Kretzschmar Acked-by: Karsten Keil Signed-off-by: David S. Miller commit 158e33d1c6d0c6bacf577bcb47591aa4293dfcb1 Author: Henne Date: Thu Mar 25 12:05:30 2010 +0000 isdn: Cleanup Sections in PCMCIA driver teles Compiling this driver gave a section mismatch, so I reviewed the init/exit paths of the driver and made the correct changes. WARNING: drivers/isdn/hisax/built-in.o(.text+0x56bfb): Section mismatch in reference from the function teles_cs_config() to the function .devinit.text:hisax_init_pcmcia() The function teles_cs_config() references the function __devinit hisax_init_pcmcia(). This is often because teles_cs_config lacks a __devinit annotation or the annotation of hisax_init_pcmcia is wrong. Signed-off-by: Henrik Kretzschmar Acked-by: Karsten Keil Signed-off-by: David S. Miller commit 93b39a0dba6a15c35a582b9e8b171b8a6ec971aa Author: Henne Date: Thu Mar 25 12:05:29 2010 +0000 isdn: Cleanup Sections in PCMCIA driver sedlbauer Compiling this driver gave a section mismatch, so I reviewed the init/exit paths of the driver and made the correct changes. WARNING: drivers/isdn/hisax/built-in.o(.text+0x558d6): Section mismatch in reference from the function sedlbauer_config() to the function .devinit.text:hisax_init_pcmcia() The function sedlbauer_config() references the function __devinit hisax_init_pcmcia(). This is often because sedlbauer_config lacks a __devinit annotation or the annotation of hisax_init_pcmcia is wrong. Signed-off-by: Henrik Kretzschmar Acked-by: Karsten Keil Signed-off-by: David S. Miller commit bcbe53682f65330bdd9ad7eed9575d2ff536353a Author: David S. Miller Date: Mon Mar 22 19:59:47 2010 -0700 via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control() Clear, don't set, ANAR_ASMDIR in this case. Noticed by Roel Kluin. Signed-off-by: David S. Miller commit 80bb3a00fa314e3c5dbbd23a38bfaf94f2402b99 Merge: 9a127aa 8f59922 Author: David S. Miller Date: Thu Mar 25 11:48:58 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit 5e64499f3d39c633de49320e399479642c2b1743 Author: Daniel Vetter Date: Fri Mar 19 21:46:23 2010 +0100 agp/intel: intel_845_driver is an agp driver! ... not a GTT driver. So the additional chipset flush introduced in commit 2162e6a2b0cd5acbb9bd8a3c94e1c1269b078295 Author: Dave Airlie Date: Wed Nov 21 16:36:31 2007 +1000 agp/intel: Add chipset flushing support for i8xx chipsets. to fix a GTT problem makes absolutely no sense. If this would really be needed for AGP chipsets, too, we should add it to all i8xx agp drivers, not just one. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit 23010e43b353c2cdc9725cbedc7e364708039bf7 Author: Daniel Vetter Date: Mon Mar 8 13:35:02 2010 +0100 drm/i915: introduce to_intel_bo helper This is a purely cosmetic change to make changes in this area easier. And hey, it's not only clearer and typechecked, but actually shorter, too! [anholt: To clarify, this is a change to let us later make drm_i915_gem_object subclass drm_gem_object, instead of having drm_gem_object have a pointer to i915's private data] Signed-off-by: Daniel Vetter Acked-by: Dave Airlie Signed-off-by: Eric Anholt commit 8d06a1e1e9c69244f08beb7d17146483f9dcd120 Author: Robert Hooker Date: Fri Mar 19 15:13:27 2010 -0400 drm/i915: Disable FBC on 915GM and 945GM. It is causing hangs after a suspend/resume cycle with the default powersave=1 module option on these chipsets since 2.6.32-rc. BugLink: http://bugs.launchpad.net/bugs/492392 Signed-off-by: Robert Hooker Acked-by: Jesse Barnes Signed-off-by: Eric Anholt commit d558b483d5a73f5718705b270cb2090f66ea48c8 Author: Bjorn Helgaas Date: Thu Mar 25 09:28:30 2010 -0600 x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 Yanko's GA-MA78GM-S2H (BIOS F11) reports the following resource in a PCI host bridge _CRS: [07] 32-Bit DWORD Address Space Resource Min Relocatability : MinFixed Max Relocatability : MaxFixed Address Minimum : CFF00000 (_MIN) Address Maximum : FEBFFFFF (_MAX) Address Length : 3EE10000 (_LEN) This is invalid per spec (ACPI 4.0, 6.4.3.5) because it's a fixed size, fixed location descriptor, but _LEN != _MAX - _MIN + 1. Based on https://bugzilla.kernel.org/show_bug.cgi?id=15480#c15, I think Windows handles this by truncating the window so it fits between _MIN and _MAX. I also verified this by modifying the SeaBIOS DSDT and booting Windows 2008 R2 with qemu. This patch makes Linux truncate the window, too, which fixes: http://bugzilla.kernel.org/show_bug.cgi?id=15480 Signed-off-by: Bjorn Helgaas Tested-by: Yanko Kaneti Signed-off-by: Jesse Barnes commit eb9fc8ef7cb1362374e55d9503e3e7458f319991 Author: Bjorn Helgaas Date: Thu Mar 25 09:28:24 2010 -0600 x86/PCI: for host bridge address space collisions, show conflicting resource With insert_resource_conflict(), we can learn what the actual conflict is, so print that info for debugging purposes. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 8f5992291457c8e6de2f5fe39849de6756be1a96 Author: Eric Dumazet Date: Thu Mar 25 17:25:11 2010 +0100 netfilter: xt_hashlimit: IPV6 bugfix A missing break statement in hashlimit_ipv6_mask(), and masks between /64 and /95 are not working at all... Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 99f4692e13ba22b228bdd155473f24ae9bdec1dc Author: Bjorn Helgaas Date: Mon Mar 22 16:34:15 2010 -0600 frv/PCI: remove redundant warnings pci_claim_resource() already prints more detailed error messages, so these are really redundant. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit c9c9b564717e5b6b2ae8b770da1c73a348c84cce Author: Bjorn Helgaas Date: Mon Mar 22 16:34:10 2010 -0600 x86/PCI: remove redundant warnings pci_claim_resource() already prints more detailed error messages, so these are really redundant. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit f967a44343e407811898ddac97abc69b293e9810 Author: Bjorn Helgaas Date: Mon Mar 22 16:34:05 2010 -0600 PCI: don't say we claimed a resource if we failed pci_claim_resource() can fail, so pay attention and only claim success when it actually succeeded. If pci_claim_resource() fails, it prints a useful diagnostic. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 134b345081534235dbf228b1005c14590e0570ba Author: Matthew Wilcox Date: Wed Mar 24 07:11:01 2010 -0600 PCI quirk: Disable MSI on VIA K8T890 systems Bugzilla 15287 indicates that there's a problem with Message Signalled Interrupts on VIA K8T890 systems. Add a quirk to disable MSI on these systems. Signed-off-by: Matthew Wilcox Tested-by: Jan Kreuzer Tested-by: lh Signed-off-by: Jesse Barnes commit 39c01b219fd30c74869b6fc8749f7900f04e9ef6 Author: Divyesh Shah Date: Thu Mar 25 15:45:57 2010 +0100 cfq-iosched: Do not merge queues of BE and IDLE classes Even if they are found to be co-operating. The prio_trees do not have any IDLE cfqqs on them. cfq_close_cooperator() is called from cfq_select_queue() and cfq_completed_request(). The latter ensures that the close cooperator code does not get invoked if the current cfqq is of class IDLE but the former doesn't seem to have any such checks. So an IDLE cfqq may get merged with a BE cfqq from the same group which should be avoided. Signed-off-by: Divyesh Shah Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit b1ffe737f5b743115ee46ffb59e338e580c54902 Author: Divyesh Shah Date: Thu Mar 25 15:45:03 2010 +0100 cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging These have helped us debug some issues we've noticed in earlier IO controller versions and should be useful now as well. The extra logging covers: - idling behavior. Since there are so many conditions based on which we decide to idle or not, this patch adds a log message for some conditions that we've found useful. - workload slices and current prio and workload type Changelog from v1: o moved log message from cfq_set_active_queue() to __cfq_set_active_queue() o changed queue_count to st->count Signed-off-by: Divyesh Shah Signed-off-by: Jens Axboe commit 6a4f2ccb467e00281470cde2dee08fe5ecde62d1 Author: Takashi Iwai Date: Thu Mar 25 15:00:15 2010 +0100 ALSA: hda - Don't set invalid connection index in Realtek initialiaiton Skip initialization of connections of DAC widgets that aren't used, which resulted in invalid verb parameters. Signed-off-by: Takashi Iwai commit 9c13886665c43600bd0af4b38e33c654e648e078 Author: Jozsef Kadlecsik Date: Thu Mar 25 11:17:26 2010 +0100 netfilter: ip6table_raw: fix table priority The order of the IPv6 raw table is currently reversed, that makes impossible to use the NOTRACK target in IPv6: for example if someone enters ip6tables -t raw -A PREROUTING -p tcp --dport 80 -j NOTRACK and if we receive fragmented packets then the first fragment will be untracked and thus skip nf_ct_frag6_gather (and conntrack), while all subsequent fragments enter nf_ct_frag6_gather and reassembly will never successfully be finished. Singed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 55e0d7cf279177dfe320f54816320558bc370f24 Author: Eric Dumazet Date: Thu Mar 25 11:00:22 2010 +0100 netfilter: xt_hashlimit: dl_seq_stop() fix If dl_seq_start() memory allocation fails, we crash later in dl_seq_stop(), trying to kfree(ERR_PTR(-ENOMEM)) Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 0491fcbb76339cecbe4b6b1e862fb0c166bacf2d Merge: ae7a3f1 fc30020 Author: Sascha Hauer Date: Thu Mar 25 08:44:12 2010 +0100 Merge branch 'mx51' into mxc-rc commit ae7a3f13ab59784d9d5041d8ecb08477a049e2c6 Author: Alberto Panizzo Date: Tue Mar 23 19:51:45 2010 +0100 MXC: mach-mx31_3ds: add support for freescale mc13783 power management device. Power Gates must to be always enabled. Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit a1ac442443342f778d5230b16efadc4c32d96298 Author: Alberto Panizzo Date: Tue Mar 23 19:50:28 2010 +0100 MXC: mach-mx31_3ds: Add SPI1 device support. Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit a1b67b957ea3b9138ed8239796cb48d8b1bf66b0 Author: Alberto Panizzo Date: Tue Mar 23 19:49:35 2010 +0100 MXC: mach-mx31_3ds: Add support for on board NAND Flash. Since the using of Bad Block Table is not constantly a good behave I had made it configurable. Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit 11a332adfeacee2634f73ad21b55aad5cc7fd54a Author: Alberto Panizzo Date: Tue Mar 23 19:46:57 2010 +0100 MXC: mach-mx31_3ds: Update variable names over recent mach name modification. Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit 6dc2d6bf5148a9ed027af21285b0e17b83b3a8f4 Author: Vladimir Zapolskiy Date: Wed Mar 24 14:32:16 2010 +0300 imx31: fix parent clock for rtc According to imx31 reference manual the signal from external low frequency clock is sent to RTC clock. The patch makes redundant the previously defined mxc_rtc clock. Signed-off-by: Vladimir Zapolskiy Cc: Sascha Hauer Cc: Daniel Mack Signed-off-by: Sascha Hauer commit 01e77706cdde7c0b47e5ca1f4284a795504c7c40 Merge: 1ff3105 8871d54 Author: Linus Torvalds Date: Wed Mar 24 16:52:15 2010 -0700 Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: OMAP: DSS2: panel-generic: re-implement mode changing OMAP: DSS2: initialize dss clk sources properly OMAP: DSS2: VRAM: Fix early_param for vram commit 1ff31056fb044a47cdda462bdef0dcacefbf6856 Merge: 6c75969 bb45692 Author: Linus Torvalds Date: Wed Mar 24 16:51:14 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON [ARM] Kirkwood: WPS button keycode mapping pxa168fb: fix incorrect resource calculation [ARM] pxa/raumfeld: fix button name [ARM] pxa/raumfeld: remove duplicated #include [ARM] locomo: fix unpaired spin_lock_irqsave [ARM] locomo: fix SPI register offset [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms [ARM] pxa: remove spi cs gpio direction to avoid clash with driver [ARM] mmp: fix for variables in uncompress.h being discarded [ARM] pxa: fix for variables in uncompress.h being discarded ARM: Update mach-types ARM: Fix IXP23xx build error in mach/memory.h commit 6c75969e22ffe27df64ff7477bd35fe72bface3e Merge: c02c873 556ae3b Author: Linus Torvalds Date: Wed Mar 24 16:50:46 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: don't try to decode GETATTR if DELEGRETURN returned error sunrpc: handle allocation errors from __rpc_lookup_create() SUNRPC: Fix the return value of rpc_run_bc_task() SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel SUNRPC: Fix a potential memory leak in auth_gss NFS: Prevent another deadlock in nfs_release_page() commit c02c873c25209f971c2e10884f50d4ab61db1e23 Merge: 541e40e 332ac7f Author: Linus Torvalds Date: Wed Mar 24 16:50:27 2010 -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: libata-sff: fix spurious IRQ handling pata_via: Add VIA VX900 support commit 541e40ee087976ec793c53446099d3f0097e1697 Merge: 1147d0f 4e1a259 Author: Linus Torvalds Date: Wed Mar 24 16:49:38 2010 -0700 Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Silence unintialized variable warnings in dwarf unwinder. sh: Tidy up a couple of section mismatches. sh: Fix build after dynamic PMB rework sh: Replace unsafe manipulation of MMUCR sh: Flush ITLB too in PTEAEX's flush_tlb_page() sh64: Remove long unused mid_sched macro SH: remove superfluous warning from the serial driver SH: fix SCIFA SCASCR register bit definitions serial: sh-sci: fix SH-Mobile SH breakage sh: Add watch-dog register address for SH7722/SH7723/SH7724 sh: ms7724: Add tiny-document for sound sh: mach-ecovec24: Add i2c_put_adapter on sh_eth_init commit 1147d0f915e3b4c5c4fa279dae2c40016b8f441d Author: Dan Carpenter Date: Tue Mar 23 14:48:37 2010 +0000 fscache: add missing unlock Sparse complained about this missing spin_unlock() Signed-off-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 34c1c460f82c809f20a2d378373d6aeb58c7808a Merge: 61964eb 8b4709e Author: Linus Torvalds Date: Wed Mar 24 16:48:11 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix dangling pointers lp3971: Fix BUCK_VOL_CHANGE_SHIFT logic lp3971: Fix setting val for LDO2 and LDO4 regulator: Get rid of lockdep warning regulator: handle kcalloc() failure Regulators: max8925-regulator - clean up driver data after removal commit 61964eba5c419ff710ac996c5ed3a84d5af7490f Author: David Howells Date: Wed Mar 24 17:09:19 2010 +0000 do_sync_read/write() should set kiocb.ki_nbytes to be consistent do_sync_read/write() should set kiocb.ki_nbytes to be consistent with do_sync_readv_writev(). Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 47568d4c56677ede6e7ff7c8e4e0fd860a9c4372 Author: David Howells Date: Wed Mar 24 17:02:28 2010 +0000 FDPIC: For-loop in elf_core_vma_data_size() is incorrect Fix an incorrect for-loop in elf_core_vma_data_size(). The advance-pointer statement lacks an assignment: CC fs/binfmt_elf_fdpic.o fs/binfmt_elf_fdpic.c: In function 'elf_core_vma_data_size': fs/binfmt_elf_fdpic.c:1593: warning: statement with no effect Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 6467a71c56934251f3c917bd4386387c2a97b41e Merge: 18020a0 6e6c822 Author: Linus Torvalds Date: Wed Mar 24 16:42:43 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Stop trying to use ACPI lid status to determine LVDS connection. drm/intel: fix up set_tiling for untiled->tiled transition drm/i915: Set up the documented clock gating on Sandybridge and Ironlake. agp/intel: Don't do the chipset flush on Sandybridge. agp/intel: Respect the GTT size on Sandybridge for scratch page setup. drm/i915: fix small leak on overlay error path drm/i915: Avoid NULL deref in get_pages() unwind after error. drm/i915: Fix check with IS_GEN6 drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats drm/i915: Enable VS timer dispatch. drm/i915: Rename FBC_C3_IDLE to FBC_CTL_C3_IDLE to match other registers drm/i915: remove an unnecessary wait_request() drm/i915: Don't bother with the BKL for GEM ioctls. commit 18020a0d8cccad0d3642219d6aef789420c04c1f Merge: c27b9a2 0f5ed04 Author: Linus Torvalds Date: Wed Mar 24 16:41:48 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-scmi: Provide module aliases for automatic loading i2c-scmi: Support IBM SMBus CMI devices acpi: Support IBM SMBus CMI devices commit c27b9a2e6c29eac2fe770bd1071007c9f8c43de5 Merge: 20dba45 06c0dd7 Author: Linus Torvalds Date: Wed Mar 24 16:36:53 2010 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix boot failures with compressed kernels [S390] fix broken proc interface for sclp_async [S390] sclp: avoid 64 bit division [S390] dasd: check tsb validity [S390] dasd: fix alignment of transport mode recovery TCW [S390] system.h: Fix compile error for 1 and 2 byte cmpxchg [S390] smp: fix lowcore allocation [S390] zcore: CPU registers are not saved under LPAR commit 20dba4596fd768b2d9154e3258871ebdd2c9fa29 Merge: 90fddab 1218002 Author: Linus Torvalds Date: Wed Mar 24 16:34:33 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: cmipci: work around invalid PCM pointer ASoC: Remove BROKEN from i.MX audio after dependencies merged ALSA: hda - Fix access-after-free in patch_realtek.c ALSA: hda - Sort codec entry list of Nvidia HDMI ALSA: hda - Add support of Nvidia GT220 HDMI ALSA: hda: Fix 0 dB offset for HP laptops using CX20551 (Waikiki) ALSA: hda - Add PCI quirk for HP dv6-1110ax. sound/oss/vidc.c: change the field used with DMA_ACTIVE ASoC: pxa-pcm-lib: initialize DMA channel to -1 ASoC: Bail out of wm_hubs DC servo if calibration fails ASoC: tlv320dac33: Internal clocking changes ASoC: tlv320dac33: Fix DSP modes ASoC: SIU driver shall select FW_LOADER commit 90fddabf5818367c6bd1fe1b256a10e01827862f Author: David Howells Date: Wed Mar 24 09:43:00 2010 +0000 Document Linux's circular buffering capabilities Document the circular buffering capabilities available in Linux. Signed-off-by: David Howells Signed-off-by: Paul E. McKenney Reviewed-by: Randy Dunlap Reviewed-by: Stefan Richter Signed-off-by: Linus Torvalds commit 8e0cc811e0f8029a7225372fb0951fab102c012f Author: OGAWA Hirofumi Date: Tue Mar 23 13:35:50 2010 -0700 fs/partition/msdos: fix unusable extended partition for > 512B sector Smaller size than a minimum blocksize can't be used, after all it's handled like 0 size. For extended partition itself, this makes sure to use bigger size than one logical sector size at least. Signed-off-by: OGAWA Hirofumi Cc: Daniel Taylor Cc: "H. Peter Anvin" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fbf586cf7f245392142e5407c2a56f1cff979b6 Author: Daniel Taylor Date: Tue Mar 23 13:35:50 2010 -0700 fs/partitions/msdos: add support for large disks In order to use disks larger than 2TiB on Windows XP, it is necessary to use 4096-byte logical sectors in an MBR. Although the kernel storage and functions called from msdos.c used "sector_t" internally, msdos.c still used u32 variables, which results in the ability to handle XP-compatible large disks. This patch changes the internal variables to "sector_t". Daniel said: "In the near future, WD will be releasing products that need this patch". [hirofumi@mail.parknet.co.jp: tweaks and fix] Signed-off-by: Daniel Taylor Signed-off-by: OGAWA Hirofumi Cc: "H. Peter Anvin" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5c26f97ec4a17c650055c83cfc1f2ee6d8818eb Author: Michael Grzeschik Date: Tue Mar 23 13:35:49 2010 -0700 lxfb: set the H- and V-SYNC polarity of the flatpanel output Fixup for the flatpanel output. The geode_modedb attribute flags are used to set the SYNC polarity of the flatpanel. Without this patch our flatpanel registers stayed unconfigured, so we just saw garbage output. Signed-off-by: Michael Grzeschik Cc: Andres Salomon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fd2c20d964a8fb9861045f1022475c9d200d684 Author: Dan Carpenter Date: Tue Mar 23 13:35:42 2010 -0700 kcore: fix test for end of list "m" is never NULL here. We need a different test for the end of list condition. Signed-off-by: Dan Carpenter Acked-by: KAMEZAWA Hiroyuki Acked-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b6ef8bb05af632889c5536513b9f4004961f73 Author: Lee Schermerhorn Date: Tue Mar 23 13:35:41 2010 -0700 mempolicy: fix get_mempolicy() for relative and static nodes Discovered while testing other mempolicy changes: get_mempolicy() does not handle static/relative mode flags correctly. Return the value that the user specified so that it can be restored via set_mempolicy() if desired. Signed-off-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Ravikiran Thirumalai Cc: KOSAKI Motohiro Cc: Christoph Lameter Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7198f3c9b13c7aa1e5d9f7ff74c0ea303174feff Author: Adrian Hunter Date: Tue Mar 23 13:35:40 2010 -0700 mmc: fix incorrect interpretation of card type bits In the extended CSD register the CARD_TYPE is an 8-bit value of which the upper 6 bits were reserved in JEDEC specifications prior to version 4.4. In version 4.4 two of the reserved bits were designated for identifying support for the newly added High-Speed Dual Data Rate. Unfortunately the mmc_read_ext_csd() function required that the reserved bits be zero instead of ignoring them as it should. This patch makes mmc_read_ext_csd() ignore the CARD_TYPE bits that are reserved or not yet supported. It also stops the function jumping to the end as though an error occurred, when it is only warns that the CARD_TYPE bits (that it does interpret) are invalid. Signed-off-by: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f8b5ee33293d43ca360771b535dfae8c57259dc Author: Jeff Mahoney Date: Tue Mar 23 13:35:39 2010 -0700 reiserfs: properly honor read-only devices The reiserfs journal behaves inconsistently when determining whether to allow a mount of a read-only device. This is due to the use of the continue_replay variable to short circuit the journal scanning. If it's set, it's assumed that there are transactions to replay, but there may not be. If it's unset, it's assumed that there aren't any, and that may not be the case either. I've observed two failure cases: 1) Where a clean file system on a read-only device refuses to mount 2) Where a clean file system on a read-only device passes the optimization and then tries writing the journal header to update the latest mount id. The former is easily observable by using a freshly created file system on a read-only loopback device. This patch moves the check into journal_read_transaction, where it can bail out before it's about to replay a transaction. That way it can go through and skip transactions where appropriate, yet still refuse to mount a file system with outstanding transactions. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f Author: Jeff Mahoney Date: Tue Mar 23 13:35:38 2010 -0700 reiserfs: fix oops while creating privroot with selinux enabled Commit 57fe60df ("reiserfs: add atomic addition of selinux attributes during inode creation") contains a bug that will cause it to oops when mounting a file system that didn't previously contain extended attributes on a system using security.* xattrs. The issue is that while creating the privroot during mount reiserfs_security_init calls reiserfs_xattr_jcreate_nblocks which dereferences the xattr root. The xattr root doesn't exist, so we get an oops. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15309 Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 298359c5bf06c04258d7cf552426e198c47e83c1 Author: Michael S. Tsirkin Date: Tue Mar 23 13:35:37 2010 -0700 exit: fix oops in sync_mm_rss In 2.6.34-rc1, removing vhost_net module causes an oops in sync_mm_rss (called from do_exit) when workqueue is destroyed. This does not happen on net-next, or with vhost on top of to 2.6.33. The issue seems to be introduced by 34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of mm_counter) which added sync_mm_rss() that is passed task->mm, and dereferences it without checking. If task is a kernel thread, mm might be NULL. I think this might also happen e.g. with aio. This patch fixes the oops by calling sync_mm_rss when task->mm is set to NULL. I also added BUG_ON to detect any other cases where counters get incremented while mm is NULL. The oops I observed looks like this: BUG: unable to handle kernel NULL pointer dereference at 00000000000002a8 IP: [] sync_mm_rss+0x33/0x6f PGD 0 Oops: 0002 [#1] SMP last sysfs file: /sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map CPU 2 Modules linked in: vhost_net(-) tun bridge stp sunrpc ipv6 cpufreq_ondemand acpi_cpufreq freq_table kvm_intel kvm i5000_edac edac_core rtc_cmos bnx2 button i2c_i801 i2c_core rtc_core e1000e sg joydev ide_cd_mod serio_raw pcspkr rtc_lib cdrom virtio_net virtio_blk virtio_pci virtio_ring virtio af_packet e1000 shpchp aacraid uhci_hcd ohci_hcd ehci_hcd [last unloaded: microcode] Pid: 2046, comm: vhost Not tainted 2.6.34-rc1-vhost #25 System Planar/IBM System x3550 -[7978B3G]- RIP: 0010:[] [] sync_mm_rss+0x33/0x6f RSP: 0018:ffff8802379b7e60 EFLAGS: 00010202 RAX: 0000000000000008 RBX: ffff88023f2390c0 RCX: 0000000000000000 RDX: ffff88023f2396b0 RSI: 0000000000000000 RDI: ffff88023f2390c0 RBP: ffff8802379b7e60 R08: 0000000000000000 R09: 0000000000000000 R10: ffff88023aecfbc0 R11: 0000000000013240 R12: 0000000000000000 R13: ffffffff81051a6c R14: ffffe8ffffc0f540 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff880001e80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00000000000002a8 CR3: 000000023af23000 CR4: 00000000000406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process vhost (pid: 2046, threadinfo ffff8802379b6000, task ffff88023f2390c0) Stack: ffff8802379b7ee0 ffffffff81040687 ffffe8ffffc0f558 ffffffffa00a3e2d <0> 0000000000000000 ffff88023f2390c0 ffffffff81055817 ffff8802379b7e98 <0> ffff8802379b7e98 0000000100000286 ffff8802379b7ee0 ffff88023ad47d78 Call Trace: [] do_exit+0x147/0x6c4 [] ? handle_rx_net+0x0/0x17 [vhost_net] [] ? autoremove_wake_function+0x0/0x39 [] ? worker_thread+0x0/0x229 [] kthreadd+0x0/0xf2 [] kernel_thread_helper+0x4/0x10 [] ? kthread+0x0/0x87 [] ? kernel_thread_helper+0x0/0x10 Code: 00 8b 87 6c 02 00 00 85 c0 74 14 48 98 f0 48 01 86 a0 02 00 00 c7 87 6c 02 00 00 00 00 00 00 8b 87 70 02 00 00 85 c0 74 14 48 98 48 01 86 a8 02 00 00 c7 87 70 02 00 00 00 00 00 00 8b 87 74 RIP [] sync_mm_rss+0x33/0x6f RSP CR2: 00000000000002a8 ---[ end trace 41603ba922beddd2 ]--- Fixing recursive fault but reboot is needed! (note: handle_rx_net is a work item using workqueue in question). sync_mm_rss+0x33/0x6f gave me a hint. I also tried reverting 34e55232e59f7b19050267a05ff1226e5cd122a5 and the oops goes away. The module in question calls use_mm and later unuse_mm from a kernel thread. It is when this kernel thread is destroyed that the crash happens. Signed-off-by: Michael S. Tsirkin Andrea Arcangeli Reviewed-by: Rik van Riel Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53feb29767c29c877f9d47dcfe14211b5b0f7ebd Author: Miao Xie Date: Tue Mar 23 13:35:35 2010 -0700 cpuset: alloc nodemask_t on the heap rather than the stack Signed-off-by: Miao Xie Acked-by: David Rientjes Cc: Nick Piggin Cc: Paul Menage Cc: Li Zefan Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ab116c9349ef52d6fbd2e2917a53f13194b048e Author: Miao Xie Date: Tue Mar 23 13:35:34 2010 -0700 cpuset: fix the problem that cpuset_mem_spread_node() returns an offline node cpuset_mem_spread_node() returns an offline node, and causes an oops. This patch fixes it by initializing task->mems_allowed to node_states[N_HIGH_MEMORY], and updating task->mems_allowed when doing memory hotplug. Signed-off-by: Miao Xie Acked-by: David Rientjes Reported-by: Nick Piggin Tested-by: Nick Piggin Cc: Paul Menage Cc: Li Zefan Cc: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5574169613b40b85d6f4c67208fa4846b897a0a1 Author: KOSAKI Motohiro Date: Tue Mar 23 13:35:33 2010 -0700 doc: add the documentation for mpol=local commit 3f226aa1c (mempolicy: support mpol=local tmpfs mount option) added new mpol=local mount option. but it didn't add a documentation. This patch does it. Signed-off-by: KOSAKI Motohiro Cc: Ravikiran Thirumalai Cc: Christoph Lameter Cc: Mel Gorman Acked-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 926f2ae04f183098cf9a30521776fb2759c8afeb Author: KOSAKI Motohiro Date: Tue Mar 23 13:35:32 2010 -0700 tmpfs: cleanup mpol_parse_str() mpol_parse_str() made lots 'err' variable related bug. Because it is ugly and reviewing unfriendly. This patch simplifies it. Signed-off-by: KOSAKI Motohiro Cc: Ravikiran Thirumalai Cc: Christoph Lameter Cc: Mel Gorman Acked-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12821f5fb942e795f8009ece14bde868893bd811 Author: KOSAKI Motohiro Date: Tue Mar 23 13:35:31 2010 -0700 tmpfs: handle MPOL_LOCAL mount option properly commit 71fe804b6d5 (mempolicy: use struct mempolicy pointer in shmem_sb_info) added mpol=local mount option. but its feature is broken since it was born. because such code always return 1 (i.e. mount failure). This patch fixes it. Signed-off-by: KOSAKI Motohiro Cc: Ravikiran Thirumalai Cc: Christoph Lameter Cc: Mel Gorman Acked-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69b2e63e9172afb4d07c305601b79a55509ac4c Author: KOSAKI Motohiro Date: Tue Mar 23 13:35:30 2010 -0700 tmpfs: mpol=bind:0 don't cause mount error. Currently, following mount operation cause mount error. % mount -t tmpfs -ompol=bind:0 none /tmp Because commit 71fe804b6d5 (mempolicy: use struct mempolicy pointer in shmem_sb_info) corrupted MPOL_BIND parse code. This patch restore the needed one. Signed-off-by: KOSAKI Motohiro Cc: Ravikiran Thirumalai Cc: Christoph Lameter Cc: Mel Gorman Acked-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 413b43deab8377819aba1dbad2abf0c15d59b491 Author: Ravikiran G Thirumalai Date: Tue Mar 23 13:35:28 2010 -0700 tmpfs: fix oops on mounts with mpol=default Fix an 'oops' when a tmpfs mount point is mounted with the mpol=default mempolicy. Upon remounting a tmpfs mount point with 'mpol=default' option, the mount code crashed with a null pointer dereference. The initial problem report was on 2.6.27, but the problem exists in mainline 2.6.34-rc as well. On examining the code, we see that mpol_new returns NULL if default mempolicy was requested. This 'NULL' mempolicy is accessed to store the node mask resulting in oops. The following patch fixes it. Signed-off-by: Ravikiran Thirumalai Signed-off-by: KOSAKI Motohiro Cc: Christoph Lameter Cc: Mel Gorman Acked-by: Lee Schermerhorn Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c363afe94b885d39ae2e93e41680282a470ad84 Author: Jani Nikula Date: Tue Mar 23 13:35:27 2010 -0700 c2port: fix device_create() return value check Use IS_ERR() instead of comparing to NULL. [akpm@linux-foundation.org: preserve the error code] Signed-off-by: Jani Nikula Cc: Vegard Nossum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb53237513bd1e090cce120efe12ede72c932b5f Author: Robin Holt Date: Tue Mar 23 13:35:26 2010 -0700 mm/ksm.c is doing an unneeded _notify in write_protect_page. ksm.c's write_protect_page implements a lockless means of verifying a page does not have any users of the page which are not accounted for via other kernel tracking means. It does this by removing the writable pte with TLB flushes, checking the page_count against the total known users, and then using set_pte_at_notify to make it a read-only entry. An unneeded mmu_notifier callout is made in the case where the known users does not match the page_count. In that event, we are inserting the identical pte and there is no need for the set_pte_at_notify, but rather the simpler set_pte_at suffices. Signed-off-by: Robin Holt Acked-by: Izik Eidus Acked-by: Andrea Arcangeli Acked-by: Hugh Dickins Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20072205fcdf7d85cd3101f1f11dfab333c5fd0c Author: Randy Dunlap Date: Tue Mar 23 13:35:24 2010 -0700 scripts/kernel-doc: fix fatal error on function prototype Fix a fatal error in scripts/kernel-doc when a function signature uses __init_or_module (just ignore that string): Error(drivers/base/platform.c:568): cannot understand prototype: 'struct platform_device * __init_or_module platform_create_bundle(struct platform_driver *driver, int (*probe)(struct platform_device *), struct resource *res, unsigned int n_res, const void *data, size_t size) ' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e07c2c7301bd2c82e55cf5cbb36f7b5bddeb8e9 Author: FUJITA Tomonori Date: Tue Mar 23 13:35:23 2010 -0700 Documentation: rename PCI/PCI-DMA-mapping.txt to DMA-API-HOWTO.txt This patch renames PCI/PCI-DMA-mapping.txt to DMA-API-HOWTO.txt. The commit 51e7364ef281e540371f084008732b13292622f0 "Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt" was supposed to do this but it didn't. Signed-off-by: FUJITA Tomonori Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c87684d32e8f95715d53039dcd2d998dc63d1eb Author: David Härdeman Date: Tue Mar 23 13:35:22 2010 -0700 kfifo: fix KFIFO_INIT in include/linux/kfifo.h include/linux/kfifo.h first defines and then undefines __kfifo_initializer which is used by INIT_KFIFO (which is also a macro, so building a module which uses INIT_KFIFO will fail). Signed-off-by: David Härdeman Acked-by: Stefani Seibold Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fa30460ea502133a18a07b14452cd660906f16f Author: David Howells Date: Tue Mar 23 13:35:21 2010 -0700 nommu: fix an incorrect comment in the do_mmap_shared_file() Fix an incorrect comment in the do_mmap_shared_file(). If a mapping is requested MAP_SHARED, then a private copy cannot be made and still provide correct semantics. Signed-off-by: David Howells Reported-by: Dave Hudson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28b8e8d4e2e3e27aa911b5aee59d5194a878f53e Author: Joe Perches Date: Tue Mar 23 13:35:20 2010 -0700 MAINTAINERS: use tab not spaces for delimiter Keeps MAINTAINERS a bit more consistent. done via sed -r -i -e 's/^([A-Z]):[ \t]+/\1:\t/g' MAINTAINERS Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06ca02b06fc26b3f940d223f319397a72a591ddf Author: Richard Röjfors Date: Tue Mar 23 13:35:20 2010 -0700 drivers/gpio/max730x.c: add license macro According to the header in max730x it is licensed GPLv2. Add a MODULE_LICENSE to avoid getting the kernel tainted. [w.sang@pengutronix.de: add MODULE_AUTHOR and MODULE_DESCRIPTION also] Signed-off-by: Richard Röjfors Signed-off-by: Wolfram Sang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ca9ea9a17a14c68611d3774d1e8a7ab6c7f4763 Author: Greg Thelen Date: Tue Mar 23 13:35:19 2010 -0700 memcg: fix typo in memcg documentation Update memory.txt to be more consistent: s/swapiness/swappiness/ Signed-off-by: Greg Thelen Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a4df13d2420ae1998e5c7d26275f8714e84da30 Author: Wolfram Sang Date: Tue Mar 23 13:35:18 2010 -0700 get_maintainer: repair STDIN usage Commit 22dd5b0cba50a197aaa3bd2790a29ee2e8e4e372 (fix perlcritic warnings) broke the ability to handle STDIN because the three argument version of open() cannot handle standard IO-streams (which is mentioned in PerlBestPractices, too). Signed-off-by: Wolfram Sang Cc: Stephen Hemminger Acked-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d53661d26aa779dcd74f8a1c5a94e181cc101d8 Author: Mike Frysinger Date: Tue Mar 23 13:35:17 2010 -0700 blackfin: enable DEBUG_SECTION_MISMATCH We see only one section mismatch now after thousands of randconfigs, and a bug has been filed about that one. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 091e635e6735fa4496c4a18e7e967b58e961303c Author: Russell King Date: Tue Mar 23 13:35:16 2010 -0700 Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation cpu_relax() is documented in volatile-considered-harmful.txt to be a memory barrier. However, everyone with the exception of Blackfin and possibly ia64 defines cpu_relax() to be a compiler barrier. Make the documentation reflect the general concensus. Linus sayeth: : I don't think it was ever the intention that it would be seen as anything : but a compiler barrier, although it is obviously implied that it might : well perform some per-architecture actions that have "memory barrier-like" : semantics. : : After all, the whole and only point of the "cpu_relax()" thing is to tell : the CPU that we're busy-looping on some event. : : And that "event" might be (and often is) about reading the same memory : location over and over until it changes to what we want it to be. So it's : quite possible that on various architectures the "cpu_relax()" could be : about making sure that such a tight loop on loads doesn't starve cache : transactions, for example - and as such look a bit like a memory barrier : from a CPU standpoint. : : But it's not meant to have any kind of architectural memory ordering : semantics as far as the kernel is concerned - those must come from other : sources. Signed-off-by: Russell King Cc: Acked-by: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7731d9a5d415414aa6903709453786d4a5ff57e4 Author: Borislav Petkov Date: Tue Mar 23 13:35:15 2010 -0700 fs/binfmt_aout.c: fix pointer warnings fs/binfmt_aout.c: In function `aout_core_dump': fs/binfmt_aout.c:125: warning: passing argument 2 of `dump_write' makes pointer from integer without a cast include/linux/coredump.h:12: note: expected `const void *' but argument is of type `long unsigned int' fs/binfmt_aout.c:132: warning: passing argument 2 of `dump_write' makes pointer from integer without a cast include/linux/coredump.h:12: note: expected `const void *' but argument is of type `long unsigned int' due to dump_write() expecting a user void *. Fold casts into the START_DATA/START_STACK macros and shut up the warnings. Signed-off-by: Borislav Petkov Cc: Daisuke HATAYAMA Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef5da59f12602815baa8fad98241b77dedea3b31 Author: Randy Dunlap Date: Tue Mar 23 13:35:14 2010 -0700 scripts/kernel-doc: handle struct member __aligned scripts/kernel-doc erroneously says: Warning(include/linux/skbuff.h:410): Excess struct/union/enum/typedef member 'cb' description in 'sk_buff' on this line in struct sk_buff: char cb[48] __aligned(8); due to treating the last field as the struct member name, so teach kernel-doc to ignore __aligned(x) in structs. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05731b979476969d4d1cbbcb535fc0f5ea90dba7 Author: Uwe Kleine-König Date: Tue Mar 23 13:35:13 2010 -0700 rtc/mc13783: fix use after free bug This was introduced by v2.6.34-rc1~38: 4c014e8 (rtc/mc13783: protect rtc {,un}registration by mc13783 lock) Signed-off-by: Uwe Kleine-König Reported-by: Dan Carpenter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7bbcdf3747e3919c31cfa87853c69d178bce548 Author: Dan Carpenter Date: Tue Mar 23 13:35:12 2010 -0700 memcontrol: fix potential null deref There was a potential null deref introduced in c62b1a3b31b5 ("memcg: use generic percpu instead of private implementation"). Signed-off-by: Dan Carpenter Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d34706f42f9b8c15185423d9af98d37ba21d011 Author: Li Zefan Date: Tue Mar 23 13:35:12 2010 -0700 cgroups: remove duplicate include commit e6a1105b ("cgroups: subsystem module loading interface") and commit c50cc752 ("sched, cgroups: Fix module export") result in duplicate including of module.h Signed-off-by: Li Zefan Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cfb80a73b5a52fb19d8b0611203e4dd58e8e9a2 Author: Daisuke Nishimura Date: Tue Mar 23 13:35:11 2010 -0700 memcg: disable move charge in no mmu case In commit 02491447 ("memcg: move charges of anonymous swap"), I tried to disable move charge feature in no mmu case by enclosing all the related functions with "#ifdef CONFIG_MMU", but the commit places these ifdefs in wrong place. (it seems that it's mangled while handling some fixes...) This patch fixes it up. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe43d6d9cf59d8f8cbfdcde2018de13ffd1285c7 Author: Stefan Richter Date: Fri Mar 19 00:39:07 2010 +0100 firewire: core: align driver match with modalias The driver match strategy was: - Match vendor/model/specifier/version of the unit directory. - If that was a miss, match vendor from the root directory and model/specifier/version of the unit directory. This was inconsistent with how the modalias string was constructed until recently (take vendor/model from root directory and specifier/ version from unit directory). It was also inconsistent with how it is done since the parent commit: - Use vendor/model/specifier/version of the unit directory if possible, - fall back to one or more of vendor/model/specifier/version from the root directory depending on which ones are not present at the unit directory. Fix this inconsistency by sharing the ROM scanner function between modalias printer function and driver match function. Signed-off-by: Stefan Richter commit 5ae73518cb39dd81e641dfa7ce20751c853579e0 Author: Stefan Richter Date: Fri Mar 19 00:38:29 2010 +0100 firewire: core: fix Model_ID in modalias The modalias string of devices that represent units on a FireWire node did not show Module_ID entries within unit directories. This was because firewire-core searched only the root directory of the configuration ROM for a Model_ID entry. We now search first the root directory, then the unit directory. IOW honor a unit directory's Model_ID if present, otherwise fall back to the root directory's model ID (if present). Furthermore, apply the same change to Vendor_ID. This had the same issue but it was less apparent because most devices provide Vendor_ID only in the root directory. And finally, also use this strategy for the remaining two IDs in the modalias, Specifier_ID and Version. It does not actually make sense to look for them elsewhere than in the unit directory because they are mandatory there. However, a uniform search order simplifies the implementation and has no adverse affect in practice. Side notes: - The older counterpart of this, nodemgr.c of ieee1394, looked for Vendor_ID first in the root directory, then in the unit directory, and for Model_ID only in the unit directory. - There is a single mainline driver which requires Vendor_ID and Model_ID --- the firedtv driver. This one worked because FireDTVs provide Vendor_ID in the root directory and Model_ID identically in root directory and unit directory. - Apart from firedtv, there are currently no drivers known to me (including userspace drivers) that look at the Vendor_ID or Model_ID of the modalias. Reported-by: Maciej Żenczykowski Signed-off-by: Stefan Richter commit 9a127aad4d60968fba96622008ea0d243688f2b0 Author: Dan Carpenter Date: Wed Mar 24 01:47:00 2010 +0000 af_key: return error if pfkey_xfrm_policy2msg_prep() fails The original code saved the error value but just returned 0 in the end. Signed-off-by: Dan Carpenter Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit a5ee4eb75413c145334c30e43f1af9875dad6fd7 Author: Clemens Ladisch Date: Mon Mar 22 09:52:16 2010 +0100 PCI quirk: RS780/RS880: work around missing MSI initialization AMD says in section 2.5.4 (GFX MSI Enable) of #43291 (AMD 780G Family Register Programming Requirements): The SBIOS must enable internal graphics MSI capability in GCCFG by setting the following: NBCFG.NB_CNTL.STRAP_MSI_ENABLE='1' Quite a few BIOS writers misinterpret this sentence and think that enabling MSI is an optional feature. However, clearing that bit just prevents delivery of MSI messages but does not remove the MSI PCI capabilities registers, and so leaves these devices unusable for any driver that attempts to use MSI. Setting that bit is not possible after the BIOS has locked down the configuration registers, so we have to manually disable MSI for the affected devices. This fixes the codec communication errors in the HDA driver when accessing the HDMI audio device, and allows us to get rid of the overcautious quirk in radeon_irq_kms.c. Signed-off-by: Clemens Ladisch Tested-by: Alex Deucher Cc: Signed-off-by: Jesse Barnes commit ca8463926306580c25e62eb901a206530d480cae Author: Tim Yamin Date: Fri Mar 19 14:22:58 2010 -0700 PCI quirk: only apply CX700 PCI bus parking quirk if external VT6212L is present Apply the CX700 quirk only when an external VT6212L is present (which is the case for the errant hardware the quirk was written for), don't touch the settings otherwise -- Hauppage PVR-500 tuners need PCI Bus Parking in order to work and when that's turned on everything seems to behave fine. I guess the underlying problem is a combination of an external VT6212L and the CX700 rather than the CX700's PCI being broken completely for all cases... Reported-by: Jeroen Roos Signed-off-by: Tim Yamin Signed-off-by: Jesse Barnes commit c519a5a7dab2d8e9a114f003e2d369bcf8e913f3 Author: Bjorn Helgaas Date: Fri Mar 19 14:56:27 2010 -0600 PCI: complain about devices that seem to be broken If we can tell that a device isn't working correctly, we should tell the user to make debugging easier. Otherwise, it can take a lot of work to determine whether the problem is in the driver, PCMCIA, PCI, hardware, etc., as in http://bugzilla.kernel.org/show_bug.cgi?id=12006 Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit e1944c6b0fba80a7837c1cbc47dfbf46e1274a4b Author: Bjorn Helgaas Date: Tue Mar 16 15:53:08 2010 -0600 PCI: print resources consistently with %pR No functional change; just print resources in the conventional style. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 7b8ff6da028232aadae6bcc7c7406c8966d0b3c4 Author: Bjorn Helgaas Date: Tue Mar 16 15:53:03 2010 -0600 PCI: make disabled window printk style match the enabled ones No functional change; this just tweaks the changes from 349e1823a405 so the new printks for disabled PCI-to-PCI bridge windows match the ones for the enabled windows. Signed-off-by: Bjorn Helgaas CC: Yinghai Lu Signed-off-by: Jesse Barnes commit 99ddd552fef7e6e3b7dc76ba8fee9ea5869d1e14 Author: Bjorn Helgaas Date: Tue Mar 16 15:52:58 2010 -0600 PCI: break out primary/secondary/subordinate for readability No functional change; just add names for the primary/secondary/subordinate bus numbers read from config space rather than repeatedly masking/shifting. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 966f3a7570447c5025d67a618d408e68a3ae3167 Author: Bjorn Helgaas Date: Thu Mar 11 17:01:19 2010 -0700 PCI: for address space collisions, show conflicting resource With request_resource_conflict(), we can learn what the actual conflict is, so print that info for debugging purposes. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit c26f91a3df1999ec1b3298372d73f90cbab81106 Author: Jiri Kosina Date: Mon Mar 22 09:32:26 2010 +0100 x86: Remove excessive early_res debug output Commit 08677214e318297 ("x86: Make 64 bit use early_res instead of bootmem before slab") introduced early_res replacement for bootmem, but left code in __free_pages_memory() which dumps all the ranges that are beeing freed, without any additional information, causing some noise in dmesg during bootup. Just remove printing of the ranges, that doesn't provide anything useful anyway. While at it, remove other commented-out KERN_DEBUG messages in the NO_BOOTMEM code as well. Signed-off-by: Jiri Kosina Found-OK-by: Andrew Morton Cc: Johannes Weiner Cc: Yinghai Lu LKML-Reference: Signed-off-by: Ingo Molnar commit 03e6d819c2cb2cc8ce5642669a0a7c72336ee7a2 Author: Alexander Duyck Date: Tue Mar 23 20:40:50 2010 +0000 skbuff: remove unused dma_head & dma_maps fields The dma map fields in the skb_shared_info structure no longer has any users and can be dropped since it is making the skb_shared_info unecessarily larger. Running slabtop show that we were using 4K slabs for the skb->head on x86_64 w/ an allocation size of 1522. It turns out that the dma_head and dma_maps array made skb_shared large enough that we had crossed over the 2k boundary with standard frames and as such we were using 4k blocks of memory for all skbs. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit f6b9f4b263f3178fc0f23f0e67d04386528cc727 Author: Vasu Dev Date: Tue Mar 23 14:42:05 2010 +0000 vlan: updates vlan real_num_tx_queues Updates real_num_tx_queues in case underlying real device has changed real_num_tx_queues. -v2 As per Eric Dumazet comment:- -- adds BUG_ON to catch case of real_num_tx_queues exceeding num_tx_queues. -- created this self contained patch to just update real_num_tx_queues. Signed-off-by: Vasu Dev Signed-off-by: Jeff Kirsher Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 669d3e0babb40018dd6e78f4093c13a2eac73866 Author: Vasu Dev Date: Tue Mar 23 14:41:45 2010 +0000 vlan: adds vlan_dev_select_queue This is required to correctly select vlan tx queue for a driver supporting multi tx queue with ndo_select_queue implemented since currently selected vlan tx queue is unaligned to selected queue by real net_devce ndo_select_queue. Unaligned vlan tx queue selection causes thrash with higher vlan tx lock contention for least fcoe traffic and wrong socket tx queue_mapping for ixgbe having ndo_select_queue implemented. -v2 As per Eric Dumazet comments, mirrored vlan net_device_ops to have them with and without vlan_dev_select_queue and then select according to real dev ndo_select_queue present or not for a vlan net_device. This is to completely skip vlan_dev_select_queue calling for real net_device not supporting ndo_select_queue. Signed-off-by: Vasu Dev Signed-off-by: Jeff Kirsher Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit a8462bde78fdb77c8ede61e1af99617905a78ccf Author: Dan Carpenter Date: Wed Mar 24 14:58:34 2010 +0300 ASoC: wm8994: playback => capture Sparse caught that initialize "playback" two times instead of initializing "capture". Signed-off-by: Dan Carpenter Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0f5ed04cb365ce0117b0588c4d9ed89f2623650b Author: Darrick J. Wong Date: Wed Mar 24 14:38:39 2010 +0100 i2c-scmi: Provide module aliases for automatic loading Provide module aliases for automatic loading. Signed-off-by: Darrick J. Wong Signed-off-by: Jean Delvare commit e82e15ddd322e4c5847536f044a40812b7ec12bd Author: Crane Cai Date: Wed Mar 24 14:38:38 2010 +0100 i2c-scmi: Support IBM SMBus CMI devices *) add a new HID for IBM SMBus CMI devices *) add methods for IBM SMBus CMI devices *) hook different HID with different control methods set *) minor tweaks as suggested by Jean Delvare Slightly modified by Darrick to use #define'd IBM SMBUS HID from Darrick's ACPI scan quirk patch. Signed-off-by: Crane Cai Signed-off-by: Darrick J. Wong Signed-off-by: Jean Delvare commit 222e82ac9ffbd3b80ab1b0b1d2c8c60ddb47d69d Author: Darrick J. Wong Date: Wed Mar 24 14:38:37 2010 +0100 acpi: Support IBM SMBus CMI devices On some old IBM workstations and desktop computers, the BIOS presents in the DSDT an SMBus object that is missing the HID identifier that the i2c-scmi driver looks for. Modify the ACPI device scan code to insert the missing HID if it finds an IBM system with such an object. Affected machines: IntelliStation Z20/Z30. Note that the i2c-i801 driver no longer works on these machines because of ACPI resource conflicts. Signed-off-by: Darrick J. Wong Signed-off-by: Jean Delvare commit 860652bfb890bd861c999ec39fcffabe5b712f85 Author: Henrik Kretzschmar Date: Wed Mar 24 12:59:20 2010 +0100 genirq: Move two IRQ functions from .init.text to .text Both functions should not be marked as __init, since they be called from modules after the init section is freed. Signed-off-by: Henrik Kretzschmar Cc: Yinghai Lu Cc: Peter Zijlstra Cc: Jiri Kosina LKML-Reference: <1269431961-5731-1-git-send-email-henne@nachtwindheim.de> Signed-off-by: Thomas Gleixner commit cc8c3b78433222e5dbc1fdfcfdde29e1743f181a Author: Thomas Gleixner Date: Tue Mar 23 22:40:53 2010 +0100 genirq: Protect access to irq_desc->action in can_request_irq() can_request_irq() accesses and dereferences irq_desc->action w/o holding irq_desc->lock. So action can be freed on another CPU before it's dereferenced. Unlikely, but ... Protect it with desc->lock. Signed-off-by: Thomas Gleixner commit 06c0dd72aea3985d0ea036f771ebb1d1083bf69f Author: Martin Schwidefsky Date: Wed Mar 24 11:49:57 2010 +0100 [S390] fix boot failures with compressed kernels Fix two bugs with the kernel image compression: 1) reset the bss section of the compressed vmlinux 2) clear the high half of the registers for 64 bit early enough for the decompression step Signed-off-by: Martin Schwidefsky commit 7b26d82f5ea7de5667f87bb5ac6570111d7bff9f Author: Hans-Joachim Picht Date: Wed Mar 24 11:49:56 2010 +0100 [S390] fix broken proc interface for sclp_async This patch now allows the use of the proc interface to either activate or deactivate call home on panic. e.g. echo 1 > /proc/sys/kernel/callhome strict_strtoul() requires _either_'\n\0' _or_ '\0' termination. This was missing and therefore the interface did not recognise valid input. Signed-off-by: Hans-Joachim Picht Signed-off-by: Martin Schwidefsky commit 9c95258c0d5911ae263bf50d854e402ce973ab32 Author: Heiko Carstens Date: Wed Mar 24 11:49:55 2010 +0100 [S390] sclp: avoid 64 bit division Avoid 64 bit division to fix this compile error on 32 bit: drivers/s390/char/sclp_cmd.c:711: undefined reference to `__udivdi3' Also move the whole arch_get_memory_phys_device function to the memory hotplug related functions. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b8fde7224d771ce55bfd67cb57d7c4c8f430972f Author: Stefan Haberland Date: Wed Mar 24 11:49:54 2010 +0100 [S390] dasd: check tsb validity Check tsb validity before the tcw_get_tsb function is called. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 4a31ba57cae853ce1ac00a22c0f5d80bd36685ed Author: Stefan Weinhuber Date: Wed Mar 24 11:49:53 2010 +0100 [S390] dasd: fix alignment of transport mode recovery TCW All TCWs need to be aligned on a 64 byte boundary or the I/O will be rejected. For recovery requests we create fresh TCWs, so we need to do the proper alignment here as well. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 1bff779285f89cd0b62955c20cca70ada4074236 Author: Christian Borntraeger Date: Wed Mar 24 11:49:52 2010 +0100 [S390] system.h: Fix compile error for 1 and 2 byte cmpxchg commit 024914477e15ef8b17f271ec47f1bb8a589f0806 "memcg: move charges of anonymous swap" revealed that the 1 byte and 2 byte cmpxchg is currently broken: arch/s390/include/asm/system.h: Assembler messages: arch/s390/include/asm/system.h:241: Error: junk at end of line: `(%r5)' make[1]: *** [mm/page_cgroup.o] Error 1 make[1]: *** Waiting for unfinished jobs.... It turned out that commit 987bcdacb18a3adc2a48d85c9b005069c2f4dd7b ([S390] use inline assembly contraints available with gcc 3.3.3) broke the inline assembly. The or operands are now in constraint 3 and 4 instead of 2 and 3. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a08786568a7e334d8a07a7bb8f4fafa3f7afb89c Author: Heiko Carstens Date: Wed Mar 24 11:49:51 2010 +0100 [S390] smp: fix lowcore allocation The intermediate lowcore for CONFIG_SMP is allocated using a call to __alloc_bootmem() with a goal of 0. That however doesn't guarantee that the allocated piece of memory is below 2GB. Instead we should call __alloc_bootmem_low(). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 92fe31329cb3a2b02f1c7616965872d6a34bcf08 Author: Michael Holzheu Date: Wed Mar 24 11:49:50 2010 +0100 [S390] zcore: CPU registers are not saved under LPAR To save the registers for all CPUs a sigp "store status" is done that stores the registers to address absolute zero. To access storage at absolute zero, normally the address of the prefix register of the accessing CPU has to be used. This does not work when large pages are active (currently only under LPAR). In order to fix that problem, instead of memcpy memcpy_real is used, which switches to real mode where prefixing works. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit d7646f7632549124fe70fec8af834c7c1246f365 Author: Dominik Brodowski Date: Mon Mar 15 21:46:34 2010 +0100 pcmcia: use dev_pm_ops for class pcmcia_socket_class Instead of requiring PCMCIA socket drivers to call various functions during their (bus) resume and suspend functions, register an own dev_pm_ops for this class. This fixes several suspend/resume bugs seen on db1xxx-ss, and probably on some other socket drivers, too. With regard to the asymmetry with only _noirq suspend, but split up resume, please see bug 14334 and commit 9905d1b411946fb3 . Signed-off-by: Dominik Brodowski commit e7176a37d436a214f6a7727ea7986c654cbee8f0 Author: Dominik Brodowski Date: Mon Mar 15 21:43:11 2010 +0100 power: support _noirq actions on device types and classes The new-style dev_pm_ops provide callbacks for both IRQs enabled and disabled. However, the _noirq variants were only called for buses registered with a device, not for classes and types. In order to properly use dev_pm_ops in class pcmcia_socket_class, support _noirq actions also on classes and types. Signed-off-by: Dominik Brodowski Acked-by: Rafael J. Wysocki commit 7d7ba8d31eb293016bc91a5c8fc36b21fd917265 Author: Dominik Brodowski Date: Wed Mar 24 10:49:14 2010 +0100 pcmcia: allow for four multifunction subdevices (again) Commit aa584ca4 broke what 6cf5be51 had already fixed: there may be four multifunction devices, but just two pseudo-multifunction devices per PCMCIA card. Signed-off-by: Dominik Brodowski commit 8a6d9b149f105f8bdfa8e42dd9753e45a1887a16 Author: Ferenc Wagner Date: Wed Mar 24 08:20:03 2010 +0100 i2o: Remove the dangerous kobj_to_i2o_device macro This macro worked only when applied to variables named 'kobj'. While this could have been fixed by simply renaming the macro argument, a more type-safe replacement by an inline function would be preferred. However, nobody uses this macro, so it's simpler to just remove it. Signed-off-by: Ferenc Wagner Signed-off-by: Jens Axboe commit 12180024cc22c0a67642ffa10e7069796e32969d Merge: b72f134 bae84e7 Author: Takashi Iwai Date: Wed Mar 24 08:03:38 2010 +0100 Merge branch 'fix/hda' into for-linus commit b72f1343d63f5bad966caf6013a943f4e1db9c72 Merge: 1c58306 3cc4e53 Author: Takashi Iwai Date: Wed Mar 24 08:03:34 2010 +0100 Merge branch 'fix/asoc' into for-linus commit 1c583063a5c769fe2ec604752e383972c69e6d9b Author: Clemens Ladisch Date: Wed Mar 24 07:10:54 2010 +0100 ALSA: cmipci: work around invalid PCM pointer When the CMI8738 FRAME2 register is read, the chip sometimes (probably when wrapping around) returns an invalid value that would be outside the programmed DMA buffer. This leads to an inconsistent PCM pointer that is likely to result in an underrun. To work around this, read the register multiple times until we get a valid value; the error state seems to be very short-lived. Signed-off-by: Clemens Ladisch Reported-and-tested-by: Matija Nalis Cc: Signed-off-by: Takashi Iwai commit 31b24b955c3ebbb6f3008a6374e61cf7c05a193c Author: Alexander Duyck Date: Tue Mar 23 18:35:18 2010 +0000 igb: only use vlan_gro_receive if vlans are registered This change makes it so that vlan_gro_receive is only used if vlans have been registered to the adapter structure. Previously we were just sending all vlan tagged frames in via this function but this results in a null pointer dereference when vlans are not registered. [ This fixes bugzilla entry 15582 -Eric Dumazet] Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit d07f3e375f608e52a1f8958fbde105bb27b7629a Author: Emil Tantilov Date: Tue Mar 23 18:34:57 2010 +0000 igb: do not modify tx_queue_len on link speed change Previously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex. This had the effect of overriding user set values on link change/reset. Testing shows that adjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex. Based on e1000e patch by Franco Fichtner Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fa3d9a6d55014b5bce5575aeab1cf711cff748ab Author: Mitch Williams Date: Tue Mar 23 18:34:38 2010 +0000 igb: count Rx FIFO errors correctly Don't aggregate rx_no_buffer_count into rx_fifo_errors. RNBC counts packets that get queued temporarily in the adapter's FIFO. These packets are not dropped and are not errors. The correct counter is rx_missed_errors (MPC). Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1bf1e347ef254ed8a13e7971a30e1bf3983da3d1 Author: Michael Chan Date: Tue Mar 23 13:13:12 2010 +0000 bnx2: Use proper handler during netpoll. Netpoll needs to call the proper handler depending on the IRQ mode and the vector. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4327ba435a56ada13eedf3eb332e583c7a0586a9 Author: Benjamin Li Date: Tue Mar 23 13:13:11 2010 +0000 bnx2: Fix netpoll crash. The bnx2 driver calls netif_napi_add() for all the NAPI structs during ->probe() time but not all of them will be used if we're not in MSI-X mode. This creates a problem for netpoll since it will poll all the NAPI structs in the dev_list whether or not they are scheduled, resulting in a crash when we access structure fields not initialized for that vector. We fix it by moving the netif_napi_add() call to ->open() after the number of IRQ vectors has been determined. Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c4caae25187ff3f5e837c6f04eb1acc2723c72d3 Author: Eric Sandeen Date: Tue Mar 23 21:32:00 2010 -0400 ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs When used_dirs was introduced for the flex_groups struct, it looks like the accounting was not put into place properly, in some places manipulating free_inodes rather than used_dirs. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit ba69f9ab7df844125898104e854e063b47c26637 Author: Jan Kara Date: Wed Mar 24 20:18:37 2010 -0400 ext4: Don't use delayed allocation by default when used instead of ext3 When ext4 driver is used to mount a filesystem instead of the ext3 file system driver (through CONFIG_EXT4_USE_FOR_EXT23), do not enable delayed allocation by default since some ext3 users and application writers have developed unfortunate expectations about the safety of writing files on systems subject to sudden and violent death without using fsync(). Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 37f328eb60a94779dd020084209fc4db2d6444a0 Author: Theodore Ts'o Date: Wed Mar 24 20:06:41 2010 -0400 ext4: Fix spelling of CONTIG_FS_EXT3 to CONFIG_FS_EXT3 Oops. (Blush.) Thanks to Sedat Dilek for pointing this out. Signed-off-by: "Theodore Ts'o" commit 14741472a05245ed5778aa0aec055e1f920b6ef8 Author: Srinivas Eeda Date: Mon Mar 22 16:50:47 2010 -0700 ocfs2: Fix a race in o2dlm lockres mastery In o2dlm, the master of a lock resource keeps a map of all interested nodes. This prevents the master from purging the resource before an interested node can create a lock. A race between the mastery thread and the mastery handler allowed an interested node to discover who the master is without informing the master directly. This is easily fixed by holding the dlm spinlock a little longer in the mastery handler. Signed-off-by: Srinivas Eeda Signed-off-by: Joel Becker commit b54c2ca475fa7d7450a45b6d778dae9dbe0bcbfe Author: Tristan Ye Date: Fri Mar 19 09:21:10 2010 +0800 Ocfs2: Handle deletion of reflinked oprhan inodes correctly. The rule is that all inodes in the orphan dir have ORPHANED_FL, otherwise we treated it as an ERROR. This rule works well except for some rare cases of reflink operation: http://oss.oracle.com/bugzilla/show_bug.cgi?id=1215 The problem is caused by how reflink and our orphan_scan thread interact. * The orphan scan pulls the orphans into a queue first, then runs the queue at a later time. We only hold the orphan_dir's lock during scanning. * Reflink create a oprhaned target in orphan_dir as its first step. It removes the target and clears the flag as the final step. These two steps take the orphan_dir's lock, but it is not held for the duration. Based on the above semantics, a reflink inode can be moved out of the orphan dir and have its ORPHANED_FL cleared before the queue of orphans is run. This leads to a ERROR in ocfs2_query_wipde_inode(). This patch teaches ocfs2_query_wipe_inode() to detect previously orphaned reflink targets. If a reflink fails or a crash occurs during the relfink operation, the inode will retain ORPHANED_FL and will be properly wiped. Signed-off-by: Tristan Ye Signed-off-by: Joel Becker commit 3939fda4b389993caf8741df5739b3e49f33a263 Author: Tristan Ye Date: Fri Mar 19 09:21:09 2010 +0800 Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir. Currently, some callers were missing to journal the dirty inode after adding it to orphan dir. Now we're going to journal such modifications within the ocfs2_orphan_add() itself, It's safe to do so, though some existing caller may duplicate this, and it makes the logic look more straightforward anyway. Signed-off-by: Tristan Ye Signed-off-by: Joel Becker commit b4414eea0e7b9c134262c801a87e338bf675962c Author: Mark Fasheh Date: Thu Mar 11 18:31:09 2010 -0800 ocfs2: Clear undo bits when local alloc is freed When the local alloc file changes windows, unused bits are freed back to the global bitmap. By defnition, those bits can not be in use by any file. Also, the local alloc will never have been able to allocate those bits if they were part of a previous truncate. Therefore it makes sense that we should clear unused local alloc bits in the undo buffer so that they can be used immediatly. [ Modified to call it ocfs2_release_clusters() -- Joel ] Signed-off-by: Mark Fasheh Signed-off-by: Joel Becker commit 66f1207bce10fd80ee8ce99b67d617644612f05e Author: Bjorn Helgaas Date: Thu Mar 11 17:01:09 2010 -0700 resources: add interfaces that return conflict information request_resource() and insert_resource() only return success or failure, which no information about what existing resource conflicted with the proposed new reservation. This patch adds request_resource_conflict() and insert_resource_conflict(), which return the conflicting resource. Callers may use this for better error messages or to adjust the new resource and retry the request. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 4881a4f89a95cc5fef6d32953954bcc3443eefd5 Author: Jens Rottmann Date: Tue Mar 23 04:23:50 2010 +0000 ksz884x: fix return value of netdev_set_eeprom ksz884x: fix return value of netdev_set_eeprom netdev_set_eeprom() confused ethtool by just returning 1 on error instead of a proper -EINVAL. Signed-off-by: Jens Rottmann Signed-off-by: David S. Miller commit 8e039d84b323c4503c4d56863faa47c783660826 Author: Ben Blum Date: Tue Mar 23 05:24:03 2010 +0000 cgroups: net_cls as module Allows the net_cls cgroup subsystem to be compiled as a module This patch modifies net/sched/cls_cgroup.c to allow the net_cls subsystem to be optionally compiled as a module instead of builtin. The cgroup_subsys struct is moved around a bit to allow the subsys_id to be either declared as a compile-time constant by the cgroup_subsys.h include in cgroup.h, or, if it's a module, initialized within the struct by cgroup_load_subsys. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6e6c822868f113dabe3c33bdd91e883cc28fa11b Author: Eric Anholt Date: Wed Mar 17 13:48:06 2010 -0700 drm/i915: Stop trying to use ACPI lid status to determine LVDS connection. I've been getting more and more quirk reports about this. It seems clear at this point that other OSes are not using this for determining whether the integrated panel should be turned on, and it is not reliable for doing so. Better to light up an unintended panel than to not light up the only usable output on the system. Signed-off-by: Eric Anholt Acked-by: Jesse Barnes commit 9713ab28ec92d0c44b2ac5765dfc26c619d9cadd Author: Dominik Brodowski Date: Tue Mar 23 16:05:00 2010 +0100 pcmcia: do not use ioports < 0x100 on x86 On x86 systems using ACPI _CRS information -- now the default for post-2008 systems -- the PCI root bus no longer pretends to be offering the root ioport_resource. To avoid accidentally hitting some platform / system device, use only I/O ports >= 0x100 for PCMCIA devices on x86. Reported-by: Komuro CC: Bjorn Helgaas Signed-off-by: Dominik Brodowski commit bb456928913fda2b360376afb13d9a0bc72c761c Author: Christian Lamparter Date: Mon Mar 8 15:26:35 2010 -0800 [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON "Input: add KEY_WPS_BUTTON definition" introduced a generic keycode for WPS input events. Signed-off-by: Christian Lamparter Signed-off-by: Nicolas Pitre commit 9705c3961e73054b656720884f0da0a5a438fbae Author: Christian Lamparter Date: Mon Mar 8 15:25:29 2010 -0800 [ARM] Kirkwood: WPS button keycode mapping Commit "Input: add KEY_WPS_BUTTON definition" added a generic keycode for WPS button. Let's use it, instead of "F1" mapping. Signed-off-by: Christian Lamparter Signed-off-by: Nicolas Pitre commit f4e60e6b303bc46cdc477d3174dbf9cb5dd013aa Author: Tyler Hicks Date: Thu Feb 11 00:02:32 2010 -0600 eCryptfs: Strip metadata in xattr flag in encrypted view The ecryptfs_encrypted_view mount option provides a unified way of viewing encrypted eCryptfs files. If the metadata is stored in a xattr, the metadata is moved to the file header when the file is read inside the eCryptfs mount. Because of this, we should strip the ECRYPTFS_METADATA_IN_XATTR flag from the header's flag section. This allows eCryptfs to treat the file as an eCryptfs file with a header at the front. Reviewed-by: Eric Sandeen Signed-off-by: Tyler Hicks commit 1984c23f9e0cdb432d90a85ecf88b424d36878fc Author: Tyler Hicks Date: Wed Feb 10 23:17:44 2010 -0600 eCryptfs: Clear buffer before reading in metadata xattr We initially read in the first PAGE_CACHE_SIZE of a file to if the eCryptfs header marker can be found. If it isn't found and ecryptfs_xattr_metadata was given as a mount option, then the user.ecryptfs xattr is read into the same buffer. Since the data from the first page of the file wasn't cleared, it is possible that we think we've found a second tag 3 or tag 1 packet and then error out after the packet contents aren't as expected. This patch clears the buffer before filling it with metadata from the user.ecryptfs xattr. Reviewed-by: Eric Sandeen Signed-off-by: Tyler Hicks commit fa3ef1cb4e6e9958a9bfaa977c107c515907f102 Author: Tyler Hicks Date: Thu Feb 11 05:09:14 2010 -0600 eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front This patch renames the num_header_bytes_at_front variable to metadata_size since it now contains the max size of the metadata. Reviewed-by: Eric Sandeen Signed-off-by: Tyler Hicks commit 157f1071354db1aed885816094888e0e257c9d0a Author: Tyler Hicks Date: Thu Feb 11 07:10:38 2010 -0600 eCryptfs: Fix metadata in xattr feature regression Fixes regression in 8faece5f906725c10e7a1f6caf84452abadbdc7b When using the ecryptfs_xattr_metadata mount option, eCryptfs stores the metadata (normally stored at the front of the file) in the user.ecryptfs xattr. This causes ecryptfs_crypt_stat.num_header_bytes_at_front to be 0, since there is no header data at the front of the file. This results in too much memory being requested and ENOMEM being returned from ecryptfs_write_metadata(). This patch fixes the problem by using the num_header_bytes_at_front variable for specifying the max size of the metadata, despite whether it is stored in the header or xattr. Reviewed-by: Eric Sandeen Signed-off-by: Tyler Hicks commit d067633b4483f3c7d971d8f889f35340a8635bb5 Author: Ryusuke Konishi Date: Mon Mar 22 19:33:43 2010 +0900 nilfs2: fix imperfect completion wait in nilfs_wait_on_logs nilfs_wait_on_logs has a potential to slip out before completion of all bio requests when it met an error. This synchronization fault may cause unexpected results, for instance, violative access to freed segment buffers from an end-bio callback routine. This fixes the issue by ensuring that nilfs_wait_on_logs waits all given logs. Signed-off-by: Ryusuke Konishi commit 830ec0458c390f29c6c99e1ff7feab9e36368d12 Author: John Stultz Date: Thu Mar 18 14:47:30 2010 -0700 time: Fix accumulation bug triggered by long delay. The logarithmic accumulation done in the timekeeping has some overflow protection that limits the max shift value. That means it will take more then shift loops to accumulate all of the cycles. This causes the shift decrement to underflow, which causes the loop to never exit. The simplest fix would be simply to do a: if (shift) shift--; However that is not optimal, as we know the cycle offset is larger then the interval << shift, the above would make shift drop to zero, then we would be spinning for quite awhile accumulating at interval chunks at a time. Instead, this patch only decreases shift if the offset is smaller then cycle_interval << shift. This makes sure we accumulate using the largest chunks possible without overflowing tick_length, and limits the number of iterations through the loop. This issue was found and reported by Sonic Zhang, who also tested the fix. Many thanks your explanation and testing! Reported-by: Sonic Zhang Signed-off-by: John Stultz Tested-by: Sonic Zhang LKML-Reference: <1268948850-5225-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 5cbb2b941d2cc77e6b915e8e55d375be632c9f6a Author: Komuro Date: Sat Mar 20 06:39:19 2010 +0900 pd6729: Coding Style fixes Signed-off-by: Komuro Signed-off-by: Dominik Brodowski commit d8e4ebf8b603bdcd091540e6b5bddf0dec10d516 Author: Jiri Kosina Date: Tue Mar 23 16:32:37 2010 +0100 HID: fix oops in gyration_event() Fix oops caused by dereferencing field->hidinput in cases where the device hasn't been claimed by hid-input. Reported-by: Andreas Demmer Signed-off-by: Jiri Kosina commit 110d735a0ae69bdd11af9acb6ea3b979137eb118 Author: Ryusuke Konishi Date: Mon Mar 22 21:36:06 2010 +0900 nilfs2: fix hang-up of cleaner after log writer returned with error According to the report from Andreas Beckmann (Message-ID: <4BA54677.3090902@abeckmann.de>), nilfs in 2.6.33 kernel got stuck after a disk full error. This turned out to be a regression by log writer updates merged at kernel 2.6.33. nilfs_segctor_abort_construction, which is a cleanup function for erroneous cases, was skipping writeback completion for some logs. This fixes the bug and would resolve the hang issue. Reported-by: Andreas Beckmann Signed-off-by: Ryusuke Konishi Tested-by: Ryusuke Konishi Cc: stable [2.6.33.x] commit 23ab15ad7a9d042afa7303b735b6e24faa607241 Author: Sage Weil Date: Mon Mar 22 09:37:14 2010 -0700 ceph: avoid loaded term 'OSD' in documention 'OSD' means different things to different people; avoid it here to avoid confusion. Signed-off-by: Sage Weil commit 393f66209669ad23f4f6d4191234c1df4367df3c Author: Sage Weil Date: Wed Mar 10 12:03:32 2010 -0800 ceph: fix possible double-free of mds request reference Clear pointer to mds request after dropping the reference to ensure we don't drop it again, as there is at least one error path through this function that does not reset fi->last_readdir to a new value. Signed-off-by: Sage Weil commit d96d60498ff748c5a88c72ec5d1cc4ba9a583e7e Author: Sage Weil Date: Sat Mar 20 20:50:58 2010 -0700 ceph: fix session check on mds reply Fix a broken check that a reply came back from the same MDS we sent the request to. I don't think a case that actually triggers this would ever come up in practice, but it's clearly wrong and easy to fix. Reported-by: Dan Carpenter Signed-off-by: Sage Weil commit 4736b009b880b7c19bea36327a71032a6dbee402 Author: Dan Carpenter Date: Sat Mar 20 15:30:16 2010 +0300 ceph: handle kmalloc() failure Return ERR_PTR(-ENOMEM) if kmalloc() fails. We handle allocation failures the same way later in the function. Signed-off-by: Dan Carpenter Signed-off-by: Sage Weil commit 9c423956b8a495f0c048143abc5da955a70eac97 Author: Sage Weil Date: Sat Mar 20 20:43:28 2010 -0700 ceph: propagate mds session allocation failures to caller Return error to original caller if register_session() fails. Signed-off-by: Sage Weil commit 8f883c24de33ba929c95e018ac0ba66e4f46734b Author: Sage Weil Date: Fri Mar 19 13:27:53 2010 -0700 ceph: make write_begin wait propagate ERESTARTSYS Currently, if the wait_event_interruptible is interrupted, we return EAGAIN unconditionally and loop, such that we aren't, in fact, interruptible. So, propagate ERESTARTSYS if we get it. Signed-off-by: Sage Weil commit ec4318bcb4c59d8b8bf7037c9f444a9887ccb265 Author: Sage Weil Date: Fri Mar 19 13:24:39 2010 -0700 ceph: fix snap rebuild condition We were rebuilding the snap context when it was not necessary (i.e. when the realm seq hadn't changed _and_ the parent seq was still older), which caused page snapc pointers to not match the realm's snapc pointer (even though the snap context itself was identical). This confused begin_write and put it into an endless loop. The correct logic is: rebuild snapc if _my_ realm seq changed, or if my parent realm's seq is newer than mine (and thus mine needs to be rebuilt too). Signed-off-by: Sage Weil commit 87b315a5b5cec5d7086494b203577602f5befc8c Author: Sage Weil Date: Mon Mar 22 14:51:18 2010 -0700 ceph: avoid reopening osd connections when address hasn't changed We get a fault callback on _every_ tcp connection fault. Normally, we want to reopen the connection when that happens. If the address we have is bad, however, and connection attempts always result in a connection refused or similar error, explicitly closing and reopening the msgr connection just prevents the messenger's backoff logic from kicking in. The result can be a console full of [ 3974.417106] ceph: osd11 10.3.14.138:6800 connection failed [ 3974.423295] ceph: osd11 10.3.14.138:6800 connection failed [ 3974.429709] ceph: osd11 10.3.14.138:6800 connection failed Instead, if we get a fault, and have outstanding requests, but the osd address hasn't changed and the connection never successfully connected in the first place, do nothing to the osd connection. The messenger layer will back off and retry periodically, because we never connected and thus the lossy bit is not set. Instead, touch each request's r_stamp so that handle_timeout can tell the request is still alive and kicking. Signed-off-by: Sage Weil commit 3dd72fc0e6dc49c79fa9e7cd7c654deac7ccaa29 Author: Sage Weil Date: Mon Mar 22 14:42:30 2010 -0700 ceph: rename r_sent_stamp r_stamp Make variable name slightly more generic, since it will (soon) reflect either the time the request was sent OR the time it was last determined to be still retrying. Signed-off-by: Sage Weil commit 3c3f2e32effd4c6acc3a9434bd7eecb0af653d89 Author: Sage Weil Date: Thu Mar 18 15:20:53 2010 -0700 ceph: fix connection fault con_work reentrancy problem The messenger fault was clearing the BUSY bit, for reasons unclear. This made it possible for the con->ops->fault function to reopen the connection, and requeue work in the workqueue--even though the current thread was already in con_work. This avoids a problem where the client busy loops with connection failures on an unreachable OSD, but doesn't address the root cause of that problem. Signed-off-by: Sage Weil commit e4cb4cb8a03adde1aa4b874623c50b9a5b56e635 Author: Sage Weil Date: Thu Mar 18 13:43:09 2010 -0700 ceph: prevent dup stale messages to console for restarting mds Prevent duplicate 'mds0 caps stale' message from spamming the console every few seconds while the MDS restarts. Set s_renew_requested earlier, so that we only print the message once, even if we don't send an actual request. Signed-off-by: Sage Weil commit efd7576b2392cc5a0934352936d793e8884c46bf Author: Sage Weil Date: Wed Mar 17 10:05:28 2010 -0700 ceph: fix pg pool decoding from incremental osdmap update The incremental map decoding of pg pool updates wasn't skipping the snaps and removed_snaps vectors. This caused osd requests to stall when pool snapshots were created or fs snapshots were deleted. Use a common helper for full and incremental map decoders that decodes pools properly. Signed-off-by: Sage Weil commit 80fc7314a7e26e8d2e4ba5b3d8cc2d4aeb750015 Author: Sage Weil Date: Tue Mar 16 15:28:54 2010 -0700 ceph: fix mds sync() race with completing requests The wait_unsafe_requests() helper dropped the mdsc mutex to wait for each request to complete, and then examined r_node to get the next request after retaking the lock. But the request completion removes the request from the tree, so r_node was always undefined at this point. Since it's a small race, it usually led to a valid request, but not always. The result was an occasional crash in rb_next() while dereferencing node->rb_left. Fix this by clearing the rb_node when removing the request from the request tree, and not walking off into the weeds when we are done waiting for a request. Since the request we waited on will _always_ be out of the request tree, take a ref on the next request, in the hopes that it won't be. But if it is, it's ok: we can start over from the beginning (and traverse over older read requests again). Signed-off-by: Sage Weil commit 916623da10e270c7e9e802a7ddfe1ec8f890982d Author: Sage Weil Date: Tue Mar 16 15:01:07 2010 -0700 ceph: only release unused caps with mds requests We were releasing used caps (e.g. FILE_CACHE) from encode_inode_release with MDS requests (e.g. setattr). We don't carry refs on most caps, so this code worked most of the time, but for setattr (utimes) we try to drop Fscr. This causes cap state to get slightly out of sync with reality, and may result in subsequent mds revoke messages getting ignored. Fix by only releasing unused caps. Signed-off-by: Sage Weil commit 15637c8b1251c38694c32214eba69b72a30e9d9b Author: Sage Weil Date: Tue Mar 16 13:42:00 2010 -0700 ceph: clean up handle_cap_grant, handle_caps wrt session mutex Drop session mutex unconditionally in handle_cap_grant, and do the check_caps from the handle_cap_grant helper. This avoids using a magic return value. Also avoid using a flag variable in the IMPORT case and call check_caps at the appropriate point. Signed-off-by: Sage Weil commit cdc2ce056a3620139056b60ad7f6d355ad13f445 Author: Sage Weil Date: Tue Mar 16 13:39:28 2010 -0700 ceph: fix session locking in handle_caps, ceph_check_caps Passing a session pointer to ceph_check_caps() used to mean it would leave the session mutex locked. That wasn't always possible if it wasn't passed CHECK_CAPS_AUTHONLY. If could unlock the passed session and lock a differet session mutex, which was clearly wrong, and also emitted a warning when it a racing CPU retook it and we did an unlock from the wrong context. This was only a problem when there was more than one MDS. First, make ceph_check_caps unconditionally drop the session mutex, so that it is free to lock other sessions as needed. Then adjust the one caller that passes in a session (handle_cap_grant) accordingly. Signed-off-by: Sage Weil commit 4ea0043a29c82ca52ca54728d837314563bec574 Author: Sage Weil Date: Tue Mar 16 10:36:40 2010 -0700 ceph: drop unnecessary WARN_ON in caps migration If we don't have the exported cap it's because we already released it. No need to WARN. Signed-off-by: Sage Weil commit 12eadc190038e68b5884a4aa313b6ab89ba60f5e Author: Sage Weil Date: Mon Mar 15 22:20:39 2010 -0700 ceph: fix null pointer deref of r_osd in debug output This causes an oops when debug output is enabled and we kick an osd request with no current r_osd (sometime after an osd failure). Check the pointer before dereferencing. Signed-off-by: Sage Weil commit 0a990e7093566ceb07e38951e1a01686923d4f09 Author: Sage Weil Date: Mon Mar 15 16:12:25 2010 -0700 ceph: clean up service ticket decoding Previously we would decode state directly into our current ticket_handler. This is problematic if for some reason we fail to decode, because we end up with half new state and half old state. We are probably already in bad shape if we get an update we can't decode, but we may as well be tidy anyway. Decode into new_* temporaries and update the ticket_handler only on success. Signed-off-by: Sage Weil commit 332ac7ff77cdc6a183d78ab129545d7b14a1d57c Author: Tejun Heo Date: Tue Mar 23 12:24:08 2010 +0900 libata-sff: fix spurious IRQ handling Commit 27943620cbd960f710a385ff4a538e14ed3f1922 introduced spurious IRQ handling but it has a race condition where valid completion can be lost while trying to clear spurious IRQ leading to occassional command timeouts. This patch improves SFF interrupt handler such that 1. Once BMDMA HSM is stopped, the condition is never considered spurious. As there's no way to resume stopped BMDMA HSM, if device status doesn't agree with BMDMA status, the only way out is aborting the command (otherwise, it will just end up timing out). 2. ap->ops->sff_check_status() can be safely called to clear spurious device IRQ as it atomically returns completion status but BMDMA IRQ status can't be cleared in safe way if command is in flight. After a spurious IRQ, call ap->ops->sff_irq_clear() only if the respective device is idle and retry completion if sff_check_status() indicates command completion. Please note that ata_piix uses bmdma_status for sff_irq_check() and #2 won't weaken spurious IRQ handling even with in-flight command because if bmdma_status indicates IRQ pending but device status is not on spurious check, the next IRQ handler invocation will abort the command due to #1. This fixes bko#15537. https://bugzilla.kernel.org/show_bug.cgi?id=15537 Signed-off-by: Tejun Heo Cc: Andrew Benton Cc: Petr Uzel Cc: Rafael J. Wysocki Signed-off-by: Jeff Garzik commit 4f4669ee732a6b37279e912af1833fbff15407a2 Merge: 48edcfc e3396b2 Author: Russell King Date: Tue Mar 23 08:18:25 2010 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 4e1a2594094020bdb41c18681c1765671138d06a Author: Paul Mundt Date: Tue Mar 23 17:07:41 2010 +0900 sh: Silence unintialized variable warnings in dwarf unwinder. The parent rb_node needs to be initialized to shut up the compiler, even though we're unlikely to ever hit this issue at run time. Signed-off-by: Paul Mundt commit 90851c40769791a6ddeef691c482ecf69bae4a5c Author: Paul Mundt Date: Tue Mar 23 17:06:47 2010 +0900 sh: Tidy up a couple of section mismatches. select_idle_routine() and register_sh_pmu() both needed their annotations fixed up to silence section mismatch warnings. Signed-off-by: Paul Mundt commit 3fe0f36c7edcd20af0a3cafc68bdd62534c0a7f0 Author: Matt Fleming Date: Mon Mar 22 22:09:58 2010 +0000 sh: Fix build after dynamic PMB rework set_pmb_entry() is now only used by a function that is wrapped in #ifdef CONFIG_PM, so wrap set_pmb_entry() in CONFIG_PM too. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit b5b6c7eea1124de5b110a48ac62650a690ed2419 Author: Matt Fleming Date: Sun Mar 21 19:51:52 2010 +0000 sh: Replace unsafe manipulation of MMUCR Setting the TI in MMUCR causes all the TLB bits in MMUCR to be cleared. Unfortunately, the TLB wired bits are also cleared when setting the TI bit, causing any wired TLB entries to become unwired. Use local_flush_tlb_all() which implements TLB flushing in a safer manner by using the memory-mapped TLB registers. As each CPU has its own PMB the modifications in pmb_init() only affect the local CPU, so only flush the local CPU's TLB. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit a9eb4f6d1a168c830a206306dfbb1f95a7fed6b3 Author: Matt Fleming Date: Sun Mar 21 19:51:43 2010 +0000 sh: Flush ITLB too in PTEAEX's flush_tlb_page() flush_tlb_page() can be used to flush TLB entries that map executable pages. Therefore, we need to ensure that the ITLB is also flushed in local_flush_tlb_page(). Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 685abecfc2a6036b713229617570980c566c7500 Author: Andreas Bombe Date: Sat Mar 20 00:38:01 2010 +0000 sh64: Remove long unused mid_sched macro interruptible_sleep_on() is referenced for use in the mid_sched macro which is not used anywhere. Remove reference and macro as well as the comment which appears to belong with them. Signed-off-by: Andreas Bombe Signed-off-by: Paul Mundt commit 0a60a210ede8942c5149526bf6847176cee5c184 Author: Guennadi Liakhovetski Date: Fri Mar 19 13:53:36 2010 +0000 SH: remove superfluous warning from the serial driver This warning has been introduced during the SCI DMA support developmenr and is not needed any more. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit d7bbf7f50e03c427debb6d7d960c48b9b934e7e2 Author: Guennadi Liakhovetski Date: Fri Mar 19 13:52:35 2010 +0000 SH: fix SCIFA SCASCR register bit definitions Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 8d099d4446fcb23ca6cc054bde3c35b417e29b3b Author: Magnus Damm Date: Tue Mar 16 11:21:07 2010 +0000 serial: sh-sci: fix SH-Mobile SH breakage The follwing commit breaks SH-Mobile on non-ARM platforms: "8a77b8d serial: sh-sci: Support ARM-based SH-Mobile CPUs." The commit assumed that CONFIG_ARCH_SHMOBILE only was set on ARM platforms, but it turns out that this kconfig is also set by all SH-based SoCs. Sh7724 and other older SH-Mobile SoCs are all broken without this fix. This patch converts the "defined(CONFIG_ARCH_SHMOBILE)" into one "defined()" per SoC model - similar to existing SH code. Reported-by: Guennadi Liakhovetski Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit bf02bd2590eb78d79ba1033d6df80c778b2f5ddf Author: Rafael J. Wysocki Date: Tue Mar 16 23:21:55 2010 +0100 ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe() acpi_ev_enable_gpe() should enable the GPE at the hardware level regardless of the value of the GPE's runtime reference counter. There are only two callers of acpi_ev_enable_gpe(), acpi_enable_gpe() and acpi_set_gpe(). The first one checks the GPE's runtime reference counter itself and only calls acpi_ev_enable_gpe() if it's equal to one, and the other one is supposed to enable the GPE unconditionally (if called with ACPI_GPE_ENABLE). This change fixes the problem in acpi_enable_wakeup_device() where the GPE will not be enabled for wakeup if it's runtime reference counter is zero, which is a regression from 2.6.33. Signed-off-by: Rafael J. Wysocki Reported-by: Robert Moore Signed-off-by: Len Brown commit 67eaa3e4fb29a758f92c9296ca006264a034e9c2 Author: Kuninori Morimoto Date: Tue Mar 16 02:02:08 2010 +0000 sh: Add watch-dog register address for SH7722/SH7723/SH7724 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit bec9fb072f58a77a449c4bb3b1b036fcecc68663 Author: Kuninori Morimoto Date: Tue Mar 16 02:01:53 2010 +0000 sh: ms7724: Add tiny-document for sound Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b230eb32c8d568284c1f33f5d06005eb97d4f897 Author: Kuninori Morimoto Date: Tue Mar 16 02:01:33 2010 +0000 sh: mach-ecovec24: Add i2c_put_adapter on sh_eth_init i2c_put_adapter is needed after i2c_get_adapter Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit bc73675b99fd9850dd914be01d71af99c5d2a1ae Author: Zhang Rui Date: Mon Mar 22 15:48:54 2010 +0800 ACPI: fixes a false alarm from lockdep fixes a false alarm from lockdep, as acpi hotplug workqueue waits other workqueues. http://bugzilla.kernel.org/show_bug.cgi?id=14553 https://bugzilla.kernel.org/show_bug.cgi?id=15521 Original-patch-from: Andrew Morton Signed-off-by: Shaohua Li Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 1ee4d61fd9822fb89e63b88a66848477087cd82e Author: Zhang Rui Date: Mon Mar 22 15:46:49 2010 +0800 ACPI dock: support multiple ACPI dock devices There may be multiple ACPI dock devices exist in ACPI namespace and we should probe all of them. http://bugzilla.kernel.org/show_bug.cgi?id=15521 CC: Li Shaohua Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 688328c7ec3cd0dc3b16342aeb045d28012cc955 Author: Eric W. Biederman Date: Wed Mar 17 22:24:39 2010 +0000 netxen: The driver doesn't work on NX_P3_B1 so cause probe to fail. I haven't been able to get link up on a NX_P3_B1 since 2.6.31. The driver complains about a firmware hang instead. When I asked I was told rev 0x41 was a preproduction rev. So disable support in the driver so no one is surprised the code doesn't work. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 5fc05f8764f301138003ff562a31ad3721f1675f Author: Amerigo Wang Date: Sun Mar 21 22:59:58 2010 +0000 netpoll: warn when there are spaces in parameters v2: update according to Frans' comments. Currently, if we leave spaces before dst port, netconsole will silently accept it as 0. Warn about this. Also, when spaces appear in other places, make them visible in error messages. Signed-off-by: WANG Cong Cc: David Miller Acked-by: Neil Horman Signed-off-by: David S. Miller commit 21afc27c9f9ae1f6370c47b323be7f3b75106569 Author: Mike Frysinger Date: Sun Mar 21 21:06:01 2010 +0000 can: bfin_can: switch to common Blackfin can header The MMR bits are being moved to this header, so include it. Signed-off-by: Mike Frysinger Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 91c030b4d6445ebe9fbddb86d584441f300df15c Merge: 7c3456f ae6be51 Author: David S. Miller Date: Mon Mar 22 20:05:26 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 4f1deba435ef75380c1d06fda860c7a15ea16fdf Author: JosephChan@via.com.tw Date: Fri Mar 19 14:08:11 2010 +0800 pata_via: Add VIA VX900 support Signed-off-by: Joseph Chan Signed-off-by: Jeff Garzik commit b3c7740a120c8a7775cb63b4d094466da5c01692 Merge: 220bf99 e6e8ea6 Author: Tony Lindgren Date: Mon Mar 22 14:06:38 2010 -0700 Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus commit ae6be51ed01d6c4aaf249a207b4434bc7785853b Author: Linus Torvalds Date: Mon Mar 22 13:12:33 2010 -0700 Fix up prototype for sys_ipc breakage Commit 45575f5a426c ("ppc64 sys_ipc breakage in 2.6.34-rc2") fixed the definition of the sys_ipc() helper, but didn't fix the prototype in Reported-and-tested-by: Andreas Schwab Signed-off-by: Linus Torvalds commit 8b4709ecea4aab1957ae7b726d6824485404a3a5 Author: Wolfram Sang Date: Sat Mar 20 15:12:58 2010 +0100 regulator: fix dangling pointers Fix I2C-drivers which missed setting clientdata to NULL before freeing the structure it points to. Also fix drivers which do this _after_ the structure was freed already. Signed-off-by: Wolfram Sang Cc: Liam Girdwood Cc: Mark Brown Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 451a73cd46573444f68f412c87439c0a291718ec Author: Axel Lin Date: Thu Mar 11 09:50:07 2010 +0800 lp3971: Fix BUCK_VOL_CHANGE_SHIFT logic Given x=0,1,2, current implementation of BUCK_VOL_CHANGE_SHIFT(x) returns 0,4,8. The correct return value should be 0,4,6. This patch fix the logic. Signed-off-by: Axel Lin Acked-by: Marek Szyprowski Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit cdb868f58103825856e27aa4e1f26943fc119e41 Author: Axel Lin Date: Tue Mar 9 16:53:59 2010 +0800 lp3971: Fix setting val for LDO2 and LDO4 In lp3971_ldo_set_voltage function, it requires val to left shift 4 bits for LDO2 and LDO4. This patch fix this issue. Signed-off-by: Axel Lin Acked-by: Marek Szyprowski Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4f26a2abe1eed18dc6adddf2d0ae5553e51578c2 Author: Ameya Palande Date: Fri Mar 12 20:09:01 2010 +0200 regulator: Get rid of lockdep warning WARNING: at kernel/lockdep.c:2706 sysfs_add_file_mode+0x4c/0xa8() Difference between v1 and v2: Moved sysfs_attr_init() call as first one to access the structure. Signed-off-by: Ameya Palande CC: Liam Girdwood CC: Mark Brown CC: David Brownell Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 67e46f347eb25222e2b415540b6ba3fd2574afe2 Author: Dan Carpenter Date: Sun Mar 7 15:36:45 2010 +0300 regulator: handle kcalloc() failure Return -ENOMEM if kcalloc() fails Signed-off-by: Dan Carpenter Acked-by: Mark Brown Acked-by: Wolfram Sang Signed-off-by: Liam Girdwood commit 3fff6c04d81a2852821135736fad2d8386464753 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:55 2010 -0800 Regulators: max8925-regulator - clean up driver data after removal It is a good tone to reset driver data after unbinding the device. Also change find_regulator_info() fro inline to __devinit - let compiler figure out if it wants it to be inlined or not. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit ef1691504c83ba3eb636c0cfd3ed33f7a6d0b4ee Author: Patrick McHardy Date: Mon Mar 22 18:25:20 2010 +0100 netfilter: xt_recent: fix regression in rules using a zero hit_count Commit 8ccb92ad (netfilter: xt_recent: fix false match) fixed supposedly false matches in rules using a zero hit_count. As it turns out there is nothing false about these matches and people are actually using entries with a hit_count of zero to make rules dependant on addresses inserted manually through /proc. Since this slipped past the eyes of three reviewers, instead of reverting the commit in question, this patch explicitly checks for a hit_count of zero to make the intentions more clear. Reported-by: Thomas Jarosch Tested-by: Thomas Jarosch Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit 7c3456fdb503071787f7f972de1069b9cacd16f0 Author: Tetsuo Handa Date: Mon Mar 22 10:22:55 2010 -0700 rxrpc: Check allocation failure. alloc_skb() can return NULL. Signed-off-by: Tetsuo Handa Signed-off-by: David Howells Signed-off-by: David S. Miller commit 7b1f513aacee53ed2d20cdf82191c7f486136469 Merge: 258152a 2de16a4 Author: Linus Torvalds Date: Mon Mar 22 10:03:51 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: console: Check if port is valid in resize_console virtio: console: Generate a kobject CHANGE event on adding 'name' attribute commit 258152acc09c5c2df97002cd58cb37cb241aacde Merge: e919241 243aad8 Author: Linus Torvalds Date: Mon Mar 22 10:01:58 2010 -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: (38 commits) ip_gre: include route header_len in max_headroom calculation if_tunnel.h: add missing ams/byteorder.h include ipv4: Don't drop redirected route cache entry unless PTMU actually expired net: suppress lockdep-RCU false positive in FIB trie. Bluetooth: Fix kernel crash on L2CAP stress tests Bluetooth: Convert debug files to actually use debugfs instead of sysfs Bluetooth: Fix potential bad memory access with sysfs files netfilter: ctnetlink: fix reliable event delivery if message building fails netlink: fix NETLINK_RECV_NO_ENOBUFS in netlink_set_err() NET_DMA: free skbs periodically netlink: fix unaligned access in nla_get_be64() tcp: Fix tcp_mark_head_lost() with packets == 0 net: ipmr/ip6mr: fix potential out-of-bounds vif_table access KS8695: update ksp->next_rx_desc_read at the end of rx loop igb: Add support for 82576 ET2 Quad Port Server Adapter ixgbevf: Message formatting cleanups ixgbevf: Shorten up delay timer for watchdog task ixgbevf: Fix VF Stats accounting after reset ixgbe: Set IXGBE_RSC_CB(skb)->DMA field to zero after unmapping the address ixgbe: fix for real_num_tx_queues update issue ... commit e91924158d89086357e46887c23d714cfb4e05ea Merge: c3824d2 5b89d2f Author: Linus Torvalds Date: Mon Mar 22 09:58:04 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: edac, mce: Filter out invalid values commit c3824d21eb653fe7017476724257ccaa8bf3d9e1 Author: Tetsuo Handa Date: Mon Mar 22 13:50:19 2010 +0000 rxrpc: Check allocation failure. alloc_skb() can return NULL. Signed-off-by: Tetsuo Handa Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 99b437a9257cb6b267bf32adfb7675948dc6d485 Author: Dan Carpenter Date: Mon Mar 22 13:07:14 2010 +0000 AFS: Potential null dereference It seems clear from the surrounding code that xpermits is allowed to be NULL here. Signed-off-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 45575f5a426c01ec68cd33d998267ba2f6278fac Author: Anton Blanchard Date: Mon Mar 22 17:47:59 2010 +1100 ppc64 sys_ipc breakage in 2.6.34-rc2 I chased down a fail on ppc64 on 2.6.34-rc2 where an application that uses shared memory was getting a SEGV. Commit baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670 ("Add generic sys_ipc wrapper") changed the second argument from an unsigned long to an int. When we call shmget the system call wrappers for sys_ipc will sign extend second (ie the size) which truncates it. It took a while to track down because the call succeeds and strace shows the untruncated size :) The patch below changes second from an int to an unsigned long which fixes shmget on ppc64 (and I assume s390, sparc64 and mips64). Signed-off-by: Anton Blanchard -- I assume the function prototypes for the other IPC methods would cause us to sign or zero extend second where appropriate (avoiding any security issues). Come to think of it, the syscall wrappers for each method should do that for us as well. Signed-off-by: Linus Torvalds commit a90110c61073eab95d1986322693c2b9a8a6a5f6 Author: Rafael J. Wysocki Date: Sun Mar 21 21:51:51 2010 +0100 x86 / perf: Fix suspend to RAM on HP nx6325 Commit 3f6da3905398826d85731247e7fbcf53400c18bd (perf: Rework and fix the arch CPU-hotplug hooks) broke suspend to RAM on my HP nx6325 (and most likely on other AMD-based boxes too) by allowing amd_pmu_cpu_offline() to be executed for CPUs that are going offline as part of the suspend process. The problem is that cpuhw->amd_nb may be NULL already, so the function should make sure it's not NULL before accessing the object pointed to by it. Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 5b89d2f9ace1970324facc68ca9b8fae19ce8096 Author: Borislav Petkov Date: Tue Mar 9 20:38:48 2010 +0100 edac, mce: Filter out invalid values Print the CPU associated with the error only when the field is valid. Cc: # .32.x .33.x Signed-off-by: Borislav Petkov commit e3396b263c6a8f086a99f1d524272ff409d66de0 Author: Dan Carpenter Date: Mon Mar 22 15:10:35 2010 +0300 pxa168fb: fix incorrect resource calculation The size calculation is not correct. It should be end - start + 1. Use resource_size() to caculate it. Signed-off-by: Dan Carpenter Signed-off-by: Eric Miao commit 2de16a493cc6153f7fa0b9da12a3862d063e3425 Author: Amit Shah Date: Fri Mar 19 17:36:44 2010 +0530 virtio: console: Check if port is valid in resize_console The console port could have been hot-unplugged. Check if it is valid before working on it. Signed-off-by: Amit Shah Signed-off-by: Michael S. Tsirkin commit ec64213c4d482ee4d15b34511441eaecdd002adf Author: Amit Shah Date: Fri Mar 19 17:36:43 2010 +0530 virtio: console: Generate a kobject CHANGE event on adding 'name' attribute When the host lets us know what 'name' a port is assigned, we create the sysfs 'name' attribute. Generate a 'change' event after this so that udev wakes up and acts on the rules for virtio-ports (currently there's only one rule that creates a symlink from the 'name' to the actual char device). Signed-off-by: Amit Shah Signed-off-by: Michael S. Tsirkin commit 3cc4e53f86dab635166929bfa47cc68d59b28c26 Author: Mark Brown Date: Fri Feb 12 14:39:36 2010 +0000 ASoC: Remove BROKEN from i.MX audio after dependencies merged Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit f9b44121b34174ae4f243a568393fc3225842e75 Merge: 8727b90 220bf99 Author: Mark Brown Date: Mon Mar 22 11:17:26 2010 +0000 Merge commit 'v2.6.34-rc2' into for-2.6.34 commit 556ae3bb32cabe483375b857dda1322384c57b65 Author: Jeff Layton Date: Sun Mar 21 12:10:36 2010 -0400 NFS: don't try to decode GETATTR if DELEGRETURN returned error The reply parsing code attempts to decode the GETATTR response even if the DELEGRETURN portion of the compound returned an error. The GETATTR response won't actually exist if that's the case and we're asking the parser to read past the end of the response. This bug is fairly benign. The parser catches this without reading past the end of the response and decode_getfattr returns -EIO. Earlier kernels however had decode_op_hdr using the READ_BUF macro, and this bug would make this printk pop any time the client got an error from a delegreturn: kernel: decode_op_hdr: reply buffer overflowed in line XXXX More recent kernels seem to have replaced this printk with a dprintk. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit f1f0abe192a72e75d7c59972e30784d043fd8d73 Author: Dan Carpenter Date: Sun Mar 21 12:10:34 2010 -0400 sunrpc: handle allocation errors from __rpc_lookup_create() __rpc_lookup_create() can return ERR_PTR(-ENOMEM). Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit ff0901f8036a1586037c30a365c9666e946af0f1 Author: Trond Myklebust Date: Fri Mar 19 16:17:45 2010 -0400 SUNRPC: Fix the return value of rpc_run_bc_task() Currently rpc_run_bc_task() will return NULL if the task allocation failed. However the only caller is bc_send, which assumes that the return value will be an ERR_PTR. Signed-off-by: Trond Myklebust commit c9acb42ef1904d15d0fb315061cefbe638f67f3a Author: Trond Myklebust Date: Fri Mar 19 15:36:22 2010 -0400 SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel The ->release_request() callback was designed to allow the transport layer to do housekeeping after the RPC call is done. It cannot be used to free the request itself, and doing so leads to a use-after-free bug in xprt_release(). Signed-off-by: Trond Myklebust commit bae84e70d66fe46c12231082cf1c4848ea22f3ef Author: Takashi Iwai Date: Mon Mar 22 08:30:20 2010 +0100 ALSA: hda - Fix access-after-free in patch_realtek.c alc_free_kctls() has to be called after all jobs done in alc_build_controls(). Signed-off-by: Takashi Iwai commit ea823c08912cfb6d4af2fa8b6dd5d8deb2fb486a Author: Takashi Iwai Date: Mon Mar 22 08:07:55 2010 +0100 ALSA: hda - Sort codec entry list of Nvidia HDMI Signed-off-by: Takashi Iwai commit e933e9e5238b79870b04718024416a6dcf602a27 Author: Derek Kelly Date: Mon Mar 22 08:04:19 2010 +0100 ALSA: hda - Add support of Nvidia GT220 HDMI This patch adds the device id for Nvidia GT220 cards to the nvhdmi driver. I have tested it and confirmed it to be working. Original patch download link: https://gist.github.com/324070/ Signed-off-by: Derek Kelly Signed-off-by: Takashi Iwai commit 025f206c9e0f96cc41567b01c07fb852d8900da1 Author: Daniel T Chen Date: Sun Mar 21 18:34:43 2010 -0400 ALSA: hda: Fix 0 dB offset for HP laptops using CX20551 (Waikiki) BugLink: https://launchpad.net/bugs/420578 The OR has verified that his hardware distorts because of the 0 dB offset not corresponding to the highest PCM level. Fix this by capping said PCM level to 0 dB similarly to what we do for CX20549 (Venice). Reported-by: Mike Pontillo Tested-by: Mike Pontillo Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 2e2e3b96d98d5c17e9c09bc6088df3e182a71814 Author: Dmitry Torokhov Date: Sun Mar 21 22:56:15 2010 -0700 Input: sparse-keymap - implement safer freeing of the keymap Allow calling sparse_keymap_free() before unregistering input device whithout risk of racing with EVIOCGETKEYCODE and EVIOCSETKEYCODE. This makes life of drivers writers easier. Acked-by: Yong Wang Signed-off-by: Dmitry Torokhov commit 2d8428acaee5468d194d8a84de22a0797791cb33 Author: Ryusuke Konishi Date: Mon Mar 22 14:01:24 2010 +0900 nilfs2: fix duplicate call to nilfs_segctor_cancel_freev Andreas Beckmann gave me a report that nilfs logged the following warnings when it got a disk full: nilfs_sufile_do_cancel_free: segment 0 must be clean nilfs_sufile_do_cancel_free: segment 1 must be clean These arise from a duplicate call to nilfs_segctor_cancel_freev in an error path of log writer. This will fix the issue. Reported-by: Andreas Beckmann Signed-off-by: Ryusuke Konishi commit 13bad37b04c779d98983307a27f97e9caa36f9b1 Author: Henrik Rydberg Date: Sun Mar 21 22:31:26 2010 -0700 Input: update the status of the Multitouch X driver project The Multitouch X driver project has moved to alpha status. This patch updates the documentation accordingly. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit 97065e033ec5fd824d0133ecd0c614fe1e5c20bd Author: Henrik Rydberg Date: Sun Mar 21 22:31:26 2010 -0700 Input: clarify the no-finger event in multitouch protocol The current documentation does not explicitly specify how to report zero fingers, leaving a potential problem in the driver implementations and giving no parsing directive to userland. This patch defines two equally valid ways. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit 243aad830e8a4cdda261626fbaeddde16b08d04a Author: Timo Teräs Date: Sat Mar 20 02:27:58 2010 +0000 ip_gre: include route header_len in max_headroom calculation Taking route's header_len into account, and updating gre device needed_headroom will give better hints on upper bound of required headroom. This is useful if the gre traffic is xfrm'ed. Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 9bf35c8dddd56f7f247a27346f74f5adc18071f4 Author: Paulius Zaleckas Date: Sun Mar 21 21:19:02 2010 -0700 if_tunnel.h: add missing ams/byteorder.h include When compiling userspace application which includes if_tunnel.h and uses GRE_* defines you will get undefined reference to __cpu_to_be16. Fix this by adding missing #include Cc: stable@kernel.org Signed-off-by: Paulius Zaleckas Signed-off-by: David S. Miller commit fe3ebaad3229c5e842e8b24cf2a24d7049a6481c Author: Daniel Mack Date: Thu Mar 18 19:37:29 2010 +0100 [ARM] pxa/raumfeld: fix button name This fixes a warning when booting 2.6.34-rc2: [ 26.619814] ------------[ cut here ]------------ [ 26.624604] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xac/0xc0() [ 26.631555] name 'on/off button' [ 26.634753] Modules linked in: Signed-off-by: Daniel Mack Cc: Sven Neumann Signed-off-by: Eric Miao commit af089f517a1fea0af2053f105c9360df614be07c Author: Huang Weiyi Date: Mon Mar 22 11:51:05 2010 +0800 [ARM] pxa/raumfeld: remove duplicated #include Remove duplicated #include('s) in arch/arm/mach-pxa/raumfeld.c Signed-off-by: Huang Weiyi Signed-off-by: Eric Miao commit c8c3dcb9df8025ed48f8b14bf4b8a77801d88758 Author: H Hartley Sweeten Date: Mon Mar 22 11:09:20 2010 +0800 [ARM] locomo: fix unpaired spin_lock_irqsave The function locomo_m62332_senddata sends a three byte i2c message to a M62332 DAC. This entire function is guarded with a spin_lock_irqsave at the start of the function and a spin_unlock_irqrestore at the end. As each byte is transferred, the i2c ACK from the DAC is checked. Currently, if the ACK is missing the function simply returns without the unlock. It also leaves the i2c bus in an invalid state since the last byte transferred did not have a "stop" condition and leave the bus idle. Fix this by adding an exit path using goto. Signed-off-by: H Hartley Sweeten Signed-off-by: Eric Miao commit 1b0d76cb9d5a65567230097a2512046f09f30523 Author: H Hartley Sweeten Date: Mon Mar 22 10:33:58 2010 +0800 [ARM] locomo: fix SPI register offset The locomo spi registers are all defined in locomo.h as offsets from the first spi register LOCOMO_SPI (0x60), which is itself an offset from the locomo base address. To correctly access these registers LOCOMO_SPI must always be included in the address calculation. There are two places in locomo.c where this is not done. The first one, in locomo_suspend, actually results in a write to LOCOMO_ST instead of LOCOMO_SPICT. The second is in __locomo_probe and results in a write to LOCOMO_MCSX2 instead of LOCOMO_SPIIE. Fix these by including LOCOMO_SPI in the calculation. Signed-off-by: H Hartley Sweeten Signed-off-by: Eric Miao commit 6533be390b1210285854fb2fc7ea80c0ada60b13 Author: Eric Miao Date: Tue Mar 9 10:34:27 2010 +0800 [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm sharpsl_pm.c actually depends on max1111 driver being built-in when not using legacy ssp code. Reported-by: Jonathan Cameron Signed-off-by: Eric Miao commit 1fe2b6b527779ca966bc285dc27f84835bc1591a Author: Eric Miao Date: Tue Mar 9 11:04:44 2010 +0800 [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms Reported-by: Jonathan Cameron Signed-off-by: Eric Miao commit ef80936f99ce558a470c5379040abd0ece52c2ff Author: Jonathan Cameron Date: Sun Mar 7 21:59:16 2010 +0000 [ARM] pxa: remove spi cs gpio direction to avoid clash with driver Signed-off-by: Jonathan Cameron Signed-off-by: Eric Miao commit 7471f46d74e0e2a668f4bc085ef486b1079b3466 Author: Eric Miao Date: Mon Mar 22 09:39:58 2010 +0800 [ARM] mmp: fix for variables in uncompress.h being discarded Due to commit: 5de813b ARM: Eliminate decompressor -Dstatic= PIC hack The data section will be discarded for the decompressor, thus move the static variables into BSS section by initializing them at run time. Reported-by: Jonathan Cameron Signed-off-by: Eric Miao commit 2a8ac187e03027a958b289dd8701ca9c013ab096 Author: Jonathan Cameron Date: Mon Mar 8 17:44:19 2010 +0000 [ARM] pxa: fix for variables in uncompress.h being discarded Due to commit: 5de813b ARM: Eliminate decompressor -Dstatic= PIC hack The data section will be discarded for the decompressor, thus move the static variables into BSS section by initializing them at run time. Signed-off-by: Jonathan Cameron Signed-off-by: Eric Miao commit 5e016cbf6cffd4a53b7922e0c91b775399d7fe47 Author: Guenter Roeck Date: Sun Mar 21 20:55:13 2010 -0700 ipv4: Don't drop redirected route cache entry unless PTMU actually expired TCP sessions over IPv4 can get stuck if routers between endpoints do not fragment packets but implement PMTU instead, and we are using those routers because of an ICMP redirect. Setup is as follows MTU1 MTU2 MTU1 A--------B------C------D with MTU1 > MTU2. A and D are endpoints, B and C are routers. B and C implement PMTU and drop packets larger than MTU2 (for example because DF is set on all packets). TCP sessions are initiated between A and D. There is packet loss between A and D, causing frequent TCP retransmits. After the number of retransmits on a TCP session reaches tcp_retries1, tcp calls dst_negative_advice() prior to each retransmit. This results in route cache entries for the peer to be deleted in ipv4_negative_advice() if the Path MTU is set. If the outstanding data on an affected TCP session is larger than MTU2, packets sent from the endpoints will be dropped by B or C, and ICMP NEEDFRAG will be returned. A and D receive NEEDFRAG messages and update PMTU. Before the next retransmit, tcp will again call dst_negative_advice(), causing the route cache entry (with correct PMTU) to be deleted. The retransmitted packet will be larger than MTU2, causing it to be dropped again. This sequence repeats until the TCP session aborts or is terminated. Problem is fixed by removing redirected route cache entries in ipv4_negative_advice() only if the PMTU is expired. Signed-off-by: Guenter Roeck Signed-off-by: David S. Miller commit e3a61d47cc37c51834abe537e0ed685829d56ee2 Merge: 634a4b2 c2c77ec Author: David S. Miller Date: Sun Mar 21 18:03:11 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit 634a4b2038a6eba4c211fb906fa2f6ec9a4bbfc7 Author: Paul E. McKenney Date: Sun Mar 21 18:01:05 2010 -0700 net: suppress lockdep-RCU false positive in FIB trie. Allow fib_find_node() to be called either under rcu_read_lock() protection or with RTNL held. Signed-off-by: Paul E. McKenney Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8c2eb4805d422bdbf60ba00ff233c794d23c3c00 Author: Colin Ian King Date: Fri Mar 19 10:28:02 2010 +0000 softlockup: Stop spurious softlockup messages due to overflow Ensure additions on touch_ts do not overflow. This can occur when the top 32 bits of the TSC reach 0xffffffff causing additions to touch_ts to overflow and this in turn generates spurious softlockup warnings. Signed-off-by: Colin Ian King Cc: Peter Zijlstra Cc: Eric Dumazet Cc: LKML-Reference: <1268994482.1798.6.camel@lenovo> Signed-off-by: Ingo Molnar commit cdead7cf12896c0e50a8be2e52de52c364603095 Author: Trond Myklebust Date: Fri Mar 19 15:36:22 2010 -0400 SUNRPC: Fix a potential memory leak in auth_gss The function alloc_enc_pages() currently fails to release the pointer rqstp->rq_enc_pages in the error path. Signed-off-by: Trond Myklebust Acked-by: J. Bruce Fields Cc: stable@kernel.org commit e3d2530a6cea80987f77b75d8784a00f3aaf22ff Author: Kunal Gangakhedkar Date: Sat Mar 20 23:08:01 2010 +0530 ALSA: hda - Add PCI quirk for HP dv6-1110ax. Adding this PCI quirk fixes the board config detection. This also fixes jack sensing by using "hp_detect=1" via properly detected board config. Signed-off-by: Kunal Gangakhedkar Signed-off-by: Takashi Iwai commit fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f Author: Julia Lawall Date: Thu Mar 18 07:53:11 2010 +0100 sound/oss/vidc.c: change the field used with DMA_ACTIVE The constant DMA_ACTIVE is defined with the dma_buffparams structure rather than with the audio_operations structure. Takashi Iwai suggested that the dmap_out field of the audio_operations structure should be used instead. This is not tested. Signed-off-by: Julia Lawall Signed-off-by: Takashi Iwai commit c2c77ec83bdad17fb688557b5b3fdc36661dd1c6 Author: Andrei Emeltchenko Date: Fri Mar 19 10:26:28 2010 +0200 Bluetooth: Fix kernel crash on L2CAP stress tests Added very simple check that req buffer has enough space to fit configuration parameters. Shall be enough to reject packets with configuration size more than req buffer. Crash trace below [ 6069.659393] Unable to handle kernel paging request at virtual address 02000205 [ 6069.673034] Internal error: Oops: 805 [#1] PREEMPT ... [ 6069.727172] PC is at l2cap_add_conf_opt+0x70/0xf0 [l2cap] [ 6069.732604] LR is at l2cap_recv_frame+0x1350/0x2e78 [l2cap] ... [ 6070.030303] Backtrace: [ 6070.032806] [] (l2cap_add_conf_opt+0x0/0xf0 [l2cap]) from [] (l2cap_recv_frame+0x1350/0x2e78 [l2cap]) [ 6070.043823] r8:dc5d3100 r7:df2a91d6 r6:00000001 r5:df2a8000 r4:00000200 [ 6070.050659] [] (l2cap_recv_frame+0x0/0x2e78 [l2cap]) from [] (l2cap_recv_acldata+0x2bc/0x350 [l2cap]) [ 6070.061798] [] (l2cap_recv_acldata+0x0/0x350 [l2cap]) from [] (hci_rx_task+0x244/0x478 [bluetooth]) [ 6070.072631] r6:dc647700 r5:00000001 r4:df2ab740 [ 6070.077362] [] (hci_rx_task+0x0/0x478 [bluetooth]) from [] (tasklet_action+0x78/0xd8) [ 6070.087005] [] (tasklet_action+0x0/0xd8) from [] Signed-off-by: Andrei Emeltchenko Acked-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit aef7d97cc604309b66f6f45cce02cd734934cd4e Author: Marcel Holtmann Date: Sun Mar 21 05:27:45 2010 +0100 Bluetooth: Convert debug files to actually use debugfs instead of sysfs Some of the debug files ended up wrongly in sysfs, because at that point of time, debugfs didn't exist. Convert these files to use debugfs and also seq_file. This patch converts all of these files at once and then removes the exported symbol for the Bluetooth sysfs class. Signed-off-by: Marcel Holtmann commit 101545f6fef4a0a3ea8daf0b5b880df2c6a92a69 Author: Marcel Holtmann Date: Mon Mar 15 14:12:58 2010 -0700 Bluetooth: Fix potential bad memory access with sysfs files When creating a high number of Bluetooth sockets (L2CAP, SCO and RFCOMM) it is possible to scribble repeatedly on arbitrary pages of memory. Ensure that the content of these sysfs files is always less than one page. Even if this means truncating. The files in question are scheduled to be moved over to debugfs in the future anyway. Based on initial patches from Neil Brown and Linus Torvalds Reported-by: Neil Brown Signed-off-by: Marcel Holtmann commit 5b3dbb44ab40660a080d03585bd35f45b2890c49 Author: Sage Weil Date: Mon Mar 15 15:57:04 2010 -0700 ceph: release old ticket_blob buffer Release the old ticket_blob buffer when we get an updated service ticket from the monitor. Previously these were getting leaked. Signed-off-by: Sage Weil commit 807c86e2ceba8febe79b289d50cd0d5e0b0af917 Author: Sage Weil Date: Mon Mar 15 15:52:17 2010 -0700 ceph: fix authenticator buffer size calculation The buffer size was incorrectly calculated for the ceph_x_encrypt() encapsulated ticket blob. Use a helper (with correct arithmetic) and BUG out if we were wrong. Signed-off-by: Sage Weil commit 63733a0fc55cca74b1911769633dc5dfd1a45907 Author: Sage Weil Date: Mon Mar 15 15:47:22 2010 -0700 ceph: fix authenticator timeout We were failing to reconnect to services due to an old authenticator, even though we had the new ticket, because we weren't properly retrying the connect handshake, because we were calling an old/incorrect helper that left in_base_pos incorrect. The result was a failure to reconnect to the OSD or MDS (with an authentication error) if the MDS restarted after the service had been up a few hours (long enough for the original authenticator to be invalid). This was only a problem if the AUTH_X authentication was enabled. Now that the 'negotiate' and 'connect' stages are fully separated, we should use the prepare_read_connect() helper instead, and remove the obsolete one. Signed-off-by: Sage Weil commit 8b218b8a4a65bf4e304ae8690cadb9100ef029c0 Author: Sage Weil Date: Tue Mar 9 12:59:08 2010 -0800 ceph: fix inode removal from snap realm when racing with migration When an inode was dropped while being migrated between two MDSs, i_cap_exporting_issued was non-zero such that issue caps were non-zero and __ceph_is_any_caps(ci) was true. This prevented the inode from being removed from the snap realm, even as it was dropped from the cache. Fix this by dropping any residual i_snap_realm ref in destroy_inode. Signed-off-by: Sage Weil commit 052bb34af3bf8ae2001b9f03d884ba0def3e427c Author: Sage Weil Date: Tue Mar 9 12:52:26 2010 -0800 ceph: add missing locking to protect i_snap_realm_item during split All ci->i_snap_realm_item/realm->inodes_with_caps manipulation should be protected by realm->inodes_with_caps_lock. This bug would have only bit us in a rare race with a realm split (during some snap creations). Signed-off-by: Sage Weil commit 978097c907b58a2d085bbf7632bee1a5a7e6f6ba Author: Sage Weil Date: Mon Mar 8 15:27:53 2010 -0800 ceph: implemented caps should always be superset of issued caps Added assertion, and cleared one case where the implemented caps were not following the issued caps. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit af98441397227a5a4f212cd48710eea72a14dbdb Merge: 37b7ef7 535297a Author: David S. Miller Date: Sat Mar 20 14:41:01 2010 -0700 Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 37b7ef7203240b3aba577bb1ff6765fe15225976 Author: Pablo Neira Ayuso Date: Tue Mar 16 13:30:21 2010 +0000 netfilter: ctnetlink: fix reliable event delivery if message building fails This patch fixes a bug that allows to lose events when reliable event delivery mode is used, ie. if NETLINK_BROADCAST_SEND_ERROR and NETLINK_RECV_NO_ENOBUFS socket options are set. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit 1a50307ba1826e4da0024e64b245ce4eadf7688a Author: Pablo Neira Ayuso Date: Thu Mar 18 14:24:42 2010 +0000 netlink: fix NETLINK_RECV_NO_ENOBUFS in netlink_set_err() Currently, ENOBUFS errors are reported to the socket via netlink_set_err() even if NETLINK_RECV_NO_ENOBUFS is set. However, that should not happen. This fixes this problem and it changes the prototype of netlink_set_err() to return the number of sockets that have set the NETLINK_RECV_NO_ENOBUFS socket option. This return value is used in the next patch in these bugfix series. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit 73852e8151b7d7a529fbe019ab6d2d0c02d8f3f2 Author: Steven J. Magnani Date: Tue Mar 16 05:22:44 2010 +0000 NET_DMA: free skbs periodically Under NET_DMA, data transfer can grind to a halt when userland issues a large read on a socket with a high RCVLOWAT (i.e., 512 KB for both). This appears to be because the NET_DMA design queues up lots of memcpy operations, but doesn't issue or wait for them (and thus free the associated skbs) until it is time for tcp_recvmesg() to return. The socket hangs when its TCP window goes to zero before enough data is available to satisfy the read. Periodically issue asynchronous memcpy operations, and free skbs for ones that have completed, to prevent sockets from going into zero-window mode. Signed-off-by: Steven J. Magnani Signed-off-by: David S. Miller commit 48edcfcfbfcb3ffa76539f237b5527b62d72133a Author: Russell King Date: Sat Mar 20 15:37:39 2010 +0000 ARM: Update mach-types Signed-off-by: Russell King commit 0372c38047394e23278fe6dbc0827db12ce60bd3 Author: Russell King Date: Sat Mar 20 15:33:09 2010 +0000 ARM: Fix IXP23xx build error in mach/memory.h One to many close parens. In file included from arch/arm/include/asm/page.h:202, from include/linux/mm_types.h:15, from include/linux/sched.h:63, from arch/arm/kernel/asm-offsets.c:13: arch/arm/include/asm/memory.h: In function 'virt_to_bus': arch/arm/include/asm/memory.h:214: error: expected ';' before ')' token arch/arm/include/asm/memory.h:214: error: expected statement before ')' token arch/arm/include/asm/memory.h: In function 'bus_to_virt': arch/arm/include/asm/memory.h:219: error: expected ';' before ')' token arch/arm/include/asm/memory.h:219: error: expected statement before ')' token Signed-off-by: Russell King commit d90e6f6aad0ffdc674bc3a05c85c40dcc18e604c Author: Henrik Rydberg Date: Sat Mar 20 00:06:40 2010 -0700 Input: bcm5974 - retract efi-broken suspend_resume With the recent system-wide improvements on suspend/resume and EFI booting the suspend_resume method of the bcm5974 has broken. When waking up from the S3 state on the MacBookAir, the trackpad is found in a yet unknown state, unable to switch to the proper multitouch mode. The result is a frozen touchpad, and a flood of errors of the kind bcm5974: bad trackpad package, length: 8. This patch retracts the reset_resume method altogether, falling back on the generic unbind/rebind functionality of the usb layer until further investigations can be made as how to reset the device when booting from efi. Signed-off-by: Henrik Rydberg Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 Author: Yong Wang Date: Fri Mar 19 23:02:16 2010 -0700 Input: sparse-keymap - free the right keymap on error 'map' is allocated in sparse_keymap_setup() and it it the one that should be freed on error instead of 'keymap'. Signed-off-by: Yong Wang Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit f5d410f2ea7ba340f11815a56e05b9fa9421c421 Author: Pablo Neira Ayuso Date: Tue Mar 16 13:30:44 2010 +0000 netlink: fix unaligned access in nla_get_be64() This patch fixes a unaligned access in nla_get_be64() that was introduced by myself in a17c859849402315613a0015ac8fbf101acf0cc1. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit 6830c25b7d08fbbd922959425193791bc42079f2 Author: Lennart Schulte Date: Wed Mar 17 02:16:29 2010 +0000 tcp: Fix tcp_mark_head_lost() with packets == 0 A packet is marked as lost in case packets == 0, although nothing should be done. This results in a too early retransmitted packet during recovery in some cases. This small patch fixes this issue by returning immediately. Signed-off-by: Lennart Schulte Signed-off-by: Arnd Hannemann Signed-off-by: David S. Miller commit a50436f2cd6e85794f7e1aad795ca8302177b896 Author: Patrick McHardy Date: Wed Mar 17 06:04:14 2010 +0000 net: ipmr/ip6mr: fix potential out-of-bounds vif_table access mfc_parent of cache entries is used to index into the vif_table and is initialised from mfcctl->mfcc_parent. This can take values of to 2^16-1, while the vif_table has only MAXVIFS (32) entries. The same problem affects ip6mr. Refuse invalid values to fix a potential out-of-bounds access. Unlike the other validity checks, this is checked in ipmr_mfc_add() instead of the setsockopt handler since its unused in the delete path and might be uninitialized. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ea93fd9456ad32cd85b2d7914b58c6313cc40c9e Author: Yegor Yefremov Date: Fri Mar 19 22:43:29 2010 -0700 KS8695: update ksp->next_rx_desc_read at the end of rx loop There is no need to adjust the next rx descriptor after each packet, so do it only once at the end of the routine. Signed-off-by: Eric Dumazet Signed-off-by: Yegor Yefremov commit b894fa2627e28c078740dc7041cd08c7e2c353ab Author: Carolyn Wyborny Date: Fri Mar 19 06:07:48 2010 +0000 igb: Add support for 82576 ET2 Quad Port Server Adapter Signed-off-by: Carolyn Wyborny Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 29b8dd024bd48c3d1d1e5140f5bbb683786f998e Author: Greg Rose Date: Fri Mar 19 03:00:31 2010 +0000 ixgbevf: Message formatting cleanups Clean up some text output formatting. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4c3a822395c01d50ca2ba3aa4529e19d237a2f8c Author: Greg Rose Date: Fri Mar 19 03:00:12 2010 +0000 ixgbevf: Shorten up delay timer for watchdog task The recovery from PF reset works better when you shorten up the delay until the watchdog task executes. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 33bd9f601ea21c4389870e425ae4eaf210d49b95 Author: Greg Rose Date: Fri Mar 19 02:59:52 2010 +0000 ixgbevf: Fix VF Stats accounting after reset The counters in the 82599 Virtual Function are not clear on read. They accumulate to the maximum value and then roll over. They are also not cleared when the VF executes a soft reset, so it is possible they are non-zero when the driver loads and starts. This has all been accounted for in the code that keeps the stats up to date but there is one case that is not. When the PF driver is reset the counters in the VF are all reset to zero. This adds an additional accounting overhead into the VF driver when the PF is reset under its feet. This patch adds additional counters that are used by the VF driver to accumulate and save stats after a PF reset has been detected. Prior to this patch displaying the stats in the VF after the PF has reset would show bogus data. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fd3686a842717b890fbe3024b83a616c54d5dba0 Author: Mallikarjuna R Chilakala Date: Fri Mar 19 04:41:33 2010 +0000 ixgbe: Set IXGBE_RSC_CB(skb)->DMA field to zero after unmapping the address As per Simon Horman's feedback set IXGBE_RSC_CB(skb)->dma to zero after unmapping HWRSC DMA address to avoid double freeing. Signed-off-by: Mallikarjuna R Chilakala Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 936332b8e00103fc20eb7e915c9a3bcb2835a11a Author: Vasu Dev Date: Fri Mar 19 04:33:10 2010 +0000 ixgbe: fix for real_num_tx_queues update issue Currently netdev_features_change is called before fcoe tx queues setup is done, so this patch moves calling of netdev_features_change after tx queues setup is done in ixgbe_init_interrupt_scheme, so that real_num_tx_queues is updated correctly on each fcoe enable or disable. This allows additional fcoe queues updated correctly in vlan driver for their correct queue selection. Signed-off-by: Vasu Dev Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 97e3ecd112ba45eb217cddab59f48659bc15d9d0 Author: stephen hemminger Date: Thu Mar 18 11:27:32 2010 +0000 TCP: check min TTL on received ICMP packets This adds RFC5082 checks for TTL on received ICMP packets. It adds some security against spoofed ICMP packets disrupting GTSM protected sessions. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 10414444cb8a8ee8893e00390b7cf40502e28352 Author: Herbert Xu Date: Thu Mar 18 23:00:22 2010 +0000 ipv6: Remove redundant dst NULL check in ip6_dst_check As the only path leading to ip6_dst_check makes an indirect call through dst->ops, dst cannot be NULL in ip6_dst_check. This patch removes this check in case it misleads people who come across this code. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d11a4dc18bf41719c9f0d7ed494d295dd2973b92 Author: Timo Teräs Date: Thu Mar 18 23:20:20 2010 +0000 ipv4: check rt_genid in dst_check Xfrm_dst keeps a reference to ipv4 rtable entries on each cached bundle. The only way to renew xfrm_dst when the underlying route has changed, is to implement dst_check for this. This is what ipv6 side does too. The problems started after 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 ("ipsec: Fix bogus bundle flowi") which fixed a bug causing xfrm_dst to not get reused, until that all lookups always generated new xfrm_dst with new route reference and path mtu worked. But after the fix, the old routes started to get reused even after they were expired causing pmtu to break (well it would occationally work if the rtable gc had run recently and marked the route obsolete causing dst_check to get called). Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 220bf991b0366cc50a94feede3d7341fa5710ee4 Author: Linus Torvalds Date: Fri Mar 19 18:17:57 2010 -0700 Linux 2.6.34-rc2 commit e4d806377b069881f930089bf880918d3ad555ab Merge: b50df7d 3f7581d Author: Linus Torvalds Date: Fri Mar 19 18:16:20 2010 -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: serial: sh-sci: remove duplicated #include sh: Export uncached helper symbols. sh: Fix up NUMA build for 29-bit. serial: sh-sci: Fix build failure for non-sh architectures. sh: Fix up uncached offset for legacy 29-bit mode. sh: Support CPU affinity masks for INTC controllers. commit b50df7d1fb37eb6aea87590b391d7111fde87121 Merge: 352d465 bcf59e2 Author: Linus Torvalds Date: Fri Mar 19 18:14:22 2010 -0700 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: uwb: remove duplicate cpu_to_le16() uwb: declare MODULE_FIRMWARE() in i1480 DFU driver uwb: make USB device id table constant uwb: wlp: refactor wlp_get_() macros commit b23179681c90a55e2a2083e1dde9f727ecffb2b7 Author: Tao Ma Date: Fri Mar 19 15:04:24 2010 +0800 ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block. You can't store a pointer that you haven't filled in yet and expect it to work. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit dfe4d3d6a6f707fff1dbfd4b8fce65e64a91b809 Author: Tao Ma Date: Fri Mar 19 15:04:23 2010 +0800 ocfs2: Fix the update of name_offset when removing xattrs When replacing a xattr's value, in some case we wipe its name/value first and then re-add it. The wipe is done by ocfs2_xa_block_wipe_namevalue() when the xattr is in the inode or block. We currently adjust name_offset for all the entries which have (offset < name_offset). This does not adjust the entrie we're replacing. Since we are replacing the entry, we don't adjust the total entry count. When we calculate a new namevalue location, we trust the entries now-wrong offset in ocfs2_xa_get_free_start(). The solution is to also adjust the name_offset for the replaced entry, allowing ocfs2_xa_get_free_start() to calculate the new namevalue location correctly. The following script can trigger a kernel panic easily. echo 'y'|mkfs.ocfs2 --fs-features=local,xattr -b 4K $DEVICE mount -t ocfs2 $DEVICE $MNT_DIR FILE=$MNT_DIR/$RANDOM for((i=0;i<76;i++)) do string_76="a$string_76" done string_78="aa$string_76" string_82="aaaa$string_78" touch $FILE setfattr -n 'user.test1234567890' -v $string_76 $FILE setfattr -n 'user.test1234567890' -v $string_78 $FILE setfattr -n 'user.test1234567890' -v $string_82 $FILE Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 035a02c1e1de31888e8b6adac0ff667971ac04db Author: Andreas Herrmann Date: Fri Mar 19 12:09:22 2010 +0100 x86, amd: Restrict usage of c1e_idle() Currently c1e_idle returns true for all CPUs greater than or equal to family 0xf model 0x40. This covers too many CPUs. Meanwhile a respective erratum for the underlying problem was filed (#400). This patch adds the logic to check whether erratum #400 applies to a given CPU. Especially for CPUs where SMI/HW triggered C1e is not supported, c1e_idle() doesn't need to be used. We can check this by looking at the respective OSVW bit for erratum #400. Cc: # .32.x .33.x Signed-off-by: Andreas Herrmann LKML-Reference: <20100319110922.GA19614@alberich.amd.com> Signed-off-by: H. Peter Anvin commit 352d4657b23fbd329efccc396000a549e0150907 Merge: 95c46af 5286944 Author: Linus Torvalds Date: Fri Mar 19 13:49:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: fix compile errors in dma-mapping-common.h alpha: remove trailing spaces in messages alpha: use __ratelimit commit 95c46afe6034d15bdf0f95d69f25489cecad9a47 Merge: cf3966b 191aee5 Author: Linus Torvalds Date: Fri Mar 19 13:42:43 2010 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Remove IOMMU_VMERGE config option powerpc: Fix swiotlb to respect the boot option powerpc: Do not call prink when CONFIG_PRINTK is not defined powerpc: Use correct ccr bit for syscall error status powerpc/fsl-booke: Get coherent bit from PTE powerpc/85xx: Make sure lwarx hint isn't set on ppc32 commit cf3966bf6ecfe25a75d625771e327b84878bc09d Merge: 8dba8f9 17cf444 Author: Linus Torvalds Date: Fri Mar 19 13:42:00 2010 -0700 Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: Delete zero-length file drivers/mtd/maps/omap_nor.c commit 8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866 Merge: 2eb645e 336cee4 Author: Linus Torvalds Date: Fri Mar 19 13:40:03 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty_port,usb-console: Fix usb serial console open/close regression tty: cpm_uart: use resource_size() tty_buffer: Fix distinct type warning hvc_console: Fix race between hvc_close and hvc_remove uartlite: Fix build on sparc. tty: Take a 256 byte padding into account when buffering below sub-page units Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call" commit 2eb645e7b5662da47646f76b41b4141f2c9bf13a Merge: 8fdb7e9 12ee3c0 Author: Linus Torvalds Date: Fri Mar 19 13:39:42 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: driver core: numa: fix BUILD_BUG_ON for node_read_distance driver-core: document ERR_PTR() return values kobject: documentation: Update to refer to kset-example.c. sysdev: the cpu probe/release attributes should be sysdev_class_attributes kobject: documentation: Fix erroneous example in kobject doc. driver-core: fix missing kernel-doc in firmware_class Driver core: Early platform kernel-doc update sysfs: fix sysfs lockdep warning in mlx4 code sysfs: fix sysfs lockdep warning in infiniband code sysfs: fix sysfs lockdep warning in ipmi code sysfs: Initialised pci bus legacy_mem field before use sysfs: use sysfs_bin_attr_init in firmware class driver commit 8fdb7e9f612b7c6ba6c3ba460c14263b5ce90f79 Merge: fc7f99c 4cb80cd Author: Linus Torvalds Date: Fri Mar 19 13:39:21 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (45 commits) USB: gadget/multi: cdc_do_config: remove redundant check usb: r8a66597-hcd: fix removed from an attached hub USB: xhci: Make endpoint interval debugging clearer. USB: Fix usb_fill_int_urb for SuperSpeed devices USB: cp210x: Remove double usb_control_msg from cp210x_set_config USB: Remove last bit of CONFIG_USB_BERRY_CHARGE USB: gadget: add gadget controller number for s3c-hsotg driver USB: ftdi_sio: Fix locking for change_speed() function USB: g_mass_storage: fixed module name in Kconfig USB: gadget: f_mass_storage::fsg_bind(): fix error handling USB: g_mass_storage: fix section mismatch warnings USB: gadget: fix Blackfin builds after gadget cleansing USB: goku_udc: remove potential null dereference USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff USB: serial: Fix module name typo for qcaux Kconfig entry. usb: cdc-wdm: Fix deadlock between write and resume usb: cdc-wdm: Fix order in disconnect and fix locking usb: cdc-wdm:Fix loss of data due to autosuspend usb: cdc-wdm: Fix submission of URB after suspension usb: cdc-wdm: Fix race between disconnect and debug messages ... commit 7c9e2b1c4784c6e574f69dbd904b2822f2e04d6e Author: Dean Nelson Date: Tue Mar 9 22:26:55 2010 -0500 PCI: cleanup error return for pcix get and set mmrbc functions pcix_get_mmrbc() returns the maximum memory read byte count (mmrbc), if successful, or an appropriate error value, if not. Distinguishing errors from correct values and understanding the meaning of an error can be somewhat confusing in that: correct values: 512, 1024, 2048, 4096 errors: -EINVAL -22 PCIBIOS_FUNC_NOT_SUPPORTED 0x81 PCIBIOS_BAD_VENDOR_ID 0x83 PCIBIOS_DEVICE_NOT_FOUND 0x86 PCIBIOS_BAD_REGISTER_NUMBER 0x87 PCIBIOS_SET_FAILED 0x88 PCIBIOS_BUFFER_TOO_SMALL 0x89 The PCIBIOS_ errors are returned from the PCI functions generated by the PCI_OP_READ() and PCI_OP_WRITE() macros. In a similar manner, pcix_set_mmrbc() also returns the PCIBIOS_ error values returned from pci_read_config_[word|dword]() and pci_write_config_word(). Following pcix_get_max_mmrbc()'s example, the following patch simply returns -EINVAL for all PCIBIOS_ errors encountered by pcix_get_mmrbc(), and -EINVAL or -EIO for those encountered by pcix_set_mmrbc(). This simplification was chosen in light of the fact that none of the current callers of these functions are interested in the specific type of error encountered. In the future, should this change, one could simply create a function that maps each PCIBIOS_ error to a corresponding unique errno value, which could be called by pcix_get_max_mmrbc(), pcix_get_mmrbc(), and pcix_set_mmrbc(). Additionally, this patch eliminates some unnecessary variables. Cc: stable@kernel.org Signed-off-by: Dean Nelson Signed-off-by: Jesse Barnes commit bdc2bda7c4dd253026cc1fce45fc939304749029 Author: Dean Nelson Date: Tue Mar 9 22:26:48 2010 -0500 PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions An e1000 driver on a system with a PCI-X bus was always being returned a value of 135 from both pcix_get_mmrbc() and pcix_set_mmrbc(). This value reflects an error return of PCIBIOS_BAD_REGISTER_NUMBER from pci_bus_read_config_dword(,, cap + PCI_X_CMD,). This is because for a dword, the following portion of the PCI_OP_READ() macro: if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; expands to: if (pos & 3) return PCIBIOS_BAD_REGISTER_NUMBER; And is always true for 'cap + PCI_X_CMD', which is 0xe4 + 2 = 0xe6. ('cap' is the result of calling pci_find_capability(, PCI_CAP_ID_PCIX).) The same problem exists for pci_bus_write_config_dword(,, cap + PCI_X_CMD,). In both cases, instead of calling _dword(), _word() should be called. Cc: stable@kernel.org Signed-off-by: Dean Nelson Signed-off-by: Jesse Barnes commit ded1d8f29b4d315a2093cafc3ee17ac870a87972 Author: Paul Mundt Date: Thu Mar 11 14:08:33 2010 -0800 PCI: kill off pci_register_set_vga_state() symbol export. When pci_register_set_vga_state() was made __init, the EXPORT_SYMBOL() was retained, which now leaves us with a section mismatch. Signed-off-by: Paul Mundt Cc: Mike Travis Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 25daeb550b69e89aff59bc6a84218a12b5203531 Author: Dean Nelson Date: Tue Mar 9 22:26:40 2010 -0500 PCI: fix return value from pcix_get_max_mmrbc() For the PCI_X_STATUS register, pcix_get_max_mmrbc() is returning an incorrect value, which is based on: (stat & PCI_X_STATUS_MAX_READ) >> 12 Valid return values are 512, 1024, 2048, 4096, which correspond to a 'stat' (masked and right shifted by 21) of 0, 1, 2, 3, respectively. A right shift by 11 would generate the correct return value when 'stat' (masked and right shifted by 21) has a value of 1 or 2. But for a value of 0 or 3 it's not possible to generate the correct return value by only right shifting. Fix is based on pcix_get_mmrbc()'s similar dealings with the PCI_X_CMD register. Cc: stable@kernel.org Signed-off-by: Dean Nelson Signed-off-by: Jesse Barnes commit 17cf4442497cb2551eae1dedee638515db47c23e Author: Jeff Garzik Date: Fri Mar 19 14:25:45 2010 -0400 Delete zero-length file drivers/mtd/maps/omap_nor.c The content was deleted in cc87edb173effdf74e680ee6d622a935ff0c1d6f, but the file remained as a zero-length file. Signed-off-by: Jeff Garzik commit d812e575822a2b7ab1a7cadae2571505ec6ec2bd Author: Trond Myklebust Date: Fri Mar 19 13:55:17 2010 -0400 NFS: Prevent another deadlock in nfs_release_page() We should not attempt to free the page if __GFP_FS is not set. Otherwise we can deadlock as per http://bugzilla.kernel.org/show_bug.cgi?id=15578 Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit fc7f99cf36ebae853639dabb43bc2f0098c59aef Merge: 0a492fd f1a3d57 Author: Linus Torvalds Date: Fri Mar 19 09:43:06 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits) ceph: update for write_inode API change ceph: reset osd after relevant messages timed out ceph: fix flush_dirty_caps race with caps migration ceph: include migrating caps in issued set ceph: fix osdmap decoding when pools include (removed) snaps ceph: return EBADF if waiting for caps on closed file ceph: set osd request message front length correctly ceph: reset front len on return to msgpool; BUG on mismatched front iov ceph: fix snaptrace decoding on cap migration between mds ceph: use single osd op reply msg ceph: reset bits on connection close ceph: remove bogus mds forward warning ceph: remove fragile __map_osds optimization ceph: fix connection fault STANDBY check ceph: invalidate_authorizer without con->mutex held ceph: don't clobber write return value when using O_SYNC ceph: fix client_request_forward decoding ceph: drop messages on unregistered mds sessions; cleanup ceph: fix comments, locking in destroy_inode ceph: move dereference after NULL test ... Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt commit 0a492fdef8aa241f6139e6455e852cc710ae8ed1 Merge: 3971047 8212cf7 Author: Linus Torvalds Date: Fri Mar 19 09:36:18 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: trivial white space [CIFS] checkpatch cleanup cifs: add cifs_revalidate_file cifs: add a CIFSSMBUnixQFileInfo function cifs: add a CIFSSMBQFileInfo function cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry commit 8727b909bb2348d29e62c599cd7a5d610da3760f Author: Daniel Mack Date: Sun Feb 28 10:42:38 2010 +0800 ASoC: pxa-pcm-lib: initialize DMA channel to -1 This fixes a warning ("pxa_free_dma: trying to free channel 0 which is already freed") when a device was opened but the hw_params() call failed. Signed-off-by: Daniel Mack Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4cb80cda51ff950614701fb30c9d4e583fe5a31f Author: Peter Korsgaard Date: Fri Mar 12 12:33:15 2010 +0100 USB: gadget/multi: cdc_do_config: remove redundant check cdc_do_config() had a double ret check after fsg_add(). Signed-off-by: Peter Korsgaard Signed-off-by: Greg Kroah-Hartman commit d835933436ac0d1e8f5b35fe809fd4e767e55d6e Author: Yoshihiro Shimoda Date: Tue Mar 16 12:29:35 2010 +0900 usb: r8a66597-hcd: fix removed from an attached hub fix the problem that when a USB hub is attached to the r8a66597-hcd and a device is removed from that hub, it's likely that a kernel panic follows. Reported-by: Markus Pietrek Signed-off-by: Yoshihiro Shimoda Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9ce669a8924c61b7321d6e2f27ed67bcd46c1fbb Author: Sarah Sharp Date: Tue Mar 16 12:59:24 2010 -0700 USB: xhci: Make endpoint interval debugging clearer. The xHCI hardware can only handle polling intervals that are a power of two. When we add a new endpoint during a bandwidth allocation, and the polling interval is rounded down to a power of two, print the original polling interval in the endpoint descriptor. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit f09a15e6e69884cedec4d1c022089a973aa01f1e Author: Matthew Wilcox Date: Tue Mar 16 12:55:44 2010 -0700 USB: Fix usb_fill_int_urb for SuperSpeed devices USB 3 and Wireless USB specify a logarithmic encoding of the endpoint interval that matches the USB 2 specification. usb_fill_int_urb() didn't know that and was filling in the interval as if it was USB 1.1. Fix usb_fill_int_urb() for SuperSpeed devices, but leave the wireless case alone, because David Vrabel wants to keep the old encoding. Update the struct urb kernel doc to note that SuperSpeed URBs must have urb->interval specified in microframes. Add a missing break statement in the usb_submit_urb() interrupt URB checking, since wireless USB and SuperSpeed USB encode urb->interval differently. This allows xHCI roothubs to actually register with khubd. Signed-off-by: Matthew Wilcox Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit e549a17f698e266373f6757bd068d1e98397b4c0 Author: Michael Brunner Date: Wed Mar 10 23:26:37 2010 +0100 USB: cp210x: Remove double usb_control_msg from cp210x_set_config This patch removes a double usb_control_msg that sets the cp210x configuration registers a second time when calling cp210x_set_config. For data sizes >2 the second write gets corrupted. The patch has been created against 2.6.34-rc1, but all cp210x driver revisions are affected. Signed-off-by: Michael Brunner Signed-off-by: Greg Kroah-Hartman commit 7f56cfd253d929c06ce4ed5bfb99a8c6805075c9 Author: Christoph Egger Date: Wed Mar 10 12:33:11 2010 +0100 USB: Remove last bit of CONFIG_USB_BERRY_CHARGE One last bit was missed while removing the USB_BERRY_CHARGE config option in a8d4211f33a9573f7b1bdcfd9c9c48631d1515ee which gets dropped by this patch. Signed-off-by: Christoph Egger Signed-off-by: Greg Kroah-Hartman commit 83ba11d93434e6f0cc2e060336b0b19a3f687fa3 Author: Maurus Cuelenaere Date: Mon Mar 8 18:20:59 2010 +0100 USB: gadget: add gadget controller number for s3c-hsotg driver This prevents some drivers from complaining that no bcdDevice id was set. Signed-off-by: Maurus Cuelenaere Signed-off-by: Greg Kroah-Hartman commit 9c67d28e4e7683b4f667fa4c7b6f9aee92b44b5c Author: Alessio Igor Bogani Date: Sat Mar 13 18:35:14 2010 +0100 USB: ftdi_sio: Fix locking for change_speed() function The change_speed() function should be serialized against multiple calls. Use the cfg_lock mutex to do this. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 11b10d999469dc0514447a15e88c7ef14ec0761d Author: Michal Nazarewicz Date: Mon Mar 15 11:10:23 2010 +0100 USB: g_mass_storage: fixed module name in Kconfig The Kconfig help message for Mass Storage Gadget claimed the module will be named "g_file_storage" whereas it should be "g_mass_storage". Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit f479d70b4f7674083c2e3c3e603b15811713fb18 Author: Peter Korsgaard Date: Fri Mar 12 15:55:28 2010 +0100 USB: gadget: f_mass_storage::fsg_bind(): fix error handling Contrary to the comment in fsg_add, fsg_bind calls fsg_unbind on errors, which decreases refcount and frees the fsg_dev structure, causing trouble when fsg_add does the same. Fix it by simply leaving up cleanup to fsg_add(). Signed-off-by: Peter Korsgaard Acked-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit f88f6691b73a35b0c6dcabb9e587aa4c63d09010 Author: Mike Frysinger Date: Sun Mar 7 10:36:27 2010 -0500 USB: g_mass_storage: fix section mismatch warnings The recent commit (0e530b45783f75) that moved usb_ep_autoconfig from the __devinit section to the __init section missed the mass storage device. Its fsg_bind() function uses the usb_ep_autoconfig() function from non __init context leading to: WARNING: drivers/usb/gadget/g_mass_storage.o(.text): Section mismatch in reference from the function _fsg_bind() to the function .init.text:_usb_ep_autoconfig() So move fsg_bind() into __init as well. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f2984a333fb5e325d478950c9d8af3693869e69c Author: Mike Frysinger Date: Tue Mar 9 00:35:22 2010 -0500 USB: gadget: fix Blackfin builds after gadget cleansing The recent change to clean out dead gadget drivers (90f7976880bbbf99) missed the call to gadget_is_musbhsfc() behind CONFIG_BLACKFIN. This causes Blackfin gadget builds to fail since the function no longer exists anywhere. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 872f8b42544c58dfa241956d220ada115a8e93c7 Author: Dan Carpenter Date: Sat Mar 6 14:08:56 2010 +0300 USB: goku_udc: remove potential null dereference "dev" is always null here. In the end it's only used to get the pci_name() of "pdev" which is redundant information and so I removed it. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 33c387529b7931248c6637bf9720ac7504a0b28b Author: spark Date: Fri Mar 5 14:18:05 2010 +0800 USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff Signed-off-by: spark Signed-off-by: Greg Kroah-Hartman commit 510607db7e2ad5078c554911418a71b469886076 Author: Stefan Schmidt Date: Wed Mar 3 19:37:12 2010 +0100 USB: serial: Fix module name typo for qcaux Kconfig entry. The module is called qcaux and not moto_modem. Also use help instead of ---help-- to be in sync with the other Kconfig entries. Signed-off-by: Stefan Schmidt Signed-off-by: Greg Kroah-Hartman commit 338124c1f18c2c737656ac58735f040d90b23d8c Author: Oliver Neukum Date: Sat Feb 27 20:57:12 2010 +0100 usb: cdc-wdm: Fix deadlock between write and resume The new runtime PM scheme allows resume() to have no locks. This fixes the deadlock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d93d16e9aa58887feadd999ea26b7b8139e98b56 Author: Oliver Neukum Date: Sat Feb 27 20:56:47 2010 +0100 usb: cdc-wdm: Fix order in disconnect and fix locking - as the callback can schedule work, URBs must be killed first - if the driver causes an autoresume, the caller must handle locking Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 62e6685470fb04fb7688ecef96c39160498721d5 Author: Oliver Neukum Date: Sat Feb 27 20:56:22 2010 +0100 usb: cdc-wdm:Fix loss of data due to autosuspend The guarding flag must be set and tested under spinlock and cleared before the URBs are resubmitted in resume. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit beb1d35f1690fe27694472a010a8e4a9ae11cc50 Author: Oliver Neukum Date: Sat Feb 27 20:55:52 2010 +0100 usb: cdc-wdm: Fix submission of URB after suspension There's a window under which cdc-wdm may submit an URB to a device about to be suspended. This introduces a flag to prevent it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d855fe2e9c19edaa47baba0e7f95e17f7a24dba8 Author: Oliver Neukum Date: Sat Feb 27 20:55:26 2010 +0100 usb: cdc-wdm: Fix race between disconnect and debug messages dev_dbg() and dev_err() cannot be used to report failures that may have been caused by a device's removal Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 922a5eadd5a3aa0b806be0c18694b618d41d0784 Author: Oliver Neukum Date: Sat Feb 27 20:54:59 2010 +0100 usb: cdc-wdm: Fix race between autosuspend and reading from the device While an available response is read the device must not be autosuspended. This requires a flag dedicated to that purpose. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 860e41a71c1731e79e1920dc42676bafc925af5e Author: Oliver Neukum Date: Sat Feb 27 20:54:24 2010 +0100 usb: cdc-wdm: Fix race between write and disconnect Unify mutexes to fix a race between write and disconnect and shift the test for disconnection to always report it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit aa4714560b4ea359bb7830188ebd06bce71bcdea Author: Felipe Balbi Date: Fri Mar 12 10:27:24 2010 +0200 usb: musb: core: declare mbase only where it's used ... and avoid a compilation if we disable host side of musb. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 7f4bca4049941ba8dac35775fe462d4ef9f0dce4 Author: Mike Frysinger Date: Fri Mar 12 10:27:23 2010 +0200 USB: musb: fix warnings in Blackfin regs The recent commit "usb: musb: Add context save and restore support" added some stubs for the Blackfin code so things would compile, but it also added a bunch of warnings due to missing return statements. Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit adb3ee421d6d39fbfadadf7093a587461ac4597e Author: Mike Frysinger Date: Fri Mar 12 10:27:21 2010 +0200 usb: musb: abstract out ULPI_BUSCONTROL register reads/writes The USB PHY on current Blackfin processors is a UTMI+ level 2 PHY. However, it has no ULPI support - so there are no registers at all. That means accesses to ULPI_BUSCONTROL have to be abstracted away like other MUSB registers. This fixes building for Blackfin parts again. Signed-off-by: Mike Frysinger Acked-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 9957dd97ec5e98dd334f87ade1d9a0b24d1f86eb Author: Tony Lindgren Date: Fri Mar 12 10:35:20 2010 +0200 usb: musb: Fix compile error for omaps for musb_hdrc CONFIG_ARCH_OMAP34XX is now CONFIG_ARCH_OMAP3. But since drivers/usb/musb/omap2430.c use CONFIG_PM for these registers and functions, do the same for the header. Otherwise we get the following for most omap3 defconfigs: drivers/usb/musb/omap2430.c:261: error: expected identifier or '(' before 'do' drivers/usb/musb/omap2430.c:261: error: expected identifier or '(' before 'while' drivers/usb/musb/omap2430.c:268: error: expected identifier or '(' before 'do' drivers/usb/musb/omap2430.c:268: error: expected identifier or '(' before 'while' Signed-off-by: Tony Lindgren Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit fa7bf3424ead0a496f5176abb3253b8176bb2935 Author: Grant Likely Date: Thu Mar 11 15:06:54 2010 -0700 usb/gadget: fix compile error on r8a66597-udc.c C file uses IS_ERR and PTR_ERR, but doesn't include Signed-off-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 1e63ef0e0c2cfb5deb9331420c9857fbe04bea73 Author: Oliver Neukum Date: Fri Mar 12 11:27:21 2010 +0100 USB: Fix documentation for avoid_reset_quirk The name used in the documentation doesn't match reality. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3b04872aa75006e2a4adaaec21e9c9ede8b8ad9d Author: Nathaniel McCallum Date: Thu Mar 11 13:09:26 2010 -0500 USB: option: add support for a new CMOTECH device to usb/serial/option Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit bb73ed2a268a29ab1b7d8cc50b5f248578e7e188 Author: Nathaniel McCallum Date: Thu Mar 11 13:01:17 2010 -0500 USB: option: move hardcoded PID to a macro in usb/serial/option Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit eaff4cdc978f414cf7b5441a333de3070d80e9c7 Author: Nathaniel McCallum Date: Thu Mar 11 13:09:24 2010 -0500 USB: option: fix incorrect manufacturer name in usb/serial/option: MAXON->CMOTECH Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit dee5658b482e9e2ac7d6205dc876fc11d4008138 Author: Daniel Sangorrin Date: Thu Mar 11 14:10:58 2010 -0800 USB: serial: ftdi: add CONTEC vendor and product id This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds identifiers for CONTEC USB serial converter. I tested it with the device COM-1(USB)H [akpm@linux-foundation.org: keep the VIDs sorted a bit] Signed-off-by: Daniel Sangorrin Cc: Andreas Mohr Cc: Radek Liboska Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1d68064a7d80da4a7334cab0356162e36229c1a1 Author: Andiry Xu Date: Fri Mar 12 17:10:04 2010 +0800 USB: xHCI: re-initialize cmd_completion When a signal interrupts a Configure Endpoint command, the cmd_completion used in xhci_configure_endpoint() is not re-initialized and the wait_for_completion_interruptible_timeout() will return failure. Initialize cmd_completion in xhci_configure_endpoint(). Signed-off-by: Andiry Xu Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit bc75fa3825cdbbdeee3a65d91cc5583bdfe41edf Author: Alex Chiang Date: Tue Mar 16 14:48:45 2010 -0600 USB: xhci: rename driver to xhci_hcd Naming consistency with other USB HCDs. Signed-off-by: Alex Chiang Cc: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit ae926976ac362efc9db2365a07891cc52414f2ec Author: Sonic Zhang Date: Mon Mar 8 11:26:01 2010 -0500 USB: musb: fix build error introduced by isoc change The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa) seems to have been against an older kernel version. It uses the old style naming of variables. Unfortunately, this breaks building for most MUSB users out there since "bDesiredMode" has been renamed to "desired_mode". Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Acked-by: Felipe Balbi Acked-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 0725e95ea56698774e893edb7e7276b1d6890954 Author: Bernhard Rosenkraenzer Date: Wed Mar 10 12:36:43 2010 +0100 USB: qcserial: add new device ids This patch adds various USB device IDs for Gobi 2000 devices, as found in the drivers available at https://www.codeaurora.org/wiki/GOBI_Releases Signed-off-by: Bernhard Rosenkraenzer Cc: stable Signed-off-by: Greg Kroah-Hartman commit f0730924e9e32bb8935c60040a26d94179355088 Author: Oliver Neukum Date: Wed Mar 3 00:37:56 2010 +0100 USB: cdc-acm: Fix stupid NULL pointer in resume() Stupid logic bug passing a just nulled pointer Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1082f57abfa26590b60c43f503afb24102a37016 Author: Clemens Ladisch Date: Mon Mar 1 17:18:56 2010 +0100 USB: EHCI: adjust ehci_iso_stream for changes in ehci_qh The EHCI driver stores in usb_host_endpoint.hcpriv a pointer to either an ehci_qh or an ehci_iso_stream structure, and uses the contents of the hw_info1 field to distinguish the two cases. After ehci_qh was split into hw and sw parts, ehci_iso_stream must also be adjusted so that it again looks like an ehci_qh structure. This fixes a NULL pointer access in ehci_endpoint_disable() when it tries to access qh->hw->hw_info1. Signed-off-by: Clemens Ladisch Reported-by: Colin Fletcher Cc: stable Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 92bc3648e6027384479852b770a542722fadee7c Author: Clemens Ladisch Date: Mon Mar 1 09:12:50 2010 +0100 USB: EHCI: fix ITD list order When isochronous URBs are shorter than one frame and when more than one ITD in a frame has been completed before the interrupt can be handled, scan_periodic() completes the URBs in the order in which they are found in the descriptor list. Therefore, the descriptor list must contain the ITDs in the correct order, i.e., a new ITD must be linked in after any previous ITDs of the same endpoint. This should fix garbled capture data in the USB audio drivers. Signed-off-by: Clemens Ladisch Reported-by: Colin Fletcher Cc: stable Signed-off-by: Greg Kroah-Hartman commit bf162019b7f5bda9eb3241ae22de831df2126132 Author: Huang Ying Date: Sun Feb 28 13:51:29 2010 +0800 USB: Option: Add support for a variant of DLink DWM 652 U5 I found a DLink DWM 652 U5 USB 3G modem has product ID 0xce1e instead of orignal 0xce16. The new ID is added. And I found there are two entries for 0xce16, one has raw number, the other has symbol DLINK_PRODUCT_DWM_652_U5. This is fixed too. Signed-off-by: Huang Ying Signed-off-by: Greg Kroah-Hartman commit cd0e8aa1f4d36ece677b8ecf270ba921843dc6ca Author: Ondrej Zary Date: Sat Feb 27 22:56:28 2010 +0100 USB: unusual_devs.h: Fix capacity for SL11R-IDE 2.6c SL11R-IDE 2.6c (at least) reports wrong capacity (one sector more). Reading that last sector causes the device not to work anymore (and looks like HAL or something does that automatically after plugging in): sd 5:0:0:0: [sdc] Device not ready sd 5:0:0:0: [sdc] Result: hostbyte=0x00 driverbyte=0x08 sd 5:0:0:0: [sdc] Sense Key : 0x2 [current] sd 5:0:0:0: [sdc] ASC=0x0 ASCQ=0x0 sd 5:0:0:0: [sdc] CDB: cdb[0]=0x28: 28 00 04 a8 b5 70 00 00 01 00 Add unusual_devs entry to fix the capacity. Signed-off-by: Ondrej Zary Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit eb8878a881c306ff3eab6e741ab8fc94096f4e1a Author: Johan Hovold Date: Sat Feb 27 16:24:49 2010 +0100 USB: serial: use port endpoint size to determine if ep is available It is possible to have a multi-port device with a port lacking an in or out bulk endpoint. Only checking for num_bulk_in or num_bulk_out is thus not sufficient to determine whether a specific port has an in or out bulk endpoint. This fixes potential null pointer dereferences in the generic open and write routines, as well as access to uninitialised fifo in write_room and chars_in_buffer. Also let write fail with ENODEV (instead of 0) on missing out endpoint (also on zero-length writes). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6313620228624ff4dcb78b1dbd459d0c208df126 Author: Johan Hovold Date: Sat Feb 27 14:06:07 2010 +0100 USB: serial: fix softint not being called on errors Make sure usb_serial_port_softint is called on errors also when using multi urb writes. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0ae1474367a15e1b65a9deed3a73a14475a419fc Author: Johan Hovold Date: Sat Feb 27 14:05:46 2010 +0100 USB: serial: fix error message on close in generic driver Resubmitting read urb fails with -EPERM if completion handler runs while urb is being killed on close. This should not be reported as an error. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 7152b592593b9d48b33f8997b1dfd6df9143f7ec Author: Alan Stern Date: Sat Mar 6 15:04:03 2010 -0500 USB: fix usbfs regression This patch (as1352) fixes a bug in the way isochronous input data is returned to userspace for usbfs transfers. The entire buffer must be copied, not just the first actual_length bytes, because the individual packets will be discontiguous if any of them are short. Reported-by: Markus Rechberger Signed-off-by: Alan Stern CC: stable Signed-off-by: Greg Kroah-Hartman commit 336cee42dd52824e360ab419eab4e8888eb054ec Author: Jason Wessel Date: Mon Mar 8 21:50:11 2010 -0600 tty_port,usb-console: Fix usb serial console open/close regression Commit e1108a63e10d344284011cccc06328b2cd3e5da3 ("usb_serial: Use the shutdown() operation") breaks the ability to use a usb console starting in 2.6.33. This was observed when using console=ttyUSB0,115200 as a boot argument with an FTDI device. The error is: ftdi_sio ttyUSB0: ftdi_submit_read_urb - failed submitting read urb, error -22 The handling of the ASYNCB_INITIALIZED changed in 2.6.32 such that in tty_port_shutdown() it always clears the flag if it is set. The fix is to add a variable to the tty_port struct to indicate when the tty port is a console. CC: Alan Cox CC: Alan Stern CC: Oliver Neukum CC: Andrew Morton Signed-off-by: Jason Wessel Signed-off-by: Greg Kroah-Hartman commit 231443665882a02214c3748b9f86615a3ce9e5c2 Author: Tobias Klauser Date: Thu Mar 11 14:08:18 2010 -0800 tty: cpm_uart: use resource_size() Use the resource_size function instead of manually calculating the resource size. This reduces the chance of introducing off-by-one errors. Signed-off-by: Tobias Klauser Cc: Alan Cox Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d4bee0a677cfa5a32f964ffa420e27406c65e605 Author: Fang Wenqi Date: Tue Mar 9 18:54:28 2010 +0800 tty_buffer: Fix distinct type warning CC drivers/char/tty_buffer.o drivers/char/tty_buffer.c: In function ‘tty_insert_flip_string_fixed_flag’: drivers/char/tty_buffer.c:251: warning: comparison of distinct pointer types lacks a cast drivers/char/tty_buffer.c: In function ‘tty_insert_flip_string_flags’: drivers/char/tty_buffer.c:288: warning: comparison of distinct pointer types lacks a cast Fix it by replacing min() with min_t() in tty_insert_flip_string_flags and tty_insert_flip_string_fixed_flag(). Signed-off-by: Fang Wenqi Signed-off-by: Greg Kroah-Hartman commit e74d098c66543d0731de62eb747ccd5b636a6f4c Author: Amit Shah Date: Fri Mar 12 11:53:15 2010 +0530 hvc_console: Fix race between hvc_close and hvc_remove Alan pointed out a race in the code where hvc_remove is invoked. The recent virtio_console work is the first user of hvc_remove(). Alan describes it thus: The hvc_console assumes that a close and remove call can't occur at the same time. In addition tty_hangup(tty) is problematic as tty_hangup is asynchronous itself.... So this can happen hvc_close hvc_remove hung up ? - no lock tty = hp->tty unlock lock hp->tty = NULL unlock notify del kref_put the hvc struct close completes tty is destroyed tty_hangup dead tty tty->ops will be NULL NULL->... This patch adds some tty krefs and also converts to using tty_vhangup(). Reported-by: Alan Cox Signed-off-by: Amit Shah CC: Alan Cox CC: linuxppc-dev@ozlabs.org CC: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit f157b58511e56d418eb582de96fedc4ea03d8061 Author: David Miller Date: Wed Mar 3 02:50:26 2010 -0800 uartlite: Fix build on sparc. We can get this driver enabled via MFD_TIMBERDALE which only requires GPIO to be on. But the of_address_to_resource() function is only present on powerpc and microblaze, so we have to conditionalize the CONFIG_OF probing bits on that. Signed-off-by: David S. Miller Acked-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 352fa6ad16b89f8ffd1a93b4419b1a8f2259feab Author: Mel Gorman Date: Tue Mar 2 22:24:19 2010 +0000 tty: Take a 256 byte padding into account when buffering below sub-page units The TTY layer takes some care to ensure that only sub-page allocations are made with interrupts disabled. It does this by setting a goal of "TTY_BUFFER_PAGE" to allocate. Unfortunately, while TTY_BUFFER_PAGE takes the size of tty_buffer into account, it fails to account that tty_buffer_find() rounds the buffer size out to the next 256 byte boundary before adding on the size of the tty_buffer. This patch adjusts the TTY_BUFFER_PAGE calculation to take into account the size of the tty_buffer and the padding. Once applied, tty_buffer_alloc() should not require high-order allocations. Signed-off-by: Mel Gorman Cc: stable Signed-off-by: Greg Kroah-Hartman commit 87a6aca504d65f242589583e04df5e74b5eae1fe Author: Greg Kroah-Hartman Date: Mon Mar 15 17:14:15 2010 -0700 Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call" This reverts commit eec9fe7d1ab4a0dfac4cb43047a7657fffd0002f. Ari writes as the reason this should be reverted: The problems with this patch include: 1. There's at least one subtlety I overlooked - switching between X servers (i.e. from one X VT to another) still requires the cooperation of both X servers. I was assuming that KMS eliminated this. 2. It hasn't been tested at all (no X server patch exists which uses the new mode). As he was the original author of the patch, I'll revert it. Cc: Ari Entlich Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 12ee3c0a0ac42bed0939420468fd35f5cdceae4f Author: David Rientjes Date: Wed Mar 10 14:50:21 2010 -0800 driver core: numa: fix BUILD_BUG_ON for node_read_distance node_read_distance() has a BUILD_BUG_ON() to prevent buffer overruns when the number of nodes printed will exceed the buffer length. Each node only needs four chars: three for distance (maximum distance is 255) and one for a seperating space or a trailing newline. Signed-off-by: David Rientjes Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit f0eae0ed3b7d4182a6b4dd03540a738518ea3163 Author: Jani Nikula Date: Thu Mar 11 18:11:45 2010 +0200 driver-core: document ERR_PTR() return values A number of functions in the driver core return ERR_PTR() values on error. Document this in the kernel-doc of the functions. Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman commit 178a5b35b2777346206d4b577b36d10061732f8c Author: Robert P. J. Day Date: Fri Mar 12 07:30:35 2010 -0500 kobject: documentation: Update to refer to kset-example.c. Signed-off-by: Robert P. J. Day Signed-off-by: Greg Kroah-Hartman commit 67fc233f4fb67907861b4077cea5294035f80dc7 Author: Stephen Rothwell Date: Tue Mar 16 10:33:32 2010 +1100 sysdev: the cpu probe/release attributes should be sysdev_class_attributes This fixes these warnings: drivers/base/cpu.c:264: warning: initialization from incompatible pointer type drivers/base/cpu.c:265: warning: initialization from incompatible pointer type Cc: Andi Kleen Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 462bd295a3d74c7d1641501bda549bccf404be5b Author: Robert P. J. Day Date: Thu Mar 11 07:59:09 2010 -0500 kobject: documentation: Fix erroneous example in kobject doc. Replace uio_mem example for kobjects with uio_map, since the uio_mem struct no longer contains a kobject. Signed-off-by: Robert P. J. Day Signed-off-by: Greg Kroah-Hartman commit e59817bf089a3893e05a059026c668fb65f8c748 Author: Randy Dunlap Date: Wed Mar 10 11:47:58 2010 -0800 driver-core: fix missing kernel-doc in firmware_class Fix kernel-doc warning in firmware_class.c: Warning(drivers/base/firmware_class.c:94): No description found for parameter 'attr' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 4d26e139f0b7d4c0700d6993506f1f60e2f2caa5 Author: Magnus Damm Date: Wed Mar 10 20:50:38 2010 +0900 Driver core: Early platform kernel-doc update This patch updates the kernel-doc notation for early platform functions. Signed-off-by: Magnus Damm Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 3691c964fa1a8f0eb5e5f00c644ef1bdd7e35a95 Author: Greg Kroah-Hartman Date: Mon Mar 15 14:01:55 2010 -0700 sysfs: fix sysfs lockdep warning in mlx4 code This fixes a sysfs lockdep warning in the mlx4 code. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit 21e3bde964e873bb5d3b1dfef68294b1437fe678 Author: Greg Kroah-Hartman Date: Mon Mar 15 14:01:25 2010 -0700 sysfs: fix sysfs lockdep warning in infiniband code This fixes a sysfs lockdep warning in the infiniband code. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit c7df670bf702d1c25ae22b4cd49deb05c1e55ecc Author: Greg Kroah-Hartman Date: Mon Mar 15 13:59:51 2010 -0700 sysfs: fix sysfs lockdep warning in ipmi code This fixes a sysfs lockdep warning in the ipmi code. Thanks to Eric Biederman and Yinghai Lu for the original versions of the patch, unfortunatly they did not submit them in a form they could be applied in. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit 6757eca348fbbdd4ab1020e565f325cd6a6b2698 Author: Mel Gorman Date: Wed Mar 10 22:48:34 2010 +0000 sysfs: Initialised pci bus legacy_mem field before use PPC64 is failing to boot the latest mmotm due to an uninitialised pointer in pci_create_legacy_files(). The surprise is that machines boot at all and it would appear to affect current mainline as well. This patch fixes the problem. Signed-off-by: Mel Gorman Signed-off-by: Greg Kroah-Hartman commit e1955ca0ee55286cbc65a8ed7471d540ae83dac8 Author: Jiri Kosina Date: Tue Mar 9 19:30:28 2010 +0100 sysfs: use sysfs_bin_attr_init in firmware class driver Annotate dynamic sysfs attribute in fw_setup_device(). This gets rid of the following lockdep warning: bnx2 0000:08:00.0: firmware: requesting bnx2/bnx2-mips-06-5.0.0.j6.fw BUG: key ffff880008293470 not in .data! ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:2706 lockdep_init_map+0x562/0x620() Modules linked in: bnx2(+) sg tpm_bios floppy rtc_lib usb_storage i2c_piix4 joydev button container shpchp i2c_core sr_mod cdrom pci_hotplug usbhid hid ohci_hcd ehci_hcd sd_mod usbcore edd ext3 mbcache jbd fan ata_generic sata_svw pata_serverworks libata scsi_mod thermal processor Pid: 1915, comm: work_for_cpu Not tainted 2.6.34-rc1-default #81 Call Trace: [] ? lockdep_init_map+0x562/0x620 [] warn_slowpath_common+0x78/0xd0 [] warn_slowpath_null+0xf/0x20 [] lockdep_init_map+0x562/0x620 [] ? sysfs_new_dirent+0x76/0x120 [] ? put_device+0x12/0x20 [] sysfs_add_file_mode+0x6c/0xd0 [] sysfs_add_file+0xc/0x10 [] sysfs_create_bin_file+0x21/0x30 [] _request_firmware+0x2f1/0x650 [] request_firmware+0xe/0x10 [] bnx2_init_one+0x8f5/0x177e [bnx2] [] ? _raw_spin_unlock_irq+0x2b/0x40 [] ? finish_task_switch+0x69/0x100 [] ? finish_task_switch+0x0/0x100 [] ? do_work_for_cpu+0x0/0x30 [] local_pci_probe+0x12/0x20 [] do_work_for_cpu+0x13/0x30 [] ? do_work_for_cpu+0x0/0x30 [] kthread+0x96/0xa0 [] kernel_thread_helper+0x4/0x10 [] ? restore_args+0x0/0x30 [] ? kthread+0x0/0xa0 [] ? kernel_thread_helper+0x0/0x10 ---[ end trace a2ecee9c9602d195 ]--- Cc: Eric W. Biederman Cc: Greg Kroah-Hartman Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 6937c947d31186750f72c9f8c942bbcc6fe63585 Author: Mark Brown Date: Thu Mar 18 12:25:35 2010 +0000 ASoC: Bail out of wm_hubs DC servo if calibration fails We're keeping track of the number of times we've iterated but never actually using this to bail out if the chip looks stuck. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fdb6b1e195757a66670801702e4b5fcc66ed3d72 Author: Peter Ujfalusi Date: Fri Mar 19 11:10:20 2010 +0200 ASoC: tlv320dac33: Internal clocking changes During validation of the internal clocking setup it has been found that the following settings were not configured in an optimal way: ASRC_CTRL_A: SRCLKDIV was incorrect, instad of divide ratio 3, ratio of 2 has to be used (as the comment stated) DAC_CTRL_A: Fs = Fsref is the desired configuration instead of Fs = Fsref / 1.5 Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 44f497b4e0bba6ce1b73a107cc13636393344252 Author: Peter Ujfalusi Date: Fri Mar 19 11:10:19 2010 +0200 ASoC: tlv320dac33: Fix DSP modes To make DSP_A mode working correctly the data delay should be configured to 0. DSP_B mode thus can not be used with DAC33, so remove it. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fc300206ad07e771ed003d35b1dc179eaf0c508f Author: Sascha Hauer Date: Fri Mar 19 11:12:02 2010 +0100 i.MX51: remove NFC AXI static mapping This area contains the Nand Flash controller registers. There is no need to map them statically as the Nand driver uses ioremap(). Signed-off-by: Sascha Hauer commit 5443856cadac7faaaeefeed9d769f497a8c6fa4b Author: Sascha Hauer Date: Fri Mar 19 10:50:55 2010 +0100 i.MX51: determine silicon revision dynamically Freescale redboot passes the silicon revision via ATAG_REVISION. Remove this bootloader dependency by doing the same as redboot does in the Kernel. Signed-off-by: Sascha Hauer commit 3d1bc8626c7b17facfcb7fb5dee4686f47a1e75d Author: Sascha Hauer Date: Thu Mar 18 16:56:30 2010 +0100 i.MX51: map TZIC dynamically This looks cleaner and allows us to call mx51_revision later when we can use ioremap to determine the silicon revision dynamically. Signed-off-by: Sascha Hauer commit 1b6a2b2d0ff2ced5fe608e0b2e13ccd2b7a283e5 Author: Sascha Hauer Date: Thu Mar 18 16:56:11 2010 +0100 i.MX51: Use correct clock for gpt The gpt uses the ipg clock, not ipg_perclk Signed-off-by: Sascha Hauer commit 48fae657f04924c06fe8c9afdb149efdd99d68dd Author: Sascha Hauer Date: Thu Mar 18 16:55:45 2010 +0100 i.MX51 Babbage: Add uncompress output Signed-off-by: Sascha Hauer commit 181fdde3b4268cb7b4af76ba6337e7ec8accbb36 Author: Richard Kennedy Date: Fri Mar 19 08:58:16 2010 +0100 block: remove 16 bytes of padding from struct request on 64bits Remove alignment padding to shrink struct request from 336 to 320 bytes so needing one fewer cacheline and therefore removing 48 bytes from struct request_queue. Signed-off-by: Richard Kennedy Signed-off-by: Jens Axboe commit b4b7a4ef097f288f724420b473dbf92a89c0ab7e Merge: e9ce335 a3d3203 Author: Jens Axboe Date: Fri Mar 19 08:05:10 2010 +0100 Merge branch 'master' into for-linus Conflicts: block/Kconfig Signed-off-by: Jens Axboe commit e9ce335df51ff782035a15c261a3c0c9892a1767 Author: Shaohua Li Date: Fri Mar 19 08:03:04 2010 +0100 cfq-iosched: fix a kbuild regression Alex Shi reported a kbuild regression which is about 10% performance lost. He bisected to this commit: 3dde36ddea3e07dd025c4c1ba47edec91606fec0. The reason is cfqq_close() can't find close cooperator. Restoring cfq_rq_close()'s threshold to original value makes the regression go away. Since for_preempt parameter isn't used anymore, this patch deletes it. Reported-by: Alex Shi Signed-off-by: Shaohua Li Acked-by: Corrado Zoccolo Signed-off-by: Jens Axboe commit 191aee58b6568cf8143901bfa3f57a9b8faa6f1c Author: FUJITA Tomonori Date: Tue Mar 2 14:25:38 2010 +0000 powerpc: Remove IOMMU_VMERGE config option The description says: Cause IO segments sent to a device for DMA to be merged virtually by the IOMMU when they happen to have been allocated contiguously. This doesn't add pressure to the IOMMU allocator. However, some drivers don't support getting large merged segments coming back from *_map_sg(). Most drivers don't have this problem; it is safe to say Y here. It's out of date. Long ago, drivers didn't have a way to tell IOMMUs about their segment length limit (that is, the maximum segment length that they can handle). So IOMMUs merged as many segments as possible and gave too large segments to drivers. dma_get_max_seg_size() was introduced to solve the above problem. Device drives can use the API to tell IOMMU about the maximum segment length that they can handle. In addition, the default limit (64K) should be safe for everyone. So this config option seems to be unnecessary. Note that this config option just enables users to disable the virtual merging by default. Users can still disable the virtual merging by the boot parameter. Signed-off-by: FUJITA Tomonori Signed-off-by: Benjamin Herrenschmidt commit a93272969c6b1d59883fcbb04845420bd72c9a20 Author: FUJITA Tomonori Date: Tue Mar 16 13:16:25 2010 +0000 powerpc: Fix swiotlb to respect the boot option powerpc initializes swiotlb before parsing the kernel boot options so swiotlb options (e.g. specifying the swiotlb buffer size) are ignored. Any time before freeing bootmem works for swiotlb so this patch moves powerpc's swiotlb initialization after parsing the kernel boot options, mem_init (as x86 does). Signed-off-by: FUJITA Tomonori Tested-by: Becky Bruce Tested-by: Albert Herranz Signed-off-by: Benjamin Herrenschmidt commit 09156a7a409cf93d1ca2706bf05d714879a5b7ea Author: Márton Németh Date: Sat Mar 6 22:43:55 2010 +0000 powerpc: Do not call prink when CONFIG_PRINTK is not defined When printk() is disabled (CONFIG_PRINTK) at menu item General setup -> Configure standard kernel features (for small systems) -> Enable support for printk then there should be no printk() calls at all. Signed-off-by: Márton Németh Signed-off-by: Benjamin Herrenschmidt commit 409d241b7bb2cf0278186040ace1c4704fb2a82f Author: Nathan Lynch Date: Fri Mar 12 13:16:02 2010 +0000 powerpc: Use correct ccr bit for syscall error status The powerpc implementations of syscall_get_error and syscall_set_return_value should use CCR0:S0 (0x10000000) for testing and setting syscall error status. Fortunately these APIs don't seem to be used at the moment. Signed-off-by: Nathan Lynch Signed-off-by: Benjamin Herrenschmidt commit d6a8536a93a3d14b6e5e3e3a59b9fb2bca6e8df2 Merge: bca14dd 9d296cf Author: Benjamin Herrenschmidt Date: Fri Mar 19 16:23:55 2010 +1100 Merge commit 'kumar/merge' into merge commit 11bc3088373e913f165a8652601c6f8b8dc4aea2 Author: Steve Glendinning Date: Thu Mar 18 22:18:41 2010 -0700 smsc95xx: Fix tx checksum offload for small packets TX checksum offload does not work properly when transmitting UDP packets with 0, 1 or 2 bytes of data. This patch works around the problem by calculating checksums for these packets in the driver. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 0ecad5a262923967147e2d1725e277a2a5fbcdd4 Author: Mallikarjuna R Chilakala Date: Thu Mar 18 15:16:56 2010 +0000 ixgbe: Fix 82599 KX4 Wake on LAN issue after an improper system shutdown Advanced Power Management is disabled for 82599 KX4 connections by clearing GRC.APME bit, causing it to not wake the system from an improper system shutdown. By default GRC.APME is enabled and software is not supposed to clear these settings during adapter probe. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1097cd17700c4e9903b7bbfcec1432f61784cb53 Author: Mallikarjuna R Chilakala Date: Thu Mar 18 14:34:52 2010 +0000 ixgbe: Fix 82599 multispeed fiber link issues due to Tx laser flapping Fix 82599 link issues during driver load and unload test using multi-speed 10G & 1G fiber modules. When connected back to back sometime 82599 multispeed fiber modules would link at 1G speed instead of 10G highest speed, due to a race condition in autotry process involving Tx laser flapping. Move autotry autoneg-37 tx laser flapping process from multispeed module init setup to driver unload. This will alert the link partner to restart its autotry process when it tries to establish the link with the link partner Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4227f62db38ed221a49908c224b9fa2b91dc797b Merge: 0641e4f c8406ea Author: David S. Miller Date: Thu Mar 18 21:18:19 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 0641e4fbf2f824faee00ea74c459a088d94905fd Author: Eric Dumazet Date: Thu Mar 18 21:16:45 2010 -0700 net: Potential null skb->dev dereference When doing "ifenslave -d bond0 eth0", there is chance to get NULL dereference in netif_receive_skb(), because dev->master suddenly becomes NULL after we tested it. We should use ACCESS_ONCE() to avoid this (or rcu_dereference()) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 54d259d474e1fee6f6bb8f0f1360d85195199ac5 Author: Guo-Fu Tseng Date: Wed Mar 17 00:09:31 2010 +0000 jme: Advance driver version number Advance driver version number after some bug fix. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit bf5e5360fd1df1ae429ebbd81838d7d0879797d1 Author: Guo-Fu Tseng Date: Wed Mar 17 00:09:30 2010 +0000 jme: Protect vlgrp structure by pause RX actions. Temporary stop the RX IRQ, and disable (sync) tasklet or napi. And restore it after finished the vlgrp pointer assignment. Signed-off-by: Guo-Fu Tseng Cc: stable@kernel.org Signed-off-by: David S. Miller commit 17da69b8bfbe441a33a873ad5dd7d3d85800bf2b Author: Guo-Fu Tseng Date: Wed Mar 17 00:09:29 2010 +0000 jme: Fix VLAN memory leak Fix memory leak while receiving 8021q tagged packet which is not registered by user. Signed-off-by: Guo-Fu Tseng Cc: stable@kernel.org Signed-off-by: David S. Miller commit 658cc524305c9759019c4430ded231f631472482 Author: Abraham Arce Date: Tue Mar 16 12:24:54 2010 +0000 KS8851: Avoid NULL pointer in set rx mode Kernel NULL pointer dereference when setting mode for IFF_MULTICAST. Tested on SDP OMAP4430 board. ks8851 spi1.0: message enable is 0 ks8851 spi1.0: revision 0, MAC f2:f4:2f:56:37:de, IRQ 194 Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP last sysfs file: Modules linked in: CPU: 0 Not tainted (2.6.34-rc1-01039-g38d7ed1-dirty #3) PC is at ks8851_set_rx_mode+0x88/0x124 LR is at bitrev32+0x24/0x2c Backtrace: [] ? (ks8851_set_rx_mode+0x0/0x124) [] (__dev_set_rx_mode+0x0/0x90) [] (dev_mc_add+0x0/0x78) [] (igmp_group_added+0x0/0x64) [] (ip_mc_inc_group+0x0/0x150) [] (ip_mc_up+0x0/0x64) [] (inetdev_event+0x0/0x3d4) [] (notifier_call_chain+0x0/0x78) [] (__raw_notifier_call_chain+0x0/0x24) [] (raw_notifier_call_chain+0x0/0x28) [] (call_netdevice_notifiers+0x0/0x24) [] (__dev_notify_flags+0x0/0x68) [] (dev_change_flags+0x0/0x4c) [] (ip_auto_config+0x0/0xf1c) [] (do_one_initcall+0x0/0x1bc) [] (kernel_init+0x0/0x234) Code: e15130bc e1833012 e14130bc e5943000 (e5934000) ---[ end trace ed0fb00a94142792 ]--- Kernel panic - not syncing: Fatal exception in interrupt Signed-off-by: Abraham Arce Signed-off-by: David S. Miller commit b634f87522dff87712df8bda2a6c9061954d552a Author: Alexandra Kossovsky Date: Thu Mar 18 20:29:24 2010 -0700 tcp: Fix OOB POLLIN avoidance. From: Alexandra.Kossovsky@oktetlabs.ru Fixes kernel bugzilla #15541 Signed-off-by: David S. Miller commit 2271048d1b3b0aabf83d25b29c20646dcabedc05 Author: Steven Rostedt Date: Thu Mar 18 17:54:19 2010 -0400 ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte align The ring buffer uses 4 byte alignment while recording events into the buffer, even on 64bit machines. This saves space when there are lots of events being recorded at 4 byte boundaries. The ring buffer has a zero copy method to write into the buffer, with the reserving of space and then committing it. This may cause problems when writing an 8 byte word into a 4 byte alignment (not 8). For x86 and PPC this is not an issue, but on some architectures this would cause an out-of-alignment exception. This patch uses CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS to determine if it is OK to use 4 byte alignments on 64 bit machines. If it is not, it forces the ring buffer event header to be 8 bytes and not 4, and will align the length of the data to be 8 byte aligned. This keeps the data payload at 8 byte alignments and will allow these machines to run without issue. The trick to this is that the header can be either 4 bytes or 8 bytes depending on the length of the data payload. The 4 byte header has a length field that supports up to 112 bytes. If the length of the data is more than 112, the length field is set to zero, and the actual length is stored in the next 4 bytes after the header. When CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set, the code forces zero in the 4 byte header forcing the length to be stored in the 4 byte array, even with a small data load. It also forces the length of the data load to be 8 byte aligned. The combination of these two guarantee that the data is always at 8 byte alignment. Tested-by: Frederic Weisbecker (on sparc64) Reported-by: Frederic Weisbecker Acked-by: David S. Miller Signed-off-by: Steven Rostedt commit 5286944d75cbe21dd21b0d57335cc6206622b62a Author: FUJITA Tomonori Date: Thu Mar 18 22:35:28 2010 -0400 alpha: fix compile errors in dma-mapping-common.h The commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 leads to the following errors with CONFIG_ALPHA_{TSUNAMI, TITAN, RAWHIDE, MARVEL}: /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h: In function `dma_map_sg_attrs': /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:49: error: implicit declaration of function `for_each_sg' /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:50: error: syntax error before "kmemcheck_mark_initialized" Signed-off-by: FUJITA Tomonori Reported-by: Michael Cree Signed-off-by: Matt Turner commit 7f2d889c9cdcd33e8942a23765623adbd468cf04 Author: Frans Pop Date: Mon Mar 1 13:29:14 2010 -0500 alpha: remove trailing spaces in messages Signed-off-by: Frans Pop Cc: linux-alpha@vger.kernel.org Signed-off-by: Matt Turner commit 2a238a96358dde09aa52de9b9f97a383165ca651 Author: Akinobu Mita Date: Mon Mar 1 13:25:49 2010 -0500 alpha: use __ratelimit Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: linux-alpha@vger.kernel.org Signed-off-by: Matt Turner commit 39710479303fd3affb3e204e9a7a75cc676977b5 Merge: 9d20593 eb63e5d Author: Linus Torvalds Date: Thu Mar 18 17:02:35 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (96 commits) Blackfin: stop cleaning include/asm/asm-offsets.h Blackfin: scale calibration when cpu freq changes Blackfin: eat spurious space in asm/dpmc.h Blackfin: fix anomaly 283 handling with exact hardware error Blackfin: bf537-stamp: add example ADXL346 orientation resources Blackfin: bf537-stamp: add example AD2S1210 IIO resources Blackfin: don't support keypad wakeup from hibernate Blackfin: bf537-stamp: add example AD7416 IIO resources Blackfin: bf537-stamp: add example ADP8860 backlight/led resources Blackfin: bf537-stamp: add example AD7414 temp sensor resources Blackfin: rename AD1836 to AD183X in board files Blackfin: bf537-stamp: add example AD2S120x resources Blackfin: add support for the on-chip MAC status interrupts Blackfin: asm/page.h: pull in asm-generic headers Blackfin: mark gpio lib functions static Blackfin: bf537-stamp: add example ADAU1361 resources Blackfin: GPIO: implement to_irq handler Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources Blackfin: bf537-stamp: add example AD2S90 resources Blackfin: bf537-stamp: add example AD5398 power regulator resources ... commit 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 Merge: 9b59a0a 9205124 Author: Linus Torvalds Date: Thu Mar 18 17:01:19 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: Build fix for mpc52xx watchdog timer code of: Fix comparison of "compatible" properties powerpc/52xx: update defconfigs spi/omap2_mcspi: Use transaction speed if provided spi/omap2_mcspi: fix NULL pointer dereference uartlite: Fix build on sparc. commit 9b59a0a4eefa132a3899b6e8d362f92559c67844 Merge: c3a0bd7 29b2ee5 Author: Linus Torvalds Date: Thu Mar 18 16:59:30 2010 -0700 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: ARM/OMAP: Remove the +x bit from a couple of source files omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values OMAP4: fix temporary hacks that break multi-omap PM OMAP2: cpu_is_omap2*: fix compile-time removal of unused code omap3: pandora: add missing i2c3 board_info omap: mach-omap2/io.c: fix function declarations omap: Fix gpio_resume_after_retention omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board omap: Checkpatch cleanup for blizzard.h omap: pass the reboot command to the boot loader omap2/3/4: mailbox: remove compiler warning OMAP2: serial.c: Fix number of uarts in early_init omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors omap2: Update n8x0 defconfig to test multi-omap and DMA api changes omap2: add USB initialization for tusb6010 omap4: Fix build break by moving omap_smc1 into a separate .S omap2/3/4: ehci: avoid compiler error with touchbook omap3: Fix compile for Touch Book early_param commit c3a0bd7515c682f4529a35318b6712c9ae456edc Merge: a41842f 0d5e6f7 Author: Linus Torvalds Date: Thu Mar 18 16:59:10 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits) ARM: Fix RiscPC decompressor build errors ARM: Fix sorting of platform group config options and includes ARM: 5991/1: Fix regression in restore_user_regs macro ARM: 5989/1: ARM: KGDB: add support for SMP platforms ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush ARM: Add final piece to fix XIP decompressor in read-only memory video: enable sh_mobile_lcdc on SH-Mobile ARM ARM: mach-shmobile: ap4evb SDHI0 platform data V2 ARM: mach-shmobile: sh7372 SDHI vector merge ARM: mach-shmobile: sh7377 SDHI vector merge ARM: mach-shmobile: sh7367 SDHI vector merge ARM: mach-shmobile: G4EVM KEYSC platform data mtd: enable sh_flctl on SH-Mobile ARM ARM: mach-shmobile: G3EVM FLCTL platform data ARM: mach-shmobile: G3EVM KEYSC platform data Video: ARM CLCD: Better fix for swapped IENB and CNTL registers ARM: Add L2 cache handling to smp boot support ARM: 5960/1: ARM: perf-events: fix v7 event selection mask ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds ... commit a41842f70d6d6b0cfde3d21e163add81c4318ebd Merge: 7228744 0e17226 Author: Linus Torvalds Date: Thu Mar 18 16:58:42 2010 -0700 Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux * 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux: ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362 ARM: SAMSUNG: Fix build error from stale define in ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. commit 722874465e3cd3268387b96e02220f84b35a8d98 Merge: 31cc1dd 841d6e8 Author: Linus Torvalds Date: Thu Mar 18 16:57:24 2010 -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: (27 commits) microblaze: entry.S use delay slot for return handlers microblaze: Save current task directly microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap microblaze: PCI early support for noMMU system microblaze: Fix dma alloc and free coherent dma functions microblaze: Add consistent code microblaze: pgtable.h: move consistent functions microblaze: Remove ancient Kconfig option for consistent mapping microblaze: Remove VMALLOC_VMADDR microblaze: Add define for ASM_LOOP microblaze: Preliminary support for dma drivers microblaze: remove trailing space in messages microblaze: Use generic show_mem() microblaze: Change temp register for cmdline microblaze: Preliminary support for dma drivers microblaze: Move cache function to cache.c microblaze: Add support from PREEMPT microblaze: Add support for Xilinx PCI host bridge microblaze: Enable PCI, missing files microblaze: Add core PCI files ... commit 31cc1dd344d941358345bd02f24c629dada9b08c Merge: 961cde9 627a2d3 Author: Linus Torvalds Date: Thu Mar 18 16:55:24 2010 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: deal with merge_bvec_fn in component devices better. commit 961cde93dee2658000ead32abffb8ddf0727abe0 Merge: f82c37e 0d9dc7c Author: Linus Torvalds Date: Thu Mar 18 16:54:31 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (69 commits) [SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport [SCSI] bfa: Update the driver version to 2.1.2.1. [SCSI] bfa: Remove unused header files and did some cleanup. [SCSI] bfa: Handle SCSI IO underrun case. [SCSI] bfa: FCS and include file changes. [SCSI] bfa: Modified the portstats get/clear logic [SCSI] bfa: Replace bfa_get_attr() with specific APIs [SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO). [SCSI] bfa: Rename pport to fcport in BFA FCS. [SCSI] bfa: IOC fixes, check for IOC down condition. [SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state. [SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt. [SCSI] bfa: IOC recovery fix in fcmode. [SCSI] bfa: AEN and byte alignment fixes. [SCSI] bfa: Introduce a link notification state machine. [SCSI] bfa: Added firmware save clear feature for BFA driver. [SCSI] bfa: FCS authentication related changes. [SCSI] bfa: PCI VPD, FIP and include file changes. [SCSI] bfa: Fix to copy fpma MAC when requested by user space application. [SCSI] bfa: RPORT state machine: direct attach mode fix. ... commit f82c37e7bb4c4d9b6a476c642d5c2d2efbd6f240 Merge: c6b9e73 dcd5c16 Author: Linus Torvalds Date: Thu Mar 18 16:52:46 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (35 commits) perf: Fix unexported generic perf_arch_fetch_caller_regs perf record: Don't try to find buildids in a zero sized file perf: export perf_trace_regs and perf_arch_fetch_caller_regs perf, x86: Fix hw_perf_enable() event assignment perf, ppc: Fix compile error due to new cpu notifiers perf: Make the install relative to DESTDIR if specified kprobes: Calculate the index correctly when freeing the out-of-line execution slot perf tools: Fix sparse CPU numbering related bugs perf_event: Fix oops triggered by cpu offline/online perf: Drop the obsolete profile naming for trace events perf: Take a hot regs snapshot for trace events perf: Introduce new perf_fetch_caller_regs() for hot regs snapshot perf/x86-64: Use frame pointer to walk on irq and process stacks lockdep: Move lock events under lockdep recursion protection perf report: Print the map table just after samples for which no map was found perf report: Add multiple event support perf session: Change perf_session post processing functions to take histogram tree perf session: Add storage for seperating event types in report perf session: Change add_hist_entry to take the tree root instead of session perf record: Add ID and to recorded event data when recording multiple events ... commit c6b9e73f2fee8bb86058f296de808b326473456b Merge: 441f405 e639ba4 Author: Linus Torvalds Date: Thu Mar 18 16:52:31 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: avoid '\0' in hid debugfs events file HID: Add RGT Clutch Wheel clutch device id HID: ntrig: fix touch events HID: add quirk for UC-Logik WP4030 tablet HID: magicmouse: fix oops after device removal commit 441f4058a04b2943685ff94e0f5f1992b0b3649e Merge: 7c34691 8ad6fca Author: Linus Torvalds Date: Thu Mar 18 16:50:55 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (30 commits) Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree Btrfs: allow treeid==0 in the inode lookup ioctl Btrfs: return keys for large items to the search ioctl Btrfs: fix key checks and advance in the search ioctl Btrfs: buffer results in the space_info ioctl Btrfs: use __u64 types in ioctl.h Btrfs: fix search_ioctl key advance Btrfs: fix gfp flags masking in the compression code Btrfs: don't look at bio flags after submit_bio btrfs: using btrfs_stack_device_id() get devid btrfs: use memparse Btrfs: add a "df" ioctl for btrfs Btrfs: cache the extent state everywhere we possibly can V2 Btrfs: cache ordered extent when completing io Btrfs: cache extent state in find_delalloc_range Btrfs: change the ordered tree to use a spinlock instead of a mutex Btrfs: finish read pages in the order they are submitted btrfs: fix btrfs_mkdir goto for no free objectids Btrfs: flush data on snapshot creation Btrfs: make df be a little bit more understandable ... commit 7c34691abe23741bfc7d2514efd5a39f0e0ecb06 Merge: 5f87e54 cfbc068 Author: Linus Torvalds Date: Thu Mar 18 16:50:09 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: ensure bdi_unregister is called on mount failure. NFS: Avoid a deadlock in nfs_release_page NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() nfs4: Make the v4 callback service hidden nfs: fix unlikely memory leak rpc client can not deal with ENOSOCK, so translate it into ENOCONN commit 5f87e54d7d6f58e8f15819cf8901860d9512e8b4 Merge: 01da470 5db5b02 Author: Linus Torvalds Date: Thu Mar 18 16:49:24 2010 -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: ahci: pp->active_link is not reliable when FBS is enabled ahci: use BIOS date in broken_suspend list ahci: add missing nv IDs commit 01da47059ab54544a508b217598fb0e73b73e7a8 Merge: 61d7180 e04dd2d Author: Linus Torvalds Date: Thu Mar 18 16:48:19 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: sound: sequencer: clean up remove bogus check ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212 ALSA: hda - Disable MSI for Nvidia controller ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 ALSA: hda - Fix secondary ADC of ALC260 basic model ALSA: hda - Add an error message for invalid mapping NID ALSA: hda - New Intel HDA controller commit fe305198d4bf481d6dd017df35c566c9d477fada Author: Daniel Vetter Date: Thu Mar 18 09:22:12 2010 +0100 drm/intel: fix up set_tiling for untiled->tiled transition Bug introduced in commit 10ae9bd25acf394c8fa2f9d795dfa9cec4d19ed6 Author: Daniel Vetter Date: Mon Feb 1 13:59:17 2010 +0100 drm/i915: blow away userspace mappings before fence change The problem is that when there's no fence reg assigned and the object is mapped at a fenceable offset in the gtt, the userspace mappings won't be torn down. Which happens on untiled->tiled transition quite often on 4th gen and later because there fencing does not have any special alignment constraints (as opposed to 2nd and 3rd gen on which I've tested the original commit). Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=26993 Signed-off-by: Daniel Vetter Tested-by: Eric Anholt (fixes OpenArena) Signed-off-by: Eric Anholt commit 8956c8bba5b11b3d3aec000e6c6184943011a8d4 Author: Eric Anholt Date: Thu Mar 18 13:21:14 2010 -0700 drm/i915: Set up the documented clock gating on Sandybridge and Ironlake. Signed-off-by: Eric Anholt commit 61d718076e95eb461fd4c3692b702a82e2be0df4 Merge: 5dbc2f5 ec57af9 Author: Linus Torvalds Date: Thu Mar 18 16:48:00 2010 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: panasonic-laptop - Fix incomplete registration failure handling backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling backlight: blackfin - Fix missing registration failure handling backlight: classmate-laptop - Fix missing registration failure handling backlight: mbp_nvidia_bl - add five more MacBook variants backlight: Allow properties to be passed at registration backlight: Add backlight_device parameter to check_fb video: backlight/progear, fix pci device refcounting backlight: l4f00242t03: Fix module licence absence. backlight: Revert some const qualifiers backlight: Add Epson L4F00242T03 LCD driver commit 66f6ff09ff67c45919b336395c4d7d0ed3a97edc Author: Eric Anholt Date: Thu Mar 18 12:19:37 2010 -0700 agp/intel: Don't do the chipset flush on Sandybridge. This CPU should be coherent with graphics in this direction, though flushing graphics caches are still required. Fixes a system reset on module load on Sandybridge with 4G+ memory. Signed-off-by: Eric Anholt commit 285aca8e2a7f8af2a18cf89d1dfa95df2f9c9132 Author: Eric Anholt Date: Thu Mar 18 11:24:06 2010 -0700 agp/intel: Respect the GTT size on Sandybridge for scratch page setup. This is similar to 14bc490bbdf1b194ad1f5f3d2a0a27edfdf78986 which respected it for how much of the GTT we would actually use. Now we won't clear beyond allocated memory when filling the GTT with scratch page addresses. Signed-off-by: Eric Anholt commit 5dbc2f543d2eb5499f3839d1abb72105cf0c03af Merge: 01d61d0 14b5d6d Author: Linus Torvalds Date: Thu Mar 18 16:47:04 2010 -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: Fix race between LED device uevent and actual attributes creation leds-gpio: fix default state handling on OF platforms leds: Add Dell Business Class Netbook LED driver leds: Kconfig cleanup leds: led-class.c - Quiet boot messages leds: make PCI device id constant leds: ALIX2: Add dependency to !GPIO_CS5335 commit 01d61d0d64065b591a3c1502d42b350b10764c54 Merge: 2e0c17d e8c3753 Author: Linus Torvalds Date: Thu Mar 18 16:46:05 2010 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: don't warn about page discards on shutdown xfs: use scalable vmap API xfs: remove old vmap cache commit 2e0c17d100c35e843dac1e99daf19b5e2b3fe168 Merge: 7de4a9a 22001a1 Author: Linus Torvalds Date: Thu Mar 18 16:45:01 2010 -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: (39 commits) gigaset: fix build failure bridge: Make first arg to deliver_clone const. bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping. route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() bridge br_multicast: Fix skb leakage in error path. bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message. NET: netpoll, fix potential NULL ptr dereference tipc: fix lockdep warning on address assignment l2tp: Fix UDP socket reference count bugs in the pppol2tp driver smsc95xx: wait for PHY to complete reset during init l2tp: Fix oops in pppol2tp_xmit smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver ne: Do not use slashes in irq name string NET: ksz884x, fix lock imbalance gigaset: correct range checking off by one error bridge: Fix br_forward crash in promiscuous mode bridge: Move NULL mdb check into br_mdb_ip_get ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation myri: remove dead code ... commit 7de4a9a73563e5f6f3c153015fadee433a443241 Merge: 1097d7c f04e879 Author: Linus Torvalds Date: Thu Mar 18 16:44:47 2010 -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: sunxvr1000: Add missing FB=y depenency. MAINTAINERS: Add entry for sparc serial drivers. drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields commit 0cff810f54b3b52075c27f7a7021d5b195264b6c Author: Lai Jiangshan Date: Thu Mar 18 12:25:33 2010 -0700 rcu: Fix local_irq_disable() CONFIG_PROVE_RCU=y false positives It is documented that local_irq_disable() also delimits RCU_SCHED read-site critical sections. See the document of synchronize_sched() or Documentation/RCU/whatisRCU.txt. So we have to test irqs_disabled() in rcu_read_lock_sched_held(). Otherwise rcu-lockdep brings incorrect complaint. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: eric.dumazet@gmail.com LKML-Reference: <1268940334-10892-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit b22b63ebafb97b66d1054e69941ee049d790c6cf Author: Mark Fasheh Date: Thu Mar 11 18:43:46 2010 -0800 ocfs2: Always try for maximum bits with new local alloc windows What we were doing before was to ask for the current window size as the maximum allocation. This had the effect of limiting the amount of allocation we could get for the local alloc during times when the window size was shrunk due to fragmentation. In some cases, that could actually *increase* fragmentation by artificially limiting the number of bits we can accept. So while we still want to ask for a minimum number of bits equal to window size, there is no reason why we should limit the number of bits the local alloc should accept. Hence always allow the maximum number of local alloc bits. Signed-off-by: Mark Fasheh Signed-off-by: Joel Becker commit 1097d7cef683c30f9768007daae2e961a0686a10 Merge: 57b552b 4e06e24 Author: Linus Torvalds Date: Thu Mar 18 11:04:59 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: PCMCIA: resource, fix lock imbalance pcmcia: add important if statement pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket pcmcia: honor saved flags in yenta_socket's I365_CSCINT register pcmcia: revert "irq probe can be done without risking an IRQ storm" pcmcia: pd6729, i82092: use parent (PCI) resources pcmcia/vrc4171: use local spinlock for device local lock. commit 8ad6fcab564c5bc956bdc3dfa440ab152b6e780f Author: Chris Mason Date: Thu Mar 18 12:23:10 2010 -0400 Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree This is used by the inode lookup ioctl to follow all the backrefs up to the subvol root. But the search being done would sometimes land one past the last item in the leaf instead of finding the backref. This changes the search to look for the highest possible backref and hop back one item. It also fixes a leaked path on failure to find the root. Signed-off-by: Chris Mason commit 1b53ac4d1b75b23bdc2b54ace787b8f718a987ef Author: Chris Mason Date: Thu Mar 18 12:17:05 2010 -0400 Btrfs: allow treeid==0 in the inode lookup ioctl When a root id of 0 is sent to the inode lookup ioctl, it will use the root of the file we're ioctling and pass the root id back to userland along with the results. This allows userland to do searches based on that root later on. Signed-off-by: Chris Mason commit 90fdde147fd32d18a20be5b498d5f26e56cca8a3 Author: Chris Mason Date: Thu Mar 18 12:14:54 2010 -0400 Btrfs: return keys for large items to the search ioctl The search ioctl was skipping large items entirely (ones that are too big for the results buffer). This changes things to at least copy the item header so that we can send information about the item back to userland. Signed-off-by: Chris Mason commit abc6e1341bda974e2d0eddb75f57a20ac18e9b33 Author: Chris Mason Date: Thu Mar 18 12:10:08 2010 -0400 Btrfs: fix key checks and advance in the search ioctl The search ioctl was working well for finding tree roots, but using it for generic searches requires a few changes to how the keys are advanced. This treats the search control min fields for objectid, type and offset more like a key, where we drop the offset to zero once we bump the type, etc. The downside of this is that we are changing the min_type and min_offset fields during the search, and so the ioctl caller needs extra checks to make sure the keys in the result are the ones it wanted. This also changes key_in_sk to use btrfs_comp_cpu_keys, just to make things more readable. Signed-off-by: Chris Mason commit 9205124c66a69664c6825501cb062ebd2acd3b3a Author: Grant Likely Date: Thu Mar 18 14:01:18 2010 -0600 powerpc/5200: Build fix for mpc52xx watchdog timer code mpc52xx_gpt_wdt_setup is defined as 0, which causes the following build failure with gcc 4.5, since it's built with -Werror. arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect Changing it to a static inline fixes the problem. Reported-by: Jeff Mahoney Signed-off-by: Grant Likely commit 1976152fd8e706135deed6cf333e347c08416056 Author: Grant Likely Date: Thu Mar 18 07:30:31 2010 -0600 of: Fix comparison of "compatible" properties Commit 7c7b60cb87547b1664a4385c187f029bf514a737 "of: put default string compare and #a/s-cell values into common header" Breaks various things on powerpc due to using strncasecmp instead of strcasecmp for comparing against "compatible" strings. This causes things like the 4xx PCI code to fail miserably due to the partial matches in code like this: for_each_compatible_node(np, NULL, "ibm,plb-pcix") ppc4xx_probe_pcix_bridge(np); for_each_compatible_node(np, NULL, "ibm,plb-pci") ppc4xx_probe_pci_bridge(np); It's not quite right to do partial name match. Entries in a compatible list are meant to be matched whole. If a device is compatible with both "foo" and "foo1", then the device should have both strings in its "compatible" property. This patch reverts powerpc and microblaze us to use strcasecmp. Signed-off-by: Benjamin Herrenschmidt (for patch description) Signed-off-by: Grant Likely Acked-by: David S. Miller Acked-by: Michal Simek commit da3b062e306452ffb74cf5e9e5128f9f1e0502ab Author: Guennadi Liakhovetski Date: Thu Mar 18 09:39:59 2010 +0100 ASoC: SIU driver shall select FW_LOADER The SIU ASoC driver must load firmware to program the DSP, therefore it has to select FW_LOADER in its Kconfig entry. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9eff26ea48bfbe2885b158742a7512a097ec911b Author: Paul Mackerras Date: Thu Mar 18 16:05:13 2010 +1100 powerpc/perf_events: Fix call-graph recording, add perf_arch_fetch_caller_regs This implements a powerpc version of perf_arch_fetch_caller_regs to get correct call-graphs. It's implemented in assembly because that way we can be sure there isn't a stack frame for perf_arch_fetch_caller_regs. If it was in C, gcc might or might not create a stack frame for it, which would affect the number of levels we have to skip. With this, we see results from perf record -e lock:lock_acquire like this: # Samples: 24878 # # Overhead Command Shared Object Symbol # ........ .............. ................. ...... # 14.99% perf [kernel.kallsyms] [k] ._raw_spin_lock | --- ._raw_spin_lock | |--25.00%-- .alloc_fd | (nil) | | | |--50.00%-- .anon_inode_getfd | | .sys_perf_event_open | | syscall_exit | | syscall | | create_counter | | __cmd_record | | run_builtin | | main | | 0xfd2e704 | | 0xfd2e8c0 | | (nil) ... etc. Signed-off-by: Paul Mackerras Acked-by: Benjamin Herrenschmidt Cc: anton@samba.org Cc: linuxppc-dev@ozlabs.org Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20100318050513.GA6575@drongo> Signed-off-by: Ingo Molnar commit 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd Author: Heiko Carstens Date: Mon Mar 15 00:35:05 2010 -0400 memory hotplug/s390: set phys_device Implement arch specific arch_get_memory_phys_device function and initialize phys_device for each memory section. That way we finally can tell which piece of memory belongs to which physical device. This makes s390's /sys/devices/system/memory/memoryX/phys_device display the correct thing? Signed-off-by: Heiko Carstens Cc: Dave Hansen Cc: Gerald Schaefer Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc32df00894f0e1dbf583cc3dab210d2969b078a Author: Heiko Carstens Date: Mon Mar 15 00:35:03 2010 -0400 memory hotplug: allow setting of phys_device /sys/devices/system/memory/memoryX/phys_device is supposed to contain the number of the physical device that the corresponding piece of memory belongs to. In case a physical device should be replaced or taken offline for whatever reason it is necessary to set all corresponding memory pieces offline. The current implementation always sets phys_device to '0' and there is no way or hook to change that. Seems like there was a plan to implement that but it wasn't finished for whatever reason. So add a weak function which architectures can override to actually set the phys_device from within add_memory_block(). Signed-off-by: Heiko Carstens Cc: Dave Hansen Cc: Gerald Schaefer Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d6151115aee73825c1752aff7cd09adfece839 Author: Akinobu Mita Date: Mon Mar 15 00:35:01 2010 -0400 hpet: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Clemens Ladisch Cc: Bob Picco Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4af96449e20f9245cf3d904098db508cdebcda8 Author: Akinobu Mita Date: Mon Mar 15 00:35:00 2010 -0400 ntfs: use bitmap_weight Use bitmap_weight() instead of doing hweight32() for each u32 element in the page. Signed-off-by: Akinobu Mita Cc: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc54e2a6d8e93ff83ec398511930b0a73e19151 Author: Venkatesh Pallipadi Date: Mon Mar 15 00:34:59 2010 -0400 jffs2: fix up rb_root initializations to use RB_ROOT jffs2 uses rb_node = NULL; to zero rb_root. The problem with this is that 17d9ddc72fb8bba0d4f678 ("rbtree: Add support for augmented rbtrees") in the linux-next tree adds a new field to that struct which needs to be NULL as well. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd. Signed-off-by: Venkatesh Pallipadi Cc: Eric Paris Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9e58a4ec3b1086d1ed8c915311aef1ae55454fd Author: KAMEZAWA Hiroyuki Date: Mon Mar 15 00:34:57 2010 -0400 memcg: avoid use cmpxchg in swap cgroup maintainance swap_cgroup uses 2bytes data and uses cmpxchg in a new operation. 2byte cmpxchg/xchg is not available on some archs. This patch replaces cmpxchg/xchg with operations under lock. Signed-off-by: KAMEZAWA Hiroyuki Reported-by: Sachin Sant wrote: Acked-by: Balbir Singh Acked-by: Daisuke Nishimura Cc: Li Zefan Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8301b91ba0b2d15c86fdf5357efe7c04eb767a6e Author: Clemens Ladisch Date: Wed Mar 17 11:07:55 2010 +0100 firewire: ohci: add cycle timer quirk for the TI TSB12LV22 Among the many entries in the TSB12LV22 errata list (TI literature number SLLS312) is the following: PCI Slave reads of the Cycle Timer register may occasionally get an incorrect value. Software may be able to validate value by reading the register multiple times rapidly and evaluating for a reasonable difference. Signed-off-by: Clemens Ladisch (untested) Signed-off-by: Stefan Richter (added #define) commit 22001a13d09d82772e831dcdac0553994a4bac5d Author: Tilman Schmidt Date: Wed Mar 17 14:22:07 2010 -0700 gigaset: fix build failure Update the dummy LL interface to the LL interface change introduced by commit daab433c03c15fd642c71c94eb51bdd3f32602c8. This fixes the build failure occurring after that commit when enabling ISDN_DRV_GIGASET but neither ISDN_I4L nor ISDN_CAPI. Impact: bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 535297a6ae4c3b7a0562e71fac15c213eeec68e7 Author: Michael S. Tsirkin Date: Wed Mar 17 16:06:11 2010 +0200 vhost: fix error handling in vring ioctls Stanse found a locking problem in vhost_set_vring: several returns from VHOST_SET_VRING_KICK, VHOST_SET_VRING_CALL, VHOST_SET_VRING_ERR with the vq->mutex held. Fix these up. Reported-by: Jiri Slaby Acked-by: Laurent Chavey Signed-off-by: Michael S. Tsirkin commit 915a428e43acfd05e4ffeaf40549b0cf163eebe2 Author: Dan Carpenter Date: Sat Mar 6 14:05:39 2010 +0300 drm/i915: fix small leak on overlay error path We should free "params" before returning. Signed-off-by: Dan Carpenter Reviewed-by: Daniel Vetter Cc: stable@kernel.org (for .33) Signed-off-by: Eric Anholt commit 1f2b10131f83f7caa67bf1273cec126b4283015d Author: Chris Wilson Date: Fri Mar 12 19:52:55 2010 +0000 drm/i915: Avoid NULL deref in get_pages() unwind after error. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=15527 NULL pointer dereference in i915_gem_object_save_bit_17_swizzle BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] i915_gem_object_save_bit_17_swizzle+0x5b/0xc0 [i915] Call Trace: [] ? i915_gem_object_put_pages+0x125/0x150 [i915] [] ? i915_gem_object_get_pages+0xf1/0x110 [i915] [] ? i915_gem_object_bind_to_gtt+0xb8/0x2a0 [i915] [] ? drm_mm_get_block_generic+0x4d/0x180 [] ? i915_gem_mmap_gtt_ioctl+0x16d/0x240 [i915] [] ? i915_gem_madvise_ioctl+0x86/0x120 [i915] Signed-off-by: Chris Wilson Reported-by: maciej.rutecki@gmail.com Cc: stable@kernel.org Reviewed-by: Eric Anholt Signed-off-by: Eric Anholt commit 59f2d0fc4bdfbbfabfa3715ba17d0609e5964c7e Author: Zhenyu Wang Date: Tue Mar 9 23:37:07 2010 +0800 drm/i915: Fix check with IS_GEN6 IS_GEN6 missed to include SandyBridge mobile chip, which failed in i915_probe_agp() for memory config detection. Fix it with a device info flag. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 76e47c30bdc591815eeb5598f1e2a243a30bd585 Author: Joe Perches Date: Thu Mar 11 14:01:38 2010 -0800 drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Cc: Dave Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: Andrew Morton [anholt: whacked it to wrap to 80 columns instead] Signed-off-by: Eric Anholt commit 71cf39b117d5aa817a4693f4478397e6b04bee25 Author: Eric Anholt Date: Mon Mar 8 23:41:55 2010 -0800 drm/i915: Enable VS timer dispatch. This could resolve HW deadlocks where a unit downstream of the VS is waiting for more input, the VS has one vertex queued up but not dispatched because it hopes to get one more vertex for 2x4 dispatch, and software isn't handing more vertices down because it's waiting for rendering to complete. The B-Spec says you should always have this bit set. Signed-off-by: Eric Anholt commit 4967790112b284f276c5065dc724f7340a2fd7a5 Author: Priit Laes Date: Tue Mar 2 11:37:00 2010 +0200 drm/i915: Rename FBC_C3_IDLE to FBC_CTL_C3_IDLE to match other registers Signed-off-by: Priit Laes Signed-off-by: Eric Anholt commit 5d9391628e8eb3b0830697697a95bfd0c3c35b9e Author: Owain G. Ainsworth Date: Wed Mar 3 05:34:29 2010 +0000 drm/i915: remove an unnecessary wait_request() The continue just after this call with loop around and wait for the request just added just fine. This leads to slightly more compact code. Signed-Off-by: Owain G. Ainsworth Signed-off-by: Eric Anholt commit f05dd2f09cac422c423dae8f9b8e2be13df05a8f Author: Eric Anholt Date: Fri Feb 26 13:32:11 2010 -0800 drm/i915: Don't bother with the BKL for GEM ioctls. We probably don't need it for most of the other driver ioctls as well, but we explicitly did locking when doing the GEM pieces. On CPU-bound graphics tasks, the BKL was showing up as 1-2% of CPU time. Signed-off-by: Eric Anholt commit 5db5b0215af94a36d4bf10900ff9707b6d5c1610 Author: Shane Huang Date: Tue Mar 16 18:08:55 2010 +0800 ahci: pp->active_link is not reliable when FBS is enabled pp->active_link is not reliable when FBS is enabled. Both PORT_SCR_ACT and PORT_CMD_ISSUE should be checked because mixed NCQ and non-NCQ commands may be in flight. Signed-off-by: Shane Huang Signed-off-by: Jeff Garzik commit fcefd25ac89239cb57fa198f125a79ff85468c75 Author: Mark Fasheh Date: Mon Mar 15 15:39:00 2010 -0700 ocfs2: set i_mode on disk during acl operations ocfs2_set_acl() and ocfs2_init_acl() were setting i_mode on the in-memory inode, but never setting it on the disk copy. Thus, acls were some times not getting propagated between nodes. This patch fixes the issue by adding a helper function ocfs2_acl_set_mode() which does this the right way. ocfs2_set_acl() and ocfs2_init_acl() are then updated to call ocfs2_acl_set_mode(). Signed-off-by: Mark Fasheh Signed-off-by: Joel Becker commit 6527f8f848ec84b9daf1cb07601266126b8507ab Author: Tao Ma Date: Wed Mar 10 09:56:52 2010 +0800 ocfs2: Update i_blocks in reflink operations. In reflink, we need to upate i_blocks for the target inode. Reported-by: Jie Liu Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 78c37eb0d5e6a9727b12ea0f1821795ffaa66cfe Author: Tao Ma Date: Wed Mar 3 11:26:27 2010 +0800 ocfs2: Change bg_chain check for ocfs2_validate_gd_parent. In ocfs2_validate_gd_parent, we check bg_chain against the cl_next_free_rec of the dinode. Actually in resize, we have the chance of bg_chain == cl_next_free_rec. So add some additional condition check for it. I also rename paramter "clean_error" to "resize", since the old one is not clearly enough to indicate that we should only meet with this case in resize. btw, the correpsonding bug is http://oss.oracle.com/bugzilla/show_bug.cgi?id=1230. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit ee860b6a650360c91f5d5f9a94262aad9be90015 Author: Sachin Prabhu Date: Wed Mar 10 10:28:40 2010 -0500 [PATCH] Skip check for mandatory locks when unlocking ocfs2_lock() will skip locks on file which has mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. ocfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Joel Becker commit 9deb343189b3cf45e84dd08480f330575ffe2004 Author: Tejun Heo Date: Tue Mar 16 09:50:26 2010 +0900 ahci: use BIOS date in broken_suspend list HP is recycling both DMI_PRODUCT_NAME and DMI_BIOS_VERSION making ahci_broken_suspend() trigger for later products which are not affected by the original problems. Match BIOS date instead of version and add references to bko's so that full information can be found easier later. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=15462 Signed-off-by: Tejun Heo Reported-by: tigerfishdaisy@gmail.com Signed-off-by: Jeff Garzik commit 603037c3d1a42d5013f035355a2c60b0006a9fdf Author: Tejun Heo Date: Thu Mar 11 11:37:16 2010 +0900 ahci: add missing nv IDs bko#15481 shows that we're missing some NVIDIA ahci PCI IDs. Peer Chen confirms that IDs 0x580-0x58f are reserved for cases where Linux ID option is selected in the BIOS and are only used for mcp65-73. Add 0x0581-0x058f. http://bugzilla.kernel.org/show_bug.cgi?id=15481 Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit dadf28a10c3eb29421837a2e413ab869ebd9e168 Author: Alexey Starikovskiy Date: Wed Mar 17 13:14:13 2010 -0400 ACPI: EC: Allow multibyte access to EC http://bugzilla.kernel.org/show_bug.cgi?id=14667 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 0e255572121180c900e24e33b87047abd8153cce Author: Michael S. Tsirkin Date: Mon Mar 8 23:24:22 2010 +0200 vhost: fix interrupt mitigation with raw sockets A thinko in code means we never trigger interrupt mitigation. Fix this. Reported-by: Juan Quintela Reported-by: Unai Uribarri Signed-off-by: Michael S. Tsirkin commit dcd5c1662db59a6b82942f47fb6ac9dd63f6d3dd Author: Frederic Weisbecker Date: Tue Mar 16 01:05:02 2010 +0100 perf: Fix unexported generic perf_arch_fetch_caller_regs perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should not have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! -v2: And also only build it if trace events are enabled. -v3: Fix changelog mistake Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Xiao Guangrong Cc: Paul Mackerras LKML-Reference: <1268697902-9518-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 8bc037fb89bb3104b9ae290d18c877624cd7d9cc Author: KOSAKI Motohiro Date: Wed Mar 17 09:36:58 2010 +0900 sched: Use proper type in sched_getaffinity() Using the proper type fixes the following compiler warning: kernel/sched.c:4850: warning: comparison of distinct pointer types lacks a cast Signed-off-by: KOSAKI Motohiro Cc: torvalds@linux-foundation.org Cc: travis@sgi.com Cc: peterz@infradead.org Cc: drepper@redhat.com Cc: rja@sgi.com Cc: sharyath@in.ibm.com Cc: steiner@sgi.com LKML-Reference: <20100317090046.4C79.A69D9226@jp.fujitsu.com> Signed-off-by: Ingo Molnar commit e04dd2d21bb70dd707d569d4ac843149b9acfb27 Merge: 2a5e00e 572c0e3 Author: Takashi Iwai Date: Wed Mar 17 09:01:38 2010 +0100 Merge branch 'fix/hda' into for-linus commit 2a5e00ed14e27908dae698900473a65cc53ccd82 Merge: 0e49887 fb40b49 Author: Takashi Iwai Date: Wed Mar 17 09:01:33 2010 +0100 Merge branch 'fix/misc' into for-linus commit 9d296cfa69b3d4abc9d556986d544f0727988eed Author: Kumar Gala Date: Tue Mar 16 23:39:56 2010 -0500 powerpc/fsl-booke: Get coherent bit from PTE We shouldn't be always setting 'M' in the TLB entry since its reasonable for somethings to be mapped non-coherent. The PTE should have 'M' set properly. Signed-off-by: Kumar Gala commit d6ccb1f55ddf5146219707c0e71b85e3a52179b4 Author: Kumar Gala Date: Wed Mar 10 23:33:25 2010 -0600 powerpc/85xx: Make sure lwarx hint isn't set on ppc32 e500v1/v2 based chips will treat any reserved field being set in an opcode as illegal. Thus always setting the hint in the opcode is a bad idea. Anton should be kept away from the powerpc opcode map. Signed-off-by: Kumar Gala commit 00909e955125e90a6ebb34671c56c4c851e62951 Author: Arnaldo Carvalho de Melo Date: Tue Mar 16 18:28:46 2010 -0300 perf top: Add missing initialization to zero The dso_short_width has to start as zero, as we're calculating the maximum short DSO name length, somehow I missed this one. Reported-by: Frédéric Weisbecker Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268774926-27488-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f04e879bf296d136bcafd8c5a26e95599b141671 Author: David S. Miller Date: Tue Mar 16 14:40:42 2010 -0700 sunxvr1000: Add missing FB=y depenency. Signed-off-by: David S. Miller commit 87faf3ccf1c939938600ab57c6c9ed5bd2e5f4cc Author: David S. Miller Date: Tue Mar 16 14:37:47 2010 -0700 bridge: Make first arg to deliver_clone const. Otherwise we get a warning from the call in br_forward(). Signed-off-by: David S. Miller commit 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 21:51:18 2010 +0000 bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping. Without CONFIG_BRIDGE_IGMP_SNOOPING, BR_INPUT_SKB_CB(skb)->mrouters_only is not appropriately initialized, so we can see garbage. A clear option to fix this is to set it even without that config, but we cannot optimize out the branch. Let's introduce a macro that returns value of mrouters_only and let it return 0 without CONFIG_BRIDGE_IGMP_SNOOPING. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 858a18a6a2f74e8f0e5b2e9671d4b74694aba708 Author: Vitaliy Gusev Date: Tue Mar 16 01:07:51 2010 +0000 route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() Call rt_secret_rebuild can cause BUG_ON(timer_pending(&net->ipv4.rt_secret_timer)) in add_timer as there is not any synchronization for call rt_secret_rebuild_oneshot() for the same net namespace. Also this issue affects to rt_secret_reschedule(). Thus use mod_timer enstead. Signed-off-by: Vitaliy Gusev Acked-by: Neil Horman Signed-off-by: David S. Miller commit 8440853bb70010f2f8edc26cb0f7af60da8b2c5a Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 19:26:56 2010 +0000 bridge br_multicast: Fix skb leakage in error path. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0ba8c9ec25465cd0680b80c0f5836f558e3b972d Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 19:27:00 2010 +0000 bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 21edbb223ed2af88b090e7945af7d91d672e3aa6 Author: Jiri Slaby Date: Tue Mar 16 05:29:54 2010 +0000 NET: netpoll, fix potential NULL ptr dereference Stanse found that one error path in netpoll_setup dereferences npinfo even though it is NULL. Avoid that by adding new label and go to that instead. Signed-off-by: Jiri Slaby Cc: Daniel Borkmann Cc: David S. Miller Acked-by: chavey@google.com Acked-by: Matt Mackall Signed-off-by: David S. Miller commit a2f46ee1ba5ee249ce2ca1ee7a7a0ac46529fb4f Author: Neil Horman Date: Tue Mar 16 08:14:33 2010 +0000 tipc: fix lockdep warning on address assignment So in the forward porting of various tipc packages, I was constantly getting this lockdep warning everytime I used tipc-config to set a network address for the protocol: [ INFO: possible circular locking dependency detected ] 2.6.33 #1 tipc-config/1326 is trying to acquire lock: (ref_table_lock){+.-...}, at: [] tipc_ref_discard+0x53/0xd4 [tipc] but task is already holding lock: (&(&entry->lock)->rlock#2){+.-...}, at: [] tipc_ref_lock+0x43/0x63 [tipc] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&(&entry->lock)->rlock#2){+.-...}: [] __lock_acquire+0xb67/0xd0f [] lock_acquire+0xdc/0x102 [] _raw_spin_lock_bh+0x3b/0x6e [] tipc_ref_acquire+0xe8/0x11b [tipc] [] tipc_createport_raw+0x78/0x1b9 [tipc] [] tipc_createport+0x8b/0x125 [tipc] [] tipc_subscr_start+0xce/0x126 [tipc] [] process_signal_queue+0x47/0x7d [tipc] [] tasklet_action+0x8c/0xf4 [] __do_softirq+0xf8/0x1cd [] call_softirq+0x1c/0x30 [] _local_bh_enable_ip+0xb8/0xd7 [] local_bh_enable_ip+0xe/0x10 [] _raw_spin_unlock_bh+0x34/0x39 [] spin_unlock_bh.clone.0+0x15/0x17 [tipc] [] tipc_k_signal+0x8d/0xb1 [tipc] [] tipc_core_start+0x8a/0xad [tipc] [] 0xffffffffa01b1087 [] do_one_initcall+0x72/0x18a [] sys_init_module+0xd8/0x23a [] system_call_fastpath+0x16/0x1b -> #0 (ref_table_lock){+.-...}: [] __lock_acquire+0xa11/0xd0f [] lock_acquire+0xdc/0x102 [] _raw_write_lock_bh+0x3b/0x6e [] tipc_ref_discard+0x53/0xd4 [tipc] [] tipc_deleteport+0x40/0x119 [tipc] [] release+0xeb/0x137 [tipc] [] sock_release+0x1f/0x6f [] sock_close+0x27/0x2b [] __fput+0x12a/0x1df [] fput+0x1a/0x1c [] filp_close+0x68/0x72 [] sys_close+0xad/0xe7 [] system_call_fastpath+0x16/0x1b Finally decided I should fix this. Its a straightforward inversion, tipc_ref_acquire takes two locks in this order: ref_table_lock entry->lock while tipc_deleteport takes them in this order: entry->lock (via tipc_port_lock()) ref_table_lock (via tipc_ref_discard()) when the same entry is referenced, we get the above warning. The fix is equally straightforward. Theres no real relation between the entry->lock and the ref_table_lock (they just are needed at the same time), so move the entry->lock aquisition in tipc_ref_acquire down, after we unlock ref_table_lock (this is safe since the ref_table_lock guards changes to the reference table, and we've already claimed a slot there. I've tested the below fix and confirmed that it clears up the lockdep issue Signed-off-by: Neil Horman CC: Allan Stephens Signed-off-by: David S. Miller commit c3259c8a7060d480e8eb2166da0a99d6879146b4 Author: James Chapman Date: Tue Mar 16 06:29:20 2010 +0000 l2tp: Fix UDP socket reference count bugs in the pppol2tp driver This patch fixes UDP socket refcnt bugs in the pppol2tp driver. A bug can cause a kernel stack trace when a tunnel socket is closed. A way to reproduce the issue is to prepare the UDP socket for L2TP (by opening a tunnel pppol2tp socket) and then close it before any L2TP sessions are added to it. The sequence is Create UDP socket Create tunnel pppol2tp socket to prepare UDP socket for L2TP pppol2tp_connect: session_id=0, peer_session_id=0 L2TP SCCRP control frame received (tunnel_id==0) pppol2tp_recv_core: sock_hold() pppol2tp_recv_core: sock_put L2TP ZLB control frame received (tunnel_id=nnn) pppol2tp_recv_core: sock_hold() pppol2tp_recv_core: sock_put Close tunnel management socket pppol2tp_release: session_id=0, peer_session_id=0 Close UDP socket udp_lib_close: BUG The addition of sock_hold() in pppol2tp_connect() solves the problem. For data frames, two sock_put() calls were added to plug a refcnt leak per received data frame. The ref that is grabbed at the top of pppol2tp_recv_core() must always be released, but this wasn't done for accepted data frames or data frames discarded because of bad UDP checksums. This leak meant that any UDP socket that had passed L2TP data traffic (i.e. L2TP data frames, not just L2TP control frames) using pppol2tp would not be released by the kernel. WARNING: at include/net/sock.h:435 udp_lib_unhash+0x117/0x120() Pid: 1086, comm: openl2tpd Not tainted 2.6.33-rc1 #8 Call Trace: [] ? udp_lib_unhash+0x117/0x120 [] ? warn_slowpath_common+0x71/0xd0 [] ? udp_lib_unhash+0x117/0x120 [] ? warn_slowpath_null+0x13/0x20 [] ? udp_lib_unhash+0x117/0x120 [] ? sk_common_release+0x17/0x90 [] ? inet_release+0x33/0x60 [] ? sock_release+0x10/0x60 [] ? sock_close+0xf/0x30 [] ? __fput+0x52/0x150 [] ? filp_close+0x3e/0x70 [] ? put_files_struct+0x62/0xb0 [] ? do_exit+0x5e7/0x650 [] ? mntput_no_expire+0x13/0x70 [] ? filp_close+0x3e/0x70 [] ? do_group_exit+0x2a/0x70 [] ? sys_exit_group+0x11/0x20 [] ? sysenter_do_call+0x12/0x26 Signed-off-by: James Chapman Signed-off-by: David S. Miller commit db443c441e204cecc1bcec490d40997db988ce3a Author: Steve Glendinning Date: Tue Mar 16 09:03:06 2010 +0000 smsc95xx: wait for PHY to complete reset during init This patch ensures the PHY correctly completes its reset before setting register values. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 3feec9095d12e311b7d4eb7fe7e5dfa75d4a72a5 Author: James Chapman Date: Tue Mar 16 06:46:31 2010 +0000 l2tp: Fix oops in pppol2tp_xmit When transmitting L2TP frames, we derive the outgoing interface's UDP checksum hardware assist capabilities from the tunnel dst dev. This can sometimes be NULL, especially when routing protocols are used and routing changes occur. This patch just checks for NULL dst or dev pointers when checking for netdev hardware assist features. BUG: unable to handle kernel NULL pointer dereference at 0000000c IP: [] pppol2tp_xmit+0x341/0x4da [pppol2tp] *pde = 00000000 Oops: 0000 [#1] SMP last sysfs file: /sys/class/net/lo/operstate Modules linked in: pppol2tp pppox ppp_generic slhc ipv6 dummy loop snd_hda_codec_atihdmi snd_hda_intel snd_hda_codec snd_pcm snd_timer snd soundcore snd_page_alloc evdev psmouse serio_raw processor button i2c_piix4 i2c_core ati_agp agpgart pcspkr ext3 jbd mbcache sd_mod ide_pci_generic atiixp ide_core ahci ata_generic floppy ehci_hcd ohci_hcd libata e1000e scsi_mod usbcore nls_base thermal fan thermal_sys [last unloaded: scsi_wait_scan] Pid: 0, comm: swapper Not tainted (2.6.32.8 #1) EIP: 0060:[] EFLAGS: 00010297 CPU: 3 EIP is at pppol2tp_xmit+0x341/0x4da [pppol2tp] EAX: 00000000 EBX: f64d1680 ECX: 000005b9 EDX: 00000000 ESI: f6b91850 EDI: f64d16ac EBP: f6a0c4c0 ESP: f70a9cac DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process swapper (pid: 0, ti=f70a8000 task=f70a31c0 task.ti=f70a8000) Stack: 000005a9 000005b9 f734c400 f66652c0 f7352e00 f67dc800 00000000 f6b91800 <0> 000005a3 f70ef6c4 f67dcda9 000005a3 f89b192e 00000246 000005a3 f64d1680 <0> f63633e0 f6363320 f64d1680 f65a7320 f65a7364 f65856c0 f64d1680 f679f02f Call Trace: [] ? ppp_push+0x459/0x50e [ppp_generic] [] ? ppp_xmit_process+0x3b6/0x430 [ppp_generic] [] ? ppp_start_xmit+0x10d/0x120 [ppp_generic] [] ? dev_hard_start_xmit+0x21f/0x2b2 [] ? sch_direct_xmit+0x48/0x10e [] ? dev_queue_xmit+0x263/0x3a6 [] ? ip_finish_output+0x1f7/0x221 [] ? ip_forward_finish+0x2e/0x30 [] ? ip_rcv_finish+0x295/0x2a9 [] ? netif_receive_skb+0x3e9/0x404 [] ? e1000_clean_rx_irq+0x253/0x2fc [e1000e] [] ? e1000_clean+0x63/0x1fc [e1000e] [] ? sched_clock_local+0x15/0x11b [] ? net_rx_action+0x96/0x195 [] ? __do_softirq+0xaa/0x151 [] ? do_softirq+0x31/0x3c [] ? irq_exit+0x26/0x58 [] ? do_IRQ+0x78/0x89 [] ? common_interrupt+0x29/0x30 [] ? native_safe_halt+0x2/0x3 [] ? default_idle+0x55/0x75 [] ? c1e_idle+0xd2/0xd5 [] ? cpu_idle+0x46/0x62 Code: 8d 45 08 f0 ff 45 08 89 6b 08 c7 43 68 7e fb 9c f8 8a 45 24 83 e0 0c 3c 04 75 09 80 63 64 f3 e9 b4 00 00 00 8b 43 18 8b 4c 24 04 <8b> 40 0c 8d 79 11 f6 40 44 0e 8a 43 64 75 51 6a 00 8b 4c 24 08 EIP: [] pppol2tp_xmit+0x341/0x4da [pppol2tp] SS:ESP 0068:f70a9cac CR2: 000000000000000c Signed-off-by: James Chapman Signed-off-by: David S. Miller commit d0cad871703b898a442e4049c532ec39168e5b57 Author: Steve Glendinning Date: Tue Mar 16 08:46:46 2010 +0000 smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver This patch adds a driver for SMSC's LAN7500 family of USB 2.0 to gigabit ethernet adapters. It's loosely based on the smsc95xx driver but the device registers for LAN7500 are completely different. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit c5e49fb5189dbce00bc37f27c83ab0f9e4748bc6 Author: Atsushi Nemoto Date: Tue Mar 16 05:27:40 2010 +0000 ne: Do not use slashes in irq name string This patch fixes following warning introduced by commit 12bac0d9f4dbf3445a0319beee848d15fa32775e ("proc: warn on non-existing proc entries"): WARNING: at /work/mips-linux/make/linux/fs/proc/generic.c:316 __xlate_proc_name+0xe0/0xe8() name 'RBHMA4X00/RTL8019' Signed-off-by: Atsushi Nemoto Signed-off-by: David S. Miller commit edee39321be9f88c47627379e8abadfce0508768 Author: Jiri Slaby Date: Tue Mar 16 04:53:50 2010 +0000 NET: ksz884x, fix lock imbalance Stanse found that one error path (when alloc_skb fails) in netdev_tx omits to unlock hw_priv->hwlock. Fix that. Signed-off-by: Jiri Slaby Cc: Tristram Ha Cc: David S. Miller Signed-off-by: David S. Miller commit 6ad34145cf809384359fe513481d6e16638a57a3 Author: Tilman Schmidt Date: Tue Mar 16 07:04:01 2010 +0000 gigaset: correct range checking off by one error Correct a potential array overrun due to an off by one error in the range check on the CAPI CONNECT_REQ CIPValue parameter. Found and reported by Dan Carpenter using smatch. Impact: bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit e8c3753ce4cd6a805ebcfdb3aa6d30e6f4b8b3e0 Author: Dave Chinner Date: Mon Mar 15 02:36:35 2010 +0000 xfs: don't warn about page discards on shutdown If we are doing a forced shutdown, we can get lots of noise about delalloc pages being discarded. This is happens by design during a forced shutdown, so don't spam the logs with these messages. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8a262e573d30187b32b5534ec489446931239cc5 Author: Alex Elder Date: Tue Mar 16 18:55:56 2010 +0000 xfs: use scalable vmap API Re-apply a commit that had been reverted due to regressions that have since been fixed. From 95f8e302c04c0b0c6de35ab399a5551605eeb006 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Tue, 6 Jan 2009 14:43:09 +1100 Implement XFS's large buffer support with the new vmap APIs. See the vmap rewrite (db64fe02) for some numbers. The biggest improvement that comes from using the new APIs is avoiding the global KVA allocation lock on every call. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy Only modifications here were a minor reformat, plus making the patch apply given the new use of xfs_buf_is_vmapped(). Modified-by: Alex Elder Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit cd9640a70d542ca026a812ac34733799da0a39c9 Author: Alex Elder Date: Tue Mar 16 18:55:54 2010 +0000 xfs: remove old vmap cache Re-apply a commit that had been reverted due to regressions that have since been fixed. Original commit: d2859751cd0bf586941ffa7308635a293f943c17 Author: Nick Piggin Date: Tue, 6 Jan 2009 14:40:44 +1100 XFS's vmap batching simply defers a number (up to 64) of vunmaps, and keeps track of them in a list. To purge the batch, it just goes through the list and calls vunamp on each one. This is pretty poor: a global TLB flush is generally still performed on each vunmap, with the most expensive parts of the operation being the broadcast IPIs and locking involved in the SMP callouts, and the locking involved in the vmap management -- none of these are avoided by just batching up the calls. I'm actually surprised it ever made much difference. (Now that the lazy vmap allocator is upstream, this description is not quite right, but the vunmap batching still doesn't seem to do much). Rip all this logic out of XFS completely. I will improve vmap performance and scalability directly in subsequent patch. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy The only change I made was to use the "new" xfs_buf_is_vmapped() function in a place it had been open-coded in the original. Modified-by: Alex Elder Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 14b5d6dd40b3091cb5f566568baa4a74dc619286 Author: Florian Fainelli Date: Wed Mar 10 18:32:18 2010 +0100 leds: Fix race between LED device uevent and actual attributes creation If we were to dynamically register/unregister leds and have udev or other daemons handle the leds class uevents, we would be notified of the adding of a new LED and if the daemon immediately tries to open one of the attributes of the led device, it would fail with a "no such file or directory" error since this the attributes are not yet created. Fix this by switching attributes to be class-wide, such that the driver core will register these attributes with device_add_attrs and then emit the kobject_uevent ADD signal. Signed-off-by: Fainelli Signed-off-by: Richard Purdie commit ec57af9c2ece22ae6234189972105d777ff5f939 Author: Bruno Prémont Date: Fri Feb 26 13:20:10 2010 +0100 backlight: panasonic-laptop - Fix incomplete registration failure handling Properly return backlight registration error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Acked-by: Harald Welte (registration failure) Signed-off-by: Richard Purdie commit 28d85873cd6d8d3176e30e02b941b1329df1024c Author: Bruno Prémont Date: Fri Feb 26 13:17:16 2010 +0100 backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling Properly return backlight registration error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Reviewed-by: Anisse Astier Signed-off-by: Richard Purdie commit fa11de0a33e214a00e205494c27fb5a7bb71a5fa Author: Bruno Prémont Date: Fri Feb 26 13:04:54 2010 +0100 backlight: blackfin - Fix missing registration failure handling Check newly registered backlight_device for error and properly return error to parent Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Acked-by: Mike Frysinger (constify struct backlight_ops) Signed-off-by: Richard Purdie commit f0af78991363d704694a3618b638662c97d8a110 Author: Bruno Prémont Date: Fri Feb 26 12:59:39 2010 +0100 backlight: classmate-laptop - Fix missing registration failure handling Check newly registered backlight_device for error and properly return error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Signed-off-by: Richard Purdie commit 36bc5ee6a8d13333980fa54e97d3469d3d4cda98 Author: Evan McClain Date: Tue Mar 9 19:20:58 2010 -0500 backlight: mbp_nvidia_bl - add five more MacBook variants This adds the MacBook 1,1 2,1 3,1 4,1 and 4,2 to the DMI tables. Signed-off-by: Evan McClain Signed-off-by: Richard Purdie commit 0493a4ff10959ff4c8e0d65efee25b7ffd4fa5db Author: Anton Vorontsov Date: Thu Mar 11 13:58:47 2010 -0800 leds-gpio: fix default state handling on OF platforms The driver wrongly sets default state for LEDs that don't specify default-state property. Currently the driver handles default state this way: memset(&led, 0, sizeof(led)); for_each_child_of_node(np, child) { state = of_get_property(child, "default-state", NULL); if (state) { if (!strcmp(state, "keep")) led.default_state = LEDS_GPIO_DEFSTATE_KEEP; ... } ret = create_gpio_led(&led, ...); } Which means that all LEDs that do not specify default-state will inherit the last value of the default-state property, which is wrong. This patch fixes the issue by moving LED's template initialization into the loop body. Signed-off-by: Anton Vorontsov Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 72dcd8d08aca4ac6154dc37243880ee306c7ea73 Author: Bob Rodgers Date: Wed Feb 17 15:23:31 2010 -0600 leds: Add Dell Business Class Netbook LED driver This patch adds an LED driver to support the Dell Activity LED on the Dell Latitude 2100 netbook and future products to come. The Activity LED is visible externally in the lid so classroom instructors can observe it from a distance. The driver uses the sysfs led_class and provides a standard LED interface. Signed-off by: Bob Rodgers Signed-off-by: Louis Davis Signed-off-by: Jim Dailey , Developers Acked-by: Matthew Garrett Acked-by: Dmitry Torokhov Signed-off-by: Richard Purdie commit d09e16664be88dc8463fe7508a2123460bf6d676 Author: H Hartley Sweeten Date: Wed Jan 20 16:08:30 2010 -0700 leds: Kconfig cleanup Remove the need for "depends on LEDS_CLASS" by wrapping the affected config options in an if/endif block. Similar for "depends on LEDS_TRIGGERS". LEDS_COBALT_RAQ still has a "depends on LEDS_CLASS=y" since it cannot be selected to build as a module. Signed-off-by: H Hartley Sweeten Signed-off-by: Richard Purdie commit bb9b6ef70f08f256ab4b8ec127c17ee629b85350 Author: H Hartley Sweeten Date: Wed Jan 6 15:34:55 2010 -0700 leds: led-class.c - Quiet boot messages As each led device gets registered a kernel message gets printed. In an embedded system with a number of leds this can produce a lot of output that just looks like noise. Change the message type to KERN_DEBUG since it might be useful in the dmesg output "after" booting. Signed-off-by: H Hartley Sweeten Signed-off-by: Richard Purdie commit 5e89a3484dea8a3d962f83fe497d064fbcde4e55 Author: Márton Németh Date: Sun Jan 10 01:11:03 2010 +0100 leds: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make pci_device_id also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Signed-off-by: Richard Purdie commit 936034026280facd7050c96c3b28339f28b09cdd Author: Daniel Mack Date: Sun Jan 10 13:27:54 2010 +0100 leds: ALIX2: Add dependency to !GPIO_CS5335 The ALIX2 LED driver and the CS5535 GPIO drivers share the same I/O range which causes a conflict if they're both enabled. Fix this for now by adding Kconfig dependencies. While at it, also drop the EXPERIMENTAL flag, as the code has been around for awhile already. Note that this is a hack. At some point, a real platform support for this board should be added which handles the LEDs via the leds-gpio driver. Signed-off-by: Daniel Mack Signed-off-by: Richard Purdie commit a19a6ee6cad2b20292a774c2f56ba8039b0fac9c Author: Matthew Garrett Date: Wed Feb 17 16:39:44 2010 -0500 backlight: Allow properties to be passed at registration Values such as max_brightness should be set before backlights are registered, but the current API doesn't allow that. Add a parameter to backlight_device_register and update drivers to ensure that they set this correctly. Signed-off-by: Matthew Garrett Signed-off-by: Richard Purdie commit 57e148b6a975980944f4466ccb669b1d02dfc6a1 Author: Bruno Prémont Date: Sun Feb 21 00:20:01 2010 +0100 backlight: Add backlight_device parameter to check_fb check_fb from backlight_ops lacks a reference to the backlight_device that's being referred to. Add this parameter so a backlight_device can be mapped to a single framebuffer, especially if the same driver handles multiple devices on a single system. Signed-off-by: Bruno Prémont Signed-off-by: Richard Purdie commit a4ebb780e194e8751dc22deeabcddd3fdc8f18f0 Author: Jiri Slaby Date: Tue Feb 2 14:44:50 2010 -0800 video: backlight/progear, fix pci device refcounting Stanse found an ommitted pci_dev_puts on error path in progearbl_probe. pmu_dev and sb_dev are gotten, but never put when backlight_device_register fails. So unify fail paths and put the devs when the failure occurs. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit c3cf2e44d3bbc694eccef33b0f2fe8e2d89baae7 Author: Alberto Panizzo Date: Tue Jan 19 09:30:50 2010 +0100 backlight: l4f00242t03: Fix module licence absence. Signed-off-by: Alberto Panizzo Signed-off-by: Richard Purdie commit b4144e4f6e3b448d322095ca08af393682a69e33 Author: Richard Purdie Date: Mon Jan 18 14:16:07 2010 +0000 backlight: Revert some const qualifiers 9905a43b2d563e6f89e4c63c4278ada03f2ebb14 went a little to far with const qualifiers as there are legitiment cases where the function pointers can change (machine specific setup code for example). Signed-off-by: Richard Purdie commit e7fb9c4ad351a8da7c09e182bd2e7ccd043daf08 Author: Alberto Panizzo Date: Fri Dec 18 16:42:11 2009 +0100 backlight: Add Epson L4F00242T03 LCD driver The Epson LCD L4F00242T03 is mounted on the Freescale i.MX31 PDK board. Based upon Marek Vasut work in l4f00242t03.c, this driver provides basic init and power on/off functionality for this device through the sysfs lcd interface. Unfortunately Datasheet for this device are not available and all the control sequences sent to the display were copied from the freescale driver that in the i.MX31 Linux BSP. As in the i.MX31PDK board the core and io suppliers are voltage regulators, that functionality is embedded here, but not strict. Signed-off-by: Alberto Panizzo Signed-off-by: Richard Purdie commit 7fde62bffb576d384ea49a3aed3403d5609ee5bc Author: Chris Mason Date: Tue Mar 16 15:40:10 2010 -0400 Btrfs: buffer results in the space_info ioctl The space_info ioctl was using copy_to_user inside rcu_read_lock. This commit changes things to copy into a buffer first and then dump the result down to userland. Signed-off-by: Chris Mason commit c8406ea8fa1adde8dc5400127281d497bbcdb84a Author: Adel Gadllah Date: Sun Mar 14 19:16:25 2010 +0100 iwlwifi: Silence tfds_in_queue message Commit a239a8b47cc0e5e6d7416a89f340beac06d5edaa introduced a noisy message, that fills up the log very fast. The error seems not to be fatal (the connection is stable and performance is ok), so make it IWL_DEBUG_TX rather than IWL_ERR. Signed-off-by: Adel Gadllah Cc: stable@kernel.org Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit 4fdec031b9169b3c17938b9c4168f099f457169c Author: Felix Fietkau Date: Fri Mar 12 04:02:43 2010 +0100 ath9k: fix BUG_ON triggered by PAE frames When I initially stumbled upon sequence number problems with PAE frames in ath9k, I submitted a patch to remove all special cases for PAE frames and let them go through the normal transmit path. Out of concern about crypto incompatibility issues, this change was merged instead: commit 6c8afef551fef87a3bf24f8a74c69a7f2f72fc82 Author: Sujith Date: Tue Feb 9 10:07:00 2010 +0530 ath9k: Fix sequence numbers for PAE frames After a lot of testing, I'm able to reliably trigger a driver crash on rekeying with current versions with this change in place. It seems that the driver does not support sending out regular MPDUs with the same TID while an A-MPDU session is active. This leads to duplicate entries in the TID Tx buffer, which hits the following BUG_ON in ath_tx_addto_baw(): index = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno); cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1); BUG_ON(tid->tx_buf[cindex] != NULL); I believe until we actually have a reproducible case of an incompatibility with another AP using no PAE special cases, we should simply get rid of this mess. This patch completely fixes my crash issues in STA mode and makes it stay connected without throughput drops or connectivity issues even when the AP is configured to a very short group rekey interval. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 3f60ebc9d6291863652d564bacc430629271e6a9 Author: Grazvydas Ignotas Date: Thu Mar 11 17:45:26 2010 +0200 wl1251: fix potential crash In case debugfs does not init for some reason (or is disabled on older kernels) driver does not allocate stats.fw_stats structure, but tries to clear it later and trips on a NULL pointer: Unable to handle kernel NULL pointer dereference at virtual address 00000000 PC is at __memzero+0x24/0x80 Backtrace: [] (wl1251_debugfs_reset+0x0/0x30 [wl1251]) [] (wl1251_op_stop+0x0/0x12c [wl1251]) [] (ieee80211_stop_device+0x0/0x74 [mac80211]) [] (ieee80211_stop+0x0/0x4ac [mac80211]) [] (dev_close+0x0/0xb4) [] (dev_change_flags+0x0/0x184) [] (devinet_ioctl+0x0/0x704) [] (inet_ioctl+0x0/0x100) Add a NULL pointer check to fix this. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Cc: stable@kernel.org Signed-off-by: John W. Linville commit ce769a2904bf5a9110ef534a7702397e38e2b3e9 Author: Sage Weil Date: Tue Mar 16 00:02:26 2010 +0000 Btrfs: use __u64 types in ioctl.h Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit 854d2c3531e6d32e76b94ca5e096ea54c7497e40 Author: Sage Weil Date: Tue Mar 16 00:02:25 2010 +0000 Btrfs: fix search_ioctl key advance key->type is u8, not u64. fs/btrfs/ioctl.c: In function 'copy_to_sk': fs/btrfs/ioctl.c:1024: warning: comparison is always true due to limited range of data type Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit 4e06e240dcbb803433ee31bfe89a3e785a77cd3b Author: Jiri Slaby Date: Tue Mar 16 15:57:44 2010 +0100 PCMCIA: resource, fix lock imbalance Stanse found that one error path (when alloc_skb fails) in netdev_tx omits to unlock hw_priv->hwlock. Fix that by moving away from unlock in each fail path. Unlock at one place instead. Introduced in 94a819f80297e1f635a7cde4ed5317612e512ba7 (pcmcia: assert locking to struct pcmcia_device) Signed-off-by: Jiri Slaby Signed-off-by: Dominik Brodowski commit e639ba481b76e445df354acd6e29d859a9b1657f Author: Bruno Prémont Date: Mon Mar 15 19:00:27 2010 +0100 HID: avoid '\0' in hid debugfs events file When dumping /sys/kernel/debug/hid/$device/events '\0' characters show up (invisible if cat to console but shown by less or while looking at a dump file). These are due to hid_debug_event() adding strlen()+1 bytes to the ring buffer (e.g. including the trailing '\0'). Any roll-over causes a '\0' as well as hid_debug_event() handles the ring buffers with HID_DEBUG_BUFSIZE-1 size while hid_debug_events_read() handles it with full HID_DEBUG_BUFSIZE size. Signed-off-by: Bruno Prémont Signed-off-by: Jiri Kosina commit ff30a0543e9a6cd732582063e7cae951cdb7acf2 Author: Jan Beulich Date: Mon Mar 15 10:11:15 2010 +0000 x86: Fix placement of FIX_OHCI1394_BASE Ever for 32-bit with sufficiently high NR_CPUS, and starting with commit 789d03f584484af85dbdc64935270c8e45f36ef7 also for 64-bit, the statically allocated early fixmap page tables were not covering FIX_OHCI1394_BASE, leading to a boot time crash when "ohci1394_dma=early" was used. Despite this entry not being a permanently used one, it needs to be moved into the permanent range since it has to be close to FIX_DBGP_BASE and FIX_EARLYCON_MEM_BASE. Reported-bisected-and-tested-by: Justin P. Mattock Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=14487 Signed-off-by: Jan Beulich Cc: # [as far back as long as it still applies] LKML-Reference: <4B9E15D30200007800034D23@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit c890692bf37671b5b78a1870d55d6d87e1c8a509 Author: Andrew Morton Date: Thu Mar 11 14:08:43 2010 -0800 kernel/sched.c: Suppress unused var warning On UP: kernel/sched.c: In function 'wake_up_new_task': kernel/sched.c:2631: warning: unused variable 'cpu' Signed-off-by: Andrew Morton Cc: Peter Zijlstra Signed-off-by: Ingo Molnar commit 7f5b774275df8c76a959eae7488128b637fcbfc8 Author: Lai Jiangshan Date: Tue Mar 16 17:00:29 2010 +0800 rcu: Fix tracepoints & lockdep false positive tracepoint.h uses rcu_dereference(), which triggers this warning: [ 0.701161] =================================================== [ 0.702211] [ INFO: suspicious rcu_dereference_check() usage. ] [ 0.702716] --------------------------------------------------- [ 0.703203] include/trace/events/workqueue.h:68 invoked rcu_dereference_check() without protection! [ 0.703971] [ 0.703990] other info that might help us debug this: [ 0.703993] [ 0.705590] [ 0.705604] rcu_scheduler_active = 1, debug_locks = 0 [ 0.706712] 1 lock held by swapper/1: [ 0.707229] #0: (cpu_add_remove_lock){+.+.+.}, at: [] cpu_maps_update_begin+0x14/0x20 [ 0.710097] [ 0.710106] stack backtrace: [ 0.712602] Pid: 1, comm: swapper Not tainted 2.6.34-rc1-tip-01613-g72662bb #168 [ 0.713231] Call Trace: [ 0.713997] [] lockdep_rcu_dereference+0x9d/0xb0 [ 0.714746] [] create_workqueue_thread+0x107/0x110 [ 0.715353] [] ? worker_thread+0x0/0x340 [ 0.715845] [] __create_workqueue_key+0x138/0x240 [ 0.716427] [] ? cpu_maps_update_done+0x12/0x20 [ 0.717012] [] init_workqueues+0x6f/0x80 [ 0.717530] [] kernel_init+0x102/0x1f0 [ 0.717570] [] ? kernel_init+0x0/0x1f0 [ 0.718944] [] kernel_thread_helper+0x6/0x10 Signed-off-by: Lai Jiangshan Cc: Paul E. McKenney Cc: Mathieu Desnoyers Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <4B9F48AD.4000404@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit d0cb4260f899d07462d49fc67e29f2438dbaca2f Author: Masami Hiramatsu Date: Mon Mar 15 13:02:35 2010 -0400 perf probe: Use original address instead of CU-based address Use original address for looking up the location of variables for dwarf_getlocation_addr() instead of CU-based address. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100315170235.31852.91195.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 67c7ff7c56f38a8ab338fbbfe366621ce6303ba1 Author: Masami Hiramatsu Date: Mon Mar 15 13:02:28 2010 -0400 perf probe: Fix offset to allow signed value Fix dereference offset to intmax_t from uintmax_t, because it can have negative values (for example local variable's offset from frame pointer). Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100315170228.31852.71946.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit e3818b8dce2a934cd1521dbc4827e5238d8f45d8 Author: Paul E. McKenney Date: Mon Mar 15 17:03:43 2010 -0700 rcu: Make rcu_read_lock_bh_held() allow for disabled BH Disabling BH can stand in for rcu_read_lock_bh(), and this patch updates rcu_read_lock_bh_held() to allow for this. In order to avoid include-file hell, this function is moved out of line to kernel/rcupdate.c. This fixes a false positive RCU warning. Reported-by: Arnd Bergmann Reported-by: Eric Dumazet Signed-off-by: Paul E. McKenney Acked-by: Lai Jiangshan Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <20100316000343.GA25857@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit b63be8d7beda7fe5879559be6f70f8e1c93109e4 Author: Arnaldo Carvalho de Melo Date: Mon Mar 15 15:03:50 2010 -0300 perf top: Improve the autosizing of column lenghts When profiling C++ workloads the symbol name length can be really big, so cap it before it garbles the result. This builds upon the autosizing already present where we choose to use the short, basename of DSOs instead of its long, full pathname. Reported-by: Pavel Krauz Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268676230-9261-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 6404fccafa3bfdc0602130a87f4d93baf928bea4 Author: David S. Miller Date: Tue Mar 16 01:00:17 2010 -0700 MAINTAINERS: Add entry for sparc serial drivers. Signed-off-by: David S. Miller commit 910ac735bad53ce54741a72a5b19ab69794ae069 Author: Li Zefan Date: Tue Mar 16 08:57:15 2010 +0100 block: make CONFIG_BLK_CGROUP visible Make the config visible, so we can choose from CONFIG_BLK_CGROUP=y and CONFIG_BLK_CGROUP=m when CONFIG_IOSCHED_CFQ=m. Signed-off-by: Li Zefan Signed-off-by: Jens Axboe commit 97fedbbe1046b3118f49df249840ca21041eefe4 Author: NeilBrown Date: Tue Mar 16 08:55:32 2010 +0100 Remove GENHD_FL_DRIVERFS This flag is not used, so best discarded. Signed-off-by: NeilBrown -- Hi Jens, I came across this recently - these are the only two occurances of "GENHD_FL_DRIVERFS" in the kernel, so it cannot be needed. NeilBrown Signed-off-by: Jens Axboe commit 935050daad4c0ce687f7111995ed7791796deff9 Author: Julia Lawall Date: Tue Mar 16 00:33:37 2010 -0700 drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields From: Julia Lawall SAB82532_ISR0_TCD is declared in drivers/serial/subsab.h as relating to a status register, while SAB82532_IMR0_TCD is declared in the same file as relating to a mask register. The latter seems more appropriate for the interrupt_mask0 field, and follows the strategy for initializing this field elsewhere in the same file. Both SAB82532_ISR0_TCD and SAB82532_IMR0_TCD have the same value. Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 7f7708f0055e49e331f267700aa8b2ee879f004c Author: Michael Braun Date: Tue Mar 16 00:26:22 2010 -0700 bridge: Fix br_forward crash in promiscuous mode From: Michael Braun bridge: Fix br_forward crash in promiscuous mode It's a linux-next kernel from 2010-03-12 on an x86 system and it OOPs in the bridge module in br_pass_frame_up (called by br_handle_frame_finish) because brdev cannot be dereferenced (its set to a non-null value). Adding some BUG_ON statements revealed that BR_INPUT_SKB_CB(skb)->brdev == br-dev (as set in br_handle_frame_finish first) only holds until br_forward is called. The next call to br_pass_frame_up then fails. Digging deeper it seems that br_forward either frees the skb or passes it to NF_HOOK which will in turn take care of freeing the skb. The same is holds for br_pass_frame_ip. So it seems as if two independent skb allocations are required. As far as I can see, commit b33084be192ee1e347d98bb5c9e38a53d98d35e2 ("bridge: Avoid unnecessary clone on forward path") removed skb duplication and so likely causes this crash. This crash does not happen on 2.6.33. I've therefore modified br_forward the same way br_flood has been modified so that the skb is not freed if skb0 is going to be used and I can confirm that the attached patch resolves the issue for me. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fb40b496ad8bbe60a60c25eb2fce20f3cc114679 Author: Dan Carpenter Date: Tue Mar 16 09:46:23 2010 +0300 sound: sequencer: clean up remove bogus check A few lines earlier bend is limited to 2399. So semitones is always less than 24 here. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit a9104f989916aac5d92bfa2c51915d5985fb2e6c Merge: ad6cfc2 89c0ac7 Author: Takashi Iwai Date: Tue Mar 16 07:50:49 2010 +0100 Merge branch 'topic/misc' into fix/misc commit 572c0e3c73341755f3e7dfaaef6b26df12bd709c Author: Daniel T Chen Date: Sun Mar 14 23:44:03 2010 -0400 ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212 BugLink: https://bugs.launchpad.net/bugs/538895 The OR has verified that both position_fix=1 and model=6stack-dig are necessary to have capture function properly. (The existing 3stack-6ch model quirk seems to be incorrect.) Reported-by: Reuben Bailey Tested-by: Reuben Bailey Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 627a2d3c29427637f4c5d31ccc7fcbd8d312cd71 Author: NeilBrown Date: Mon Mar 8 16:44:38 2010 +1100 md: deal with merge_bvec_fn in component devices better. If a component device has a merge_bvec_fn then as we never call it we must ensure we never need to. Currently this is done by setting max_sector to 1 PAGE, however this does not stop a bio being created with several sub-page iovecs that would violate the merge_bvec_fn. So instead set max_segments to 1 and set the segment boundary to the same as a page boundary to ensure there is only ever one single-page segment of IO requested at a time. This can particularly be an issue when 'xen' is used as it is known to submit multiple small buffers in a single bio. Signed-off-by: NeilBrown Cc: stable@kernel.org commit 36e9e1eab777e077f7484d309ff676d0568e27d1 Author: Suresh Siddha Date: Mon Mar 15 14:33:06 2010 -0800 x86: Handle legacy PIC interrupts on all the cpu's Ingo Molnar reported that with the recent changes of not statically blocking IRQ0_VECTOR..IRQ15_VECTOR's on all the cpu's, broke an AMD platform (with Nvidia chipset) boot when "noapic" boot option is used. On this platform, legacy PIC interrupts are getting delivered to all the cpu's instead of just the boot cpu. Thus not initializing the vector to irq mapping for the legacy irq's resulted in not handling certain interrupts causing boot hang. Fix this by initializing the vector to irq mapping on all the logical cpu's, if the legacy IRQ is handled by the legacy PIC. Reported-by: Ingo Molnar Signed-off-by: Suresh Siddha [ -v2: io-apic-enabled improvement ] Acked-by: Yinghai Lu Cc: Eric W. Biederman LKML-Reference: <1268692386.3296.43.camel@sbs-t61.sc.intel.com> Signed-off-by: Ingo Molnar commit 0821ec55bb1382dd3b9476dc15d5dbbb19f0c3fd Author: Herbert Xu Date: Mon Mar 15 20:38:25 2010 -0700 bridge: Move NULL mdb check into br_mdb_ip_get Since all callers of br_mdb_ip_get need to check whether the hash table is NULL, this patch moves the check into the function. This fixes the two callers (query/leave handler) that didn't check it. Reported-by: Michael Braun Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d00561a2f64b381aefb41f4a140ff5dc373b52e7 Author: Lars Ellenberg Date: Mon Mar 15 19:09:28 2010 -0700 ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe A few subdevice IDs seem to have been dropped when hfc_multi was included upstream, just compare the list at http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175 with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c Added PCIe 2 Port card and LED settings (same as PCI) Do not use /KKe Signed-off-by: Lars Ellenberg Signed-off-by: Karsten Keil Signed-off-by: David S. Miller commit 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 Merge: d14a0eb a3d3203 Author: David S. Miller Date: Mon Mar 15 16:23:54 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 0e17226f7cd289504724466f4298abc9bdfca3fe Author: Ben Dooks Date: Mon Mar 15 23:08:03 2010 +0000 ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362 Commit 4e6d488af37980d224cbf298224db6173673f362 either missed out the following machine files or somehow managed to clash between merges. Fixup the three files missing the second parameter to addruart macro to allow them to build. Fixes the following warnings in arch/arm/kernel/debug.c: arch/arm/kernel/debug.S: Assembler messages: arch/arm/kernel/debug.S:167: Error: too many positional arguments arch/arm/kernel/debug.S:183: Error: too many positional arguments Signed-off-by: Ben Dooks commit d14a0ebda7d3daede1a99c01527affb9ceaa4c22 Author: Gerrit Renker Date: Sun Mar 14 20:13:19 2010 +0000 net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation dccp: fix panic caused by failed initialisation This fixes a kernel panic reported thanks to Andre Noll: if DCCP is compiled into the kernel and any out of the initialisation steps in net/dccp/proto.c:dccp_init() fail, a subsequent attempt to create a SOCK_DCCP socket will panic, since inet{,6}_create() are not prevented from creating DCCP sockets. This patch fixes the problem by propagating a failure in dccp_init() to dccp_v{4,6}_init_net(), and from there to dccp_v{4,6}_init(), so that the DCCP protocol is not made available if its initialisation fails. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit b8d689743106bab5c49dda87080e76aa78db8a56 Author: Dan Carpenter Date: Sun Mar 14 22:24:08 2010 +0000 myri: remove dead code We can never reach the return statement. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 873a69a358a6b393fd8d9d92e193ec8895cac4d7 Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: prune use of tty_buffer_request_room Calling tty_buffer_request_room() before tty_insert_flip_string() is unnecessary, costs CPU and for big buffers can mess up the multi-page allocation avoidance. Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: Alan Cox , stable@kernel.org Signed-off-by: David S. Miller commit 3a0a3a6b92edf181f849ebd8417122392ba73a96 Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: correct clearing of at_state strings on RING In RING handling, clear the table of received parameter strings in a loop like everywhere else, instead of by enumeration which had already gotten out of sync. Impact: minor bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: stable@kernel.org Signed-off-by: David S. Miller commit bc35b4e347c047fb1c665bb761ddb22482539f7f Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: avoid registering CAPI driver more than once Registering/unregistering the Gigaset CAPI driver when a device is connected/disconnected causes an Oops when disconnecting two Gigaset devices in a row, because the same capi_driver structure gets unregistered twice. Fix by making driver registration/unregistration a separate operation (empty in the ISDN4Linux case) called when the main module is loaded/unloaded. Impact: bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: stable@kernel.org Signed-off-by: David S. Miller commit 4d823be98c5b24d94c7f41a384a4bb60d7848ad5 Author: Christoph Egger Date: Thu Mar 11 12:07:54 2010 +0000 obsolete config in kernel source: HSO_AUTOPM CONFIG_HSO_AUTOPM is set by KConfig / set in the Kernel source, makefiles and won't be ever set this way, therefor simply removing the protected code. Signed-off-by: Christoph Egger Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6329da5f258ae752d1f33b549bae4f8a20b6871a Author: Christoph Egger Date: Thu Mar 11 12:07:52 2010 +0000 obsolete config in kernel source: USE_INTERNAL_TIMER CONFIG_USE_INTERNAL_TIMER seems to be the remainings of some experiment. It is explicitely #undef-ed as not working, only referenced from one source file and rather aged. Hereby cleaning it from the kernel tree. Signed-off-by: Christoph Egger Acked-by: Roel Kluin Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d287d66ee460b8d90b9ac840dd37f524a289bf97 Author: Akinobu Mita Date: Thu Mar 11 12:07:50 2010 +0000 atm: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Chas Williams Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a1ca14ac54675d3bf48d442b5a7b9eba133f1888 Author: Akinobu Mita Date: Thu Mar 11 12:07:49 2010 +0000 phonet: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: "David S. Miller" Signed-off-by: Andrew Morton Acked-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit f28f9e43b3d81d1e69da0ebf77c8a6780cb5e0c8 Author: Randy Dunlap Date: Fri Mar 12 19:23:27 2010 +0000 timestamping: fix example build Fix Makefiles so that Documentation/networking/timestamping/timestamping.c will build when using the CONFIG_BUILD_DOCSRC kconfig option. (timestamping.c does not build currently with its simple Makefile.) Also fix printf format warnings. Signed-off-by: Randy Dunlap Cc: Patrick Ohly Signed-off-by: David S. Miller commit 65e543f12cb7f98cb041a759a21685569eec8695 Author: Ben Dooks Date: Mon Mar 15 22:57:18 2010 +0000 ARM: SAMSUNG: Fix build error from stale define in The decleration of error() as static in the platform specific uncompress code in arch/arm/plat-samsung/include/plat/uncomopress.h causes the build of the uncompressor to break. Remove it, as it is no longer needed. arch/arm/boot/compressed/decompress.o: In function `gunzip': /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:67: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:73: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:80: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:95: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:152: undefined reference to `error' Signed-off-by: Ben Dooks commit 876e956f207373f974f2808c36aabcd4e32c9ee4 Author: Julia Lawall Date: Tue Mar 9 11:14:11 2010 +0000 drivers/net: drop redundant memset The region set by the call to memset is immediately overwritten by the subsequent call to memcpy. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression e1,e2,e3,e4; @@ - memset(e1,e2,e3); memcpy(e1,e4,e3); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 255f5c327ec3a1d77fe54ef5773ef5eaf7c35a3e Author: Ian Munsie Date: Thu Mar 11 12:07:25 2010 +0000 i4l: change magic numbers in Eicon DIVA ISDN driver to symbolic names Replace references to the '20' magic number found throughout the Eicon ISDN driver for the length of the station_id field in the T30_INFO struct with the T30_MAX_STATION_ID_LENGTH symbolic constant. Signed-off-by: Ian Munsie Cc: Armin Schindler Cc: Karsten Keil Cc: Stoyan Gaydarov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8b4017d8c191822f1c93744e7876c9020e6209aa Author: Ian Munsie Date: Thu Mar 11 12:07:24 2010 +0000 i4l: silence compiler warnings for array access in Eicon DIVA ISDN driver When compiling this driver, the compiler throws the following warnings: drivers/isdn/hardware/eicon/message.c:8426: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8427: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8434: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8435: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8436: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8447: warning: array subscript is above array bounds This arises from the particular semantics the driver is using to write to the nlc array (static byte[256]). The array has a length in byte 0 followed by a T30_INFO struct starting at byte 1. The T30_INFO struct has a number of variable length strings after the station_id entry, which cannot be explicitly defined in the struct and the driver accesses them with an array index to station_id beyond the length of station_id. This patch merely changes the semantics that the driver uses to access the entries after the station_id entry to use the original 256 byte nlc array taking the offset and length of the station_id entry to calculate where to write in the array, thereby silencing the warning. Signed-off-by: Ian Munsie Cc: Armin Schindler Cc: Karsten Keil Cc: Stoyan Gaydarov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit dec9951b8ad86c591af7b452966bf48b307a4010 Author: Roel Kluin Date: Thu Mar 11 12:07:22 2010 +0000 isdn: misplaced parenthesis in pof_handle_data() The parenthesis was misplaced. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 9baddeb8c6c7faa7da8706ad629f09ca221850c1 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:02 2010 +0000 bnx2x: change smp_mb() comment to conform the true Access to fp->tx_bp_prod is protected by __netif_tx_lock, smp_mb() is not needed for that. Signed-off-by: Stanislaw Gruszka Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0efc22f3afa5d8f070a33fea06162d7d9d518e38 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:01 2010 +0000 bnx2x: remove not necessary compiler barrier Access to fp->tx_bd_prod is protected by __netif_tx_lock, so we do not need any barrier for that. Update of fp->tx_bd_cons in bnx2x_tx_int() is not protected by lock, but barrier() nor smb_mb() in bnx2x_tx_avail() not guarantee we will see values that is written on other cpu. Ordering issues between netif_tx_stop_queue(), netif_tx_queue_stopped(), fp->tx_bd_cons = bd_cons and bnx2x_tx_avail() are already handled by smp_mb() in bnx2x_tx_int() and bnx2x_start_xmit(). Signed-off-by: Stanislaw Gruszka Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2d99cf16f42b1979a2c498bb6d09498dbd689978 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:00 2010 +0000 bnx2x: use smp_mb() to keep ordering of read write operations Since we want to keep ordering of write to fp->bd_tx_cons and netif_tx_queue_stopped(txq), what is read of txq->state, we have to use general memory barrier. Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit d4a2ac3e802d9f598453a7854d0fdf67371ac2dd Author: Ajit Khaparde Date: Thu Mar 11 01:35:59 2010 +0000 be2net: fix mccq create for big endian architectures The request to create an mccq was being dispatched without doing a byte swap of num_pages. This byte swap is necessary for Big Endian systems like PPC. Not having this fix leads mccq create to fail on BE ASICs running newer version of firmware, thereby causing driver initialization failure. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit d4fdcd923daf9d03d2e1b956d66f05c3f2ca4c43 Author: chaithrika@ti.com Date: Wed Mar 10 22:37:56 2010 +0000 TI DaVinci EMAC: Convert to dev_pm_ops Migrate from the legacy PM hooks to use dev_pm_ops structure. Signed-off-by: Chaithrika U S Acked-by: Kevin Hilman Signed-off-by: David S. Miller commit be5bce2bf5cfe021bc6bdff4d49fa18776bc293d Author: Sekhar Nori Date: Tue Mar 9 01:20:37 2010 +0000 net: davinci emac: use dma_{map, unmap}_single API for cache coherency The davinci emac driver uses some ARM specific DMA APIs for cache coherency which have been removed from kernel with the 2.6.34 merge. Modify the driver to use the dma_{map, unmap}_single() APIs defined in dma-mapping.h Without this fix, the driver fails to compile on Linus's tree. Tested on DM365 and OMAP-L138 EVMs. Signed-off-by: Sekhar Nori Acked-by: Kevin Hilman Signed-off-by: David S. Miller commit e79032aa75af76a14e2cdd973b199855e7761881 Author: Vasily Khoruzhick Date: Mon Mar 15 16:27:08 2010 +0200 ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver Reset period_ns and duty_ns values in suspend handler to avoid skip of configuration if same values passed to pwm_config; Restore invertion bit in resume handler. Without this patch PWM works incorrectly after resume from suspend. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 664e87e47e086962a832f9a613a8fd4042a02ac1 Author: Vasily Khoruzhick Date: Sun Mar 14 16:32:28 2010 +0200 ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. Fix compilation issue by moving s3c2440-cpufreq.c into mach-s3c2440 directory Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 211a0d941b1924e667483f822a55e2cc694cd212 Author: David S. Miller Date: Mon Mar 15 15:23:30 2010 -0700 e100: Fix ring parameter change handling regression. When the PCI pool changes were added to fix resume failures: commit 98468efddb101f8a29af974101c17ba513b07be1 e100: Use pci pool to work around GFP_ATOMIC order 5 memory allocation failu and commit 70abc8cb90e679d8519721e2761d8366a18212a6 e100: Fix broken cbs accounting due to missing memset. This introduced a problem that can happen if the TX ring size is increased. We need to size the PCI pool using cbs->max instead of the default cbs->count value. Signed-off-by: David S. Miller commit 0d5e6f7ae8609b944c08e8a2f63f7d169c548134 Author: Russell King Date: Mon Mar 15 22:04:24 2010 +0000 ARM: Fix RiscPC decompressor build errors arch/arm/boot/compressed/decompress.o: In function `do_decompress': decompress.c:(.text+0x26e8): undefined reference to `error' decompress.c:(.text+0x2760): undefined reference to `error' decompress.c:(.text+0x27d8): undefined reference to `error' decompress.c:(.text+0x2824): undefined reference to `error' decompress.c:(.text+0x28f0): undefined reference to `error' Signed-off-by: Russell King commit e6e8ea63f5d745e5a3030eec1964d0429b93107d Author: Sergio Aguirre Date: Mon Mar 1 14:26:45 2010 -0600 omap3: zoom2/3: Register only 1 8250 port There's no more serial ports available, so, doesn't make sense to create 4 device nodes. Signed-off-by: Sergio Aguirre commit fcbcea93abbe361e14dd458d0a5a3e9dadaa5ba9 Author: Sergio Aguirre Date: Mon Mar 1 12:17:15 2010 -0600 omap3: zoom 2/3: Change debugboard serial port id This is now changed to PLAT8250_DEV_PLATFORM (= 0), because it's the only port that's going to be initialized in Zoom 2/3 boards. So, it doesn't make sense to keep the hardcoded 3 value anymore. Signed-off-by: Sergio Aguirre commit 9e265aa7ac493aa0a3de80aa3092d8677b3e8546 Author: Sergio Aguirre Date: Mon Mar 1 11:52:36 2010 -0600 omap3: 3630sdp: Explicitly enable all UARTs All UARTs seem physically reachable, so, enable them all. Signed-off-by: Sergio Aguirre commit 2d7f66104cc9ef508c382c8d6cb1ce6123383350 Author: Sergio Aguirre Date: Mon Mar 1 11:48:26 2010 -0600 omap3: zoom2/3 / 3630sdp: Don't init always all uarts This is useless, since in Zoom2/3 boards, the ports aren't even physically accessible. They must be explicitly initted in the board-zoom2.c, board-zoom3.c and board-3630sdp.c files instead. Signed-off-by: Sergio Aguirre commit 4b1bbd3fd9384ad6ca62903172ccb6a8729dd897 Author: Sergio Aguirre Date: Fri Feb 26 19:58:47 2010 -0600 omap2/3/4: serial: Remove condition for getting uart4_phys This check is invalid, since we haven't filled the omap_revision var at this point. Signed-off-by: Sergio Aguirre commit 10c805eb4f89d44fe4e457d727b59af15c4a4a36 Author: Sergio Aguirre Date: Tue Mar 9 13:22:14 2010 -0600 OMAP3: serial: Use dev_* macros instead of printk As we have a struct device populated at the time we are printing the errors, using dev_* macros makes more sense, as could give a better idea where the error/warning came from. Signed-off-by: Sergio Aguirre commit e88d556dc5f0ef437e3538277a1dd33e5038be77 Author: Sergio Aguirre Date: Sat Feb 27 14:13:43 2010 -0600 OMAP3: serial: Check for zero-based physical addr This is for protecting a wrong mapping attempt of a zero-based physical address. The result is that, no serial port will be attempted to be mapped. Also add an additional protection for NULL clocks before attempting to enable them (if above condition applies) Signed-off-by: Sergio Aguirre commit cfbc0683af235106e7dabe92003870b82ad6f0ba Author: NeilBrown Date: Thu Mar 11 11:20:17 2010 +1100 NFS: ensure bdi_unregister is called on mount failure. bdi_unregister is called by nfs_put_super which is only called by generic_shutdown_super if ->s_root is not NULL. So if we error out in a circumstance where we called nfs_bdi_register (i.e. server != NULL) but have not set s_root, then we need to call bdi_unregister explicitly in nfs_get_sb and various other *_get_sb() functions. Signed-off-by: NeilBrown Signed-off-by: Trond Myklebust commit ccf50e2341c4174d5579315e184ea312081acec6 Author: Russell King Date: Mon Mar 15 19:03:06 2010 +0000 ARM: Fix sorting of platform group config options and includes ... and document the sorting criteria to help future additions. Signed-off-by: Russell King commit 8e4971f2fb2380ce66196136e113d04196b80fcd Author: Anders Grafström Date: Mon Mar 15 16:04:14 2010 +0100 ARM: 5991/1: Fix regression in restore_user_regs macro ARMv5T and earlier require that a ldm {}^ instruction is not followed by an instruction that accesses banked registers. This patch restores the nop that was lost in commit b86040a59feb255a8193173caa4d5199464433d5. Signed-off-by: Anders Grafström Signed-off-by: Russell King commit 8212cf7583a5ba5d213d9c9180be808222a2813f Author: Dan Carpenter Date: Mon Mar 15 11:22:26 2010 +0300 cifs: trivial white space I fixed the indent level. Signed-off-by: Dan Carpenter Signed-off-by: Steve French commit ef5780c018ed169a77b623f87c4ba52faa8ad0fe Author: Nick Piggin Date: Mon Mar 15 11:05:29 2010 -0400 Btrfs: fix gfp flags masking in the compression code GFP_FS must be masked out, NOFS can't be or'd in. Signed-off-by: Chris Mason commit 5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e Author: Chris Mason Date: Mon Mar 15 10:21:30 2010 -0400 Btrfs: don't look at bio flags after submit_bio After callling submit_bio, the bio can be freed at any time. The btrfs submission thread helper was checking the bio flags too late, which might not give the correct answer. When CONFIG_DEBUG_PAGE_ALLOC is turned on, it can lead to oopsen. Signed-off-by: Chris Mason commit a343832f1a55c74791a8a37053fc02ad80640710 Author: Xiao Guangrong Date: Wed Jan 6 11:48:18 2010 +0000 btrfs: using btrfs_stack_device_id() get devid We can use btrfs_stack_device_id() to get dev_item->devid Signed-off-by: Xiao Guangrong Signed-off-by: Chris Mason commit 91748467a5c5884e44ad5cf58630c0c28474f1f6 Author: Akinobu Mita Date: Sun Feb 28 10:59:11 2010 +0000 btrfs: use memparse Use memparse() instead of its own private implementation. Signed-off-by: Akinobu Mita Cc: Chris Mason Cc: linux-btrfs@vger.kernel.org Signed-off-by: Chris Mason commit 1406e4327be3a533a2b18582f715ce2cfbcf6804 Author: Josef Bacik Date: Wed Jan 13 18:19:06 2010 +0000 Btrfs: add a "df" ioctl for btrfs df is a very loaded question in btrfs. This gives us a way to get the per-space usage information so we can tell exactly what is in use where. This will help us figure out ENOSPC problems, and help users better understand where their disk space is going. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 2ac55d41b5d6bf49e76bc85db5431240617e2f8f Author: Josef Bacik Date: Wed Feb 3 19:33:23 2010 +0000 Btrfs: cache the extent state everywhere we possibly can V2 This patch just goes through and fixes everybody that does lock_extent() blah unlock_extent() to use lock_extent_bits() blah unlock_extent_cached() and pass around a extent_state so we only have to do the searches once per function. This gives me about a 3 mb/s boots on my random write test. I have not converted some things, like the relocation and ioctl's, since they aren't heavily used and the relocation stuff is in the middle of being re-written. I also changed the clear_extent_bit() to only unset the cached state if we are clearing EXTENT_LOCKED and related stuff, so we can do things like this lock_extent_bits() clear delalloc bits unlock_extent_cached() without losing our cached state. I tested this thoroughly and turned on LEAK_DEBUG to make sure we weren't leaking extent states, everything worked out fine. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 5a1a3df1f6c86926cfe8657e6f9b4b4c2f467d60 Author: Josef Bacik Date: Tue Feb 2 20:51:14 2010 +0000 Btrfs: cache ordered extent when completing io When finishing io we run btrfs_dec_test_ordered_pending, and then immediately run btrfs_lookup_ordered_extent, but btrfs_dec_test_ordered_pending does that already, so we're searching twice when we don't have to. This patch lets us pass a btrfs_ordered_extent in to btrfs_dec_test_ordered_pending so if we do complete io on that ordered extent we can just use the one we found then instead of having to do another btrfs_lookup_ordered_extent. This made my fio job with the other patch go from 24 mb/s to 29 mb/s. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit c2a128d28a2e78e159e17e8c9274d0a9d9492555 Author: Josef Bacik Date: Tue Feb 2 21:19:11 2010 +0000 Btrfs: cache extent state in find_delalloc_range This patch makes us cache the extent state we find in find_delalloc_range since we'll have to lock the extent later on in the function. This will keep us from re-searching for the rang when we try to lock the extent. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 49958fd7dbb83cd4d65179d025940e01fe1fbacd Author: Josef Bacik Date: Tue Feb 2 21:48:28 2010 +0000 Btrfs: change the ordered tree to use a spinlock instead of a mutex The ordered tree used to need a mutex, but currently all we use it for is to protect the rb_tree, and a spin_lock is just fine for that. Using a spin_lock instead makes dbench run a little faster, 58 mb/s instead of 51 mb/s, and have less latency, 3445.138 ms instead of 3820.633 ms. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 4125bf761cd0786e1163e024c7c809ce2cc625bc Author: Chris Mason Date: Wed Feb 3 18:18:45 2010 +0000 Btrfs: finish read pages in the order they are submitted The endio is done at reverse order of bio vectors. That means for a sequential read, the page first submitted will finish last in a bio. Considering we will do checksum (making cache hot) for every page, this does introduce delay (and chance to squeeze cache used soon) for pages submitted at the begining. I don't observe obvious performance difference with below patch at my simple test, but seems more natural to finish read in the order they are submitted. Signed-off-by: Shaohua Li Signed-off-by: Chris Mason commit 0be2e98173f8badd5ccc7c2e994891746ba1caf4 Author: Miao Xie Date: Thu Feb 11 08:06:58 2010 +0000 btrfs: fix btrfs_mkdir goto for no free objectids btrfs_mkdir() must jump to the place of ending transaction after btrfs_find_free_objectid() failed. Or this transaction can't end. Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 0bdb1db297ab36865a63ee722d35ff0a1f0ae522 Author: Sage Weil Date: Fri Feb 19 14:13:50 2010 -0800 Btrfs: flush data on snapshot creation Flush any delalloc extents when we create a snapshot, so that recently written file data is always included in the snapshot. A later commit will add the ability to snapshot without the flush, but most people expect flushing. Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit bd4d10888990f7e3f8029205d27eb155202d6969 Author: Josef Bacik Date: Fri Mar 5 21:59:21 2010 +0000 Btrfs: make df be a little bit more understandable The way we report df usage is way confusing for everybody, including some other utilities (bacula for one). So this patch makes df a little bit more understandable. First we make used actually count the total amount of used space in all space info's. This will give us a real view of how much disk space is in use. Second, for blocks available, only count data space. This makes things like bacula work because it says 0 when you can no longer write anymore data to the disk. I think this is a nice compromise, since you will end up with something like the following [root@alpha ~]# df -h Filesystem Size Used Avail Use% Mounted on /dev/mapper/VolGroup-lv_root 148G 30G 111G 21% / /dev/sda1 194M 116M 68M 64% /boot tmpfs 985M 12K 985M 1% /dev/shm /dev/mapper/VolGroup-LogVol02 145G 140G 0 100% /mnt/btrfs-test Compare this with btrfsctl -i output [root@alpha btrfs-progs-unstable]# ./btrfsctl -i /mnt/btrfs-test/ Metadata, DUP: total=4.62GB, used=2.46GB System, DUP: total=8.00MB, used=24.00KB Data: total=134.80GB, used=134.80GB Metadata: total=8.00MB, used=0.00 System: total=4.00MB, used=0.00 operation complete This way we show that there is no more data space to be used, but we have another 5GB of space left for metadata. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 3a0524dc054791688177544fe510d2868ee20d9f Author: TARUISI Hiroaki Date: Tue Feb 9 06:36:45 2010 +0000 btrfs: Update existing btrfs_device for renaming device When we scan devices in a multi-device filesystem, we memorize the original name. If the device gets a new name, later scans don't update the in-kernel structures related to it, and we're not able to mount the filesystem. This patch updates device name during scaning. Signed-off-by: TARUISI Hiroaki Signed-off-by: Chris Mason commit 1e701a3292e25a6c4939cad9f24951dc6b6ad853 Author: Chris Mason Date: Thu Mar 11 09:42:04 2010 -0500 Btrfs: add new defrag-range ioctl. The btrfs defrag ioctl was limited to doing the entire file. This commit adds a new interface that can defrag a specific range inside the file. It can also force compression on the file, allowing you to selectively compress individual files after they were created, even when mount -o compress isn't turned on. Signed-off-by: Chris Mason commit 940100a4a7b78b27e60a3e72340fb9b5397dcdb2 Author: Chris Mason Date: Wed Mar 10 10:52:59 2010 -0500 Btrfs: be more selective in the defrag ioctl The btrfs defrag ioctl had some bugs around delalloc accounting, and it wasn't properly skipping pages that were not in the mapping. It wasn't properly clearing the page checked flag, which could make the writeback code ignore the page forever while pinning it as dirty. This commit fixes those problems and makes defrag a little smarter. It skips holes and it doesn't waste time defragging large extents. If a tiny extent comes before a very large extent, it will defrag both of them to make sure the tiny extent ends up next to something big. Signed-off-by: Chris Mason commit 51684082b11c304829ea22193d4d96a5b1663b97 Author: Chris Mason Date: Wed Mar 10 15:33:32 2010 -0500 Btrfs: run the backing dev more often in the submit_bio helper The submit_bio helper thread can decide to loop back around to service more bios. This commit forces it to unplug first, which helps reduce the latency seen by submitters. Signed-off-by: Chris Mason commit 4849f01d153be0f52b8191ee1be0ce492aa96811 Author: Josef Bacik Date: Mon Dec 14 19:18:38 2009 +0000 Btrfs: make subvolid=0 mount the original default root Since theres not a good way to make sure the user sees the original default root tree id, and not to mention it's 5 so is way different than any other volume, just make subvol=0 mount the original default root. This makes it a bit easier for users to handle in the long run. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 6ef5ed0d386be5c43ec66d6f2999919c0893558b Author: Josef Bacik Date: Fri Dec 11 21:11:29 2009 +0000 Btrfs: add ioctl and incompat flag to set the default mount subvol This patch needs to go along with my previous patch. This lets us set the default dir item's location to whatever root we want to use as our default mounting subvol. With this we don't have to use mount -o subvol= anymore to mount a different subvol, we can just set the new one and it will just magically work. I've done some moderate testing with this, mostly just switching the default mount around, mounting subvols and the default mount at the same time and such, everything seems to work. Thanks, Older kernels would generally be able to still mount the filesystem with the default subvolume set, but it would result in a different volume being mounted, which could be an even more unpleasant suprise for users. So if you set your default subvolume, you can't go back to older kernels. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 73f73415caddbc01d9f10c03e0a677d5b3d11569 Author: Josef Bacik Date: Fri Dec 4 17:38:27 2009 +0000 Btrfs: change how we mount subvolumes This work is in preperation for being able to set a different root as the default mounting root. There is currently a problem with how we mount subvolumes. We cannot currently mount a subvolume of a subvolume, you can only mount subvolumes/snapshots of the default subvolume. So say you take a snapshot of the default subvolume and call it snap1, and then take a snapshot of snap1 and call it snap2, so now you have / /snap1 /snap1/snap2 as your available volumes. Currently you can only mount / and /snap1, you cannot mount /snap1/snap2. To fix this problem instead of passing subvolid= you must pass in subvolid=, where is the tree id that gets spit out via the subvolume listing you get from the subvolume listing patches (btrfs filesystem list). This allows us to mount /, /snap1 and /snap1/snap2 as the root volume. In addition to the above, we also now read the default dir item in the tree root to get the root key that it points to. For now this just points at what has always been the default subvolme, but later on I plan to change it to point at whatever root you want to be the new default root, so you can just set the default mount and not have to mount with -o subvolid=. I tested this out with the above scenario and it worked perfectly. Thanks, mount -o subvol operates inside the selected subvolid. For example: mount -o subvol=snap1,subvolid=256 /dev/xxx /mnt /mnt will have the snap1 directory for the subvolume with id 256. mount -o subvol=snap /dev/xxx /mnt /mnt will be the snap directory of whatever the default subvolume is. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 12534832cb7b0abc7369298246e8b7af03b863ca Author: Josef Bacik Date: Thu Dec 17 21:32:27 2009 +0000 Btrfs: make set/get functions for the super compat_ro flags use compat_ro Our set/get functions for compat_ro_flags actually look at compat_flags. This will mess any attempt to use compat flags up. The fix is obvious. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit ac8e9819d71f907a0532b01b22c26b56bbbcbd21 Author: Chris Mason Date: Sun Feb 28 15:39:26 2010 -0500 Btrfs: add search and inode lookup ioctls The search ioctl is a generic tool for doing btree searches from userland applications. The first user of the search ioctl is a subvolume listing feature, but we'll also use it to find new files in a subvolume. The search ioctl allows you to specify min and max keys to search for, along with min and max transid. It returns the items along with a header that includes the item key. Signed-off-by: Chris Mason commit 98d377a0894e6bcca44eafd4d2eee74e8af4db83 Author: TARUISI Hiroaki Date: Wed Nov 18 05:42:14 2009 +0000 Btrfs: add a function to lookup a directory path by following backrefs This will be used by the inode lookup ioctl. Signed-off-by: TARUISI Hiroaki Signed-off-by: Chris Mason commit 80c43ed724797627d8f86855248c497a6161a214 Author: Takashi Iwai Date: Mon Mar 15 15:51:53 2010 +0100 ALSA: hda - Disable MSI for Nvidia controller Judging from the member of enable_msi white-list, Nvidia controller seems to cause troubles with MSI enabled, e.g. boot hang up or other serious issue may come up. It's safer to disable MSI as default for Nvidia controllers again for now. Signed-off-by: Takashi Iwai Cc: commit 5d8614cc5d6c5c02b7995ed97303481d4e3a8cc7 Author: Will Deacon Date: Fri Mar 12 11:03:58 2010 +0100 ARM: 5989/1: ARM: KGDB: add support for SMP platforms To support SMP platforms, KGDB requires the architecture backend to implement the kgdb_roundup_cpus function. This patch, taken against 2.6.33, implements the function for ARM based on the MIPS port. Cc: Jason Wessel Cc: Jean-Michel Hautbois Cc: KGDB Mailing List Signed-off-by: Will Deacon Signed-off-by: Russell King commit 75216859d96f66856a0ee78c2de5b02115ff65f3 Author: Sascha Hauer Date: Mon Mar 15 15:14:50 2010 +0100 ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush This got broken with commit 0e056f20 Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit b89ebadc3421f8ff85030768ec14144794984877 Author: Russell King Date: Mon Mar 15 14:29:22 2010 +0000 ARM: Add final piece to fix XIP decompressor in read-only memory This defines STATIC_RW_DATA, which prevents the read/write malloc management data being declared with a static attribute. Signed-off-by: Russell King commit 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 Merge: 3f17522 7278a22 Author: Russell King Date: Mon Mar 15 14:27:06 2010 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 commit e794c01b7de40d180417eacbd910e8f31f2fafeb Author: Dan Carpenter Date: Mon Mar 15 11:25:10 2010 +0300 pcmcia: add important if statement There was a problem introduced in Jul 2008 by: 0e6f9d270840 pcmcia: use pcmcia_loop_config in scsi pcmcia drivers Signed-off-by: Dan Carpenter Signed-off-by: Dominik Brodowski commit 0d3a940de51c47a3d6322537c8dce925db755477 Author: Jens Künzer Date: Sat Mar 6 08:27:22 2010 +0100 pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary As the PCI irq pin of the ti1130 pcmcia bridge is not connected (at least on some old IBM Thinkpad 760ED notebooks), the Cardbus IRQ has to be routed to an ISA irq. Part 3 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message, cleanup] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit ba8819e991ac507fcbfa080eacdff3e7eea4dc03 Author: Jens Künzer Date: Sat Mar 6 08:02:24 2010 +0100 pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket cb_irq is presumed to be the same as the pci_dev's irq. This won't be true any more as soon as we allow the ISA irq to be used for Cardbus devices. Therefore, use the pci_dev's irq explicitely whenever we care about it. Part 2 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit 28ca8dd71fc170090edca62cb8129625d01b7760 Author: Jens Künzer Date: Sat Mar 6 07:46:16 2010 +0100 pcmcia: honor saved flags in yenta_socket's I365_CSCINT register Instead of overwriting the I365_CSCINT register, save the old value and merely change the bits we care about. Part 1 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit b416cd8efb6ce2661f8f98f603972f0b8f796ee4 Author: Dominik Brodowski Date: Tue Mar 9 17:17:36 2010 +0100 pcmcia: revert "irq probe can be done without risking an IRQ storm" This reverts commit 635416ef393e8cec5a89fc6c1de710ee9596a51e. The argument passed to request_irq() only affects action->flags (IRQF_*), but IRQ_NOAUTOEN relates to desc->status. Reported-by: Jan Beulich CC: Alan Cox Signed-off-by: Dominik Brodowski commit 7a96e87d6e58a07235a2bc3eff9b093af4937a72 Author: Dominik Brodowski Date: Sat Mar 13 17:42:39 2010 +0100 pcmcia: pd6729, i82092: use parent (PCI) resources A newly added parent resource entry for the root PCI bus, such as 40000000-ffffffff : PCI Bus #00 means that the pd6729 and i82092 drivers cannot allocate iomem as freely as before, unless they do so as PCI devices. Therefore, set socket->cb_dev so that rsrc_nonstatic.c does the right thing. Reported-by: Komuro Signed-off-by: Dominik Brodowski commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc Author: Yoichi Yuasa Date: Wed Mar 10 15:57:56 2010 +0900 pcmcia/vrc4171: use local spinlock for device local lock. struct pcmcia_socket lock had been used before. Signed-off-by: Yoichi Yuasa Signed-off-by: Dominik Brodowski commit cf36df6bfb49fd265a39f676bfc9718029fef160 Author: Clemens Ladisch Date: Mon Mar 15 13:20:32 2010 +0100 firewire: core: fw_iso_resource_manage: fix error handling If the bandwidth allocation fails, the error must be returned in *channel regardless of whether the channel allocation succeeded. Checking for c >= 0 is not correct if no channel allocation was requested, in which case this part of the code is reached with c == -EINVAL. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit c77a5710b7e23847bfdb81fcaa10b585f65c960a Author: Martin K. Petersen Date: Wed Mar 10 00:48:33 2010 -0500 block: Export max number of segments and max segment size in sysfs These two values are useful when debugging issues surrounding maximum I/O size. Put them in sysfs with the rest of the queue limits. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit ee714f2dd33e726346e34f5cda12543162f4753e Author: Martin K. Petersen Date: Wed Mar 10 00:48:32 2010 -0500 block: Finalize conversion of block limits functions Remove compatibility wrappers and update remaining drivers. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 2cda2728aa1c8c006418a24f867b25e5eb7a32e2 Author: Martin K. Petersen Date: Mon Mar 15 12:46:51 2010 +0100 block: Fix overrun in lcm() and move it to lib lcm() was defined to take integer-sized arguments. The supplied arguments are multiplied, however, causing us to overflow given sufficiently large input. That in turn led to incorrect optimal I/O size reporting in some cases (RAID over RAID). Switch lcm() over to unsigned long similar to gcd() and move the function from blk-settings.c to lib. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 8871d54b5e1558bd59baad02eb7a80f86d49f4a1 Author: Tomi Valkeinen Date: Thu Mar 4 17:52:43 2010 +0200 OMAP: DSS2: panel-generic: re-implement mode changing Mode changing code was left out with the DSS driver remodeling. Add the code back. Signed-off-by: Tomi Valkeinen commit ce619e1fb86d68f125e0e6d10a5484f67a6d97b3 Author: Tomi Valkeinen Date: Fri Mar 12 12:46:05 2010 +0200 OMAP: DSS2: initialize dss clk sources properly Clk sources were not initialized, leading to kernel crash, or possibly to strange behaviour if DSI was compiled in. Signed-off-by: Tomi Valkeinen commit b43f6e5e258d67acae5961896d10bbe38c271070 Author: Anisse Astier Date: Wed Mar 10 19:17:46 2010 +0100 ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 This should make the speakers and jack detection work on MSI all-in-one computers NetOn AP1900 and Wind Top AE2220. Signed-off-by: Anisse Astier Cc: Signed-off-by: Takashi Iwai commit 9c4cc0bdede1c39bde60a0d5d9251aac71fbe719 Author: Takashi Iwai Date: Mon Mar 15 09:07:52 2010 +0100 ALSA: hda - Fix secondary ADC of ALC260 basic model Fix adc_nids[] for ALC260 basic model to match with num_adc_nids. Otherwise you get an invalid NID in the secondary "Input Source" mixer element. Signed-off-by: Takashi Iwai Cc: commit 28d1a85e136985982448b2f9b1342bae85ad1c98 Author: Takashi Iwai Date: Mon Mar 15 09:05:46 2010 +0100 ALSA: hda - Add an error message for invalid mapping NID Add an error message to snd_hda_add_nid() for invalid mapping NID to make easier to hunt the buggy code. Also added a missing space to the error message in snd_hda_build_controls() Signed-off-by: Takashi Iwai commit c602c8ad45d6ee6ad91fc544513cc96f70790983 Author: Vitaliy Kulikov Date: Mon Mar 15 09:01:26 2010 +0100 ALSA: hda - New Intel HDA controller Added a PCI controller id on new Dell laptops. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit cd3d8031eb4311e516329aee03c79a08333141f1 Author: KOSAKI Motohiro Date: Fri Mar 12 16:15:36 2010 +0900 sched: sched_getaffinity(): Allow less than NR_CPUS length [ Note, this commit changes the syscall ABI for > 1024 CPUs systems. ] Recently, some distro decided to use NR_CPUS=4096 for mysterious reasons. Unfortunately, glibc sched interface has the following definition: # define __CPU_SETSIZE 1024 # define __NCPUBITS (8 * sizeof (__cpu_mask)) typedef unsigned long int __cpu_mask; typedef struct { __cpu_mask __bits[__CPU_SETSIZE / __NCPUBITS]; } cpu_set_t; It mean, if NR_CPUS is bigger than 1024, cpu_set_t makes an ABI issue ... More recently, Sharyathi Nagesh reported following test program makes misterious syscall failure: ----------------------------------------------------------------------- #define _GNU_SOURCE #include #include #include int main() { cpu_set_t set; if (sched_getaffinity(0, sizeof(cpu_set_t), &set) < 0) printf("\n Call is failing with:%d", errno); } ----------------------------------------------------------------------- Because the kernel assumes len argument of sched_getaffinity() is bigger than NR_CPUS. But now it is not correct. Now we are faced with the following annoying dilemma, due to the limitations of the glibc interface built in years ago: (1) if we change glibc's __CPU_SETSIZE definition, we lost binary compatibility of _all_ application. (2) if we don't change it, we also lost binary compatibility of Sharyathi's use case. Then, I would propse to change the rule of the len argument of sched_getaffinity(). Old: len should be bigger than NR_CPUS New: len should be bigger than maximum possible cpu id This creates the following behavior: (A) In the real 4096 cpus machine, the above test program still return -EINVAL. (B) NR_CPUS=4096 but the machine have less than 1024 cpus (almost all machines in the world), the above can run successfully. Fortunatelly, BIG SGI machine is mainly used for HPC use case. It means they can rebuild their programs. IOW we hope they are not annoyed by this issue ... Reported-by: Sharyathi Nagesh Signed-off-by: KOSAKI Motohiro Acked-by: Ulrich Drepper Acked-by: Peter Zijlstra Cc: Linus Torvalds Cc: Andrew Morton Cc: Jack Steiner Cc: Russ Anderson Cc: Mike Travis LKML-Reference: <20100312161316.9520.A69D9226@jp.fujitsu.com> Signed-off-by: Ingo Molnar commit a3d3203e4bb40f253b1541e310dc0f9305be7c84 Merge: f937331 ec28dcc Author: Linus Torvalds Date: Sun Mar 14 20:29:21 2010 -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: (34 commits) ACPI: processor: push file static MADT pointer into internal map_madt_entry() ACPI: processor: refactor internal map_lsapic_id() ACPI: processor: refactor internal map_x2apic_id() ACPI: processor: refactor internal map_lapic_id() ACPI: processor: driver doesn't need to evaluate _PDC ACPI: processor: remove early _PDC optin quirks ACPI: processor: add internal processor_physically_present() ACPI: processor: move acpi_get_cpuid into processor_core.c ACPI: processor: export acpi_get_cpuid() ACPI: processor: mv processor_pdc.c processor_core.c ACPI: processor: mv processor_core.c processor_driver.c ACPI: plan to delete "acpi=ht" boot option ACPI: remove "acpi=ht" DMI blacklist PNPACPI: add bus number support PNPACPI: add window support resource: add window support resource: add bus number support resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type acpiphp: Execute ACPI _REG method for hotadded devices ACPI video: Be more liberal in validating _BQC behaviour ... commit f937331b3f92cb2f67bc81baa1b8cc5198c439e5 Author: Wolfram Sang Date: Mon Mar 15 01:29:41 2010 +0100 init dynamic bin_attribute structures Commit 6992f5334995af474c2b58d010d08bc597f0f2fe ("sysfs: Use one lockdep class per sysfs attribute.") introduced this requirement. First, at25 was fixed manually. Then, other occurences were found with coccinelle and the following semantic patch. Results were reviewed and fixed up: @ init @ identifier struct_name, bin; @@ struct struct_name { ... struct bin_attribute bin; ... }; @ main extends init @ expression E; statement S; identifier name, err; @@ ( struct struct_name *name; | - struct struct_name *name = NULL; + struct struct_name *name; ) ... ( sysfs_bin_attr_init(&name->bin); | + sysfs_bin_attr_init(&name->bin); if (sysfs_create_bin_file(E, &name->bin)) S | + sysfs_bin_attr_init(&name->bin); err = sysfs_create_bin_file(E, &name->bin); ) Signed-off-by: Wolfram Sang Cc: Eric W. Biederman Signed-off-by: Linus Torvalds commit 3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 Author: Huang Weiyi Date: Fri Mar 12 13:05:06 2010 +0000 serial: sh-sci: remove duplicated #include Remove duplicated #include('s) in drivers/serial/sh-sci.c Signed-off-by: Huang Weiyi Signed-off-by: Paul Mundt commit 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 Author: Magnus Damm Date: Wed Mar 10 11:33:10 2010 +0000 video: enable sh_mobile_lcdc on SH-Mobile ARM This patch enables the sh_mobile_lcdc driver on SH-Mobile ARM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3a14d0397732b6aaa541348b5a8e8f639ecd02b7 Author: Magnus Damm Date: Wed Mar 10 09:26:44 2010 +0000 ARM: mach-shmobile: ap4evb SDHI0 platform data V2 Add SDHI0 platform data for the AP4EVB board V2. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c57a31abf0b469b9cab6810f4e1895bb7ef1c482 Author: Magnus Damm Date: Wed Mar 10 05:17:24 2010 +0000 ARM: mach-shmobile: sh7372 SDHI vector merge Merge the SDHI vectors for sh7372 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c148abfc2d807b2734e7ecd0e00c71ef7d4b7f42 Author: Magnus Damm Date: Wed Mar 10 05:15:16 2010 +0000 ARM: mach-shmobile: sh7377 SDHI vector merge Merge the SDHI vectors for sh7377 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 9615b37c5c8fed963811c100053d495c412880fb Author: Magnus Damm Date: Wed Mar 10 05:13:12 2010 +0000 ARM: mach-shmobile: sh7367 SDHI vector merge Merge the SDHI vectors for sh7367 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6676a1701b0b135dacbb7cfeef48004315300df0 Author: NISHIMOTO Hiroki Date: Tue Feb 23 10:55:10 2010 +0000 ARM: mach-shmobile: G4EVM KEYSC platform data This patch adds KEYSC platform data for the G4EVM board. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 3e862c05ca1bf5bd4cb703bc257d180a4583bc41 Author: Magnus Damm Date: Fri Feb 19 10:01:22 2010 +0000 mtd: enable sh_flctl on SH-Mobile ARM Update the Kconfig entry for the sh_flctl driver to enable build on SH-Mobile ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 143f3b833f98271341379d813cb72deb1657a380 Author: Magnus Damm Date: Fri Feb 19 09:54:06 2010 +0000 ARM: mach-shmobile: G3EVM FLCTL platform data This patch adds FLCTL platform data for the G3EVM board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 03fb256df9c960b10c0e01b7e92d2f31433675fe Author: Magnus Damm Date: Tue Feb 16 10:48:15 2010 +0000 ARM: mach-shmobile: G3EVM KEYSC platform data This patch adds KEYSC platform data for the G3EVM board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit ec28dcc6b4c00b78ad269ad5b85ebd5c2d504825 Merge: c67fcd6 d060705 f6bb13a 0c99c52 4c81ba4 7e0e9c0 149fe9c cffdde9 fa80945 8b7ef6d 70287db 38bcb37 Author: Len Brown Date: Sun Mar 14 21:30:17 2010 -0400 Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release commit 2b497502b7cef167288a08737403a5a6cec697f0 Author: Daniel Vetter Date: Thu Mar 11 21:19:18 2010 +0000 drm/radeon: collect r100 asic related declarations in radeon_asic.h This just an example to show what radeon_asic.h might be good for. Before Jerome kills it ;) Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit e6990375ef4ec449994991034238f1ffab8a3a1a Author: Daniel Vetter Date: Thu Mar 11 21:19:17 2010 +0000 drm/radeon: include radeon_asic.h in the asic specific files In essence this creates a home for all asic specific declarations in radeon_asic.h Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 9479c54f0dfa63dad1ecfca897f51693c7c2fa65 Author: Daniel Vetter Date: Thu Mar 11 21:19:16 2010 +0000 drm/radeon: unconfuse return value of radeon_asic->clear_surface_reg No one cares about it, so set it to void. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 48e7a5f19fe0c10ebb35be7acf383366d139ee0a Author: Daniel Vetter Date: Thu Mar 11 21:19:15 2010 +0000 drm/radeon: move asic structs to radeon_asic.c With these static structs gone, radeon_asic.h is a real header file and can be used as such. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 0a10c85129c2d53cfd6db81677628e2fe58b5928 Author: Daniel Vetter Date: Thu Mar 11 21:19:14 2010 +0000 drm/radeon: create radeon_asic.c And move asic init plus a few related functions from radeon_device.c to it. This file will hold all the asic structures in the future, but atm they're still stuck in radeon_asic.h. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 149fe9c293f76803206648270ca24fc2604d5f01 Author: Alex Chiang Date: Mon Feb 22 12:12:00 2010 -0700 ACPI: processor: push file static MADT pointer into internal map_madt_entry() There's no real need for a pointer to the MADT to be global. The only function who uses it is map_madt_entry. This allows us to remove some more ugly #ifdefs. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit eae701ceadf5aa3fc3b334029ef71f6885ef1cde Author: Alex Chiang Date: Mon Feb 22 12:11:55 2010 -0700 ACPI: processor: refactor internal map_lsapic_id() Un-nest the if statements for readability. Remove comments that re-state the obvious. Change the control flow so that we no longer need a temp variable. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit d67420956b7b1dcffb894b2f1f81b9408fca1b4c Author: Alex Chiang Date: Mon Feb 22 12:11:50 2010 -0700 ACPI: processor: refactor internal map_x2apic_id() Untangle the nested if conditions to make this function look more similar to the other map_*apic_id() functions. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 11130736c99c37e253f45b2d3fd30b07313f83c6 Author: Alex Chiang Date: Mon Feb 22 12:11:44 2010 -0700 ACPI: processor: refactor internal map_lapic_id() Untangle the if() statement a little for readability. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit d8191fa4a33fdc817277da4f2b7f771ff605a41c Author: Alex Chiang Date: Mon Feb 22 12:11:39 2010 -0700 ACPI: processor: driver doesn't need to evaluate _PDC Now that the early _PDC evaluation path knows how to correctly evaluate _PDC on only physically present processors, there's no need for the processor driver to evaluate it later when it loads. To cover the hotplug case, push _PDC evaluation down into the hotplug paths. Cc: x86@kernel.org Cc: Tony Luck Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 3b1da4c5d1032ebc29fec8bd8f592ba6589be8ed Author: Alex Chiang Date: Mon Feb 22 12:11:34 2010 -0700 ACPI: processor: remove early _PDC optin quirks Now that we check for physically present processors before blindly evaluating _PDC, we no longer need to maintain a DMI opt-in table nor a kernel param. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 5d554a7bb0643a6151a84319bfeba8270bf5269e Author: Alex Chiang Date: Mon Feb 22 12:11:29 2010 -0700 ACPI: processor: add internal processor_physically_present() Detect if a processor is physically present before evaluating _PDC. We want this because some BIOS will provide a _PDC even for processors that are not present. These bogus _PDC methods then attempt to load non-existent tables, which causes problems. Avoid those bogus landmines. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 78ed8bd2944b6400f742306e5fe9d1b9b6bf18ba Author: Alex Chiang Date: Mon Feb 22 12:11:24 2010 -0700 ACPI: processor: move acpi_get_cpuid into processor_core.c Enumerating processors (via MADT/_MAT) belongs in the processor core, which is always built-in, rather than living in the processor driver which may not be built. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 2e9d5e4efa0beeca03ad550bda28027826e83e42 Author: Alex Chiang Date: Mon Feb 22 12:11:19 2010 -0700 ACPI: processor: export acpi_get_cpuid() Rename static get_cpu_id() to acpi_get_cpuid() and export it. This change also gives us an opportunity to remove the #ifndef CONFIG_SMP from processor_driver.c and into a header file where it properly belongs. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 4d5d4cd88c542ff56cf7feacd29cc907f2abbfbb Author: Alex Chiang Date: Mon Feb 22 12:11:14 2010 -0700 ACPI: processor: mv processor_pdc.c processor_core.c We've renamed the old processor_core.c to processor_driver.c, to convey the idea that it can be built modular and has driver-like bits. Now let's re-create a processor_core.c for the bits needed statically by the rest of the kernel. The contents of processor_pdc.c are a good starting spot, so let's just rename that file and complete our three card monte. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 0131aa3dd7dcf41c66784b96ff351f63ee3ef348 Author: Alex Chiang Date: Mon Feb 22 12:11:08 2010 -0700 ACPI: processor: mv processor_core.c processor_driver.c The ACPI processor driver can be built as a module. But it has pieces of code that should always be built statically into the kernel. The plan is for processor_core.c to contain the static bits while processor_driver.c contains the module-like bits. Since the bulk of the code in the current processor_core.c is module-like, first step is to rename the file to processor_driver.c Next step will re-create processor_core.c and cherry-pick out the static bits. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 1fc59eda33e55f8787901e3501d695bf5ecec48b Merge: d5e5ded d0d6cb8 Author: Dave Airlie Date: Mon Mar 15 11:08:56 2010 +1000 Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus * 'radeon-for-airlied' of ../linux-2.6: drm/radeon/kms: prepare for more reclocking operations drm/radeon/kms: switch to condition waiting for reclocking drm/radeon/r600: add missing license and comments to r600_blit_shaders.c drm/radeon/kms: improve coding style a little drm/radeon/kms: remove dead audio/HDMI code drm/radeon/kms: enable audio engine on DCE32 drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs drm/radeon/kms: clean assigning HDMI blocks to encoders drm/radeon/kms: clean HDMI definitions drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing drm/radeon/kms/r1xx: enable hw i2c drm/radeon/kms: fix i2c prescale calc on older radeons drm/radeon/kms: fix for hw i2c drm/radeon/kms: fix pal tv-out support on legacy IGP chips drm/radeon/kms: further spread spectrum fixes drm/radeon/kms: use lcd pll limits when available drm/radeon/kms/atom: spread spectrum fix drm/radeon/kms: catch atombios infinite loop and break out of it drm/radeon: add new RS880 pci id commit d5e5deddf67389eabc3d9b13004c108120d397e1 Merge: 44fef22 f405350 Author: Dave Airlie Date: Mon Mar 15 11:07:33 2010 +1000 Merge remote branch 'nouveau/for-airlied' into drm-linus * nouveau/for-airlied: drm/nouveau: add module option to disable TV detection drm/nouveau: Never evict VRAM buffers to system. drm/nv50: fix connector table parsing for some cards drm/nv50: add a memory barrier to pushbuf submission drm/nouveau: print a message very early during suspend drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay. drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI drm/nouveau: add option to allow override of dcb connector table types drm/nv50: Improve PGRAPH interrupt handling. drm/nv50: Make ctxprog wait until interrupt handler is done. drm/nouveau: Fix fbcon corruption with font width not divisible by 8 drm/nv50: Remove redundant/incorrect ctxvals initialisation. commit 4c81ba4900ab4eb24c7d2ba1aca594c644b6ce4c Author: Len Brown Date: Sun Mar 14 16:28:46 2010 -0400 ACPI: plan to delete "acpi=ht" boot option Signed-off-by: Len Brown commit 44fef22416886a04d432043f741a6faf2c6ffefd Author: Ben Skeggs Date: Thu Feb 18 09:12:09 2010 +1000 drm/edid: allow certain bogus edids to hit a fixup path rather than fail Signed-off-by: Ben Skeggs Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 8144c880397d502d12af4ef721f3eac50163fa39 Author: Len Brown Date: Thu Feb 18 23:42:47 2010 -0500 ACPI: remove "acpi=ht" DMI blacklist SuSE added these entries when deploying ACPI in Linux-2.4. I pulled them into Linux-2.6 on 2003-08-09. Over the last 6+ years, several entries have proven to be unnecessary and deleted, while no new entries have been added. Matthew suggests that they now have negative value, and I agree. Based-on-patch-by: Matthew Garrett Signed-off-by: Len Brown commit 725398322d05486109375fbb85c3404108881e17 Author: Zhao Yakui Date: Thu Mar 4 08:25:55 2010 +0000 drm: remove the EDID blob stored in the EDID property when it is disconnected Now the EDID property will be updated when the corresponding EDID can be obtained from the external display device. But after the external device is plugged-out, the EDID property is not updated. In such case we still get the corresponding EDID property although it is already detected as disconnected. https://bugs.freedesktop.org/show_bug.cgi?id=26743 Signed-off-by: Zhao Yakui Signed-off-by: Zhenyu Wang Cc: stable@kernel.org Signed-off-by: Dave Airlie commit ae6445ac7475ff0526b019560793e50bad9cf78d Author: Randy Dunlap Date: Thu Mar 11 22:01:39 2010 +0000 drm/vmwgfx: depends on FB vmwfgx uses framebuffer interfaces, so it should depend on FB. Otherwise it has these build errors (e.g., when CONFIG_FB=m): drivers/built-in.o: In function `vmw_fb_close': (.text+0x97713): undefined reference to `unregister_framebuffer' drivers/built-in.o: In function `vmw_fb_close': (.text+0x97754): undefined reference to `framebuffer_release' drivers/built-in.o: In function `vmw_fb_init': (.text+0x97e1c): undefined reference to `framebuffer_alloc' drivers/built-in.o: In function `vmw_fb_init': (.text+0x9838d): undefined reference to `register_framebuffer' drivers/built-in.o: In function `vmw_fb_init': (.text+0x9842a): undefined reference to `framebuffer_release' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Acked-by: Jakob Bornecrantz Signed-off-by: Dave Airlie commit b642ed06f2fccf62534f5269358776e0cba28f3c Author: Robert P. J. Day Date: Sat Mar 13 10:36:32 2010 +0000 drm: "kobject_init/kobject_add" -> "kobject_init_and_add". Replace sequential calls to kobject_init() and kobject_add() with the combo wrapper kobject_init_and_add(), which provides the same semantics. Signed-off-by: Robert P. J. Day Signed-off-by: Dave Airlie commit 72e942dd846f98e2d35aad5436d77a878ef05c5e Author: Dave Airlie Date: Tue Mar 9 06:33:26 2010 +0000 drm/ttm: use drm calloc large and free large Now that the drm core can do this, lets just use it, split the code out so TTM doesn't have to drag all of drmP.h in. Signed-off-by: Dave Airlie commit d0d6cb81e7eb34d83461070ca3e919fba1db437c Author: Rafał Miłecki Date: Tue Mar 2 22:06:52 2010 +0100 drm/radeon/kms: prepare for more reclocking operations Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 839461d3b0e3082eb382f17a3e3899372f28649a Author: Rafał Miłecki Date: Tue Mar 2 22:06:51 2010 +0100 drm/radeon/kms: switch to condition waiting for reclocking We tried to implement interruptible waiting with timeout (it was broken anyway) which was not a good idea as explained by Andrew. It's possible to avoid using additional variable but actually it inroduces using more complex in-kernel tools. So simply add one variable for condition. Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 7e0e9c042790d4ea44c6a00ddaad8b8bbcc3f17f Author: Bjorn Helgaas Date: Fri Mar 5 10:47:57 2010 -0700 PNPACPI: add bus number support Add support for bus number resources. This is for bridges with a range of bus numbers behind them. Previously, PNP ignored bus number resources. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit fa35b49260b615d634bfa1f767aa315fa323c2e9 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:52 2010 -0700 PNPACPI: add window support Add support for resource windows. This is for bridge resources, i.e., regions where a bridge forwards transactions from the primary to the secondary side. This does not add support for *setting* windows via the /proc interface. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 9d7cca04211d4eb104eaaa424b98f650bc29c730 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:47 2010 -0700 resource: add window support Add support for resource windows. This is for bridge resources, i.e., regions where a bridge forwards transactions from the primary to the secondary side. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 0f4050c7d3ba0275e5f39513c0670a717d43048c Author: Bjorn Helgaas Date: Fri Mar 5 10:47:42 2010 -0700 resource: add bus number support Add support for bus number resources. This is for bridges with a range of bus numbers behind them. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:26 2010 -0700 resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type No functional change; this just makes room for another resource type. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 65388342d66a63a29c76058e94a00d7bc0c6423b Author: Alex Deucher Date: Fri Mar 5 19:22:24 2010 -0500 drm/radeon/r600: add missing license and comments to r600_blit_shaders.c R6xx+ cards need to use the 3D engine to blit data which requires quite a bit of hw state setup. Rather than pull the whole 3D driver (which normally generates the 3D state) into the DRM, we opt to use statically generated state tables. The regsiter state and shaders were hand generated to support blitting functionality. See the 3D driver or documentation for descriptions of the registers and shader instructions. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3fe373d98cdb35c494517b0954b76f8094f4c59d Author: Rafał Miłecki Date: Sat Mar 6 13:03:38 2010 +0000 drm/radeon/kms: improve coding style a little We still have many magic numbers in HDMI/audio to define Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 0a7d934e6022a12e3f428b2adcb4b531e86170dd Author: Rafał Miłecki Date: Sat Mar 6 13:03:37 2010 +0000 drm/radeon/kms: remove dead audio/HDMI code Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425 Author: Rafał Miłecki Date: Sat Mar 6 13:03:36 2010 +0000 drm/radeon/kms: enable audio engine on DCE32 Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 5715f67cecee3617c7a6ff84ee44da46d525559e Author: Rafał Miłecki Date: Sat Mar 6 13:03:35 2010 +0000 drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs Older GPUs are little different, HDMI blocks are not hard-wired, but routable. We should just find some free HDMI block and route it to choosen encoder. In case of RS6x0 there is only one HDMI block, we don't enable HDMI on RS6x00 yet however. Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 2cd6218cb8043ef4360b561e726cd081f8a380cc Author: Rafał Miłecki Date: Mon Mar 8 22:14:01 2010 +0000 drm/radeon/kms: clean assigning HDMI blocks to encoders We almost always used first HDMI block for first encoder and second for sencod. Exception was KLDSCP_LVTMA. Analyzing code picking DIG encoder shows the same behaviour. It shows HDMI block are related to DIGs, which relation we now use. Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 808032ee296ee7b37a6df090be40a330e09ae30e Author: Rafał Miłecki Date: Sat Mar 6 13:03:33 2010 +0000 drm/radeon/kms: clean HDMI definitions We already know same offsets are used for different encoders/transmitters, so just numeric them instead naming incorrectly. Additionaly we found additional registers needed for RV770+ Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit d805f50aa1d9eef63fec356b2be557e2da3cd643 Author: Alex Deucher Date: Thu Mar 11 10:38:07 2010 -0500 drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing based on ddx patch from Matthias Hopf. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b28ea41164dc36110dafcdc63783e9b7fb865784 Author: Alex Deucher Date: Fri Mar 12 13:30:49 2010 -0500 drm/radeon/kms/r1xx: enable hw i2c fixing the i2c prescale in the last patch gets it working on r1xx. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 96a4c8d50de20da865296a380b996f73204d6b34 Author: Alex Deucher Date: Fri Mar 12 12:55:34 2010 -0500 drm/radeon/kms: fix i2c prescale calc on older radeons Should fix fdo bug 26430 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit ae08819c2a4729444676f1bb55e5e28263f6f5a1 Author: Alex Deucher Date: Thu Mar 11 13:28:14 2010 -0500 drm/radeon/kms: fix for hw i2c use the i2c pads to drive SDA Possible fix for fdo bug 26430 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 15f7207761cfcf8f53fb6e5cacffe060478782c3 Author: Alex Deucher Date: Wed Mar 10 18:33:03 2010 -0500 drm/radeon/kms: fix pal tv-out support on legacy IGP chips Based on ddx patch by Andrzej Hajda. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 267364ac17f6474c69b03034340f769b22f46105 Author: Alex Deucher Date: Mon Mar 8 17:10:41 2010 -0500 drm/radeon/kms: further spread spectrum fixes Adjust modeset ordering to fix spread spectrum. The spread spectrum command table relies on the crtc routing to already be set in order to work properly on some asics. Should fix fdo bug 25741. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 86cb2bbfda2cf402aee46779ee90bbb7d915482b Author: Alex Deucher Date: Mon Mar 8 12:55:16 2010 -0500 drm/radeon/kms: use lcd pll limits when available The bios has alternate pll output limits for LCD panels. If available, use these for pll divider calculations. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b792210e7d1f9fb102061e2016da96cf2ad5cdbd Author: Alex Deucher Date: Sat Mar 6 10:57:30 2010 -0500 drm/radeon/kms/atom: spread spectrum fix The atom spread spectrum table does not always disable ss. Explicitly disable it and then use the atom table to enable later if needed (currently only used for LVDS). Fixes display issues on some systems. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit f4053509669f904aec70c51e2ff75563ba7ae823 Author: Ben Skeggs Date: Mon Mar 15 09:43:51 2010 +1000 drm/nouveau: add module option to disable TV detection Intended to be used as a workaround in cases where we falsely detect that a TV is connected when it's not. Signed-off-by: Ben Skeggs commit 965cf68e8797932e9cd49238a6dd39423ac9b256 Author: Francisco Jerez Date: Sat Mar 6 13:42:45 2010 +0100 drm/nouveau: Never evict VRAM buffers to system. VRAM->system is a synchronous operation: it involves scheduling a VRAM->TT DMA transfer and stalling the CPU until it's finished so that we can unbind the new memory from the translation tables. VRAM->TT can always be performed asynchronously, even if TT is already full and we have to move something out of it. Additionally, allowing VRAM->system behaves badly under heavy memory pressure because once we run out of TT, stuff starts to be moved back and forth between VRAM and system, and the TT contents are hardly renewed. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit c21b0fe6de3912f53087b4f3991942529f03eef6 Author: Jerome Glisse Date: Tue Mar 2 20:37:52 2010 +0100 drm/radeon/kms: catch atombios infinite loop and break out of it In somecase the atombios code might lead to infinite loop because the GPU is in broken state, this patch track the jump history and will abort atombios execution if we are stuck executing the same jump for more than 1sec. Note that otherwise in some case we might enter an infinite loop in the kernel context which is bad. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 338e2b1d571e4873908b199c90d6a31f65137fe3 Author: Alex Deucher Date: Wed Mar 3 13:39:13 2010 -0500 drm/radeon: add new RS880 pci id This should go to 2.6.33 stable as well. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit d330a5befb88875a9b3d2db62f9b74dadf660b13 Author: Jan Kara Date: Sun Mar 14 18:17:54 2010 -0400 ext4: Fix estimate of # of blocks needed to write indirect-mapped files http://bugzilla.kernel.org/show_bug.cgi?id=15420 Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 181427a7e01beab76c789414334375839f026128 Author: Dan Carpenter Date: Sat Mar 13 14:14:22 2010 +0300 tomoyo: fix potential use after free The original code returns a freed pointer. This function is expected to return NULL on errors. Signed-off-by: Dan Carpenter Acked-by: Tetsuo Handa Signed-off-by: James Morris commit d06070509147c948a06056da619c9dc2ed349805 Author: Shaohua Li Date: Thu Feb 25 10:59:34 2010 +0800 acpiphp: Execute ACPI _REG method for hotadded devices Per ACPI spec, _ERG method should be executed before device driver gets control for hotpluged device. Firmware might do some configuration there. See http://bugzilla.kernel.org/show_bug.cgi?id=10805. In this machine, _REG method of docked device will configure cardbus bridge. Signed-off-by: Shaohua Li Tested-by: Paul Martin Signed-off-by: Len Brown commit 70287db87cfc968fe78bf82a489833cc77b84352 Author: Matthew Garrett Date: Tue Feb 16 16:53:50 2010 -0500 ACPI video: Be more liberal in validating _BQC behaviour Right now, if _BQC returns a value we don't understand we immediately invalidate it. Change this behaviour so we only invalidate it if it continues to give an invalid answer after we've already set a brightness. Signed-off-by: Matthew Garrett Acked-by: Zhang Rui Signed-off-by: Len Brown commit 3f17522ce461a31e7ced6311b28fcf5b8a763316 Author: Russell King Date: Fri Feb 12 14:32:01 2010 +0000 Video: ARM CLCD: Better fix for swapped IENB and CNTL registers On PL111, as found on Realview and other platforms, these registers are always arranged as CNTL then IENB. On PL110, these registers are IENB then CNTL, except on Versatile platforms. Re-arrange the handling of these register swaps so that PL111 always gets it right without resorting to ifdefs, leaving the only case needing special handling being PL110 on Versatile. Fill out amba/clcd.h with the PL110/PL111 register definition differences in case someone tries to use the PL110 specific definitions on PL111. Signed-off-by: Russell King commit 1027247f6eb727db6c600b9eb02796f0766ae704 Author: Russell King Date: Fri Feb 12 14:36:24 2010 +0000 ARM: Add L2 cache handling to smp boot support The page table and secondary data which we're asking the secondary CPU to make use of has to hit RAM to ensure that the secondary CPU can see it since it may not be taking part in coherency or cache searches at this point. Acked-by: Santosh Shilimkar Signed-off-by: Russell King commit bca14dd14f3b0c5e3e2d1d314679f85b67871365 Merge: 02ca6c4 2aa2b50 Author: Linus Torvalds Date: Sun Mar 14 11:15:45 2010 -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: x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y commit 02ca6c407e0d43e6de5d646d26d87fc2eaa7a98b Author: Randy Dunlap Date: Thu Feb 4 12:11:09 2010 -0800 Add include to i2c-xii.c to fix build error drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay' Signed-off-by: Randy Dunlap Cc: "Richard Röjfors" Cc: "Ben Dooks (embedded platforms)" Cc: linux-i2c@vger.kernel.org Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3f995f317f7070e81e8e38bb11357d6671ab6969 Author: Richard Röjfors Date: Tue Mar 9 09:17:36 2010 +0100 Add the platform data include for the Xilinx XPS IIC Bus Interface This file was missed in the original patch that went into Linus' tree. Cc: "Ben Dooks (embedded platforms)" Cc: linux-i2c@vger.kernel.org Signed-off-by: Richard Röjfors Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a818d8e43147f40864363456b37a00b819439307 Merge: f901e75 31968ec Author: Linus Torvalds Date: Sun Mar 14 11:13:54 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table Input: ALPS - fix stuck buttons on some touchpads Input: wm831x-on - convert to use genirq Input: ads7846 - add wakeup support Input: appletouch - fix integer overflow issue Input: ad7877 - increase pen up imeout Input: ads7846 - add support for AD7843 parts Input: bf54x-keys - fix system hang when pressing a key Input: alps - add support for the touchpad on Toshiba Tecra A11-11L Input: remove BKL, fix input_open_file() locking Input: serio_raw - remove BKL Input: mousedev - remove BKL Input: add driver for TWL4030 vibrator device Input: enable remote wakeup for PNP i8042 keyboard ports Input: scancode in get/set_keycodes should be unsigned Input: i8042 - use platfrom_create_bundle() helper Input: wacom - merge out and in prox events Input: gamecon - fix off by one range check Input: wacom - replace WACOM_PKGLEN_PENABLED commit f901e753923192a7793e5d7591e2c03dcb252d68 Merge: bced863 c91cea1 Author: Linus Torvalds Date: Sun Mar 14 11:13:24 2010 -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: remove whitespaces before quoted newlines nilfs2: remove spaces before tabs nilfs2: fix various typos in comments nilfs2: fix typo "cout" -> "count" in error message nilfs2: fix function name typos in docbook comments nilfs2: fix discrepancy in use of static specifier commit bced86359918326a65258b1be245834e5c493c88 Merge: ceb804c 0a9c147 Author: Linus Torvalds Date: Sun Mar 14 11:13:04 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-algo-bit: Add pre- and post-xfer hooks at24: Init dynamic bin_attribute structures i2c: Drop configure option I2C_DEBUG_CHIP tsl2550: Move from i2c/chips to misc i2c-i801: Don't use the block buffer for I2C block writes i2c-powermac: Be less verbose in the absence of real errors. i2c-smbus: Use device_lock/device_unlock commit ceb804cd0f63b0e0a87b81913b66add6de03043d Merge: 3474cbd f78233d Author: Linus Torvalds Date: Sun Mar 14 11:11:08 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: Skip check for mandatory locks when unlocking 9p: Fixes a simple bug enabling writes beyond 2GB. 9p: Change the name of new protocol from 9p2010.L to 9p2000.L fs/9p: re-init the wstat in readdir loop net/9p: Add sysfs mount_tag file for virtio 9P device net/9p: Use the tag name in the config space for identifying mount point commit 2aa2b50dd62b5d0675bd7453fbeb5732dc2d7866 Author: Ingo Molnar Date: Sun Mar 14 08:57:03 2010 +0100 x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y Commit f56e8a076 "x86/mce: Fix RCU lockdep splats" introduced the following build bug: arch/x86/kernel/cpu/mcheck/mce.c: In function 'mce_log': arch/x86/kernel/cpu/mcheck/mce.c:166: error: 'mce_read_mutex' undeclared (first use in this function) arch/x86/kernel/cpu/mcheck/mce.c:166: error: (Each undeclared identifier is reported only once arch/x86/kernel/cpu/mcheck/mce.c:166: error: for each function it appears in.) Move the in-the-middle-of-file lock variable up to the variable definition section, the top of the .c file. Cc: Paul E. McKenney Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 31968ecf584330b51a25b7bf881c2b632a02a3fb Author: Christoph Fritz Date: Sat Mar 13 22:26:23 2010 -0800 Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table ALDI/MEDION netbook E1222 needs to be in the reset quirk list for its touchpad's proper function. Reported-by: Michael Fischer Signed-off-by: Christoph Fritz Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit c91ed059a080c6f9a7ba525e5027c65d19115d15 Author: Martin Buck Date: Sat Mar 13 22:23:58 2010 -0800 Input: ALPS - fix stuck buttons on some touchpads Enable button release event redirection to the device that got the button press not only for touchpads with interleaved protocols, but unconditionally for all Alps touchpads. This is required at least for the touchpads in Dell Inspiron 8200 and Latitude d630. Signed-off-by: Martin Buck Signed-off-by: Dmitry Torokhov commit 3474cbd11df8cdd6413781ea95bd51dd469098ff Merge: d89b218 2d378b9 Author: Linus Torvalds Date: Sat Mar 13 21:29:38 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Add very basic XVR-1000 framebuffer driver. qlogicpti: Remove slash in QlogicPTI irq name commit c91cea11dfec65968ff9d1b4239c1eab63bf72fd Author: Ryusuke Konishi Date: Sun Mar 14 04:01:27 2010 +0900 nilfs2: remove whitespaces before quoted newlines This kills the following checkpatch warnings: WARNING: unnecessary whitespace before a quoted newline #869: FILE: super.c:869: + "remount to a different snapshot. \n", WARNING: unnecessary whitespace before a quoted newline #389: FILE: the_nilfs.c:389: + printk(KERN_ERR "NILFS: too short segment. \n"); Signed-off-by: Ryusuke Konishi commit 55480a06e9ee8d05d0e580bf46611df489653c76 Author: Ryusuke Konishi Date: Sun Mar 14 03:55:56 2010 +0900 nilfs2: remove spaces before tabs This kills the following checkpatch warnings: WARNING: please, no space before tabs #74: FILE: segment.h:74: +^Iunsigned ^I^Iflags;$ WARNING: please, no space before tabs #35: FILE: segbuf.c:35: +^Iint ^I^I^Istart, end; /* The region to be submitted */$ Signed-off-by: Ryusuke Konishi commit 7a65004bbaa6a21a0438aac9c64814e46084dc3f Author: Ryusuke Konishi Date: Sun Mar 14 03:32:40 2010 +0900 nilfs2: fix various typos in comments This fixes various typos I found in comments of nilfs2. Signed-off-by: Ryusuke Konishi commit 1621562b6ac55aa69239895d90276577547a5f62 Author: Ryusuke Konishi Date: Sun Mar 14 03:17:45 2010 +0900 nilfs2: fix typo "cout" -> "count" in error message Signed-off-by: Ryusuke Konishi commit 9ccf56c13831c5fe0edecd8c1184c9a6fe805d23 Author: Ryusuke Konishi Date: Sun Mar 14 03:01:03 2010 +0900 nilfs2: fix function name typos in docbook comments Fixes the following typos in docbook comments: nilfs_detroy_transaction_cache -> nilfs_destroy_transaction_cache nilfs_secgtor_start_timer -> nilfs_segctor_start_timer Signed-off-by: Ryusuke Konishi commit 6c477d44a7dad43a2783b4dea7f4ca3882d77126 Author: Ryusuke Konishi Date: Sun Mar 14 02:01:51 2010 +0900 nilfs2: fix discrepancy in use of static specifier Two segbuf functions, nilfs_segbuf_write and nilfs_segbuf_wait, are declared with the static storage class specifier, but their implementations are not. This fixes the discrepancy. Signed-off-by: Ryusuke Konishi commit 2d378b9179881b46a0faf11430efb421fe03ddd8 Author: David S. Miller Date: Sat Mar 13 16:25:03 2010 -0800 sparc64: Add very basic XVR-1000 framebuffer driver. Signed-off-by: David S. Miller Acked-by: Frans van Berckel commit d89b218b801fd93ea95880f1c7fde348cbcc51c5 Merge: 80a1860 bec68ff Author: Linus Torvalds Date: Sat Mar 13 14:50:18 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits) bridge: ensure to unlock in error path in br_multicast_query(). drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages sky2: Avoid rtnl_unlock without rtnl_lock ipv6: Send netlink notification when DAD fails drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant ipconfig: Handle devices which take some time to come up. mac80211: Fix memory leak in ieee80211_if_write() mac80211: Fix (dynamic) power save entry ipw2200: use kmalloc for large local variables ath5k: read eeprom IQ calibration values correctly for G mode ath5k: fix I/Q calibration (for real) ath5k: fix TSF reset ath5k: use fixed antenna for tx descriptors libipw: split ieee->networks into small pieces mac80211: Fix sta_mtx unlocking on insert STA failure path rt2x00: remove KSEG1ADDR define from rt2x00soc.h net: add ColdFire support to the smc91x driver asix: fix setting mac address for AX88772 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. net: Fix dev_mc_add() ... commit 80a186074e72e2cd61f6716d90cf32ce54981a56 Merge: 15c989d 3d07467 Author: Linus Torvalds Date: Sat Mar 13 14:46:18 2010 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix pick_next_highest_task_rt() for cgroups sched: Cleanup: remove unused variable in try_to_wake_up() x86: Fix sched_clock_cpu for systems with unsynchronized TSC commit 15c989d4d14b82f43cae7efc6a7794cdd556f274 Merge: 4e3eadd 0e152cd Author: Linus Torvalds Date: Sat Mar 13 14:45:49 2010 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems x86, UV: Fix target_cpus() in x2apic_uv_x.c x86: Reduce per cpu warning boot up messages x86: Reduce per cpu MCA boot up messages x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already commit 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 Merge: 8655e7e b97c4bc Author: Linus Torvalds Date: Sat Mar 13 14:43:01 2010 -0800 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: locking: Make sparse work with inline spinlocks and rwlocks x86/mce: Fix RCU lockdep splats rcu: Increase RCU CPU stall timeouts if PROVE_RCU ftrace: Replace read_barrier_depends() with rcu_dereference_raw() rcu: Suppress RCU lockdep warnings during early boot rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() rcu: Suppress __mpol_dup() false positive from RCU lockdep rcu: Make rcu_read_lock_sched_held() handle !PREEMPT rcu: Add control variables to lockdep_rcu_dereference() diagnostics rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU rcu: Use wrapper function instead of exporting tasklist_lock sched, rcu: Fix rcu_dereference() for RCU-lockdep rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU x86/gart: Unexport gart_iommu_aperture Fix trivial conflicts in kernel/trace/ftrace.c commit 8655e7e3ddec60603c4f6c14cdf642e2ba198df8 Merge: 461d208 b634587 Author: Linus Torvalds Date: Sat Mar 13 14:40:50 2010 -0800 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: Do not record user stack trace from NMI context tracing: Disable buffer switching when starting or stopping trace tracing: Use same local variable when resetting the ring buffer function-graph: Init curr_ret_stack with ret_stack ring-buffer: Move disabled check into preempt disable section function-graph: Add tracing_thresh support to function_graph tracer tracing: Update the comm field in the right variable in update_max_tr function-graph: Use comment notation for func names of dangling '}' function-graph: Fix unused reference to ftrace_set_func() tracing: Fix warning in s_next of trace file ops tracing: Include irqflags headers from trace clock commit 461d208cfbd1f0af26027b2c35ded515e54b1ee6 Merge: 9fdfbc2 0e49887 Author: Linus Torvalds Date: Sat Mar 13 14:39:54 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 sound: fix opti92x-ad1848 build ALSA: hda - Fix input source elements of secondary ADCs on Realtek ALSA: hda - Fix wrong model range check for ALC268 commit 9fdfbc2bff587f454dd95e2caa6d147c9abe39e4 Merge: 8cea4eb dc1d628 Author: Linus Torvalds Date: Sat Mar 13 14:39:42 2010 -0800 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Provide generic perf_sample_data initialization MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer perf trace: Don't use pager if scripting perf trace/scripting: Remove extraneous header read perf, ARM: Modify kuser rmb() call to compile for Thumb-2 x86/stacktrace: Don't dereference bad frame pointers perf archive: Don't try to collect files without a build-id perf_events, x86: Fixup fixed counter constraints perf, x86: Restrict the ANY flag perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE perf, x86: add some IBS macros to perf_event.h perf, x86: make IBS macros available in perf_event.h hw-breakpoints: Remove stub unthrottle callback x86/hw-breakpoints: Remove the name field perf: Remove pointless breakpoint union perf lock: Drop the buffers multiplexing dependency perf lock: Fix and add misc documentally things percpu: Add __percpu sparse annotations to hw_breakpoint commit 8cea4eb642890a1de58980e7e1617d1765ef8f7c Merge: 122ce87 720e774 Author: Linus Torvalds Date: Sat Mar 13 14:38:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Skip check for mandatory locks when unlocking GFS2: Allow the number of committed revokes to temporarily be negative GFS2: do not select QUOTA commit 122ce878dc189860a380539bde19498bf93443a7 Merge: daf9fe2 0636b33 Author: Linus Torvalds Date: Sat Mar 13 14:38:31 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix CX4 link problem in back-to-back configuration RDMA/nes: Clear stall bit before destroying NIC QP RDMA/nes: Set assume_aligned_header bit RDMA/cxgb3: Wait at least one schedule cycle during device removal IB/mad: Ignore iWARP devices on device removal IPoIB: Include return code in trace message for ib_post_send() failures IPoIB: Fix TX queue lockup with mixed UD/CM traffic commit 3ee8f0a2b1c81f0472b25d40aa5c1c7c6a0edc2a Author: Markus Rathgeb Date: Sat Mar 13 17:29:43 2010 +0100 HID: Add RGT Clutch Wheel clutch device id This patch enables force feedback for the "RGT Force Feedback CLUTCH Racing Wheel". It only modifies hid-core.c (hid_blacklist) and hid-tmff.c to add the new USB IDs. Signed-off-by: Markus Rathgeb Signed-off-by: Jiri Kosina commit bec68ff1637ca00bb1585a03a7be8a13380084de Author: YOSHIFUJI Hideaki Date: Sat Mar 13 12:27:21 2010 -0800 bridge: ensure to unlock in error path in br_multicast_query(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit c251c7f738cd94eb3a1febda318078c661eccb4d Author: Joe Perches Date: Sat Mar 13 12:26:15 2010 -0800 drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote: > From: Mikael Pettersson > Date: Wed, 10 Mar 2010 16:33:28 +0100 > > Booting 2.6.34-rc1 on a machine with a tulip nic I see > > a number of kernel messages that include "(null)" where > > previous kernels included the string "tulip0": > CC:'ing the guilty party :-) It's one of the following > commits: Thanks Mikael. Anonymity has some good attributes. Blame avoidance is one of them. I've broad shoulders. It's me, then Dwight Howard... There might be another few of these where ->name or ->dev was used before struct device or net_device was registered. I'll go back and check. tulip_core has: if (tp->flags & HAS_MEDIA_TABLE) { sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */ tulip_parse_eeprom(dev); strcpy(dev->name, "eth%d"); /* un-hack */ } So I don't feel _too_ bad. tulip_parse_eeprom is done before register_netdev so the logging there can not use netdev_ or dev_(&dev->dev Signed-off-by: Joe Perches Tested-by: Mikael Pettersson Signed-off-by: David S. Miller commit 2a40018984c5c9647df1c18489449a3a227d9136 Author: Mike McCormack Date: Sat Mar 13 12:24:18 2010 -0800 sky2: Avoid rtnl_unlock without rtnl_lock Make sure we always call rtnl_lock before going down the error path in sky2_resume, which unlocks the rtnl lock. Signed-off-by: Mike McCormack Signed-off-by: David S. Miller commit e2577a065832f2c6d108de2e027891bdb2d78924 Author: Herbert Xu Date: Sat Mar 13 12:23:29 2010 -0800 ipv6: Send netlink notification when DAD fails If we are managing IPv6 addresses using DHCP, it would be nice for user-space to be notified if an address configured through DHCP fails DAD. Otherwise user-space would have to poll to see whether DAD succeeds. This patch uses the existing notification mechanism and simply hooks it into the DAD failure code path. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3f07d1295191cfa41125e4e61ee2064790070071 Author: Julia Lawall Date: Sat Mar 13 12:22:16 2010 -0800 drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant The constant TG3_FLAG_10_100_ONLY should be used with the tg3_flags field, not the tg3_flags2 field, as done elsewhere in the same file. Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit a003460b21323ddb29479505d9555f0985b8b2f1 Merge: 964ad81 dee6026 Author: David S. Miller Date: Sat Mar 13 12:17:09 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 0a9c14751377a1407f5e35791e13651d2fc7801c Author: Jean Delvare Date: Sat Mar 13 20:56:56 2010 +0100 i2c-algo-bit: Add pre- and post-xfer hooks Drivers might have to do random things before and/or after I2C transfers. Add hooks to the i2c-algo-bit implementation to let them do so. Signed-off-by: Jean Delvare Cc: Alex Deucher commit d07b56b3098b9f32ae6dedeacbc594bd01dcfcd1 Author: Wolfram Sang Date: Sat Mar 13 20:56:55 2010 +0100 at24: Init dynamic bin_attribute structures Commit 6992f5334995af474c2b58d010d08bc597f0f2fe introduced this requirement. Reported-by: Albrecht Dress Signed-off-by: Wolfram Sang Signed-off-by: Eric W. Biederman Signed-off-by: Jean Delvare commit e77482d735efa2606c1f2afeebd53e1119d0e5c6 Author: Jean Delvare Date: Sat Mar 13 20:56:55 2010 +0100 i2c: Drop configure option I2C_DEBUG_CHIP Now that directory drivers/i2c/chips is gone, configuration option I2C_DEBUG_CHIP no longer has any effect, so we can drop it. Signed-off-by: Jean Delvare Acked-by: Wolfram Sang commit 6a9bcced518b98a7e52b9e8e96af228b171e0498 Author: Jean Delvare Date: Sat Mar 13 20:56:54 2010 +0100 tsl2550: Move from i2c/chips to misc Move the last remaining driver from i2c/chips to misc. Good ridance! Signed-off-by: Jean Delvare Acked-by: Wolfram Sang Acked-by: Jonathan Cameron commit c074c39d62306efa5ba7c69c1a1531bc7333d252 Author: Jean Delvare Date: Sat Mar 13 20:56:53 2010 +0100 i2c-i801: Don't use the block buffer for I2C block writes Experience has shown that the block buffer can only be used for SMBus (not I2C) block transactions, even though the datasheet doesn't mention this limitation. Reported-by: Felix Rubinstein Signed-off-by: Jean Delvare Cc: Oleg Ryjkov Cc: stable@kernel.org commit 8e4b980c28c91cfe9d0ce0431bc0af56e146b49e Author: Jean Delvare Date: Sat Mar 13 20:56:52 2010 +0100 i2c-powermac: Be less verbose in the absence of real errors. Be less verbose in the absence of real errors. We don't have to report failed probes to the users, it's only confusing them. Signed-off-by: Jean Delvare Tested-by: Andrey Gusev Cc: Benjamin Herrenschmidt Cc: stable@kernel.org commit f635a1e74bd6001f06fe1df53d32daf2b28bf04b Author: Stephen Rothwell Date: Mon Mar 1 16:04:45 2010 +1100 i2c-smbus: Use device_lock/device_unlock Use the new device locking/unlocking API. Signed-off-by: Stephen Rothwell Signed-off-by: Jean Delvare commit f78233dd44a110c574fe760ad6f9c1e8741a0d00 Author: Sachin Prabhu Date: Sat Mar 13 09:03:55 2010 -0600 9p: Skip check for mandatory locks when unlocking While investigating a bug, I came across a possible bug in v9fs. The problem is similar to the one reported for NFS by ASANO Masahiro in http://lkml.org/lkml/2005/12/21/334. v9fs_file_lock() will skip locks on file which has mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped during unlock and the machine will end up with a BUG in locks_remove_flock(). v9fs_file_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Eric Van Hensbergen commit fc0f296126433e61600539325975b6c30681c07e Author: jvrao Date: Mon Mar 8 22:07:02 2010 +0000 9p: Fixes a simple bug enabling writes beyond 2GB. Fixes a simple bug so that large files beyond 2GB can be created. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Badari Pulavarty Signed-off-by: Eric Van Hensbergen commit 45bc21edb52fa71dbb1324c6f573aa880e95519d Author: Sripathi Kodi Date: Mon Mar 8 17:33:04 2010 +0000 9p: Change the name of new protocol from 9p2010.L to 9p2000.L This patch changes the name of the new 9P protocol from 9p2010.L to 9p2000.u. This is because we learnt that the name 9p2010 is already being used by others. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit fae4528b2341f2ab0c86c191e24d9cdd93624c60 Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:16 2010 +0000 fs/9p: re-init the wstat in readdir loop This ensure that on failure when we free the stat buf we don't end up freeing an already freed pointer in the earlier loop Signed-off-by: Aneesh Kumar K.V Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 86c8437383acd85c05ec7c9a004f59fe7ac9821a Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:15 2010 +0000 net/9p: Add sysfs mount_tag file for virtio 9P device This adds a new file for virtio 9P device. The file contain details of the mount device name that should be used to mount the 9P file system. Ex: /sys/devices/virtio-pci/virtio1/mount_tag file now contian the tag name to be used to mount the 9P file system. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 97ee9b0257402f4731b55dfea42f24d26d793ddf Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:14 2010 +0000 net/9p: Use the tag name in the config space for identifying mount point This patch use the tag name in the config space to identify the mount device. The the virtio device name depend on the enumeration order of the device and may not remain the same across multiple boots So we use the tag name which is set via qemu option to uniquely identify the mount device Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit d10fca9f39238b07cc670b441d2b423de30359d2 Author: Will Deacon Date: Fri Feb 26 10:46:15 2010 +0100 ARM: 5960/1: ARM: perf-events: fix v7 event selection mask The event selection mask for ARMv7 cores [ARMV7_EVTSEL_MASK] is incorrectly set to 0x7f. This means that the top bit of an event ID is ignored, so counting branch misses (id=0x10) and ISBs (id=0x90) give the same results. This patch sets the event selection mask to the correct value of 0xff. Signed-off-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit ddee87f208b6229d2910dd5930c87089dc56c87e Author: Will Deacon Date: Thu Feb 25 15:04:14 2010 +0100 ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING If IRQ balancing is used on a multicore ARM system, PMU interrupt lines may be relocated onto CPUs other than the one causing the counter overflow. This can result in misattribution of events to the wrong core and, in the case that the CPU handling the interrupt has not experience counter overflow, the interrupt can be disabled because the handler returns IRQ_NONE. This patch adds the IRQF_NOBALANCING flag to the request_irq call in perf_events.c. Acked-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit a91ed072d6135926c296a42b0b46de35e6347845 Author: Greg Ungerer Date: Fri Mar 12 06:19:25 2010 +0100 ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds Commit 26a26d329688ab018e068b412b03d43d7c299f0a ("dma-mapping: switch ARMv7 DMA mappings to retain 'memory' attribute") added a new macro, pgprot_dmacoherent(), to correctly map DMA memory. The non-mmu pgtable support code also needs to implement this macro, otherwise when compiling you get: CC arch/arm/mm/dma-mapping.o arch/arm/mm/dma-mapping.c: In function 'dma_alloc_coherent': arch/arm/mm/dma-mapping.c:320: error: implicit declaration of function 'pgprot_dmacoherent' arch/arm/mm/dma-mapping.c:320: error: 'pgprot_kernel' undeclared (first use in this function) arch/arm/mm/dma-mapping.c:320: error: (Each undeclared identifier is reported only once arch/arm/mm/dma-mapping.c:320: error: for each function it appears in.) Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit bb35579b45bcb0b74167a2165d3ea973f640bf00 Author: Mikael Pettersson Date: Thu Mar 11 12:28:31 2010 +0100 ARM: 5987/1: fix warning in kernel/elfcore.c from ARM's elf.h 2.6.34-rc1 added kernel/elfcore.c which includes . On ARM, this results in: In file included from include/linux/elf.h:7, from kernel/elfcore.c:1: /tmp/linux-2.6.34-rc1/arch/arm/include/asm/elf.h:101: warning: 'struct task_struct' declared inside parameter list /tmp/linux-2.6.34-rc1/arch/arm/include/asm/elf.h:101: warning: its scope is only this definition or declaration, which is probably not what you want Including seems a bit heavyweight, so this patch just adds a tentative declaration of struct task_struct in . Signed-off-by: Mikael Pettersson Signed-off-by: Russell King commit 438ff39d7813515d3aac20f53b5b95aaa58b38f9 Author: Rob Alley Date: Thu Mar 11 02:15:04 2010 +0100 ARM: 5986/1: at91sam9g20-ek: Correct braces in I2C registration code The change introduced in patch 5596/1 used incorrect bracing which resulted in the AT24 EEPROM no longer being registered. This patch corrects the bracing and allows both the WM8731 audio device and AT24 EEPROM device to be registered. Signed-off-by: Rob Alley Signed-off-by: Russell King commit a2302b45d8ab41a55e84c39a6c6f813586ad8493 Author: Mark Brown Date: Wed Mar 10 19:10:28 2010 +0100 ARM: 5985/2: ARM: Fix Samsung build after "ARM: Eliminate decompressor -Dstatic= PIC hack" Commit 5de813b6 (ARM: Eliminate decompressor -Dstatic= PIC hack) among other things changed the declared type of the error() function to an extern, conflicting with the forward declartion in the Samsung plat/uncompress.h which appears to have been relying on the static being defined away, causing build failures since error() ends up with a GOT relocation but the linker script discards all GOT relocated data and functions: arch/arm/boot/compressed/decompress.o: In function `gunzip': /home/broonie/git/linux-2.6/arch/arm/boot/compressed/../../../../lib/decompress_ +inflate.c:68: undefined reference to `error' and so on. Fix this by moving the declaration into uncompress/misc.c where it is shared with the rest of the code, correcting the definition as we go. Signed-off-by: Mark Brown Signed-off-by: Russell King commit 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 Author: Borislav Petkov Date: Fri Mar 12 15:43:03 2010 +0100 x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems de957628ce7c84764ff41331111036b3ae5bad0f changed setting of the x86_init.iommu.iommu_init function ptr only when GART IOMMU is found. One side effect of it is that num_k8_northbridges is not initialized anymore if not explicitly called. This resulted in uninitialized pointers in , for example, which uses the num_k8_northbridges thing through node_to_k8_nb_misc(). Fix that through an initcall that runs right after the PCI subsystem and does all the scanning. Then, remove initialization in gart_iommu_init() which is a rootfs_initcall and we're running before that. What is more, since num_k8_northbridges is being used in other places beside GART IOMMU, include it whenever we add AMD CPU support. The previous dependency chain in kconfig contained K8_NB depends on AGP_AMD64|GART_IOMMU which was clearly incorrect. The more natural way in terms of hardware dependency should be AGP_AMD64|GART_IOMMU depends on K8_NB depends on CPU_SUP_AMD && PCI. Make it so Number One! Signed-off-by: Borislav Petkov Cc: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100312144303.GA29262@aftab> Signed-off-by: Ingo Molnar Tested-by: Joerg Roedel commit fc6ceea045031658d0b59af562369eae980b4370 Author: Masami Hiramatsu Date: Fri Mar 12 18:22:24 2010 -0500 perf probe: Fix need_dwarf flag if lazy matching is used Set need_dwarf if lazy matching pattern is specified, because lazy matching requires real source path for which we must use debuginfo. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100312232224.2017.54550.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 594087a04eea544356f9c52e83c1a9bc380ce80f Author: Masami Hiramatsu Date: Fri Mar 12 18:22:17 2010 -0500 perf probe: Fix probe_point buffer overrun Fix probe_point array-size overrun problem. In some cases (e.g. inline function), one user-specified probe-point can be translated to many probe address, and it overruns pre-defined array-size. This also removes redundant MAX_PROBES macro definition. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: LKML-Reference: <20100312232217.2017.45017.stgit@localhost6.localdomain6> [ Note that only root can create new probes. Eventually we should remove the MAX_PROBES limit, but that is a larger patch not eligible to perf/urgent treatment. ] Signed-off-by: Ingo Molnar commit b6345879ccbd9b92864fbd7eb8ac48acdb4d6b15 Author: Steven Rostedt Date: Fri Mar 12 20:03:30 2010 -0500 tracing: Do not record user stack trace from NMI context A bug was found with Li Zefan's ftrace_stress_test that caused applications to segfault during the test. Placing a tracing_off() in the segfault code, and examining several traces, I found that the following was always the case. The lock tracer was enabled (lockdep being required) and userstack was enabled. Testing this out, I just enabled the two, but that was not good enough. I needed to run something else that could trigger it. Running a load like hackbench did not work, but executing a new program would. The following would trigger the segfault within seconds: # echo 1 > /debug/tracing/options/userstacktrace # echo 1 > /debug/tracing/events/lock/enable # while :; do ls > /dev/null ; done Enabling the function graph tracer and looking at what was happening I finally noticed that all cashes happened just after an NMI. 1) | copy_user_handle_tail() { 1) | bad_area_nosemaphore() { 1) | __bad_area_nosemaphore() { 1) | no_context() { 1) | fixup_exception() { 1) 0.319 us | search_exception_tables(); 1) 0.873 us | } [...] 1) 0.314 us | __rcu_read_unlock(); 1) 0.325 us | native_apic_mem_write(); 1) 0.943 us | } 1) 0.304 us | rcu_nmi_exit(); [...] 1) 0.479 us | find_vma(); 1) | bad_area() { 1) | __bad_area() { After capturing several traces of failures, all of them happened after an NMI. Curious about this, I added a trace_printk() to the NMI handler to read the regs->ip to see where the NMI happened. In which I found out it was here: ffffffff8135b660 : ffffffff8135b660: 48 83 ec 78 sub $0x78,%rsp ffffffff8135b664: e8 97 01 00 00 callq ffffffff8135b800 What was happening is that the NMI would happen at the place that a page fault occurred. It would call rcu_read_lock() which was traced by the lock events, and the user_stack_trace would run. This would trigger a page fault inside the NMI. I do not see where the CR2 register is saved or restored in NMI handling. This means that it would corrupt the page fault handling that the NMI interrupted. The reason the while loop of ls helped trigger the bug, was that each execution of ls would cause lots of pages to be faulted in, and increase the chances of the race happening. The simple solution is to not allow user stack traces in NMI context. After this patch, I ran the above "ls" test for a couple of hours without any issues. Without this patch, the bug would trigger in less than a minute. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Steven Rostedt commit a2f8071428ed9a0f06865f417c962421c9a6b488 Author: Steven Rostedt Date: Fri Mar 12 19:56:00 2010 -0500 tracing: Disable buffer switching when starting or stopping trace When the trace iterator is read, tracing_start() and tracing_stop() is called to stop tracing while the iterator is processing the trace output. These functions disable both the standard buffer and the max latency buffer. But if the wakeup tracer is running, it can switch these buffers between the two disables: buffer = global_trace.buffer; if (buffer) ring_buffer_record_disable(buffer); <<<--------- swap happens here buffer = max_tr.buffer; if (buffer) ring_buffer_record_disable(buffer); What happens is that we disabled the same buffer twice. On tracing_start() we can enable the same buffer twice. All ring_buffer_record_disable() must be matched with a ring_buffer_record_enable() or the buffer can be disable permanently, or enable prematurely, and cause a bug where a reset happens while a trace is commiting. This patch protects these two by taking the ftrace_max_lock to prevent a switch from occurring. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit 283740c619d211e34572cc93c8cdba92ccbdb9cc Author: Steven Rostedt Date: Fri Mar 12 19:48:41 2010 -0500 tracing: Use same local variable when resetting the ring buffer In the ftrace code that resets the ring buffer it references the buffer with a local variable, but then uses the tr->buffer as the parameter to reset. If the wakeup tracer is running, which can switch the tr->buffer with the max saved buffer, this can break the requirement of disabling the buffer before the reset. buffer = tr->buffer; ring_buffer_record_disable(buffer); synchronize_sched(); __tracing_reset(tr->buffer, cpu); If the tr->buffer is swapped, then the reset is not happening to the buffer that was disabled. This will cause the ring buffer to fail. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit ea14eb714041d40fcc5180b5a586034503650149 Author: Steven Rostedt Date: Fri Mar 12 19:41:23 2010 -0500 function-graph: Init curr_ret_stack with ret_stack If the graph tracer is active, and a task is forked but the allocating of the processes graph stack fails, it can cause crash later on. This is due to the temporary stack being NULL, but the curr_ret_stack variable is copied from the parent. If it is not -1, then in ftrace_graph_probe_sched_switch() the following: for (index = next->curr_ret_stack; index >= 0; index--) next->ret_stack[index].calltime += timestamp; Will cause a kernel OOPS. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Signed-off-by: Steven Rostedt commit 52fbe9cde7fdb5c6fac196d7ebd2d92d05ef3cd4 Author: Lai Jiangshan Date: Mon Mar 8 14:50:43 2010 +0800 ring-buffer: Move disabled check into preempt disable section The ring buffer resizing and resetting relies on a schedule RCU action. The buffers are disabled, a synchronize_sched() is called and then the resize or reset takes place. But this only works if the disabling of the buffers are within the preempt disabled section, otherwise a window exists that the buffers can be written to while a reset or resize takes place. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Lai Jiangshan LKML-Reference: <4B949E43.2010906@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c Merge: 9d85929 8d002bd Author: Linus Torvalds Date: Fri Mar 12 16:41:09 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Several MFD drivers should depend on GENERIC_HARDIRQS mfd: Fix sm501 requested region size commit 9d85929fefd040ca84a5e04ee704d043efcc3c2e Merge: 6db823c eeb5b4a Author: Linus Torvalds Date: Fri Mar 12 16:35:21 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix stat->f_namelen fat: Fix vfat_lookup() commit 6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe Author: Linus Torvalds Date: Fri Mar 12 16:30:23 2010 -0800 Fix up .gitignore for top-level file patterns Some of the gitignore file patters were explicitly meant to be only for the top level, but weren't marked that way, so they would trigger recursively in subdirectories too. Normally that was harmless, but at least "linux" happened to trigger elsewhere too. Fix it up. And other patterns in that section weren't necessarily top-level at all. Reported-by: Jiri Slaby Signed-off-by: Linus Torvalds commit 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 Merge: 3836a03 ad6759f Author: Linus Torvalds Date: Fri Mar 12 16:27:08 2010 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timekeeping: Prevent oops when GENERIC_TIME=n commit 3836a03d978e68b0ae00d3589089343c998cd4ff Author: Eric Paris Date: Tue Mar 9 22:23:01 2010 -0500 anon_inodes: mark the anon inode private Inotify was switched to use anon_inode instead of its own private filesystem which only had one inode in commit c44dcc56d2b5c7 "switch inotify_user to anon_inode" The problem with this is that now the inotify inode is not a distinct inode which can be managed by LSMs. userspace tools which use inotify were allowed to use the inotify inode but may not have had permission to do read/write type operations on the anon_inode. After looking at the anon_inode and its users it looks like the best solution is to just mark the anon_inode as S_PRIVATE so the security system will ignore it. Signed-off-by: Eric Paris Acked-by: James Morris Signed-off-by: Linus Torvalds commit 83c0fb6500b13c9b7564fe453b76356dc58415d4 Merge: 11bfe2e 3a065fc Author: Linus Torvalds Date: Fri Mar 12 16:22:50 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: use ext2_find_next_bit udf: Do not read inode before writing it udf: Fix unalloc space handling in udf_update_inode commit 11bfe2ea732c6499c46c4f3a63d567c05b9dbafd Merge: b6fedfd 5b8a2fb Author: Linus Torvalds Date: Fri Mar 12 16:21:24 2010 -0800 Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm_sdcc.c: missing brackets in msmsdcc_resume() commit b97c4bc16734a2e597dac7f91ee9eb78f4aeef9a Author: Luca Barbieri Date: Thu Mar 11 14:08:45 2010 -0800 locking: Make sparse work with inline spinlocks and rwlocks Currently sparse does not work with inline spinlock and rwlock functions. The problem is that they do not use the __acquires/__releases out-of-line functions, but use inline functions with no sparse annotations. This patch adds the appropriate annotations to make it work properly. Signed-off-by: Luca Barbieri Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit b6fedfd2a18a489d31246312f7279f82e3cc6b37 Merge: c32da02 30124d1 Author: Linus Torvalds Date: Fri Mar 12 16:06:51 2010 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/booke: Fix breakpoint/watchpoint one-shot behavior powerpc: Reduce printk from pseries_mach_cpu_die() powerpc: Move checks in pseries_mach_cpu_die() powerpc: Reset kernel stack on cpu online from cede state powerpc: Fix G5 thermal shutdown powerpc/pseries: Pass CPPR value to H_XIRR hcall powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc: Fix SMP build with disabled CPU hotplugging. powerpc: Dynamically allocate pacas powerpc/perf: e500 support powerpc/perf: Build callchain code regardless of hardware event support. powerpc/cpm2: Checkpatch cleanup powerpc/86xx: Renaming following split of GE Fanuc joint venture powerpc/86xx: Convert gef_pic_lock to raw_spinlock powerpc/qe: Convert qe_ic_lock to raw_spinlock powerpc/82xx: Convert pci_pic_lock to raw_spinlock powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock commit c32da02342b7521df25fefc2ef20aee0e61cf887 Merge: dca1d9f 318ae2e Author: Linus Torvalds Date: Fri Mar 12 16:04:50 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX commit dca1d9f6d7ae428c193f32bd3e9a4ca13176648b Merge: 9ff9933 91e0138 Author: Linus Torvalds Date: Fri Mar 12 16:00:54 2010 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits) ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock ARM: S3C2443: Remove #if 0 for clk_mpll ARM: S3C2443: Update notes on MPLLREF clock ARM: S3C2443: Further clksrc-clk conversions ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation USB: Fix s3c-hsotg build following Samsung platform header moves ARM: S3C64XX: Reintroduce unconditional build of audio device ARM: 5961/1: ux500: fix CLKRST addresses ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted ASoC: Fix S3C64xx IIS driver for Samsung header reorg ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support [ARM] pxa: fix typo in mxm8x10.h [ARM] pxa/raumfeld: set GPIO drive bits for LED pins [ARM] pxa/zeus: Add support for mcp2515 CAN bus [ARM] pxa/zeus: Add support for onboard max6369 watchdog [ARM] pxa/zeus: Add Eurotech as the manufacturer [ARM] pxa/zeus: Correct the USB host initialisation flags [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress [ARM] pxa: refactor uncompress.h for non-PXA uarts [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs ... commit 9ff99339447de403a46be5e3f23d0c794d540b06 Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: poll Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move epoll_table extern declaration to linux/poll.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2edf5e49800846a2b2b6461d99cdae18067c440f Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: lockdep Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move lockdep extern declarations to linux/lockdep.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f0e056fdebc15d3f4724ebc7bbf323158add1d7 Author: Dave Young Date: Wed Mar 10 15:24:09 2010 -0800 sysctl extern cleanup: rtmutex Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move max_lock_depth extern declaration to linux/rtmutex.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 Author: Dave Young Date: Wed Mar 10 15:24:08 2010 -0800 sysctl extern cleanup: acct Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move acct_parm extern declaration to linux/acct.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 Author: Dave Young Date: Wed Mar 10 15:24:07 2010 -0800 sysctl extern cleanup: sg Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move sg_big_buff extern declaration to scsi/sg.h Signed-off-by: Dave Young Acked-by: Doug Gilbert Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ed109103d73b0bafc92e860cead56725231384d Author: Dave Young Date: Wed Mar 10 15:24:06 2010 -0800 sysctl extern cleanup: module Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move modprobe_path extern declaration to linux/kmod.h Move modules_disabled extern declaration to linux/module.h Signed-off-by: Dave Young Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5ab67726f33b50f40db0ccf271ceb3c658554d5 Author: Dave Young Date: Wed Mar 10 15:24:05 2010 -0800 sysctl extern cleanup: rcu Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move rcutorture_runnable extern declaration to linux/rcupdate.h Signed-off-by: Dave Young Acked-by: Josh Triplett Reviewed-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: signal Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move print_fatal_signals extern declaration to linux/signal.h Signed-off-by: Dave Young Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb5572fed55f4c2b7dbc42582bc82dcb47632380 Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: C_A_D Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move C_A_D extern variable declaration to linux/reboot.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d759c3745e62c36fd7efee7a2ce2a327f22e9056 Author: Vladimir Zapolskiy Date: Wed Mar 10 15:23:57 2010 -0800 mxcmmc: fixed max_seg_size value on initialization This unpleasant typo appeared while porting the driver from Freescale original sources, where anyone can easily find the correct version. Current incorrect version potentially can influence segment and merge handling in block subsystem via MMC request queue settings. Signed-off-by: Vladimir Zapolskiy Cc: Sascha Hauer Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51ea3f6a4571e9283e2ff79b74bcedfc2986dbe2 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:57 2010 -0800 inflate_fast: sout is already a short so ptr arith was off by one. inflate_fast() can do either POST INC or PRE INC on its pointers walking the memory to decompress. Default is PRE INC. The sout pointer offset was miscalculated in one case as the calculation assumed sout was a char * This breaks inflate_fast() iff configured to do POST INC. Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69eae65523b457a3ac4262a66cfff57f2c924a9 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:55 2010 -0800 zlib: make new optimized inflate endian independent Commit 6846ee5ca68d81e6baccf0d56221d7a00c1be18b ("zlib: Fix build of powerpc boot wrapper") made the new optimized inflate only available on arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. This patch will again enable the optimization for all arch's by defining our own endian independent version of unaligned access. As an added bonus, arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS do a plain load instead. Signed-off-by: Joakim Tjernlund Cc: Anton Blanchard Cc: Benjamin Herrenschmidt Cc: David Woodhouse Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ceaa2f39bfa73c4398cd01e78f1c3ebde3d3383 Author: Russell King Date: Wed Mar 10 15:23:53 2010 -0800 decompress: fix new decompressor for PIC The ARM kernel decompressor wants to be able to relocate r/w data independently from the rest of the image, and we do this by ensuring that r/w data has global visibility. Define STATIC_RW_DATA to be empty to achieve this. Signed-off-by: Russell King Cc: Alain Knaff Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c1840f15feecb6961f480cad1a7a8e53a3f2ba6 Author: Akinobu Mita Date: Wed Mar 10 15:23:52 2010 -0800 sgi-gru: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fbcae222b8aa3a47034a484e02e7fc14050c783 Author: Julia Lawall Date: Wed Mar 10 15:23:52 2010 -0800 drivers/char/mmtimer.c: eliminate useless code The variable x is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Stefan observed: The next x = rb_entry(mn->next, struct mmtimer, list); is preceded by a test whether mn->next is NULL. Unless that test is redundant too, your patch fixes a potential NULL pointer dereference, introduced by commit cbacdd95 "SGI Altix mmtimer: allow larger number of timers per node" in 2.6.26. Signed-off-by: Julia Lawall Cc: Stefan Richter Cc: Dimitri Sivanich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 582ef52a5d5650931f6d76c81d824bd98419ac8a Author: Alberto Panizzo Date: Wed Mar 10 15:23:50 2010 -0800 w1: mxc_w1: move probe() and remove() to the dev* text area This fixes the section mismatch warning for mxc_w1_probe() Cc: Evgeniy Polyakov Cc: Sascha Hauer Acked-by: Uwe Kleine-König Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6786073927c3ff3eb7fc3d2192e761e86fa0d352 Author: Roel Kluin Date: Wed Mar 10 15:23:49 2010 -0800 w1: fix test in ds2482_wait_1wire_idle() With `while (++retries < DS2482_WAIT_IDLE_TIMEOUT)' retries reaches DS2482_WAIT_IDLE_TIMEOUT after the loop Signed-off-by: Roel Kluin Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ed63d5eb4c0de0321f5c0a7328e132a78f9fafe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial amba-pl010: enable PPS support Function pl010_enable_ms() is automagically called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc77f161aa5e81ddaf38390094c4f2ca3814e6b1 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial 8250: enable PPS support Automagically function serial8250_enable_ms() is called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0880df0ccde8d551fc4d88c455acb2ee0801e26 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:47 2010 -0800 pps: serial clients support Adds support, by using the PPS line discipline, for the PPS sources connected with the CD (Carrier Detect) pin of a serial port. [akpm@linux-foundation.org: fix cast size warnings] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 572b9adbd40b5565dc413db04af9cc234f72bf19 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:46 2010 -0800 ldisc n_tty: add new method n_tty_inherit_ops() This new method can be used to init a new struct tty_ldisc_ops as the default tty_ldisc_N_TTY struct. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3e63afe8a74c0134d05a551cc74facc3b3ec0d7 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 ldisc: new dcd_change() method for line disciplines Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697fb85fcf21b5229a3072440222d14b05ef2abe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 pps: LinuxPPS clients support Each PPS source can be registered/deregistered into the system by using special modules called "clients". They simply define the PPS sources' attributes and implement the time signal registration mechanism. This patch adds a special directory for such clients and adds a dummy client that can be useful to test system integrity on real systems. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51e7364ef281e540371f084008732b13292622f0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:44 2010 -0800 Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5a69f4c1319c03b946e1e99a590b6002aa3e5ef Author: FUJITA Tomonori Date: Wed Mar 10 15:23:43 2010 -0800 Documentation: remove the PCI DMA API description in DMA-API.txt - remove the PCI DMA API description in DMA-API.txt - remove the descriptions of dma_unmap macros since PCI-DMA-mapping.txt has the same description. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 216bf58f4092df33262bea498f0460657f4842a4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:42 2010 -0800 Documentation: convert PCI-DMA-mapping.txt to use the generic DMA API - replace the PCI DMA API (i.e. pci_dma_*) with the generic DMA API. - make the document more generic (use the PCI specific explanation as an example). [akpm@linux-foundation.org: fix things Randy noticed] Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f3cd1e0bb452c31a306a3e764514ea2eaf7d2e0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:41 2010 -0800 dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h We can use pci-dma-compat.h to implement pci_set_dma_mask and pci_set_consistent_dma_mask as we do with the other PCI DMA API. We can remove HAVE_ARCH_PCI_SET_DMA_MASK too. Signed-off-by: FUJITA Tomonori Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fee48cd330c68332f9712bc968d934a1a84a32a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts arm to the generic pci_set_dma_mask and pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for dmabounce). Signed-off-by: FUJITA Tomonori Looked-over-by: Russell King Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6c70e6910d21443ab0f894bab52b9ea653ef27 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: powerpc: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts powerpc to use the generic pci_set_dma_mask and pci_set_consistent_dma_mask (drivers/pci/pci.c). The generic pci_set_dma_mask does what powerpc's pci_set_dma_mask does. Unlike powerpc's pci_set_consistent_dma_mask, the gneric pci_set_consistent_dma_mask sets only coherent_dma_mask. It doesn't work for powerpc? pci_set_consistent_dma_mask API should set only coherent_dma_mask? Signed-off-by: FUJITA Tomonori Acked-by: Benjamin Herrenschmidt Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1961f49ee8d7339ea2454443dfc0460e0b2748 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:39 2010 -0800 dma-mapping: dma-mapping.h: add dma_set_coherent_mask dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This is necessary to move to the generic device model DMA API from the PCI bus specific API in the long term. dma_set_coherent_mask works in the exact same way that pci_set_consistent_dma_mask does. So this patch also changes pci_set_consistent_dma_mask to call dma_set_coherent_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:38 2010 -0800 dma-mapping: pci: convert pci_set_dma_mask to call dma_set_mask This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask. pci_set_dma_mask (in drivers/pci/pci.c) does the same things that dma_set_mask does on all the architectures that use pci_set_dma_mask; calls dma_supprted and sets dev->dma_mask. So we safely change pci_set_dma_mask to simply call dma_set_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Acked-by: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:37 2010 -0800 dma-mapping: alpha: use include/linux/pci-dma-compat.h This converts Alpha to use include/linux/pci-dma-compat.h. Alpha is the only architecutre that implements the PCI DMA API in the own way. That makes it difficult to implement the generic DMA API via the PCI bus specific DMA API. The generic DMA API calls the PCI DMA API implementation in arch/alpha/kernel/pci_iommu.c on non Jensen systems. It calls the DMA API in arch/alpha/kernel/pci-noop.c on Jensen systems. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 349004294c365cb99a0ee84149286d6f29b1e6b9 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:35 2010 -0800 dma-mapping: sparc: unify 32bit and 64bit dma_set_mask This patchset transforms the PCI DMA API into the generic device model. It's one of the reasons why we introduced the generic DMA API long ago; driver writers are always able to use the generic DMA API with any bus instead of using bus specific DMA APIs such as pci_map_single, sbus_map_single, etc (only two bus specific APIs exist now; pci and ssb). Some of the PCI DMA API are already implented on the top of the generic DMA API (include/asm-generic/pci-dma-compat.h). But there are some exceptions. This patchset finishes the transformation. This patch: sparc has two dma_set_mask implementations for 32bit and 64bit. They are same except for the error returned value. We can safely unify them since the error returned value doesn't matter as long as it is negative (as DMA-API.txt describes). This patch also changes dma_set_mask not to call pci_set_dma_mask. Instead, dma_set_mask does the same thing that pci_set_dma_mask does. This change enables ut to change pci_set_dma_mask to call dma_set_mask; we can implement pci_set_dma_mask as pci-dma-compat.h does. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: James Bottomley Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06db881b4f1b5fb8fff563423f76b7361de8281a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:33 2010 -0800 dma-mapping: mn10300: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Koichi Yasutake Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b4f767af73d50ab9ce3a92f254eb290f5e5507c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: blackfin: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: Mike Frysinger Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 027491f4b2ff15fe5cc36c900cb2d1fdb35cefdd Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: frv: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and frv has the same comments in three files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0acedc124aca35f5cce9d4ee288dc372bf517e09 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:31 2010 -0800 dma-mapping.h: add the dma_unmap state API Adds the following macros: DECLARE_DMA_UNMAP_ADDR(ADDR_NAME) DECLARE_DMA_UNMAP_LEN(LEN_NAME) dma_unmap_addr(PTR, ADDR_NAME) dma_unmap_addr_set(PTR, ADDR_NAME, VAL) dma_unmap_len(PTR, LEN_NAME) dma_unmap_len_set(PTR, LEN_NAME, VAL) The API corresponds to the pci_unmap state API. We'll move to this new generic API from the PCI specific API in the long term. As include/asm-generic/pci-dma-compat.h does, the pci_unmap API simply calls the new generic API for some time. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f41b177157718abe9a93868bb76e47d4a6f3681d Author: FUJITA Tomonori Date: Wed Mar 10 15:23:30 2010 -0800 pci-dma: add linux/pci-dma.h to linux/pci.h All the architectures properly set NEED_DMA_MAP_STATE now so we can safely add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h inclusion in arch's asm/pci.h Signed-off-by: FUJITA Tomonori Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7e67ac1f329fa28b6a411335787c786de618cba Author: FUJITA Tomonori Date: Wed Mar 10 15:23:29 2010 -0800 pci-dma: cris: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Mikael Starvik Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479ea1e90c2b052de793a80ecc5eceab480f44ff Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: xtensa: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Chris Zankel Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d15b51be6f3a04762522c8ee9ac6a3a02752c0ed Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: sparc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cabbb6277286adf973fbb30aca9b194922a316e Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: sh: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Paul Mundt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af407c6db16aa9ca63559076dbe620220a822580 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: powerpc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Benjamin Herrenschmidt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a0bd66a3f78cb993144aaf336ce115017a0b5c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:26 2010 -0800 pci-dma: parisc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1e02b329d64353e67af070516a9bd14caff8bb0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: mips: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ralf Baechle Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed5ef8b44374def8461a0a05d4afc34d4ad684 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: ia64: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Tony Luck Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272ecbe5919d057388bbbea751fad5471aaf3f02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:24 2010 -0800 pci-dma: frv: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: arm: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Russell King Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d925badd63a4e335905066152d96b83266987c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: alpha: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bc4e4590de89c2dfcfb1000344cd072574c9ad4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:22 2010 -0800 pci-dma: x86: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5637f2df8d56b64697c1ee5c96cf0d6b650b30cb Author: FUJITA Tomonori Date: Wed Mar 10 15:23:21 2010 -0800 pci-dma: add include/linux/pci-dma.h This patch adds include/linux/pci-dma.h that defines the pci_unmap state API: DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DECLARE_PCI_UNMAP_LEN(LEN_NAME) pci_unmap_addr(PTR, ADDR_NAME) pci_unmap_addr_set(PTR, ADDR_NAME, VAL) pci_unmap_len(PTR, LEN_NAME) pci_unmap_len_set(PTR, LEN_NAME, VAL) This enables us to remove lots of the duplication in architecture implementations since there are only two ways to define the API. If architectures define CONFIG_NEED_DMA_MAP_STATE, they get the real definition of pci_unmap state API. If not, they get the noop definition. In the long term, it's better to replace the API with the generic device model API such as DECLARE_DMA_UNMAP_ADDR. We can map the API to the generic one (like dma-mapping-compat.h does). This patch also makes the migration process easier. We can remove this file after the migration. It might be simpler to add the API to include/linux/pci.h but looks it's already too large. We'll remove pci-dma.h after finishing moving to the generic device model. So I put the API to a separate file. Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Acked-by: Russell King Acked-by: David Howells Cc: Tony Luck Cc: Ralf Baechle Cc: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: David S. Miller Cc: Chris Zankel Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 771cb3ecfb4d2858a7583be83caf27726f6c3002 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 um: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Jeff Dike Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d2efd0800ee7a7c71ae8748d759bb5eb4b71839 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 alpha: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8127bfc5645db0e050468e0ff971b4081f73ddcf Author: FUJITA Tomonori Date: Wed Mar 10 15:23:18 2010 -0800 DMA-API.txt: remove dma_sync_single_range description dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9705ef7ec8c67a62474291bb4b235927bdf702db Author: FUJITA Tomonori Date: Wed Mar 10 15:23:17 2010 -0800 DMA-API.txt: add dma_sync_single/sg API description This adds the description of the following eight function: dma_sync_single_for_cpu pci_dma_sync_single_for_cpu dma_sync_single_for_device pci_dma_sync_single_for_device dma_sync_sg_for_cpu pci_dma_sync_sg_for_cpu dma_sync_sg_for_device pci_dma_sync_sg_for_device It was unclear that the API permits a partial sync (some network drivers already do though). I made it clear that the sync_single API can do a partial sync but the sync_sg API can't. We could do a partial sync with the sync_sg API too, however, it's difficult for driver writers to correctly use the sync_sg API for a partial sync since the scatterlists passed in to the mapping API can't be modified. It's unlikely that driver writers want to do a partial sync with the sync_sg API (because the sync_sg API are usually used for block drivers). So I think that it's better to forbid a partial sync with the sync_sg API. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 039956e9199b71ea673954e025f52f319110ca58 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:15 2010 -0800 Documentation/DMA-API.txt: remove deprecated function descriptions dma_sync_single(), pci_dma_sync_single(), dma_sync_sg(), and pci_dma_sync_sg() are deprecated. We should not advertise them. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: Joerg Roedel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8004fd2ad6042ae24d3913cf5089909781db3a25 Author: Peter Tyser Date: Wed Mar 10 15:23:15 2010 -0800 edac: e752x: add dram scrubbing support Add support to scrub DRAM using the e752x integrated memory scrubbing engine. The e7320/7520/e7525 chipsets support scrubbing at one rate while the i3100 chipset supports a normal and fast rate. A similar patch was originally sent back in 2008: http://sourceforge.net/mailarchive/forum.php?thread_name=1204835866.25206.70.camel@localhost.localdomain&forum_name=bluesmoke-devel This version has the following updates: - Use 16-bit PCI config cycles to access MCHSCRB register e7320/7520/e7525 docs say register is 16bits wide, i3100 says 8. I tested 16bits on the i3100 to be safe. - Recalcuate and round actual scrub rates The changes have been tested on an i3100-based board. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8de5c1a165be5624a1003ce17877299e04b2afd6 Author: Konstantin Olifer Date: Wed Mar 10 15:23:14 2010 -0800 edac: e752x fsb ecc FSB parity is only supported on the Xeon processor. Previously it was incorrectly enabled for the Celeron as well. Signed-off-by: Konstantin Olifer Signed-off-by: Doug Thompson Cc: Peter Tyser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed3f7516da31205aed9b47a13348c0d982c4f5 Author: H Hartley Sweeten Date: Wed Mar 10 15:23:13 2010 -0800 edac: mpc85xx use resource_size instead of raw math Use resource_size() instead of arithmetic. Signed-off-by: H Hartley Sweeten Signed-off-by: Doug Thompson Acked-by: Dave Jiang Cc: Peter Tyser Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcca7c3d003ce61ed71b412f645cfbe7bd8e882e Author: Peter Tyser Date: Wed Mar 10 15:23:12 2010 -0800 edac: mpc85xx improve SDRAM error reporting Add the ability to detect the specific data line or ECC line which failed when printing out SDRAM single-bit errors. An example of a single-bit SDRAM ECC error is below: EDAC MPC85xx MC1: Err Detect Register: 0x80000004 EDAC MPC85xx MC1: Faulty data bit: 59 EDAC MPC85xx MC1: Expected Data / ECC: 0x7f80d000_409effa0 / 0x6d EDAC MPC85xx MC1: Captured Data / ECC: 0x7780d000_409effa0 / 0x6d EDAC MPC85xx MC1: Err addr: 0x00031ca0 EDAC MPC85xx MC1: PFN: 0x00000031 Knowning which specific data or ECC line caused an error can be useful in tracking down hardware issues such as improperly terminated signals, loose pins, etc. Note that this feature is only currently enabled for 64-bit wide data buses, 32-bit wide bus support should be added. I don't have any 32-bit wide systems to test on. If someone has one and is willing to give this patch a shot with the check for a 64-bit data bus removed it would be much appreciated and I can re-submit with both 32 and 64 bit buses supported. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21768639be419d00275ac4e58b863361d0c24ee4 Author: Peter Tyser Date: Wed Mar 10 15:23:11 2010 -0800 edac: mpc85xx mask ecc syndrome correctly With a 64-bit wide data bus only the lowest 8-bits of the ECC syndrome are relevant. With a 32-bit wide data bus only the lowest 16-bits are relevant on most architectures. Without this change, the ECC syndrome displayed can be mildly confusing, eg: EDAC MPC85xx MC1: syndrome: 0x25252525 When in reality the ECC syndrome is 0x25. A variety of Freescale manuals say a variety of different things about how to decode the CAPTURE_ECC (syndrome) register. I don't have a system with a 32-bit bus to test on, but I believe the change is correct. It'd be good to get an ACK from someone at Freescale about this change though. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8467005da3ef6104b89a4cc5e9c9d9445b75565f Author: Alexey Dobriyan Date: Wed Mar 10 15:23:10 2010 -0800 nsproxy: remove INIT_NSPROXY() Remove INIT_NSPROXY(), use C99 initializer. Remove INIT_IPC_NS(), INIT_NET_NS() while I'm at it. Note: headers trim will be done later, now it's quite pointless because results will be invalidated by merge window. Signed-off-by: Alexey Dobriyan Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13aa9a6b0f2371d2ce0de57c2ede62ab7a787157 Author: Oleg Nesterov Date: Wed Mar 10 15:23:09 2010 -0800 pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig() zap_pid_ns_processes() uses force_sig(SIGKILL) to ensure SIGKILL will be delivered to sub-namespace inits as well. This is correct, but we are going to change force_sig_info() semantics. See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31 We can use send_sig_info(SEND_SIG_NOINFO) instead, since 614c517d7c00af1b26ded20646b329397d6f51a1 ("signals: SEND_SIG_NOINFO should be considered as SI_FROMUSER()") SEND_SIG_NOINFO means "from user" and therefore send_signal() will get the correct from_ancestor_ns = T flag. Signed-off-by: Oleg Nesterov Acked-by: Serge Hallyn Acked-by: Linus Torvalds Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb6764409392836b44a61b06d94954efd6200f Author: Corey Minyard Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: remove ipmi_smi.h self-include There is no need for linux/ipmi_smi.h to include itself. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f95d51308a72288d877c3c8dc4597c9a93f7344 Author: Bela Lubkin Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: fix slave_addrs setting to actually work Actually use the slave_addrs module parameter if it is specified, and make things consistent about passing zero in for the slave address for the default. Signed-off-by: Bela Lubkin Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae74e823cb7d4cd476f623fce9a38f625f6c09a8 Author: Martin Wilck Date: Wed Mar 10 15:23:06 2010 -0800 ipmi: add parameter to limit CPU usage in kipmid In some cases kipmid can use a lot of CPU. This adds a way to tune the CPU used by kipmid to help in those cases. By setting kipmid_max_busy_us to a value between 100 and 500, it is possible to bring down kipmid CPU load to practically 0 without loosing too much ipmi throughput performance. Not setting the value, or setting the value to zero, operation is unaffected. Signed-off-by: Martin Wilck Signed-off-by: Corey Minyard Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1eb1332b8f07e937add24c6fd2ac40b8737a2f4 Author: Jiri Slaby Date: Wed Mar 10 15:23:05 2010 -0800 ipc: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6db2ade10852b7c665b361239c3411abaa880b5 Author: Veaceslav Falico Date: Wed Mar 10 15:23:04 2010 -0800 copy_signal() cleanup: clean tty_audit_fork() Remove unneeded initialization in tty_audit_fork(). It is called only via copy_signal() and is useless after the kmem_cache_zalloc() was used. Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93c59907c6f247d09239135caecf294a106a2ae0 Author: Veaceslav Falico Date: Wed Mar 10 15:23:03 2010 -0800 copy_signal() cleanup: clean thread_group_cputime_init() Remove unneeded initializations in thread_group_cputime_init() and in posix_cpu_timers_init_group(). They are useless after kmem_cache_zalloc() was used in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dd66e69d472f0ba5355a2529364d0db9a18a02b Author: Veaceslav Falico Date: Wed Mar 10 15:23:02 2010 -0800 copy_signal() cleanup: kill taskstats_tgid_init() and acct_init_pacct() Kill unused functions taskstats_tgid_init() and acct_init_pacct() because we don't use them anywhere after using kmem_cache_zalloc() in copy_signal(). Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56704ef6b0c5796c9ff38cc78aa232dfb9644d7 Author: Veaceslav Falico Date: Wed Mar 10 15:23:01 2010 -0800 copy_signal() cleanup: use zalloc and remove initializations Use kmem_cache_zalloc() on signal creation and remove unneeded initialization lines in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e34112e3966fc466ced2698e6c196bb50b1ee20e Author: Christoph Hellwig Date: Wed Mar 10 15:23:01 2010 -0800 m32r: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. The old code only disables the breakpoints on PTRACE_KILL, while after this patch this also happens for PTRACE_CONT and PTRACE_SYSCALL which matches the behaviour of the other architetures. I think this is a bugfixes, but please double verify this is correct. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 290ba3aef58ff21c977585ff6b687e457f80bf54 Author: Christoph Hellwig Date: Wed Mar 10 15:23:00 2010 -0800 cris arch-v32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. The way breakpoints are disabled is entirely inconsistent currently, I tried to make some sense of it, but I suspect all of the content of ptrace_disable should be moved into user_disable_single_step, this defintively needs some revisting as the current patch changes behaviour in not quite designed ways. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8313809ef3bfa8fa366d416add2150787235f192 Author: Christoph Hellwig Date: Wed Mar 10 15:22:58 2010 -0800 cris arch-v10: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d75ca10225be4c7509026f9b61c740b22e734e4 Author: Christoph Hellwig Date: Wed Mar 10 15:22:57 2010 -0800 xtensa: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bd095083558928cc3b36b826422d69bcd743dca Author: Christoph Hellwig Date: Wed Mar 10 15:22:56 2010 -0800 um: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. XXX: I'm not sure arch_has_single_step() is placed in the exactly correct location, please verify in which of the ptrace headers it should really be. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55436c91652b45be576b91ec96a8d65f6b7447fa Author: Christoph Hellwig Date: Wed Mar 10 15:22:55 2010 -0800 mips: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa1ac57a317f927b8fb901e6270fc41fdaae8e1c Author: Christoph Hellwig Date: Wed Mar 10 15:22:54 2010 -0800 microblaze: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Michal Simek Cc: John Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a0fde8b3b16fcfb2bb4a136c53918f1ca9b35cc Author: Christoph Hellwig Date: Wed Mar 10 15:22:53 2010 -0800 m68knommu: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. m68knommu already defines the nessecary user_enable_single_step and user_disable_single_step functions for this. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 857fb252a1858ccded2e31ee98c6c0ab79c07999 Author: Christoph Hellwig Date: Wed Mar 10 15:22:52 2010 -0800 h8300: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8393171b1f6c30a889fd7cb16fc193f689923c Author: Christoph Hellwig Date: Wed Mar 10 15:22:51 2010 -0800 avr32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Currently avr32 doesn't implement any code to disable single stepping when one of the non-syscall requests is called which seems wrong, but I've left it as-is for now. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 440e6ca79aebdc274ce4c625a6f42c8bf3c7bc91 Author: Christoph Hellwig Date: Wed Mar 10 15:22:50 2010 -0800 arm: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't and the single stepping disable only happens if the tracee process isn't a zombie yet, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd341abba65e3d93fc24c132e4c0278d18b6d2fc Author: Christoph Hellwig Date: Wed Mar 10 15:22:47 2010 -0800 alpha: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Matt Turner Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dacbe41f776db0a5a9aee1e41594f405c95778a5 Author: Christoph Hellwig Date: Wed Mar 10 15:22:46 2010 -0800 ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h While in theory user_enable_single_step/user_disable_single_step/ user_enable_blockstep could also be provided as an inline or macro there's no good reason to do so, and having the prototype in one places keeps code size and confusion down. Roland said: The original thought there was that user_enable_single_step() et al might well be only an instruction or three on a sane machine (as if we have any of those!), and since there is only one call site inlining would be beneficial. But I agree that there is no strong reason to care about inlining it. As to the arch changes, there is only one thought I'd add to the record. It was always my thinking that for an arch where PTRACE_SINGLESTEP does text-modifying breakpoint insertion, user_enable_single_step() should not be provided. That is, arch_has_single_step()=>true means that there is an arch facility with "pure" semantics that does not have any unexpected side effects. Inserting a breakpoint might do very unexpected strange things in multi-threaded situations. Aside from that, it is a peculiar side effect that user_{enable,disable}_single_step() should cause COW de-sharing of text pages and so forth. For PTRACE_SINGLESTEP, all these peculiarities are the status quo ante for that arch, so having arch_ptrace() itself do those is one thing. But for building other things in the future, it is nicer to have a uniform "pure" semantics that arch-independent code can expect. OTOH, all such arch issues are really up to the arch maintainer. As of today, there is nothing but ptrace using user_enable_single_step() et al so it's a distinction without a practical difference. If/when there are other facilities that use user_enable_single_step() and might care, the affected arch's can revisit the question when someone cares about the quality of the arch support for said new facility. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3c1e01a09d6af2dd7811a066ffcfc5171be2bed Author: Christoph Hellwig Date: Wed Mar 10 15:22:44 2010 -0800 ptrace: use ptrace_request() in the remaining architectures Use ptrace_request() in the three remaining architectures that didn't use it (m68knommu, h8300, microblaze). This means: - ptrace_request now handles PTRACE_{PEEK,POKE}{TEXT,DATA} and PTRACE_DETATCH calls that were previously called directly, or in case of h8300 even open coded. - adds new support for PTRACE_SETOPTIONS/PTRACE_GETEVENTMSG/ PTRACE_GETSIGINFO/PTRACE_SETSIGINFO Signed-off-by: Christoph Hellwig Cc: Geert Uytterhoeven Cc: Yoshinori Sato Cc: Oleg Nesterov Cc: Michal Simek Acked-by: Greg Ungerer Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7baab93f9297da3e42a8cecfbf91d5f22f415500 Author: Miao Xie Date: Wed Mar 10 15:22:42 2010 -0800 nodemask: fix the declaration of NODEMASK_ALLOC() we can't declarate two variable at the same scope by NODEMASK_ALLOC(). This patch fixes it. Signed-off-by: Miao Xie Cc: David Rientjes Cc: Lee Schermerhorn Cc: Nick Piggin Cc: Paul Menage Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a38374b8bd482b1e7c25f830772e9b73337ec2ed Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:40 2010 -0800 memcg: update maintainer list Nishimura-san have been working for memcg very good. His review and tests give us much improvements and account migraiton which he is now challenging is really important. He is a stakeholder. Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Acked-by: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 867578cbccb0893cc14fc29c670f7185809c90d6 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:39 2010 -0800 memcg: fix oom kill behavior In current page-fault code, handle_mm_fault() -> ... -> mem_cgroup_charge() -> map page or handle error. -> check return code. If page fault's return code is VM_FAULT_OOM, page_fault_out_of_memory() is called. But if it's caused by memcg, OOM should have been already invoked. Then, I added a patch: a636b327f731143ccc544b966cfd8de6cb6d72c6. That patch records last_oom_jiffies for memcg's sub-hierarchy and prevents page_fault_out_of_memory from being invoked in near future. But Nishimura-san reported that check by jiffies is not enough when the system is terribly heavy. This patch changes memcg's oom logic as. * If memcg causes OOM-kill, continue to retry. * remove jiffies check which is used now. * add memcg-oom-lock which works like perzone oom lock. * If current is killed(as a process), bypass charge. Something more sophisticated can be added but this pactch does fundamental things. TODO: - add oom notifier - add permemcg disable-oom-kill flag and freezer at oom. - more chances for wake up oom waiter (when changing memory limit etc..) Reviewed-by: Daisuke Nishimura Tested-by: Daisuke Nishimura Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Signed-off-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0263c12c12ccc90edc9d856fa839f8936183e6d1 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:37 2010 -0800 memcg: fix typos in memcg_test.txt Signed-off-by: Kirill A. Shutemov Reviewed-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e111452d457ceedec8a57fc3d45b1312e736fba Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:36 2010 -0800 memcg: update memcg_test.txt to describe memory thresholds Decription of sanity check for memory thresholds. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8fd973a41942bc760dd21581e24117bc1dd063 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:35 2010 -0800 cgroups: add simple listener of cgroup events to documentation An example of cgroup notification API usage. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a4db548edcce067c1201ef25cf2bc29f32dca4 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: remove events before destroying subsystem state objects Events should be removed after rmdir of cgroup directory, but before destroying subsystem state objects. Let's take reference to cgroup directory dentry to do that. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab78683c17d739c2a2077141dcf81a02b7fb57e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: fix race between userspace and kernelspace Notify userspace about cgroup removing only after rmdir of cgroup directory to avoid race between userspace and kernelspace. eventfd are used to notify about two types of event: - control file-specific, like crossing memory threshold; - cgroup removing. To understand what really happen, userspace can check if the cgroup still exists. To avoid race beetween userspace and kernelspace we have to notify userspace about cgroup removing only after rmdir of cgroup directory. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daaf1e68874c078a15ae6ae827751839c4d81739 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:32 2010 -0800 memcg: handle panic_on_oom=always case Presently, if panic_on_oom=2, the whole system panics even if the oom happend in some special situation (as cpuset, mempolicy....). Then, panic_on_oom=2 means painc_on_oom_always. Now, memcg doesn't check panic_on_oom flag. This patch adds a check. BTW, how it's useful ? kdump+panic_on_oom=2 is the last tool to investigate what happens in oom-ed system. When a task is killed, the sysytem recovers and there will be few hint to know what happnes. In mission critical system, oom should never happen. Then, panic_on_oom=2+kdump is useful to avoid next OOM by knowing precise information via snapshot. TODO: - For memcg, it's for isolate system's memory usage, oom-notiifer and freeze_at_oom (or rest_at_oom) should be implemented. Then, management daemon can do similar jobs (as kdump) or taking snapshot per cgroup. Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Cc: Nick Piggin Reviewed-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1080d7a30304d03b1d9fd530aacd8aece2d702a2 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:31 2010 -0800 memcg: update memcg_test.txt Update memcg_test.txt to describe how to test the move-charge feature. Signed-off-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: "Kirill A. Shutemov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2265e6fa3f220ea5fd37522d13390e9675adcf7 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:31 2010 -0800 memcg : share event counter rather than duplicate Memcg has 2 eventcountes which counts "the same" event. Just usages are different from each other. This patch tries to reduce event counter. Now logic uses "only increment, no reset" counter and masks for each checks. Softlimit chesk was done per 1000 evetns. So, the similar check can be done by !(new_counter & 0x3ff). Threshold check was done per 100 events. So, the similar check can be done by (!new_counter & 0x7f) ALL event checks are done right after EVENT percpu counter is updated. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 430e48631e72aeab74d844c57b441f98a2e36eee Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:30 2010 -0800 memcg: update threshold and softlimit at commit Presently, move_task does "batched" precharge. Because res_counter or css's refcnt are not-scalable jobs for memcg, try_charge_().. tend to be done in batched manner if allowed. Now, softlimit and threshold check their event counter in try_charge, but the charge is not a per-page event. And event counter is not updated at charge(). Moreover, precharge doesn't pass "page" to try_charge() and softlimit tree will be never updated until uncharge() causes an event." So the best place to check the event counter is commit_charge(). This is per-page event by its nature. This patch move checks to there. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c62b1a3b31b5e27a6c5c2e91cc5ce05fdb6344d0 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:29 2010 -0800 memcg: use generic percpu instead of private implementation When per-cpu counter for memcg was implemneted, dynamic percpu allocator was not very good. But now, we have good one and useful macros. This patch replaces memcg's private percpu counter implementation with generic dynamic percpu allocator. The benefits are - We can remove private implementation. - The counters will be NUMA-aware. (Current one is not...) - This patch makes sizeof struct mem_cgroup smaller. Then, struct mem_cgroup may be fit in page size on small config. - About basic performance aspects, see below. [Before] # size mm/memcontrol.o text data bss dec hex filename 24373 2528 4132 31033 7939 mm/memcontrol.o [page-fault-throuput test on 8cpu/SMP in root cgroup] # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 45878618 page-faults ( +- 0.110% ) 602635826 cache-misses ( +- 0.105% ) 61.005373262 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 13.14 [After] #size mm/memcontrol.o text data bss dec hex filename 23913 2528 4132 30573 776d mm/memcontrol.o # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 48179400 page-faults ( +- 0.271% ) 588628407 cache-misses ( +- 0.136% ) 61.004615021 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 12.22 Text size is reduced. This performance improvement is not big and will be invisible in real world applications. But this result shows this patch has some good effect even on (small) SMP. Here is a test program I used. 1. fork() processes on each cpus. 2. do page fault repeatedly on each process. 3. after 60secs, kill all childredn and exit. (3 is necessary for getting stable data, this is improvement from previous one.) #define _GNU_SOURCE #include #include #include #include #include #include #include #include /* * For avoiding contention in page table lock, FAULT area is * sparse. If FAULT_LENGTH is too large for your cpus, decrease it. */ #define FAULT_LENGTH (2 * 1024 * 1024) #define PAGE_SIZE 4096 #define MAXNUM (128) void alarm_handler(int sig) { } void *worker(int cpu, int ppid) { void *start, *end; char *c; cpu_set_t set; int i; CPU_ZERO(&set); CPU_SET(cpu, &set); sched_setaffinity(0, sizeof(set), &set); start = mmap(NULL, FAULT_LENGTH, PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); if (start == MAP_FAILED) { perror("mmap"); exit(1); } end = start + FAULT_LENGTH; pause(); //fprintf(stderr, "run%d", cpu); while (1) { for (c = (char*)start; (void *)c < end; c += PAGE_SIZE) *c = 0; madvise(start, FAULT_LENGTH, MADV_DONTNEED); } return NULL; } int main(int argc, char *argv[]) { int num, i, ret, pid, status; int pids[MAXNUM]; if (argc < 2) return 0; setpgid(0, 0); signal(SIGALRM, alarm_handler); num = atoi(argv[1]); pid = getpid(); for (i = 0; i < num; ++i) { ret = fork(); if (!ret) { worker(i, pid); exit(0); } pids[i] = ret; } sleep(1); kill(-pid, SIGALRM); sleep(60); for (i = 0; i < num; i++) kill(pids[i], SIGKILL); for (i = 0; i < num; i++) waitpid(pids[i], &status, 0); return 0; } Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a6135b64fda39d931a79090f4da37f1c6da4a8c Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:25 2010 -0800 memcg: typo in comment to mem_cgroup_print_oom_info() s/mem_cgroup_print_mem_info/mem_cgroup_print_oom_info/ Signed-off-by: Kirill A. Shutemov Cc: Balbir Singh Cc: Pavel Emelyanov Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e72b6347c9459e6cff5634ddc815485bae6985f Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:24 2010 -0800 memcg: implement memory thresholds It allows to register multiple memory and memsw thresholds and gets notifications when it crosses. To register a threshold application need: - create an eventfd; - open memory.usage_in_bytes or memory.memsw.usage_in_bytes; - write string like " " to cgroup.event_control. Application will be notified through eventfd when memory usage crosses threshold in any direction. It's applicable for root and non-root cgroup. It uses stats to track memory usage, simmilar to soft limits. It checks if we need to send event to userspace on every 100 page in/out. I guess it's good compromise between performance and accuracy of thresholds. [akpm@linux-foundation.org: coding-style fixes] [nishimura@mxp.nes.nec.co.jp: fix documentation merge issue] Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378ce724bc2a0ef1243e11c09d58a70bb6be007a Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:23 2010 -0800 memcg: rework usage of stats by soft limit Instead of incrementing counter on each page in/out and comparing it with constant, we set counter to constant, decrement counter on each page in/out and compare it with zero. We want to make comparing as fast as possible. On many RISC systems (probably not only RISC) comparing with zero is more effective than comparing with a constant, since not every constant can be immediate operand for compare instruction. Also, I've renamed MEM_CGROUP_STAT_EVENTS to MEM_CGROUP_STAT_SOFTLIMIT, since really it's not a generic counter. Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 104f39284e830f425085886ef72c49aee6631575 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:21 2010 -0800 memcg: extract mem_group_usage() from mem_cgroup_read() Helper to get memory or mem+swap usage of the cgroup. Signed-off-by: Kirill A. Shutemov Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dea116876eefc9c7ca9c5d74fe665481e499fa3 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:20 2010 -0800 cgroup: implement eventfd-based generic API for notifications This patchset introduces eventfd-based API for notifications in cgroups and implements memory notifications on top of it. It uses statistics in memory controler to track memory usage. Output of time(1) on building kernel on tmpfs: Root cgroup before changes: make -j2 506.37 user 60.93s system 193% cpu 4:52.77 total Non-root cgroup before changes: make -j2 507.14 user 62.66s system 193% cpu 4:54.74 total Root cgroup after changes (0 thresholds): make -j2 507.13 user 62.20s system 193% cpu 4:53.55 total Non-root cgroup after changes (0 thresholds): make -j2 507.70 user 64.20s system 193% cpu 4:55.70 total Root cgroup after changes (1 thresholds, never crossed): make -j2 506.97 user 62.20s system 193% cpu 4:53.90 total Non-root cgroup after changes (1 thresholds, never crossed): make -j2 507.55 user 64.08s system 193% cpu 4:55.63 total This patch: Introduce the write-only file "cgroup.event_control" in every cgroup. To register new notification handler you need: - create an eventfd; - open a control file to be monitored. Callbacks register_event() and unregister_event() must be defined for the control file; - write " " to cgroup.event_control. Interpretation of args is defined by control file implementation; eventfd will be woken up by control file implementation or when the cgroup is removed. To unregister notification handler just close eventfd. If you need notification functionality for a control file you have to implement callbacks register_event() and unregister_event() in the struct cftype. [kamezawa.hiroyu@jp.fujitsu.com: Kconfig fix] Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 483c30b514bd3037fa3f19fa42327c94c10f51c8 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:18 2010 -0800 memcg: improve performance in moving swap charge Try to reduce overheads in moving swap charge by: - Adds a new function(__mem_cgroup_put), which takes "count" as a arg and decrement mem->refcnt by "count". - Removed res_counter_uncharge, css_put, and mem_cgroup_put from the path of moving swap account, and consolidate all of them into mem_cgroup_clear_mc. We cannot do that about mc.to->refcnt. These changes reduces the overhead from 1.35sec to 0.9sec to move charges of 1G anonymous memory(including 500MB swap) in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 024914477e15ef8b17f271ec47f1bb8a589f0806 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:17 2010 -0800 memcg: move charges of anonymous swap This patch is another core part of this move-charge-at-task-migration feature. It enables moving charges of anonymous swaps. To move the charge of swap, we need to exchange swap_cgroup's record. In current implementation, swap_cgroup's record is protected by: - page lock: if the entry is on swap cache. - swap_lock: if the entry is not on swap cache. This works well in usual swap-in/out activity. But this behavior make the feature of moving swap charge check many conditions to exchange swap_cgroup's record safely. So I changed modification of swap_cgroup's recored(swap_cgroup_record()) to use xchg, and define a new function to cmpxchg swap_cgroup's record. This patch also enables moving charge of non pte_present but not uncharged swap caches, which can be exist on swap-out path, by getting the target pages via find_get_page() as do_mincore() does. [kosaki.motohiro@jp.fujitsu.com: fix ia64 build] [akpm@linux-foundation.org: fix typos] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8033b97c9b5ef063e3f4bf2efe1cd0a22093aaff Author: Daisuke Nishimura Date: Wed Mar 10 15:22:16 2010 -0800 memcg: avoid oom during moving charge This move-charge-at-task-migration feature has extra charges on "to"(pre-charges) and "from"(left-over charges) during moving charge. This means unnecessary oom can happen. This patch tries to avoid such oom. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 854ffa8d104e44111fec96764c0e0cb29223d54c Author: Daisuke Nishimura Date: Wed Mar 10 15:22:15 2010 -0800 memcg: improve performance in moving charge Try to reduce overheads in moving charge by: - Instead of calling res_counter_uncharge() against the old cgroup in __mem_cgroup_move_account() everytime, call res_counter_uncharge() at the end of task migration once. - removed css_get(&to->css) from __mem_cgroup_move_account() because callers should have already called css_get(). And removed css_put(&to->css) too, which was called by callers of move_account on success of move_account. - Instead of calling __mem_cgroup_try_charge(), i.e. res_counter_charge(), repeatedly, call res_counter_charge(PAGE_SIZE * count) in can_attach() if possible. - Instead of calling css_get()/css_put() repeatedly, make use of coalesce __css_get()/__css_put() if possible. These changes reduces the overhead from 1.7sec to 0.6sec to move charges of 1G anonymous memory in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ffef5feff4e4240e767d2f1144b1634a41762e3 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:14 2010 -0800 memcg: move charges of anonymous page This patch is the core part of this move-charge-at-task-migration feature. It implements functions to move charges of anonymous pages mapped only by the target task. Implementation: - define struct move_charge_struct and a valuable of it(mc) to remember the count of pre-charges and other information. - At can_attach(), get anon_rss of the target mm, call __mem_cgroup_try_charge() repeatedly and count up mc.precharge. - At attach(), parse the page table, find a target page to be move, and call mem_cgroup_move_account() about the page. - Cancel all precharges if mc.precharge > 0 on failure or at the end of task move. [akpm@linux-foundation.org: a little simplification] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dc74be032bfcaa2f9d9e4296ff5bbddfa9e2f19 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:13 2010 -0800 memcg: add interface to move charge at task migration In current memcg, charges associated with a task aren't moved to the new cgroup at task migration. Some users feel this behavior to be strange. These patches are for this feature, that is, for charging to the new cgroup and, of course, uncharging from the old cgroup at task migration. This patch adds "memory.move_charge_at_immigrate" file, which is a flag file to determine whether charges should be moved to the new cgroup at task migration or not and what type of charges should be moved. This patch also adds read and write handlers of the file. This patch also adds no-op handlers for this feature. These handlers will be implemented in later patches. And you cannot write any values other than 0 to move_charge_at_immigrate yet. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b70cc5fdb445a6929a01e9c406593265b136c99d Author: Li Zefan Date: Wed Mar 10 15:22:12 2010 -0800 cgroups: clean up cgroup_pidlist_find() a bit Don't call get_pid_ns() before we locate/alloc the ns. Signed-off-by: Li Zefan Cc: Serge Hallyn Acked-by: Paul Menage Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67523c48aa74d5637848edeccf285af1c60bf14a Author: Ben Blum Date: Wed Mar 10 15:22:11 2010 -0800 cgroups: blkio subsystem as module Modify the Block I/O cgroup subsystem to be able to be built as a module. As the CFQ disk scheduler optionally depends on blk-cgroup, config options in block/Kconfig, block/Kconfig.iosched, and block/blk-cgroup.h are enhanced to support the new module dependency. Signed-off-by: Ben Blum Cc: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Cc: Vivek Goyal Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ca712ea84728531d36841ca8f98f9e8680bcf4e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:10 2010 -0800 cgroups: fix CONTENTS in cgroups documentation Add a forgotten item into CONTENTS. Signed-off-by: Kirill A. Shutemov Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf5d5941fda647fe3d2f2d00cf9e0245236a5f08 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module unloading Provides support for unloading modular subsystems. This patch adds a new function cgroup_unload_subsys which is to be used for removing a loaded subsystem during module deletion. Reference counting of the subsystems' modules is moved from once (at load time) to once per attached hierarchy (in parse_cgroupfs_options and rebind_subsystems) (i.e., 0 or 1). Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a1105ba08b265023dd71a4174fb4a29ebc7083 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module loading interface Add interface between cgroups subsystem management and module loading This patch implements rudimentary module-loading support for cgroups - namely, a cgroup_load_subsys (similar to cgroup_init_subsys) for use as a module initcall, and a struct module pointer in struct cgroup_subsys. Several functions that might be wanted by modules have had EXPORT_SYMBOL added to them, but it's unclear exactly which functions want it and which won't. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aae8aab40367036931608fdaf9e2dc568b516f19 Author: Ben Blum Date: Wed Mar 10 15:22:07 2010 -0800 cgroups: revamp subsys array This patch series provides the ability for cgroup subsystems to be compiled as modules both within and outside the kernel tree. This is mainly useful for classifiers and subsystems that hook into components that are already modules. cls_cgroup and blkio-cgroup serve as the example use cases for this feature. It provides an interface cgroup_load_subsys() and cgroup_unload_subsys() which modular subsystems can use to register and depart during runtime. The net_cls classifier subsystem serves as the example for a subsystem which can be converted into a module using these changes. Patch #1 sets up the subsys[] array so its contents can be dynamic as modules appear and (eventually) disappear. Iterations over the array are modified to handle when subsystems are absent, and the dynamic section of the array is protected by cgroup_mutex. Patch #2 implements an interface for modules to load subsystems, called cgroup_load_subsys, similar to cgroup_init_subsys, and adds a module pointer in struct cgroup_subsys. Patch #3 adds a mechanism for unloading modular subsystems, which includes a more advanced rework of the rudimentary reference counting introduced in patch 2. Patch #4 modifies the net_cls subsystem, which already had some module declarations, to be configurable as a module, which also serves as a simple proof-of-concept. Part of implementing patches 2 and 4 involved updating css pointers in each css_set when the module appears or leaves. In doing this, it was discovered that css_sets always remain linked to the dummy cgroup, regardless of whether or not any subsystems are actually bound to it (i.e., not mounted on an actual hierarchy). The subsystem loading and unloading code therefore should keep in mind the special cases where the added subsystem is the only one in the dummy cgroup (and therefore all css_sets need to be linked back into it) and where the removed subsys was the only one in the dummy cgroup (and therefore all css_sets should be unlinked from it) - however, as all css_sets always stay attached to the dummy cgroup anyway, these cases are ignored. Any fix that addresses this issue should also make sure these cases are addressed in the subsystem loading and unloading code. This patch: Make subsys[] able to be dynamically populated to support modular subsystems This patch reworks the way the subsys[] array is used so that subsystems can register themselves after boot time, and enables the internals of cgroups to be able to handle when subsystems are not present or may appear/disappear. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b9fff711d5e8db8c844161c684017e556c38a0 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:05 2010 -0800 cgroup: introduce coalesce css_get() and css_put() Current css_get() and css_put() increment/decrement css->refcnt one by one. This patch add a new function __css_get(), which takes "count" as a arg and increment the css->refcnt by "count". And this patch also add a new arg("count") to __css_put() and change the function to decrement the css->refcnt by "count". These coalesce version of __css_get()/__css_put() will be used to improve performance of memcg's moving charge feature later, where instead of calling css_get()/css_put() repeatedly, these new functions will be used. No change is needed for current users of css_get()/css_put(). Signed-off-by: Daisuke Nishimura Acked-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2468c7234b366eeb799ee0648cb58f9cba394a54 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:03 2010 -0800 cgroup: introduce cancel_attach() Add cancel_attach() operation to struct cgroup_subsys. cancel_attach() can be used when can_attach() operation prepares something for the subsys, but we should rollback what can_attach() operation has prepared if attach task fails after we've succeeded in can_attach(). Signed-off-by: Daisuke Nishimura Acked-by: Li Zefan Reviewed-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce9f07bf1bed9a1f9886373ad0b149294f84c25 Author: Dave Young Date: Wed Mar 10 15:22:02 2010 -0800 Documentation/email-clients.txt: update gmail information Gmail web gui does not work for sending patches now even with firefox "view source with" extension. It will use windows style line breaks to wrap lines automatically when sening email. Rewrite the gmail web gui part of email client documentation. Signed-off-by: Dave Young Cc: Randy Dunlap Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c98ecaf350737cd424eb94140e9e9f1a3408956 Author: Randy Dunlap Date: Wed Mar 10 15:22:02 2010 -0800 scripts/kernel-doc: fix empty function description section scripts/kernel-doc mishandles a function that has a multi-line function short description and no function parameters. The observed problem was from drivers/scsi/scsi_netlink.c: /** * scsi_netlink_init - Called by SCSI subsystem to intialize * the SCSI transport netlink interface * **/ kernel-doc treated the " * " line as a Description: section with only a newline character in the Description contents. This caused output_highlight() to complain: "output_highlight got called with no args?", plus produce a perl call stack backtrace. The fix is just to ignore Description sections if they only contain "\n". Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6b6e2b112cafcd63bdbebbffe97279f41e5ca62 Author: Bartlomiej Zolnierkiewicz Date: Wed Mar 10 15:22:00 2010 -0800 Documentation: remove obsolete voyager.txt file x86/Voyager support has been removed a year ago. Signed-off-by: Bartlomiej Zolnierkiewicz Inspired-by: Jonathan Corbet Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5247c854ed1cef30e0c7f4c6dfbf3c9d83bcf8e Author: Randy Dunlap Date: Wed Mar 10 15:21:59 2010 -0800 Documentation/SubmitChecklist: add rule #1 Add header file requirements. Compliments of Stephen Rothwell. Stephen calls this Rule #1, so I put it there, but I didn't want to demote any of the others in the list, so I made one of them number 2b. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bace8c1edefa700c7f7af522c5374ef63860ae Author: Randy Dunlap Date: Wed Mar 10 15:21:58 2010 -0800 Documentation/vm/: split txt and source files Documentation/vm/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Also build the recently-added map_hugetlb.c. Make several functions static to prevent linker warnings. Signed-off-by: Randy Dunlap Acked-by: Eric B Munson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e0051ae48a253685e4309256f9c1ec2bdb74b5d Author: Randy Dunlap Date: Wed Mar 10 15:21:57 2010 -0800 Documentation/fs/: split txt and source files Make dnotify_test.c source file and add it to Makefile so that bitrot can be prevented. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49129accc21ddb2e779d375dacafb612b1bd28d Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/laptop/: split txt and source files Documentation/laptops/laptop-mode.txt: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61863099f58e458f08c101da87da752a1e009f5 Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/timers/: split txt and source files Documentation/timers/hpet.txt: Expose example and tool source files in the Documentation/timers/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad25ad979a309963e580015d57e4ec7da72bb7d4 Author: Evgeniy Dushistov Date: Wed Mar 10 15:21:55 2010 -0800 ufs: make solaris fsck happy Alex Viskovatoff let me know that after copying data to solaris's ufs from linux, solaris's fsck sees some errors in cylinder summary information. This is because of solaris expects find some data on another places, then curernt implementation save it. This patch fixes this issue. It is tested by me, and also Alex reported that it works for him. Signed-off-by: Evgeniy Dushistov Reported-by: Alex Viskovatoff Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3a0fd4d877fe7692901b5867ba7cbd3f6d19d22 Author: Alex Viskovatoff Date: Wed Mar 10 15:21:53 2010 -0800 fs/ufs: recognize Solaris-specific file system state Recent releases of Solaris set the fs_clean state of an unmounted UFS file system as FSLOG ("logging fs"). However, the Linux kernel currently does not recognize the value which represents this state. Thus, attempting to mount such a file system rw produces the message kernel: ufs_read_super: can't grok fs_clean 0xfffffffd and the file system is mounted read-only. This patch makes the kernel recognize that value. Signed-off-by: Alex Viskovatoff Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7d4d849b4e3acc405ec222884936800ffb26d48 Author: Andrew Morton Date: Wed Mar 10 15:21:52 2010 -0800 drivers/char/mem.c: cleanups - fix switch statement layout - fix whitespace stuff - fix comment layout - remove unneeded inlining - use __weak - remove trailing whitespace - move uncached_access() inside `#ifndef __HAVE_PHYS_MEM_ACCESS_PROT' - it is otherwise unused. Cc: KAMEZAWA Hiroyuki Cc: OGAWA Hirofumi Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcefafb6ac90ece8d68a6c203105f3d313e52da4 Author: Wu Fengguang Date: Wed Mar 10 15:21:51 2010 -0800 /dev/mem: dont allow seek to last page So as to return a uniform error -EOVERFLOW instead of a random one: # kmem-seek 0xfffffffffffffff0 seek /dev/kmem: Device or resource busy # kmem-seek 0xfffffffffffffff1 seek /dev/kmem: Block device required Suggested by OGAWA Hirofumi. Cc: OGAWA Hirofumi Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cb9a75d13676d75bcc6fbc6f885403795581913 Author: Huang Weiyi Date: Wed Mar 10 15:21:51 2010 -0800 fbdev: bfin-lq035q1-fb: remove duplicated #include Remove duplicated #include('s) in drivers/video/bfin-lq035q1-fb.c Signed-off-by: Huang Weiyi Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8b1925430339be1464a9a028754d94984dacfdb Author: Ben Hutchings Date: Wed Mar 10 15:21:49 2010 -0800 video: fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2164235da9153f1fbd5191bf71c86fae322c7dd7 Author: Christoph Egger Date: Wed Mar 10 15:21:49 2010 -0800 obsolete config in kernel source: LWMON5 There was some conditionalizing for the LWMON5 boards in kernel source. However infrastructure for enabling this isn't here so probably the special case code can go as well. Signed-off-by: Christoph Egger Acked-by: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c0e0c88422033c9b6162bf7875aecdd095130b7 Author: Joe Perches Date: Wed Mar 10 15:21:48 2010 -0800 drivers/video/via: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Acked-by: Florian Tobias Schandinat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8661970875d7d27e4de233d357327fffdb4a5e3d Author: Wang Qiang Date: Wed Mar 10 15:21:47 2010 -0800 NUC900 LCD Controller Driver An LCD controller driver for nuc900s. The Linux LOGO is just fine and the FB-Test application was ok, too. Signed-off-by: Wang Qiang Cc: Wang Zongshun Cc: Russell King Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91d4e0a4c889e3e8078c26542b8f5a322b87adf4 Author: Christoph Egger Date: Wed Mar 10 15:21:46 2010 -0800 fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR The config Option FB_SOFT_BUFFER was removed in c465e05a03209651078b95686158648fd7ed84c5 ("fbcon/fbdev: Move softcursor out of fbdev to fbcon"). While moving to fbcon this single driver has it left as a select in KConfig / #ifdef in source. This last occurence is removed here so the option is really gone Signed-off-by: Christoph Egger Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55a23c4af83df9c8fdf55690a09a3f0a92bd127b Author: Maik Broemme Date: Wed Mar 10 15:21:44 2010 -0800 intelfb: new maintainer It seems that Sylvain no longer maintain the intelfb driver. Two weeks ago I had a short mail conversation with Jean regarding who can replace him. Well I will do it, because I know the driver and use it very often. Attached is a patch which update the maintainer file to make bug reporting easier. Signed-off-by: Maik Broemme Sylvain Meyer Cc: Krzysztof Helt Cc: Dave Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b32bfc3843f7fd090d30853d98866d923cfb8fff Author: Jaya Kumar Date: Wed Mar 10 15:21:43 2010 -0800 broadsheetfb: support storing waveform This patch adds waveform storing capability to broadsheetfb. It uses the firmware class to retrieve the waveform, and the request to initiate the waveform storing is done via a driver sysfs entry, loadstore_waveform. Broadsheet is a framebuffer device. It is slightly different from a typical framebuffer controller that drives a normal TFT-LCD display. Most E-Ink display panels require a waveform in order to function. That is, in order to drive the state of a pixel to black, gray, or white, a specific waveform is utilized. Basically, that waveform represents the specific E-field wiggling needed to get the pixel to its optimal state given current temperature, and its previous state. TN/IPS-LCDs use a similar concept but the driving waveform is sufficiently simple that it is internalized in the TFT source/gate driver. These E-Ink waveforms are specific to a production batch. That is, a batch of display films are produced, then they get characterized and a waveform is generated for that batch. Broadsheet, typically, is attached to its private SPI flash which is then flashed with this waveform. Users won't be able to see the waveform and typically won't ever need to know about it. If however, the display panel attached to broadsheet is changed out, then they will need to update their waveform. That would typically be done at a factory or repair facility rather than by a user. [akpm@linux-foundation.org: fix printk warning] Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2afb18981739a1426af2a6c952e03c5966b3dfc6 Author: Jaya Kumar Date: Wed Mar 10 15:21:41 2010 -0800 broadsheetfb: add MMIO hooks Allow boards with GP-MMIO controllers to provide hooks to broadsheetfb in order to offload cmd/data writes and data reads instead of relying only on host based GPIO wiggling. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17cea3cece6d3ec47a5b358821505943abe6541 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:41 2010 -0800 viafb: support color depth 15 and 30 Add support for the color depth 15 on IGA1 and 30 on IGA1 and IGA2. To allow the usage of those the driver now refuses color depth that are totally off and otherwise the selection in viafb_check_var is used. Therefore the first call to this for the first framebuffer was delayed a bit. It only enables the new formats if they are requested exactly (viafb_bpp=15|30). As this is a new feature, no regressions are expected. The color depth 15 was successfully tested. Didn't get anything usable for 30 but that might be the programs fault. I would like to get some feedback whether it works as expected or not if somebody knows a program/configuration where it should. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 415559fbf2353f4271a4cd6e11259b8bbc97cc33 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:40 2010 -0800 viafb: rework color setting This is a rewritten version of viafb_setcolreg. The hardware register writes were split up and moved to hw.c where they belong as this is really low level stuff. It was made dual fb aware. Furthermore viafb_setcmap was removed as the problem with 8bpp originated from a bug in writing multiple color registers at once. The removal of viafb_setcmap might introduce a small performance regression but its certainly better to receive the correct result a bit slower than a garbled picture fast. It should give us a working 8bpp mode and is more extensible than the old hardcoded code. No other regressions are expected but as the hardware might be a bit picky it might cause some regressions in 8bpp mode on some hardware although I doubt that. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:39 2010 -0800 viafb: some virtual_xres handling fixes Do not require the virtual_xres to be aligned as line length is for such purposes. Calculate always the smallest line length required. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd140691bda491b417a6d1e81b03416b54cb8d8d Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:38 2010 -0800 viafb: rework color checking Make color checking a bit more tolerant in what values it allows and more fine grained to later support 15 and 30 bits formats. It splits the filling of the color information in var to a seperate function and sets some color related values in var that where previously untouched. This could be a bug fix but at least I don't know any applications that was fooled by not correctly setting the fields in var. At least no regressions are expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dba77f8409eb861b28d295211776d953a8255ec7 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:37 2010 -0800 viafb: make some variables a bit less global Move some variables closer to their usage. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:36 2010 -0800 viafb: remove dead code due to IGA1_IGA2 Some code depended on IGA1_IGA2 which was never set (at least with the symbolic name). Remove this dead code although it might one day be useful to get a hint on how some things might work. However as this is dead it is likely full of bugs and would prevent a clean structure (as it has some very strange things). Dead code -> no regressions, at least if VIA doesn't do anything very ugly. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacccd1657bdecae8f7c98a8e2b84367a8d4e87 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:35 2010 -0800 viafb: split color mode setting up This patch splits color mode setting up in seperate functions. Some hardware initialization that was previously mixed with it is moved to viafb_setmode. As are the calls to the newly created function. This is yet another little step towards controlling each IGA on its own. As this patch really aims too mimic the old behaviour no regressions are expected. However I noticed that 8bpp (or 6bpp?) seems actually a bit broken before and after the patch. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe9aab8ec2d65378b0663c3287a67da4a892b54e Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: introduce strict parameter checking Refuse to work if wrong parameters are given. This should improve the user experience as it will be clear that something is wrong and not silently ignored. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c9443ed284fc6ec8a4f702c66e9ad6bdf912c05 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: make viafb_set_par more dual framebuffer compatible This patch is an attempt to make viafb_set_par work correctly with more than one framebuffer. As modesetting is not (yet/easily) possible for each individual IGA it uses the (normally to be avoided) global variables viafbinfo{,1} to ensure that each function is called with the correct values. This patch (finally) allows usable dual framebuffer setups and should not affect non dual fb ones. It works in some (most?) configurations as sometimes the driver still gets device connections wrong. It can be worth to try the devices in reverse order (in viafb_active_dev). The user experience is still not very nice as: - on the second fb you'll normally have a garbled picture as long as no application draws to it goal: auto on/off devices depending on reference counting - as the whole machinery is always done you can see mode changes also in an unaffected framebuffer goal: split modesetting up for each individual IGA Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee79d54db45bb5e6da3eb76bae162c920aeb9763 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:32 2010 -0800 viafb: video address setting revisited Set always the correct video address. Especially do panning right on multiple IGAs. This should have no effect on single monitor mode (no SAMM, no dual fb). For SAMM without dual fb this might break something as I really cannot image what we are supposed to do for different resolutions with a single framebuffer as we can't get data out of nowhere (no, they are not set up in something one would call "expanded"). Previously I got for that funny colored pictures as the second IGA pointed to video memory that was never written to. After the patch it'll work as cloning if the first and second mode are identical (this was working already without SAMM). Finally for dual fb this should push us a step in the right direction. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cf607923dee1898b9fc1e62568b79e7f785b995 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:31 2010 -0800 viafb: reorder initialization for dual framebuffer mode This patch reorders the initialization for dual framebuffer mode to not ignore the settings for the first mode. Previously they were overwritten with the settings for the second one before they were applied. This should have no effect on non dual framebuffer mode and do what the user intended (initalization to desired modes) in dual framebuffer mode. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8566b29e86ef3906dd6c0ea4a02c2a925748da5 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: yet another dead code removal Remove some functions that were never executed and a related undocumented module parameter. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5f06f5cddd6681b978ffdb53755e28eefccb1bb Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: some dvi cleanup Remove some unused variables, move some dvi code around and store the detected maximum resolution for later use. The vertical resolution is handled as the old code did it but I hope it can be read from the hardware some day. No runtime change expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b24b00c364bb3bfa717ba2ead258a527b20cc5f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:29 2010 -0800 viafb: remove the remaining VIA_RES_* uses Remove the rest of the VIA_RES_* use cases. Obviously this was no longer useful. Keep the related infrastructure/functions for later use. No runtime impact expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd73d6868b9ecb4841def0c6ff0a25da27db33ba Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:28 2010 -0800 viafb: split global index up This is the first step to remove an artificial global index that was used in two ways: 1. As a pseudo index in the mode table. Pseudo as you had to search through the table to find the referenced entry. This was replaced by using a pointer to the entry. 2. As a shortcut to compare a combination of horizontal and vertical resolution at the same time. This was replaced by a "(hres<<16) | vres" which is good enough for now and the near future. If vres or hres become greater than 2^16 this might indeed cause problems but this solution allows to split this indexing mess up without the requirement to do even more code changes. This is a big change that will allow more clean ups. It should be a bit faster but that is probably not relevant for normal operation. No regressions expected but as this is a relatively big step heavy testing is appreciated. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2365dfe99495159b3395dd0eddece2f0d58f527a Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:27 2010 -0800 viafb: remove dead code Remove a completly unused function. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc8b82f8c80e8b9e212e0102ee7af9972829e45c Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:26 2010 -0800 viafb: deprecate private ioctls Print a warning when viafb ioctls are called. Those should not be used as their exact meaning is sometimes unknown and they in parts duplicate functionality present in the framebuffer interface. There is no known user of these ioctls. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1c341a060da1bd66a1982198b1a99765b07b8a2 Author: Jaya Kumar Date: Wed Mar 10 15:21:24 2010 -0800 broadsheetfb: add multiple panel type support Update broadsheetfb to add support for multiple panel types. The 3.7" and 6" are known to work but the 9.7" is untested due to lack of hardware. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d40f29bff30a1a50d7ad69bd150c9cda1ce1ba9d Author: Michael Hennerich Date: Wed Mar 10 15:21:24 2010 -0800 fbdev: bf54x-lq043fb/bfin-t350mcqb-fb: drop custom mmap() handler The common Blackfin code implements the get_fb_unmapped_area() function, so we no longer need to have our own mmap() handler. The common fb code will take care of everything for us now. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d3580d40cc38bbaf63d0b2756931e0ae241a9ea Author: Roel Kluin Date: Wed Mar 10 15:21:23 2010 -0800 asiliantfb: fix test of unsigned in asiliant_calc_dclk2() Ftarget, Fret, n and m are unsigned so the tests did not work. Signed-off-by: Roel Kluin Cc: Andres Salomon Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3e37a5a7c91045497553bcbd6a5faea98b21b3 Author: André Goddard Rosa Date: Wed Mar 10 15:21:22 2010 -0800 coredump: plug a memory leak situation on dump_seek() After having started writing the coredump, if filesystem reports an error anytime while writing part of the core file, we would leak a memory page when bailing out. Signed-off-by: André Goddard Rosa Acked-by: KOSAKI Motohiro Cc: Alexander Viro Cc: Roland McGrath Cc: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cacdb4add1b1e50fe75edc50ebbb7bddd9cf5e7 Author: Christoph Hellwig Date: Wed Mar 10 15:21:21 2010 -0800 Add generic sys_olduname() Add generic implementations of the old and really old uname system calls. Note that sh only implements sys_olduname but not sys_oldolduname, but I'm not going to bother with another ifdef for that special case. m32r implemented an old uname but never wired it up, so kill it, too. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e28cbf22933d0c0ccaf3c4c27a1a263b41f73859 Author: Christoph Hellwig Date: Wed Mar 10 15:21:19 2010 -0800 improve sys_newuname() for compat architectures On an architecture that supports 32-bit compat we need to override the reported machine in uname with the 32-bit value. Instead of doing this separately in every architecture introduce a COMPAT_UTS_MACHINE define in and apply it directly in sys_newuname(). Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670 Author: Christoph Hellwig Date: Wed Mar 10 15:21:18 2010 -0800 Add generic sys_ipc wrapper Add a generic implementation of the ipc demultiplexer syscall. Except for s390 and sparc64 all implementations of the sys_ipc are nearly identical. There are slight differences in the types of the parameters, where mips and powerpc as the only 64-bit architectures with sys_ipc use unsigned long for the "third" argument as it gets casted to a pointer later, while it traditionally is an "int" like most other paramters. frv goes even further and uses unsigned long for all parameters execept for "ptr" which is a pointer type everywhere. The change from int to unsigned long for "third" and back to "int" for the others on frv should be fine due to the in-register calling conventions for syscalls (we already had a similar issue with the generic sys_ptrace), but I'd prefer to have the arch maintainers looks over this in details. Except for that h8300, m68k and m68knommu lack an impplementation of the semtimedop sub call which this patch adds, and various architectures have gets used - at least on i386 it seems superflous as the compat code on x86-64 and ia64 doesn't even bother to implement it. [akpm@linux-foundation.org: add sys_ipc to sys_ni.c] Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: David Howells Acked-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4679373cf4ee0e7792dc56205365732b725c2c1 Author: Christoph Hellwig Date: Wed Mar 10 15:21:15 2010 -0800 Add generic sys_old_mmap() Add a generic implementation of the old mmap() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d0e52830e9ae09b872567f4aca3dfb5b5918079 Author: Christoph Hellwig Date: Wed Mar 10 15:21:13 2010 -0800 Add generic sys_old_select() Add a generic implementation of the old select() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Acked-by: Andreas Schwab Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 724ee626f38feaea215a11790e1a0cb5d83b0628 Author: Joe Perches Date: Wed Mar 10 15:21:11 2010 -0800 drivers/block/floppy.c: remove unnecessary casting in fd_ioctl Convert outparam to const void *. Cast outparam to const char * for strlen(). Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aad92cfea6fec14bd57dd9c283cc6eb023c97bd Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro Just code the test directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712e1de43ed572886d6913a86eee5e73b7de4318 Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove obfuscating CODE2SIZE macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ded2863d09208b27baa4a6ad95bb7e5539e48c05 Author: Joe Perches Date: Wed Mar 10 15:21:09 2010 -0800 drivers/block/floppy.c: add __func__ to debugt Make debugt messages a little neater. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f2527174ab1ee7f4550c91be47b3f843ff1316d Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto Reduces indent. Makes a bit more readable and intelligible. Return value now at bottom of function. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce2f11fe784f7999b82c7a71cdbcb86ad2653def Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: remove some unnecessary casting Remove char/void __user * use. Remove kmalloc cast. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ebddd85a6a6ad793eca82d65fba4573d0e28042 Author: Joe Perches Date: Wed Mar 10 15:21:07 2010 -0800 drivers/block/floppy.c: use %pf in logging messages Print the function name not the pointer address where useful and possible Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 275176bc2a7bbd5c4446ba12b8f4353a69012053 Author: Joe Perches Date: Wed Mar 10 15:21:06 2010 -0800 drivers/block/floppy.c: use __func__ where appropriate Add and use __func__ to is_alive. Use __func__ in some DPRINTs. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 891eda80a5227a12956d7997baf9f4b54a9aa4f9 Author: Joe Perches Date: Wed Mar 10 15:21:05 2010 -0800 drivers/block/floppy.c: DPRINT neatening Move DPRINT macro definition above 1st use Consolidate a format string (>80 columns) Add a newline to an unterminated message Comment neatened Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a23d133359eec2297ff4c72c260ccacb156d883 Author: Joe Perches Date: Wed Mar 10 15:21:04 2010 -0800 drivers/block/floppy.c: remove #define FLOPPY_SANITY_CHECK The code could not be compiled without the #define, so just remove it and the #ifdef/#endif lines. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73507e6cd8dc6cd98a39164a9b775c7092faddb4 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout Prior to patch "drivers/block/floppy.c: Use pr_" only reschedule_timeout(,"request done"...) printed a numeric value after a reschedule_timeout event message. Restore that behavior and remove the now unnecessary argument. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0da3132f90c01f532dd85c537b5c78a196a11e24 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: unclutter redo_fd_request logic Change for(;;) with continue; to label: goto label Reduces indentation and adds a bit of clarity. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 416d8d2888db392c562fb8afaf9136730ef0da9e Author: Joe Perches Date: Wed Mar 10 15:21:02 2010 -0800 drivers/block/floppy.c: remove REPEAT macro Macros with hidden flow changes aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15b2630c587dcea931f563deb50d617af96b4edb Author: Joe Perches Date: Wed Mar 10 15:21:01 2010 -0800 drivers/block/floppy.c: remove unnecessary return and braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57584c5a3824a15f65d2b065d9f453fc1ae1dab7 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: add function is_ready_state Used a couple of times, might simplify the code a bit. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29f1c7848feb3954939b52fd5b7dca30dbce9426 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: convert int initialising to bool initialized Don't initialize initialized either. Default is false. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8 Author: Joe Perches Date: Wed Mar 10 15:20:59 2010 -0800 drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" Use it directly in the one place it's used. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c529730a98874fa951995d8a312c7fd606832eda Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: move leading && and || to preceding line Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f63f469ed1cee8305840b7bbcee2f99797cd12 Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: convert int 1/0 to bool true/false Various functions use int where bool is appropriate lock_fdc, wait_til_done, poll_drive, user_reset_fdc Convert to bool. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55eee80c6233c67217a6238dd94f1fc765c723d1 Author: Joe Perches Date: Wed Mar 10 15:20:57 2010 -0800 drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT Obfuscating macros with embedded returns are not nice Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86b12b48a29f4795e2e550f510d39931576bdf75 Author: Joe Perches Date: Wed Mar 10 15:20:56 2010 -0800 drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT and ECALL macros Remove these obfuscating macros with hidden returns Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4575b55281825d157573bbc5aa28b9144193ddd2 Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove most uses of CALL and ECALL macros Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e029853612ba5999caed4dbc833dab729aac75ba Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros Use clear_bit, set_bit, and test_bit functions directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87f530d8f1733651f3e34b81c801d6e1bb635936 Author: Joe Perches Date: Wed Mar 10 15:20:54 2010 -0800 drivers/block/floppy.c: add debug_dcl(...) macro Converted #ifdef DCL_DEBUG if (test) DPRINTK(...); #endif to debug_dcl(test, ...); Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a0d61f64123ab758d8b8cc8f8ca521733d2f32 Author: Joe Perches Date: Wed Mar 10 15:20:53 2010 -0800 drivers/block/floppy.c: remove macro LOCK_FDC Macros with hidden returns aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a52d67de6da21db0e549e38749b7a00029fea3 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove a few spaces from function casts Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da27365342868df88fdd5c217bf68ec10b14b5f0 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove IN/OUT macros, indent switch/case Remove ugly IN/OUT macros, use direct case and code Add missing semicolon after ECALL Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96534f1dd5bf9d324c2d31355cb69565381d1460 Author: Joe Perches Date: Wed Mar 10 15:20:51 2010 -0800 drivers/block/floppy.c: indent a comment Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87c9e0a880f2992dc210eb4ea8b2da6c63883ca Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: remove CLEARSTRUCT macro, use memset Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb57f0c662faa9879e8f265c9bc1f15bb238d2c7 Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: comment neatening and remove naked ; Spacing, column alignment and a for loop with a naked semicolon converted to an assign and while Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2300f90e31178f44b0e903c12ea311df1297d7fa Author: Joe Perches Date: Wed Mar 10 15:20:49 2010 -0800 drivers/block/floppy.c: remove LAST_OUT macro Macros with hidden returns are not nice. Convert the 2 uses to use direct code. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b2b2ecd88d06ae212d069a4e187ab690b1636f Author: Joe Perches Date: Wed Mar 10 15:20:48 2010 -0800 drivers/block/floppy.c: hoist assigns from if()s, neatening Move assigns above if()s Remove unnecessary parentheses from returns Use a temporary for a duplicated test Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 045f98363080ddbbcef6b8b8306ec58a818406a0 Author: Joe Perches Date: Wed Mar 10 15:20:47 2010 -0800 drivers/block/floppy.c: remove used once CHECK_READY macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a81ee5447157a4b9930bab8ec70cf77a55db64e8 Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: remove unnecessary braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b46df356de8c63882cfb1ee7501bd9c772a6981b Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: use pr_ Convert bare printk to pr_info and pr_cont Convert printk(KERN_ERR to pr_err Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48c8cee61f22fe5a2ea00488222b3415378469ad Author: Joe Perches Date: Wed Mar 10 15:20:45 2010 -0800 drivers/block/floppy.c: #define space and column neatening Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49375434ec011dabcc8bfa5091f5327284e42ce Author: Joe Perches Date: Wed Mar 10 15:20:44 2010 -0800 drivers/block/floppy.c: convert some #include Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718a38211bf4375c0a1efad3afbc5dbaef5d33f9 Author: Wu Fengguang Date: Wed Mar 10 15:20:43 2010 -0800 mm: introduce dump_page() and print symbolic flag names - introduce dump_page() to print the page info for debugging some error condition. - convert three mm users: bad_page(), print_bad_pte() and memory offline failure. - print an extra field: the symbolic names of page->flags Example dump_page() output: [ 157.521694] page:ffffea0000a7cba8 count:2 mapcount:1 mapping:ffff88001c901791 index:0x147 [ 157.525570] page flags: 0x100000000100068(uptodate|lru|active|swapbacked) Signed-off-by: Wu Fengguang Cc: Ingo Molnar Cc: Alex Chiang Cc: Rik van Riel Cc: Andi Kleen Cc: Mel Gorman Cc: Christoph Lameter Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b3a6549b2602ca30f58715a0071e29f9898cae9 Author: Julia Lawall Date: Wed Mar 10 15:20:42 2010 -0800 drivers/scsi/ses.c: eliminate double free The few lines below the kfree of hdr_buf may go to the label err_free which will also free hdr_buf. The most straightforward solution seems to be to just move the kfree of hdr_buf after these gotos. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier E; expression E1; iterator I; statement S; @@ *kfree(E); ... when != E = E1 when != I(E,...) S when != &E *kfree(E); // Signed-off-by: Julia Lawall Cc: James Bottomley Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d30a1f6315b8940537e8e98882c6038fbac9ba5 Author: Thomas Gleixner Date: Wed Mar 10 15:20:40 2010 -0800 mm: do not iterate over NR_CPUS in __zone_pcp_update() __zone_pcp_update() iterates over NR_CPUS instead of limiting the access to the possible cpus. This might result in access to uninitialized areas as the per cpu allocator only populates the per cpu memory for possible cpus. This problem was created as a result of the dynamic allocation of pagesets from percpu memory that went in during the merge window - commit 99dcc3e5a94ed491fbef402831d8c0bbb267f995 ("this_cpu: Page allocator conversion"). Signed-off-by: Thomas Gleixner Acked-by: Pekka Enberg Acked-by: Tejun Heo Acked-by: Christoph Lameter Acked-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bddb4e9f3f53df02a783751984ddeade71b085 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:20:38 2010 -0800 nommu: fix build breakage Commit 34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of mm_counter") added sync_mm_rss() for syncing loosely accounted rss counters. It's for CONFIG_MMU but sync_mm_rss is called even in NOMMU enviroment (kerne/exit.c, fs/exec.c). Above commit doesn't handle it well. This patch changes SPLIT_RSS_COUNTING depends on SPLIT_PTLOCKS && CONFIG_MMU And for avoid unnecessary function calls, sync_mm_rss changed to be inlined noop function in header file. Reported-by: David Howells Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Mike Frysinger Signed-off-by: Michal Simek Signed-off-by: David Howells Cc: Greg Ungerer Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 936ed49a540e2dce645da27e7e4032b24310a8e4 Author: Mike Frysinger Date: Wed Mar 10 15:20:38 2010 -0800 MAINTAINERS: add bfin_sdh driver Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 516a82422209e078345d0ca54b16793d7bfd4782 Author: Albert Herranz Date: Wed Mar 10 15:20:37 2010 -0800 sdio: recognize io card without powercycle SDIO Simplified Specification V2.00 states that it is strongly recommended that the host executes either a power reset or issues a CMD52 (I/O Reset) to re-initialize an I/O only card or the I/O portion of a combo card. Additionally, the CMD52 must be issued first because it cannot be issued after a CMD0. With this patch the Nintendo Wii SDIO-based WLAN card is detected after a system reset, without requiring a complete system powercycle. Signed-off-by: Albert Herranz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0ab4a4d5094e5d17b103dc5073529a04f00a469 Author: Uwe Kleine-König Date: Wed Mar 10 15:20:35 2010 -0800 rtc/hctosys: only claim the RTC provided the system time if it did Without this patch /sys/class/rtc/$CONFIG_RTC_HCTOSYS_DEVICE/hctosys contains a 1 (meaning "This rtc was used to initialize the system clock") even if reading the time at bootup failed. Moreover change error handling in rtc_hctosys() to use goto and so reduce the indention level. Signed-off-by: Uwe Kleine-König Cc: Paul Gortmaker Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 019b4d123aa7b9fc135b532e021cfde85db7665d Author: Richard Kennedy Date: Wed Mar 10 15:20:33 2010 -0800 fs: buffer_head: remove kmem_cache constructor to reduce memory usage under slub When using slub, having a kmem_cache constructor forces slub to add a free pointer to the size of the cached object, which can have a significant impact to the number of small objects that can fit into a slab. As buffer_head is relatively small and we can have large numbers of them, removing the constructor is a definite win. On x86_64 removing the constructor gives me 39 objects/slab, 3 more than without the patch. And on x86_32 73 objects/slab, which is 9 more. As alloc_buffer_head() already initializes each new object there is very little difference in actual code run. Signed-off-by: Richard Kennedy Cc: Alexander Viro Cc: Jens Axboe Acked-by: Nick Piggin Cc: "Theodore Ts'o" Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03affdef4fc85e416e3862abb0aa549c6034cdd0 Author: Joe Perches Date: Wed Mar 10 15:20:32 2010 -0800 fs/ocfs2/cluster/tcp.c: remove use of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Cc: Mark Fasheh Acked-by: Joel Becker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0636b33c5f2fac4e274464ae6867805f080fc433 Merge: 69960a2 a48f509 070e140 a72042c Author: Roland Dreier Date: Fri Mar 12 10:54:20 2010 -0800 Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next commit a72042c08a8ba3b685dc9cba62c57c48188ef2c8 Author: Chien Tung Date: Wed Mar 3 19:13:26 2010 +0000 RDMA/nes: Fix CX4 link problem in back-to-back configuration Commit 09124e19 ("RDMA/nes: Add support for KR device id 0x0110") took out too much code and broke CX4 link detection in back-to-back configuration. Put back the code that does the link check. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 15365c108ea27598e265f8c13e7051d99ca5b0b9 Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:31 2010 -0800 posix-cpu-timers: Reset expire cache when no timer is running When a process deletes cpu timer or a timer expires we do not clear the expiration cache sig->cputimer_expires. As a result the fastpath_timer_check() which prevents us to loop over all threads in case no timer is active is not working and we run the slow path needlessly on every tick. Zero sig->cputimer_expires in stop_process_timers(). Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Spencer Candland Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 829b6c1ef488856c6a46a2f705f5068062d5f34c Author: Andrew Morton Date: Thu Mar 11 14:04:30 2010 -0800 timer stats: Fix del_timer_sync() and try_to_del_timer_sync() These functions forgot to run timer_stats_timer_clear_start_info(). It's unobvious what effect this has and whether it matters much - we won't be printing it out anyway if the timer's detached. Untested, just an Ingo trollpatch. [ Nevertheless correct - tglx ] Signed-off-by: Andrew Morton Cc: Ingo Molnar Cc: johnstul@us.ibm.com Signed-off-by: Thomas Gleixner commit 80a05b9ffa7dc13f6693902dd8999a2b61a3a0d7 Author: Thomas Gleixner Date: Fri Mar 12 17:34:14 2010 +0100 clockevents: Sanitize min_delta_ns adjustment and prevent overflows The current logic which handles clock events programming failures can increase min_delta_ns unlimited and even can cause overflows. Sanitize it by: - prevent zero increase when min_delta_ns == 1 - limiting min_delta_ns to a jiffie - bail out if the jiffie limit is hit - add retries stats for /proc/timer_list so we can gather data Reported-by: Uwe Kleine-Koenig Signed-off-by: Thomas Gleixner commit 29b2ee5af5f3a02846bd38a1e2121d62ee5f6aca Author: Andrew Clayton Date: Sat Mar 6 00:14:46 2010 +0000 ARM/OMAP: Remove the +x bit from a couple of source files Remove the +x bit from a couple of source files Signed-off-by: Andrew Clayton Signed-off-by: Tony Lindgren commit 0841cb826859a4f14c472cc75a782811310f010e Author: Janusz Krzysztofik Date: Tue Feb 23 15:50:38 2010 +0000 omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values The MsBSP register cache will never have any error/status flags set, since these flags are never written to the reg_cache. So it is kind of not necessary to clear these flags, which are actually always 0. In other words, clearing the status/error flags are not necessary, since the reg_cache will never got these bits set. We can just write back the register content from the cache as it is when clearing an error condition. Tested on Amstrad Delta. Reported-by: Peter Ujfalusi Signed-off-by: Janusz Krzysztofik Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 8447b360a3897bdfb0677107564d1dd9ab6e63be Author: Jack Steiner Date: Thu Mar 11 12:43:29 2010 -0600 x86, UV: Fix target_cpus() in x2apic_uv_x.c target_cpu() should initially target all cpus, not just cpu 0. Otherwise systems with lots of disks can exhaust the interrupt vectors on cpu 0 if a large number of disks are discovered before the irq balancer is running. Note: UV code only... Signed-off-by: Jack Steiner LKML-Reference: <20100311184328.GA21433@sgi.com> Signed-off-by: Ingo Molnar commit f11c9c5c259cb2c3d698548dc3936f773ab1f5b9 Author: Edward Shishkin Date: Thu Mar 11 14:09:47 2010 -0800 vfs: improve writeback_inodes_wb() Do not pin/unpin superblock for every inode in writeback_inodes_wb(), pin it for the whole group of inodes which belong to the same superblock and call writeback_sb_inodes() handler for them. Signed-off-by: Edward Shishkin Cc: Jens Axboe Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit c12ec0a2d94001003dfb929ce14c287fca0522b0 Author: Roel Kluin Date: Thu Mar 11 14:09:47 2010 -0800 paride: fix off-by-one test With `while (j++ < PX_SPIN)' j reaches PX_SPIN + 1 after the loop. This is probably unlikely to produce a problem. Signed-off-by: Roel Kluin Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd Author: Geert Uytterhoeven Date: Tue Dec 15 21:49:57 2009 +0100 mfd: Several MFD drivers should depend on GENERIC_HARDIRQS commit 5fb4d38b19d95a5f980f0a10adba798f5b92128c ("mfd: Move WM831x to generic IRQ") didn't take into account that genirq support depends on GENERIC_HARDIRQS. Additionally, 2.6.34-rc1 added: - commit 2afa62ea76027b00e472ddb672191e6e15425b43 ("mfd: Use genirq in 88pm860x"). - commit 760e4518788df6762700e6bb9dd8692379f11168 ("mfd: Convert WM8350 to genirq"). - commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e ("mfd: Update irq handler in max8925") Make all of them depend on GENERIC_HARDIRQS to avoid compile errors on architectures that don't support genirq yet. Signed-off-by: Geert Uytterhoeven Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit a5300dcbbd5d455a1a5978095b8f78af66c540a6 Author: Samuel Ortiz Date: Mon Mar 8 20:07:48 2010 +0100 mfd: Fix sm501 requested region size We should only request for the MFD used region, not the whole thing. Signed-off-by: Samuel Ortiz Tested-by: Paul Mundt Reviewed-by: H Hartley Sweeten commit 964ad81cbd933e5fa310faeec1e923c14651284b Author: David S. Miller Date: Fri Mar 12 00:00:17 2010 -0800 ipconfig: Handle devices which take some time to come up. Some network devices, particularly USB ones, take several seconds to fully init and appear in the device list. If the user turned ipconfig on, they are using it for NFS root or some other early booting purpose. So it makes no sense to just flat out fail immediately if the device isn't found. It also doesn't make sense to just jack up the initial wait to something crazy like 10 seconds. Instead, poll immediately, and then periodically once a second, waiting for a usable device to appear. Fail after 12 seconds. Signed-off-by: David S. Miller Tested-by: Christian Pellegrin commit aa4b1f6e83aaf20997edc4c10e03baf834343e5a Author: Kevin Hilman Date: Wed Mar 10 17:16:31 2010 +0000 OMAP4: fix temporary hacks that break multi-omap PM When building for multi-omap, and OMAP4 is enabled, CONFIG_ARCH_OMAP4 will be true and prevent included code from building/running for OMAP2/3 as well. This problem exists in io.c where some hwmod/PM/SDRC init code is prevented from running even on OMAP2/3 when OMAP4 is included in a multi-OMAP build. A quick glance suggests that this #ifndef is no longer needed in most of the cases. In the remaining cases, the function is wrapped with "if (cpu_is_omap24xx() || cpu_is_omap34xx())" which will be optimized out for OMAP4-only builds. Note that this is only a short-term fix. Longer-term, OMAP4 needs to create init functions for SDRC and hwmod late-init. Tested-by: Santosh Shilimkar Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 54c44fb7df4774280a2deb4ba191cbab84602413 Author: Kevin Hilman Date: Wed Mar 10 17:16:30 2010 +0000 OMAP2: cpu_is_omap2*: fix compile-time removal of unused code Currently if omap2420 is defined but not omap2430, cpu_is_omap2430() is still defined as a macro, instead of #define'd to zero. This results in conditional cpu_is_omap2430() code still being compiled, and leads to possible compile/link errors. In particular for hwmod init. To fix, add extra #ifdefs to CPU check macros to ensure that the is_omap* macros are zero for each OMAP2 if they are not configured into the kernel. Tested-by: Santosh Shilimkar Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 03d5671dde04a186471969d73cfc89ee02664c2c Author: Grazvydas Ignotas Date: Wed Mar 10 11:13:53 2010 +0000 omap3: pandora: add missing i2c3 board_info This will allow BQ27500 fuel gauge to function. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit 8185e468446e1e2b383bd61210702fffaed3ddc0 Author: Aaro Koskinen Date: Wed Mar 3 16:24:53 2010 +0000 omap: mach-omap2/io.c: fix function declarations Get rid of the following warnings: warning: non-ANSI function declaration of function [...] Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 9f29006ae8c85746e5a52d557f689359149a0793 Author: Chien Tung Date: Wed Mar 3 19:13:28 2010 +0000 RDMA/nes: Clear stall bit before destroying NIC QP Clear the stall bit to drop any incoming packets while destroying NIC QP. This will prevent a chip resource leak. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 883c699241f48667ff59277d8c20790868fd4829 Author: Faisal Latif Date: Tue Mar 2 17:22:51 2010 -0600 RDMA/nes: Set assume_aligned_header bit Set assume_aligned_header bit in QP context as requested by hardware group. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit f00d649703fbedbdeb33d63c4c4731656e11297c Author: Sergio Aguirre Date: Wed Mar 3 16:21:08 2010 +0000 omap: Fix gpio_resume_after_retention For omap4 case, this was wrongly writing GPIO_LEVELDETECTx registers with OMAP24XX_ offset and OMAP4_ offset. Bug introduced in commit: commit 3f1686a9bfe74979c6ad538c78039730f665f77e Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap: Fix gpio.c for multi-omap for omap4 Signed-off-by: Sergio Aguirre Signed-off-by: Tony Lindgren commit 228893f9d2b70a7416267050ce03bfd9eb624713 Author: Enric Balletbo i Serra Date: Mon Mar 1 11:18:08 2010 +0000 omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board Select CONFIG_LEDS_GPIO to enable IGEP v2 LED support and control of supported LEDs from userspace. Otherwise GPIO LEDs are exported as GPIO 26, 27 and 28 using the gpiolib framework. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 00df9384ccfa02c062449e381c051bcfe97cdf6f Author: Andrea Gelmini Date: Sat Feb 27 16:51:38 2010 +0000 omap: Checkpatch cleanup for blizzard.h arch/arm/plat-omap/include/plat/blizzard.h:9: ERROR: spaces prohibited around that ':' (ctx:WxW) Signed-off-by: Andrea Gelmini Signed-off-by: Tony Lindgren commit 29b9a218d0be8e207ddeacdc68eb1e4b7f54b85a Author: Aaro Koskinen Date: Fri Feb 26 10:25:28 2010 +0000 omap: pass the reboot command to the boot loader This patch follows the commit be093beb608edf821b45fe00a8a080fb5c6ed4af by Russell King: OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart(). The patch adds the missing parameter to omap1_arch_reset() and omap_prcm_arch_reset(), and modifies the latter to pass the reboot command parameter to the boot loader instead of reboot mode (which is for kernel internal use only and cannot be modified by the userspace). Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 26e4248359c6bf2da4a07767f6e12f1df426ab0a Author: Suman Anna Date: Mon Jan 25 18:27:21 2010 -0600 omap2/3/4: mailbox: remove compiler warning Remove a compiler warning in device-specific mailbox module. Signed-off-by: Suman Anna Signed-off-by: Tony Lindgren commit 21b90340207d324f92111e25ead1752533eeb9ca Author: Thomas Weber Date: Thu Feb 25 09:40:19 2010 +0000 OMAP2: serial.c: Fix number of uarts in early_init The omap_serial_early_init prints the following errors: Could not get uart4_ick Could not get uart4_fck because all the uarts available in omap_uart[] will be initialized. Only omap4430 and omap3630 have 4 uarts at the moment. This patch reduces the number of uarts when cpu is not omap4430 or omap3630. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 69960a275efc9d82797bbbe2460a2d6c9cace314 Author: Steve Wise Date: Wed Mar 3 15:06:34 2010 +0000 RDMA/cxgb3: Wait at least one schedule cycle during device removal During a hot-plug LLD removal event or an EEH error event, iw_cxgb3 must ensure that any/all threads that might be in a cxgb3 exported function must return from the function before iw_cxgb3 returns from its event processing. Do this by calling synchronize_net(). Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 070e140c4c536df33a9870318791b2ca8f7dbfcf Author: Steve Wise Date: Thu Mar 4 18:18:18 2010 +0000 IB/mad: Ignore iWARP devices on device removal When an iWARP device is unloaded, the ib_mad module logs errors. It should be ignoring iWARP devices on device removal just like it does on device add. Signed-off-by: Steve Wise Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit a48f509b26cec53338f4b0abd52ecea35e3974b8 Author: Or Gerlitz Date: Thu Mar 4 13:17:37 2010 +0000 IPoIB: Include return code in trace message for ib_post_send() failures Print the return code of ib_post_send() if it fails to make these debugging messages more useful. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit f0dc117abdfa9a0e96c3d013d836460ef3cd08c7 Author: Eli Cohen Date: Wed Mar 3 12:27:52 2010 +0000 IPoIB: Fix TX queue lockup with mixed UD/CM traffic The IPoIB UD QP reports send completions to priv->send_cq, which is usually left unarmed; it only gets armed when the number of outstanding send requests reaches the size of the TX queue. This arming is done only in the send path for the UD QP. However, when sending CM packets, the net queue may be stopped for the same reasons but no measures are taken to recover the UD path from a lockup. Consider this scenario: a host sends high rate of both CM and UD packets, with a TX queue length of N. If at some time the number of outstanding UD packets is more than N/2 and the overall outstanding packets is N-1, and CM sends a packet (making the number of outstanding sends equal N), the TX queue will be stopped. When all the CM packets complete, the number of outstanding packets will still be higher than N/2 so the TX queue will not be restarted. Fix this by calling ib_req_notify_cq() when the queue is stopped in the CM path. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 9e542f37ce20428170010baa36a0ecbfcc0b29bb Author: Tony Lindgren Date: Thu Mar 11 11:06:56 2010 -0800 omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors While waiting for the related USB patch, fix compile by enabling it in the defconfigs. As discussed at: http://thread.gmane.org/gmane.linux.usb.general/27432/focus=4460 Otherwise we'll get errors like: drivers/usb/core/hcd.c:1892: error: 'pm_wq' undeclared (first use in this function) drivers/usb/core/hcd.c:1892: error: (Each undeclared identifier is reported only once drivers/usb/core/hcd.c:1892: error: for each function it appears in.) Signed-off-by: Tony Lindgren commit 9f591fd76afdc0e5192e9ed00a36f8efc0b4dfe6 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 15:53:11 2010 -0300 perf record: Don't try to find buildids in a zero sized file Fixing this symptom: [acme@mica linux-2.6-tip]$ perf record -a -f Fatal: Permission error - are you root? Bus error [acme@mica linux-2.6-tip]$ I.e. if for some reason no data is collected, in this case a non root user trying to do systemwide profiling, no data will be collected, and then we end up trying to mmap a zero sized file and access the file header, b00m. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: LKML-Reference: <1268333592-30872-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 79cf5bff25bc30c31fd7e4782c36947ec4bace7f Author: Tony Lindgren Date: Wed Mar 10 18:55:31 2010 -0800 omap2: Update n8x0 defconfig to test multi-omap and DMA api changes Recent DMA API changes broke compile for tusb6010. While testing the fixes for tusb6010, I had to update the n8x0 defconfig quite a bit. Might as well merge it while at it to make it more usable as we're using this to test the multi-omap booting between V6 and V7 ARMs. Also, anybody using n8x0 with a current kernel will most likely want to mount root on the MMC instead of the onenand to keep the Maemo install intact. Enable I2C, REGULATOR, MMC, MFD, PM, and USB. Also change the root to /dev/mmcblk0p2 instead of the onenand. Signed-off-by: Tony Lindgren commit 97b9ad1633ed3724e0563d250850763d20275da7 Author: Francisco Alecrim Date: Wed Mar 10 18:52:24 2010 -0800 omap2: add USB initialization for tusb6010 Based on Kalle's and Tony's patches. Some variables re-organized and unused code removed. Signed-off-by: Kalle Valo Signed-off-by: Francisco Alecrim [tony@atomide.com: this is needed to fix the related tusb6010 DMA API changes] Signed-off-by: Tony Lindgren commit d660f9a26ef81c3bbced92514ffbe82e1b882ee1 Author: Santosh Shilimkar Date: Thu Mar 11 07:33:46 2010 +0000 omap4: Fix build break by moving omap_smc1 into a separate .S This patch moves omap_smc1 function to a seperate omap44xx-smc.S file and sets compile flags as -Wa,-march=armv7-a. This fix was suggested by Tony Lindgren Signed-off-by: Santosh Shilimkar [tony@atomide.com: otherwise multi-omap build with V6 and V7 breaks] Signed-off-by: Tony Lindgren commit 6f69a1815a93722b360a1439934856e766509002 Author: Felipe Balbi Date: Thu Mar 4 09:45:53 2010 +0200 omap2/3/4: ehci: avoid compiler error with touchbook the early_param() call in board-omap3touchbook.c expands to: static const char __setup_str_early_touchbook_revision[] __section(.init.rodata) _aligned(1) = tbr; [...] and we have a non-const variable being added to the same section: static struct ehci_hcd_omap_platform_data ehci_pdata __section(.init.rodata); because of that, gcc generates a section type conflict which can (and actually should) be avoided by marking const every variable marked with __initconst. This patch fixes that for the ehci_hdc_omap_platform_data. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 720e7749279bde0d08684b1bb4e7a2eedeec6394 Author: Sachin Prabhu Date: Thu Mar 11 12:24:45 2010 -0500 GFS2: Skip check for mandatory locks when unlocking gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock(). gfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Steven Whitehouse commit 39ad2bbb5900d1bc9ae8f06cebb4cb2529d9e42e Author: Lars Ellenberg Date: Thu Mar 4 15:52:30 2010 +0100 drbd: fix al-to-on-disk-bitmap for 4k logical_block_size Up to now, applying the in-core activity-log to the on-disk bitmap did not care for logical_block_size. On logical_block_size != 512 byte, this very likely results in misalligned block access and spurious "io errors". We now simply always submit aligned whole 4k blocks, fixing this for logical block sizes of 512, 1024, 2048 and 4096. For even larger logical block sizes, this won't work. But I'm not aware of devices with such properties being available. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 1f55243024087b56aef0b1e6d9c0ea89c76f0a6b Author: Philipp Reisner Date: Thu Mar 4 15:51:01 2010 +0100 drbd: Renamed overwrite_peer to primary_force Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit d10a33c68b8526d95ef6ee72b371c392d48df4d3 Author: Philipp Reisner Date: Thu Mar 4 15:11:39 2010 +0100 drbd: Forcing primary should also work for Consistent disks [Bugz 266] Up to now this only worked for Outdated and Inconsistent disks, that it did not worked for Consistent disks was an inconsistent omission. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit d0c3f60f3611ceac9b1e4fdffd1497337568e7cb Author: Philipp Reisner Date: Tue Mar 2 15:06:45 2010 +0100 drbd: Make sure we do not send state updates during an empty resync [Bugz 271] This is a race condition that existed for ages. The previous commit reduces the window, this one closes it. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 309d1608cce32903d67d47e7545e232c400b6aa0 Author: Philipp Reisner Date: Tue Mar 2 15:03:44 2010 +0100 drbd: Reduce the time an empty resync takes usually This mitigates changes introduced with commit: http://git.drbd.org/?p=drbd-8.3.git;a=commit;h=4b6803a3276652da3737 Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c42b6cf4b38c9726d4b46c48d04197c9ca74d773 Author: Lars Ellenberg Date: Wed Mar 3 02:44:11 2010 +0100 drbd: add missing drbd command names to avoid in error messages cmdname() should map command number to its human readable representation. The string table was incomplete, though. Maybe rather do a switch() block, and let the compiler help us to keep it complete? Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 4589d7f829951c1713ef5a4ad1a9bb563da329b5 Author: Lars Ellenberg Date: Wed Mar 3 02:25:33 2010 +0100 drbd_disconnect: grab meta.socket mutex as well Fixes a race and potential kernel panic if e.g. the worker was just about to send a few P_RS_IS_IN_SYNC via the meta socket for checksum based resync, while the receiver destroys the sockets in drbd_disconnect. To make sure no-one is using the meta socket, it is not enough to stop the asender... Grab the meta socket mutex before destroying it. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 676396d545350a70d922605ec23c2ed26124334a Author: Lars Ellenberg Date: Wed Mar 3 02:08:22 2010 +0100 fix unit of rs_same_csums accounting Depending on resync request size, we need to account for more than one bit. Impact: cosmetic If SyncTarget reported correctly 100% equal checksums, the SyncSource usually reported 12% equal checksums instead, because it only counted requests, we typically do 32k resync requests, and the bitmap granularity is still 4k. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 580b9767dbdf2c049c4d05330c70ea786ef01016 Author: Lars Ellenberg Date: Fri Feb 26 23:15:23 2010 +0100 drbd: fix broken state change after split-brain attach while connected Situation: we have diverging data sets, i.e. we had a split brain somewhen, but currently are connected, one node diskless. Then we try to attach that disk, figure it is consistent, but has a diverging data set, we refuse to attach. This led to strange state changes: 22:18:35 bb drbd1: peer( Unknown -> Primary ) conn( WFReportParams -> Connected) pdsk( DUnknown -> UpToDate ) 22:19:30 bb drbd1: disk( Diskless -> Attaching ) 22:19:30 bb drbd1: disk( Attaching -> Negotiating ) 22:19:30 bb drbd1: drbd_sync_handshake: 22:19:30 bb drbd1: self 97BF25798B9D5222:F33D1F62ADE698DD:4269796F9D027C83:AC45D8B5C3C1BF93 bits:19449 flags:0 22:19:30 bb drbd1: peer 280DFB6E125465D3:F33D1F62ADE698DC:4269796F9D027C82:AC45D8B5C3C1BF93 bits:2575806 flags:0 22:19:30 bb drbd1: uuid_compare()=100 by rule 90 22:19:30 bb drbd1: Split-Brain detected, dropping connection! 22:19:30 bb drbd1: disk( Negotiating -> Diskless ) while the other side says: 22:19:30 aa drbd1: Split-Brain detected, dropping connection! 22:19:30 aa drbd1: Disk attach process on the peer node was aborted. 22:19:30 aa drbd1: conn( Connected -> TOO_LARGE ) pdsk( Diskless -> Consistent ) This should be fixed now. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 4aa83b7bf122106669346eef40632289f540653f Author: Lars Ellenberg Date: Fri Feb 26 16:53:24 2010 +0100 drbd: fix NULL pointer dereference on 4k hard sect size we still don't support 4k 'physical' sectors 'natively', but use a read-modify-write workaround. And we even tried to use the extra page before we allocated it :( Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit cf14c2e987ba0a09a7b09be2ecd55af0bc9c17b4 Author: Philipp Reisner Date: Tue Feb 2 21:03:50 2010 +0100 drbd: --dry-run option for drbdsetup net ( drbdadm -- --dry-run connect ) Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc Author: Peter Zijlstra Date: Wed Mar 10 17:07:24 2010 +0100 sched: Fix pick_next_highest_task_rt() for cgroups Since pick_next_highest_task_rt() already iterates all the cgroups and is really only interested in tasks, skip over the !task entries. Reported-by: Dhaval Giani Signed-off-by: Peter Zijlstra Tested-by: Dhaval Giani LKML-Reference: Signed-off-by: Ingo Molnar commit 639fe4b12f92b54c9c3b38c82cdafaa38cfd3e63 Author: Xiao Guangrong Date: Thu Mar 11 15:30:35 2010 +0800 perf: export perf_trace_regs and perf_arch_fetch_caller_regs Export perf_trace_regs and perf_arch_fetch_caller_regs since module will use these. Signed-off-by: Xiao Guangrong [ use EXPORT_PER_CPU_SYMBOL_GPL() ] Signed-off-by: Peter Zijlstra LKML-Reference: <4B989C1B.2090407@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 45e16a6834b6af098702e5ea6c9a40de42ff77d8 Author: Peter Zijlstra Date: Thu Mar 11 13:40:30 2010 +0100 perf, x86: Fix hw_perf_enable() event assignment What happens is that we schedule badly like: <...>-1987 [019] 280.252808: x86_pmu_start: event-46/1300c0: idx: 0 <...>-1987 [019] 280.252811: x86_pmu_start: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252812: x86_pmu_start: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252813: x86_pmu_start: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252814: x86_pmu_start: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252825: x86_pmu_stop: event-46/1300c0: idx: 0 <...>-1987 [019] 280.252826: x86_pmu_stop: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252827: x86_pmu_stop: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252828: x86_pmu_stop: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252829: x86_pmu_stop: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252834: x86_pmu_start: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252834: x86_pmu_start: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252835: x86_pmu_start: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252836: x86_pmu_start: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252837: x86_pmu_start: event-51/1300c0: idx: 32 *FAIL* This happens because we only iterate the n_running events in the first pass, and reset their index to -1 if they don't match to force a re-assignment. Now, in our RR example, n_running == 0 because we fully unscheduled, so event-50 will retain its idx==32, even though in scheduling it will have gotten idx=0, and we don't trigger the re-assign path. The easiest way to fix this is the below patch, which simply validates the full assignment in the second pass. Reported-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1268311069.5037.31.camel@laptop> Signed-off-by: Ingo Molnar commit 85cfabbcd10f8d112feee6e2ec64ee78033b6d3c Author: Peter Zijlstra Date: Thu Mar 11 13:06:56 2010 +0100 perf, ppc: Fix compile error due to new cpu notifiers Fix: arch/powerpc/kernel/perf_event.c:1334: error: 'power_pmu_notifier' undeclared (first use in this function) arch/powerpc/kernel/perf_event.c:1334: error: (Each undeclared identifier is reported only once arch/powerpc/kernel/perf_event.c:1334: error: for each function it appears in.) arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'power_pmu_notifier' arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'register_cpu_notifier' Due to commit 3f6da390 (perf: Rework and fix the arch CPU-hotplug hooks). Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit bb6fbc4548b9ae7ebbd06ef72f00229df259d217 Author: Trond Myklebust Date: Thu Mar 11 09:19:35 2010 -0500 NFS: Avoid a deadlock in nfs_release_page J.R. Okajima reports the following deadlock: INFO: task kswapd0:305 blocked for more than 120 seconds. "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kswapd0 D 0000000000000001 0 305 2 0x00000000 ffff88001f21d4f0 0000000000000046 ffff88001fdea680 ffff88001f21c000 ffff88001f21dfd8 ffff88001f21c000 ffff88001f21dfd8 ffff88001f21dfd8 ffff88001fdea040 0000000000014c00 0000000000000001 ffff88001fdea040 Call Trace: [] io_schedule+0x4d/0x70 [] sync_page+0x65/0xa0 [] __wait_on_bit_lock+0x52/0xb0 [] ? sync_page+0x0/0xa0 [] __lock_page+0x64/0x70 [] ? wake_bit_function+0x0/0x40 [] truncate_inode_pages_range+0x344/0x4a0 [] truncate_inode_pages+0x10/0x20 [] generic_delete_inode+0x15e/0x190 [] generic_drop_inode+0x5d/0x80 [] iput+0x78/0x80 [] nfs_dentry_iput+0x38/0x50 [] dentry_iput+0x84/0x110 [] d_kill+0x2e/0x60 [] dput+0x7a/0x170 [] path_put+0x15/0x40 [] __put_nfs_open_context+0xa4/0xb0 [] ? nfs_free_request+0x0/0x50 [] put_nfs_open_context+0xb/0x10 [] nfs_free_request+0x29/0x50 [] kref_put+0x8e/0xe0 [] nfs_release_request+0x14/0x20 [] nfs_find_and_lock_request+0x89/0xa0 [] nfs_wb_page+0x80/0x110 [] nfs_release_page+0x70/0x90 [] try_to_release_page+0x5e/0x80 [] shrink_page_list+0x638/0x860 [] shrink_zone+0x63e/0xc40 We can fix this by making the call to put_nfs_open_context() happen when we actually remove the write request from the inode (which is done by the nfsiod thread in this case). Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit d6dd692168c049196f54edc2e8227c60702bb1d2 Author: Mike Travis Date: Fri Mar 5 13:10:38 2010 -0600 x86: Reduce per cpu warning boot up messages Reduce warning message output to one line only instead of per cpu. Signed-of-by: Mike Travis Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Brian Gerst Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit 10fb7f1f2d311b4d2e5d881fe2d83f1c281100f9 Author: Mike Travis Date: Fri Mar 5 13:10:36 2010 -0600 x86: Reduce per cpu MCA boot up messages Don't write per cpu MCA boot up messages. Signed-of-by: Mike Travis Cc: Hidetoshi Seto Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit 841d6e8c4e969b2cdd80f7216af34d932c41b1a6 Author: Michal Simek Date: Fri Jan 22 14:28:36 2010 +0100 microblaze: entry.S use delay slot for return handlers Signed-off-by: Michal Simek commit 8633bebc63ba5752254925f8b49a19102df1a0ff Author: Michal Simek Date: Mon Feb 22 13:24:43 2010 +0100 microblaze: Save current task directly Signed-off-by: Michal Simek commit b1d70c62fff3e8b6224699801c610c244882685a Author: Michal Simek Date: Fri Jan 22 10:24:06 2010 +0100 microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap There is possible to save r3/r4 at the beggining of user part before calling handlers and at the end restore it. Signed-off-by: Michal Simek commit 79bf3a137617e6deeac411c39f1660b7e91d6348 Author: Michal Simek Date: Wed Jan 20 15:17:08 2010 +0100 microblaze: PCI early support for noMMU system Signed-off-by: Michal Simek commit 1be53e084a5bd8f59850348e1066d25aa0200031 Author: Michal Simek Date: Thu Mar 11 14:15:48 2010 +0100 microblaze: Fix dma alloc and free coherent dma functions We have to use consistent code to be able to do coherent dma function. In consistent code is used cache inhibit page mapping. Xilinx reported that there is bug in Microblaze for WB and d-cache_always use option. Microblaze 7.30.a should be first version where is this bug removed. Signed-off-by: Michal Simek commit 3a0d7a4dd5b3a6545e5764735b48ab84e64af723 Author: Michal Simek Date: Mon Feb 22 12:16:08 2010 +0100 microblaze: Add consistent code Remove ancient Kconfig option for consistent code. MMU uses cache inhibit pages. noMMU uses UNCACHE SHADOW feature where is used double ram size. For example: Physical ram is 256MB and cache are setup to cover the same size. But if you setup in HW that size is 512MB and cache covers 256MB than you can use adresses from 256-512MB without caches and correspond with 0-256MB with cache. That's why I am using dcache base/high addresses to find out uncache area. Signed-off-by: Michal Simek commit ae8ee1505162f47f8b8cf7a44c26ea6b172e1445 Author: Michal Simek Date: Mon Feb 22 12:09:02 2010 +0100 microblaze: pgtable.h: move consistent functions Consistent functions will be used for noMMU and MMU kernels. Signed-off-by: Michal Simek commit b8a84059b5c3a3b9ba3973dcdab1e1d9cc4975e0 Author: Michal Simek Date: Mon Feb 22 11:33:07 2010 +0100 microblaze: Remove ancient Kconfig option for consistent mapping We don't use CONSISTENT option from Kconfig that's why I am removing them. Signed-off-by: Michal Simek commit cca5613f0278fb0ae0aba285a496add55d0cabab Author: Michal Simek Date: Mon Feb 22 11:27:27 2010 +0100 microblaze: Remove VMALLOC_VMADDR Signed-off-by: Michal Simek commit 22607a28213068af113b46862eafa785f00a482e Author: Michal Simek Date: Mon Feb 15 16:41:40 2010 +0100 microblaze: Add define for ASM_LOOP It is default option but both options must be measured. Signed-off-by: Michal Simek commit dcbae4be907488df5e1cc8a89b7df1a0565c257c Author: Michal Simek Date: Tue Feb 9 09:25:08 2010 +0100 microblaze: Preliminary support for dma drivers I found several problems for ll_temac driver and on system with WB. This early fix should fix it. I will clean this patch before I will add it to mainline Signed-off-by: Michal Simek commit 4c912c1a33abb67aefecb5ed8bd73d91887c4977 Author: Frans Pop Date: Sat Feb 6 18:47:12 2010 +0100 microblaze: remove trailing space in messages Signed-off-by: Frans Pop Cc: microblaze-uclinux@itee.uq.edu.au Cc: Michal Simek Signed-off-by: Michal Simek commit e786c6ad2ba7f1f9b9cc9d75d5e7ba7d9cdc550a Author: Michal Simek Date: Mon Feb 8 14:48:16 2010 +0100 microblaze: Use generic show_mem() Remove arch-specific show_mem() in favor of the generic version. It is based on powerpc patch. bda2fa535564ace56a395d5b65c6dc81305401fa Signed-off-by: Michal Simek commit 137d0795a72786fa33e6900cb2ac2eae81f4b6ee Author: Michal Simek Date: Thu Feb 4 11:42:24 2010 +0100 microblaze: Change temp register for cmdline For copy was used r7 register when CONFIG_CMDLINE_BOOL option is enabled. But r7 stores pointer to fdt that's why machine_early_init not detect compiled-in DTB. I also moved kernel PID setup to have TLB init in one block Signed-off-by: Michal Simek commit d79f3b06a9e40b382bd5d5ae8dea9b3210eda9ce Author: Michal Simek Date: Mon Feb 8 12:13:10 2010 +0100 microblaze: Preliminary support for dma drivers I found several problems for ll_temac driver and on system with WB. This early fix should fix it. I will clean this patch before I will add it to mainline Signed-off-by: Michal Simek commit 7ae5f21361fea11f58c398701da635f778635d13 Author: John Kacur Date: Thu Mar 11 13:57:00 2010 +0100 perf: Make the install relative to DESTDIR if specified Without this change, the install path is relative to prefix/DESTDIR where prefix is automatically set to $HOME. This can produce unexpected results. For example: make -C tools/perf DESTDIR=/home/jkacur/tmp install-man creates the directory: /home/jkacur/home/jkacur/tmp/share/... instead of the expected: /home/jkacur/tmp/share/... Signed-off-by: John Kacur Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Tom Zanussi Cc: Kyle McMartin Cc: LKML-Reference: <1268312220-12880-1-git-send-email-jkacur@redhat.com> Signed-off-by: Ingo Molnar commit 407c1da07d5afa001ed0fdb8f379c00bbd09990a Author: Michal Simek Date: Tue Jan 12 14:51:04 2010 +0100 microblaze: Move cache function to cache.c It is better to have init cache handling on one place. Signed-off-by: Michal Simek commit 777537905744c28b02c283692e7f75f5445c1afa Author: Michal Simek Date: Tue Jan 12 09:55:10 2010 +0100 microblaze: Add support from PREEMPT This patch add core PREEMPT support for Microblaze. I tried to trace it via tracers and I was able to see any output. I also added low level debug functions to see if that code is called. Signed-off-by: Michal Simek commit 83ff56f46a8532488ee364bb93a9cb2a59490d33 Author: Masami Hiramatsu Date: Tue Mar 9 10:22:19 2010 -0500 kprobes: Calculate the index correctly when freeing the out-of-line execution slot From : Ananth N Mavinakayanahalli When freeing the instruction slot, the arithmetic to calculate the index of the slot in the page needs to account for the total size of the instruction on the various architectures. Calculate the index correctly when freeing the out-of-line execution slot. Reported-by: Sachin Sant Reported-by: Heiko Carstens Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Masami Hiramatsu LKML-Reference: <4B9667AB.9050507@redhat.com> Signed-off-by: Ingo Molnar commit 733cc2183116b216abb52e709709bb0e626c9a75 Author: Michal Simek Date: Mon Jan 18 15:27:11 2010 +0100 microblaze: Add support for Xilinx PCI host bridge This patch is based on powerpc patch 64f16502475ddf663169369fffff6da9b10ea9fb We did some cleanups and removed powerpc parts. There is one new debug early listing function too. Exclude function is only in Debug options. We tested in on custom board. Signed-off-by: Michal Simek commit a6475c132278c1be158a13872c233aeab8a00176 Author: Michal Simek Date: Mon Jan 18 15:27:10 2010 +0100 microblaze: Enable PCI, missing files There are two parts of changes. The first is just enable PCI in Makefiles and in Kconfig. The second is the rest of missing files. I didn't want to add it with previous patch because that patch is too big. Current Microblaze toolchain has problem with weak symbols that's why is necessary to apply this changes to be possible to compile pci support. Xilinx knows about this problem. Signed-off-by: Michal Simek commit d3afa58c20b65155af9f0d5eaa59fe2d367ac432 Author: Michal Simek Date: Mon Jan 18 14:42:34 2010 +0100 microblaze: Add core PCI files Add pci-common.h and pci32.c. Files are based on PPC version. There are removed ppc specific parts and the code was completely clean. Signed-off-by: Michal Simek commit 2ed975b43c1bf09652795a355c4e820e21c4ec44 Author: Michal Simek Date: Mon Jan 18 14:25:08 2010 +0100 microblaze: Add pci-bridge.h Add pci-bridge.h for Microblaze. It is based on powerpc header file. My changes: I removed PPC_ prefix from constants Removed ppc64 specifis parts Signed-off-by: Michal Simek commit 830980a0a83e0b5af97c31f24dc7f1b57aa9ccea Author: Michal Simek Date: Mon Jan 18 14:23:16 2010 +0100 microblaze: Add pci.h Add pci.h for microblaze. It is based on powerpc pci.h Signed-off-by: Michal Simek commit 2ddafeab6f159640299d17fb9b73b57f65011d85 Author: Michal Simek Date: Thu Jan 14 15:40:11 2010 +0100 microblaze: io.h include asm-generic/iomap.h I need to use generic/iomap.h for PCI that's why is necessary to include it and fix ioport_{map,unmap} functions. Signed-off-by: Michal Simek commit ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4 Author: Dan Carpenter Date: Sat Mar 6 14:17:52 2010 +0300 sched: Cleanup: remove unused variable in try_to_wake_up() We haven't used the "orig_rq" variable since 055a00865d "Fix/add missing update_rq_clock() calls" Signed-off-by: Dan Carpenter Cc: Peter Zijlstra Cc: Andreas Herrmann Cc: Gautham R Shenoy Cc: efault@gmx.de LKML-Reference: <20100306111752.GL4958@bicker> Signed-off-by: Ingo Molnar commit c6ba01a4c7806d134c8d483525997559071d0990 Author: Michal Simek Date: Thu Jan 14 15:16:31 2010 +0100 microblaze: Add irq_create_{of_,}mapping functions Support function for PCI. We don't use any advance mapping mechanism that's why implementation is simple. Signed-off-by: Michal Simek commit a84642a339235020e6dccc022de27055f1fa9340 Author: Michal Simek Date: Thu Jan 14 17:03:49 2010 +0100 microblaze: Add {z,}alloc_maybe_bootmem functions I will need {z,}alloc_maybe_bootmem functions for pci patches Signed-off-by: Michal Simek commit 2549edd353196d7de9c18e08146d7a8836f97235 Author: Michal Simek Date: Wed Jan 20 14:36:24 2010 +0100 microblaze: Implement __dma_sync_page There is necessary to do some cache handling for dma operations. Signed-off-by: Michal Simek commit ccfe27d7000668b02d10fc3e06aa49e3e3603162 Author: Michal Simek Date: Thu Jan 14 11:21:02 2010 +0100 microblaze: Support DMA Add DMA support for Microblaze. There are some part of this new feature: 1. Basic DMA support 2. Enable DMA debug option 3. Setup notifier Ad 1. dma-mapping come from powerpc and x86 version and it is based on generic dma-mapping-common.h Ad 2. DMA support debug features which is used in generic file. For more information please look at Documentation/DMA-API.txt Ad 3. notifier is very important to setup dma_ops. Without this part for example ll_temac driver failed because there are no setup dma operations. Signed-off-by: Michal Simek commit 915a0b575fdb2376135ed9334b3ccb1eb51db622 Merge: e02c4fd 0e95017 Author: Ingo Molnar Date: Thu Mar 11 13:39:33 2010 +0100 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit f56e8a0765cc4374e02f4e3a79e2427b5096b075 Author: Paul E. McKenney Date: Fri Mar 5 15:03:27 2010 -0800 x86/mce: Fix RCU lockdep splats Create an rcu_dereference_check_mce() that checks for RCU-sched read side and mce_read_mutex being held on update side. Replace uses of rcu_dereference() in arch/x86/kernel/cpu/mcheck/mce.c with this new macro. Signed-off-by: Paul E. McKenney Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 007b09243b099811124f69d492adeebe9e439f96 Author: Paul E. McKenney Date: Fri Mar 5 15:03:26 2010 -0800 rcu: Increase RCU CPU stall timeouts if PROVE_RCU CONFIG_PROVE_RCU imposes additional overhead on the kernel, so increase the RCU CPU stall timeouts in an attempt to allow for this effect. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3f379b03fbfddd20536389a85c6456f8233d1f8d Author: Paul E. McKenney Date: Fri Mar 5 15:03:25 2010 -0800 ftrace: Replace read_barrier_depends() with rcu_dereference_raw() Replace the calls to read_barrier_depends() in ftrace_list_func() with rcu_dereference_raw() to improve readability. The reason that we use rcu_dereference_raw() here is that removed entries are never freed, instead they are simply leaked. This is one of a very few cases where use of rcu_dereference_raw() is the long-term right answer. And I don't yet know of any others. ;-) Signed-off-by: Paul E. McKenney Acked-by: Steven Rostedt Cc: Frederic Weisbecker Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit a12b51c478899fe0b7e874a559b05ba35f1128ee Author: Paul Mackerras Date: Wed Mar 10 20:36:09 2010 +1100 perf tools: Fix sparse CPU numbering related bugs At present, the perf subcommands that do system-wide monitoring (perf stat, perf record and perf top) don't work properly unless the online cpus are numbered 0, 1, ..., N-1. These tools ask for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN) and then try to create events for cpus 0, 1, ..., N-1. This creates problems for systems where the online cpus are numbered sparsely. For example, a POWER6 system in single-threaded mode (i.e. only running 1 hardware thread per core) will have only even-numbered cpus online. This fixes the problem by reading the /sys/devices/system/cpu/online file to find out which cpus are online. The code that does that is in tools/perf/util/cpumap.[ch], and consists of a read_cpu_map() function that sets up a cpumap[] array and returns the number of online cpus. If /sys/devices/system/cpu/online can't be read or can't be parsed successfully, it falls back to using sysconf to ask how many cpus are online and sets up an identity map in cpumap[]. The perf record, perf stat and perf top code then calls read_cpu_map() in the system-wide monitoring case (instead of sysconf) and uses cpumap[] to get the cpu numbers to pass to perf_event_open. Signed-off-by: Paul Mackerras Cc: Anton Blanchard Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com> Signed-off-by: Ingo Molnar commit 8a03ae2a5baed3df09e5643615bdd853fc142a09 Author: Thomas Gleixner Date: Fri Jan 29 20:39:07 2010 +0000 block: drbd: Convert semaphore to mutex The bm_change semaphore is semantically a mutex. Convert it to a real mutex. Signed-off-by: Thomas Gleixner Signed-off-by: Philipp Reisner commit 220b140b52ab6cc133f674a7ffec8fa792054f25 Author: Paul Mackerras Date: Wed Mar 10 20:45:52 2010 +1100 perf_event: Fix oops triggered by cpu offline/online Anton Blanchard found that he could reliably make the kernel hit a BUG_ON in the slab allocator by taking a cpu offline and then online while a system-wide perf record session was running. The reason is that when the cpu comes up, we completely reinitialize the ctx field of the struct perf_cpu_context for the cpu. If there is a system-wide perf record session running, then there will be a struct perf_event that has a reference to the context, so its refcount will be 2. (The perf_event has been removed from the context's group_entry and event_entry lists by perf_event_exit_cpu(), but that doesn't remove the perf_event's reference to the context and doesn't decrement the context's refcount.) When the cpu comes up, perf_event_init_cpu() gets called, and it calls __perf_event_init_context() on the cpu's context. That resets the refcount to 1. Then when the perf record session finishes and the perf_event is closed, the refcount gets decremented to 0 and the context gets kfreed after an RCU grace period. Since the context wasn't kmalloced -- it's part of a per-cpu variable -- bad things happen. In fact we don't need to completely reinitialize the context when the cpu comes up. It's sufficient to initialize the context once at boot, but we need to do it for all possible cpus. This moves the context initialization to happen at boot time. With this, we don't trash the refcount and the context never gets kfreed, and we don't hit the BUG_ON. Reported-by: Anton Blanchard Signed-off-by: Paul Mackerras Tested-by: Anton Blanchard Acked-by: Peter Zijlstra Cc: Signed-off-by: Ingo Molnar commit 2e95e3f668c85276ce699993596d3b52b0fcf4c5 Author: Benjamin Marzinski Date: Wed Mar 10 18:10:19 2010 -0600 GFS2: Allow the number of committed revokes to temporarily be negative GFS2 tracks the number of revokes and unrevokes that are part of committed transactions via sd_log_commited_revoke. It is possible for one process to add revokes during its transaction, while another process unrevokes them during its transaction. If the second process finishes its transaction first, sd_log_commited_revoke will be decremented by the number of unrevokes that the second process did, without first being incremented by the number of revokes the first process did. This is fine, since all started transactions must be completed before the journal can be flushed. However, sd_log_commited_revoke is an unsigned integer, and log_refund() causes an assertion failure if it would go negative at the end of a transaction. This patch makes sd_log_commited_revoke a signed integer and allows it to go negative. __gfs2_log_flush() still checks that it mataches the actual number of revokes. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit afadb8e08c48d08b75f3caf8404742b13e6b3624 Author: Mark Brown Date: Wed Mar 10 23:41:33 2010 -0800 Input: wm831x-on - convert to use genirq Now that the WM831x core has been converted to use genirq for the interrupt controller there is no need for the client drivers to use a WM831x-specific API rather than just calling genirq directly. Also fixes a leak of the IRQ during init failure - the error path free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit fdba2bb1f2eed85085a0fe154e1acb82de3239f7 Author: Ranjith Lohithakshan Date: Wed Mar 10 23:41:22 2010 -0800 Input: ads7846 - add wakeup support Add wakeup support to the ads7846 driver. Platforms can enable wakeup capability by setting the wakeup flag in ads7846_platform_data. With this patch the ads7846 driver can be used to wake the system from suspend. Signed-off-by: Ranjith Lohithakshan Signed-off-by: Dmitry Torokhov commit 04b4b88cca0ebe3813b4b6f014fb6a0db380b137 Author: Vadim Zaliva Date: Wed Mar 10 23:41:00 2010 -0800 Input: appletouch - fix integer overflow issue When reading data from Geyser 2 touchpads used on post Oct 2005 Apple PowerBooks the driver was casting X and Y coordinates values to 'signed char'. Testing on one of such PowerBooks I have noticed that touchpad always generates positive values, but some of them are greater that 127, and thus, when cast to 'signed char' being interpreted as a negative. Such bigger values have been observed infrequently, closer to the edges of a touchpad, so the problem was not very visible. Nevertheless, the patch would potentially improve touchpad driver accuracy. Signed-off-by: Vadim Zaliva Signed-off-by: Dmitry Torokhov commit acc6a0935e5958ad1a1b99a1c6f44a52264bedf0 Author: Grant Likely Date: Wed Mar 10 14:39:50 2010 -0700 powerpc/52xx: update defconfigs Signed-off-by: Grant Likely commit dee60269f0fe90927ce5095eef3a8723bbb9c53e Merge: 51f5f8c 1382c71 Author: John W. Linville Date: Wed Mar 10 16:34:38 2010 -0500 Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 51f5f8ca446d4c59041b9b6995821e13208897ea Author: Eric Dumazet Date: Wed Mar 10 17:13:36 2010 +0100 mac80211: Fix memory leak in ieee80211_if_write() Fix memory leak and use kmalloc() instead of kzalloc() as we are going to overwrite the allocated buffer. Signed-off-by: Eric Dumazet Signed-off-by: John W. Linville commit 2a13052fe495948e572839e514e0e0cd236c50b0 Author: Juuso Oikarinen Date: Tue Mar 9 14:25:02 2010 +0200 mac80211: Fix (dynamic) power save entry Currently hardware with !IEEE80211_HW_PS_NULLFUNC_STACK and IEEE80211_HW_REPORTS_TX_ACK_STATUS will never enter PSM due to the conditions in the power save entry functions. Fix those conditions. Signed-off-by: Juuso Oikarinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit 41093167ec6c1854903a4bc38a37b5740c028984 Author: Zhu Yi Date: Tue Mar 9 16:05:31 2010 +0800 ipw2200: use kmalloc for large local variables Fixed below compiler warning: drivers/net/wireless/ipw2x00/ipw2200.c: In function ‘ipw_load_firmware’: drivers/net/wireless/ipw2x00/ipw2200.c:3260: warning: the frame size of 1168 bytes is larger than 1024 bytes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 9bd4517ddc51c803784778ab52e6f0bc03b77a52 Author: Scott Ellis Date: Wed Mar 10 14:23:13 2010 -0700 spi/omap2_mcspi: Use transaction speed if provided omap2_mcspi_transfer() gets called in omap2_mcspi_work() when the transaction speed_hz or bits_per_word fields are non-zero. omap2_mcspi_transfer() does not look at the speed_hz field so the override speed value is ignored. The code should probably change to one of these options. 1. Skip the call to omap2_mcsp_transfer() if the only reason was a non-zero speed_hz and it's not going to be used. 2. Use the new speed_hz value provided The patch below uses the speed_hz value. Signed-off-by: Scott Ellis Signed-off-by: Grant Likely commit 5e7749436d576a525d7b2a4bcffb17b3364b9e00 Author: Scott Ellis Date: Wed Mar 10 14:22:45 2010 -0700 spi/omap2_mcspi: fix NULL pointer dereference Check spi->controller_state before dereferencing. Shows up NULL here when using spi_alloc_device()/spi_add_device() and spi_add_device() fails before spi_setup(). Calling spi_dev_put() on the leftover spi_device results in the error. Signed-off-by: Scott Ellis Signed-off-by: Grant Likely commit 5f13bfac0718ce6f83ecba3755f224c3790e8d66 Author: Bruno Randolf Date: Tue Mar 9 16:56:10 2010 +0900 ath5k: read eeprom IQ calibration values correctly for G mode we read the IQ correction values (i_cal and q_cal) for G mode from a wrong location (the same shifts as for A mode is applied which is incorrect). use correct locations, matching the docs and HAL sources. also we should write IQ correction only when we have that information in the EEPROM, starting from version 4. also write it in the same way as we do in the periodic recalibration (enable last), just to be sure. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 86415d43efd4f7093979cfa8a80232114266f1a4 Author: Bruno Randolf Date: Tue Mar 9 16:56:05 2010 +0900 ath5k: fix I/Q calibration (for real) I/Q calibration was completely broken, resulting in a high number of CRC errors on received packets. before i could see around 10% to 20% CRC errors, with this patch they are between 0% and 3%. 1.) the removal of the mask in commit "ath5k: Fix I/Q calibration (f1cf2dbd0f798b71b1590e7aca6647f2caef1649)" resulted in no mask beeing used when writing the I/Q values into the register. additional errors in the calculation of the values (see 2.) resulted too high numbers, exceeding the masks, so wrong values like 0xfffffffe were written. to be safe we should always use the bitmask when writing parts of a register. 2.) using a (s32) cast for q_coff is a wrong conversion to signed, since we convert to a signed value later by substracting 128. this resulted in too low numbers for Q many times, which were limited to -16 by the boundary check later on. 3.) checked everything against the HAL sources and took over comments and minor optimizations from there. 4.) we can't use ENABLE_BITS when we want to write a number (the number can contain zeros). also always write the correction values first and set ENABLE bit last, like the HAL does. Signed-off-by: Bruno Randolf Cc: stable@kernel.org Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit a3b980fd1391e75068ae25f3817728b27bfdb04c Author: Bruno Randolf Date: Tue Mar 9 16:55:33 2010 +0900 ath5k: fix TSF reset to reset the TSF, AR5K_BEACON_RESET_TSF has to be 1, not 0. also we have a function for that so use it. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8bd8beab49fec3f7d014c328641bd94de3df744b Author: Bruno Randolf Date: Tue Mar 9 16:55:23 2010 +0900 ath5k: use fixed antenna for tx descriptors when using a fixed antenna we should use the antenna number in all tx descriptors, otherwise the hardware will sometimes send the frame out on the other antenna. it seems like the hardware does not always respect the default antenna and diversity settings (esp. AR5K_STA_ID1_DEFAULT_ANTENNA). also i would like to note that antenna diversity does not always work correctly on 5414 (at least) when only one antenna is connected: for example all frames might be received on antenna A but still the HW tries to send on antenna B some times, causing packet loss. this is both verified with the antenna statistics output of the previous patch and a spectrum analyzer. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8e59340e4fb65cfd748eaa1e23db057c52520f35 Author: Zhu Yi Date: Mon Mar 8 13:18:03 2010 +0800 libipw: split ieee->networks into small pieces The ieee->networks consists of 128 struct libipw_network entries. If we allocate this chunk of memory altogether, it ends up with an order 4 page allocation. High order page allocation is likely to fail on system high load. This patch splits the big chunk memory allocation into small pieces, each is 344 bytes, allocates them with 128 times. The patch fixed bug http://bugzilla.kernel.org/show_bug.cgi?id=14989 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 38a679a52be13d5a0c766597ab823e06688d6e8e Author: Jouni Malinen Date: Sat Mar 6 18:35:08 2010 +0200 mac80211: Fix sta_mtx unlocking on insert STA failure path Commit 34e895075e21be3e21e71d6317440d1ee7969ad0 introduced sta_mtx locking into sta_info_insert() (now sta_info_insert_rcu), but forgot to unlock this mutex on one of the error paths. Fix this by adding the missing mutex_unlock() call for the case where STA insert fails due to an entry existing already. This may happen at least in AP mode when a STA roams between two BSSes (vifs). Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e5a9a35cb9c0d92d7c986cb3696fb794be100087 Author: Helmut Schaa Date: Fri Mar 5 17:44:22 2010 +0100 rt2x00: remove KSEG1ADDR define from rt2x00soc.h Remove the KSEG1ADDR define from rt2x00soc.h as it redefines and covers the correct one from the arch/mips/include/asm/addrspace.h. Otherwise the driver oopses on the target platform (Ralink rt3050 board). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 07081fd8587478849b69d7b41596e81ff5a7f532 Author: David Miller Date: Wed Mar 10 14:05:35 2010 -0700 uartlite: Fix build on sparc. We can get this driver enabled via MFD_TIMBERDALE which only requires GPIO to be on. But the of_address_to_resource() function is only present on powerpc and microblaze, so we have to conditionalize the CONFIG_OF probing bits on that. Signed-off-by: David S. Miller Signed-off-by: Grant Likely commit b4d2314bb88b07e5a04e6c75b442a1dfcd60e340 Author: Trond Myklebust Date: Wed Mar 10 15:21:44 2010 -0500 NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() If the NFS_INO_REVAL_FORCED flag is set, that means that we don't yet have an up to date attribute cache. Even if we hold a delegation, we must put a GETATTR on the wire. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 0b1adaa031a55e44f5dd942f234bf09d28e8a0d6 Author: Thomas Gleixner Date: Tue Mar 9 19:45:54 2010 +0100 genirq: Prevent oneshot irq thread race Lars-Peter pointed out that the oneshot threaded interrupt handler code has the following race: CPU0 CPU1 hande_level_irq(irq X) mask_ack_irq(irq X) handle_IRQ_event(irq X) wake_up(thread_handler) thread handler(irq X) runs finalize_oneshot(irq X) does not unmask due to !(desc->status & IRQ_MASKED) return from irq does not unmask due to (desc->status & IRQ_ONESHOT) This leaves the interrupt line masked forever. The reason for this is the inconsistent handling of the IRQ_MASKED flag. Instead of setting it in the mask function the oneshot support sets the flag after waking up the irq thread. The solution for this is to set/clear the IRQ_MASKED status whenever we mask/unmask an interrupt line. That's the easy part, but that cleanup opens another race: CPU0 CPU1 hande_level_irq(irq) mask_ack_irq(irq) handle_IRQ_event(irq) wake_up(thread_handler) thread handler(irq) runs finalize_oneshot_irq(irq) unmask(irq) irq triggers again handle_level_irq(irq) mask_ack_irq(irq) return from irq due to IRQ_INPROGRESS return from irq does not unmask due to (desc->status & IRQ_ONESHOT) This requires that we synchronize finalize_oneshot_irq() with the primary handler. If IRQ_INPROGESS is set we wait until the primary handler on the other CPU has returned before unmasking the interrupt line again. We probably have never seen that problem because it does not happen on UP and on SMP the irqbalancer protects us by pinning the primary handler and the thread to the same CPU. Reported-by: Lars-Peter Clausen Signed-off-by: Thomas Gleixner Cc: stable@kernel.org commit 717ea4b3474852057b1ce2c639ce219f4f8d3a8d Author: Greg Ungerer Date: Wed Mar 10 07:37:06 2010 -0800 net: add ColdFire support to the smc91x driver Some embedded ColdFire based boards use the SMC 91x family of ethernet devices. (For example the Freescale M5249C3 and MoretonBay NETtel). Add IO access support to the SMC91x driver, and allow this driver to be configured for ColdFire platforms. Signed-off-by: Greg Ungerer Signed-off-by: David S. Miller commit 7f29a3baa825725d29db399663790d15c78cddcf Author: Jussi Kivilinna Date: Tue Mar 9 12:24:38 2010 +0000 asix: fix setting mac address for AX88772 Setting new MAC address only worked when device was set to promiscuous mode. Fix MAC address by writing new address to device using undocumented command AX_CMD_READ_NODE_ID+1. Patch is tested with AX88772 device. Signed-off-by: Jussi Kivilinna Acked-by: David Hollis Signed-off-by: David S. Miller commit 2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Mar 9 16:47:52 2010 +0000 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. Commit a43912ab19... ("tunnel: eliminate recursion field") eliminated use of recursion field from tunnel structures, but its definition still exists in ip6_tnl{}. Let's remove that unused field. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 3041f5170751e3522aa1bd6e8ca5d98e846720b0 Author: Eric Dumazet Date: Tue Mar 9 19:09:08 2010 +0000 net: Fix dev_mc_add() Commit 6e17d45a (net: add addr len check to dev_mc_add) added a bug in dev_mc_add(), since it can now exit with a lock imbalance. Signed-off-by: Eric Dumazet CC: Jiri Pirko Signed-off-by: David S. Miller commit 0a141509ede48ac33ef756ac1640f4d3f46fa2db Author: Eric Dumazet Date: Tue Mar 9 19:40:54 2010 +0000 net: Annotates neigh_invalidate() Annotates neigh_invalidate() with __releases() and __acquires() for sparse sake. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bb134d5d9580fc7b945e3bca3c4b263947022966 Author: Eric Dumazet Date: Tue Mar 9 05:55:56 2010 +0000 tcp: Fix tcp_v4_rcv() Commit d218d111 (tcp: Generalized TTL Security Mechanism) added a bug for TIMEWAIT sockets. We should not test min_ttl for TW sockets. Reported-by: Tetsuo Handa Signed-off-by: Eric Dumazet Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 Author: Louis Rilling Date: Tue Mar 9 06:14:41 2010 +0000 tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() Commit 09943a1819a240ff4a72f924d0038818fcdd0a90 Author: Matt Carlson Date: Fri Aug 28 14:01:57 2009 +0000 tg3: Convert ISR parameter to tnapi forgot to update tg3_poll_controller(), leading to intermittent crashes with netpoll. Fix this. Signed-off-by: Louis Rilling Cc: stable@kernel.org Signed-off-by: David S. Miller commit 78cb27939ff4fd66d7f76cfe7c59c0fdf1b29ed8 Author: Frank Blaschka Date: Mon Mar 8 20:36:57 2010 +0000 qeth: change checksumming default for HiperSockets Deactivate inbound checksumming on HiperSocket is a valid but dangerous optimization in case the frame is routed from an OSA network to an HiperSockets network. To go for sure we change the default to software checksumming. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4 Author: Ursula Braun Date: Mon Mar 8 20:36:56 2010 +0000 qeth: no recovery after layer mismatch (z/VM NICs) Depending on their definition in z/VM, virtual devices for z/VM VSWITCH or GuestLAN must be configured either in layer2 or in layer3 mode. If qeth detects a layer mismatch, device activation fails. Trying to recover from this error cannot help; thus scheduling a recovery should be avoided. In addition, since recovery is forbidden during online setting of a qeth device, existence of its network device is guaranteed for all dev_close() calls in qeth. The corresponding checks can be removed. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit a959189a978e0104e8aa7f1522f5eff42d891456 Author: Ursula Braun Date: Mon Mar 8 20:36:55 2010 +0000 qeth: set promisc off after trace disabling failure If HiperSockets Network Traffic Analyzer is switched off, but trace disabling fails somehow, the qeth driver does not switch off its promisc mode status. A following sniffer reactivation fails, since qeth does not see a need to reenable tracing. At the same time the code analyzing results of trace commands is restructured. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 21fde749cbf71d03e8cf87a7a9a45349597e138a Author: Frank Blaschka Date: Mon Mar 8 20:36:54 2010 +0000 qeth: l3 send dhcp in non pass thru mode dhcp frames are valid IPv4 packets so there is no need to send them in pass thru mode. This allows dhcp packets to pass HiperSockets. Also the dhcp release frame is send out correctly with this patch. Signed-off-by: Frank Blaschka Signed-off-by: Martin Schwidefsky Signed-off-by: David S. Miller commit fe7a26257a4191de6047f7e1d38832472eb22f85 Author: Ursula Braun Date: Mon Mar 8 20:36:53 2010 +0000 qeth: enable kmsg hash processing in qeth_core_sys.c provide qeth kmsg definitions to enable hash string generation for kernel message created with dev_err(). Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 2886539d5e649c22a6d2107eb431d3bee81e0e6d Author: Rafi Rubin Date: Wed Mar 10 16:10:28 2010 +0100 HID: ntrig: fix touch events This reinstates the lost unpressing of BTN_TOUCH. To prevent undesireably touch toggles this also deals with tip switch events. Added a trap to prevent going out of bounds for hidinputs with empty reports. Clear bits of unused buttons which result in misidentification. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 97d5a22005f38057b4bc0d95f81cd26510268794 Author: Frederic Weisbecker Date: Fri Mar 5 05:35:37 2010 +0100 perf: Drop the obsolete profile naming for trace events Drop the obsolete "profile" naming used by perf for trace events. Perf can now do more than simple events counting, so generalize the API naming. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Masami Hiramatsu Cc: Jason Baron commit c530665c31c0140b74ca7689e7f836177796e5bd Author: Frederic Weisbecker Date: Wed Mar 3 07:16:16 2010 +0100 perf: Take a hot regs snapshot for trace events We are taking a wrong regs snapshot when a trace event triggers. Either we use get_irq_regs(), which gives us the interrupted registers if we are in an interrupt, or we use task_pt_regs() which gives us the state before we entered the kernel, assuming we are lucky enough to be no kernel thread, in which case task_pt_regs() returns the initial set of regs when the kernel thread was started. What we want is different. We need a hot snapshot of the regs, so that we can get the instruction pointer to record in the sample, the frame pointer for the callchain, and some other things. Let's use the new perf_fetch_caller_regs() for that. Comparison with perf record -e lock: -R -a -f -g Before: perf [kernel] [k] __do_softirq | --- __do_softirq | |--55.16%-- __open | --44.84%-- __write_nocancel After: perf [kernel] [k] perf_tp_event | --- perf_tp_event | |--41.07%-- lock_acquire | | | |--39.36%-- _raw_spin_lock | | | | | |--7.81%-- hrtimer_interrupt | | | smp_apic_timer_interrupt | | | apic_timer_interrupt The old case was producing unreliable callchains. Now having right frame and instruction pointers, we have the trace we want. Also syscalls and kprobe events already have the right regs, let's use them instead of wasting a retrieval. v2: Follow the rename perf_save_regs() -> perf_fetch_caller_regs() Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Jason Baron Cc: Archs commit 5331d7b84613b8325362dde53dc2bff2fb87d351 Author: Frederic Weisbecker Date: Thu Mar 4 21:15:56 2010 +0100 perf: Introduce new perf_fetch_caller_regs() for hot regs snapshot Events that trigger overflows by interrupting a context can use get_irq_regs() or task_pt_regs() to retrieve the state when the event triggered. But this is not the case for some other class of events like trace events as tracepoints are executed in the same context than the code that triggered the event. It means we need a different api to capture the regs there, namely we need a hot snapshot to get the most important informations for perf: the instruction pointer to get the event origin, the frame pointer for the callchain, the code segment for user_mode() tests (we always use __KERNEL_CS as trace events always occur from the kernel) and the eflags for further purposes. v2: rename perf_save_regs to perf_fetch_caller_regs as per Masami's suggestion. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Jason Baron Cc: Archs commit 61e67fb9d3ed13e6a7f58652ae4979b9c872fa57 Author: Frederic Weisbecker Date: Wed Mar 3 07:38:37 2010 +0100 perf/x86-64: Use frame pointer to walk on irq and process stacks We were using the frame pointer based stack walker on every contexts in x86-32, but not in x86-64 where we only use the seven-league boots on the exception stacks. Use it also on irq and process stacks. This utterly accelerate the captures. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo commit db2c4c7791cd04512093d05afc693c3511a65fd7 Author: Frederic Weisbecker Date: Tue Feb 2 23:34:40 2010 +0100 lockdep: Move lock events under lockdep recursion protection There are rcu locked read side areas in the path where we submit a trace event. And these rcu_read_(un)lock() trigger lock events, which create recursive events. One pair in do_perf_sw_event: __lock_acquire | |--96.11%-- lock_acquire | | | |--27.21%-- do_perf_sw_event | | perf_tp_event | | | | | |--49.62%-- ftrace_profile_lock_release | | | lock_release | | | | | | | |--33.85%-- _raw_spin_unlock Another pair in perf_output_begin/end: __lock_acquire |--23.40%-- perf_output_begin | | __perf_event_overflow | | perf_swevent_overflow | | perf_swevent_add | | perf_swevent_ctx_event | | do_perf_sw_event | | perf_tp_event | | | | | |--55.37%-- ftrace_profile_lock_acquire | | | lock_acquire | | | | | | | |--37.31%-- _raw_spin_lock The problem is not that much the trace recursion itself, as we have a recursion protection already (though it's always wasteful to recurse). But the trace events are outside the lockdep recursion protection, then each lockdep event triggers a lock trace, which will trigger two other lockdep events. Here the recursive lock trace event won't be taken because of the trace recursion, so the recursion stops there but lockdep will still analyse these new events: To sum up, for each lockdep events we have: lock_*() | trace lock_acquire | ----- rcu_read_lock() | | | lock_acquire() | | | trace_lock_acquire() (stopped) | | | lockdep analyze | ----- rcu_read_unlock() | lock_release | trace_lock_release() (stopped) | lockdep analyze And you can repeat the above two times as we have two rcu read side sections when we submit an event. This is fixed in this patch by moving the lock trace event under the lockdep recursion protection. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Li Zefan Cc: Lai Jiangshan Cc: Masami Hiramatsu Cc: Jens Axboe commit 65f2ed2b2fa6034ef9890b60c8fd39fbe76b9d37 Author: Arnaldo Carvalho de Melo Date: Tue Mar 9 15:58:17 2010 -0300 perf report: Print the map table just after samples for which no map was found If -vv is used just the map table will be printed, -vvv will print the symbol table too, with it we can see that we have a bug where some samples are not being resolved to a map when we get them in the perf.data stream, but after we have it all processed, we can find the right map, some reordering probably is happening. Upcoming patches will provide ways to ask for most PERF_SAMPLE_ conditional samples to be taken for !PERF_RECORD_SAMPLE events too, then we'll be able to ask for PERF_SAMPLE_TIME and PERF_SAMPLE_CPU to help diagnose this. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268161097-17761-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cbbc79a53278b83bf7f834127751459f9299e402 Author: Eric B Munson Date: Fri Mar 5 12:51:09 2010 -0300 perf report: Add multiple event support Perf report does not handle multiple events being reported, even though perf record stores them properly on disk. This patch addresses that issue by adding the logic to perf report to use the event stream id that is saved by record and the new data structures to seperate the event streams and report them individually. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit eefc465cdd49cb89a742083fac2807c718ddad31 Author: Eric B Munson Date: Fri Mar 5 12:51:08 2010 -0300 perf session: Change perf_session post processing functions to take histogram tree Now that report can store historgrams for multiple events we need to be able to do the post processing work for each histogram. This patch changes the post processing functions so that they can be called individually for each event's histogram. Signed-off-by: Eric B Munson [ Guarantee bisectabilty by fixing up builtin-report.c ] Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cb8f09393646c5058056db771583c86e0ed1d92f Author: Eric B Munson Date: Fri Mar 5 12:51:07 2010 -0300 perf session: Add storage for seperating event types in report This patch adds the structures necessary to count each event type independently in perf report. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d403d0acc9c5afa679a3f61e71489530d7fa0606 Author: Eric B Munson Date: Fri Mar 5 12:51:06 2010 -0300 perf session: Change add_hist_entry to take the tree root instead of session In order to minimize the impact of storing multiple events in a report this function will now take the root of the histogram tree so that the logic for selecting the proper tree can be inserted before the call. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8907fd607b66e36636469a2de9833db643869db8 Author: Eric B Munson Date: Fri Mar 5 12:51:05 2010 -0300 perf record: Add ID and to recorded event data when recording multiple events Currently perf record does not write the ID or the to disk for events. This doesn't allow report to tell if an event stream contains one or more types of events. This patch adds this entry to the list of data that record will write to disk if more than one event was requested. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit accd3cc45a0e1d11090ea66888405987de77bdca Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 12:51:04 2010 -0300 perf probe: Add missing variable initialization cc1: warnings being treated as errors util/probe-finder.c: In function 'find_line_range': util/probe-finder.c:172: warning: 'src' may be used uninitialized in this function make: *** [util/probe-finder.o] Error 1 Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Masami Hiramatsu Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 1224550969e0bf18785786a1a9f801cd86d68586 Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 11:54:02 2010 -0300 perf tools: Don't trow away old map slices not overlapped by new maps Signed-off-by: Arnaldo Carvalho de Melo Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267800842-22324-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d4944a06666054707d23e11888e480af239e5abf Author: Peter Zijlstra Date: Mon Mar 8 13:51:20 2010 +0100 perf: Provide better condition for event rotation Try to avoid useless rotation and PMU disables. [ Could be improved by keeping a nr_runnable count to better account for the < PERF_STAT_INACTIVE counters ] Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit f3d46b2e6fa57547f9884330798792afc83f4b04 Author: Peter Zijlstra Date: Sat Mar 6 13:24:58 2010 +0100 perf, x86: Fix double enable calls hw_perf_enable() would enable already enabled events. This causes problems with code that assumes that ->enable/->disable calls are balanced (like the LBR code does). What happens is that events that were already running and left in place would get enabled again. Avoid this by only enabling new events that match their previous assignment. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 19925ce778f9fc371b9607625de3bff04c60121e Author: Peter Zijlstra Date: Sat Mar 6 13:20:40 2010 +0100 perf, x86: Fix double disable calls hw_perf_enable() would disable events that were not yet enabled. This causes problems with code that assumes that ->enable/->disable calls are balanced (like the LBR code does). What happens is that we disable newly added counters that match their previous assignment, even though they are not yet programmed on the hardware. Avoid this by only doing the first pass over the existing events. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 356e1f2e0ace2d4b100c8eda9d49b709e8323da5 Author: Peter Zijlstra Date: Sat Mar 6 13:49:56 2010 +0100 perf, x86: Properly account n_added Make sure n_added is properly accounted so that we can rely on the value to reflect the number of added counters. This is needed if its going to be used for more than a boolean check. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 71e2d2828046133ed985696a02e2e1499ca0bfb8 Author: Peter Zijlstra Date: Mon Mar 8 17:51:33 2010 +0100 perf, x86: Avoid double disable on throttle vs ioctl(PERF_IOC_DISABLE) Calling ioctl(PERF_EVENT_IOC_DISABLE) on a thottled counter would result in a double disable, cure this by using x86_pmu_{start,stop} for throttle/unthrottle and teach x86_pmu_stop() to check ->active_mask. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit c08053e627d23490a03431285b78b7a5b617fbad Author: Peter Zijlstra Date: Sat Mar 6 13:19:24 2010 +0100 perf, x86: Fix x86_pmu_start pmu::start should undo pmu::stop, make it so. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 34538ee77b39a12702e0f4c3ed9e8fa2dd5eb92c Author: Peter Zijlstra Date: Tue Mar 2 21:16:55 2010 +0100 perf, x86: Use unlocked bitops There is no concurrency on these variables, so don't use LOCK'ed ops. As to the intel_pmu_handle_irq() status bit clean, nobody uses that so remove it all together. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.240023029@chello.nl> Signed-off-by: Ingo Molnar commit aff3d91a913c9ae0c2f56b65b27cbd00c7d27ee3 Author: Peter Zijlstra Date: Tue Mar 2 20:32:08 2010 +0100 perf, x86: Change x86_pmu.{enable,disable} calling convention Pass the full perf_event into the x86_pmu functions so that those may make use of more than the hw_perf_event, and while doing this, remove the superfluous second argument. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.165166129@chello.nl> Signed-off-by: Ingo Molnar commit cc2ad4ba8792b9d4ff893ae3b845d2c5a6206fc9 Author: Peter Zijlstra Date: Tue Mar 2 20:18:39 2010 +0100 perf, x86: Remove superfluous arguments to x86_perf_event_update() The second and third argument to x86_perf_event_update() are superfluous since they are simple expressions of the first argument. Hence remove them. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.089468871@chello.nl> Signed-off-by: Ingo Molnar commit 07088edb88164c2a2406cd2d9a7be19d8515214b Author: Peter Zijlstra Date: Tue Mar 2 20:16:01 2010 +0100 perf, x86: Remove superfluous arguments to x86_perf_event_set_period() The second and third argument to x86_perf_event_set_period() are superfluous since they are simple expressions of the first argument. Hence remove them. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.006500906@chello.nl> Signed-off-by: Ingo Molnar commit 3fb2b8ddcc6a7aa62af6bd2cb939edfd4c460506 Author: Peter Zijlstra Date: Mon Mar 8 13:51:01 2010 +0100 perf, x86, Do not user perf_disable from NMI context Explicitly use intel_pmu_{disable,enable}_all() in intel_pmu_handle_irq() to avoid the NMI race conditions in perf_{disable,enable} Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 32975a4f114be52286f9a5bf6c230dbb8c0e1903 Author: Peter Zijlstra Date: Sat Mar 6 19:49:19 2010 +0100 perf: Optimize perf_disable Currently we always call hw_perf_disable(), even if its already disabled, this seems superflous, esp. since it cannot be made NMI safe (see further patches). Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 3f6da3905398826d85731247e7fbcf53400c18bd Author: Peter Zijlstra Date: Fri Mar 5 13:01:18 2010 +0100 perf: Rework and fix the arch CPU-hotplug hooks Remove the hw_perf_event_*() hotplug hooks in favour of per PMU hotplug notifiers. This has the advantage of reducing the static weak interface as well as exposing all hotplug actions to the PMU. Use this to fix x86 hotplug usage where we did things in ONLINE which should have been done in UP_PREPARE or STARTING. Signed-off-by: Peter Zijlstra Cc: Paul Mundt Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100305154128.736225361@chello.nl> Signed-off-by: Ingo Molnar commit dc1d628a67a8f042e711ea5accc0beedc3ef0092 Author: Peter Zijlstra Date: Wed Mar 3 15:55:04 2010 +0100 perf: Provide generic perf_sample_data initialization This makes it easier to extend perf_sample_data and fixes a bug on arm and sparc, which failed to set ->raw to NULL, which can cause crashes when combined with PERF_SAMPLE_RAW. It also optimizes PowerPC and tracepoint, because the struct initialization is forced to zero out the whole structure. Signed-off-by: Peter Zijlstra Acked-by: Jean Pihet Reviewed-by: Frederic Weisbecker Acked-by: David S. Miller Cc: Jamie Iles Cc: Paul Mackerras Cc: Stephane Eranian Cc: stable@kernel.org LKML-Reference: <20100304140100.315416040@chello.nl> Signed-off-by: Ingo Molnar commit 5c1f96f4cffbdde9e194f3ae5373953f3fa12836 Author: Thomas Weber Date: Wed Mar 3 09:16:54 2010 +0100 OMAP: DSS2: VRAM: Fix early_param for vram In commit 2b0d8c251b8876d530a6bf671eb5425838fa698a the __early_param is replaced with the generic early_param. This patch fixes the parameter passing for the vram. Signed-off-by: Thomas Weber [tomi.valkeinen@nokia.com: changed the commit prefix] Signed-off-by: Tomi Valkeinen commit 0e49887703015dd73667664c5abc9a6366641da9 Merge: 7d39cf6 89c0ac7 Author: Takashi Iwai Date: Wed Mar 10 09:01:30 2010 +0100 Merge branch 'topic/misc' into for-linus commit 7d39cf62242d52729ddff9a9ae195669f462d5c4 Merge: a3087ae ecd2162 Author: Takashi Iwai Date: Wed Mar 10 09:01:25 2010 +0100 Merge branch 'topic/hda' into for-linus commit 5b34d1ee1e51d61e779a25d28808e8ad824cea3d Author: Paul Mundt Date: Wed Mar 10 16:46:58 2010 +0900 sh: Export uncached helper symbols. oprofile and others need to get at these, so provide symbol exports. Signed-off-by: Paul Mundt commit 089b43f9737f2e51c6ce354749f5a9f3f093601c Author: Paul Mundt Date: Wed Mar 10 16:29:48 2010 +0900 sh: Fix up NUMA build for 29-bit. pmb_bolt_mapping() is undefined on 29-bit builds, so provide a stub. This fixes up the NUMA build on platforms lacking PMB support. Signed-off-by: Paul Mundt commit 4eb6f91b95e7618eae0103b6cba7c7f01f9d40f3 Author: Michael Hennerich Date: Tue Mar 9 20:38:47 2010 -0800 Input: ad7877 - increase pen up imeout The time interval between consecutive interrupts depends on a number of tunables: first_conversion_delay, acquisition_time, averaging and foremost the pen_down_acc_interval. Since the mod_timer() action for the PEN UP event happens in the spi_async() callback function, latencies incurred by the spi bus drivers also need to be taken into account. So all in all, give the PEN UP event a bit more wiggle room and increase timeout to 100ms. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 06a09124b5ec65f81df66c56695d9a9ae04a0114 Author: Michael Hennerich Date: Tue Mar 9 20:38:45 2010 -0800 Input: ads7846 - add support for AD7843 parts The AD7873 is almost identical to the ADS7846; the only difference is related to the Power Management bits PD0 and PD1. This results in a slightly different PENIRQ enable behavior. For the AD7873, VREF should be turned off during differential measurements. So, add the AD7873/43 to the list of driver supported devices, and prevent VREF usage during differential/ratiometric conversion modes. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit d544d623c5ef3ca14407e8bc042fdf938a966b04 Author: Ben Skeggs Date: Wed Mar 10 15:52:43 2010 +1000 drm/nv50: fix connector table parsing for some cards The connector table index in the DCB entry for each output type is an index into the connector table, and does *not* necessarily match up with what was previously called "index" in the connector table entries themselves. Not real sure what that index is exactly, renamed to "index2" as we still use it to prevent creating multiple TV connectors. Signed-off-by: Ben Skeggs commit 9e49f6c1339a7972e23a335c4c71a289b4c6f65b Author: Mike Frysinger Date: Tue Mar 9 20:38:45 2010 -0800 Input: bf54x-keys - fix system hang when pressing a key We need to use the nosync version of disable_irq so that we don't hang in the IRQ handler as we don't ACK the interrupt until later. This used to work regardless, but at some point, the IRQ behavior changed. Not sure when exactly. Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit ce48fa93a6f5cadd4141a921dfb4129c8850374e Author: Maarten Maathuis Date: Thu Feb 25 20:00:38 2010 +0100 drm/nv50: add a memory barrier to pushbuf submission - This is useful for vram pushbuffers that are write combined. - pre-nv50 has one too (in WRITE_PUT). Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit 81441570c9cbf453891d90f5725adbbfe5a9cc69 Author: Maarten Maathuis Date: Sun Feb 21 13:28:35 2010 +0100 drm/nouveau: print a message very early during suspend - In case of suspend lockups it's nice to know it happened in nouveau. Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit e5ec882cfc18007c6076236ac33a713bcc1d35aa Author: Francisco Jerez Date: Fri Mar 5 15:15:39 2010 +0100 drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay. The calculated values were a little bit off (~16 clocks), the only effect it could have had is a slightly offset image with respect to the blob on analog outputs (bug 26790). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 53c44c3a065ac48c4ccb38f811cf7c5d305c9d4e Author: Ben Skeggs Date: Thu Mar 4 12:12:22 2010 +1000 drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI Signed-off-by: Ben Skeggs commit da647d5bf3c0a4b7ad150803910cb1d737ac522e Author: Ben Skeggs Date: Thu Mar 4 12:00:39 2010 +1000 drm/nouveau: add option to allow override of dcb connector table types Signed-off-by: Ben Skeggs commit 304424e17dd904cef048ef8966d9f54618a915cc Author: Marcin Kościelnicki Date: Mon Mar 1 00:18:39 2010 +0000 drm/nv50: Improve PGRAPH interrupt handling. This makes nouveau recognise and report more kinds of PGRAPH errors, as well as prevent GPU lockups resulting from some of them. Lots of guesswork was involved and some part of this is probably incorrect. Some potential-lockuop situations are handled by just resetting a whole PGRAPH subunit, which doesn't sound like a "proper" solution, but seems to work just fine... for now. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit 3bf777bf0ab112527cea103c3681934a9f41c03d Author: Marcin Kościelnicki Date: Sun Feb 28 23:45:38 2010 +0000 drm/nv50: Make ctxprog wait until interrupt handler is done. This will fix races between generated ctxprogs and interrupt handler. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit c82b88d578847909797945824851a6a9a84f9c20 Author: Marcin Kościelnicki Date: Sat Feb 27 18:13:35 2010 +0000 drm/nouveau: Fix fbcon corruption with font width not divisible by 8 NV50 is nice and has a switch that autoaligns stuff for us. Pre-NV50, we need to align input bitmap width manually. Signed-off-by: Marcin Kościelnicki Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 37000d275721e25af6b49fbb2dbcd04022091276 Author: Marcin Kościelnicki Date: Thu Feb 25 18:53:37 2010 +0000 drm/nv50: Remove redundant/incorrect ctxvals initialisation. 11c/004 offset corresponds to PGRAPH reg 0x400828, and is initialised earlier anyway by both our ctxprog generator and blob ctxvals. It's actually incorrect with the generator, since we use different layout on pre-NVA0. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit eb8bff85c5bd5caef7c374ff32b86545029efb56 Author: Thomas Bächler Date: Tue Mar 9 20:38:48 2010 -0800 Input: alps - add support for the touchpad on Toshiba Tecra A11-11L Signed-off-by: Thomas Bächler Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit 2f2177c8dadbcb08c14f796ac983c5475eca1bd3 Author: Arnd Bergmann Date: Tue Mar 9 20:38:48 2010 -0800 Input: remove BKL, fix input_open_file() locking Holding the BKL in input_open_file seems pointless because it does not protect against updates of input_table, and all open functions from the underlying drivers have proper mutex locking. This makes input_open_file take the input_mutex when accessing the table and no lock when calling into the lower function. Signed-off-by: Arnd Bergmann Acked-by: Thadeu Lima de Souza Cascardo Signed-off-by: Dmitry Torokhov commit 77554b4d1fac6a66d4e624a6e36c020a4f5b6b64 Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 9 20:38:47 2010 -0800 Input: serio_raw - remove BKL serio_raw open function already uses a mutex. Also change formatting a bit. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Arnd Bergmann Signed-off-by: Dmitry Torokhov commit c90c6a885ac9827921e8f94f3ce4360ae11148f1 Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 9 20:38:47 2010 -0800 Input: mousedev - remove BKL There's no need for BKL in mousedev, relevan protection is provided by a private mutex. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Arnd Bergmann Signed-off-by: Dmitry Torokhov commit 04e82ffb0f02e645f3dde5128ef39d425a8b3c6d Author: Peter Huewe Date: Wed Mar 10 11:55:05 2010 +0900 serial: sh-sci: Fix build failure for non-sh architectures. This patch fixes a build failure for various arm based defconfigs [1][2][3] and maybe other architectures/configs. The build failure was introduced by the sh specific patch [4] "serial: sh-sci: Add DMA support" by Guennadi Liakhovetski Patch against linux-next of 20100309 References: [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2248992/ [2] http://kisskb.ellerman.id.au/kisskb/buildresult/2248996/ [3] http://kisskb.ellerman.id.au/kisskb/buildresult/2248998/ [4] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=73a19e4c0301908ce6346715fd08a74308451f5a Signed-off-by: Peter Huewe Signed-off-by: Paul Mundt commit d2197e1e6038bb01568367a220e4a4e040f8337d Author: Tony Lindgren Date: Tue Mar 9 14:59:48 2010 -0800 omap3: Fix compile for Touch Book early_param Commit 2b0d8c251b8876d530a6bf671eb5425838fa698a changed ARM to use the common early_param code. Fix compile for Touch Book accordingly. Signed-off-by: Tony Lindgren commit 1382c71c764540880d35485b033a44ce104d8e2e Author: Reinette Chatre Date: Thu Feb 25 10:02:19 2010 -0800 Revert "iwlwifi: Send broadcast probe request only when asked to" This reverts commit 21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9. As explained by Johannes: When we build a probe request frame in the buffer with the SSID, we could arrive over the limit of 200 bytes. When we build it in the buffer without the SSID (wildcard) we don't arrive over 200 bytes, but the ucode still allows direct probe in addition because it has an internal buffer that is larger when it inserts the SSID... Signed-off-by: Reinette Chatre commit 1d79e53c56afe0826a311c3bc1653ad938166c22 Author: Reinette Chatre Date: Fri Feb 26 11:01:36 2010 -0800 iwl3945: fix memory corruption Recent patch "iwlwifi: move 3945 clip groups to 3945 data" exposed a memory corruption problem. When initializing the clip groups the code was mistakenly using the iwlagn rate count, not the 3945 rate count. This resulted in more memory being written than was allocated. "iwlwifi: move 3945 clip groups to 3945 data" moved the location where the clip groups are stored and the impact is now severe in that the number of configured TX queues is modified. Previously the "temperature" field was overwritten, which did not seem to affect the operation. Fix this one instance where wrong rate count was used. I also noticed one more location where the iwlagn rate count was used to index an iwl3945 array, fix this. I also modified one location that modified the iwlagn rate count to obtain the iwl3945 rate count ... just use the iwl3945 rate count directly. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2165 and http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2168 Signed-off-by: Reinette Chatre commit ff215713eb33c56301cf6bfec0143ddc7f22c138 Author: Steve French Date: Tue Mar 9 20:30:42 2010 +0000 [CIFS] checkpatch cleanup Signed-off-by: Steve French commit abab095d1fd25986b910d3c46289d8fa3582cdc5 Author: Jeff Layton Date: Fri Feb 12 07:44:18 2010 -0500 cifs: add cifs_revalidate_file ...to allow updating inode attributes on an existing inode by filehandle. Change mmap and llseek codepaths to use that instead of cifs_revalidate_dentry since they have a filehandle readily available. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ecd216260f87dd8c14b2580a16f055554644bbea Author: Ralf Gerbig Date: Tue Mar 9 18:25:47 2010 +0100 ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 without the following patch audio ssttuutteerrs on ASUS M2N32-SLI PREMIUM ACPI BIOS Revision 1304 the sound device is: 00:0e.1 Audio device: nVidia Corporation MCP55 High Definition Audio (rev a2) worked with 2.6.32 Signed-off-by: Ralf Gerbig Cc: Signed-off-by: Takashi Iwai commit 3a065fcf9efed42ba736da7be528f2d3dec4965a Author: Akinobu Mita Date: Tue Feb 23 23:11:13 2010 +0900 udf: use ext2_find_next_bit Use ext2_find_next_bit (generic_find_next_le_bit) to find the set bit in little endian bitmap region. Signed-off-by: Akinobu Mita Signed-off-by: Jan Kara commit 5833ded9b6d783b8446349bada08f0f5e4227895 Author: Jan Kara Date: Fri Jan 8 16:52:59 2010 +0100 udf: Do not read inode before writing it We needlessly read inode in udf_update_inode just before zeroing out the contents of the buffer. Fix it. Signed-off-by: Jan Kara commit aae917cd188f397e9223001d9f6c0adfb339fd64 Author: Jan Kara Date: Fri Jan 8 16:46:29 2010 +0100 udf: Fix unalloc space handling in udf_update_inode Writing of inode holding unallocated space info was broken because we first cleared the buffer and after that checked whether it contains a tag meaning the block holds unallocated space information. Fix the problem by checking appropriate in memory flag instead. Also cleanup the function a bit along the way - most importantly lock buffer when modifying its contents, check for buffer_write_io_error instead of !buffer_uptodate, etc.. Signed-off-by: Jan Kara commit 548b84166917d6f5e2296123b85ad24aecd3801d Merge: cfb581b 57d5488 Author: Ingo Molnar Date: Tue Mar 9 17:11:53 2010 +0100 Merge commit 'v2.6.34-rc1' into perf/urgent Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar commit eb63e5d15758d2b1e607ddd5fb861b5596629380 Author: Mike Frysinger Date: Tue Mar 9 08:41:12 2010 -0500 Blackfin: stop cleaning include/asm/asm-offsets.h The file is no longer generated, so we don't want to clean it. Reported-by: Vivi Li Signed-off-by: Mike Frysinger commit eff7f270e9a05688066f40589d7b44e1dcf335dc Author: Andrej Gelenberg Date: Tue Mar 9 13:49:54 2010 +0100 HID: add quirk for UC-Logik WP4030 tablet Add HID_QUIRK_MULTI_INPUT for UC-Logik tablet. $ lsusb ... Bus 004 Device 002: ID 5543:0003 UC-Logic Technology Corp. Genius MousePen 4x3 Tablet/Aquila L1 Tablet Signed-off-by: Andrej Gelenberg Signed-off-by: Jiri Kosina commit 28918c211d86b6eeb70182c523800c7bc442960c Author: Michael Poole Date: Tue Mar 9 06:47:35 2010 -0500 HID: magicmouse: fix oops after device removal Ask the HID core not to register an input device for the mouse. Fix an oops after removing the device, due to leaving the new input device registered. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit e9edb1d8a345119c9baafa1b240eb1ec06a44662 Author: Christoph Hellwig Date: Wed Mar 3 08:53:51 2010 -0500 GFS2: do not select QUOTA gfs2 only needs the quotactl code, not the generic quota implementation. Signed-off-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit 3dd1b39497b6820219581af16e6a8831a582bb3a Author: Jari Vanhala Date: Tue Mar 9 00:29:46 2010 -0800 Input: add driver for TWL4030 vibrator device TWL4030 Vibrator implemented via Force Feedback interface. This uses MFD TWL4030 codec and own dynamic workqueue. Signed-off-by: Jari Vanhala Signed-off-by: Dmitry Torokhov commit 3e6e15a862a0bc20128497bbdc54254cdec21835 Author: Alan Stern Date: Mon Mar 8 23:42:46 2010 -0800 Input: enable remote wakeup for PNP i8042 keyboard ports This patch (as1355) enables remote wakeup by default on PNP i8042 keyboard ports. Signed-off-by: Alan Stern Signed-off-by: Dmitry Torokhov commit 881245dcff29df992d8431392a41fb81549129f9 Author: William Cohen Date: Tue Mar 9 09:26:04 2010 +0100 Add DocBook documentation for the block tracepoints. This patch adds a simple description of the various block tracepoints available in the kernel. Signed-off-by: William Cohen Acked-by: Randy Dunlap Signed-off-by: Jens Axboe commit 58b939959d228681208ba997595411fddc860849 Author: Dmitry Torokhov Date: Mon Mar 8 22:37:10 2010 -0800 Input: scancode in get/set_keycodes should be unsigned The HID layer has some scan codes of the form 0xffbc0000 for logitech devices which do not work if scancode is typed as signed int, so we need to switch to unsigned it instead. While at it keycode being signed does not make much sense either. Acked-by: Márton Németh Acked-by: Matthew Garrett Acked-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit ec62e1c8dd2f9b2a833b48d4a2f58f0c5e07384c Author: Dmitry Torokhov Date: Mon Mar 8 22:37:09 2010 -0800 Input: i8042 - use platfrom_create_bundle() helper Signed-off-by: Dmitry Torokhov commit ce67eef6a112bb283c6db39f9195800f31f5599a Merge: 776943f 57d5488 Author: Dmitry Torokhov Date: Mon Mar 8 23:17:32 2010 -0800 Merge commit 'v2.6.34-rc1' into for-linus commit cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0 Author: Ingo Molnar Date: Mon Mar 8 15:20:50 2010 +0100 MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer Acked-by: Peter Zijlstra Acked-by: Paul Mackerras Acked-by: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 7998a8787a8b35fede689c2bb716f65b231e7492 Author: Graf Yang Date: Mon Mar 8 03:01:35 2010 +0000 Blackfin: scale calibration when cpu freq changes Need to make sure we update the loops_per_jiffy values when we start changing the core clock. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit f2b0cd61cf635cbdc110472f6edc97328322cb8b Author: Mike Frysinger Date: Thu Mar 4 07:35:30 2010 -0500 Blackfin: eat spurious space in asm/dpmc.h Signed-off-by: Mike Frysinger commit 2943bff69e3728cfd69841537120125f9373bb28 Author: Robin Getz Date: Thu Feb 25 18:16:52 2010 +0000 Blackfin: fix anomaly 283 handling with exact hardware error The exact hardware error handling code was added before the workaround for anomaly 283 which caused the anomaly to be triggered in some cases (an infinite core stall). So re-order the code to avoid this. Reported-by: Andrew Rook Signed-off-by: Robin Getz Signed-off-by: Mike Frysinger commit 6ba255f4a8a0785ea8a2b052837a7b91eeac1bb4 Author: Michael Hennerich Date: Tue Dec 8 11:34:07 2009 +0000 Blackfin: bf537-stamp: add example ADXL346 orientation resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 848c51ccee5c4d51b1dc1a029508cfbb73f8c260 Author: Graf Yang Date: Fri Feb 26 11:49:52 2010 +0000 Blackfin: bf537-stamp: add example AD2S1210 IIO resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit ae4a8c1903e5d0ec19dcb257ec922b888941abba Author: Michael Hennerich Date: Thu Feb 25 13:32:24 2010 +0000 Blackfin: don't support keypad wakeup from hibernate The on-chip keypad peripheral requires different registers to be setup depending on the standby type (standby vs hibernation). However, since the power management framework doesn't differentiate between these types, the driver doesn't know which registers to program and subsequently it avoids doing so. Always enabling the keyboard wakeup source causes misbehavior when the pins are not assigned to the keypad. If they happen to drive a certain level, they'll trigger a wake up event which is not wanted. So until the aforementioned issue can be sorted out, drop support for the wakeup source completely. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit ef8873e06efdc023ee2e7f708787c79b78df3fcd Author: Sonic Zhang Date: Thu Feb 25 10:27:48 2010 +0000 Blackfin: bf537-stamp: add example AD7416 IIO resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 72fa2e9204d5efe4732346f99465a01c380f5cd3 Author: Michael Hennerich Date: Wed Feb 24 21:05:35 2010 +0000 Blackfin: bf537-stamp: add example ADP8860 backlight/led resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 5f0225948ecc4bb21cc35839d3d447e22d40a71f Author: Sonic Zhang Date: Wed Feb 24 07:32:50 2010 +0000 Blackfin: bf537-stamp: add example AD7414 temp sensor resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit d40bd71f88e7be193ce4feb4b92572c70024b9c2 Author: Barry Song Date: Mon Feb 22 10:31:06 2010 +0000 Blackfin: rename AD1836 to AD183X in board files The ASoC codec driver was generalized and renamed, so update the board resources accordingly. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit df6a949b4666780969fd90a2f3ac3db3b62552d6 Author: Graf Yang Date: Sun Feb 21 10:23:07 2010 +0000 Blackfin: bf537-stamp: add example AD2S120x resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit aec59c911307639c77076bdc9d9b546a4a767a73 Author: Michael Hennerich Date: Fri Feb 19 15:09:10 2010 +0000 Blackfin: add support for the on-chip MAC status interrupts This patch provides infrastructure for MAC Wake-On-Lan and PHYINT use in phylib. New Interrupts added: IRQ_MAC_PHYINT /* PHY_INT Interrupt */ IRQ_MAC_MMCINT /* MMC Counter Interrupt */ IRQ_MAC_RXFSINT /* RX Frame-Status Interrupt */ IRQ_MAC_TXFSINT /* TX Frame-Status Interrupt */ IRQ_MAC_WAKEDET /* Wake-Up Interrupt */ IRQ_MAC_RXDMAERR /* RX DMA Direction Error Interrupt */ IRQ_MAC_TXDMAERR /* TX DMA Direction Error Interrupt */ IRQ_MAC_STMDONE /* Station Mgt. Transfer Done Interrupt */ On BF537/6 the implementation is not straight forward since there are now two chained chained_handlers. A cleaner approach would have been to add latter IRQs to the demux of IRQ_GENERIC_ERROR. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit b2740801457b2fbbe14812c0fda24bd689025886 Author: Mike Frysinger Date: Tue Feb 16 04:03:10 2010 -0500 Blackfin: asm/page.h: pull in asm-generic headers Signed-off-by: Mike Frysinger commit f9c29e872b1c468d09c04ed452dc58961914c9d7 Author: Joachim Eastwood Date: Thu Feb 11 12:41:11 2010 +0100 Blackfin: mark gpio lib functions static Signed-off-by: Joachim Eastwood Signed-off-by: Mike Frysinger commit c48d767569ec6449277bf4248295b4c165b57159 Author: Cliff Cai Date: Thu Feb 11 09:27:18 2010 +0000 Blackfin: bf537-stamp: add example ADAU1361 resources Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger commit 7f4f69f991146fa976cbc914a50285b2afc0ad93 Author: Joachim Eastwood Date: Wed Feb 10 12:31:41 2010 +0100 Blackfin: GPIO: implement to_irq handler This makes it possible to support IRQs coming from off-chip GPIO controllers. Signed-off-by: Joachim Eastwood Signed-off-by: Mike Frysinger commit f8e6dbffa7a6cb3da3bcaf1fde3039896e1ac764 Author: Sonic Zhang Date: Wed Feb 10 09:09:05 2010 +0000 Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit f5f9531c7e588ee62e3aeddb14613ea80e7c2ca2 Author: Graf Yang Date: Wed Feb 10 07:15:59 2010 +0000 Blackfin: bf537-stamp: add example AD2S90 resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit f32792d045e1bbd86c0af0a28a46ae87af1ae100 Author: Sonic Zhang Date: Tue Feb 9 02:47:09 2010 +0000 Blackfin: bf537-stamp: add example AD5398 power regulator resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 2bc4affe9c374983220c1a5d5566ce67c95384fc Author: Frans Pop Date: Sat Feb 6 18:47:18 2010 +0100 Blackfin: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: Mike Frysinger commit fe5b25c09873faee44077ee6ff8f23eee61b0fa0 Author: Michael Hennerich Date: Thu Feb 4 14:41:39 2010 +0000 Blackfin: bf537-stamp: add example ADS7846 touchscreen resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit ddaebcabbc18811ac4ac6e84fb9c327e8393a1dc Author: Mike Frysinger Date: Fri Jan 29 01:33:54 2010 +0000 Blackfin: add support for restart_syscall() Signed-off-by: Mike Frysinger commit 9e228ee9eae97b533d3b3133f76478c70dbd4294 Author: Mike Frysinger Date: Fri Feb 12 07:24:34 2010 +0000 Blackfin: check for bad syscalls after tracing it We want to report all system calls (even invalid ones) to the tracing layers, so check the NR only after we've notified. Signed-off-by: Mike Frysinger commit 600482c13d3d3612d71f39d8aaec47f63aafa801 Author: Mike Frysinger Date: Wed Feb 17 10:44:22 2010 +0000 Blackfin: fix single stepping over system calls On Blackfin systems, the hardware single step exception triggers before the system call exception, so we need to save this info to process it later on. Otherwise, single stepping in userspace misses a few insns right after the system call. This is based a bit on the SuperH code added in commit 4b505db9c4c72dbd. Reported-by: Roland McGrath Signed-off-by: Mike Frysinger commit e8f263dfd32a784a816fe68956e564f8ede4a9fc Author: Mike Frysinger Date: Tue Jan 26 07:33:53 2010 +0000 Blackfin: initial tracehook support Signed-off-by: Mike Frysinger commit e50e2f25c5b90abd00a1e5871c45094cf5207afc Author: Mike Frysinger Date: Sun Feb 14 22:58:02 2010 +0000 Blackfin: initial regset support We don't support core dumps (yet?), but this should make things easier. Signed-off-by: Mike Frysinger commit f2ce48024a9a6d3e92a023ded0f7b1e99da1cd16 Author: Mike Frysinger Date: Sun Feb 14 22:56:24 2010 +0000 Blackfin: simplify PTRACE_{PEEK,POKE}USR in preperation for regset support Signed-off-by: Mike Frysinger commit 5f09c77d2ad69397498b6555f0d3cd697304253c Author: Mike Frysinger Date: Sun Feb 14 22:49:59 2010 +0000 Blackfin: simplify SYSCFG code a bit and ignore attempts to change it We don't want to let user space modify the SYSCFG register arbitrarily as the settings are system wide (SNEN/CNEN) and can cause misbehavior. The only other bit here (SSSTEP) has proper controls via PTRACE_SINGLESTEP. Signed-off-by: Mike Frysinger commit f5b99627a3065858ad5c678703ed7af5363dca39 Author: Christoph Hellwig Date: Wed Feb 3 09:15:57 2010 +0000 Blackfin: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Signed-off-by: Mike Frysinger commit ad6720c0b52ae1cde0bc567e57a71acde1a292aa Author: Barry Song Date: Wed Feb 3 09:15:31 2010 +0000 Blackfin: bf537-stamp: add example AD715{0,2}/AD774{5,6,7} IIO resources Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 718340f62900ed44046d2b0f74d0dec7cf844194 Author: Graf Yang Date: Mon Feb 1 06:07:50 2010 +0000 Blackfin: rewrite resync_core_{i,d}cache() SMP logic to avoid per_cpu data This functions are implicitly called by core functions like cpu_relax(), and since those functions may be called early on before common code has initialized the per-cpu data area, we need to tweak the stats gathering. Now the statistics are maintained in common bss which makes these funcs safe to use as soon as the C runtime env is setup. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 6c2b7072a7035837998da38809f98e4182e4c41c Author: Graf Yang Date: Wed Jan 27 11:16:32 2010 +0000 Blackfin: add support for cpufreq on SMP systems Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 3b82790c12f8122d3df07cc387d2d74355e54c75 Author: Barry Song Date: Wed Jan 27 09:01:36 2010 +0000 Blackfin: rename AD1938 to AD193X in board files The ASoC codec driver was generalized and renamed, so update the board resources accordingly. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 7136d9c5e874813ccbd1d438924c413b7305944c Author: Yi Li Date: Tue Jan 26 04:02:44 2010 +0000 Blackfin: add CALLER_ADDR ftrace macros Since GCC doesn't support __builtin_frame_address(n) where n!=0, add our own function to walk the stack frame pointers. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 652afdc3403cbccb93c7e6db582a1204a9e5e90a Author: Mike Frysinger Date: Mon Jan 25 22:12:32 2010 +0000 Blackfin: move KGDB selection to the way other arches do it Signed-off-by: Mike Frysinger commit 64b33a00dc39dceac04dbd7622ab14017e074712 Author: Graf Yang Date: Mon Jan 25 03:47:43 2010 +0000 Blackfin: split watchdog definitions into a dedicated header file This allows things to be shared between the different watchdog sources. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 4ab069e5356bae71dda2ce6bb2b2a62a34f2bf25 Author: Barry Song Date: Fri Jan 22 10:07:30 2010 +0000 Blackfin: add dma_disable_irq_nosync() API for irq handlers Some IRQ handlers need to disable a DMA channel without waiting. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 3750411fb7ca96dd11ce8a63f213b60bfe4b5c29 Author: Mike Frysinger Date: Fri Jan 22 09:11:20 2010 -0500 Blackfin: fix whitespace damage in thread_info.h Signed-off-by: Mike Frysinger commit b73faf74493fd1bc75a8938aa5d296facf50a650 Author: Mike Frysinger Date: Fri Jan 22 07:59:32 2010 -0500 Blackfin: support new ftrace frame pointer semantics Signed-off-by: Mike Frysinger commit aebfef03249819886a7f9c981940cbd48d82ea47 Author: Mike Frysinger Date: Fri Jan 22 07:35:20 2010 -0500 Blackfin: implement ftrace mcount test Signed-off-by: Mike Frysinger commit 6388d14eb2dd3af655cee28ca2a1c56881e63e56 Author: Barry Song Date: Thu Jan 21 07:20:44 2010 +0000 Blackfin: implement ndelay() Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 60ffdb36547da2397d6cfefe9c752ebad16524f6 Author: Graf Yang Date: Wed Jan 20 10:56:24 2010 +0000 Blackfin: implement nmi_watchdog for SMP on BF561 Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 726e96561e4704278bc5197238f6459e1a63aa77 Author: Barry Song Date: Wed Jan 20 07:25:31 2010 +0000 Blackfin: respect the L1 kconfig optimization in the MPU code Restore support for CONFIG_EXCPT_IRQ_SYSC_L1 in the MPU CPLB manager. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 336746ed8ee8ef503ba79bc4b6f0b5a40e8ab3ce Author: Barry Song Date: Tue Oct 13 09:19:18 2009 +0000 Blackfin: bf537-stamp/bf527-ezkit: move ASoC SPORT resources to boards file Rather than declaring pin resources in the drivers, do it in the board. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 439b486746df9f57524e002dfd6117bbc040e925 Author: Barry Song Date: Fri Nov 13 02:41:07 2009 +0000 Blackfin: bf548-ezkit: add ASoC CPU DAI resources Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit f3dec78333d6369161eb833dbd8c8f006f359fdf Author: Michael Hennerich Date: Tue Jan 19 14:45:38 2010 +0000 Blackfin: increase NR_IRQS beyond NR on-chip IRQs This makes room for off-chip IRQ controllers. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 5e8d3210b5bffbe64afca9152241284a46611c7e Author: Barry Song Date: Tue Jan 19 11:01:08 2010 +0000 Blackfin: fill out the signal si_addr when sending a SIGBUS/SIGSEGV Some userspace applications use this member in diagnosing crashes. It also makes some LTP tests pass (i.e. the Blackfin arch behaves more like everyone else). Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0531c467da6438f278e9420a30f73eea2fdb73bd Author: Mike Frysinger Date: Tue Jan 19 07:04:29 2010 +0000 Blackfin: bf537-stamp: move ADF7021 MAC storage into platform resources Just generate a random MAC on the demo board since the ADF702x lacks dedicated storage for such things. Signed-off-by: Mike Frysinger commit 441504df6b81302c06010083c8d63b1465ead405 Author: Yi Li Date: Tue Jan 19 04:35:28 2010 +0000 Blackfin: add support for irqflags tracing Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 5aff1642aee0fe3cb9be7339fcc09dd2bd1976f0 Author: Harald Krapfenbauer Date: Fri Jan 15 09:25:11 2010 +0000 Blackfin: tcm-bf518: new board port Signed-off-by: Harald Krapfenbauer Signed-off-by: Mike Frysinger commit 38e7673f24e6c19aba9ecff86760cb7981b91464 Author: Barry Song Date: Fri Jan 15 03:24:39 2010 +0000 Blackfin: bf537-stamp: declare parallel flash as ROM with XIP kernel When the kernel is executing out of parallel flash (XIP), we can't have the flash go into an erase/programming cycle, otherwise the instruction fetching steps fail and everything crashes. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 29bb3bc0c71d867d50b18a0277bf28cd8dd3fca7 Author: Cliff Cai Date: Thu Jan 14 08:28:38 2010 +0000 Blackfin: bf527-ezkit/bf537-stamp: add example SSM2602 I2C resources Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger commit c6669c223a409199a45bb8f31a2e160ee26d19cc Author: Graf Yang Date: Wed Jan 13 06:09:34 2010 +0000 Blackfin: fix up mm locking in address dumping The locking code in the address dumper needs to grab the mm's mmap_sem so that other CPUs do not get an inconsistent view. On UP systems this really wasn't a problem, but it is easy to trigger a race on SMP systems when another CPU removes a mapping. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 7e1082b7dbb60081b157d82106da33686cb9ea91 Author: Barry Song Date: Tue Jan 12 03:59:18 2010 +0000 Blackfin: bf533-{ezkit,stamp}: add sound platform devices Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 8d0177dbcbad26ffd451b607c8fa74295d81e7b9 Author: Mike Frysinger Date: Sat Jan 9 00:48:01 2010 +0000 Blackfin: kgdb: mark all local funcs/structs static Signed-off-by: Mike Frysinger commit 48a74f9d1b381471397097851531c4e392f97451 Author: Roel Kluin Date: Fri Jan 8 20:06:22 2010 +0100 Blackfin: fix decoding of opcodes 41-47 in decode_instruction() This condition allowed only decoding of opcode 0x0040 Signed-off-by: Roel Kluin Signed-off-by: Mike Frysinger commit d86bfb1600db38e8387beee0aaab4263cfd728a2 Author: Barry Song Date: Thu Jan 7 04:11:17 2010 +0000 Blackfin: initial XIP support Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit aad16f32284030907b4f105e92e5fb534fd272bc Author: Barry Song Date: Tue Jan 5 07:25:24 2010 +0000 Blackfin: fix initial stack pointer setup During very early init, the stack pointer is given a slightly incorrect value (&init_thread_union). The value is later adjusted to the right one during early init (&init_thread_union + THREAD_SIZE), but it is used a few times in between. While the few functions used don't actually put things onto the stack (due to optimization), it's best if we simply use the right value from the start. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 8916a1499d958fcb9086a2c49a5fa3000689bb81 Author: Barry Song Date: Tue Jan 5 07:16:32 2010 +0000 Blackfin: fix the section name of init_thread_union Use the common attribute rather than setting the section name directly. The common linker script defines expect the newer naming. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 6feda3a6530204ad73a2dc1713c051462a1d9c49 Author: Barry Song Date: Tue Jan 5 07:05:50 2010 +0000 Blackfin: replace harcoded define with proper THREAD_SIZE macro Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0afc272cc6044b7a4f1318eadbfb10c4be654441 Author: Jie Zhang Date: Tue Jan 5 04:22:33 2010 +0000 Blackfin: fix relocation errors with large initramfs images Since we are now discarding .exit.text at runtime instead of link time, we need to place all .text sections ahead of the .data sections. Otherwise, a really large attached initramfs may cause link errors as it pushes the PC relative relocations behind the limits of the Blackfin ISA (~16meg). The instructions in the .exit.text are unable to call back into the .text sections leading to a link failure. Signed-off-by: Jie Zhang Signed-off-by: Mike Frysinger commit cb191718fcca887fb4d5e3de833546ab12b433f9 Author: Yi Li Date: Wed Dec 30 07:12:50 2009 +0000 Blackfin: try to simplify interrupt ifdef ugliness Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 54536c5c6a807d0db7252c3b33638b88f34650ff Author: Yi Li Date: Wed Dec 30 04:04:07 2009 +0000 Blackfin: simplify SMP handling in SRAM code There is no need to use {get,put}_cpu() when we already have a spinlock to protect against multiple processors running simultaneously. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 0b39db28b953945232719e7ff6fb802aa8a2be5f Author: Graf Yang Date: Mon Dec 28 11:13:51 2009 +0000 Blackfin: SMP: add PM/CPU hotplug support Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 0d152c27e336b5fd777da7dd3e814617e7305afd Author: Yi Li Date: Mon Dec 28 10:21:49 2009 +0000 Blackfin: SMP: make core timers per-cpu clock events for HRT SMP systems require per-cpu local clock event devices in order to enable HRT support. One a BF561, we can use local core timer for this purpose. Originally, there was one global core-timer clock event device set up for core A. To accomplish this feat, we need to split the gptimer0/core timer logic so that each is a standalone clock event. There is no requirement that we only have one clock event source anyways. Once we have this, we just define per-cpu clock event devices for each local core timer. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 682f5dc4ed7cdef1f55e40ee505c4346dfa6fa91 Author: Graf Yang Date: Mon Dec 28 09:27:27 2009 +0000 Blackfin: drop cpu_callin_map on SMP systems Common API already provides functions for managing online CPUs. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 0325f25a919ed09d11b16ec8eccf95618dc36601 Author: Sonic Zhang Date: Mon Dec 28 07:29:57 2009 +0000 Blackfin: SMP: add support for IRQ affinity Now that the Blackfin IRQ controller supports this, drivers get the normal functionality of controlling which CPU to bind IRQs to. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 69e1d8a61d5aa9e03676dc21fdfb750c5a97bb34 Author: Mike Frysinger Date: Fri Dec 25 21:06:06 2009 +0000 Blackfin: unify MMR helpers Signed-off-by: Mike Frysinger commit f05ede3a9416b6eff6c997c12fd749044fb4fdac Author: Mike Frysinger Date: Fri Dec 25 15:34:08 2009 +0000 Blackfin: isram: add unlikely to sanity checks Don't want the compiler assuming the rare sanity checks are the norm and optimize for those paths. Signed-off-by: Mike Frysinger commit 0ea19c64e30f3688d1a890217c382db2b0ca411c Author: Sonic Zhang Date: Wed Dec 23 07:01:43 2009 +0000 Blackfin: update defconfigs Signed-off-by: Sonic Zhang Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0f7b468b6eace87ecdc59b3ec8476d50b0561ac2 Author: Michael Hennerich Date: Tue Dec 22 11:32:06 2009 +0000 Blackfin: add optimized version of Hamming Weight functions Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 252077cf7d44f1f261a5fdaedab88057f8379859 Author: Valentin Yakovenkov Date: Tue Dec 22 09:02:10 2009 +0000 Blackfin: bf561-acvilon: save the smsc911x mac address Signed-off-by: Valentin Yakovenkov Signed-off-by: Mike Frysinger commit 7a9cc48907e05e61033b953a3860e55703625950 Author: Sonic Zhang Date: Tue Dec 22 04:47:04 2009 +0000 Blackfin: bf537-stamp: unify duplicated ADP5588 headers Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 01218654cd97a1e970034b1e080ec5459172c3f6 Author: Mike Frysinger Date: Mon Dec 21 15:07:43 2009 +0000 Blackfin: bf537-stamp: change CONFIG_USB_SL811_BFIN_IRQ to IRQ_PF4 The Kconfig option was never mainlined, so replace the define with the actual pin that it is hooked up to by default. Signed-off-by: Mike Frysinger commit 3b781de6dd96d64c133a7ed774f385d35129575b Author: Mike Frysinger Date: Mon Dec 21 15:04:03 2009 +0000 Blackfin: drop unused SL811 platform resources from bf527/pnav boards These platforms don't hook up to this USB controller, so no point in declaring resources for it. Signed-off-by: Mike Frysinger commit 1dafdc513a20410e328b22b6d25d4ac78557516a Author: Michael Hennerich Date: Fri Dec 18 12:30:04 2009 +0000 Blackfin: BF51x: fix L1 Instruction SRAM size The BF51x's Instruction SRAM is 32kB, not 48kB. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 244d34230b7447fba95221dbf39b39e94257939c Author: Michael Hennerich Date: Fri Dec 18 09:29:39 2009 +0000 Blackfin: update AD7879 resources to match the new gpiolib driver support Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit edd07992504e631b50d18d130c62addbcb16269e Author: Michael Hennerich Date: Wed Dec 16 08:45:17 2009 +0000 Blackfin: gpio: use shorter name The gpio label size is 16 char, but the current code uses a longer name resulting in chopped display. So use a shorter name. Reported-by: Peter Meerwald Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 15435a2a55a678b21b9bb75a7513b3c9ff69a68e Author: Michael Hennerich Date: Wed Dec 16 08:39:58 2009 +0000 Blackfin: pull in asm/bfin_can.h for interrupt masks Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit a3a6a590190ca77aedf9de871d941c1139a5a24c Author: Sonic Zhang Date: Wed Dec 16 07:52:52 2009 +0000 Blackfin: dma-mapping: fix thinko in constant optimization Make sure the non-constant version of the dma_sync functions actually complete instead of recursively calling itself forever. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 0c270807db7c6478d60ab2bc23511fd5868a7a80 Author: Mike Frysinger Date: Tue Dec 15 20:57:43 2009 +0000 Blackfin: drop duplicate HOTPLUG Kconfig option The option already exists for everyone in init/Kconfig. Signed-off-by: Mike Frysinger commit 0e64268ced7975ddcfed3e47a26b8df534f8e3ed Author: Mike Frysinger Date: Tue Dec 15 13:33:19 2009 +0000 Blackfin: merge common CAN defines into one headers Rather than copy and paste the MMR defines and register layout, consolidate everything in one place. Signed-off-by: Mike Frysinger commit 360adee8a5c249f221de43d7d46073391359a4ba Author: Mike Frysinger Date: Tue Dec 15 05:08:36 2009 +0000 Blackfin: wire up the various memory related syscalls These all just go to the stub syscall at the moment, so this is largely future proofing. Signed-off-by: Mike Frysinger commit ead9b1156d4b128db9f13ee8be32cbcd3f255db9 Author: Graf Yang Date: Mon Dec 14 08:01:08 2009 +0000 Blackfin: SMP: enable HAVE_LEGACY_PER_CPU_AREA The current Blackfin SMP code relies on the legacy cpu area code, so select it until we port things to the newer code. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 5792ab2a0a22fdaef33056ca2b31847a28b1af60 Author: Sonic Zhang Date: Wed Dec 9 07:01:50 2009 +0000 Blackfin: MPU: handle caches for reserved memory We weren't handling the user-specified cache behavior for the reserved memory regions (via mem=/max_mem=). The no-MPU code already takes care of this, so add support to the MPU code as well. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit d94a1aa44ed6bfe8d8ab36c02de652d4fcf0d2c3 Author: Michael Hennerich Date: Tue Dec 8 11:45:55 2009 +0000 Blackfin: extend bfin-lq035q1-fb resources to include PPI mode This lets us support the new BF527-EZKIT V2.1 via platform resources tweaks only. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 6924dfb0588dab02a331a3a526f8a8fae7d1b3cc Author: Michael Hennerich Date: Mon Dec 7 13:41:28 2009 +0000 Blackfin: bf527-ezkit: add support for V2.1 boards Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit e18e7dd33454f277b9438af66d25984362278021 Author: Barry Song Date: Mon Dec 7 10:05:58 2009 +0000 Blackfin: fix MPU page permission masks overflow when dealing with async memory Attempting to use the MPU while doing XIP out of parallel flash hooked up to the async memory bus would often result in random crashes as the MPU slowly corrupted memory. The fallout here is that the async banks gain MPU protection from user space too. So any accesses have to go through the mmap() interface rather than just using hardcoded pointers. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit c9784ebb23be1e2ef23f537d6df04e0ea0206802 Author: Yi Li Date: Fri Dec 4 06:56:21 2009 +0000 Blackfin: flush caches on SMP when one core calls another via IPI Sometimes a SMP system will randomly panic at boot. This is due to caches being out of sync when one core tries to signal the other. So when one core calls another via IPI, flush the data caches. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 3630ac34b0ab346ff0910401dbed7af624be7027 Author: Mike Frysinger Date: Tue Nov 17 04:26:22 2009 +0000 Blackfin: bfin_sport: unify & standardize SPORT masks Rather than have every SPORT driver copy & paste things, declare the C structure and MMR bitmasks in one place for everyone to use. Signed-off-by: Mike Frysinger commit c13ce9fd26c3a0e32b3bf0b00929181e66114ed2 Author: Sonic Zhang Date: Wed Sep 23 09:37:46 2009 +0000 Blackfin: add UART/SPORT early platform resources This lets people easily select the UART/SPORT consoles for early printk while leveraging the pins declared in the boards file. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit b635f1912da764c960c044ffd58ba27157aa2c85 Author: Sonic Zhang Date: Wed Sep 23 08:06:25 2009 +0000 Blackfin: allow boards to register early devices Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit df5de261306d9bfc1ed9121595593b10a7626b95 Author: Sonic Zhang Date: Wed Sep 23 05:01:56 2009 +0000 Blackfin: move SPORT UART resources to boards files Rather than keeping the pins in the actual driver and worrying about a mess of Kconfig options, declare all the desired pin resources in the boards file. This lets people easily select the specific pins/ports for the normal emulated UART as well as GPIOs for CTS/RTS. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 08a54bffaf7d5dc9391518323234ce9f9ea4be8e Author: Barry Song Date: Fri Sep 18 09:14:38 2009 +0000 Blackfin: bf537-stamp: ad1938: switch to GPIO CS Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 6bd1fbea2e8bff9346a5afb44ca948b4e4ed74a5 Author: Sonic Zhang Date: Wed Sep 9 10:46:19 2009 +0000 Blackfin: move on-chip UART resources to boards files Rather than keeping the pins in the actual driver and worrying about a mess of Kconfig options, declare all the desired pin resources in the boards file. This lets people easily select the specific pins/ports for the normal UART as well as GPIOs for CTS/RTS. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 30124d11097e371e42052144d8a3f4a78d26e09f Author: Dave Kleikamp Date: Mon Mar 1 04:57:34 2010 +0000 powerpc/booke: Fix breakpoint/watchpoint one-shot behavior Another fix for the extended ptrace patches in the -next tree. The handling of breakpoints and watchpoints is inconsistent. When a breakpoint or watchpoint is hit, the interrupt handler is clearing the proper bits in the dbcr* registers, but leaving the dac* and iac* registers alone. The ptrace code to delete the break/watchpoints checks the dac* and iac* registers for zero to determine if they are enabled. Instead, they should check the dbcr* bits. Signed-off-by: Dave Kleikamp Signed-off-by: Benjamin Herrenschmidt commit a8e6da093ea8642b1320fb5d64134366f2a8d0ac Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:23 2010 +0000 powerpc: Reduce printk from pseries_mach_cpu_die() Remove debug printks in pseries_mach_cpu_die(). These are noisy at runtime. Traceevents can be added to instrument this section of code. The following KERN_INFO printks are removed: cpu 62 (hwid 62) returned from cede. Decrementer value = b2802fff Timebase value = 2fa8f95035f4a cpu 62 (hwid 62) got prodded to go online cpu 58 (hwid 58) ceding for offline with hint 2 Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 0212f2602a38e740d5a96aba4cebfc2ebc993ecf Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:16 2010 +0000 powerpc: Move checks in pseries_mach_cpu_die() Rearrange condition checks for better code readability and prevention of possible race conditions when preferred_offline_state can potentially change during the execution of pseries_mach_cpu_die(). The patch will make pseries_mach_cpu_die() put cpu in one of the consistent states and not hit the run over BUG() Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 8dbce53cc249a76e9450708d291fce5a7e29c6a1 Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:09 2010 +0000 powerpc: Reset kernel stack on cpu online from cede state Cpu hotplug (offline) without dlpar operation will place cpu in cede state and the extended_cede_processor() function will return when resumed. Kernel stack pointer needs to be reset before start_secondary() is called to continue the online operation. Added new function start_secondary_resume() to do the above steps. Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit de0b632ba05bc88949e67d33d1c313fcf922ae2e Author: Josh Boyer Date: Fri Feb 5 03:52:16 2010 +0000 powerpc: Fix G5 thermal shutdown This changes the thresholds for the liquid cooled G5 thermal shutdown mechanism to prevent an errant shutdown with some models. Signed-off-by: David Woodhouse Signed-off-by: Benjamin Herrenschmidt commit f09b7b2a1115d3afe02c66156746287f6c63bba0 Author: Mark Nelson Date: Sun Jan 31 20:12:58 2010 +0000 powerpc/pseries: Pass CPPR value to H_XIRR hcall Now that we properly keep track of the CPPR value (since 49bd3647134ea47420067aea8d1401e722bf2aac, "powerpc/pseries: Track previous CPPR values to correctly EOI interrupts") we can pass it to the H_XIRR hcall. This is needed because the Partition Adjunct Option of new versions of pHyp extend the H_XIRR hcall to include the CPPR as an input parameter. Earlier versions not supporting this option just disregard the extra input parameter, so this doesn't cause any problems for existing systems. The Partition Adjunct Option is required for future systems that will support SR-IOV capable devices. Signed-off-by: Mark Nelson Signed-off-by: Benjamin Herrenschmidt commit 856f70a368022645a08fbecc5d30ec218f13232d Author: Dave Kleikamp Date: Tue Feb 23 09:43:17 2010 +0000 powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc/booke: Fix a couple typos in the advanced ptrace code Found and fixed a couple typos in the advanced ptrace patches. (These patches are currently in benh's next tree.) Signed-off-by: Dave Kleikamp Cc: Benjamin Herrenschmidt Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 5b72d74ce2fccca2a301de60f31b16ddf5c93984 Author: Adam Lackorzynski Date: Sat Feb 27 07:07:59 2010 +0000 powerpc: Fix SMP build with disabled CPU hotplugging. Compiling 2.6.33 with SMP enabled and HOTPLUG_CPU disabled gives me the following link errors: LD init/built-in.o LD .tmp_vmlinux1 arch/powerpc/platforms/built-in.o: In function `.smp_xics_setup_cpu': smp.c:(.devinit.text+0x88): undefined reference to `.set_cpu_current_state' smp.c:(.devinit.text+0x94): undefined reference to `.set_default_offline_state' arch/powerpc/platforms/built-in.o: In function `.smp_pSeries_kick_cpu': smp.c:(.devinit.text+0x13c): undefined reference to `.set_preferred_offline_state' smp.c:(.devinit.text+0x148): undefined reference to `.get_cpu_current_state' smp.c:(.devinit.text+0x1a8): undefined reference to `.get_cpu_current_state' make: *** [.tmp_vmlinux1] Error 1 The following change fixes that for me and seems to work as expected. Signed-off-by: Adam Lackorzynski Signed-off-by: Benjamin Herrenschmidt commit 1426d5a3bd07589534286375998c0c8c6fdc5260 Author: Michael Ellerman Date: Thu Jan 28 13:23:22 2010 +0000 powerpc: Dynamically allocate pacas On 64-bit kernels we currently have a 512 byte struct paca_struct for each cpu (usually just called "the paca"). Currently they are statically allocated, which means a kernel built for a large number of cpus will waste a lot of space if it's booted on a machine with few cpus. We can avoid that by only allocating the number of pacas we need at boot. However this is complicated by the fact that we need to access the paca before we know how many cpus there are in the system. The solution is to dynamically allocate enough space for NR_CPUS pacas, but then later in boot when we know how many cpus we have, we free any unused pacas. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 59603b9ae426e968d452f9325cdcff308573dee7 Merge: 57d5488 a111065 Author: Benjamin Herrenschmidt Date: Tue Mar 9 11:51:57 2010 +1100 Merge commit 'kumar/next' into merge commit 522dba7134d6b2e5821d3457f7941ec34f668e6d Merge: 51d0f6d bb910a7 Author: Linus Torvalds Date: Mon Mar 8 16:10:29 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI/PM Runtime: Make runtime PM of PCI devices inactive by default commit 51d0f6d1f50349579f007adf5c0b51aaedd93b94 Merge: 57d5488 da495ec Author: Linus Torvalds Date: Mon Mar 8 14:07:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: kfree correct pointer during mount option parsing Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL commit da495ecc0fb096b383754952a1c152147bc95b52 Author: Josef Bacik Date: Thu Feb 25 20:38:35 2010 +0000 Btrfs: kfree correct pointer during mount option parsing We kstrdup the options string, but then strsep screws with the pointer, so when we kfree() it, we're not giving it the right pointer. Tested-by: Andy Lutomirski Signed-off-by: Chris Mason commit 6bef4d317193d3badbbfa3f3c593758ace84a629 Author: Eric Paris Date: Tue Feb 23 19:43:04 2010 +0000 Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL btrfs inialize rb trees in quite a number of places by settin rb_node = NULL; The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULL for the new rbtree library code to work properly. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd. Without the patch I get a panic. Signed-off-by: Eric Paris Acked-by: Venkatesh Pallipadi Signed-off-by: Chris Mason commit 42d38041a94cef1e38f7b8ab9827881022a183a9 Author: Wolfgang Grandegger Date: Mon Mar 8 12:51:41 2010 -0800 MAINTAINERS: add netdev to CAN network layer and drivers entries Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit de5865714621e23d65c52955ca2125dbb074c242 Author: Neil Horman Date: Mon Mar 8 12:43:56 2010 -0800 tipc: filter out messages not intended for this host Port commit 20deb48d16fdd07ce2fdc8d03ea317362217e085 from git://tipc.cslab.ericsson.net/pub/git/people/allan/tipc.git Part of the large effort I'm trying to help with getting all the downstreamed code from windriver forward ported to the upstream tree Origional commit message Restore check to filter out inadverdently received messages This patch reimplements a check that allows TIPC to discard messages that are not intended for it. This check was present in TIPC 1.5/1.6, but was removed by accident during the development of TIPC 1.7; it has now been updated to account for new features present in TIPC 1.7 and reinserted into TIPC. The main benefit of this check is to filter out messages arriving from orphaned link endpoints, which can arise when a node exits the network and then re-enters it with a different TIPC network address (i.e. value). Signed-off-by: Neil Horman Origionally-authored-by: Allan Stephens Signed-off-by: David S. Miller commit 91e013827c0bcbb187ecf02213c5446b6f62d445 Merge: 988addf 8d2b09f Author: Russell King Date: Mon Mar 8 20:24:11 2010 +0000 Merge branch 'master' into for-linus commit 988addf82e4c03739375279de73929580a2d4a6a Merge: 004c1c7 25cf84c Author: Russell King Date: Mon Mar 8 20:21:04 2010 +0000 Merge branch 'origin' into devel-stable Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c commit d88dca79d3852a3623f606f781e013d61486828a Author: Neil Horman Date: Mon Mar 8 12:20:58 2010 -0800 tipc: fix endianness on tipc subscriber messages Remove htohl implementation from tipc I was working on forward porting the downstream commits for TIPC and ran accross this one: http://tipc.cslab.ericsson.net/cgi-bin/gitweb.cgi?p=people/allan/tipc.git;a=commitdiff;h=894279b9437b63cbb02405ad5b8e033b51e4e31e I was going to just take it, when I looked closer and noted what it was doing. This is basically a routine to byte swap fields of data in sent/received packets for tipc, dependent upon the receivers guessed endianness of the peer when a connection is established. Asside from just seeming silly to me, it appears to violate the latest RFC draft for tipc: http://tipc.sourceforge.net/doc/draft-spec-tipc-02.txt Which, according to section 4.2 and 4.3.3, requires that all fields of all commands be sent in network byte order. So instead of just taking this patch, instead I'm removing the htohl function and replacing the calls with calls to ntohl in the rx path and htonl in the send path. As part of this fix, I'm also changing the subscr_cancel function, which searches the list of subscribers, using a memcmp of the entire subscriber list, for the entry to tear down. unfortunately it memcmps the entire tipc_subscr structure which has several bits that are private to the local side, so nothing will ever match. section 5.2 of the draft spec indicates the tuple should uniquely identify a subscriber, so convert subscr_cancel to just match on those fields (properly endian swapped). I've tested this using the tipc test suite, and its passed without issue. Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit f5c445ed4148434f142be0263a8ad7cb58503e8a Author: Eric Dumazet Date: Mon Mar 8 12:17:04 2010 -0800 ethtool: Use noinline_for_stack Use self documenting noinline_for_stack instead of duplicated comments. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 81160e66cca3d3a16b7d88e0e2dccfc5c76f36f9 Author: Joe Perches Date: Mon Mar 8 12:15:59 2010 -0800 net/sunrpc: Convert (void)snprintf to snprintf (Applies on top of "Remove uses of NIPQUAD, use %pI4") Casts to void of snprintf are most uncommon in kernel source. 9 use casts, 1301 do not. Remove the remaining uses in net/sunrpc/ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit fc0b579168cbe737c83c6b9bbfe265d3ae6baca6 Author: Joe Perches Date: Mon Mar 8 12:15:28 2010 -0800 net/sunrpc: Remove uses of NIPQUAD, use %pI4 Originally submitted Jan 1, 2010 http://patchwork.kernel.org/patch/71221/ Convert NIPQUAD to the %pI4 format extension where possible Convert %02x%02x%02x%02x/NIPQUAD to %08x/ntohl Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e9dcd1613f0ac0b3573b7d813a2c5672cd8302eb Author: Barry Song Date: Mon Mar 8 12:13:57 2010 -0800 can: fix bfin_can build error after alloc_candev() change Looks like commit a6e4bc530403 didn't include updates to drivers so the Blackfin CAN driver fails to build now. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 49697ee79242d5f8ac88f1ebc62e583d16bcc687 Author: Steve Dickson Date: Tue Oct 13 16:07:33 2009 -0400 nfs4: Make the v4 callback service hidden To avoid hangs in the svc_unregister(), on version 4 mounts (and unmounts), when rpcbind is not running, make the nfs4 callback program an 'hidden' service by setting the 'vs_hidden' flag in the nfs4_callback_version structure. Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 28b2774a0d5852236dab77a4147b8b88548110f1 Author: Eric Dumazet Date: Mon Mar 8 11:32:01 2010 -0800 tcp: Fix tcp_make_synack() Commit 4957faad (TCPCT part 1g: Responder Cookie => Initiator), part of TCP_COOKIE_TRANSACTION implementation, forgot to correctly size synack skb in case user data must be included. Many thanks to Mika Pentillä for spotting this error. Reported-by: Penttillä Mika Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f6bb13aa1ea3bb26a4c783822347873f085b9000 Author: Rafael J. Wysocki Date: Thu Mar 4 01:52:58 2010 +0100 ACPI / EC / PM: Close race between EC and resume from hibernation There is a race between resume from hibernation and the EC driver that may result in restoring the hibernation image in the middle of an EC transaction in progress, which in turn may lead to unpredictable behavior of the platform. To remove that race condition, add a helpers for suspending and resuming EC transactions in a safe way to be executed by the ACPI platform hibernate pre-restore and restore cleanup callbacks. http://bugzilla.kernel.org/show_bug.cgi?id=14668 Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Maxim Levitsky Signed-off-by: Len Brown commit 7dd08a570dcf45d52155996fee688405635ee481 Author: Dan Carpenter Date: Sat Mar 6 15:02:22 2010 +0300 nfs: fix unlikely memory leak I'll admit that it's unlikely for the first allocation to fail and the second one to succeed. I won't be offended if you ignore this patch. Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust commit 5fe46e9d733f19a880ef7e516002bd4c2b833e14 Author: Bian Naimeng Date: Mon Mar 8 14:49:01 2010 +0800 rpc client can not deal with ENOSOCK, so translate it into ENOCONN If NFSv4 client send a request before connect, or the old connection was broken because a ETIMEOUT error catched by call_status, ->send_request will return ENOSOCK, but rpc layer can not deal with it, so make sure ->send_request can translate ENOSOCK into ENOCONN. Signed-off-by: Bian Naimeng Signed-off-by: Trond Myklebust commit 77d3926306bf4eecac50150ba5625797219f14ba Author: Meelis Roos Date: Mon Mar 8 10:53:08 2010 -0800 qlogicpti: Remove slash in QlogicPTI irq name qlogicpti driver registers its irq with a name containing slash. This results in [ 71.049735] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xa8/0xb8() [ 71.132815] name 'Qlogic/PTI' because proc_mkdir with the name of the irq fails. Fix it by just removing the slash from irq name. Discovered and tested on real hardware (Sun Ultra 1). Signed-off-by: Meelis Roos Signed-off-by: David S. Miller commit 57d54889cd00db2752994b389ba714138652e60c Author: Linus Torvalds Date: Mon Mar 8 10:45:44 2010 -0800 Linux 2.6.34-rc1 commit 9837638727488922727b0cfd438039fa73364183 Author: Eric Dumazet Date: Mon Mar 8 03:20:00 2010 +0000 net: fix route cache rebuilds We added an automatic route cache rebuilding in commit 1080d709fb9d8cd43 but had to correct few bugs. One of the assumption of original patch, was that entries where kept sorted in a given way. This assumption is known to be wrong (commit 1ddbcb005c395518 gave an explanation of this and corrected a leak) and expensive to respect. Paweł Staszewski reported to me one of his machine got its routing cache disabled after few messages like : [ 2677.850065] Route hash chain too long! [ 2677.850080] Adjust your secret_interval! [82839.662993] Route hash chain too long! [82839.662996] Adjust your secret_interval! [155843.731650] Route hash chain too long! [155843.731664] Adjust your secret_interval! [155843.811881] Route hash chain too long! [155843.811891] Adjust your secret_interval! [155843.858209] vlan0811: 5 rebuilds is over limit, route caching disabled [155843.858212] Route hash chain too long! [155843.858213] Adjust your secret_interval! This is because rt_intern_hash() might be fooled when computing a chain length, because multiple entries with same keys can differ because of TOS (or mark/oif) bits. In the rare case the fast algorithm see a too long chain, and before taking expensive path, we call a helper function in order to not count duplicates of same routes, that only differ with tos/mark/oif bits. This helper works with data already in cpu cache and is not be very expensive, despite its O(N^2) implementation. Paweł Staszewski sucessfully tested this patch on his loaded router. Reported-and-tested-by: Paweł Staszewski Signed-off-by: Eric Dumazet Acked-by: Neil Horman Signed-off-by: David S. Miller commit 1515faf2f995add976d4428bbc1583a4a0c81e5f Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:50 2010 +0000 qlcnic: remove extra space from board names Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit addd5abf49be31787aeb6203d266e0bd31a3fadd Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:49 2010 +0000 qlcnic: fix bios version check Bios sub version from unified fw image is calculated incorrect. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b7eff1007fea3d153a9a5c0f872304ec19412bbb Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:48 2010 +0000 qlcnic: validate unified fw image Validate all sections of unified fw image, before accessing them, to avoid seg fault. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 9ab17b3968f9521bb4fffd8767953d2b0148aad0 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:47 2010 +0000 qlcnic: fix multicast handling For promiscuous mode, driver send request to device for deleting multicast addresses and again it send request for adding them back while exiting from this mode, this is bad for performance. Just setting device in promiscuous mode is enough, no need to del/add multicast addresses. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bfe8b91b8b877066c8ac788f59a40324eaac6d8 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:46 2010 +0000 qlcnic: additional driver statistics. Statistics added for lro/lso bytes, count for tx stop queue and wake queue and skb alloc failure count. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bae5698616ac336938684ce7a7370299bd55d01 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:45 2010 +0000 qlcnic: fix tx csum status Kernel default tx csum function (ethtool_op_get_tx_csum) doesn't show correct csum status. It takes various FLAGS (NETIF_F_ALL_CSUM) in account to show tx csum status, which driver doesn't set while disabling tx csum. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7e8a9298adf7531c58d73ba9c499353e3807cf19 Author: Ajit Khaparde Date: Sun Mar 7 14:23:44 2010 +0000 be2net: remove unused code in be_load_fw This patch cleans up some unused code from be_load_fw(). Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 500ca9ba241304937c54c379e515b24400379353 Author: Ajit Khaparde Date: Sun Mar 7 14:21:27 2010 +0000 be2net: remove usage of be_pci_func When PCI functions are virtuialized in applications by assigning PCI functions to VM (PCI passthrough), the be2net driver in the VM sees a different function number. So, use of PCI function number in any calculation will break existing code. This patch takes care of it. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 6cce09f87a04797fae5b947ef2626c14a78f0b49 Author: Eric Dumazet Date: Sun Mar 7 23:21:57 2010 +0000 tcp: Add SNMP counters for backlog and min_ttl drops Commit 6b03a53a (tcp: use limited socket backlog) added the possibility of dropping frames when backlog queue is full. Commit d218d111 (tcp: Generalized TTL Security Mechanism) added the possibility of dropping frames when TTL is under a given limit. This patch adds new SNMP MIB entries, named TCPBacklogDrop and TCPMinTTLDrop, published in /proc/net/netstat in TcpExt: line netstat -s | egrep "TCPBacklogDrop|TCPMinTTLDrop" TCPBacklogDrop: 0 TCPMinTTLDrop: 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4045635318538d3ddd2007720412fdc4b08f6a62 Author: Zhu Yi Date: Sun Mar 7 16:21:39 2010 +0000 net: add __must_check to sk_add_backlog Add the "__must_check" tag to sk_add_backlog() so that any failure to check and drop packets will be warned about. Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit e10154189f001b6428a83f58b03a27954f0f8022 Merge: d4bab1b 410c176 Author: Linus Torvalds Date: Mon Mar 8 10:17:20 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (62 commits) msi-laptop: depends on RFKILL msi-laptop: Detect 3G device exists by standard ec command msi-laptop: Add resume method for set the SCM load again msi-laptop: Support some MSI 3G netbook that is need load SCM msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook Driver core: create lock/unlock functions for struct device sysfs: fix for thinko with sysfs_bin_attr_init() sysfs: Kill unused sysfs_sb variable. sysfs: Pass super_block to sysfs_get_inode driver core: Use sysfs_rename_link in device_rename sysfs: Implement sysfs_rename_link sysfs: Pack sysfs_dirent more tightly. sysfs: Serialize updates to the vfs inode sysfs: windfarm: init sysfs attributes sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes sysfs: Document sysfs_attr_init and sysfs_bin_attr_init sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes sysfs: Use one lockdep class per sysfs attribute. sysfs: Only take active references on attributes. ... commit 89c0ac7cab2440a771ba1e2ab953186bc9c29786 Author: Randy Dunlap Date: Mon Mar 8 09:32:42 2010 -0800 sound: fix opti92x-ad1848 build Fix 'else' placement in ifdef block so that build succeeds: sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 0d9dc7c8b9b7fa0f53647423b41056ee1beed735 Author: Gal Rosen Date: Thu Jan 21 10:15:32 2010 +0200 [SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport The issue occur while deleting 60 virtual ports through the sys interface /sys/class/fc_vports/vport-X/vport_delete. It happen while in a mistake each request sent twice for the same vport. This interface is asynchronous, entering the delete request into a work queue, allowing more than one request to enter to the delete work queue. The result is a NULL pointer. The first request already delete the vport, while the second request got a pointer to the vport before the device destroyed. Re-create vport later cause system freeze. Solution: Check vport flags before entering the request to the work queue. [jejb: fixed int<->long problem on spinlock flags variable] Signed-off-by: Gal Rosen Acked-by: James Smart Cc: Stable Tree Signed-off-by: James Bottomley commit 004c1c7096659d352b83047a7593e91d8a30e3c5 Merge: 882d01f 3b05007 Author: Russell King Date: Mon Mar 8 16:08:46 2010 +0000 Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable commit 318ae2edc3b29216abd8a2510f3f80b764f06858 Merge: 25cf84c 3e58974 Author: Jiri Kosina Date: Mon Mar 8 16:55:37 2010 +0100 Merge branch 'for-next' into for-linus Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c commit d4bab1b091be4a91a7363118c9ede3cc9a7fefd4 Merge: 56b7892 2786095 Author: Linus Torvalds Date: Mon Mar 8 07:35:30 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] i6300esb.c: change platform_driver to pci_driver [WATCHDOG] i6300esb: fix unlock register with [WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static [WATCHDOG] change reboot_notifier to platform-shutdown method. [WATCHDOG] watchdog_info constify [WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture [WATCHDOG] iTCO_wdt: clean up probe(), modify err msg [WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup [WATCHDOG] support for max63xx watchdog timer chips [WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver [WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs commit 56b78921c32ae825c596c158e74ab48c0e8e280d Merge: 3c443cb a3087ae Author: Linus Torvalds Date: Mon Mar 8 07:34:26 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits) ALSA: hdmi - show debug message on changing audio infoframe ALSA: hdmi - merge common code for intelhdmi and nvhdmi ALSA: hda - Add ASRock mobo to MSI blacklist ALSA: hda: uninitialized variable fix ALSA: hda: Use LPIB for a Biostar Microtech board ALSA: usb/audio.h: Fix field order ALSA: fix jazz16 compile (udelay) ALSA: hda: Use LPIB for Dell Latitude 131L ALSA: hda - Build hda_eld into snd-hda-codec module ALSA: hda - Support NVIDIA MCP89 and GT21x hdmi audio ALSA: hda - Support max codecs to 8 for nvidia hda controller ALSA: riptide: clean up while loop ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line ALSA: timer - pass real event in snd_timer_notify1() to instance callback ALSA: oxygen: change || to && ALSA: opti92x: use PnP data to select Master Control port ASoC: fix ak4104 register array access ASoC: soc_pcm_open: Add missing bailout tag ALSA: usbaudio: Fix wrong bitrate for Creative Creative VF0470 Live Cam ALSA: ua101: removing debugging code ... commit 3c443cbc1dbb9a3b4dd9a134b97349195bcb4990 Merge: d401403 1ffaa64 Author: Linus Torvalds Date: Mon Mar 8 07:33:46 2010 -0800 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents [S390] smsgiucv: declare char pointers as "const" [S390] dasd: automatic recognition of read-only devices [S390] remove unused qdio flags in zfcp and qeth [S390] Cleanup xtime usage [S390] qdio: add missing bracket [S390] cio: fix init_count in case of recognition after steal lock [S390] dasd: security and PSF update patch for EMC CKD ioctl [S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA [S390] uaccess: make sure copy_from_user_overflow is builtin commit d4014030d2b2508aaf54093a5885f1c8a2275dd7 Author: Christian Kujau Date: Mon Mar 8 15:03:09 2010 +0000 FS-Cache: Remove the EXPERIMENTAL flag Remove the EXPERIMENTAL flag from FS-Cache so that Ubuntu can make use of the facility. Signed-off-by: Christian Kujau Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 2786095a58fd55931fa0298ff6e3914331edaaf2 Author: Wim Van Sebroeck Date: Mon Mar 8 13:48:01 2010 +0000 [WATCHDOG] i6300esb.c: change platform_driver to pci_driver Since the intel 6300esb platform uses a dedicated PCI ID for it's watchdog timer (00:1d.4), it's better and easier to have this as a pci_driver. Signed-off-by: Wim Van Sebroeck commit 8b408fe4f853dcfa18d133aa4cf1d7546b4c3870 Author: Joerg Roedel Date: Mon Mar 8 14:20:07 2010 +0100 x86/amd-iommu: Use helper function to destroy domain In the amd_iommu_domain_destroy the protection_domain_free function is partly reimplemented. The 'partly' is the bug here because the domain is not deleted from the domain list. This results in use-after-free errors and data-corruption. Fix it by just using protection_domain_free instead. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 40d1f0048289b1baed859baee06878417fae540e Author: Paul Mundt Date: Mon Mar 8 21:03:21 2010 +0900 sh: Fix up uncached offset for legacy 29-bit mode. The uncached_start was being set up properly for 32-bit but managed to break 29-bit in the process, fix it up. Signed-off-by: Paul Mundt commit 1ffaa640c6ba135aafc91841204e41846eae6841 Author: Hendrik Brueckner Date: Mon Mar 8 12:26:26 2010 +0100 [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents The smsgiucv_app driver registers a callback with the smsgiucv driver to receive z/VM CP special messages (SMSG) starting with "APP". When the callback is called for special messages, the driver creates an uevent for the received message. The uevent consists of additional environment data containing the message prefix ("APP"), message sender, and message content. udev rules can be used to trigger application specific actions through matching the content or sender of the special message. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 09003ed90a2880de7e36b170a9298dd10d53e322 Author: Hendrik Brueckner Date: Mon Mar 8 12:26:25 2010 +0100 [S390] smsgiucv: declare char pointers as "const" Declare the smsgiucv prefix char pointer as "const" and use use const char pointers in callback functions. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 33b62a30f78536b976183cc764c08038ac011e0a Author: Stefan Weinhuber Date: Mon Mar 8 12:26:24 2010 +0100 [S390] dasd: automatic recognition of read-only devices In z/VM it is possible to attach a device as read-only. To prevent unintentional write requests and subsequent I/O errors, we can detect this configuration using the z/VM DIAG 210 interface and set the respective linux block device to read-only as well. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 584dfddfce1bd81d877f14de2b56d4bc747af821 Author: Ursula Braun Date: Mon Mar 8 12:25:20 2010 +0100 [S390] remove unused qdio flags in zfcp and qeth zfcp and qeth are setting flags for the qdio-layer, but these flags are not used in qdio. Patch removes the flag definitions from qdio and their settings in zfcp and qeth. Cc: Jan Glauber Cc: Christof Schmitt Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit b1e2ba8da973535e62839915403b6f5450081d8c Author: John Stultz Date: Mon Mar 8 12:25:19 2010 +0100 [S390] Cleanup xtime usage This replaces direct xtime usage in the s390 arch with timekeeping accessors, so we can further clean up the timekeeping core. Cc: Thomas Gleixner Signed-off-by: John Stultz Signed-off-by: Martin Schwidefsky commit bd6e8a162ecdec4f1d8895b0f330f75425993567 Author: Ursula Braun Date: Mon Mar 8 12:25:18 2010 +0100 [S390] qdio: add missing bracket Add a missing bracket to only log the outbound handler event in the appropriate case. Signed-off-by: Ursula Braun Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit a290156f479af436f94ac23f5729a1e33c94293b Author: Sebastian Ott Date: Mon Mar 8 12:25:17 2010 +0100 [S390] cio: fix init_count in case of recognition after steal lock After we try to steal a lock on a ccw device in boxed state, we have to restart device recognition and potentially reprobing. In this case ccw_device_init_count was erroneously decreased twice. This patch fixes the issue. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 52898025cf7d458d029c18773d0ef49b4789d829 Author: Nigel Hislop Date: Mon Mar 8 12:25:16 2010 +0100 [S390] dasd: security and PSF update patch for EMC CKD ioctl Remove the PSF order/suborder check from the Symmetrix CKD dasd ioctl. In exchange restrict the ioctl to CAP_SYS_ADMIN and CAP_SYS_RAWIO. Signed-off-by: Nigel Hislop Signed-off-by: Martin Schwidefsky commit 91a970d9889c7d6f451ee91ed361d0f0119d3778 Author: Hendrik Brueckner Date: Mon Mar 8 12:25:15 2010 +0100 [S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA The device driver must allocate memory for IUCV buffers with GFP_DMA, because IUCV cannot address memory above 2GB (31bit addresses only). Because the IUCV ignores the higher bits of the address, sending and receiving IUCV data with this driver might cause memory corruptions. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 596a95cdf0ba35ea353fb5b65750f596d712041e Author: Heiko Carstens Date: Mon Mar 8 12:25:14 2010 +0100 [S390] uaccess: make sure copy_from_user_overflow is builtin If there is no in kernel image caller modules will suffer: ERROR: "copy_from_user_overflow" [net/core/pktgen.ko] undefined! ERROR: "copy_from_user_overflow" [net/can/can-raw.ko] undefined! ERROR: "copy_from_user_overflow" [fs/cifs/cifs.ko] undefined! Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5311114d4867113c00f78829d4ce14be458ec925 Author: Takashi Iwai Date: Mon Mar 8 12:13:07 2010 +0100 ALSA: hda - Fix input source elements of secondary ADCs on Realtek Since alc_auto_create_input_ctls() doesn't set the elements for the secondary ADCs, "Input Source" elemtns for these also get empty, resulting in buggy outputs of alsactl like: control.14 { comment.access 'read write' comment.type ENUMERATED comment.count 1 iface MIXER name 'Input Source' index 1 value 0 } This patch fixes alc_mux_enum_*() (and others) to fall back to the first entry if the secondary input mux is empty. Signed-off-by: Takashi Iwai Cc: commit 50ae0aa8f55813b2cc5e5b7f589f328b8fcd45ec Author: Takashi Iwai Date: Mon Mar 8 12:09:59 2010 +0100 ALSA: hda - Fix wrong model range check for ALC268 Fix a wrong value passed to snd_hda_check_board_codec_sid_config() as the upper-limit in parse_alc268(), so that any wrong value can't be passed. So far, no bogus value was set in the quirk entries, so this won't give any behavioral changes. Signed-off-by: Takashi Iwai commit 39f3be72c1a1b20d7e6e35717afa2ddb89259650 Author: Wim Van Sebroeck Date: Mon Mar 8 11:02:38 2010 +0000 [WATCHDOG] i6300esb: fix unlock register with Before you can read or write from the i6300esb memeory mapped registers, you need to unlock these. This is done by writing the magic numbers 0x80 and 0x86 to the reload register. The size of the reload register is 32bit though. Also binary 11 is hex 0x03 and not 0x11. Signed-off-by: Wim Van Sebroeck commit a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 Merge: f0f20a1 2b9ddcb Author: Takashi Iwai Date: Mon Mar 8 09:35:50 2010 +0100 Merge branch 'topic/misc' into for-linus commit f0f20a16983f7d3713ab695e19bd15eca4e7533f Merge: f1cf9a6 e555317 Author: Takashi Iwai Date: Mon Mar 8 09:35:48 2010 +0100 Merge branch 'topic/asoc' into for-linus commit f1cf9a666de65254b0c56b4dec8ca2ecdab5b620 Merge: 6679ee1 2abbf43 Author: Takashi Iwai Date: Mon Mar 8 09:35:43 2010 +0100 Merge branch 'topic/hda' into for-linus commit c2282adbdea3548ae0271c1b1b2deec5f56ad224 Author: FUJITA Tomonori Date: Mon Mar 8 09:11:07 2010 +0100 Documentation: fix block/biodoc.txt dma mapping description - It looks incorrect to use blk_rq_map_sg with pci_map_page here about DMA mappings. dma_map_sg? - better to use dma_map_page instead of pci_map_page. http://marc.info/?l=linux-kernel&m=126596737604808&w=2 Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit 8bf8c376ab2eefaf0386f4e003e720e1434fa43d Author: Dmitry Monakhov Date: Wed Mar 3 06:28:06 2010 +0300 blkdev: fix merge_bvec_fn return value checks v2 merge_bvec_fn() returns bvec->bv_len on success. So we have to check against this value. But in case of fs_optimization merge we compare with wrong value. This patch must be included in b428cd6da7e6559aca69aa2e3a526037d3f20403 But accidentally i've forgot to add this in the initial patch. To make things straight let's replace all such checks. In fact this makes code easy to understand. Signed-off-by: Dmitry Monakhov Signed-off-by: Jens Axboe commit 2abbf4391fb56dfa97221ed6796782537d15196f Author: Wu Fengguang Date: Mon Mar 8 10:45:38 2010 +0800 ALSA: hdmi - show debug message on changing audio infoframe Also change printk level for the two others. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 079d88ccc374d2c1a850b8a83595ba4c907fb3df Author: Wu Fengguang Date: Mon Mar 8 10:44:23 2010 +0800 ALSA: hdmi - merge common code for intelhdmi and nvhdmi Create patch_hdmi.c to hold common code from intelhdmi and nvhdmi. For now the patch_hdmi.c file is simply included by patch_intelhdmi.c and patch_nvhdmi.c, and does not represent a real codec. There are no behavior changes to intelhdmi. However nvhdmi made several changes when copying code out of intelhdmi, which are all reverted in this patch. Wei Ni confirmed that the reverted code actually works fine. Tested-by: Wei Ni Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit a8941dad1f12b4e8a87a517ed27f29d0209c817c Author: Paul Mundt Date: Mon Mar 8 13:33:17 2010 +0900 sh: Support CPU affinity masks for INTC controllers. This hooks up the ->set_affinity() for the INTC controllers, which can be done as just a simple copy of the cpumask. The enable/disable paths already handle SMP register strides, so we just test the affinity mask in these paths to determine which strides to skip over. The early enable/disable path happens prior to the IRQs being registered, so we have no affinity mask established at that point, in which case we just default to CPU_MASK_ALL. This is left as it is to permit the force enable/disable code to retain existing semantics. Signed-off-by: Paul Mundt commit 410c17651998944630a95fbb286a50362de2dbb0 Author: Randy Dunlap Date: Wed Feb 3 14:24:28 2010 -0800 msi-laptop: depends on RFKILL msi-laptop uses rfkill*() interfaces so it should depend on RFKILL. msi-laptop.c:(.text+0x1fcd1b): undefined reference to `rfkill_alloc' msi-laptop.c:(.text+0x1fcd76): undefined reference to `rfkill_register' msi-laptop.c:(.text+0x1fcdc8): undefined reference to `rfkill_destroy' msi-laptop.c:(.text+0x1fcdd9): undefined reference to `rfkill_unregister' This repairs "msi-laptop: Detect 3G device exists by standard ec command", which is in some gregkh tree. Signed-off-by: Randy Dunlap Cc: Lennart Poettering Cc: Lee, Chun-Yi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e22388e71b8787b26dc33d023e5c1eec58865541 Author: Lee, Chun-Yi Date: Wed Jan 27 12:23:00 2010 +0800 msi-laptop: Detect 3G device exists by standard ec command Detect 3G device exists by standard ec command. Driver will not create the threeg sysfs file and threeg rfkill interface if there have no internal 3G device in MSI notebook/netbook. Signed-off-by: Lee, Chun-Yi Cc: Lennart Poettering Signed-off-by: Greg Kroah-Hartman commit ec766278ba927f3d3c75211ea7697aae37f327f0 Author: Lee, Chun-Yi Date: Wed Jan 27 00:13:45 2010 +0800 msi-laptop: Add resume method for set the SCM load again Implement the resume method for set the load SCM flag after system reusme. Without this patch, the wifi function key on SCM model will back to BIOS control mode then confuse with the userland software control. e.g. MSI N034 Signed-off-by: Lee, Chun-Yi Cc: Lennart Poettering Signed-off-by: Greg Kroah-Hartman commit 472ea12d1a265c868e1605abb59bf21f595eedfc Author: Lee, Chun-Yi Date: Fri Jan 22 00:15:59 2010 +0800 msi-laptop: Support some MSI 3G netbook that is need load SCM Some MSI 3G netbook only have one fn key to control Wlan/Bluetooth/3G, those netbook will load the SCM (windows app) to disable the original Wlan/Bluetooth control by BIOS when user press fn key, then control Wlan/Bluetooth/3G by SCM (software control by OS). Without SCM, user cann't on/off 3G module on those 3G netbook. On Linux, msi-laptop driver will do the same thing to disable the original BIOS control, then might need use HAL or other userland application to do the software control that simulate with SCM. e.g. MSI N034 netbook Signed-off-by: Lee, Chun-Yi Cc: Lennart Poettering Signed-off-by: Greg Kroah-Hartman commit fc0dc4c926e6b7afe680aecf809f48eef3faa182 Author: Lee, Chun-Yi Date: Sat Jan 9 23:17:07 2010 +0800 msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command Add threeg sysfs file for support query 3G state by standard 66/62 ec command, the MSI standard ec interface supported this feature. Signed-off-by: Lee, Chun-Yi Cc: Lennart Poettering Signed-off-by: Greg Kroah-Hartman commit 46d0e9e091ba5dd29cac7543e97084540da9c4b7 Author: Lee, Chun-Yi Date: Sat Jan 9 21:16:52 2010 +0800 msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook Suppport standard ec 66/62 command on MSI notebook and nebook. MSI netbook and notebook already support 66/62 command, so, add new get_state function, and put the old model to non-standard model, but driver still support those old model. Signed-off-by: Lee, Chun-Yi Cc: Lennart Poettering Signed-off-by: Greg Kroah-Hartman commit 8e9394ce2412254ec69fd2a4f3e44a66eade2297 Author: Greg Kroah-Hartman Date: Wed Feb 17 10:57:05 2010 -0800 Driver core: create lock/unlock functions for struct device In the future, we are going to be changing the lock type for struct device (once we get the lockdep infrastructure properly worked out) To make that changeover easier, and to possibly burry the lock in a different part of struct device, let's create some functions to lock and unlock a device so that no out-of-core code needs to be changed in the future. This patch creates the device_lock/unlock/trylock() functions, and converts all in-tree users to them. Cc: Thomas Gleixner Cc: Jean Delvare Cc: Dave Young Cc: Ming Lei Cc: Jiri Kosina Cc: Phil Carmody Cc: Arjan van de Ven Cc: Cornelia Huck Cc: Rafael J. Wysocki Cc: Pavel Machek Cc: Len Brown Cc: Magnus Damm Cc: Alan Stern Cc: Randy Dunlap Cc: Stefan Richter Cc: David Brownell Cc: Vegard Nossum Cc: Jesse Barnes Cc: Alex Chiang Cc: Kenji Kaneshige Cc: Andrew Morton Cc: Andrew Patterson Cc: Yu Zhao Cc: Dominik Brodowski Cc: Samuel Ortiz Cc: Wolfram Sang Cc: CHENG Renquan Cc: Oliver Neukum Cc: Frans Pop Cc: David Vrabel Cc: Kay Sievers Cc: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 62e877b893e6350c900d381f353aa62ed48dcc97 Author: Stephen Rothwell Date: Mon Mar 1 20:38:36 2010 +1100 sysfs: fix for thinko with sysfs_bin_attr_init() After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/pci/pci-sysfs.c: In function 'pci_create_legacy_files': drivers/pci/pci-sysfs.c:645: error: lvalue required as unary '&' operand drivers/pci/pci-sysfs.c:658: error: lvalue required as unary '&' operand Caused by commit "sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes" interacting with commit "sysfs: Use one lockdep class per sysfs attribute") both from the driver-core tree. Signed-off-by: Stephen Rothwell Cc: "Eric W. Biederman" Signed-off-by: Greg Kroah-Hartman commit 0f4288ec6fcc1a47d1fa0241ec1c6dacd5a09e96 Author: Eric W. Biederman Date: Fri Feb 12 19:22:28 2010 -0800 sysfs: Kill unused sysfs_sb variable. Now that there are no more users we can remove the sysfs_sb variable. Acked-by: Tejun Heo Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit fac2622bbad4d7e3a32c53e631e018b80ec631dc Author: Eric W. Biederman Date: Fri Feb 12 19:22:27 2010 -0800 sysfs: Pass super_block to sysfs_get_inode Currently sysfs_get_inode magically returns an inode on sysfs_sb. Make the super_block parameter explicit and the code becomes clearer. Acked-by: Tejun Heo Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 2354dcc7218853a6537ec722be40fde9a11c413b Author: Eric W. Biederman Date: Fri Feb 12 19:22:26 2010 -0800 driver core: Use sysfs_rename_link in device_rename Don't open code the renaming of symlinks in sysfs instead use the new helper function sysfs_rename_link Acked-by: Tejun Heo Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 7cb32942d91a501b2df944928ccc9e6590ab237b Author: Eric W. Biederman Date: Fri Feb 12 19:22:25 2010 -0800 sysfs: Implement sysfs_rename_link Because of rename ordering problems we occassionally give false warnings about invalid sysfs operations. So using sysfs_rename create a sysfs_rename_link function that doesn't need strange workarounds. Cc: Benjamin Thery Cc: Daniel Lezcano Acked-by: Serge Hallyn Acked-by: Tejun Heo Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 19c38b632d4554329986021fd66bdea468cf452c Author: Eric W. Biederman Date: Fri Feb 12 19:22:24 2010 -0800 sysfs: Pack sysfs_dirent more tightly. Placing the 16bit s_mode between a pointer and a long doesn't pack well especailly on 64bit where we wast 48 bits. So move s_mode and declare it as a unsigned short. This is the sysfs backing store after all we don't need fields extra large just in case someday we want userspace to be able to use a larger value. Acked-by: Tejun Heo Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit f8d4f618fed5a4978afada52166bc2efaf7656d1 Author: Eric W. Biederman Date: Fri Feb 12 19:22:23 2010 -0800 sysfs: Serialize updates to the vfs inode The vfs depends upon filesystem methods to update the vfs inode. Sysfs adds to the normal number of places where the vfs inode is updated by also updatng the vfs inode in sysfs_refresh_inode. Typically the inode mutex is used to serialize updates to the vfs inode, but grabbing the inode mutex in sysfs_permission and sysfs_getattr causes deadlocks, because sometimes the vfs calls those operations with the inode mutex held. Therefore sysfs can not use the inode mutex to serial updates to the vfs inode. The sysfs_mutex is acquired in all of the routines where sysfs updates the vfs inode, and with a small change we can consistently protext sysfs vfs inode updates with the sysfs_mutex. To protect the sysfs vfs inode updates with the sysfs_mutex simply requires extending the scope of sysfs_mutex in sysfs_setattr over inode_setattr, and over inode_change_ok (so we have an unchanging inode when we perform the check). Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit b35c74dab64f4c212f36d868419108556c9cf3e2 Author: Johannes Berg Date: Sat Feb 20 16:43:02 2010 +0100 sysfs: windfarm: init sysfs attributes This is required for lockdep. Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman commit 361795b1eb7c08e9e65a2ebb4a4e536294d378a2 Author: Eric W. Biederman Date: Fri Feb 12 13:41:56 2010 -0800 sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes A little more whack-a-mole annotating the dynamic sysfs attributes. I had everything built into my earlier test kernel, and so I missed these. Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 35960258ed388cdcebdb71df35fd5126978ca325 Author: Eric W. Biederman Date: Fri Feb 12 04:35:32 2010 -0800 sysfs: Document sysfs_attr_init and sysfs_bin_attr_init I have added a new requirement to the external sysfs interface that dynamically allocated sysfs attributes must call sysfs_attr_init if lockdep is enabled. For the time being callying sysfs_attr_init is only mandatory if lockdep is enabled, so we can live with a few unconverted instances until we find them all. As this is part of the public interface of sysfs it is a good idea to document these pseudo functions so someone inspeciting the code can find out what has happened. Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit a07e4156a2ee6359d31a44946d7ee7f85dbf6bca Author: Eric W. Biederman Date: Thu Feb 11 15:23:05 2010 -0800 sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes These are the non-static sysfs attributes that exist on my test machine. Fix them to use sysfs_attr_init or sysfs_bin_attr_init as appropriate. It simply requires making a sysfs attribute present to see this. So this is a little bit tedious but otherwise not too bad. Signed-off-by: Eric W. Biederman Acked-by: WANG Cong Cc: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 6992f5334995af474c2b58d010d08bc597f0f2fe Author: Eric W. Biederman Date: Thu Feb 11 15:21:53 2010 -0800 sysfs: Use one lockdep class per sysfs attribute. Acknowledge that the logical sysfs rwsem has one instance per sysfs attribute with different locking depencencies for different attributes. There is a sysfs idiom where writing to one sysfs file causes the addition or removal of other sysfs files. Lumping all of the sysfs attributes together in one lock class causes lockdep to generate lots of false positives. This introduces the requirement that non-static sysfs attributes need to be initialized with sysfs_attr_init or sysfs_bin_attr_init. Strictly speaking this requirement only exists when lockdep is enabled, and when lockdep is enabled we get a bit fat warning if this requirement is not met. Signed-off-by: Eric W. Biederman Acked-by: WANG Cong Cc: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit a2db6842873c8e5a70652f278d469128cb52db70 Author: Eric W. Biederman Date: Thu Feb 11 15:20:00 2010 -0800 sysfs: Only take active references on attributes. If we exclude directories and symlinks from the set of sysfs dirents where we need active references we are left with sysfs attributes (binary or not). - Tweak sysfs_deactivate to only do something on attributes - Move lockdep initialization into sysfs_file_add_mode to limit it to just attributes. Signed-off-by: Eric W. Biederman Acked-by: WANG Cong Cc: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit e72ceb8ccac5f770b3e696e09bb673dca7024b20 Author: Eric W. Biederman Date: Thu Feb 11 15:18:38 2010 -0800 sysfs: Remove sysfs_get/put_active_two It turns out that holding an active reference on a directory is pointless. The purpose of the active references are to allows us to block when removing sysfs entries that have custom methods so we don't remove modules while running modular code and to keep those custom methods from accessing data structures after the files have been removed. Further sysfs_remove_dir remove all elements in the directory before removing the directory itself, so there is no chance we will remove a directory with active children. Signed-off-by: Eric W. Biederman Cc: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 3c31f07ad0dab02fe17195d32a965d57fd947707 Author: Ben Hutchings Date: Sun Feb 14 14:18:53 2010 +0000 Driver core: Fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit d6e976c0d258c9547a308bd8a9a82ec93e2bc6e2 Author: Hans J. Koch Date: Wed Feb 10 20:12:42 2010 +0100 UIO: Remove SMX Cryptengine driver Ben Nizette, the author of this driver, told me in a private mail that this project has been cancelled. He suggested to remove the driver for now, and will come back with a new version should the hardware really exist. This patch completely removes the driver. Signed-off-by: Hans J. Koch Acked-by: Ben Nizette Signed-off-by: Greg Kroah-Hartman commit 0a965eb9f69caf0fb331d45556da8bab1c8dcb11 Author: John Ogness Date: Thu Feb 11 15:38:53 2010 +0100 UIO: minor Kconfig fixes Two trivial fixes for the Userspace IO Kconfig file: 1) uio_sercos3 is a PCI driver, so let it depend on PCI. 2) "default n" under UIO_PCI_GENERIC is luxury since it is already the default. Acked-by: John Ogness Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 8f314cfc1259d3f5039b142ce6fdc90367c22d82 Author: Hans J. Koch Date: Tue Feb 9 20:13:49 2010 +0100 UIO: Add a driver for Hilscher netX-based fieldbus cards This patch adds a Userspace IO driver for netX-based fieldbus cards by Hilscher (see http://www.hilscher.com). ATM, cifX and comX cards are supported. The userspace part for this driver is provided by Hilscher and should come with the card. The driver is in use for several months now and has been tested by people at Hilscher and Linutronix. Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 57f1e87523bdb6c39659ead7c0f72eea9e520fbe Author: Uwe Kleine-König Date: Thu Feb 4 20:56:56 2010 +0100 auxdisplay: move cfag12864bfb's probe function to .devinit.text A pointer to cfag12864bfb_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 Acked-by: Miguel Ojeda Cc: Andrew Morton Cc: Avuton Olrich Cc: Antonino Daplas Signed-off-by: Greg Kroah-Hartman commit ea180ca4d6fbeeb8f8bea4a175d2b84b9129b693 Author: Uwe Kleine-König Date: Thu Feb 4 20:56:55 2010 +0100 media: move omap24xxcam's probe function to .devinit.text A pointer to omap24xxcam_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 Acked-by: Sakari Ailus Acked-by: Trilok Soni Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a96b9121862bbd18e00c865d9516e0a98bb135ef Author: Uwe Kleine-König Date: Thu Feb 4 20:56:54 2010 +0100 w1: move omap_hdq's probe function to .devinit.text A pointer to omap_hdq_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: Stanley.Miao Acked-by: Evgeniy Polyakov Cc: Andrew Morton Cc: Madhusudhan Chikkature Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 1139aea97a6325270bda6c86ea1c9711a0c21e33 Author: Uwe Kleine-König Date: Thu Feb 4 20:56:53 2010 +0100 i2c: move i2c_omap's probe function to .devinit.text A pointer to omap_i2c_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: Kalle Jokiniemi Cc: Tony Lindgren Cc: Paul Walmsley Cc: Richard Woodruff Cc: chandra shekhar Cc: Jason P Marini Cc: Syed Mohammed Khasim Cc: Jarkko Nikula Cc: Juha Yrjola Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ea79632d90754409b11388410bbe23b62394401d Author: Uwe Kleine-König Date: Thu Feb 4 20:56:52 2010 +0100 x86: move hp-wmi's probe function to .devinit.text A pointer to hp_wmi_bios_setup 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: Frans Pop Cc: Larry Finger Cc: Len Brown Cc: Helge Deller Cc: Andrew Morton Acked-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b Author: Uwe Kleine-König Date: Thu Feb 4 20:56:51 2010 +0100 platform-drivers: move probe to .devinit.text in drivers/video A pointer to a probe callback 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: Adrian Bunk Cc: Alberto Mardegan Cc: Andrew Morton Cc: Andriy Skulysh Cc: Antonino Daplas Cc: Anton Vorontsov Cc: Ben Dooks Cc: Chandramouli Narayanan Cc: Christoph Hellwig Cc: Frans Pop Cc: Geert Uytterhoeven Cc: Greg Kroah-Hartman Cc: Helge Deller Cc: Huang Ying Cc: Ian Molton Cc: Joshua Kinard Cc: Kaj-Michael Lang Cc: Krzysztof Helt Cc: linux-fbdev-devel@lists.sourceforge.net Cc: Maciej W. Rozycki Cc: Magnus Damm Cc: Martin Michlmayr Cc: Matthias Kaehlcke Cc: Paul Mundt Cc: Pavel Machek Cc: Philipp Zabel Cc: Richard Purdie Cc: Roel Kluin Cc: Roland Stigge Cc: Russell King Cc: Thomas Bogendoerfer Cc: Vincent Sanders Cc: Yoichi Yuasa Acked-by: Ralf Baechle Acked-by: Arnaud Patard Acked-by: James Simmons Acked-by: Peter Jones Acked-by: Jaya Kumar Signed-off-by: Greg Kroah-Hartman commit 1b07193b34c1bc1c184e2d53a62633a73ea9b0a0 Author: Uwe Kleine-König Date: Thu Feb 4 20:56:50 2010 +0100 platform-drivers: move probe to .devinit.text in drivers/scsi A pointer to a probe callback 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 Morton Cc: David Brownell Cc: Dmitri Vorobiev Cc: Henrik Kretzschmar Cc: James Bottomley Cc: Kay Sievers Cc: peter fuerst Cc: Thomas Bogendoerfer Acked-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman commit 91a99dfc6b57f2e956d10d41123234fad3399212 Author: Uwe Kleine-König Date: Thu Feb 4 20:56:49 2010 +0100 platform-drivers: move probe to .devinit.text in arch/arm A pointer to a probe callback 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 Morton Cc: Ben Dooks Cc: Dmitry Baryshkov Cc: Eric Miao Cc: Liam Girdwood Cc: Paul Sokolovsky Cc: Richard Purdie Cc: Russell King Acked-by: Arnaud Patard Acked-by: Dmitry Eremin-Solenikov Acked-by: Kristoffer Ericson Signed-off-by: Greg Kroah-Hartman commit 831fad2f75f0d7bfc339de81173e7068a3c72276 Author: Uwe Kleine-König Date: Tue Jan 26 09:35:00 2010 +0100 Driver core: make struct platform_driver.id_table const This fixes a warning on several pxa based machines: arch/arm/mach-pxa/ssp.c:475: warning: initialization discards qualifiers from pointer target type Signed-off-by: Uwe Kleine-König Acked-by: Vikram Dhillon Acked-by: Eric Miao Signed-off-by: Greg Kroah-Hartman commit 52cf25d0ab7f78eeecc59ac652ed5090f69b619e Author: Emese Revfy Date: Tue Jan 19 02:58:23 2010 +0100 Driver core: Constify struct sysfs_ops in struct kobj_type Constify struct sysfs_ops. This is part of the ops structure constification effort started by Arjan van de Ven et al. Benefits of this constification: * prevents modification of data that is shared (referenced) by many other structure instances at runtime * detects/prevents accidental (but not intentional) modification attempts on archs that enforce read-only kernel data at runtime * potentially better optimized code as the compiler can assume that the const data cannot be changed * the compiler/linker move const data into .rodata and therefore exclude them from false sharing Signed-off-by: Emese Revfy Acked-by: David Teigland Acked-by: Matt Domsch Acked-by: Maciej Sosnowski Acked-by: Hans J. Koch Acked-by: Pekka Enberg Acked-by: Jens Axboe Acked-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 6c1733aca0b48db4d0e660d54976a1cca25b5eaf Author: Greg Kroah-Hartman Date: Thu Jan 21 15:07:59 2010 -0800 sysdev: fix up the probe/release attributes These should be sysdev attributes, not class attributes. This patch should resolve the problem. Thanks to Stephen Rothwell for pointing out the problem. Reported-by: Stephen Rothwell Cc: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit c607cf0c20903f22919c187d1db4f3256c58f0c5 Author: Stefan Richter Date: Fri Jan 15 13:23:51 2010 +0100 HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) One of the roles which -mm fulfilled some time ago (to offer an integration testing ground) has been taken over by -next. This is still news to Documentation/HOWTO, so mention it there. Also add a word on how patchwork is used to track patches as they make their way into subsystem trees. Remove some arbitrary links to subsystem repositories; they can all be found in the MAINTAINERS database. Acked-by: Randy Dunlap Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit 9cd43611ccfb46632bfa7d19f688924ea93f1613 Author: Emese Revfy Date: Thu Dec 31 14:52:51 2009 +0100 kobject: Constify struct kset_uevent_ops Constify struct kset_uevent_ops. This is part of the ops structure constification effort started by Arjan van de Ven et al. Benefits of this constification: * prevents modification of data that is shared (referenced) by many other structure instances at runtime * detects/prevents accidental (but not intentional) modification attempts on archs that enforce read-only kernel data at runtime * potentially better optimized code as the compiler can assume that the const data cannot be changed * the compiler/linker move const data into .rodata and therefore exclude them from false sharing Signed-off-by: Emese Revfy Signed-off-by: Greg Kroah-Hartman commit 985fc176a6c03836454629be2f2a611ccc7c7002 Author: Luis R. Rodriguez Date: Wed Jan 13 21:18:15 2010 -0500 driver-core: firmware_class: remove base.h header inclusion base.h is used by base drivers for sharing internal structures. Turns out firmware_class does not depend on it at all so remove it. Cc: Johannes Berg Signed-off-by: Luis R. Rodriguez Acked-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman commit 1e5289c97bba2d8ee7239a416bc3f28743362cd9 Author: Eric W. Biederman Date: Fri Jan 1 14:43:53 2010 -0800 sysfs: Cache the last sysfs_dirent to improve readdir scalability v2 When sysfs_readdir stops short we now cache the next sysfs_dirent to return to user space in filp->private_data. There is no impact on the rest of sysfs by doing this and in the common case it allows us to pick up exactly where we left off with no seeking. Additionally I drop and regrab the sysfs_mutex around filldir to avoid a page fault abritrarily increasing the hold time on the sysfs_mutex. v2: Returned to using INT_MAX as the EOF condition. seekdir is ambiguous unless all directory entries have a unique f_pos value. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14949 Signed-off-by: Eric W. Biederman Cc: Linus Torvalds Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3f5468c9ae293cbca43e4ffe6ca3b3235189042a Author: Kay Sievers Date: Thu Jan 14 22:54:37 2010 +0100 Driver-Core: require valid action string in uevent trigger No longer fall back to "add" and warn, but always require a valid action-string written to the "uevent" file. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7934779a69f1184f29d786b89e77dd14519bd226 Author: Kay Sievers Date: Thu Jan 14 22:49:39 2010 +0100 Driver-Core: disable /sbin/hotplug by default No recent mainstream system uses the /sbin/hotplug fork-bomb any more. Disable it by default to reflect how it is used these days. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 4237e5fd3e07da268029cd4862cf551d9a74e33f Author: Kay Sievers Date: Thu Jan 14 22:47:57 2010 +0100 Driver-Core: devtmpfs - remove EXPERIMENTAL and flush out the description All major distros enable devtmpfs on recent systems, so remove the EXPERIMENTAL flag, and make the description a bit more instructive. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 5e31d76f2817bd50258a092a7c5b15b3006fd61c Author: Kay Sievers Date: Wed Jan 13 14:16:36 2010 +0100 Driver-Core: devtmpfs - reset inode permissions before unlinking Before unlinking the inode, reset the current permissions of possible references like hardlinks, so granted permissions can not be retained across the device lifetime by creating hardlinks, in the unusual case that there is a user-writable directory on the same filesystem. Signed-off-by: Kay Sievers Cc: stable Signed-off-by: Greg Kroah-Hartman commit 0933e2d98d1b170ef62d48e18157f5dc43b58217 Author: Andi Kleen Date: Tue Jan 5 12:48:09 2010 +0100 driver core: Convert some drivers to CLASS_ATTR_STRING Convert some drivers who export a single string as class attribute to the new class_attr_string functions. This removes redundant code all over. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 869dfc875e32fd832385fd52ce54525a10401ed6 Author: Andi Kleen Date: Tue Jan 5 12:48:08 2010 +0100 driver core: Add class_attr_string for simple read-only string Several drivers just export a static string as class attributes. Use the new extensible attribute support to define a simple CLASS_ATTR_STRING() macro for this. This will allow to remove code from drivers in followon patches. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 28812fe11a21826ba4c97c6c7971a619987cd912 Author: Andi Kleen Date: Tue Jan 5 12:48:07 2010 +0100 driver-core: Add attribute argument to class_attribute show/store Passing the attribute to the low level IO functions allows all kinds of cleanups, by sharing low level IO code without requiring an own function for every piece of data. Also drivers can extend the attributes with own data fields and use that in the low level function. This makes the class attributes the same as sysdev_class attributes and plain attributes. This will allow further cleanups in drivers. Full tree sweep converting all users. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 5fbcae57db69128c14080a7a5a42d0626bfe155c Author: Heiko Carstens Date: Fri Feb 12 11:19:24 2010 +0100 sysdev: fix missing s390 conversion In linux-next "sysdev: Pass attribute in sysdev_class attributes show/store" forgot to convert one place in s390 code. Here is the missing part. Cc: Andi Kleen Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman commit 8564a6c140317de04a71eb203bdbb58845d69f9c Author: Andi Kleen Date: Tue Jan 5 12:48:06 2010 +0100 sysdev: Fix type of sysdev class attribute in memory driver This attribute is really a sysdev_class attribute, not a plain class attribute. They are identical in layout currently, but this might not always be the case. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 1e395ab3d9b6aa09c5f0aa46a1b0a6fc5bd33133 Author: Andi Kleen Date: Tue Jan 5 12:48:05 2010 +0100 sysdev: Add sysdev_create/remove_files Allow to create/remove arrays of sysdev attributes Just wrappers around sysfs_create/move_files Will be used later to clean up some drivers. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 3701cde6e35245e26f63252f46c62e8a790fa996 Author: Andi Kleen Date: Tue Jan 5 12:48:04 2010 +0100 sysdev: Use sysdev_class attribute arrays in node driver Convert the node driver to sysdev_class attribute arrays. This greatly cleans up the code and remove a lot of code. Saves ~150 bytes of code on x86-64. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit e1a7e29a266ba3313a873d302b352521403bd155 Author: Andi Kleen Date: Tue Jan 5 12:48:03 2010 +0100 sysdev: Convert node driver Use sysdev_class attribute arrays in node driver Convert the node driver to sysdev_class attribute arrays. This greatly cleans up the code and remove a lot of code. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 38457ab3a0d36320370c715145ba6da514127194 Author: Andi Kleen Date: Tue Jan 5 12:48:02 2010 +0100 sysfs: Add attribute array to sysdev classes Add a attribute array that is automatically registered and unregistered to struct sysdev_class. This is similar to what struct class has. A lot of drivers add list of attributes, so it's better to do this easily in the common sysdev layer. This adds a new field to struct sysdev_class. I audited the whole tree and there are no dynamically allocated sysdev classes, so this is fully compatible. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 1c205ae18db53ff72985dd79f3baaf2dbaba6db7 Author: Andi Kleen Date: Tue Jan 5 12:48:01 2010 +0100 sysfs: Add sysfs_add/remove_files utility functions Adding/Removing a whole array of attributes is very common. Add a standard utility function to do this with a simple function call, instead of requiring drivers to open code this. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 265d2e2e31c5f6dc1b20ae1653a17fdba706f79e Author: Andi Kleen Date: Tue Jan 5 12:48:00 2010 +0100 sysdev: Convert cpu driver sysdev class attributes Using the new attribute argument convert the cpu driver class attributes to carry the node state. Then use a shared function to do what a lot of individual functions did before. This eliminates an ugly macro. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit b15f562fc2f5429f27e5dfb0b0ee5ec44f661986 Author: Andi Kleen Date: Tue Jan 5 12:47:59 2010 +0100 sysdev: Convert node driver class attributes to be data driven Using the new attribute argument convert the node driver class attributes to carry the node state. Then use a shared function to do what a lot of individual functions did before. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit c9be0a36f9bf392a7984473124a67a12964df11f Author: Andi Kleen Date: Tue Jan 5 12:47:58 2010 +0100 sysdev: Pass attribute in sysdev_class attributes show/store Passing the attribute to the low level IO functions allows all kinds of cleanups, by sharing low level IO code without requiring an own function for every piece of data. Also drivers can extend the attributes with own data fields and use that in the low level function. Similar to sysdev_attributes and normal attributes. This is a tree-wide sweep, converting everything in one go. No functional changes in this patch other than passing the new argument everywhere. Tested on x86, the non x86 parts are uncompiled. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 3d03ba4d1dd2246adff5a9ff1194a539b3bc05a7 Author: Eric Miao Date: Fri Jan 1 15:43:28 2010 +0800 driver core: make platform_device_id table const The platform ID table is normally const, force that by adding the attribute. Signed-off-by: Eric Miao Signed-off-by: Greg Kroah-Hartman commit ecdf6ceb8cf4756bd4214bf9755755752b6015f5 Author: Dmitry Torokhov Date: Tue Dec 29 20:11:20 2009 -0800 Driver core: add platform_create_bundle() helper Many legacy-style module create singleton platform devices themselves, along with corresponding platform driver. Instead of replicating error handling code in all such drivers, provide a helper that allocates and registers a single platform device and a driver and binds them together. Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 20ef9f46a9abe3c25d9f2834f6cc86bfab46d609 Author: Radu Voicilas Date: Sat Dec 12 01:06:10 2009 -0800 kset-example: Spelling fixes. No change in functionality. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit a115bc070b1fc57ab23f3972401425927b5b465c Author: Radu Voicilas Date: Sat Dec 12 01:06:09 2009 -0800 kobject-example: Spelling fixes. No change in functionality. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 77d3d7c1d561f49f755d7390f0764dff90765974 Author: Tejun Heo Date: Fri Feb 5 17:57:02 2010 +0900 driver-core: fix race condition in get_device_parent() sysfs is creating several devices in cuse class concurrently and with CONFIG_SYSFS_DEPRECATED turned off, it triggers the following oops. BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 IP: [] sysfs_addrm_start+0x4a/0xf0 PGD 75bb067 PUD 75be067 PMD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/devices/system/cpu/cpu7/topology/core_siblings CPU 1 Modules linked in: cuse fuse Pid: 4737, comm: osspd Not tainted 2.6.31-work #77 RIP: 0010:[] [] sysfs_addrm_start+0x4a/0xf0 RSP: 0018:ffff88000042f8f8 EFLAGS: 00010296 RAX: ffff88000042ffd8 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff880007eef660 RDI: 0000000000000001 RBP: ffff88000042f918 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000001 R11: ffffffff81158b0a R12: ffff88000042f928 R13: 00000000fffffff4 R14: 0000000000000000 R15: ffff88000042f9a0 FS: 00007fe93905a950(0000) GS:ffff880008600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000038 CR3: 00000000077c9000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process osspd (pid: 4737, threadinfo ffff88000042e000, task ffff880007eef040) Stack: ffff880005da10e8 0000000011cc8d6e ffff88000042f928 ffff880003d28a28 <0> ffff88000042f988 ffffffff811592d7 0000000000000000 0000000000000000 <0> 0000000000000000 0000000000000000 ffff88000042f958 0000000011cc8d6e Call Trace: [] create_dir+0x67/0xe0 [] sysfs_create_dir+0x58/0xb0 [] ? kobject_add_internal+0xcc/0x220 [] ? vsnprintf+0x3c1/0xb90 [] kobject_add_internal+0x107/0x220 [] kobject_add_varg+0x47/0x80 [] kobject_add+0x53/0x90 [] device_add+0xd4/0x690 [] ? dev_set_name+0x4b/0x70 [] cuse_process_init_reply+0x2b4/0x420 [cuse] ... The problem is that kobject_add_internal() first adds a kobject to the kset and then try to create sysfs directory for it. If the creation fails, it remove the kobject from the kset. get_device_parent() accesses class_dirs kset while only holding class_dirs.list_lock to see whether the cuse class dir exists. But when it exists, it may not have finished initialization yet or may fail and get removed soon. In the above case, the former happened so the second one ends up trying to create subdirectory under NULL sysfs_dirent. Fix it by grabbing a mutex in get_device_parent(). Signed-off-by: Tejun Heo Reported-by: Colin Guthrie Cc: stable Signed-off-by: Greg Kroah-Hartman commit 25cf84cf377c0aae5dbcf937ea89bc7893db5176 Merge: 322aafa 335a64a5c Author: Linus Torvalds Date: Sun Mar 7 16:04:03 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console * git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console: virtio: console: Use better variable names for fill_queue operation virtio: console: Fix type of 'len' as unsigned int commit 322aafa6645a48c3b7837ca7385f126ab78127fd Merge: dd04265 c7bbf52 Author: Linus Torvalds Date: Sun Mar 7 15:59:39 2010 -0800 Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) x86, mrst: Fix whitespace breakage in apb_timer.c x86, mrst: Fix APB timer per cpu clockevent x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC x86, olpc: Use pci subarch init for OLPC x86, pci: Add arch_init to x86_init abstraction x86, mrst: Add Kconfig dependencies for Moorestown x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI x86, pci: Add sanity check for PCI fixed bar probing x86, legacy_irq: Remove duplicate vector assigment x86, legacy_irq: Remove left over nr_legacy_irqs x86, mrst: Platform clock setup code x86, apbt: Moorestown APB system timer driver x86, mrst: Add vrtc platform data setup code x86, mrst: Add platform timer info parsing code x86, mrst: Fill in PCI functions in x86_init layer x86, mrst: Add dummy legacy pic to platform setup x86/PCI: Moorestown PCI support x86, ioapic: Add dummy ioapic functions x86, ioapic: Early enable ioapic for timer irq ... Fixed up semantic conflict of new clocksources due to commit 17622339af25 ("clocksource: add argument to resume callback"). commit dd04265b028c00c365a78f9ff78a05e217f98656 Merge: 6dc3eb5 3f4ae86 Author: Linus Torvalds Date: Sun Mar 7 15:56:25 2010 -0800 Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c: Add support for Xilinx XPS IIC Bus Interface i2c: omap: Add support for 16-bit registers i2c-pnx: fix setting start/stop condition powerpc: doc/dts-bindings: update doc of FSL I2C bindings i2c-mpc: add support for the MPC512x processors from Freescale i2c-mpc: rename "setclock" initialization functions to "setup" i2c-mpc: use __devinit[data] for initialization functions and data i2c/imx: don't add probe function to the driver struct i2c: Add support for Ux500/Nomadik I2C controller commit 6dc3eb5c1f96641cda7056aa34393e317076d6cf Merge: 8fe900b 2c08583 Author: Linus Torvalds Date: Sun Mar 7 15:56:04 2010 -0800 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (66 commits) mfd: Fix ucb1x00 build failure for collie_defconfig mfd: Fix lpc_sch related depends/selects, fix build error gpio: Fix sch_gpio warning gpio: add Intel SCH GPIO controller driver i2c: convert i2c-isch to platform_device mfd: Use completion interrupt for WM831x AUXADC mfd: Use completion interrupt for WM835x AUXADC mfd: Introduce remove_script function for twl4030 mfd/mmc: SDHI Kconfig update mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support gpiolib: Force wm831x GPIOs into GPIO mode when requested mfd: Add WM831x revision B support gpiolib: Correct debugfs display of WM831x GPIO inversion gpiolib: Actually set output state in wm831x_gpio_direction_output() tmio_mmc: Balance cell enable()/disable() calls tmio_mmc: Remove const from platform data V3 tmio_mmc: Use 100ms mmc_detect_change() delay tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2 tmio_mmc: Keep card-detect interrupts enabled mfd: Add twl6030 base addr for ID0, ID1, ID2 ... commit 8fe900b8c7aa6a307e552ff776e0c04c28dcf9c8 Merge: 138860b a71b676 Author: Linus Torvalds Date: Sun Mar 7 15:49:12 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (368 commits) Staging: winbond: fix up wireless api errors Staging: dream: camera: sk5k3e2fx: fix code style issues Staging: dream: camera: msm_camera: fix code style issues Staging: wlan-ng: More checkpatch.pl error cleanups Staging: wlan-ng - checkpatch.pl fixups Staging: comedi: comedi_fops.c: Checkpatch cleanup Staging: comedi: fix suspect code indent in ni_labpc.c Staging: comedi: fix yet another brace coding style issue in ni_labpc.c Staging: comedi: fix another brace coding style issues in ni_labpc.c Staging: comedi: fix brace coding style issue in ni_labpc.c Staging: comedi: poc: Adding some KERN_ facility level Staging: dream: camera: msm_camera: fix some code style issues Staging: wlan-ng: fix most of the style issues in hfa384x.h Staging: dream: camera: msm_camera: fix coding style issues Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c Staging: comedi: fix bracing coding style issue in ni_65xx.c Staging: comedi: pcmad: Checkpatch cleanups Staging: comedi: poc: fix coding style issues staging: dt3155: revert u_long to u64 usage Staging: comedi: drivers.c: Checkpatch cleanup ... commit 138860b95359feee49a31fb12be87825e4cd84ac Author: Randy Dunlap Date: Thu Mar 4 09:37:12 2010 -0800 seq_file: fix new kernel-doc warnings Fix kernel-doc notation in new seq-file functions and correct spelling. Signed-off-by: Randy Dunlap Cc: Li Zefan Cc: Alexander Viro Signed-off-by: Linus Torvalds commit 4a31c08d2fecc74a630653828f5388fbb037f8c2 Merge: 2ddb3b1 0272282 Author: Linus Torvalds Date: Sun Mar 7 15:47:19 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits) sh: Convert sh to use read/update_persistent_clock sh: Move PMB debugfs entry initialization to later stage sh: Fix up flush_cache_vmap() on SMP. sh: fix up MMU reset with variable PMB mapping sizes. sh: establish PMB mappings for NUMA nodes. sh: check for existing mappings for bolted PMB entries. sh: fixed virt/phys mapping helpers for PMB. sh: make pmb iomapping configurable. sh: reworked dynamic PMB mapping. sh: Fix up cpumask_of_pcibus() for the NUMA build. serial: sh-sci: Tidy up build warnings. sh: Fix up ctrl_read/write stragglers in migor setup. serial: sh-sci: Add DMA support. dmaengine: shdma: extend .device_terminate_all() to record partial transfer sh: merge sh7722 and sh7724 DMA register definitions sh: activate runtime PM for dmaengine on sh7722 and sh7724 dmaengine: shdma: add runtime PM support. dmaengine: shdma: separate DMA headers. dmaengine: shdma: convert to platform device resources dmaengine: shdma: fix DMA error handling. ... commit 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 Merge: 5980bb3 6ee7765 Author: Linus Torvalds Date: Sun Mar 7 15:45:53 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: use __ratelimit in unaligned.c parisc: Convert to read/update_persistent_clock parisc: Simplify param.h by including parisc: drop unnecessary cast in __ldcw_align() macro parisc: add strict copy size checks (v2) parisc: remove trailing space in messages parisc: ditto sys_accept4 parisc: wire up sys_recvmmsg commit 5980bb3ee6e733d66eea04c221a140dea15d52de Merge: 68ae6b5 d690b2c Author: Linus Torvalds Date: Sun Mar 7 15:45:35 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM: Provide generic subsystem-level callbacks PM / Runtime: Document power.runtime_auto and related functions commit 68ae6b5cc1e8b88754a64140b88e467e02abfea2 Merge: 08b8499 bc505f3 Author: Linus Torvalds Date: Sun Mar 7 15:38:23 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: set pci bus master enable bit commit 10cc2b50eb4b01ca4dc014af2094d28b4ebe20d7 Author: Herbert Xu Date: Fri Mar 5 21:03:35 2010 +0000 bridge: Fix RCU race in br_multicast_stop Thanks to Paul McKenny for pointing out that it is incorrect to use synchronize_rcu_bh to ensure that pending callbacks have completed. Instead we should use rcu_barrier_bh. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 49f5fcfd4ac3df24aa66520e1c5f37db5dfa8c10 Author: Herbert Xu Date: Fri Mar 5 21:07:39 2010 +0000 bridge: Use RCU list primitive in __br_mdb_ip_get As Paul McKenney correctly pointed out, __br_mdb_ip_get needs to use the RCU list walking primitive in order to work correctly on platforms where data-dependency ordering is not guaranteed. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0c9a2ac1f8a2e55b3382dfc27256878a58ea49e9 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Mar 7 00:14:44 2010 +0000 ipv6: Optmize translation between IPV6_PREFER_SRC_xxx and RT6_LOOKUP_F_xxx. IPV6_PREFER_SRC_xxx definitions: | #define IPV6_PREFER_SRC_TMP 0x0001 | #define IPV6_PREFER_SRC_PUBLIC 0x0002 | #define IPV6_PREFER_SRC_COA 0x0004 RT6_LOOKUP_F_xxx definitions: | #define RT6_LOOKUP_F_SRCPREF_TMP 0x00000008 | #define RT6_LOOKUP_F_SRCPREF_PUBLIC 0x00000010 | #define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 So, we can translate between these two groups by shift operation instead of multiple 'if's. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 25dc27d17dc868aae78fd03bef3113cf586b12e5 Author: Florian Fainelli Date: Sun Mar 7 00:55:50 2010 +0000 cpmac: bump version to 0.5.2 Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 9fba1c31f4f3f9f860a4afee0b409cde27d06741 Author: Florian Fainelli Date: Sun Mar 7 00:55:47 2010 +0000 cpmac: fallback to switch mode if no PHY chip found If we were unable to detect a PHY on any of the MDIO bus id we tried instead of bailing out with -ENODEV, assume the MAC is connected to a switch and use MDIO bus 0. This unbreaks quite a lot of devices out there whose switch cannot be detected. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 30765d0502905a9248e5de72fc7ac83c23422861 Author: Florian Fainelli Date: Sun Mar 7 00:55:26 2010 +0000 cpmac: fix the receiving of 802.1q frames Despite what the comment above CPMAC_SKB_SIZE says, the hardware also needs to account for the FCS length in a received frame. This patch fix the receiving of 802.1q frames which have 4 more bytes. While at it unhardcode the definition and use the one from if_vlan.h. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 8d15d3864a733476931f7e0b3d82824cddc766c2 Author: Oliver Hartkopp Date: Sat Mar 6 08:31:50 2010 +0000 MAINTAINER: Correct CAN Maintainer responsibilities and paths Update the CAN Maintainer responsibilities and add source paths. Additional the SocketCAN core ML is not subscribers-only anymore. Signed-off-by: Oliver Hartkopp Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit e7111eac8ebda724d1e4d9e6aaf4569744a584d5 Author: Petko Manolov Date: Sun Mar 7 06:10:01 2010 +0000 another pegasus usb net device This one removes trailing whitespace in pegasus.h and more importantly adds new Pegasus compatible device. Signed-off-by: Julian Brown Signed-off-by: Petko Manolov Signed-off-by: David S. Miller commit 0e2b807234c42fab59f98ec913db30dfda0e63a7 Author: Dan Carpenter Date: Sun Mar 7 02:35:42 2010 +0000 irda-usb: add error handling and fix leak If the call to kcalloc() fails then we should return -ENOMEM. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 72150e9b7fec217fbd646a29ea2f65a3d4d55ea9 Author: Dan Carpenter Date: Sat Mar 6 01:04:45 2010 +0000 sock.c: potential null dereference We test that "prot->rsk_prot" is non-null right before we dereference it on this line. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit ea3fb371b2a391958670f2a65e1203f7dba61671 Author: Dan Carpenter Date: Sat Mar 6 01:11:38 2010 +0000 ems_usb: cleanup: remove uneeded check "skb" is alway non-null here, but even if it were null the check isn't needed because dev_kfree_skb() can handle it. This eliminates a smatch warning about dereferencing a variable before checking that it is non-null. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 02a780c014c40973cbe71d04cec7a24e6629995f Author: Dan Carpenter Date: Sat Mar 6 01:14:09 2010 +0000 bridge: cleanup: remove unneed check We dereference "port" on the lines immediately before and immediately after the test so port should hopefully never be null here. Signed-off-by: Dan Carpenter Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b96b894c518bc7399e6b86b635b5e8cd7356a8e9 Author: Figo.zhang Date: Fri Mar 5 16:36:02 2010 +0000 fix a race in ks8695_poll fix a race at the end of NAPI processing in ks8695_poll() function. Signed-off-by:Figo.zhang Signed-off-by: David S. Miller commit 3b05007e43ea629394e89ea0b023d7b15375a2bb Merge: f9fed7c 41f23a0 Author: Ben Dooks Date: Sun Mar 7 22:56:19 2010 +0000 ARM: Merge next-samsung-s3c2443-clock Merge branch 'next-samsung-s3c2443-clock' into next-samsung commit 41f23a09f32124322dc41bea7f65baff6e9b0ac5 Author: Ben Dooks Date: Sat Jan 30 11:14:14 2010 +0200 ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock Add set_rate and round_rate calls to armdiv for future use with cpu frequency scaling. Signed-off-by: Ben Dooks commit 71ed587d4a5d377ef5a6917043543ff949ff7dcf Author: Ben Dooks Date: Sat Jan 30 10:49:15 2010 +0200 ARM: S3C2443: Remove #if 0 for clk_mpll The clk_mpll has long been moved into common clock code, remove the code completely instead of the nasty #if 0 block. Signed-off-by: Ben Dooks commit 2dd5f181420ae8ea1cb976b81ed87517f0d4fcd7 Author: Ben Dooks Date: Sat Jan 30 10:46:52 2010 +0200 ARM: S3C2443: Update notes on MPLLREF clock Add note on MPLLREF clock source and why it cannot be easily removed. Signed-off-by: Ben Dooks commit 4bed36b2c5b3248ae6f9aaf5194fbe85153e4026 Author: Ben Dooks Date: Sat Jan 30 10:25:49 2010 +0200 ARM: S3C2443: Further clksrc-clk conversions Move more of the core clocks that where left over from the last commit as they are much more core to the system operation. This should allow for easier tracking of any problems. Signed-off-by: Ben Dooks commit 9aa753c4422492547a190df8a3b6a56282669f9b Author: Ben Dooks Date: Sat Jan 30 09:19:59 2010 +0200 ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation The S3C2443 clock code could easily make use of the clksrc implementation in plat-samsung for many of the clocks. Make the clocks that easily move to clksrc-clk over, update any initialisation and remove the old register definitions from the header file (it is only being used once). Signed-off-by: Ben Dooks commit f9fed7cd7efaa0d050f21f6f9ed532d3143b7369 Author: Mark Brown Date: Mon Mar 1 18:51:42 2010 +0000 USB: Fix s3c-hsotg build following Samsung platform header moves Fix a reference to regs-sys.h got missed in the reorganisation of the Samsung platform headers targetted for 2.6.34. Signed-off-by: Mark Brown Acked-by: Greg Kroah-Hartman Signed-off-by: Ben Dooks commit 0ea5357f2e02aa3741daddf71dd8b2f3b313db74 Author: Mark Brown Date: Fri Mar 5 10:47:23 2010 +0000 ARM: S3C64XX: Reintroduce unconditional build of audio device Ben Dooks' commit cf9814eb (ARM: S3C64XX: Make audio device code built unconditionally) made the struct devices for the audio blocks in the S3C64xx series processors be built unconditionally but this change seems to have gone AWOL in the various Samsung platform moves this release cycle, causing link failures with machine drivers that rely on it. Reintroduce the change. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 3f4ae8605261e6f71e721e026bc18cb1851a7276 Merge: 2086f84 e1d5b65 Author: Ben Dooks Date: Sun Mar 7 22:29:28 2010 +0000 Merge branch 'next-i2c-xilinx' into next-i2c commit 2086f848e0f7bd71d49a92c6acb127e3bf766907 Merge: aaa02ab d84d3ea Author: Ben Dooks Date: Sun Mar 7 22:29:21 2010 +0000 Merge branch 'next-i2c-omap' into next-i2c commit aaa02ab55796341e713f798c57c5099153869278 Merge: ad0194e 192505b Author: Ben Dooks Date: Sun Mar 7 22:29:13 2010 +0000 Merge branch 'next-i2c-mpc-v8' into next-i2c commit e1d5b6598cdc33257fe68302ae9db81d2f7bb883 Author: Richard Röjfors Date: Thu Feb 11 10:42:00 2010 +0100 i2c: Add support for Xilinx XPS IIC Bus Interface This patch adds support for the Xilinx XPS IIC Bus Interface. The driver uses the dynamic mode, supporting to put several I2C messages in the FIFO to reduce the number of interrupts. It has the same feature as ocores, it can be passed a list of devices that will be added when the bus is probed. Signed-off-by: Richard Röjfors Signed-off-by: Ben Dooks commit d84d3ea317ce0db89ce0903b4037f800c5d4c477 Author: Cory Maccarrone Date: Sat Dec 12 17:54:02 2009 -0800 i2c: omap: Add support for 16-bit registers The current i2c-omap driver is set up for 32-bit registers, which corresponds to most OMAP devices. However, OMAP730/850 based devices use a 16-bit register size. This change modifies the driver to perform a runtime CPU type check to determine the register sizes, and uses a bit shift of either 1 or 2 bits to compute the proper register sizes for all registers. Signed-off-by: Cory Maccarrone Acked-by: Tony Lindgren Signed-off-by: Ben Dooks commit ad0194e8d624df67a970a36e8ef9e61514e25553 Author: Luotao Fu Date: Mon Mar 1 13:24:24 2010 +0100 i2c-pnx: fix setting start/stop condition The start/stop condtions are set in different places repetedly in the i2c-pnx driver. Beside in i2c_pnx_start and i2c_pnx_stop the start/stop bit are also set during the transfer of a i2c message in the master_xmit/rcv calls. This is wrong since we can't set the start/stop condition during the transaction of a single message any way. As a matter of fact, the driver will sometimes set both the start and the stop bits at one time. This can be easily reproduced by sending a simple read request like e.g struct i2c_msg msgs[] = { { addr, 0, 1, buf }, { addr, I2C_M_RD, offset, buf } }; While processing the first message the i2c_pnx_master_xmit will set both the start_bit and the stop_bit, which will eventually confuse the slave. Fixed by remove setting start/stop condition from the transmit routines. Signed-off-by: Luotao Fu Signed-off-by: Ben Dooks commit 192505bdb4e43ecbd11627bc0e205875edba473c Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:20 2010 +0100 powerpc: doc/dts-bindings: update doc of FSL I2C bindings This patch adds the MPC5121 to the list of supported devices, enhances the doc of the "clock-frequency" property and removes the obsolete "cell-index", "device_type" and "fsl-i2c" property. Furthermore an example for the MPC5121 has been added. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: Ben Dooks commit f00d738f04899534e2c372b2ad8b670050a945e2 Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:19 2010 +0100 i2c-mpc: add support for the MPC512x processors from Freescale As I2C interrupts must be enabled for the MPC512x by the setup function as well, "fsl,preserve-clocking" is handled in a slighly different way. Also, the old settings are now reported calling dev_dbg(). For the MPC512x the clock setup function of the MPC52xx can be re-used. Furthermore, the Kconfig help has been updated and corrected. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: Ben Dooks commit a93522116ee5aa13eeb74c0fd73d8c5d15211e64 Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:18 2010 +0100 i2c-mpc: rename "setclock" initialization functions to "setup" To prepare support for the MPC512x processors from Freescale the "setclock" initialization functions have been renamed to "setup" because I2C interrupts must be enabled for the MPC512x by this function as well. Signed-off-by: Wolfgang Grandegger Acked-by: Wolfram Sang Signed-off-by: Ben Dooks commit 6e56dd3d0e1e899a824c247aa72bc4250ce7668a Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:17 2010 +0100 i2c-mpc: use __devinit[data] for initialization functions and data "__devinit[data]" has not yet been used for all initialization functions and data. To avoid truncating lines, the struct "mpc_i2c_match_data" has been renamed to "mpc_i2c_data", which is even the better name. Signed-off-by: Wolfgang Grandegger Tested-by: Wolfram Sang Signed-off-by: Ben Dooks commit 96eb7164e3c2f8c1b53118078e5c06f7c34c2d49 Author: Uwe Kleine-König Date: Mon Feb 1 15:57:25 2010 +0100 i2c/imx: don't add probe function to the driver struct Having a pointer to the probe function is unnecessary when using platform_driver_probe and yields a section mismatch warning after removing the white list entry "*driver" for { .data$, .data.rel$ } -> { .init.* } mismatches in modpost. Signed-off-by: Uwe Kleine-König Signed-off-by: Ben Dooks commit 3f9900f17cdb0366d234c0487df80a6b0d18c852 Author: srinidhi kasagar Date: Mon Feb 1 19:44:54 2010 +0530 i2c: Add support for Ux500/Nomadik I2C controller This adds support for ST-Ericsson's I2C block found in Ux500 and Nomadik 8815 platforms. Signed-off-by: srinidhi kasagar Acked-by: Andrea Gallo Acked-by: Linus Walleij Reviewed-by: Linus Walleij Signed-off-by: Ben Dooks commit 2c08583c6a6b4c5f5dea4cb0931eca82af7db6fe Author: Peter Huewe Date: Sat Mar 6 14:36:38 2010 +0100 mfd: Fix ucb1x00 build failure for collie_defconfig This patch fixes a build failure[1], by adding the missing semaphore.h include References: [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2234322/ Signed-off-by: Peter Huewe Signed-off-by: Samuel Ortiz commit 860fb8c134ebca9be8bc2ddd2b13e19ac10c192e Author: Randy Dunlap Date: Fri Mar 5 09:43:06 2010 -0800 mfd: Fix lpc_sch related depends/selects, fix build error LPC_SCH is selected by GPI_SCH and I2C_ISCH, even when PCI is not enabled, but LPC_SCH depends on PCI, so make GPI_SCH and I2C_ISCH also depend on PCI. Those 2 selects also need to select what LPC_SCH selects, since kconfig does not follow selects. Signed-off-by: Randy Dunlap Cc: Denis Turischev Signed-off-by: Samuel Ortiz commit 8e7aafe41be2a7cd5c181ed68876e9ec55ccdba7 Author: Samuel Ortiz Date: Fri Mar 5 17:14:01 2010 +0100 gpio: Fix sch_gpio warning We need to check for gpiochip_remove() errors. Signed-off-by: Samuel Ortiz commit be9b06b2d80fe661491138c6993f944babb26260 Author: Denis Turischev Date: Tue Mar 2 10:48:55 2010 +0100 gpio: add Intel SCH GPIO controller driver Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit fd46a0064af171c90664e5b7165c0c9f94478a87 Author: Denis Turischev Date: Mon Mar 1 18:59:55 2010 +0200 i2c: convert i2c-isch to platform_device Convert i2c-isch to platform_device for the lpc mfd core to add it at probe time. Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit 473fe73650b9f92114edbedfbb616561c1a0026c Author: Mark Brown Date: Tue Feb 23 11:08:06 2010 +0000 mfd: Use completion interrupt for WM831x AUXADC Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the status of the AUXADC if we don't get a completion, mostly for systems that don't have the WM831x interrupt infrastructure hooked up. Also reduce the timeout for completion of conversions to 5ms from the previous 10ms, the lower timeout should be sufficient. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit d19663ac61a6e36eec655d3c84a106686ebddd2c Author: Mark Brown Date: Tue Feb 23 11:08:05 2010 +0000 mfd: Use completion interrupt for WM835x AUXADC Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the state of the AUXADC if we don't get a completion, mostly for systems that don't have the WM8350 interrupt infrastructure hooked up. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 11a441ce82d6ffecfd39b324024de0cd630b36c1 Author: Mike Turquette Date: Mon Feb 22 11:16:30 2010 -0600 mfd: Introduce remove_script function for twl4030 New function twl4030_remove_script(u8 flags) takes a script type as defined in twl.h and prevents any script already loaded in that position from running. This is accomplished by programming SEQ_ADD_* to 0x3f, the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags. (Future) users of this function include OMAP board files for machines facing a race condition between sleep and warm reset. Signed-off-by: Mike Turquette Signed-off-by: Samuel Ortiz commit 3d8ca8c0b9fe42d005360e255fbf7a6f8580ef87 Author: Magnus Damm Date: Mon Feb 22 13:40:59 2010 +0900 mfd/mmc: SDHI Kconfig update Enable the sh_mobile_sdhi mfd driver on SH-Mobile ARM processors. While at it, make CONFIG_TMIO_MMC depend on CONFIG_MFD_SH_MOBILE_SDHI. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 3c49e810507c9d0659b8aa61f7f91aecda428ee3 Author: Magnus Damm Date: Mon Feb 22 13:37:09 2010 +0900 mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support Add MMC_CAP_MMC_HIGHSPEED support to the sh_mobile_sdhi driver. Also, remove type cast and FIXME comment. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 1bca748cccec1c7f30b4424882de965100744432 Author: Mark Brown Date: Wed Feb 17 18:45:26 2010 +0000 gpiolib: Force wm831x GPIOs into GPIO mode when requested This is the chip default but it's possible the bootloader or OTP will have been configured to a different mode (eg, to provide feedback during startup). Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit f92e8f8144243a3651b2e350b706ea2d04931f8c Author: Mark Brown Date: Wed Feb 17 18:45:25 2010 +0000 mfd: Add WM831x revision B support Revision B of the WM831x devices changes the sense of the tristate bit for GPIO configuration, inverting it to become an enable instead. Take account of this in the gpiolib driver. A current sink regulation status bit has also been added in revision B, add a flag indicating if it's present but don't use it yet. This revision also adds an interrupt on key up for the ON pin event which the existing code is able to take advantage of. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 6b8274fafeec9b112cee5b6ced5f9189957c889f Author: Mark Brown Date: Wed Feb 17 18:45:24 2010 +0000 gpiolib: Correct debugfs display of WM831x GPIO inversion Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3383d23d86791503559cb87837491af37469d9e5 Author: Mark Brown Date: Wed Feb 17 18:04:35 2010 +0000 gpiolib: Actually set output state in wm831x_gpio_direction_output() wm831x_gpio_direction_output() ignored the state passed into it. Signed-off-by: Mark Brown Cc: stable@kernel.org Signed-off-by: Samuel Ortiz commit 7ee422dc6e947fcdc153246d47f26ae0b7cf083d Author: Magnus Damm Date: Wed Feb 17 16:38:23 2010 +0900 tmio_mmc: Balance cell enable()/disable() calls This patch adds cell->disable() calls to the tmio-mmc probe() error handling and the remove() function. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 707f0b2fbc65876e8abd94d26d8d0620600c05d4 Author: Magnus Damm Date: Wed Feb 17 16:38:14 2010 +0900 tmio_mmc: Remove const from platform data V3 Remove const from the tmio-mmc platform data hclk V3. This change makes it possible to remove the type cast from the sh_mobile_sdhi driver which is using the clock framework to get the clock rate. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 6d9af5af61a6c30676ef6f56a791d4036c92d249 Author: Magnus Damm Date: Wed Feb 17 16:38:04 2010 +0900 tmio_mmc: Use 100ms mmc_detect_change() delay This patch changes the tmio_mmc driver to wait 100ms before checking the card detect status. This type of delay is quite common among mmc drivers, it seems that most hardware platforms need to give the hardware some time to settle before checking card availabilty. Hotplug is half-broken without this patch on the sh7724 Ecovec board. Hot insertion seems ok but eject is never detected without this patch. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit b741d440a97c376af309e902eeb2f3c5673d2c92 Author: Yusuke Goda Date: Wed Feb 17 16:37:55 2010 +0900 tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2 Enable MMC_CAP_XX support in the tmio_mmc driver if pdata->capabilities is set. Signed-off-by: Yusuke Goda Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit a8c39d8deb8341d15fc0eabaa9750f7a1db9d0df Author: Guennadi Liakhovetski Date: Wed Feb 17 16:37:45 2010 +0900 tmio_mmc: Keep card-detect interrupts enabled On SuperH platforms the SDHI controller does not produce any command IRQs after a completed IO. This leads to card-detect interrupts staying disabled. Do not disable card-detect interrupts on DATA IRQs. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit fa0d976298b25d090fafc3460c63fee1c8eea854 Author: Balaji T K Date: Fri Feb 19 12:39:38 2010 +0100 mfd: Add twl6030 base addr for ID0, ID1, ID2 Add base address for generic slave ID0, ID1, ID2 and introduced one more entry to align RTC module number between twl4030 and twl6030 Signed-off-by: Balaji T K Signed-off-by: Samuel Ortiz commit a29aaf55cd6faa75e35abfe00bd3ffc537490485 Author: Moiz Sonasath Date: Tue Feb 16 18:57:21 2010 -0600 mfd: Disable TWL4030/5030 I2C1/I2C4 internal pull-ups This patch disables TWL4030/5030 I2C1 adn I2C4(SR) internal pull-up, to use only the external HW resistor >=470 Ohm for the assured functionality in HS mode. While testing the I2C in High Speed mode, it was discovered that without a proper pull-up resistor, there is data corruption during multi-byte transfer. RTC(time_set) test case was used for testing. From the analysis done, it was concluded that ideally we need a pull-up of 1.6k Ohm(recomended) or atleast 470 Ohm or greater for assured performance in HS mode. Signed-off-by: Moiz Sonasath Signed-off-by: Allen Pais Signed-off-by: Samuel Ortiz commit e82c60ae7d3a7f19c4b9b3e7bd6ea298fa5efe93 Author: Denis Turischev Date: Fri Feb 19 11:26:25 2010 +0100 mfd: Introduce lpc_sch for Intel SCH LPC bridge Intel Poulsbo (SCH) chipset LPC bridge controller contains several functions. Creating and MFD driver for the LPC bridge controller allows simultaneous use of SMBus and GPIO interfaces on the SCH. Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit 91fedede0338eb6203cdd618d8ece873fdb7c22c Author: Samuel Ortiz Date: Fri Feb 19 11:07:59 2010 +0100 mfd: Check for ACPI conflicts For ACPI based systems, we should check for ACPI conflicts when adding the platform devices. The test will always succeed for non ACPI platforms. Signed-off-by: Samuel Ortiz commit 14e5c82ca32870698b7cbe54196e00682d929ca5 Author: Eduardo Valentin Date: Thu Feb 11 13:47:09 2010 +0100 mfd: Fix twl_has_pwrbutton typo Change the typo CONFIG_INPUT_TWL4030_PWBUTTON_MODULE in the twl_has_pwrbutton definition to CONFIG_INPUT_TWL4030_PWRBUTTON_MODULE. Signed-off-by: Eduardo Valentin Signed-off-by: Christoph Egger Signed-off-by: Samuel Ortiz commit 6985403138b74ad28c8ddac8baf88869556bec9a Author: Haojian Zhuang Date: Wed Feb 3 15:40:59 2010 -0500 input: Support onkey in 88pm860x Signed-off-by: Haojian Zhuang Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit 2afa62ea76027b00e472ddb672191e6e15425b43 Author: Haojian Zhuang Date: Mon Feb 8 05:02:00 2010 -0500 mfd: Use genirq in 88pm860x Use genirq to simplify IRQ handling in 88pm860x. Remove the interface of mask/free IRQs on 88pm860x. All these work is taken by genirq. Update the touchscreen driver of 88pm860x since IRQ handling is changed. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 7731074ab21745cde00578148ce760df107eaf27 Author: Joonyoung Shim Date: Sun Feb 7 10:16:14 2010 +0900 mfd: Fix WM8994 error handling This patch fixes wrong goto statement for error handling on probe. Signed-off-by: Myungjoo Ham Signed-off-by: Joonyoung Shim Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit e8343ddaccb322b1a2a989ac362cabd1e94597ad Author: Haojian Zhuang Date: Wed Feb 3 15:38:12 2010 -0500 mfd: Use i2c_dummy in 88pm860x Use i2c_dummy in 88pm860x driver to avoid using static in probe function. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 34c9120805ff4b3f7a8053bd64157ba564774433 Author: Haojian Zhuang Date: Wed Feb 3 15:37:23 2010 -0500 mfd: Clean code in max8925 Remove unused definitions. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 28db38888b2a53b6bdd70104c2d2a199632ca507 Author: Haojian Zhuang Date: Mon Jan 25 10:38:35 2010 -0500 power_supply: Enable power supply of max8925 MAX8925 is a PMIC that contains charger component Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit a39069f6ce6500a5ca39e534108247f25169d8e0 Author: Haojian Zhuang Date: Mon Jan 25 06:30:29 2010 -0500 rtc: Enable rtc in max8925 MAX8925 is a PMIC that contains RTC component. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e Author: Haojian Zhuang Date: Fri Feb 5 16:07:54 2010 +0100 mfd: Update irq handler in max8925 Update thread irq handler. Simply the interface of using thread irq. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit b13c0df517bedbc40cff4ab5f797b08b1111918b Author: Haojian Zhuang Date: Mon Jan 25 06:26:34 2010 -0500 mfd: Update i2c driver for max8925 Update I2C driver in order to fit all of three I2C components in max8925. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1ea933f4cdbb88197139b9e62778beba0120e229 Author: Mike Turquette Date: Fri Feb 5 09:51:37 2010 +0100 mfd: Program twl4030 remap_sleep correctly Variable remap was incorrectly referencing remap_off for the remap_sleep case when configuring TWL4030 power scripts. Signed-off-by: Mike Turquette Signed-off-by: Samuel Ortiz commit 2955c309921e23d592ef585cf8e7ded1e11565b7 Author: Mark Brown Date: Fri Jan 29 18:20:30 2010 +0000 gpiolib: Add WM8994 GPIO support The WM8994 has 11 GPIO lines. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 9e50108668a70a9927257298bd4e679300124420 Author: Mark Brown Date: Fri Jan 29 18:20:29 2010 +0000 mfd: Add initial WM8994 support The WM8994 is a highly integrated ultra low power audio hub CODEC. Since it includes on-board regulators and GPIOs it is represented as a multi-function device, though the overwhelming majority of the functionality is provided by the ASoC CODEC driver. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 1c4d3b70a40c666331052adf77933e6994590b74 Author: Mark Brown Date: Fri Jan 29 18:20:28 2010 +0000 mfd: Add WM8994 register definitions As a separate patch due to the large size. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit bef3e20c9f8ce5cb8809cf33494d95a78db07857 Author: Randy Dunlap Date: Wed Jan 20 19:55:34 2010 -0800 mfd: htc-i2cpld depends on GPIOLIB htc-i2cpld should depend on GPIOLIB, otherwise there are many build errors: drivers/mfd/htc-i2cpld.c:50: error: field 'chip_out' has incomplete type drivers/mfd/htc-i2cpld.c:54: error: field 'chip_in' has incomplete type drivers/mfd/htc-i2cpld.c:243: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:243: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:278: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:278: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:282: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:282: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:315: error: dereferencing pointer to incomplete type drivers/mfd/htc-i2cpld.c:322: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:322: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:467+: error: dereferencing pointer to incomplete type [19X] drivers/mfd/htc-i2cpld.c:490: error: implicit declaration of function 'gpiochip_add' drivers/mfd/htc-i2cpld.c:504: error: implicit declaration of function 'gpiochip_remove' Signed-off-by: Randy Dunlap Signed-off-by: Samuel Ortiz commit f7ea2dc59ed46dcd0f1cfaccda02211f4507207b Author: Christoph Egger Date: Fri Jan 15 15:33:46 2010 +0100 mfd: Remove leftover from discontinued TWL4030 battery patch The TWL4030_BCI_BATTERY config option originates from a patch to the omap git tree. However inclusion in linux was seemingly rejected and the functionality nears inclusion under a different name so this removes the bits of the old version that made it into the mainline kernel again. Signed-off-by: Christoph Egger Signed-off-by: Samuel Ortiz commit ca229f1b624a72a1c9eb1d94bbca7a0c094a1b8b Author: Linus Walleij Date: Sun Jan 17 20:57:43 2010 +0100 mfd: Fix debugfs code in AB3100 OTP driver This fixes the aged and unreachable debugfs code in the AB3100 OTP driver so that it's (A) reachable and (B) works. Bug detected in parallell by Christoph Egger using VAMOS and Robert P. J. Day by his kernel scanning script. Signed-off-by: Linus Walleij Cc: Christoph Egger Cc: Robert P. J. Day Signed-off-by: Samuel Ortiz commit 2071db4848ea809887e97248dd3dec02a2e3dd6b Author: Linus Walleij Date: Tue Jan 19 11:41:52 2010 +0100 mfd: Use AB3100 MFD core IRQ for interrupt randomness This reintroduces the entropy sampling of the AB3100 IRQ as the IRQF_SAMPLE_RANDOM is going out according to the feature removal schedule. I'm trying to do this the right way then, so CC:ing some random people for a quick review. We add entropy for interrupt events in the AB3100 which are truly random in nature, like external cables being connected, voltages on batteries dropping below certain ranges, ADC triggers or overheating. Signed-off-by: Linus Walleij Cc: Robin Getz Acked-by: Matt Mackall Signed-off-by: Samuel Ortiz commit 6048a3dd2371c58611ea0ab8b306f8f1469399ae Author: Cory Maccarrone Date: Tue Jan 19 11:22:45 2010 +0100 mfd: Add HTCPLD driver This change introduces a driver for the HTC PLD chip found on some smartphones, such as the HTC Wizard and HTC Herald. It works through the I2C bus and acts as a GPIO extender. Specifically: * it can have several sub-devices, each with its own I2C address * Each sub-device provides 8 output and 8 input pins * The chip attaches to one GPIO to signal when any of the input GPIOs change -- at which point all chips must be scanned for changes This driver implements the GPIOs throught the kernel's GPIO and IRQ framework. This allows any GPIO-servicing drivers to operate on htcpld pins, such as the gpio-keys and gpio-leds drivers. Signed-off-by: Cory Maccarrone Signed-off-by: Samuel Ortiz commit 08ff6f2a9908c87b0adffe6453291be22db3a62f Author: Haojian Zhuang Date: Mon Jan 11 13:10:08 2010 +0100 regulator: Add max8925 support MAX8925 contains 3 Buck and 20 LDO regulator. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4f811ef0d40048ae80b6ea77080b814725bffc58 Author: Haojian Zhuang Date: Fri Dec 18 10:01:45 2009 -0500 backlight: Enable max8925 backlight Enable max8925 backlight sub device. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1ad998934e9c6cbae91662a05e0cb8772b1f4f75 Author: Haojian Zhuang Date: Fri Jan 8 12:43:29 2010 -0500 mfd: Add subdevs in max8925 Add subdevs in MAX8925. MAX8925 includes regulator, backlight and touch components. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit d50f8f339f6901fccc9d4292b65ce8b69d7413d4 Author: Haojian Zhuang Date: Fri Jan 8 12:29:23 2010 +0100 mfd: Initial max8925 support Basic Max8925 support, which is a power management IC from Maxim Semiconductor. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 34a4b2391e9fbd12de9817de4ae409528bd7d7b6 Author: Haojian Zhuang Date: Thu Dec 10 06:06:17 2009 -0500 regulator: Unsupport 88pm8607 A0 and A1 Remove the support 88PM8607 A0/A1 stepping. There's some register definition changes in B0 stepping. It can make software more efficient. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 866a98ae6e1a9768cd25fe1185481569c7e4b4a9 Author: Haojian Zhuang Date: Tue Dec 15 16:06:17 2009 -0500 input: Enable touch on 88pm860x Enable touchscreen driver for the 88pm860x multi function core. Signed-off-by: Haojian Zhuang Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit 0a2f915b405ac1a8d19d9b7cf7873f26ba682a24 Author: Haojian Zhuang Date: Wed Jan 6 17:10:09 2010 -0500 led: Enable led in 88pm860x Enable led sub device in Marvell 88PM860x. Two LED arrays can be supported. Each LED array can be used for R,G,B leds. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit d07e8bf83fd71567aaf9c27c3b133ab3cf8f3c4c Author: Haojian Zhuang Date: Mon Nov 9 12:41:07 2009 -0500 backlight: Enable backlight in 88pm860x At most, three backlight device can be supported in 88pm860x driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit a16122bcacf050e7f83015183053cf799713cc37 Author: Haojian Zhuang Date: Tue Dec 15 16:04:36 2009 -0500 mfd: Append subdev into 88pm860x driver Append backlight, led & touch subdevs into 88pm860x driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 5c42e8c4a9c86ea26ed4ecb732a842dea0dfb6b6 Author: Haojian Zhuang Date: Tue Dec 15 16:01:47 2009 -0500 mfd: Add irq support in 88pm860x 88PM860x is a complex PMIC device. It contains touch, charger, sound, rtc, backlight, led, and so on. Host communicates to 88PM860x by I2C bus. Use thread irq to support this usage case. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 2cc50bee9934deb6dfe32929a4c1742cf83d6db3 Author: Haojian Zhuang Date: Wed Jan 6 17:07:13 2010 -0500 mfd: Rename 88pm8607 to 88pm860x in mfd Rename 88PM8607 to 88PM860X in both Makefile and Kconfig under mfd directory. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 53dbab7af9ca13fa95605e9a5c31bb803dcba363 Author: Haojian Zhuang Date: Fri Jan 8 06:01:24 2010 -0500 mfd: Support 88pm8606 in 860x driver 88PM8606 and 88PM8607 are two discrete chips used for power management. Hardware designer can use them together or only one of them according to requirement. There's some logic tightly linked between these two chips. For example, USB charger driver needs to access both chips by I2C interface. Now share one driver to these two devices. Only one I2C client is identified in platform init data. If another chip is also used, user should mark it in companion_addr field of platform init data. Then driver could create another I2C client for the companion chip. All I2C operations are accessed by 860x-i2c driver. In order to support both I2C client address, the read/write API is changed in below. reg_read(client, offset) reg_write(client, offset, data) The benefit is that client drivers only need one kind of read/write API. I2C and MFD driver can be shared in both 8606 and 8607. Since API is changed, update API in 8607 regulator driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit bbd51b1ff1bf57b9ed7f062486a415509968d4d9 Author: Haojian Zhuang Date: Wed Jan 6 17:04:18 2010 -0500 mfd: Split 88pm8607 driver Create 88pm8607-i2c driver to support all I2C operation of 88PM8607. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 0df883df8e8aea79b501f6262b595e66dec175dc Author: Linus Walleij Date: Fri Jan 8 10:44:16 2010 +0100 mfd: Convert AB3100 driver to threaded IRQ This converts the AB3100 core MFD driver to use a threaded interrupt handler instead of the explicit top/bottom-half construction with a workqueue. This saves some code and make it more similar to other modern MFD drivers. Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 38f6ce45f0bca04ac653c57cacd375c469995321 Author: Mark Brown Date: Thu Jan 7 16:10:08 2010 +0000 gpiolib: Add support for WM8350 GPIO controller Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 59f25070df0325067d7916b467ad15725657fedc Author: Mark Brown Date: Wed Jan 6 19:24:25 2010 +0000 mfd: Update WM8350 drivers for changed interrupt numbers The headphone detect and charger are using the IRQ numbers so need to take account of irq_base with the genirq conversion. I obviously picked the wrong system for initial testing. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit ecf926bcda5ba1da7269dcaa71a1b6920dc48349 Author: Mark Brown Date: Tue Jan 5 20:40:47 2010 +0000 mfd: Don't allow WM8350 to be built modular The genirq implementation does not allow modules to implement irq_chips so the conversion of WM8350 to genirq means we can no longer allow the driver to be built as a module. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 760e4518788df6762700e6bb9dd8692379f11168 Author: Mark Brown Date: Tue Jan 5 13:59:09 2010 +0000 mfd: Convert WM8350 to genirq This gives us use of the diagnostic facilities genirq provides and will allow implementation of interrupt support for the WM8350 GPIOs. Stub functions are provided to ease the transition of the individual drivers, probably after additional work to pass the IRQ numbers via the struct devices. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 29c71b138c83c8191f1f7e46fcc28b9d6bc8a5dd Author: Mark Brown Date: Tue Jan 5 13:59:08 2010 +0000 rtc: Suppress duplicate enable/disable of WM8350 update interrupt Unlike the wm8350-custom code genirq nests enable and disable calls so we can't just unconditionally mask or unmask the interrupt, we need to remember the state we set and only mask or unmask when there is a real change. Signed-off-by: Mark Brown Acked-by: Alessandro Zummo Cc: rtc-linux@googlegroups.com Signed-off-by: Samuel Ortiz commit f99344fc69c3df46786a39ea4283a4175ea40b3f Author: Mark Brown Date: Tue Jan 5 13:59:07 2010 +0000 mfd: Add a data argument to the WM8350 IRQ free function To better match genirq. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 0e820ab60118e06db62ef4e55b6dd96db807a34e Author: Julia Lawall Date: Tue Dec 22 21:31:43 2009 +0100 mfd: Correct use after free for t7l66xb The structure t7l66xb should not be freed before the subsequent references to its fields in the arguments to clk_put. Furthermore, this structure is allocated near the beginning of the function, and a goto to the label err_noirq appears after a successful allocation, so it would seem that the kfree should be moved down below this label. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x->f // Signed-off-by: Julia Lawall commit 1ecc09e765d3ae16ef42a4d454836d9ed804fd18 Author: H Hartley Sweeten Date: Tue Jan 5 20:01:16 2010 +0100 mfd: Use resouce_size for tc6393xb Use resource_size() for ioremap. Signed-off-by: H Hartley Sweeten Cc: Ian Molton Signed-off-by: Samuel Ortiz commit c02e6a5ff43d24d73cf7830c2925e213fc72e037 Author: H Hartley Sweeten Date: Tue Jan 5 19:58:34 2010 +0100 mfd: Use resource_size() for t7l66xb Use resource_size() for ioremap. Signed-off-by: H Hartley Sweeten Cc: Ian Molton Signed-off-by: Samuel Ortiz commit 311e54c07e784fe63d421f724dcc597d1f82ccad Author: H Hartley Sweeten Date: Tue Jan 5 19:55:54 2010 +0100 mfd: Use resource_size() in sm501 The requested memory region is smaller than the actual ioremap(). Use resource_size() to get the correct size. Signed-off-by: H Hartley Sweeten Cc: Ben Dooks Signed-off-by: Samuel Ortiz commit 08b8499bdd26822df16f962db88215d02e40850a Merge: 3ceb85a fb46359 Author: Linus Torvalds Date: Sun Mar 7 12:52:38 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix cast warning in pcc driver. [CPUFREQ] Processor Clocking Control interface driver commit 3ceb85ae35421c5bc560c7af8d0dd1c73d071ad0 Author: Dmitry Torokhov Date: Sun Mar 7 12:37:17 2010 -0800 USB: remove unused defintion of struct usb_device_status The recent rework of /proc/bus/usb/devices polling support made this structure unused so let's remove it. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit b8fa05719ba4349be80ce929237249b57886a203 Author: Linus Torvalds Date: Sun Mar 7 09:54:44 2010 -0800 Revert "lib: build list_sort() only if needed" This reverts commit a069c266ae5fdfbf5b4aecf2c672413aa33b2504. It turns ou that not only was it missing a case (XFS) that needed it, but perhaps more importantly, people sometimes want to enable new modules that they hadn't had enabled before, and if such a module uses list_sort(), it can't easily be inserted any more. So rather than add a "select LIST_SORT" to the XFS case, just leave it compiled in. It's not all _that_ big, after all, and the inconvenience isn't worth it. Requested-by: Alexey Dobriyan Cc: Christoph Hellwig Cc: Don Mullis Cc: Andrew Morton Cc: Dave Chinner Signed-off-by: Linus Torvalds commit 1dace8c801ac531022bd31a7316a6b4351837617 Author: Jeff Dike Date: Thu Mar 4 16:10:14 2010 -0500 vhost: fix error path in vhost_net_set_backend An error could cause vhost_net_set_backend to exit without unlocking vq->mutex. Fix this. Signed-off-by: Jeff Dike Signed-off-by: Michael S. Tsirkin commit c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383 Author: Andrew Morton Date: Wed Mar 3 11:57:40 2010 -0800 [WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static Making this instance static exposes the code to SMP races, etc. Signed-off-by: Andrew Morton Signed-off-by: Wim Van Sebroeck commit 168b5251adddb1554926cfb94f79a8a28bc6ebe5 Author: Wim Van Sebroeck Date: Sat Dec 26 19:13:00 2009 +0000 [WATCHDOG] change reboot_notifier to platform-shutdown method. Platform device drivers can use the .shutdown method to handle soft shutdown's instead of reboot_notifier's. Signed-off-by: Wim Van Sebroeck commit 42747d712de56cf2087b702d2ad90af114c53138 Author: Wim Van Sebroeck Date: Sat Dec 26 18:55:22 2009 +0000 [WATCHDOG] watchdog_info constify make the watchdog_info struct const where possible. Signed-off-by: Wim Van Sebroeck commit 8d2b09f5b0de2c0e37f50d04980bc81098988239 Author: Rabin Vincent Date: Mon Mar 1 05:01:25 2010 +0100 ARM: 5961/1: ux500: fix CLKRST addresses Correct the base addresses of the CLKRST registers. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 51d47999b9452a8dc7ae58a11423c5db28f21ae1 Author: Laurent Pinchart Date: Thu Mar 4 15:33:16 2010 +0100 ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted If PC points outside kernel text, start printing the backtrace at LR instead. Signed-off-by: Laurent Pinchart Signed-off-by: Russell King commit 4193d13b2c2b694aa59e629e6daf6269d7922f13 Author: Michele Ballabio Date: Sat Mar 6 21:06:46 2010 +0100 ALSA: hda - Add ASRock mobo to MSI blacklist This avoids a lockup at boot. Signed-off-by: Michele Ballabio Signed-off-by: Takashi Iwai commit 7484399fe2f85212754ffdd78121636b47a49a13 Merge: d2db09b 0a27fcf Author: Takashi Iwai Date: Sun Mar 7 09:29:29 2010 +0100 Merge branch 'fix/hda' into topic/hda commit d55f88f0275e4b21435957d3d354a79bb9edeec7 Author: Krishna Gudipati Date: Fri Mar 5 19:38:52 2010 -0800 [SCSI] bfa: Update the driver version to 2.1.2.1. Upgrade the upstream driver from 2.0.0.0 to 2.1.2.1. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit d1c61f8ef582055569de76a86fa1984f9b6698cf Author: Krishna Gudipati Date: Fri Mar 5 19:38:44 2010 -0800 [SCSI] bfa: Remove unused header files and did some cleanup. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 95aa060decd2472d319c3f12b0b1b699a5f35058 Author: Krishna Gudipati Date: Fri Mar 5 19:38:27 2010 -0800 [SCSI] bfa: Handle SCSI IO underrun case. When IO is completed with underrun and with good SCSI status, check if the transferred bytes against scsi_cmnd->underflow, which is set to minimum number of bytes that must be transferred for this command, if is less than required minimum, complete the IO with DID_ERROR. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 25e2934c26f5efaea156c9fda4457d01a8bb44e1 Author: Krishna Gudipati Date: Fri Mar 5 19:38:17 2010 -0800 [SCSI] bfa: FCS and include file changes. MS module did not invoke fdmi offline in all cases, call fdmi offline when ms module receives a port offline, so that fdmi offline is from one place in the ms module. Make changes to handle 10G speed in the conversion routine. Replaced the usage of bfa_adapter_attr_s struct with specific API's. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit ca8b4327e405820966971236224db0e0724b5673 Author: Krishna Gudipati Date: Fri Mar 5 19:38:07 2010 -0800 [SCSI] bfa: Modified the portstats get/clear logic Modified the portstats get/clear logic for port physical/FCoE/QoS stats. Added more stats to FC Fixed some issues with FCoE stats collection. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 0a4b1fc0b24fc7adbaf8413f2992ce1395991a78 Author: Krishna Gudipati Date: Fri Mar 5 19:37:57 2010 -0800 [SCSI] bfa: Replace bfa_get_attr() with specific APIs bfa_ioc_attr_s is a big structure and some times could cause stack overflow if defined locally, so add specific APIs that are needed to replace the use of ioc_attr local var. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f58e9ebbf78bd36c6cf1ca651280d39efe73a7c0 Author: Krishna Gudipati Date: Fri Mar 5 19:37:45 2010 -0800 [SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO). Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 1c8a4c37494932acd59079b4fc8d8f69fb329c2a Author: Krishna Gudipati Date: Fri Mar 5 19:37:37 2010 -0800 [SCSI] bfa: Rename pport to fcport in BFA FCS. Rename pport structures to fcport in BFA FCS, to resolve confusion about the port structures in the firmware, and make sure the SG page is setup correctly. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 13cc20c5e764e6ef8d57f33980ab8c386c25fb4d Author: Krishna Gudipati Date: Fri Mar 5 19:37:29 2010 -0800 [SCSI] bfa: IOC fixes, check for IOC down condition. Currently BFA was not checking for IOC down condition when issuing getstats/clearstats Add check to see if IOC is operational, before issuing getstats/clearstats. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 78f915f7b095dda76970c8c9568489fa779ef73f Author: Krishna Gudipati Date: Fri Mar 5 19:37:18 2010 -0800 [SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state. Use dummy interrupt handlers till chip initialization is complete. Install real interrupt handlers after chip initialization. Also removed msix installation code in bfa_iocfc_init(). Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f5713c5dfb4d61cd77debf61d3873eb36877ff1f Author: Krishna Gudipati Date: Fri Mar 5 19:37:09 2010 -0800 [SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt. Fixed the issue of not acknowledging the command queue full-to-non-full interrupt. Implemented separate acknowledging functions for different ASIC and interrupt mode. Fixed the case of missing CPE interrupt by always processing the pending requests in the completion path. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 816e49b8ed209e5e08d4c43359635cbca17e7196 Author: Krishna Gudipati Date: Fri Mar 5 19:36:56 2010 -0800 [SCSI] bfa: IOC recovery fix in fcmode. ioc_recover failed to work in fcmode. Fixed the code to initialize the ioc_regs.err_set during the notify_hbfail. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 2993cc71d1bff61999ade7f2b6b3ea2dd1e2c8d9 Author: Krishna Gudipati Date: Fri Mar 5 19:36:47 2010 -0800 [SCSI] bfa: AEN and byte alignment fixes. Replace enum types with int and rearrange the fields to fix some alignment issue. Local var ioc_attr is causing the stack to overflow, so removed the usage of the local ioc_attr var and now invoking an API to return the ioc_type. Fix some AEN issues. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 9693e7dff5c2911b4e445f5f656ef57b3a5bffac Author: Krishna Gudipati Date: Fri Mar 5 19:36:30 2010 -0800 [SCSI] bfa: Introduce a link notification state machine. Introduce a link notification state machine to handle next incoming link events while the current event is being delivered to the driver. When the event has been processed by the driver, the link notification state machine will queue the next event (if there is any) to the driver. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 738c9e66dcb7e17a962a7d65c976386b970d10ca Author: Krishna Gudipati Date: Fri Mar 5 19:36:19 2010 -0800 [SCSI] bfa: Added firmware save clear feature for BFA driver. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f926a05f5c1507aeae0e36175a03c0a19c201187 Author: Krishna Gudipati Date: Fri Mar 5 19:36:00 2010 -0800 [SCSI] bfa: FCS authentication related changes. Made FCS authentication related changes to state machines and header files. Made changes in FCS state machines to handle the case when secret string is NULL. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 7af074dc9d343f69bab4bfd699e6d7ba09915fd9 Author: Krishna Gudipati Date: Fri Mar 5 19:35:45 2010 -0800 [SCSI] bfa: PCI VPD, FIP and include file changes. Changed PCI VPD to incorporate specific OEM vendors. Added FCoE specific interrupt latency and delay params. Added some variables needed by FIP 2.0. Added some new logging and tracing definitions. Added reserved members to make the structures (IOC, IOCFC) 64bit aligned. Changed the module identifiers, as some files were moved. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 86e32dabbad0d860b2be3c30a33c10a134d4ccf1 Author: Krishna Gudipati Date: Fri Mar 5 19:35:33 2010 -0800 [SCSI] bfa: Fix to copy fpma MAC when requested by user space application. Copy fpma MAC when requested by user space application. Added FPMA mac address to the lport attributes structure. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 72041ed8fc8ed92c11af90949bab7b08f3e34fd3 Author: Krishna Gudipati Date: Fri Mar 5 19:35:16 2010 -0800 [SCSI] bfa: RPORT state machine: direct attach mode fix. Make sure that in direct attach mode, we do not query the name server after a target is marked offline. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit e641de37e67953fa9ecad72608942481a5d66a1d Author: Krishna Gudipati Date: Fri Mar 5 19:35:02 2010 -0800 [SCSI] bfa: Replace bfa_assert() with bfa_sm_fault() Replace bfa_assert() with bfa_sm_fault() to get unhandled events for debugging. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 8b651b4294e67789028982d18779a9ebe75c2b8a Author: Krishna Gudipati Date: Fri Mar 5 19:34:44 2010 -0800 [SCSI] bfa: Clear LL_HALT and PSS_ERR bit when IOC crashes. Clear LL_HALT and PSS_ERR bit in the interrupt status register on an IOC crash. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 0a20de446c76529028cb239bf2a13cb0f05b263a Author: Krishna Gudipati Date: Fri Mar 5 19:34:20 2010 -0800 [SCSI] bfa: IOC changes: Support faster recovery and split bfa_ioc.c into ASIC specific code. Add support for faster IOC recovery after failure. Split bfa_ioc.c into three files: bfa_ioc.c: Common code shared between crossbow and catapult ASIC's. bfa_ioc_cb.c: Code specific to the crossbow, reg mapping and interrupt related routines. bfa_ioc_ct.c: Code specific to the catapult, reg mapping and interrupt related routines. Fix to make sure IOC reinitialize's properly on enable request - update the ioc_fwstate reg with BFI_IOC_FAIL on ioc disable mbox cmd timeout. Makefile changes to support the 2 newly added files bfa_ioc_cb.c and bfa_ioc_ct.c. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4da0b66c6e9ea7ba78a19f9f186779826d89f8b0 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:37 2010 -0700 vsprintf: move %pR resource printf_specs off the stack This adds separate I/O and memory specs, so we don't have to change the field width in a shared spec, which then lets us make all the specs const and static, since they never change. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit b89dc5d6b0981c1096ccffbf8f4413c7bb1bcc0a Author: Bjorn Helgaas Date: Fri Mar 5 10:47:31 2010 -0700 vsprintf: clarify comments for printf_spec flags Add clues about what the SMALL and SPECIAL flags do. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit ef0658f3de484bf9b173639cd47544584e01efa5 Author: Joe Perches Date: Sat Mar 6 17:10:14 2010 -0800 vsprintf.c: Reduce sizeof struct printf_spec from 24 to 8 bytes Reducing the size of struct printf_spec is a good thing because multiple instances are commonly passed on stack. It's possible for type to be u8 and field_width to be s8, but this is likely small enough for now. Signed-off-by: Joe Perches Signed-off-by: Linus Torvalds commit 7bc80cd935a4d5fd8574f6994bd95d0aad273d56 Author: Linus Torvalds Date: Sat Mar 6 16:34:34 2010 -0800 usbfs: fix deadlock on 'usbfs_mutex', clean up poll The caller of usbfs_conn_disc_event() in some cases (but not always) already holds usbfs_mutex, so trying to protect the event counter with that lock causes nasty deadlocks. The problem was introduced by commit 554f76962d ("USB: Remove BKL from poll()") when the BLK protection was turned into using the mutex instead. So fix this by using an atomic variable instead. And while we're at it, get rid of the atrocious naming of said variable and the waitqueue it is associated with. This also cleans up the unnecessary locking in the poll routine, since the whole point of how the pollwait table works is that you can just add yourself to the waiting list, and then check the condition you're waiting for afterwards - avoiding all races. It also gets rid of the unnecessary dynamic allocation of the device status that just contained a single word. We should use f_version for this, as Dmitry Torokhov points out. That simplifies everything further. Reported-and-tested-by: Jeff Chua Acked-by: Greg Kroah-Hartman Acked-by: Alan Stern Cc: Oliver Neukum Cc: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 Author: Akinobu Mita Date: Sun Feb 28 10:58:15 2010 +0000 parisc: use __ratelimit in unaligned.c Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Signed-off-by: Kyle McMartin commit c60185248fd1c7b777f08d3f3337836331da3d17 Author: john stultz Date: Wed Dec 23 04:14:03 2009 +0000 parisc: Convert to read/update_persistent_clock This patch converts the parisc architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Acked-by: Helge Deller Signed-off-by: Kyle McMartin commit eef83afbd6c2577c9fd07e1a280bb0beb603b293 Author: Robert P. J. Day Date: Thu Dec 31 20:43:55 2009 +0000 parisc: Simplify param.h by including Signed-off-by: Robert P. J. Day Signed-off-by: Kyle McMartin commit 1d747c7e7b754cacb9bc8d31854bdc3a58d70597 Author: Helge Deller Date: Tue Feb 2 19:06:23 2010 +0000 parisc: drop unnecessary cast in __ldcw_align() macro __ldcw_align() can directly access the slock member of struct arch_spinlock_t instead of using an ugly cast. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 888c31fc83ddc7fcd9947cb67c5718b4e3dd5e1b Author: Helge Deller Date: Mon Feb 1 19:56:33 2010 +0000 parisc: add strict copy size checks (v2) Add CONFIG_DEBUG_STRICT_USER_COPY_CHECKS, copied from the x86 implementation. Tested with 32 and 64bit kernel. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit a3bee03e718c9251456676b71a723a34c999e891 Author: Frans Pop Date: Sat Feb 6 17:47:14 2010 +0000 parisc: remove trailing space in messages Signed-off-by: Frans Pop Cc: linux-parisc@vger.kernel.org Cc: Kyle McMartin Cc: Helge Deller Signed-off-by: Kyle McMartin commit 81e4a5e3057740a625cf556879ae0becf6199f8c Author: Kyle McMartin Date: Sat Dec 26 17:19:17 2009 +0000 parisc: ditto sys_accept4 tested with test_accept4.c from de11defebf00007677fb7ee91d9b089b78786fbb Signed-off-by: Kyle McMartin commit 9ceb38e6b691debe4bf04cb63165c503a8556177 Author: Helge Deller Date: Tue Dec 22 22:50:33 2009 +0000 parisc: wire up sys_recvmmsg Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 66b89159c25a47d2177743526c61b5ada7acc39e Merge: 87c7ae0 c2f843f Author: Linus Torvalds Date: Sat Mar 6 13:18:03 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Change magic number [LogFS] Remove h_version field [LogFS] Check feature flags [LogFS] Only write journal if dirty [LogFS] Fix bdev erases [LogFS] Silence gcc [LogFS] Prevent 64bit divisions in hash_index [LogFS] Plug memory leak on error paths [LogFS] Add MAINTAINERS entry [LogFS] add new flash file system Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in fs/logfs/inode.c introduced by write_inode() being changed to use writeback_control' by commit a9185b41a4f84971b930c519f0c63bd450c4810d ("pass writeback_control to ->write_inode") commit d690b2cd222afc75320b9b8e9da7df02e9e630ca Author: Rafael J. Wysocki Date: Sat Mar 6 21:28:37 2010 +0100 PM: Provide generic subsystem-level callbacks There are subsystems whose power management callbacks only need to invoke the callbacks provided by device drivers. Still, their system sleep PM callbacks should play well with the runtime PM callbacks, so that devices suspended at run time can be left in that state for a system sleep transition. Provide a set of generic PM callbacks for such subsystems and define convenience macros for populating dev_pm_ops structures. Signed-off-by: Rafael J. Wysocki commit 87d1b3e60b55ef65f10054ccc319e5d67cf010e9 Author: Rafael J. Wysocki Date: Sat Mar 6 21:28:17 2010 +0100 PM / Runtime: Document power.runtime_auto and related functions The power.runtime_auto device flag and the helper functions pm_runtime_allow() and pm_runtime_forbid() used to modify it are a part of the run-time power management framework and therefore they should be described in Documentation/power/runtime_pm.txt. Signed-off-by: Rafael J. Wysocki commit 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892 Merge: dff6d1c f070304 Author: Linus Torvalds Date: Sat Mar 6 11:34:04 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm raid1: fix deadlock when suspending failed device dm: eliminate some holes data structures dm ioctl: introduce flag indicating uevent was generated dm: free dm_io before bio_endio not after dm table: remove unused dm_get_device range parameters dm ioctl: only issue uevent on resume if state changed dm raid1: always return error if all legs fail dm mpath: refactor pg_init dm mpath: wait for pg_init completion when suspending dm mpath: hold io until all pg_inits completed dm mpath: avoid storing private suspended state dm: document when snapshot has finished merging dm table: remove dm_get from dm_table_get_md dm mpath: skip activate_path for failed paths dm mpath: pass struct pgpath to pg init done commit dff6d1c5ef9116a4478908001d72ee67127ecf01 Merge: 66ce3cf a0a5e34 Author: Linus Torvalds Date: Sat Mar 6 11:33:09 2010 -0800 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (23 commits) hwmon: Remove the deprecated adt7473 driver hwmon: Fix off-by-one kind values hwmon: (tmp421) Fix temperature conversions hwmon: (tmp421) Restore missing inputs hwmon: Driver for Andigilog aSC7621 family monitoring chips hwmon: (adt7411) Improve locking hwmon: Add driver for ADT7411 voltage and temperature sensor hwmon: (w83793) Add watchdog functionality hwmon: (g760a) Make rpm_from_cnt static hwmon: (it87) Validate auto pwm settings hwmon: (it87) Add support for old automatic fan speed control hwmon: (it87) Drop dead web links in documentation hwmon: (it87) Add an entry in MAINTAINERS hwmon: (it87) Use strict_strtol instead of simple_strtol hwmon: (it87) Fix many checkpatch errors and warnings hwmon: (it87) Add support for beep on alarm hwmon: (it87) Create vid attributes by group hwmon: (it87) Refactor attributes creation and removal hwmon: (it87) Expose the PWM/temperature mappings hwmon: (it87) Display fan outputs in automatic mode as such ... commit 66ce3cf84deba6cc71dcf43c9d56a4278e5f712d Merge: 05c5cb3 9b1f56d Author: Linus Torvalds Date: Sat Mar 6 11:32:21 2010 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: (21 commits) xfs: return inode fork offset in bulkstat for fsr xfs: Increase the default size of the reserved blocks pool xfs: truncate delalloc extents when IO fails in writeback xfs: check for more work before sleeping in xfssyncd xfs: Fix a build warning in xfs_aops.c xfs: fix locking for inode cache radix tree tag updates xfs: remove xfs_ipin/xfs_iunpin xfs: cleanup xfs_iunpin_wait/xfs_iunpin_nowait xfs: kill xfs_lrw.h xfs: factor common xfs_trans_bjoin code xfs: stop passing opaque handles to xfs_log.c routines xfs: split xfs_bmap_btalloc xfs: fix xfs_fsblock_t tracing xfs: fix inode pincount check in fsync xfs: Non-blocking inode locking in IO completion xfs: implement optimized fdatasync xfs: remove wrapper for the fsync file operation xfs: remove wrappers for read/write file operations xfs: merge xfs_lrw.c into xfs_file.c xfs: fix dquota trace format ... commit 05c5cb31ec47cacf38db56d9efaa37ca9d473132 Merge: 4582a30 4ea41e2 Author: Linus Torvalds Date: Sat Mar 6 11:31:38 2010 -0800 Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: (22 commits) nfsd4: fix minor memory leak svcrpc: treat uid's as unsigned nfsd: ensure sockets are closed on error Revert "sunrpc: move the close processing after do recvfrom method" Revert "sunrpc: fix peername failed on closed listener" sunrpc: remove unnecessary svc_xprt_put NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN xfs_export_operations.commit_metadata commit_metadata export operation replacing nfsd_sync_dir lockd: don't clear sm_monitored on nsm_reboot_lookup lockd: release reference to nsm_handle in nlm_host_rebooted nfsd: Use vfs_fsync_range() in nfsd_commit NFSD: Create PF_INET6 listener in write_ports SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found" SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt() NFSD: Support AF_INET6 in svc_addsock() function SUNRPC: Use rpc_pton() in ip_map_parse() nfsd: 4.1 has an rfc number nfsd41: Create the recovery entry for the NFSv4.1 client nfsd: use vfs_fsync for non-directories ... commit 4582a30c2fdca5d2b40f63a20ea082b93230ff2b Merge: 9cc0cb3 6e9065d Author: Linus Torvalds Date: Sat Mar 6 11:30:18 2010 -0800 Merge git://git.infradead.org/ubi-2.6 * git://git.infradead.org/ubi-2.6: UBI: add write checking UBI: simplify debugging return codes UBI: fix attaching error path UBI: support attaching by MTD character device name UBI: mark few variables as __initdata commit 9cc0cb3c7d54f320b9eede6f4a49072ecadd864d Author: Denis Turischev Date: Fri Mar 5 13:44:39 2010 -0800 gpio: introduce it8761e_gpio driver for IT8761E Super I/O chip Signed-off-by: Denis Turischev Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8a5164c297c16c2f4be776714ca47dba252cc3d Author: Ben Gardner Date: Fri Mar 5 13:44:38 2010 -0800 gpio: cs5535-gpio: fix input direction The cs5535-gpio driver's get() function was returning the output value. This means that the GPIO pins would never work as an input, even if configured as an input. The driver should return the READ_BACK value, which is the sensed line value. To make that work when the direction is 'output', INPUT_ENABLE needs to be set. In addition, the driver was not disabling OUTPUT_ENABLE when the direction is set to 'input'. That would cause the GPIO to continue to drive the pin if the direction was ever set to output. This issue was noticed when attempting to use the gpiolib driver to read an external input. I had previously been using the char/cs5535-gpio driver. Signed-off-by: Ben Gardner Acked-by: Andres Salomon Cc: Andrew Morton Cc: David Brownell Cc: Mark Brown Cc: [2.6.33.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89ea8bbe9c3eb2ea0cb57a4ecf283cab7326f0b0 Author: Marc Zyngier Date: Fri Mar 5 13:44:36 2010 -0800 gpio: pca953x.c: add interrupt handling capability Most of the GPIO expanders controlled by the pca953x driver are able to report changes on the input pins through an *INT pin. This patch implements the irq_chip functionality (edge detection only). The driver has been tested on an Arcom Zeus. [akpm@linux-foundation.org: the compiler does inlining for us nowadays] Signed-off-by: Marc Zyngier Cc: Eric Miao Cc: Haojian Zhuang Cc: David Brownell Cc: Nate Case Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c35c89aa3d7e0f253c3a10456a8b075288b4565 Author: Richard Röjfors Date: Fri Mar 5 13:44:35 2010 -0800 timbgpio: add support for interrupt triggering on both flanks Introduce support for triggering interrupts on both rising and falling edge. This feature requires version 3 or newer of the IP, a version check is done when triggering on both edges is requested. Signed-off-by: Richard Röjfors Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e45f1d1155894e6f4291f5536b224874d52d8e2 Author: Eric Miao Date: Fri Mar 5 13:44:35 2010 -0800 gpio: introduce gpio_request_one() and friends gpio_request() without initial configuration of the GPIO is normally useless, introduce gpio_request_one() together with GPIOF_ flags for input/output direction and initial output level. gpio_{request,free}_array() for multiple GPIOs. Signed-off-by: Eric Miao Cc: David Brownell Cc: Ben Nizette Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62fecb70cfaa9b4c6aa1981acd53b18f4ad925f0 Author: Olof Johansson Date: Fri Mar 5 13:44:34 2010 -0800 pca953x: minor include cleanup linux/i2c/pca953x.h is a very bare include file. Fix check for multiple includes of linux/i2c/pca953x.h, and add dependent includes into the header file. Signed-off-by: Olof Johansson Acked-by: Wolfram Sang Acked-by: Jean Delvare Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e952805d2d2e706aed182723e5ab3ec0b1f91de3 Author: Wolfram Sang Date: Fri Mar 5 13:44:33 2010 -0800 gpio: add driver for MAX7300 I2C GPIO extender Add the MAX7300-I2C variant of the MAX7301-SPI version. Both chips share the same core logic, so the generic part of the in-kernel SPI-driver is refactored into a generic part. The I2C and SPI specific funtions are then wrapped into seperate drivers picking up the generic part. Signed-off-by: Wolfram Sang Cc: Juergen Beisert Cc: David Brownell Cc: Jean Delvare Cc: Anton Vorontsov Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a98c04d78c896d52baef20ffc11f6d1ba6eb786 Author: James Hogan Date: Fri Mar 5 13:44:31 2010 -0800 rtc-coh901331: fix braces in resume code The else part of the if statement is indented but does not have braces around it. It clearly should since it uses clk_enable and clk_disable which are supposed to balance. Signed-off-by: James Hogan Acked-by: Linus Walleij Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9407351d7cce01a9ada942f00201e92e2541d9cb Author: Uwe Kleine-König Date: Fri Mar 5 13:44:30 2010 -0800 rtc/mc13783: implement alarm Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c014e872e02baa5b0bde38b2b2867ccf1f9df76 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:30 2010 -0800 rtc/mc13783: protect rtc {,un}registration by mc13783 lock This is to protect from interrupt handlers using an unregistered rtc device. To assert that the reset irq is considered now before the rtc is registered the corresponding status is checked before. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c3400810a7a33e176bf33b6b074d881e829374 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:29 2010 -0800 mfd/mc13783: new function reading irq mask and status register The driver for the mc13783 rtc needs to know if the TODA irq is pending. Instead of tracking in the rtc driver if the irq is enabled provide that information, too. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:28 2010 -0800 rtc/mc13783: don't use deprecated mc13783 API calls mc13783_ackirq, mc13783_unmask and mc13783_mask are deprecated, use the drop in replacements with the nicer names. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a83319182afe9ba7d958180b3bd3a32a9e3d1be Author: Uwe Kleine-König Date: Fri Mar 5 13:44:26 2010 -0800 input/mc13783-ts: don't use deprecated mc13783 API calls mc13783_ackirq is deprecated, use the drop in replacement mc13783_irq_ack. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Acked-by: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57205026da070b59e9546df352fe465f1aeacf99 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:25 2010 -0800 mc13783: rename mc13783_{{un,}mask,ack_irq} to have a mc13783_irq prefix In the source file group these functions together. The mc13783 header file provides fallback implementations for the old names to prevent build failures. When all users of the old names are fixed to use the new names these can go away. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7a06a0cdd86d572e91657603180da5992be6d3 Author: Aaro Koskinen Date: Fri Mar 5 13:44:24 2010 -0800 rtc-core: fix memory leak The idr should be destroyed when the module is unloaded. Found with kmemleak. Signed-off-by: Aaro Koskinen Cc: Alessandro Zummo Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e84067b6e557b0b85cdbceaf9a9189fc2c26536 Author: Tobias Klauser Date: Fri Mar 5 13:44:23 2010 -0800 rtc-twl: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 870a2761a8df7dea7449b4225c9babcf22c6ead4 Author: Julia Lawall Date: Fri Mar 5 13:44:23 2010 -0800 rtc-at91sam9: Correct size given to memset Memset should be given the size of the structure, not the size of the pointer. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ type T; T *x; expression E; @@ memset(x, E, sizeof( + * x)) // Signed-off-by: Julia Lawall Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b51e8293182764ca7b1a1bdb28a5c5dc60152c76 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:21 2010 -0800 rtc-pcf2123: move pcf2123_remove to .devexit.text The function pcf2123_remove is used only wrapped by __devexit_p so define it using __devexit. Signed-off-by: Uwe Kleine-König Signed-off-by: Alessandro Zummo Cc: Christian Pellegrin Cc: Chris Verges Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4877d2b3678f4455f2b8b0211868ac57c3b1ff6 Author: H Hartley Sweeten Date: Fri Mar 5 13:44:20 2010 -0800 rtc-ep93xx.c: cleanup probe/remove routines Fix issue with rtc device not getting unregistered in probe error path. Use the devres managed resource functions in the probe routine to cleanup the error path. Use sysfs_{create/remove}_group to add/remove the sysfs files. Reduces the text size by 132 bytes, increases data by 12 bytes: text data bss dec hex filename - 937 124 0 1061 425 rtc-ep93xx.o + 805 136 0 941 3ad rtc-ep93xx.o Signed-off-by: H Hartley Sweeten Acked-by: Alessandro Zummo Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49908e739e23e2672d3efb9b1a35f877f8e86342 Author: Alexander Beregalov Date: Fri Mar 5 13:44:19 2010 -0800 rtc: mxc: fix memory leak Free pdata before exit. Found by cppcheck. [yuasa@linux-mips.org: add missing iounmap()] Signed-off-by: Alexander Beregalov Reviewed-by: WANG Cong Acked-by: Daniel Mack Acked-by: Alessandro Zummo Cc Yoichi Yuasa Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27fb7f009bdb1ff13d4e4c008a2fd36b2305055b Author: Randy Dunlap Date: Fri Mar 5 13:44:18 2010 -0800 xen: add kconfig menu Currently the xen support drivers are displayed in the main Device Drivers menu of the config tools instead of in their own sub-menu, so move them to their own sub-menu, like the rest of the driver world uses. This keeps the main Device Drivers menu from becoming messy. Signed-off-by: Randy Dunlap Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aed359df4d82c38145d95957b741f0b08d24074 Author: Thiago Farina Date: Fri Mar 5 13:44:17 2010 -0800 console/vgacon.c: mark file-local symbol static warning: symbol 'vgacon_text_mode_force' was not declared. Should it be static? Signed-off-by: Thiago Farina Acked-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a52712af5a7473b9f85d8499153f4bbfe875f942 Author: Amerigo Wang Date: Fri Mar 5 13:44:17 2010 -0800 console: limit the range of VGACON_SOFT_SCROLLBACK_SIZE BuraphaLinux reported that we will trigger a mm warning when we CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=65536, this is because mm cann't allocate so many pages. We should limit the range of CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, don't give a user any chance to trigger that. Reported-by: BuraphaLinux Server Tested-by: BuraphaLinux Server Signed-off-by: WANG Cong Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76595f79d76fbe6267a51b3a866a028d150f06d4 Author: Neil Horman Date: Fri Mar 5 13:44:16 2010 -0800 coredump: suppress uid comparison test if core output files are pipes Modify uid check in do_coredump so as to not apply it in the case of pipes. This just got noticed in testing. The end of do_coredump validates the uid of the inode for the created file against the uid of the crashing process to ensure that no one can pre-create a core file with different ownership and grab the information contained in the core when they shouldn' tbe able to. This causes failures when using pipes for a core dumps if the crashing process is not root, which is the uid of the pipe when it is created. The fix is simple. Since the check for matching uid's isn't relevant for pipes (a process can't create a pipe that the uermodehelper code will open anyway), we can just just skip it in the event ispipe is non-zero Reverts a pipe-affecting change which was accidentally made in : commit c46f739dd39db3b07ab5deb4e3ec81e1c04a91af : Author: Ingo Molnar : AuthorDate: Wed Nov 28 13:59:18 2007 +0100 : Commit: Linus Torvalds : CommitDate: Wed Nov 28 10:58:01 2007 -0800 : : vfs: coredumping fix Signed-off-by: Neil Horman Cc: Andi Kleen Cc: Oleg Nesterov Cc: Alan Cox Cc: Al Viro Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c99cbf49a6e1a1efd25b11f4604c65c455e1612 Author: Oleg Nesterov Date: Fri Mar 5 13:44:14 2010 -0800 coredump: set ->group_exit_code for other CLONE_VM tasks too User visible change. do_coredump() kills all threads which share the same ->mm but only the coredumping process gets the proper exit_code. Other tasks which share the same ->mm die "silently" and return status == 0 to parent. This is historical behaviour, not actually a bug. But I think Frank Heckenbach rightly dislikes the current behaviour. Simple test-case: #include #include #include #include int main(void) { int stat; if (!fork()) { if (!vfork()) kill(getpid(), SIGQUIT); } wait(&stat); printf("stat=%x\n", stat); return 0; } Before this patch it prints "stat=0" despite the fact the child was killed by SIGQUIT. After this patch the output is "stat=3" which obviously makes more sense. Even with this patch, only the task which originates the coredumping gets "|= 0x80" if the core was actually dumped, but at least the coredumping signal is visible to do_wait/etc. Reported-by: Frank Heckenbach Signed-off-by: Oleg Nesterov Acked-by: WANG Cong Cc: Roland McGrath Cc: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30736a4d43f4af7f1a7836d6a266be17082195c4 Author: Masami Hiramatsu Date: Fri Mar 5 13:44:12 2010 -0800 coredump: pass mm->flags as a coredump parameter for consistency Pass mm->flags as a coredump parameter for consistency. --- 1787 if (mm->core_state || !get_dumpable(mm)) { <- (1) 1788 up_write(&mm->mmap_sem); 1789 put_cred(cred); 1790 goto fail; 1791 } 1792 [...] 1798 if (get_dumpable(mm) == 2) { /* Setuid core dump mode */ <-(2) 1799 flag = O_EXCL; /* Stop rewrite attacks */ 1800 cred->fsuid = 0; /* Dump root private */ 1801 } --- Since dumpable bits are not protected by lock, there is a chance to change these bits between (1) and (2). To solve this issue, this patch copies mm->flags to coredump_params.mm_flags at the beginning of do_coredump() and uses it instead of get_dumpable() while dumping core. This copy is also passed to binfmt->core_dump, since elf*_core_dump() uses dump_filter bits in mm->flags. [akpm@linux-foundation.org: fix merge] Signed-off-by: Masami Hiramatsu Acked-by: Roland McGrath Cc: Hidehiro Kawai Cc: Oleg Nesterov Cc: Ingo Molnar Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d9032bbe4671dc481261ccd4e161cd96e54b118 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:10 2010 -0800 elf coredump: add extended numbering support The current ELF dumper implementation can produce broken corefiles if program headers exceed 65535. This number is determined by the number of vmas which the process have. In particular, some extreme programs may use more than 65535 vmas. (If you google max_map_count, you can find some users facing this problem.) This kind of program never be able to generate correct coredumps. This patch implements ``extended numbering'' that uses sh_info field of the first section header instead of e_phnum field in order to represent upto 4294967295 vmas. This is supported by AMD64-ABI(http://www.x86-64.org/documentation.html) and Solaris(http://docs.sun.com/app/docs/doc/817-1984/). Of course, we are preparing patches for gdb and binutils. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93eb211e6c9ff6054fcf9c5b9e344d8d9ad29175 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:09 2010 -0800 elf coredump: make offset calculation process and writing process explicit By the next patch, elf_core_dump() and elf_fdpic_core_dump() will support extended numbering and so will produce the corefiles with section header table in a special case. The problem is the process of writing a file header offset of the section header table into e_shoff field of the ELF header. ELF header is positioned at the beginning of the corefile, while section header at the end. So, we need to take which of the following ways: 1. Seek backward to retry writing operation for ELF header after writing process for a whole part 2. Make offset calculation process and writing process totally sequential The clause 1. is not always possible: one cannot assume that file system supports seek function. Consider the no_llseek case. Therefore, this patch adopts the clause 2. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fcccbac89f5bbc5e41aa72086960059fce372da Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:07 2010 -0800 elf coredump: replace ELF_CORE_EXTRA_* macros by functions elf_core_dump() and elf_fdpic_core_dump() use #ifdef and the corresponding macro for hiding _multiline_ logics in functions. This patch removes #ifdef and replaces ELF_CORE_EXTRA_* by corresponding functions. For architectures not implemeonting ELF_CORE_EXTRA_*, we use weak functions in order to reduce a range of modification. This cleanup is for my next patches, but I think this cleanup itself is worth doing regardless of my firnal purpose. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 088e7af73a962fcc8883b7a6392544d8342553d6 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:06 2010 -0800 coredump: move dump_write() and dump_seek() into a header file My next patch will replace ELF_CORE_EXTRA_* macros by functions, putting them into other newly created *.c files. Then, each files will contain dump_write(), where each pair of binfmt_*.c and elfcore.c should be the same. So, this patch moves them into a header file with dump_seek(). Also, the patch deletes confusing DUMP_WRITE macros in each files. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05f47fda9fc5b17bfab189e9d54228025befc996 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:05 2010 -0800 coredump: unify dump_seek() implementations for each binfmt_*.c The current ELF dumper can produce broken corefiles if program headers exceed 65535. In particular, the program in 64-bit environment often demands more than 65535 mmaps. If you google max_map_count, then you can find many users facing this problem. Solaris has already dealt with this issue, and other OSes have also adopted the same method as in Solaris. Currently, Sun's document and AMD 64 ABI include the description for the extension, where they call the extension Extended Numbering. See Reference for further information. I believe that linux kernel should adopt the same way as they did, so I've written this patch. I am also preparing for patches of GDB and binutils. How to fix ========== In new dumping process, there are two cases according to weather or not the number of program headers is equal to or more than 65535. - if less than 65535, the produced corefile format is exactly the same as the ordinary one. - if equal to or more than 65535, then e_phnum field is set to newly introduced constant PN_XNUM(0xffff) and the actual number of program headers is set to sh_info field of the section header at index 0. Compatibility Concern ===================== * As already mentioned in Summary, Sun and AMD64 has already adopted this. See Reference. * There are four combinations according to whether kernel and userland tools are respectively modified or not. The next table summarizes shortly for each combination. --------------------------------------------- Original Kernel | Modified Kernel --------------------------------------------- < 65535 | >= 65535 | < 65535 | >= 65535 ------------------------------------------------------------- Original Tools | OK | broken | OK | broken (#) ------------------------------------------------------------- Modified Tools | OK | broken | OK | OK ------------------------------------------------------------- Note that there is no case that `OK' changes to `broken'. (#) Although this case remains broken, O-M behaves better than O-O. That is, while in O-O case e_phnum field would be extremely small due to integer overflow, in O-M case it is guaranteed to be at least 65535 by being set to PN_XNUM(0xFFFF), much closer to the actual correct value than the O-O case. Test Program ============ Here is a test program mkmmaps.c that is useful to produce the corefile with many mmaps. To use this, please take the following steps: $ ulimit -c unlimited $ sysctl vm.max_map_count=70000 # default 65530 is too small $ sysctl fs.file-max=70000 $ mkmmaps 65535 Then, the program will abort and a corefile will be generated. If failed, there are two cases according to the error message displayed. * ``out of memory'' means vm.max_map_count is still smaller * ``too many open files'' means fs.file-max is still smaller So, please change it to a larger value, and then retry it. mkmmaps.c == #include #include #include #include #include int main(int argc, char **argv) { int maps_num; if (argc < 2) { fprintf(stderr, "mkmmaps [number of maps to be created]\n"); exit(1); } if (sscanf(argv[1], "%d", &maps_num) == EOF) { perror("sscanf"); exit(2); } if (maps_num < 0) { fprintf(stderr, "%d is invalid\n", maps_num); exit(3); } for (; maps_num > 0; --maps_num) { if (MAP_FAILED == mmap((void *)NULL, (size_t) 1, PROT_READ, MAP_SHARED | MAP_ANONYMOUS, (int) -1, (off_t) NULL)) { perror("mmap"); exit(4); } } abort(); { char buffer[128]; sprintf(buffer, "wc -l /proc/%u/maps", getpid()); system(buffer); } return 0; } Tested on i386, ia64 and um/sys-i386. Built on sh4 (which covers fs/binfmt_elf_fdpic.c) References ========== - Sun microsystems: Linker and Libraries. Part No: 817-1984-17, September 2008. URL: http://docs.sun.com/app/docs/doc/817-1984 - System V ABI AMD64 Architecture Processor Supplement Draft Version 0.99., May 11, 2009. URL: http://www.x86-64.org/ This patch: There are three different definitions for dump_seek() functions in binfmt_aout.c, binfmt_elf.c and binfmt_elf_fdpic.c, respectively. The only for binfmt_elf.c. My next patch will move dump_seek() into a header file in order to share the same implementations for dump_write() and dump_seek(). As the first step, this patch unify these three definitions for dump_seek() by applying the past commits that have been applied only for binfmt_elf.c. Specifically, the modification made here is part of the following commits: * d025c9db7f31fc0554ce7fb2dfc78d35a77f3487 * 7f14daa19ea36b200d237ad3ac5826ae25360461 This patch does not change a shape of corefiles. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12bac0d9f4dbf3445a0319beee848d15fa32775e Author: Alexey Dobriyan Date: Fri Mar 5 13:44:00 2010 -0800 proc: warn on non-existing proc entries * warn if creation goes on to non-existent directory * warn if removal goes on from non-existing directory * warn if non-existing proc entry is removed Signed-off-by: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17a5765f20d1219c3f05eb17aab11671978e0ec Author: Alexey Dobriyan Date: Fri Mar 5 13:43:59 2010 -0800 proc: do translation + unlink atomically at remove_proc_entry() remove_proc_entry() does lock lookup parent unlock lock unlink proc entry from lists unlock which can be made bit more correct by doing parent translation + unlink without dropping lock. Signed-off-by: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5748150eabdacd3f870c311b63d32f5e312bf624 Author: José Miguel Gonçalves Date: Fri Mar 5 13:43:58 2010 -0800 drivers/hwmon/adcxx.c: fix for single-channel ADCs While testing an ADC121S021 in an embedded board with a S3C2142 SoC (ARM core), I have found that the 'adcxx' driver does not handle correctly single channel ADCs from this chip family. For single channel chips you must only issue one read transfer for correct measurement. Signed-off-by: Jose Miguel Goncalves Cc: Marc Pignat Cc: Anton Vorontsov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cae787840ae82aa02649f45c46839b349034435 Author: Joe Perches Date: Fri Mar 5 13:43:56 2010 -0800 drivers/hwmon/vt8231.c: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Cc: Roger Lucas Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f2a9463d18517a9839401c3de6419ee1435875b Author: Joakim Tjernlund Date: Fri Mar 5 13:43:55 2010 -0800 crc32: some minor cleanups Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e79d96eed306a8b4af67b3f35f6867edfabeebc Author: Joe Perches Date: Fri Mar 5 13:43:55 2010 -0800 checkpatch: warn on unnecessary spaces before quoted newlines Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08e4436566250cb98b3f3ac37643b1cf09481256 Author: Alberto Panizzo Date: Fri Mar 5 13:43:54 2010 -0800 checkpatch.pl: warn if an adding line introduce spaces before tabs. Signed-off-by: Alberto Panizzo Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79404849e90a41ea2109bd0e2f7c7164b0c4ce73 Author: Emese Revfy Date: Fri Mar 5 13:43:53 2010 -0800 checkpatch.pl: extend list of expected-to-be-const structures Based on Arjan's suggestion, extend the list of ops structures that should be const. Signed-off-by: Emese Revfy Cc: Andy Whitcroft Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22fd2d3e4f75a2596ccdfdcbdfd505c9c60bf346 Author: Stefani Seibold Date: Fri Mar 5 13:43:52 2010 -0800 checkpatch.pl: add union and struct to the exceptions list Here is a small code snippet, which will be complained about by checkpatch.pl: #define __STRUCT_KFIFO_COMMON(recsize, ptrtype) \ union { \ struct { \ unsigned int in; \ unsigned int out; \ }; \ char rectype[recsize]; \ ptrtype *ptr; \ const ptrtype *ptr_const; \ }; This construct is legal and safe, so checkpatch.pl should accept this. It should be also true for struct defined in a macro. Add the `struct' and `union' keywords to the exceptions list of the checkpatch.pl script, to prevent error message "Macros with multiple statements should be enclosed in a do - while loop". Otherwise it is not possible to build a struct or union with a macro. Signed-off-by: Stefani Seibold Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52131292c069b74f4b5f3c786ff66ff6e82b0e69 Author: Wolfram Sang Date: Fri Mar 5 13:43:51 2010 -0800 checkpatch: fix false positive on __initconst checkpatch falsely complained about '__initconst' because it thought the 'const' needed a space before. Fix this by changing the list of attributes: - add '__initconst' - force plain 'init' to contain a word-boundary at the end Signed-off-by: Wolfram Sang Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 691e669ba8c64d31ac08d87b1751e6acfa3ff65e Author: Joe Perches Date: Fri Mar 5 13:43:51 2010 -0800 checkpatch.pl: allow > 80 char lines for logging functions not just printk Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42bdf74c95b6935f3c09a09ba4bead6cad11b540 Author: Hidetoshi Seto Date: Fri Mar 5 13:43:50 2010 -0800 checkpatch: trivial fix for trailing statements check In case if the statement and the conditional are in one line, the line appears in the report doubly. And items of this check have no blank line before the next item. This patch fixes these trivial problems, to improve readability of the report. [sample.c] > if (cond1 > && cond2 > && cond3) func_foo(); > > if (cond4) func_bar(); Before: > ERROR: trailing statements should be on next line > #1: FILE: sample.c:1: > +if (cond1 > [...] > + && cond3) func_foo(); > ERROR: trailing statements should be on next line > #5: FILE: sample.c:5: > +if (cond4) func_bar(); > +if (cond4) func_bar(); > total: 2 errors, 0 warnings, 5 lines checked After: > ERROR: trailing statements should be on next line > #1: FILE: sample.c:1: > +if (cond1 > [...] > + && cond3) func_foo(); > > ERROR: trailing statements should be on next line > #5: FILE: sample.c:5: > +if (cond4) func_bar(); > > total: 2 errors, 0 warnings, 5 lines checked Signed-off-by: Hidetoshi Seto Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f53a9b80f011080555c498d2ca2dc6b1a77c42c Author: Joe Perches Date: Fri Mar 5 13:43:48 2010 -0800 scripts/checkpatch.pl: add WARN on sizeof(&foo) sizeof(&foo) is frequently an error. Warn on its use. Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 849382948992cc6482c778b1e854c19368b60c05 Author: Vasily Khoruzhick Date: Fri Mar 5 13:43:46 2010 -0800 mmc: enable DMA on Ricoh sdhci reader by default This card reader doesn't advertise, however DMA works well. Probably windows SDHCI driver assumes that all readers support DMA and thus we see that bug. Signed-off-by: Vasily Khoruzhick Tested-by: Maxim Levitsky Signed-off-by: Maxim Levitsky Cc: Harald Welte Cc: Norbert Preining Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 752993ef8e40d1863b26c7dc51e12223588d0fe0 Author: Nicolas Ferre Date: Fri Mar 5 13:43:45 2010 -0800 mmc: at91_mci: correct kunmap_atomic() kunmap_atomic() accepts a pointer to any location in the page so we do not need the subtraction and cast. Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b27a1a566c5a4cce81d75107a0f130e43c6a5f8 Author: Nicolas Ferre Date: Fri Mar 5 13:43:44 2010 -0800 mmc: at91_mci: introduce per-mci-revision conditional code We used to manage features and differences on a per-cpu basis. As several cpus share the same mci revision, this patch aggregates cpus that have the same IP revision in one defined constant. We use the at91mci_is_mci1rev2xx() funtion name not to mess with newer Atmel sd/mmc IP called "MCI2". _rev2 naming could have been confusing... Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 541e7ef0399c6c5753cc8d3e8f371dcb3627e8a4 Author: Nicolas Ferre Date: Fri Mar 5 13:43:43 2010 -0800 mmc: at91_mci: Enable MMC_CAP_SDIO_IRQ only when it actually works. According to the datasheets AT91SAM9261 does not support SDIO interrupts, and AT91SAM9260/9263 have an erratum requiring 4bit mode while using slot B for the interrupt to work. Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af13be2acac60ca5593e41a601d4a5b6bc35302 Author: Wolfgang Muees Date: Fri Mar 5 13:43:42 2010 -0800 mmc: at91_mci: enable large data blocks This patch is setting some max_ variables for the IO elevator, so the elevator will put requests for large data blocks to the driver. This is critical for a) speed and b) wear leveling of the flash chip controller: Otherwise the controller will treat the SD card badly with millions of single 4 KByte write commands. This will lead to a shorter life time for the SD cards. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86ee26f5b0a889bf7e9f6351bbf01516d0686461 Author: Wolfgang Muees Date: Fri Mar 5 13:43:41 2010 -0800 mmc: at91_mci: use DMA buffer for read Convert the read to use the DMA buffer as well. The old code was doing double-buffering DMA with the PDC; no way to make it work. Replace it with a single-PDC approach. It also simplify things removing the need for a pre_dma_read() function. [nicolas.ferre@atmel.com coding style modifications] Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3780d90602dfef6df3d8b39b203d6bf7fb99f22a Author: Wolfgang Muees Date: Fri Mar 5 13:43:40 2010 -0800 mmc: at91_mci: use one coherent DMA buffer The TX DMA buffer is allocated only once, because the allocation/deallocation of the buffer for EACH chunk of data is time-consuming and prone to memory fragmentation. Using a coherent DMA buffer avoids extra data cache calls. [nicolas.ferre@atmel.com: coding style modifications] Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a04ac5b9b45a7adec7d3ee3968e677b6e4b98f25 Author: Wolfgang Muees Date: Fri Mar 5 13:43:39 2010 -0800 mmc: at91_mci: fix timeout errors Fix two timeout errors, one for slow SDHC cards and one for slow users while inserting SD cards. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b3520f2df8e4e5dad6a7b2743d037bf06c22024 Author: Wolfgang Muees Date: Fri Mar 5 13:43:38 2010 -0800 mmc: at91_mci: fix pointer errors Fixes two pointer errors, one which leads to memory overwrites if used with large chunks of data. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 Author: Lars-Peter Clausen Date: Fri Mar 5 13:43:37 2010 -0800 s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin Signed-off-by: Lars-Peter Clausen Cc: Ben Dooks Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c212808a1ba6bfba489006399b8152a047305acf Author: Lars-Peter Clausen Date: Fri Mar 5 13:43:35 2010 -0800 s3cmci: initialize default platform data no_wprotect and no_detect with 1 If no platform_data was givin to the device it's going to use it's default platform data struct which has all fields initialized to zero. As a result the driver is going to try to request gpio0 both as write protect and card detect pin. Which of course will fail and makes the driver unusable Previously to the introduction of no_wprotect and no_detect the behavior was to assume that if no platform data was given there is no write protect or card detect pin. This patch restores that behavior. Signed-off-by: Lars-Peter Clausen Cc: Ben Dooks Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b5eda369ac3772dad416ef96d86064204d74770 Author: Daniel Drake Date: Fri Mar 5 13:43:34 2010 -0800 sdio: put active devices into 1-bit mode during suspend And bring them back to 4-bit mode during resume. Signed-off-by: Daniel Drake Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40216842dca4fa485cb1aa5eb231149a4a57cc85 Author: Nicolas Pitre Date: Fri Mar 5 13:43:34 2010 -0800 sdio: kick the interrupt thread upon a resume Some SDIO cards may suspend while keeping function interrupts active especially in the powered suspend case. Upon resume we need to kick the SDIO interrupt thread to check for pending interrupts and to restart card IRQ detection at the host controller level. Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bca4cf703826fcb2bbabbe19c6fc7b2fc4fd7cc Author: Chris Ball Date: Fri Mar 5 13:43:33 2010 -0800 sdio: don't use CMD[357] as part of a powered SDIO resume Seen on a Marvell 8686 SDIO card and Via VX855 controller: we must avoid sending CMD3/5/7 on a resume where power has been maintained, because the 8686 will refuse to respond to them and the MMC stack will give up on the card. Signed-off-by: Chris Ball Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4cbb3d834922ffa0309b6a08fa42dac87ef9d2 Author: Nicolas Pitre Date: Fri Mar 5 13:43:32 2010 -0800 sdio: sdhci support for suspend mode PM features Tested with an XO v1.5 from OLPC. Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da68c4eb258cd9f3f0b8aeb7e46b8118bb6358b6 Author: Nicolas Pitre Date: Fri Mar 5 13:43:31 2010 -0800 sdio: introduce API for special power management features This patch series provides the core changes needed to allow SDIO cards to remain powered and active while the host system is suspended, and let them wake up the host system when needed. This is used to implement wake-on-lan with SDIO wireless cards at the moment. Patches to add that support to the libertas driver will be posted separately. This patch: Some SDIO cards have the ability to keep on running autonomously when the host system is suspended, and wake it up when needed. This however requires that the host controller preserve power to the card, and configure itself appropriately for wake-up. There is however 4 layers of abstractions involved: the host controller driver, the MMC core code, the SDIO card management code, and the actual SDIO function driver. To make things simple and manageable, host drivers must advertise their PM capabilities with a feature bitmask, then function drivers can query and set those features from their suspend method. Then each layer in the suspend call chain is expected to act upon those bits accordingly. [akpm@linux-foundation.org: fix typo in comment] Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e506f35b1dc327c448d4791bc098f07b9b2efe9 Author: Ben Dooks Date: Fri Mar 5 13:43:29 2010 -0800 sdhci: improve sdhci sdhci_set_adma_desc() code sdhci_set_adma_desc() is using byte-writes to write data in a specified order into memory. Change to using __le16 for the two byte and __le32 for the four byte cases and use the cpu_to_{le16,le32} to do the conversion before writing. This will reduce the size of the code and the number of writes as we no longer need to chop the data up before writing. As an example on ARM S3C64XX SoC, in little-endian configuration: 000000d4 : - d8: e1a0c423 lsr ip, r3, #8 - dc: e1a0ec21 lsr lr, r1, #24 - e0: e1a04821 lsr r4, r1, #16 - e4: e1a05421 lsr r5, r1, #8 - e8: e1a06442 asr r6, r2, #8 - ec: e5c0c001 strb ip, [r0, #1] - f0: e5c0e007 strb lr, [r0, #7] - f4: e5c04006 strb r4, [r0, #6] - f8: e5c05005 strb r5, [r0, #5] - fc: e5c01004 strb r1, [r0, #4] - 100: e5c06003 strb r6, [r0, #3] - 104: e5c02002 strb r2, [r0, #2] - 108: e5c03000 strb r3, [r0] + d4: e5801004 str r1, [r0, #4] + d8: e1c030b0 strh r3, [r0] + dc: e1c020b2 strh r2, [r0, #2] Signed-off-by: Ben Dooks Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 118cd17d4137f34c747c32765c1cb4d3910c04d4 Author: Ben Dooks Date: Fri Mar 5 13:43:26 2010 -0800 sdhci: add adma descriptor set call The code to write the ADMA descriptor into memory is repeated several times throughout sdhci_adma_table_pre, and thus should be moved into a common function. This will also be useful if the patch to make the write more efficient is accepted. Signed-off-by: Ben Dooks Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fb7fb4a01d09f81d1daaf65e52d929734bd691f Author: Bing Zhao Date: Fri Mar 5 13:43:25 2010 -0800 sdio: add quirk to clamp byte mode transfer Some SDIO cards expect byte transfers not to exceed the configured block transfer size. Add a quirk to that effect. Patches to make use of this quirk will be sent separately. Signed-off-by: Bing Zhao Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 729adf1b5f4562f67fe8bf6c1df97edc1128fac7 Author: Cliff Cai Date: Fri Mar 5 13:43:25 2010 -0800 mmc: bfin_sdh: set timeout based on actual card data The hardcoded value doesn't really work for all cards. Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05dabcc4a51eab7342b2220f0121b4f4a5109386 Author: Mike Frysinger Date: Fri Mar 5 13:43:24 2010 -0800 mmc: bfin_sdh: drop redundant MMC depend string The host/Kconfig file is only included when MMC is selected. Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c744d988729db9be37d1c877d143cfe63941c25c Author: Mike Frysinger Date: Fri Mar 5 13:43:23 2010 -0800 mmc: bfin_sdh: fix unused sg warning on BF51x/BF52x systems The local sg variable is only used with BF54x code. Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09591dd3183d5aeae515bd5fcba718ec49e11ece Author: Nicolas Ferre Date: Fri Mar 5 13:43:22 2010 -0800 mmc: Atmel host kconfig cleanup for everyone else This prevents those without an Atmel chip having a line in kernel configuration which says "Atmel SD/MMC Driver" without any option. Signed-off-by: Jonathan Cameron Signed-off-by: Nicolas Ferre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 132f10746c2bb2e4bcfc3fadff12f390ace2d183 Author: Vipin Bhandari Date: Fri Mar 5 13:43:21 2010 -0800 davinci: MMC: add support for 8bit MMC cards Add support for 8bit MMC cards. The controller data width is configurable depending on the wires setting in the platform data structure. MMC 8bit is tested on OMAPL137 and MMC 4bit is tested on OMAPL138 EVM. Signed-off-by: Vipin Bhandari Cc: David Brownell Cc: Chaithrika U S Cc: Sudhakar Rajashekhara Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03cd8f7ebe0cbef5ca7eed349774085e92a3d726 Author: Maxim Levitsky Date: Fri Mar 5 13:43:20 2010 -0800 ricoh_mmc: port from driver to pci quirk This patch solves nasty problem original driver has. Original goal of the ricoh_mmc was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding writing of yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into the pci quirk section, thus it is executes before the pci is enumerated, and therefore solving that issue, also same sequence of commands is performed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky Acked-by: Philip Langdale Acked-by: Wolfram Sang Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45bf5cd7be624712ef1591e9de71f0ff7ad21cf1 Author: Andrew Morton Date: Fri Mar 5 13:43:19 2010 -0800 fs/compat_ioctl.c: suppress two warnings fs/compat_ioctl.c: In function 'do_ioctl_trans': fs/compat_ioctl.c:534: warning: 'karg' may be used uninitialized in this function fs/compat_ioctl.c:533: warning: 'kcmd' may be used uninitialized in this function fs/compat_ioctl.c:656: warning: 'ret' may be used uninitialized in this function Reduces text size by 44 bytes. If someone calls one of these functions with an unexpected argument, the code's buggy as-is. Amerigo Wang Cc: Alexander Viro Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08564fb7ab9ead9226b6154439c3fecd17972eb0 Author: Akinobu Mita Date: Fri Mar 5 13:43:18 2010 -0800 bitmap: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a86e2bad0b9fbf3290ae496da6dab9536dd6bf7 Author: Ben Hutchings Date: Fri Mar 5 13:43:17 2010 -0800 lib: fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a069c266ae5fdfbf5b4aecf2c672413aa33b2504 Author: Don Mullis Date: Fri Mar 5 13:43:16 2010 -0800 lib: build list_sort() only if needed Build list_sort() only for configs that need it -- those that don't save ~581 bytes (i386). Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b12b7a28faa2e9ed5a361cd08ea576ab1f1509 Author: Don Mullis Date: Fri Mar 5 13:43:15 2010 -0800 lib: revise list_sort() header comment Clarify and correct header comment of list_sort(). Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 835cc0c8477fdbc59e0217891d6f11061b1ac4e2 Author: Don Mullis Date: Fri Mar 5 13:43:15 2010 -0800 lib: more scalable list_sort() XFS and UBIFS can pass long lists to list_sort(); this alternative implementation scales better, reaching ~3x performance gain when list length exceeds the L2 cache size. Stand-alone program timings were run on a Core 2 duo L1=32KB L2=4MB, gcc-4.4, with flags extracted from an Ubuntu kernel build. Object size is 581 bytes compared to 455 for Mark J. Roberts' code. Worst case for either implementation is a list length just over a power of two, and to roughly the same degree, so here are timing results for a range of 2^N+1 lengths. List elements were 16 bytes each including malloc overhead; initial order was random. time (msec) Tatham-Roberts | generic-Mullis-v2 loop_count length | | ratio 4000000 2 206 294 1.427 2000000 3 176 227 1.289 1000000 5 199 172 0.864 500000 9 235 178 0.757 250000 17 243 182 0.748 125000 33 261 196 0.750 62500 65 277 209 0.754 31250 129 292 219 0.75 15625 257 317 235 0.741 7812 513 340 252 0.741 3906 1025 362 267 0.737 1953 2049 388 283 0.729 ~ L1 size 976 4097 556 323 0.580 488 8193 678 361 0.532 244 16385 773 395 0.510 122 32769 844 418 0.495 61 65537 917 454 0.495 30 131073 1128 543 0.481 15 262145 2355 869 0.369 ~ L2 size 7 524289 5597 1714 0.306 3 1048577 6218 2022 0.325 Mark's code does not actually implement the usual or generic mergesort, but rather a variant from Simon Tatham described here: http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html Simon's algorithm performs O(log N) passes over the entire input list, doing merges of sublists that double in size on each pass. The generic algorithm instead merges pairs of equal length lists as early as possible, in recursive order. For either algorithm, the elements that extend the list beyond power-of-two length are a special case, handled as nearly as possible as a "rounding-up" to a full POT. Some intuition for the locality of reference implications of merge order may be gotten by watching this animation: http://www.sorting-algorithms.com/merge-sort Simon's algorithm requires only O(1) extra space rather than the generic algorithm's O(log N), but in my non-recursive implementation the actual O(log N) data is merely a vector of ~20 pointers, which I've put on the stack. Long-running list_sort() calls: If the list passed in may be long, or the client's cmp() callback function is slow, the client's cmp() may periodically invoke cond_resched() to voluntarily yield the CPU. All inner loops of list_sort() call back to cmp(). Stability of the sort: distinct elements that compare equal emerge from the sort in the same order as with Mark's code, for simple test cases. A boot-time test is provided to verify this and other correctness requirements. A kernel that uses drm.ko appears to run normally with this change; I have no suitable hardware to similarly test the use by UBIFS. [akpm@linux-foundation.org: style tweaks, fix comment, make list_sort_test __init] Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6a2eedfddcded92c8f9b0ac022a99c4134696b0 Author: André Goddard Rosa Date: Fri Mar 5 13:43:12 2010 -0800 lib/string.c: simplify strnstr() Signed-off-by: André Goddard Rosa Cc: Li Zefan Cc: Joe Perches Cc: Frederic Weisbecker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a11d2b64e1f2556953120d516241243ea365f0ae Author: André Goddard Rosa Date: Fri Mar 5 13:43:11 2010 -0800 lib/string.c: simplify stricmp() Removes 32 bytes on core2 with gcc 4.4.1: text data bss dec hex filename 3196 0 0 3196 c7c lib/string-BEFORE.o 3164 0 0 3164 c5c lib/string-AFTER.o Signed-off-by: André Goddard Rosa Cc: Joe Perches Cc: Frederic Weisbecker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a6e25357d51d6ecf4ee21e9048f0416a085a79c Author: Joe Perches Date: Fri Mar 5 13:43:11 2010 -0800 MAINTAINERS: document and add "Q" patchwork queue entries Patchwork queues show the acceptance/rejection state of submitted patches for various MAINTAINER trees. Document their existence. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e200e0ec9148ad2941e30d59b9552973d49a82b6 Author: Joe Perches Date: Fri Mar 5 13:43:10 2010 -0800 MAINTAINERS: WAVELAN moved to staging by commit 0234f84ebb00d36c48062befa5436eef36b71ccd Update patterns Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 931812cb1b40650e44f6bbb2acb84a129498202f Author: Joe Perches Date: Fri Mar 5 13:43:10 2010 -0800 MAINTAINERS: STARMODE RADIO IP (STRIP) moved to staging by commit 955015bb0b42167d14f776ff5947ae2463a974dc Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc95ec6fbd9e2426df76b8cf62063d2ee8e32dc2 Author: Joe Perches Date: Fri Mar 5 13:43:09 2010 -0800 MAINTAINERS: update PERFORMANCE EVENTS F: patterns To match arch/*/kernel perf_event location changes Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9582206c526be81054a8be2227e92a4403d2452 Author: Joe Perches Date: Fri Mar 5 13:43:08 2010 -0800 MAINTAINERS: remove HAYES ESP SERIAL DRIVER Commit f53a2ade0bb9f2a81f473e6469155172a96b7c38 ("tty: esp: remove broken driver") removed it Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82cc83473559e0e6da6278053c2d14448b189e0e Author: Joe Perches Date: Fri Mar 5 13:43:08 2010 -0800 MAINTAINERS: remove AMD GEODE F: arch/x86/kernel/geode_32.c Commit c95d1e53ed89b75a4d7b68d1cbae4607b1479243 ("cs5535: drop the Geode-specific MFGPT/GPIO code") removed it. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c840c18bcd8efb37f1a565e83a9509e1ea5d105 Author: Joe Perches Date: Fri Mar 5 13:43:07 2010 -0800 scripts/get_maintainer.pl: fix possible infinite loop If MAINTAINERS section entries are misformatted, it was possible to have an infinite loop. Correct the defect by always moving the index to the end of section + 1 Also, exit check for exclude as soon as possible. Signed-off-by: Joe Perches Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a63ceb4c36a7674f7efa90e8ba96b44a3989d717 Author: Stephen Hemminger Date: Fri Mar 5 13:43:06 2010 -0800 get_maintainer: quote email address with period Picky mail systems won't accept email addresses where recipient has period in name; ie. David S. Miller will not work. Signed-off-by: Stephen Hemminger Acked-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22dd5b0cba50a197aaa3bd2790a29ee2e8e4e372 Author: Stephen Hemminger Date: Fri Mar 5 13:43:06 2010 -0800 get_maintainer: fix perlcritic warnings perlcritic is a standard checker for Perl Best Practices. This patch fixes most of the warnings in the get_maintainer script. If kernel programmers are going to have checkpatch they should write clean scripts as well... Bareword file handle opened at line 176, column 1. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 176, column 1. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 207, column 5. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 207, column 5. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 246, column 6. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 246, column 6. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 258, column 2. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 258, column 2. See page 207 of PBP. (Severity: 5) Expression form of "eval" at line 983, column 17. See page 161 of PBP. (Severity: 5) Expression form of "eval" at line 985, column 17. See page 161 of PBP. (Severity: 5) Subroutine prototypes used at line 1186, column 1. See page 194 of PBP. (Severity: 5) Subroutine prototypes used at line 1206, column 1. See page 194 of PBP. (Severity: 5) Signed-off-by: Stephen Hemminger Acked-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64f77f312b15f101bf6c4c65d5359ccc16e3f82b Author: Joe Perches Date: Fri Mar 5 13:43:04 2010 -0800 scripts/get_maintainer.pl: add ability to read from STDIN Doesn't need or accept '-' as a trailing option to read stdin. Doesn't print usage() after bad options. Adds --usage as command line equivalent of --help Suggested-by: Borislav Petkov Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f11e9a1534c5e9dd4be97b30e6b24902e0ec325b Author: Joe Perches Date: Fri Mar 5 13:43:03 2010 -0800 scripts/get_maintainer.pl: change --sections to print in the same style as MAINTAINERS Signed-off-by: Joe Perches Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b76c9da611593eed6a13527c5ebd00c173624ad Author: Joe Perches Date: Fri Mar 5 13:43:03 2010 -0800 scripts/get_maintainer.pl: add --sections, print entire matched subsystem Print the complete contents of the matched subsystems in pattern match depth order. Sample output: $ ./scripts/get_maintainer.pl --sections -f drivers/net/usb/smsc95xx.c USB SMSC95XX ETHERNET DRIVER M:Steve Glendinning L:netdev@vger.kernel.org S:Supported F:drivers/net/usb/smsc95xx.* USB SUBSYSTEM M:Greg Kroah-Hartman L:linux-usb@vger.kernel.org W:http://www.linux-usb.org T:quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S:Supported F:Documentation/usb/ F:drivers/net/usb/ F:drivers/usb/ F:include/linux/usb.h F:include/linux/usb/ NETWORKING DRIVERS L:netdev@vger.kernel.org W:http://www.linuxfoundation.org/en/Net T:git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git S:Odd Fixes F:drivers/net/ F:include/linux/if_* F:include/linux/*device.h THE REST M:Linus Torvalds L:linux-kernel@vger.kernel.org Q:http://patchwork.kernel.org/project/LKML/list/ T:git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git S:Buried alive in reporters F:* F:*/ Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03372dbbe618bfcd02f9c8cdbfe78e97e3aad43b Author: Joe Perches Date: Fri Mar 5 13:43:00 2010 -0800 scripts/get_maintainer.pl: add --file-emails, find embedded email addresses Add an imperfect option to search a source file for email addresses. New option: --file-emails or --fe email addresses in files are freeform text and are nearly impossible to parse. Still, might as well try to do a somewhat acceptable job of finding them. This code should find all addresses that are in the form addr@domain.tld The code assumes that up to 3 alphabetic words along with dashes, commas, and periods that preceed the email address are a name. If 3 words are found for the name, and one of the first two words are a single letter and period, or just a single letter then the 3 words are use as name otherwise the last 2 words are used. Some variants that are shown correctly: John Smith Random J. Developer Random J. Developer (rjd@tld.com) J. Random Developer rjd@tld.com Variants that are shown nominally correctly: Written by First Last (funny-addr@somecompany.com) is shown as: First Last Variants that are shown incorrectly: Some Really Long Name MontaVista Software, Inc. are returned as: Long Name "Software, Inc" --roles and --rolestats show "(in file)" for matches. For instance: Without -file-emails: $ ./scripts/get_maintainer.pl -f -nogit -roles net/core/netpoll.c David S. Miller (maintainer:NETWORKING [GENERAL]) linux-kernel@vger.kernel.org (open list) With -fe: $ ./scripts/get_maintainer.pl -f -fe -nogit -roles net/core/netpoll.c David S. Miller (maintainer:NETWORKING [GENERAL]) Matt Mackall (in file) Ingo Molnar (in file) linux-kernel@vger.kernel.org (open list) netdev@vger.kernel.org (open list:NETWORKING [GENERAL]) The number of email addresses in the file in not limited. Neither is the number of returned email addresses. Signed-off-by: Joe Perches Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea83886dde49fd7524e9f4a246dd5dff4ad236a Author: Gustavo F. Padovan Date: Fri Mar 5 13:42:58 2010 -0800 printk: avoid warning when CONFIG_PRINTK is disabled kernel/printk.c:72: warning: `saved_console_loglevel' defined but not used Signed-off-by: Gustavo F. Padovan Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef097dd7ba4eab8b4f0026d85fcef9fe23b821f Author: Michael Neuling Date: Fri Mar 5 13:42:57 2010 -0800 exec: create initial stack independent of PAGE_SIZE Currently we create the initial stack based on the PAGE_SIZE. This is unnecessary. This creates this initial stack independent of the PAGE_SIZE. It also bumps up the number of 4k pages allocated from 20 to 32, to align with 64K page systems. Signed-off-by: Michael Neuling Cc: Helge Deller Reviewed-by: KOSAKI Motohiro Cc: Americo Wang Cc: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9728e5d6e6c432ee8487c63ce6e479e2474d9945 Author: Tetsuo Handa Date: Fri Mar 5 13:42:56 2010 -0800 kernel/pid.c: update comment on find_task_by_pid_ns tasklist_lock does protect the task and its pid, it can't go away. The problem is that find_pid_ns() itself is unsafe without rcu lock, it can race with copy_process()->free_pid(any_pid). Protecting copy_process()->free_pid(any_pid) with tasklist_lock would make it possible to call find_task_by_pid_ns() under tasklist safely, but we don't do so because we are trying to get rid of the read_lock sites of tasklist_lock. Signed-off-by: Tetsuo Handa Cc: Oleg Nesterov Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8aeee85a29e27e043db582bf2ae8e5f42767934f Author: Anton Blanchard Date: Fri Mar 5 13:42:55 2010 -0800 panic: fix panic_timeout accuracy when running on a hypervisor I've had some complaints about panic_timeout being wildly innacurate on shared processor PowerPC partitions (a 3 minute panic_timeout taking 30 minutes). The problem is we loop on mdelay(1) and with a 1ms in 10ms hypervisor timeslice each of these will take 10ms (ie 10x) longer. I expect other platforms with shared processor hypervisors will see the same issue. This patch keeps the old behaviour if we have a panic_blink (only keyboard LEDs right now) and does 1 second mdelays if we don't. Signed-off-by: Anton Blanchard Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78d7d407b62a021e6d2e8dc24c0b90e390ab58a1 Author: Jiri Slaby Date: Fri Mar 5 13:42:54 2010 -0800 kernel core: use helpers for rlimits Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4bb527438b4181cd3c564ae04dd344c381283a1 Author: Jiri Slaby Date: Fri Mar 5 13:42:53 2010 -0800 posix-cpu-timers: cleanup rlimits usage Fetch rlimit (both hard and soft) values only once and work on them. It removes many accesses through sig structure and makes the code cleaner. Mostly a preparation for writable resource limits support. Signed-off-by: Jiri Slaby Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3abd4f9531becb71626bd206955d47d5ea54f06 Author: Thiago Farina Date: Fri Mar 5 13:42:52 2010 -0800 kernel/exit.c: fix shadows sparse warning kernel/exit.c:1183:26: warning: symbol 'status' shadows an earlier one kernel/exit.c:1173:21: originally declared here Signed-off-by: Thiago Farina Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c03c383563f147907f1a90cf16f1e190e2f4aae Author: Jaswinder Singh Rajput Date: Fri Mar 5 13:42:52 2010 -0800 includecheck fix for kernel/params.c Fix the following 'make includecheck' warning: kernel/params.c: linux/string.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: André Goddard Rosa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f1664f92b2247111b7d37e454a050b76ac61b7f Author: Dan Carpenter Date: Fri Mar 5 13:42:51 2010 -0800 splice: comparing unsigned int < 0 "ret" needs to be signed or the error handling for splice_to_pipe() won't work correctly. Signed-off-by: Dan Carpenter Cc: Tom Zanussi Cc: Jens Axboe Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0347af4ee3922220f6bfe74b87b526aa709a0365 Author: Simon Kagstrom Date: Fri Mar 5 13:42:49 2010 -0800 lkdtm: add debugfs access and loosen KPROBE ties Add adds a debugfs interface and additional failure modes to LKDTM to provide similar functionality to the provoke-crash driver submitted here: http://lwn.net/Articles/371208/ Crashes can now be induced either through module parameters (as before) or through the debugfs interface as in provoke-crash. The patch also provides a new "direct" interface, where KPROBES are not used, i.e., the crash is invoked directly upon write to the debugfs file. When built without KPROBES configured, only this mode is available. Signed-off-by: Simon Kagstrom Cc: M. Mohan Kumar Cc: Americo Wang Cc: David Woodhouse Cc: Ingo Molnar Cc: "Eric W. Biederman" , Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33fd797b3e2c6a7663b9331150da0acdb31990a2 Author: Thadeu Lima de Souza Cascardo Date: Fri Mar 5 13:42:48 2010 -0800 eisa: fix coding style for eisa bus code Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Kay Sievers Cc: Greg Kroah-Hartman Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d9e7363b87a4c5fb3fc17070607a75a9eb4cc8 Author: Julia Lawall Date: Fri Mar 5 13:42:47 2010 -0800 drivers/misc/iwmc3200top/main.c: eliminate useless code The variable priv is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Cc: Tomas Winkler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7463e633c5f94792dcff1afefb0d2961318a9d09 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:46 2010 -0800 init/main.c: make setup_max_cpus static for !SMP The only in tree external users of the symbol setup_max_cpus are in arch/x86/. The files ./kernel/alternative.c, ./kernel/visws_quirks.c, and ./mm/kmemcheck/kmemcheck.c are all guarded by CONFIG_SMP being defined. For this case the symbol is an unsigned int and declared as an extern in include/linux/smp.h. When CONFIG_SMP is not defined the symbol setup_max_cpus is a constant value that is only used in init/main.c. Make the symbol static for this case. Signed-off-by: H Hartley Sweeten Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd8d6c0ed89ba387609419e3d8d4c6b92a5d446 Author: Rakib Mullick Date: Fri Mar 5 13:42:45 2010 -0800 smp: fix documentation in include/linux/smp.h smp: Fix documentation. Fix documentation in include/linux/smp.h: smp_processor_id() Signed-off-by: Rakib Mullick Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72c3368856c543ace033f6a5b9a3edf1f4043236 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:43 2010 -0800 nodemask.h: remove macro any_online_node The macro any_online_node() is prone to producing sparse warnings due to the local symbol 'node'. Since all the in-tree users are really requesting the first online node (the mask argument is either NODE_MASK_ALL or node_online_map) just use the first_online_node macro and remove the any_online_node macro since there are no users. Signed-off-by: H Hartley Sweeten Acked-by: David Rientjes Reviewed-by: KAMEZAWA Hiroyuki Cc: Mel Gorman Cc: Lee Schermerhorn Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Dave Hansen Cc: Milton Miller Cc: Nathan Fontenot Cc: Geoff Levand Cc: Grant Likely Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Cc: David S. Miller Cc: Benny Halevy Cc: Chuck Lever Cc: Ricardo Labiaga Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d554ed895dc8f293cc712c71f14b101ace82579a Author: Jiri Slaby Date: Fri Mar 5 13:42:42 2010 -0800 fs: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Cc: Alexander Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 221e3ebf6d5f2625373573155924e39f196c5d3d Author: Heiko Carstens Date: Fri Mar 5 13:42:41 2010 -0800 cpumask: let num_*_cpus() function always return unsigned values Dependent on CONFIG_SMP the num_*_cpus() functions return unsigned or signed values. Let them always return unsigned values to avoid strange casts. Fixes at least one warning: kernel/kprobes.c: In function 'register_kretprobe': kernel/kprobes.c:1038: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Heiko Carstens Cc: Heiko Carstens Cc: Ananth N Mavinakayanahalli Cc: Masami Hiramatsu Cc: Ingo Molnar Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8aaed5bec2b9177eab1796c8c4f7a4c90804eef6 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:39 2010 -0800 init/initramfs.c: fix "symbol shadows an earlier one" noise The symbol 'count' is a local global variable in this file. The function clean_rootfs() should use a different symbol name to prevent "symbol shadows an earlier one" noise. Signed-off-by: H Hartley Sweeten Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a85b8d6049cbb0e7961df2069322fbc4192026a Author: Andreas Mohr Date: Fri Mar 5 13:42:39 2010 -0800 init/main.c: improve usability in case of init binary failure - new Documentation/init.txt file describing various forms of failure trying to load the init binary after kernel bootup - extend the init/main.c init failure message to direct to Documentation/init.txt Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87d5e0236d9d688fb575e9e12232764ac617617c Author: Chen Gong Date: Fri Mar 5 13:42:38 2010 -0800 kernel/cpu.c: delete deprecated definition in cpu_up() Additional_cpus is only supported for IA64 now. X86_64 should not be included. Signed-off-by: Chen Gong Cc: Ingo Molnar Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c8f05c2837b06bb2739e85204c0d34009fb6494 Author: Randy Dunlap Date: Fri Mar 5 13:42:35 2010 -0800 MFGPT: move clocksource menu Move the CS5535 MFGPT hrtimer kconfig option to be with the other MFGPT options. This makes it easier to find and also removes it from the main "Device Drivers" menu, where it should not have been. Signed-off-by: Randy Dunlap Acked-by: Andres Salomon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b2a8c8f3c65c08bd737b30d3ceee732ed84813a Author: WANG Cong Date: Fri Mar 5 13:42:34 2010 -0800 um: tell git to ignore generated files Tell git to ignore the generated files under um, except: include/shared/kern_constants.h include/shared/user_constants.h which will be moved to include/generated. Signed-off-by: WANG Cong Cc: Al Viro Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03315b59165ee2049a4b903a1b0b8bf673d701fa Author: Alexander Beregalov Date: Fri Mar 5 13:42:33 2010 -0800 uml: line.c: avoid NULL pointer dereference Assign tty only if line is not NULL. [akpm@linux-foundation.org: simplification] Signed-off-by: Alexander Beregalov Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be1494527c4dea4db87749d08b09be23327157dc Author: Roel Kluin Date: Fri Mar 5 13:42:33 2010 -0800 cris v32: typo in crisv32_arbiter_unwatch()? With id 1 the wrong bp was unwatched. Signed-off-by: Roel Kluin Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda1c5af26a00ee31cdc5ab8321a1be7851cbfff Author: Roel Kluin Date: Fri Mar 5 13:42:32 2010 -0800 cryptocop: fix assertion in create_output_descriptors() size_t desc_len cannot be less than 0, test before the subtraction. Signed-off-by: Roel Kluin Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba875ba6b7cd28c5f15680ed694276510aa69970 Author: john stultz Date: Fri Mar 5 13:42:31 2010 -0800 cris: convert to use arch_gettimeoffset() Convert cris to use GENERIC_TIME via the arch_getoffset() infrastructure, reducing the amount of arch specific code we need to maintain. Signed-off-by: John Stultz Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56e6943b41468826c26155139629c9a5379550ab Author: Richard Kennedy Date: Fri Mar 5 13:42:30 2010 -0800 cpuidle menu: remove 8 bytes of padding on 64 bit builds Reorder struct menu_device to remove 8 bytes of padding on 64 bit builds. Size drops from 136 to 128 bytes, so possibly needing one fewer cache lines. Signed-off-by: Richard Kennedy Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77079dbec721a282bf0931385ae10d77cdbac5af Author: Roel Kluin Date: Fri Mar 5 13:42:28 2010 -0800 alpha: PTR_ERR overwrites -EINVAL in syscall osf_mount The initial -EINVAL value is overwritten by `retval = PTR_ERR(name)'. If this isn't an error pointer and typenr is not 1, 6 or 9, then this retval, a pointer cast to a long, is returned. Signed-off-by: Roel Kluin Acked-by: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6822190882ce02ae8ae135026c2b3f17c006960b Author: FUJITA Tomonori Date: Fri Mar 5 13:42:26 2010 -0800 frv: remove pci_dma_sync_single() and pci_dma_sync_sg() No architecture except for frv has pci_dma_sync_single() and pci_dma_sync_sg(). The APIs are deprecated. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08259d58e4fa12ceaece82193c5816152f638cca Author: Hugh Dickins Date: Fri Mar 5 13:42:25 2010 -0800 mm: add comment on swap_duplicate's error code swap_duplicate()'s loop appears to miss out on returning the error code from __swap_duplicate(), except when that's -ENOMEM. In fact this is intentional: prior to -ENOMEM for swap_count_continuation, swap_duplicate() was void (and the case only occurs when copy_one_pte() hits a corrupt pte). But that's surprising behaviour, which certainly deserves a comment. Signed-off-by: Hugh Dickins Reported-by: Huang Shijie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d Author: Steven J. Magnani Date: Fri Mar 5 13:42:24 2010 -0800 nommu: get_user_pages(): pin last page on non-page-aligned start The noMMU version of get_user_pages() fails to pin the last page when the start address isn't page-aligned. The patch fixes this in a way that makes find_extend_vma() congruent to its MMU cousin. Signed-off-by: Steven J. Magnani Acked-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f047f4f3792344901e1ea18a180515d7d5349e02 Author: Amerigo Wang Date: Fri Mar 5 13:42:24 2010 -0800 mm: use the same log level for show_mem() Use the same log level for printk's in show_mem(), so that those messages can be shown completely when using log level 6. Signed-off-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 478352e789f507105193d3d0177c3b4f26da0399 Author: David Rientjes Date: Fri Mar 5 13:42:23 2010 -0800 mm: add comment about deprecation of __GFP_NOFAIL __GFP_NOFAIL was deprecated in dab48dab, so add a comment that no new users should be added. Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 645747462435d84c6c6a64269ed49cc3015f753d Author: Johannes Weiner Date: Fri Mar 5 13:42:22 2010 -0800 vmscan: detect mapped file pages used only once The VM currently assumes that an inactive, mapped and referenced file page is in use and promotes it to the active list. However, every mapped file page starts out like this and thus a problem arises when workloads create a stream of such pages that are used only for a short time. By flooding the active list with those pages, the VM quickly gets into trouble finding eligible reclaim canditates. The result is long allocation latencies and eviction of the wrong pages. This patch reuses the PG_referenced page flag (used for unmapped file pages) to implement a usage detection that scales with the speed of LRU list cycling (i.e. memory pressure). If the scanner encounters those pages, the flag is set and the page cycled again on the inactive list. Only if it returns with another page table reference it is activated. Otherwise it is reclaimed as 'not recently used cache'. This effectively changes the minimum lifetime of a used-once mapped file page from a full memory cycle to an inactive list cycle, which allows it to occur in linear streams without affecting the stable working set of the system. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31c0569c3b0b6cc8a867ac6665ca081553f7984c Author: Johannes Weiner Date: Fri Mar 5 13:42:21 2010 -0800 vmscan: drop page_mapping_inuse() page_mapping_inuse() is a historic predicate function for pages that are about to be reclaimed or deactivated. According to it, a page is in use when it is mapped into page tables OR part of swap cache OR backing an mmapped file. This function is used in combination with page_referenced(), which checks for young bits in ptes and the page descriptor itself for the PG_referenced bit. Thus, checking for unmapped swap cache pages is meaningless as PG_referenced is not set for anonymous pages and unmapped pages do not have young ptes. The test makes no difference. Protecting file pages that are not by themselves mapped but are part of a mapped file is also a historic leftover for short-lived things like the exec() code in libc. However, the VM now does reference accounting and activation of pages at unmap time and thus the special treatment on reclaim is obsolete. This patch drops page_mapping_inuse() and switches the two callsites to use page_mapped() directly. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc8d636cdb95f7b792d5ba8c9f3b295809c125d Author: Johannes Weiner Date: Fri Mar 5 13:42:19 2010 -0800 vmscan: factor out page reference checks The used-once mapped file page detection patchset. It is meant to help workloads with large amounts of shortly used file mappings, like rtorrent hashing a file or git when dealing with loose objects (git gc on a bigger site?). Right now, the VM activates referenced mapped file pages on first encounter on the inactive list and it takes a full memory cycle to reclaim them again. When those pages dominate memory, the system no longer has a meaningful notion of 'working set' and is required to give up the active list to make reclaim progress. Obviously, this results in rather bad scanning latencies and the wrong pages being reclaimed. This patch makes the VM be more careful about activating mapped file pages in the first place. The minimum granted lifetime without another memory access becomes an inactive list cycle instead of the full memory cycle, which is more natural given the mentioned loads. This test resembles a hashing rtorrent process. Sequentially, 32MB chunks of a file are mapped into memory, hashed (sha1) and unmapped again. While this happens, every 5 seconds a process is launched and its execution time taken: python2.4 -c 'import pydoc' old: max=2.31s mean=1.26s (0.34) new: max=1.25s mean=0.32s (0.32) find /etc -type f old: max=2.52s mean=1.44s (0.43) new: max=1.92s mean=0.12s (0.17) vim -c ':quit' old: max=6.14s mean=4.03s (0.49) new: max=3.48s mean=2.41s (0.25) mplayer --help old: max=8.08s mean=5.74s (1.02) new: max=3.79s mean=1.32s (0.81) overall hash time (stdev): old: time=1192.30 (12.85) thruput=25.78mb/s (0.27) new: time=1060.27 (32.58) thruput=29.02mb/s (0.88) (-11%) I also tested kernbench with regular IO streaming in the background to see whether the delayed activation of frequently used mapped file pages had a negative impact on performance in the presence of pressure on the inactive list. The patch made no significant difference in timing, neither for kernbench nor for the streaming IO throughput. The first patch submission raised concerns about the cost of the extra faults for actually activated pages on machines that have no hardware support for young page table entries. I created an artificial worst case scenario on an ARM machine with around 300MHz and 64MB of memory to figure out the dimensions involved. The test would mmap a file of 20MB, then 1. touch all its pages to fault them in 2. force one full scan cycle on the inactive file LRU -- old: mapping pages activated -- new: mapping pages inactive 3. touch the mapping pages again -- old and new: fault exceptions to set the young bits 4. force another full scan cycle on the inactive file LRU 5. touch the mapping pages one last time -- new: fault exceptions to set the young bits The test showed an overall increase of 6% in time over 100 iterations of the above (old: ~212sec, new: ~225sec). 13 secs total overhead / (100 * 5k pages), ignoring the execution time of the test itself, makes for about 25us overhead for every page that gets actually activated. Note: 1. File mapping the size of one third of main memory, _completely_ in active use across memory pressure - i.e., most pages referenced within one LRU cycle. This should be rare to non-existant, especially on such embedded setups. 2. Many huge activation batches. Those batches only occur when the working set fluctuates. If it changes completely between every full LRU cycle, you have problematic reclaim overhead anyway. 3. Access of activated pages at maximum speed: sequential loads from every single page without doing anything in between. In reality, the extra faults will get distributed between actual operations on the data. So even if a workload manages to get the VM into the situation of activating a third of memory in one go on such a setup, it will take 2.2 seconds instead 2.1 without the patch. Comparing the numbers (and my user-experience over several months), I think this change is an overall improvement to the VM. Patch 1 is only refactoring to break up that ugly compound conditional in shrink_page_list() and make it easy to document and add new checks in a readable fashion. Patch 2 gets rid of the obsolete page_mapping_inuse(). It's not strictly related to #3, but it was in the original submission and is a net simplification, so I kept it. Patch 3 implements used-once detection of mapped file pages. This patch: Moving the big conditional into its own predicate function makes the code a bit easier to read and allows for better commenting on the checks one-by-one. This is just cleaning up, no semantics should have been changed. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c84ee22b8321fa0130a53d4c9806474d62eff0 Author: Mel Gorman Date: Fri Mar 5 13:42:16 2010 -0800 mm: document /sys/devices/system/node/nodeX Add a bare description of what /sys/devices/system/node/nodeX is. Others will follow in time but right now, none of that tree is documented. The existence of this file might at least encourage people to document new entries. Signed-off-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1b57ac061b0e348c9a878f8fa3a93a67fe6af42 Author: Mel Gorman Date: Fri Mar 5 13:42:15 2010 -0800 mm: document /proc/pagetypeinfo Add documentation for /proc/pagetypeinfo. Signed-off-by: Mel Gorman Reviewed-by: Christoph Lameter Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72f0ba0252e7177965255ed2c663be126b6b5f91 Author: David Rientjes Date: Fri Mar 5 13:42:14 2010 -0800 mm: suppress pfn range output for zones without pages free_area_init_nodes() emits pfn ranges for all zones on the system. There may be no pages on a higher zone, however, due to memory limitations or the use of the mem= kernel parameter. For example: Zone PFN ranges: DMA 0x00000001 -> 0x00001000 DMA32 0x00001000 -> 0x00100000 Normal 0x00100000 -> 0x00100000 The implementation copies the previous zone's highest pfn, if any, as the next zone's lowest pfn. If its highest pfn is then greater than the amount of addressable memory, the upper memory limit is used instead. Thus, both the lowest and highest possible pfn for higher zones without memory may be the same. The pfn range for zones without memory is now shown as "empty" instead. Signed-off-by: David Rientjes Cc: Mel Gorman Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 452aa6999e6703ffbddd7f6ea124d3968915f3e3 Author: Rafael J. Wysocki Date: Fri Mar 5 13:42:13 2010 -0800 mm/pm: force GFP_NOIO during suspend/hibernation and resume There are quite a few GFP_KERNEL memory allocations made during suspend/hibernation and resume that may cause the system to hang, because the I/O operations they depend on cannot be completed due to the underlying devices being suspended. Avoid this problem by clearing the __GFP_IO and __GFP_FS bits in gfp_allowed_mask before suspend/hibernation and restoring the original values of these bits in gfp_allowed_mask durig the subsequent resume. [akpm@linux-foundation.org: fix CONFIG_PM=n linkage] Signed-off-by: Rafael J. Wysocki Reported-by: Maxim Levitsky Cc: Sebastian Ott Cc: Benjamin Herrenschmidt Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad2bd7e0e9647cd48593a6b3a2be07dc2c2d28ed Author: Hugh Dickins Date: Fri Mar 5 13:42:12 2010 -0800 mm/swapfile.c: fix swapon size off-by-one There's an off-by-one disagreement between mkswap and swapon about the meaning of swap_header last_page: mkswap (in all versions I've looked at: util-linux-ng and BusyBox and old util-linux; probably as far back as 1999) consistently means the offset (in page units) of the last page of the swap area, whereas kernel sys_swapon (as far back as 2.2 and 2.3) strangely takes it to mean the size (in page units) of the swap area. This disagreement is the safe way round; but it's worrying people, and loses us one page of swap. The fix is not just to add one to nr_good_pages: we need to get maxpages (the size of the swap_map array) right before that; and though that is an unsigned long, be careful not to overflow the unsigned int p->max which later holds it (probably why header uses __u32 last_page instead of size). Why did we subtract one from the maximum swp_offset to calculate maxpages? Though it was probably me who made that change in 2.4.10, I don't get it: and now we should be adding one (without risk of overflow in this case). Fix the handling of swap_header badpages: it could have overrun the swap_map when very large swap area used on a more limited architecture. Remove pre-initializations of swap_header, nr_good_pages and maxpages: those date from when sys_swapon was supporting other versions of header. Reported-by: Nitin Gupta Reported-by: Jarkko Lavinen Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc148a5f7e0532750c312385c7ee9fa3e9311f34 Author: Rik van Riel Date: Fri Mar 5 13:42:10 2010 -0800 mm: remove VM_LOCK_RMAP code When a VMA is in an inconsistent state during setup or teardown, the worst that can happen is that the rmap code will not be able to find the page. The mapping is in the process of being torn down (PTEs just got invalidated by munmap), or set up (no PTEs have been instantiated yet). It is also impossible for the rmap code to follow a pointer to an already freed VMA, because the rmap code holds the anon_vma->lock, which the VMA teardown code needs to take before the VMA is removed from the anon_vma chain. Hence, we should not need the VM_LOCK_RMAP locking at all. Signed-off-by: Rik van Riel Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c44b674323f4a2480dbeb65d4b487fa5f06f49e0 Author: Rik van Riel Date: Fri Mar 5 13:42:09 2010 -0800 rmap: move exclusively owned pages to own anon_vma in do_wp_page() When the parent process breaks the COW on a page, both the original which is mapped at child and the new page which is mapped parent end up in that same anon_vma. Generally this won't be a problem, but for some workloads it could preserve the O(N) rmap scanning complexity. A simple fix is to ensure that, when a page which is mapped child gets reused in do_wp_page, because we already are the exclusive owner, the page gets moved to our own exclusive child's anon_vma. Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Reviewed-by: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 033a64b56aed798991de18d226085dfb1ccd858d Author: Rik van Riel Date: Fri Mar 5 13:42:08 2010 -0800 rmap: remove obsolete check from __page_check_anon_rmap() When an anonymous page is inherited from a parent process, the vma->anon_vma can differ from the page anon_vma. This can trip up __page_check_anon_rmap, which is indirectly called from do_swap_page(). Remove that obsolete check to prevent an oops. Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Reviewed-by: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5beb49305251e5669852ed541e8e2f2f7696c53e Author: Rik van Riel Date: Fri Mar 5 13:42:07 2010 -0800 mm: change anon_vma linking to fix multi-process server scalability issue The old anon_vma code can lead to scalability issues with heavily forking workloads. Specifically, each anon_vma will be shared between the parent process and all its child processes. In a workload with 1000 child processes and a VMA with 1000 anonymous pages per process that get COWed, this leads to a system with a million anonymous pages in the same anon_vma, each of which is mapped in just one of the 1000 processes. However, the current rmap code needs to walk them all, leading to O(N) scanning complexity for each page. This can result in systems where one CPU is walking the page tables of 1000 processes in page_referenced_one, while all other CPUs are stuck on the anon_vma lock. This leads to catastrophic failure for a benchmark like AIM7, where the total number of processes can reach in the tens of thousands. Real workloads are still a factor 10 less process intensive than AIM7, but they are catching up. This patch changes the way anon_vmas and VMAs are linked, which allows us to associate multiple anon_vmas with a VMA. At fork time, each child process gets its own anon_vmas, in which its COWed pages will be instantiated. The parents' anon_vma is also linked to the VMA, because non-COWed pages could be present in any of the children. This reduces rmap scanning complexity to O(1) for the pages of the 1000 child processes, with O(N) complexity for at most 1/N pages in the system. This reduces the average scanning cost in heavily forking workloads from O(N) to 2. The only real complexity in this patch stems from the fact that linking a VMA to anon_vmas now involves memory allocations. This means vma_adjust can fail, if it needs to attach a VMA to anon_vma structures. This in turn means error handling needs to be added to the calling functions. A second source of complexity is that, because there can be multiple anon_vmas, the anon_vma linking in vma_adjust can no longer be done under "the" anon_vma lock. To prevent the rmap code from walking up an incomplete VMA, this patch introduces the VM_LOCK_RMAP VMA flag. This bit flag uses the same slot as the NOMMU VM_MAPPED_COPY, with an ifdef in mm.h to make sure it is impossible to compile a kernel that needs both symbolic values for the same bitflag. Some test results: Without the anon_vma changes, when AIM7 hits around 9.7k users (on a test box with 16GB RAM and not quite enough IO), the system ends up running >99% in system time, with every CPU on the same anon_vma lock in the pageout code. With these changes, AIM7 hits the cross-over point around 29.7k users. This happens with ~99% IO wait time, there never seems to be any spike in system time. The anon_vma lock contention appears to be resolved. [akpm@linux-foundation.org: cleanups] Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Cc: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 648bcc771145172a14bc35eeb849ed08f6aa4f1e Author: Thiago Farina Date: Fri Mar 5 13:42:04 2010 -0800 mm/memcontrol.c: fix "integer as NULL pointer" sparse warning mm/memcontrol.c:2548:32: warning: Using plain integer as NULL pointer Signed-off-by: Thiago Farina Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19adf9c5d5793657118f2002237c0ee49c3b6185 Author: Andrew Morton Date: Fri Mar 5 13:42:03 2010 -0800 include/linux/fs.h: convert FMODE_* constants to hex It was tolerable until Eric went and added 8388608. Cc: Eric Paris Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0141450f66c3c12a3aaa869748caa64241885cdf Author: Wu Fengguang Date: Fri Mar 5 13:42:03 2010 -0800 readahead: introduce FMODE_RANDOM for POSIX_FADV_RANDOM This fixes inefficient page-by-page reads on POSIX_FADV_RANDOM. POSIX_FADV_RANDOM used to set ra_pages=0, which leads to poor performance: a 16K read will be carried out in 4 _sync_ 1-page reads. In other places, ra_pages==0 means - it's ramfs/tmpfs/hugetlbfs/sysfs/configfs - some IO error happened where multi-page read IO won't help or should be avoided. POSIX_FADV_RANDOM actually want a different semantics: to disable the *heuristic* readahead algorithm, and to use a dumb one which faithfully submit read IO for whatever application requests. So introduce a flag FMODE_RANDOM for POSIX_FADV_RANDOM. Note that the random hint is not likely to help random reads performance noticeably. And it may be too permissive on huge request size (its IO size is not limited by read_ahead_kb). In Quentin's report (http://lkml.org/lkml/2009/12/24/145), the overall (NFS read) performance of the application increased by 313%! Tested-by: Quentin Barnes Signed-off-by: Wu Fengguang Cc: Nick Piggin Cc: Andi Kleen Cc: Steven Whitehouse Cc: David Howells Cc: Jonathan Corbet Cc: Al Viro Cc: Christoph Hellwig Cc: Trond Myklebust Cc: Chuck Lever Cc: [2.6.33.x] Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42e49608683ab25fbbbf9c40edb944601e543882 Author: Wu Fengguang Date: Fri Mar 5 13:42:01 2010 -0800 vfs: take f_lock on modifying f_mode after open time We'll introduce FMODE_RANDOM which will be runtime modified. So protect all runtime modification to f_mode with f_lock to avoid races. Signed-off-by: Wu Fengguang Cc: Al Viro Cc: Christoph Hellwig Cc: Trond Myklebust Cc: Chuck Lever Cc: [2.6.33.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85f1fb72fa76eabc4481dc79f42d2b011df54762 Author: KOSAKI Motohiro Date: Fri Mar 5 13:42:00 2010 -0800 mm/migrate.c: kill anon local variable from migrate_page_copy commit 01b1ae63c2 ("memcg: simple migration handling") removed mem_cgroup_uncharge_cache_page() call from migrate_page_copy. Local variable `anon' is now unused. Signed-off-by: KOSAKI Motohiro Cc: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da0aa138944311e6745a00ac3d88f03e8d9a46c4 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:59 2010 -0800 mm/mempolicy.c: fix indentation of the comments of do_migrate_pages Currently, do_migrate_pages() have very long comment and this is not indent properly. I often misunderstand it is function starting commnents and confused it. this patch fixes it. note: this patch doesn't break 80 column rule. I guess original author intended this indentaion, but an accident corrupted it. Signed-off-by: KOSAKI Motohiro Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d96ae5309165d9ed7c008a178238977b73595cd9 Author: akpm@linux-foundation.org Date: Fri Mar 5 13:41:58 2010 -0800 memory-hotplug: create /sys/firmware/memmap entry for new memory A memmap is a directory in sysfs which includes 3 text files: start, end and type. For example: start: 0x100000 end: 0x7e7b1cff type: System RAM Interface firmware_map_add was not called explicitly. Remove it and add function firmware_map_add_hotplug as hotplug interface of memmap. Each memory entry has a memmap in sysfs, When we hot-add new memory, sysfs does not export memmap entry for it. We add a call in function add_memory to function firmware_map_add_hotplug. Add a new function add_sysfs_fw_map_entry() to create memmap entry, it will be called when initialize memmap and hot-add memory. [akpm@linux-foundation.org: un-kernedoc a no longer kerneldoc comment] Signed-off-by: Shaohui Zheng Acked-by: Andi Kleen Acked-by: Yasunori Goto Reviewed-by: Wu Fengguang Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d8cebd4bcd7c3878462fdfda34bbcdeb4df7ef4 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:57 2010 -0800 mm: fix mbind vma merge problem Strangely, current mbind() doesn't merge vma with neighbor vma although it's possible. Unfortunately, many vma can reduce performance... This patch fixes it. reproduced program ---------------------------------------------------------------- #include #include #include #include #include #include #include static unsigned long pagesize; int main(int argc, char** argv) { void* addr; int ch; int node; struct bitmask *nmask = numa_allocate_nodemask(); int err; int node_set = 0; char buf[128]; while ((ch = getopt(argc, argv, "n:")) != -1){ switch (ch){ case 'n': node = strtol(optarg, NULL, 0); numa_bitmask_setbit(nmask, node); node_set = 1; break; default: ; } } argc -= optind; argv += optind; if (!node_set) numa_bitmask_setbit(nmask, 0); pagesize = getpagesize(); addr = mmap(NULL, pagesize*3, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, 0, 0); if (addr == MAP_FAILED) perror("mmap "), exit(1); fprintf(stderr, "pid = %d \n" "addr = %p\n", getpid(), addr); /* make page populate */ memset(addr, 0, pagesize*3); /* first mbind */ err = mbind(addr+pagesize, pagesize, MPOL_BIND, nmask->maskp, nmask->size, MPOL_MF_MOVE_ALL); if (err) error("mbind1 "); /* second mbind */ err = mbind(addr, pagesize*3, MPOL_DEFAULT, NULL, 0, 0); if (err) error("mbind2 "); sprintf(buf, "cat /proc/%d/maps", getpid()); system(buf); return 0; } ---------------------------------------------------------------- result without this patch addr = 0x7fe26ef09000 [snip] 7fe26ef09000-7fe26ef0a000 rw-p 00000000 00:00 0 7fe26ef0a000-7fe26ef0b000 rw-p 00000000 00:00 0 7fe26ef0b000-7fe26ef0c000 rw-p 00000000 00:00 0 7fe26ef0c000-7fe26ef0d000 rw-p 00000000 00:00 0 => 0x7fe26ef09000-0x7fe26ef0c000 have three vmas. result with this patch addr = 0x7fc9ebc76000 [snip] 7fc9ebc76000-7fc9ebc7a000 rw-p 00000000 00:00 0 7fffbe690000-7fffbe6a5000 rw-p 00000000 00:00 0 [stack] => 0x7fc9ebc76000-0x7fc9ebc7a000 have only one vma. [minchan.kim@gmail.com: fix file offset passed to vma_merge()] Signed-off-by: KOSAKI Motohiro Reviewed-by: Christoph Lameter Cc: Nick Piggin Cc: Hugh Dickins Cc: Andrea Arcangeli Cc: Mel Gorman Cc: Lee Schermerhorn Signed-off-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93e4a89a8c987189b168a530a331ef6d0fcf07a7 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:55 2010 -0800 mm: restore zone->all_unreclaimable to independence word commit e815af95 ("change all_unreclaimable zone member to flags") changed all_unreclaimable member to bit flag. But it had an undesireble side effect. free_one_page() is one of most hot path in linux kernel and increasing atomic ops in it can reduce kernel performance a bit. Thus, this patch revert such commit partially. at least all_unreclaimable shouldn't share memory word with other zone flags. [akpm@linux-foundation.org: fix patch interaction] Signed-off-by: KOSAKI Motohiro Cc: David Rientjes Cc: Wu Fengguang Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Huang Shijie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc91668eaf9e7ba61e867fc2218b7e9fb67faa4f Author: Li Hong Date: Fri Mar 5 13:41:54 2010 -0800 mm: remove free_hot_page() free_hot_page() is just a wrapper around free_hot_cold_page() with parameter 'cold = 0'. After adding a clear comment for free_hot_cold_page(), it is reasonable to remove a level of call. [akpm@linux-foundation.org: fix build] Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Cc: Americo Wang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c475dab63ae798d81fb597a6a1859986b296d9d0 Author: Li Hong Date: Fri Mar 5 13:41:53 2010 -0800 mm/page_alloc.c: adjust a call site to trace_mm_page_free_direct Move a call of trace_mm_page_free_direct() from free_hot_page() to free_hot_cold_page(). It is clearer and close to kmemcheck_free_shadow(), as it is done in function __free_pages_ok(). Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f650316c8b80fe61a31b8b575405b37cbf170459 Author: Li Hong Date: Fri Mar 5 13:41:52 2010 -0800 mm/page_alloc.c: remove duplicate call to trace_mm_page_free_direct trace_mm_page_free_direct() is called in function __free_pages(). But it is called again in free_hot_page() if order == 0 and produce duplicate records in trace file for mm_page_free_direct event. As below: K-PID CPU# TIMESTAMP FUNCTION gnome-terminal-1567 [000] 4415.246466: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.246468: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.246506: mm_page_alloc: page=ffffea0003db9f40 pfn=1155800 order=0 migratetype=0 gfp_flags=GFP_KERNEL gnome-terminal-1567 [000] 4415.255557: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.255557: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 This patch removes the first call and adds a call to trace_mm_page_free_direct() in __free_pages_ok(). Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76ca542d880ebe59a7a03c1597e73e1ded271857 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:47 2010 -0800 mm, lockdep: annotate reclaim context to zone reclaim too Commit cf40bd16fd ("lockdep: annotate reclaim context") introduced reclaim context annotation. But it didn't annotate zone reclaim. This patch do it. The point is, commit cf40bd16fd annotate __alloc_pages_direct_reclaim but zone-reclaim doesn't use __alloc_pages_direct_reclaim. current call graph is __alloc_pages_nodemask get_page_from_freelist zone_reclaim() __alloc_pages_slowpath __alloc_pages_direct_reclaim try_to_free_pages Actually, if zone_reclaim_mode=1, VM never call __alloc_pages_direct_reclaim in usual VM pressure. Signed-off-by: KOSAKI Motohiro Reviewed-by: Minchan Kim Acked-by: Nick Piggin Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84b18490d1f1bc7ed5095c929f78bc002eb70f26 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:47 2010 -0800 vmscan: get_scan_ratio() cleanup The get_scan_ratio() should have all scan-ratio related calculations. Thus, this patch move some calculation into get_scan_ratio. Signed-off-by: KOSAKI Motohiro Reviewed-by: Rik van Riel Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45973d74fd3b1e3e16c025b688a725c7653b1443 Author: Minchan Kim Date: Fri Mar 5 13:41:45 2010 -0800 vmscan: check high watermark after shrink zone Kswapd checks that zone has sufficient pages free via zone_watermark_ok(). If any zone doesn't have enough pages, we set all_zones_ok to zero. !all_zone_ok makes kswapd retry rather than sleeping. I think the watermark check before shrink_zone() is pointless. Only after kswapd has tried to shrink the zone is the check meaningful. Move the check to after the call to shrink_zone(). [akpm@linux-foundation.org: fix comment, layout] Signed-off-by: Minchan Kim Reviewed-by: KOSAKI Motohiro Cc: Mel Gorman Cc: Rik van Riel Reviewed-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59e99e5b9706867f18d4a36c1e4645fbaacbec2e Author: Jiri Slaby Date: Fri Mar 5 13:41:44 2010 -0800 mm: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06f9d8c2b50060543fb6e0af87ddb86e654dee6b Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:43 2010 -0800 mm: mlock_vma_pages_range() only return success or failure Currently, mlock_vma_pages_range() only return len or 0. then current error handling of mmap_region() is meaningless complex. This patch makes simplify and makes consist with brk() code. Signed-off-by: KOSAKI Motohiro Cc: Nick Piggin Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c58267c32429ea6535428ca6b8a036892c1697f2 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:43 2010 -0800 mm: mlock_vma_pages_range() never return negative value Currently, mlock_vma_pages_range() never return negative value. Then, we can remove some worthless error check. Signed-off-by: KOSAKI Motohiro Cc: Nick Piggin Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b084d4353ff99d824d3bc5a5c2c22c70b1fba722 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:42 2010 -0800 mm: count swap usage A frequent questions from users about memory management is what numbers of swap ents are user for processes. And this information will give some hints to oom-killer. Besides we can count the number of swapents per a process by scanning /proc//smaps, this is very slow and not good for usual process information handler which works like 'ps' or 'top'. (ps or top is now enough slow..) This patch adds a counter of swapents to mm_counter and update is at each swap events. Information is exported via /proc//status file as [kamezawa@bluextal memory]$ cat /proc/self/status Name: cat State: R (running) Tgid: 2910 Pid: 2910 PPid: 2823 TracerPid: 0 Uid: 500 500 500 500 Gid: 500 500 500 500 FDSize: 256 Groups: 500 VmPeak: 82696 kB VmSize: 82696 kB VmLck: 0 kB VmHWM: 432 kB VmRSS: 432 kB VmData: 172 kB VmStk: 84 kB VmExe: 48 kB VmLib: 1568 kB VmPTE: 40 kB VmSwap: 0 kB <=============== this. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Reviewed-by: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e55232e59f7b19050267a05ff1226e5cd122a5 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:40 2010 -0800 mm: avoid false sharing of mm_counter Considering the nature of per mm stats, it's the shared object among threads and can be a cache-miss point in the page fault path. This patch adds per-thread cache for mm_counter. RSS value will be counted into a struct in task_struct and synchronized with mm's one at events. Now, in this patch, the event is the number of calls to handle_mm_fault. Per-thread value is added to mm at each 64 calls. rough estimation with small benchmark on parallel thread (2threads) shows [before] 4.5 cache-miss/faults [after] 4.0 cache-miss/faults Anyway, the most contended object is mmap_sem if the number of threads grows. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d559db086ff5be9bcc259e5aa50bf3d881eaf1d1 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:39 2010 -0800 mm: clean up mm_counter Presently, per-mm statistics counter is defined by macro in sched.h This patch modifies it to - defined in mm.h as inlinf functions - use array instead of macro's name creation. This patch is for reducing patch size in future patch to modify implementation of per-mm counter. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Cc: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19b629f581320999ddb9f6597051b79cdb53459c Author: Akinobu Mita Date: Fri Mar 5 13:41:38 2010 -0800 infiniband: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Acked-by: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 984b3f5746ed2cde3d184651dabf26980f2b66e5 Author: Akinobu Mita Date: Fri Mar 5 13:41:37 2010 -0800 bitops: rename for_each_bit() to for_each_set_bit() Rename for_each_bit to for_each_set_bit in the kernel source tree. To permit for_each_clear_bit(), should that ever be added. The patch includes a macro to map the old for_each_bit() onto the new for_each_set_bit(). This is a (very) temporary thing to ease the migration. [akpm@linux-foundation.org: add temporary for_each_bit()] Suggested-by: Alexey Dobriyan Suggested-by: Andrew Morton Signed-off-by: Akinobu Mita Cc: "David S. Miller" Cc: Russell King Cc: David Woodhouse Cc: Artem Bityutskiy Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3cb91ce1ac1d93a7cc6f81bb5247f7602b572bb Author: David Miller Date: Fri Mar 5 13:41:36 2010 -0800 timbgpio: fix build Use of get_irq_chip_data() et al. requires including linux/irq.h Signed-off-by: David S. Miller Cc: Richard Röjfors Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 781b16775ba0bb55fac0e1757bf0bd87c8879632 Author: Al Viro Date: Sat Mar 6 18:41:07 2010 +0000 Fix a dumb typo - use of & instead of && We managed to lose O_DIRECTORY testing due to a stupid typo in commit 1f36f774b2 ("Switch !O_CREAT case to use of do_last()") Reported-by: Walter Sheets Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cda61c9420028ddd251b60f1445c9eed756991c7 Author: Martyn Welch Date: Mon Mar 1 17:06:20 2010 +0000 [WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture This patch corrects author and copyright notices following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch Signed-off-by: Wim Van Sebroeck commit ec26985be4a22652c323f264cf570e4fbe3610b6 Author: Naga Chumbalkar Date: Tue Feb 9 00:42:02 2010 +0100 [WATCHDOG] iTCO_wdt: clean up probe(), modify err msg It's possible that the platform is not allowing reboot via TCO timer expiration. Also, differentiate between not finding a chipset that has TCO, and the case where TCO is present but the driver fails to initialize for some reason. Signed-off-by: Naga Chumbalkar Signed-off-by: Wim Van Sebroeck commit f538ed9ea0a54ba2121f35f52d63e4025c534909 Author: Wim Van Sebroeck Date: Wed Feb 10 19:34:05 2010 +0000 [WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup Clean-up driver: * make release the reverse of probe so that both are consistent * add WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctls. Signed-off-by: Wim Van Sebroeck commit 66aaa7a5592c0d8ca768c77d15d561bd43f514d8 Author: Marc Zyngier Date: Thu Feb 4 20:08:56 2010 +0000 [WATCHDOG] support for max63xx watchdog timer chips This driver adds support for the max63{69,70,71,72,73,74} family of watchdog timer chips. It has been tested on an Arcom Zeus (max6369). Signed-off-by: Marc Zyngier Signed-off-by: Wim Van Sebroeck commit 12926dc4167a9af460476a0df17f055398c8b871 Author: Mika Westerberg Date: Sun Nov 29 17:03:03 2009 +0200 [WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver Signed-off-by: Mika Westerberg Signed-off-by: Wim Van Sebroeck commit c90bf2aa94c08a0f48874f64ebdeb5fe973cf02e Author: Mika Westerberg Date: Sun Nov 29 16:58:38 2009 +0200 [WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs Technologic Systems TS-72xx SBCs have external glue logic CPLD which includes watchdog timer. This driver implements kernel support for that. Signed-off-by: Mika Westerberg Signed-off-by: Wim Van Sebroeck commit c2f843f03d658e9ab2a1a455f2c1851fd6a869af Author: Joern Engel Date: Sat Mar 6 10:03:11 2010 +0100 [LogFS] Change magic number Many changes were made during development that could result in old versions of mklogfs and the kernel code being subtly incompatible. Not being a friend of subtleties, I hereby change the magic number. Any old version of mklogfs is now guaranteed to fail. commit 9cf05b416d3324457f1dd8be35f4eaa7a9640bed Author: Joern Engel Date: Sat Mar 6 10:01:46 2010 +0100 [LogFS] Remove h_version field Incompatible change: h_compr is moved up so the padding is all in one chunk. commit c8634fd3115497ac311f57be9c12f993437745cf Author: Jeff Layton Date: Fri Feb 12 07:44:17 2010 -0500 cifs: add a CIFSSMBUnixQFileInfo function ...to allow us to get unix attrs via filehandle. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit bcd5357f430363376565d07ca542127d6d36602c Author: Jeff Layton Date: Fri Feb 12 07:44:16 2010 -0500 cifs: add a CIFSSMBQFileInfo function ...to get inode attributes via filehandle instead of by path. In some places, we need to revalidate an inode on an open filehandle, but we can't necessarily guarantee that the dentry associated with it will still be valid. When we have an open filehandle already, it makes more sense to do a filehandle based operation anyway. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit df2cf170c823ba779ca339e3ede347c87f4dc6a9 Author: Jeff Layton Date: Fri Feb 12 07:44:16 2010 -0500 cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry cifs_revalidate is renamed to cifs_revalidate_dentry as a later patch will add a by-filehandle variant. Add a new "invalid_mapping" flag to the cifsInodeInfo that indicates that the pagecache is considered invalid. Add a new routine to check inode attributes whenever they're updated and set that flag if the inode has changed on the server. cifs_revalidate_dentry is then changed to just update the attrcache if needed and then to zap the pagecache if it's not valid. There are some other behavior changes in here as well. Open files are now allowed to have their caches invalidated. I see no reason why we'd want to keep stale data around just because a file is open. Also, cifs_revalidate_cache uses the server_eof for revalidating the file size since that should more closely match the size of the file on the server. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit f070304094edb8d516423e79edd27c97ec2020b0 Author: Takahiro Yasui Date: Sat Mar 6 02:32:35 2010 +0000 dm raid1: fix deadlock when suspending failed device To prevent deadlock, bios in the hold list should be flushed before dm_rh_stop_recovery() is called in mirror_suspend(). The recovery can't start because there are pending bios and therefore dm_rh_stop_recovery deadlocks. When there are pending bios in the hold list, the recovery waits for the completion of the bios after recovery_count is acquired. The recovery_count is released when the recovery finished, however, the bios in the hold list are processed after dm_rh_stop_recovery() in mirror_presuspend(). dm_rh_stop_recovery() also acquires recovery_count, then deadlock occurs. Signed-off-by: Takahiro Yasui Signed-off-by: Alasdair G Kergon Reviewed-by: Mikulas Patocka commit 924e600d417ead9ef67043988055ba236f114718 Author: Mike Snitzer Date: Sat Mar 6 02:32:33 2010 +0000 dm: eliminate some holes data structures Eliminate a 4-byte hole in 'struct dm_io_memory' by moving 'offset' above the 'ptr' to which it applies (size reduced from 24 to 16 bytes). And by association, 1-4 byte hole is eliminated in 'struct dm_io_request' (size reduced from 56 to 48 bytes). Eliminate all 6 4-byte holes and 1 cache-line in 'struct dm_snapshot' (size reduced from 392 to 368 bytes). Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 3abf85b5b5851b5f28d3d8a920ebb844edd08352 Author: Peter Rajnoha Date: Sat Mar 6 02:32:31 2010 +0000 dm ioctl: introduce flag indicating uevent was generated Set a new DM_UEVENT_GENERATED_FLAG when returning from ioctls to indicate that a uevent was actually generated. This tells the userspace caller that it may need to wait for the event to be processed. Signed-off-by: Peter Rajnoha Signed-off-by: Alasdair G Kergon commit a97f925a32aad2a37971d7bfb657006acf04e42d Author: Mikulas Patocka Date: Sat Mar 6 02:32:29 2010 +0000 dm: free dm_io before bio_endio not after Free the dm_io structure before calling bio_endio() instead of after it, to ensure that the io_pool containing it is not referenced after it is freed. This partially fixes a problem described here https://www.redhat.com/archives/dm-devel/2010-February/msg00109.html thread 1: bio_endio(bio, io_error); /* scheduling happens */ thread 2: close the device remove the device thread 1: free_io(md, io); Thread 2, when removing the device, sees non-empty md->io_pool (because the io hasn't been freed by thread 1 yet) and may crash with BUG in mempool_free. Thread 1 may also crash, when freeing into a nonexisting mempool. To fix this we must make sure that bio_endio() is the last call and the md structure is not accessed afterwards. There is another bio_endio in process_barrier, but it is called from the thread and the thread is destroyed prior to freeing the mempools, so this call is not affected by the bug. A similar bug exists with module unloads - the module may be unloaded immediately after bio_endio - but that is more difficult to fix. Signed-off-by: Mikulas Patocka Cc: stable@kernel.org Signed-off-by: Alasdair G Kergon commit 8215d6ec5fee1e76545decea2cd73717efb5cb42 Author: Nikanth Karthikesan Date: Sat Mar 6 02:32:27 2010 +0000 dm table: remove unused dm_get_device range parameters Remove unused parameters(start and len) of dm_get_device() and fix the callers. Signed-off-by: Nikanth Karthikesan Signed-off-by: Alasdair G Kergon commit 0f3649a9e305ea22eb196a84a2d7520afcaa6060 Author: Mike Snitzer Date: Sat Mar 6 02:32:24 2010 +0000 dm ioctl: only issue uevent on resume if state changed Only issue a uevent on a resume if the state of the device changed, i.e. if it was suspended and/or its table was replaced. Signed-off-by: Dave Wysochanski Signed-off-by: Mike Snitzer Cc: stable@kernel.org Signed-off-by: Alasdair G Kergon commit ede5ea0b8b815560dc54c712536fdf0b456b6ad0 Author: Mikulas Patocka Date: Sat Mar 6 02:32:22 2010 +0000 dm raid1: always return error if all legs fail If all mirror legs fail, always return an error instead of holding the bio, even if the handle_errors option was set. At present it is the responsibility of the driver underneath us to deal with retries, multipath etc. The patch adds the bio to the failures list instead of holding it directly. do_failures tests first if all legs failed and, if so, returns the bio with -EIO. If any leg is still alive and handle_errors is set, do_failures calls hold_bio. Reviewed-by: Takahiro Yasui Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit fb61264297ca42a2a132f0433f75ccf7fd304ac6 Author: Kiyoshi Ueda Date: Sat Mar 6 02:32:18 2010 +0000 dm mpath: refactor pg_init This patch pulls the pg_init path activation code out of process_queued_ios() into a new function. No functional change. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit 2bded7bd7e8b12a913b0b58167a48220560e1514 Author: Kiyoshi Ueda Date: Sat Mar 6 02:32:13 2010 +0000 dm mpath: wait for pg_init completion when suspending When suspending the device we must wait for all I/O to complete, but pg-init may be still in progress even after flushing the workqueue for kmpath_handlerd in multipath_postsuspend. This patch waits for pg-init completion correctly in multipath_postsuspend(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit d0259bf0eefc503d3c9c9ccda35033c3dd3aac30 Author: Kiyoshi Ueda Date: Sat Mar 6 02:30:02 2010 +0000 dm mpath: hold io until all pg_inits completed m->queue_io is set to block processing I/Os, and it needs to be kept while pg-init, which issues multiple path activations, is in progress. But m->queue is cleared when a path activation completes without error in pg_init_done(), even while other path activations are in progress. That may cause undesired -EIO on paths which are not complete activation. This patch fixes that by not clearing m->queue_io until all path activations complete. (Before the hardware handlers were moved into the SCSI layer, pg_init only used one path.) Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit fce323dd68e13354071538c765b062859e6f8286 Author: Kiyoshi Ueda Date: Sat Mar 6 02:29:59 2010 +0000 dm mpath: avoid storing private suspended state 'suspended' flag in struct multipath was introduced to check whether the multipath target is in suspended state, but the same check is done through dm_suspended() now, so remove the flag and related code. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Cc: Mike Anderson Signed-off-by: Alasdair G Kergon commit c53a381efbe3d0e0629121b3f0d2b62a0e167791 Author: Mike Snitzer Date: Sat Mar 6 02:29:56 2010 +0000 dm: document when snapshot has finished merging Update Documentation/device-mapper/snapshot.txt to cover "How to determine when a snapshot has finished merging". Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit ecdb2e257abc33ae6798d3ccba87bdafa40ef6b6 Author: Kiyoshi Ueda Date: Sat Mar 6 02:29:52 2010 +0000 dm table: remove dm_get from dm_table_get_md Remove the dm_get() in dm_table_get_md() because dm_table_get_md() could be called from presuspend/postsuspend, which are called while mapped_device is in DMF_FREEING state, where dm_get() is not allowed. Justification for that is the lifetime of both objects: As far as the current dm design/implementation, mapped_device is never freed while targets are doing something, because dm core waits for targets to become quiet in dm_put() using presuspend/postsuspend. So targets should be able to touch mapped_device without holding reference count of the mapped_device, and we should allow targets to touch mapped_device even if it is in DMF_FREEING state. Backgrounds: I'm trying to remove the multipath internal queue, since dm core now has a generic queue for request-based dm. In the patch-set, the multipath target wants to request dm core to start/stop queue. One of such start/stop requests can happen during postsuspend() while the target waits for pg-init to complete, because the target stops queue when starting pg-init and tries to restart it when completing pg-init. Since queue belongs to mapped_device, it involves calling dm_table_get_md() and dm_put(). On the other hand, postsuspend() is called in dm_put() for mapped_device which is in DMF_FREEING state, and that triggers BUG_ON(DMF_FREEING) in the 2nd dm_put(). I had tried to solve this problem by changing only multipath not to touch mapped_device which is in DMF_FREEING state, but I couldn't and I came up with a question why we need dm_get() in dm_table_get_md(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit f7b934c8127deebf4eb56fbe4a4ae0da16b6dbcd Author: Moger, Babu Date: Sat Mar 6 02:29:49 2010 +0000 dm mpath: skip activate_path for failed paths This patch adds two minor fixes while processing device mapper path activation. Skip failed paths while calling activate_path. If the path is already failed then activate_path will fail for sure. We don't have to call in that case. In some case this might cause prolonged retries unnecessarily. Change the misleading message if the path being activated fails with SCSI_DH_NOSYS. Signed-off-by: Babu Moger Signed-off-by: Alasdair G Kergon commit 83c0d5d5388a8d45f7a45e0ec34adc52a78c81ad Author: Moger, Babu Date: Sat Mar 6 02:29:45 2010 +0000 dm mpath: pass struct pgpath to pg init done This patch removes some unnecessary argument casting. There is no functional change with this patch. Passes 'struct pgpath' through to pg_init_done() instead of the enclosed 'struct dm_path'. Tested the changes with LSI storage.. CC: Chandra Seetharaman Signed-off-by: Babu Moger Acked-by: Kiyoshi Ueda Signed-off-by: Alasdair G Kergon commit 0e95017355dcf43031da6d0e360a748717e56df1 Author: Tim Bird Date: Thu Feb 25 15:36:43 2010 -0800 function-graph: Add tracing_thresh support to function_graph tracer Add support for tracing_thresh to the function_graph tracer. This version of this feature isolates the checks into new entry and return functions, to avoid adding more conditional code into the main function_graph paths. When the tracing_thresh is set and the function graph tracer is enabled, only the functions that took longer than the time in microseconds that was set in tracing_thresh are recorded. To do this efficiently, only the function exits are recorded: [tracing]# echo 100 > tracing_thresh [tracing]# echo function_graph > current_tracer [tracing]# cat trace # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 1) ! 119.214 us | } /* smp_apic_timer_interrupt */ 1) <========== | 0) ! 101.527 us | } /* __rcu_process_callbacks */ 0) ! 126.461 us | } /* rcu_process_callbacks */ 0) ! 145.111 us | } /* __do_softirq */ 0) ! 149.667 us | } /* do_softirq */ 0) ! 168.817 us | } /* irq_exit */ 0) ! 248.254 us | } /* smp_apic_timer_interrupt */ Also, add support for specifying tracing_thresh on the kernel command line. When used like so: "tracing_thresh=200 ftrace=function_graph" this can be used to analyse system startup. It is important to disable tracing soon after boot, in order to avoid losing the trace data. Acked-by: Frederic Weisbecker Signed-off-by: Tim Bird LKML-Reference: <4B87098B.4040308@am.sony.com> Signed-off-by: Steven Rostedt commit 1acaa1b2d9b5904c9cce06122990a2d71046ce16 Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 18:23:50 2010 -0300 tracing: Update the comm field in the right variable in update_max_tr The latency output showed: # | task: -3 (uid:0 nice:0 policy:1 rt_prio:99) The comm is missing in the "task:" and it looks like a minus 3 is the output. The correct display should be: # | task: migration/0-3 (uid:0 nice:0 policy:1 rt_prio:99) The problem is that the comm is being stored in the wrong data structure. The max_tr.data[cpu] is what stores the comm, not the tr->data[cpu]. Before this patch the max_tr.data[cpu]->comm was zeroed and the /debug/trace ended up showing just the '-' sign followed by the pid. Also remove a needless initialization of max_data. Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1267824230-23861-1-git-send-email-acme@infradead.org> Signed-off-by: Steven Rostedt commit a094fe04c751698a18c3a0d376a3bdb117f1e0d8 Author: Steven Rostedt Date: Fri Mar 5 20:08:58 2010 -0500 function-graph: Use comment notation for func names of dangling '}' When a '}' does not have a matching function start, the name is printed within parenthesis. But this makes it confusing between ending '}' and function starts. This patch makes the function name appear in C comment notation. Old view: 3) 1.281 us | } (might_fault) 3) 3.620 us | } (filldir) 3) 5.251 us | } (call_filldir) 3) | call_filldir() { 3) | filldir() { New view: 3) 1.281 us | } /* might_fault */ 3) 3.620 us | } /* filldir */ 3) 5.251 us | } /* call_filldir */ 3) | call_filldir() { 3) | filldir() { Requested-by: Ingo Molnar Signed-off-by: Steven Rostedt commit 801c29fd1fdeb84f60241beb445ff5db154450ae Author: Steven Rostedt Date: Fri Mar 5 20:02:19 2010 -0500 function-graph: Fix unused reference to ftrace_set_func() The declaration of ftrace_set_func() is at the start of the ftrace.c file and wrapped with a #ifdef CONFIG_FUNCTION_GRAPH condition. If function graph tracing is enabled but CONFIG_DYNAMIC_FTRACE is not, a warning about that function being declared static and unused is given. This really should have been placed within the CONFIG_FUNCTION_GRAPH condition that uses ftrace_set_func(). Moving the declaration down fixes the warning and makes the code cleaner. Reported-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 Author: Rafael J. Wysocki Date: Sat Feb 27 21:37:37 2010 +0100 PCI/PM Runtime: Make runtime PM of PCI devices inactive by default Make the run-time power management of PCI devices be inactive by default by calling pm_runtime_forbid() for each PCI device during its initialization. This setting may be overriden by the user space with the help of the /sys/devices/.../power/control interface. That's necessary to avoid breakage on systems where ACPI-based wake-up is known to fail for some devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit f1a3d57213fe264b4cf584e78bac36aaf9998729 Author: Stephen Rothwell Date: Mon Jan 18 11:53:08 2010 +1100 ceph: update for write_inode API change Signed-off-by: Stephen Rothwell Signed-off-by: Sage Weil commit 64096c17417380d8a472d096645f4cbc9406c987 Merge: cc7889f 1154fab Author: Linus Torvalds Date: Fri Mar 5 14:35:40 2010 -0800 Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Fix per-cpu merge conflict failslab: add ability to filter slab caches slab: fix regression in touched logic dma kmalloc handling fixes slub: remove impossible condition slab: initialize unused alien cache entry as NULL at alloc_alien_cache(). SLUB: Make slub statistics use this_cpu_inc SLUB: this_cpu: Remove slub kmem_cache fields SLUB: Get rid of dynamic DMA kmalloc cache allocation SLUB: Use this_cpu operations in slub commit 3a22813a5aaf8e8c72be575dabe0ba26f9352f4d Author: Breno Leitao Date: Thu Mar 4 10:40:44 2010 +0000 s2io: Fixing debug message Currently s2io is dumping debug messages using the interface name before it was allocated, showing a message like the following: s2io: eth%d: Ring Mem PHY: 0x7ef80000 s2io: s2io_reset: Resetting XFrame card eth%d This patch just fixes it, printing the pci bus information for the card instead of the interface name. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit a80483d3722b603dae8a52495f8d88a7d4b1bf1c Author: Jesse Brandeburg Date: Fri Mar 5 02:21:44 2010 +0000 e1000e: fix packet corruption and tx hang during NFSv2 when receiving a particular type of NFS v2 UDP traffic, the hardware could DMA some bad data and then hang, possibly corrupting memory. Disable the NFS parsing in this hardware, verified to fix the bug. Originally reported and reproduced by RedHat's Neil Horman CC: nhorman@tuxdriver.com Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Acked-by: Neil Horman Signed-off-by: David S. Miller commit 5fe88eae26dbd24eed73eb0b681e13981fd486b3 Author: David Dillow Date: Thu Mar 4 04:37:16 2010 +0000 typhoon: fix incorrect use of smp_wmb() The typhoon driver was incorrectly using smp_wmb() to order memory accesses against IO to the NIC in a few instances. Use wmb() instead, which is required to actually order between memory types. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d17792ebdf90289c9fd1bce888076d3d60ecd53b Author: Jeff Garzik Date: Thu Mar 4 08:21:53 2010 +0000 ethtool: Add direct access to ops->get_sset_count On 03/04/2010 09:26 AM, Ben Hutchings wrote: > On Thu, 2010-03-04 at 00:51 -0800, Jeff Kirsher wrote: >> From: Jeff Garzik >> >> This patch is an alternative approach for accessing string >> counts, vs. the drvinfo indirect approach. This way the drvinfo >> space doesn't run out, and we don't break ABI later. > [...] >> --- a/net/core/ethtool.c >> +++ b/net/core/ethtool.c >> @@ -214,6 +214,10 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use >> info.cmd = ETHTOOL_GDRVINFO; >> ops->get_drvinfo(dev,&info); >> >> + /* >> + * this method of obtaining string set info is deprecated; >> + * consider using ETHTOOL_GSSET_INFO instead >> + */ > > This comment belongs on the interface (ethtool.h) not the > implementation. Debatable -- the current comment is located at the callsite of ops->get_sset_count(), which is where an implementor might think to add a new call. Not all the numeric fields in ethtool_drvinfo are obtained from ->get_sset_count(). Hence the "some" in the attached patch to include/linux/ethtool.h, addressing your comment. > [...] >> +static noinline int ethtool_get_sset_info(struct net_device *dev, >> + void __user *useraddr) >> +{ > [...] >> + /* calculate size of return buffer */ >> + for (i = 0; i< 64; i++) >> + if (sset_mask& (1ULL<< i)) >> + n_bits++; > [...] > > We have a function for this: > > n_bits = hweight64(sset_mask); Agreed. I've attached a follow-up patch, which should enable my/Jeff's kernel patch to be applied, followed by this one. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 723b2f57ad83ee7087acf9a95e8e289414b1f521 Author: Jeff Garzik Date: Wed Mar 3 22:51:50 2010 +0000 ethtool: Add direct access to ops->get_sset_count This patch is an alternative approach for accessing string counts, vs. the drvinfo indirect approach. This way the drvinfo space doesn't run out, and we don't break ABI later. Signed-off-by: Jeff Garzik Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4b79a1aedcb9dd6e3f27b970dcb553aefcd97254 Author: David Brown Date: Fri Mar 5 09:12:34 2010 +0000 net: smc91x: Support Qualcomm MSM development boards. Signed-off-by: David Brown Signed-off-by: Daniel Walker Acked-by: Nicolas Pitre Signed-off-by: David S. Miller commit a3a858ff18a72a8d388e31ab0d98f7e944841a62 Author: Zhu Yi Date: Thu Mar 4 18:01:47 2010 +0000 net: backlog functions rename sk_add_backlog -> __sk_add_backlog sk_add_backlog_limited -> sk_add_backlog Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 2499849ee8f513e795b9f2c19a42d6356e4943a4 Author: Zhu Yi Date: Thu Mar 4 18:01:46 2010 +0000 x25: use limited socket backlog Make x25 adapt to the limited socket backlog change. Cc: Andrew Hendry Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 53eecb1be5ae499d399d2923933937a9ea1a284f Author: Zhu Yi Date: Thu Mar 4 18:01:45 2010 +0000 tipc: use limited socket backlog Make tipc adapt to the limited socket backlog change. Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Allan Stephens Signed-off-by: David S. Miller commit 50b1a782f845140f4138f14a1ce8a4a6dd0cc82f Author: Zhu Yi Date: Thu Mar 4 18:01:44 2010 +0000 sctp: use limited socket backlog Make sctp adapt to the limited socket backlog change. Cc: Vlad Yasevich Cc: Sridhar Samudrala Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit 79545b681961d7001c1f4c3eb9ffb87bed4485db Author: Zhu Yi Date: Thu Mar 4 18:01:43 2010 +0000 llc: use limited socket backlog Make llc adapt to the limited socket backlog change. Cc: Arnaldo Carvalho de Melo Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 55349790d7cbf0d381873a7ece1dcafcffd4aaa9 Author: Zhu Yi Date: Thu Mar 4 18:01:42 2010 +0000 udp: use limited socket backlog Make udp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 Author: Zhu Yi Date: Thu Mar 4 18:01:41 2010 +0000 tcp: use limited socket backlog Make tcp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 8eae939f1400326b06d0c9afe53d2a484a326871 Author: Zhu Yi Date: Thu Mar 4 18:01:40 2010 +0000 net: add limit for socket backlog We got system OOM while running some UDP netperf testing on the loopback device. The case is multiple senders sent stream UDP packets to a single receiver via loopback on local host. Of course, the receiver is not able to handle all the packets in time. But we surprisingly found that these packets were not discarded due to the receiver's sk->sk_rcvbuf limit. Instead, they are kept queuing to sk->sk_backlog and finally ate up all the memory. We believe this is a secure hole that a none privileged user can crash the system. The root cause for this problem is, when the receiver is doing __release_sock() (i.e. after userspace recv, kernel udp_recvmsg -> skb_free_datagram_locked -> release_sock), it moves skbs from backlog to sk_receive_queue with the softirq enabled. In the above case, multiple busy senders will almost make it an endless loop. The skbs in the backlog end up eat all the system memory. The issue is not only for UDP. Any protocols using socket backlog is potentially affected. The patch adds limit for socket backlog so that the backlog size cannot be expanded endlessly. Reported-by: Alex Shi Cc: David Miller Cc: Arnaldo Carvalho de Melo Cc: Alexey Kuznetsov Cc: Patrick McHardy Cc: Vlad Yasevich Cc: Sridhar Samudrala Cc: Jon Maloy Cc: Allan Stephens Cc: Andrew Hendry Signed-off-by: Zhu Yi Signed-off-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit cc7889ff5ee7a1c1a2b5073c53db5ad9b76f14e2 Merge: b13d3c6 3fa04ec Author: Linus Torvalds Date: Fri Mar 5 13:25:45 2010 -0800 Merge branch 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (44 commits) NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping NFS: Clean up nfs_sync_mapping NFS: Simplify nfs_wb_page() NFS: Replace __nfs_write_mapping with sync_inode() NFS: Simplify nfs_wb_page_cancel() NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set NFS: Reduce the number of unnecessary COMMIT calls NFS: Add a count of the number of unstable writes carried by an inode NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c nfs41 fix NFS4ERR_CLID_INUSE for exchange id NFS: Fix an allocation-under-spinlock bug SUNRPC: Handle EINVAL error returns from the TCP connect operation NFSv4.1: Various fixes to the sequence flag error handling nfs4: renewd renew operations should take/put a client reference nfs41: renewd sequence operations should take/put client reference nfs: prevent backlogging of renewd requests nfs: kill renewd before clearing client minor version NFS: Make close(2) asynchronous when closing NFS O_DIRECT files NFS: Improve NFS iostat byte count accuracy for writes ... commit b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0 Merge: e213e26 5717144 Author: Linus Torvalds Date: Fri Mar 5 13:25:24 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: fs/9p: Add hardlink support to .u extension 9P2010.L handshake: .L protocol negotiation 9P2010.L handshake: Remove "dotu" variable 9P2010.L handshake: Add mount option 9P2010.L handshake: Add VFS flags net/9p: Handle mount errors correctly. net/9p: Remove MAX_9P_CHAN limit net/9p: Add multi channel support. commit e213e26ab3988c516c06eba4dcd030ac052f6dc9 Merge: c812a51 efd8f0e Author: Linus Torvalds Date: Fri Mar 5 13:20:53 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (33 commits) quota: stop using QUOTA_OK / NO_QUOTA dquot: cleanup dquot initialize routine dquot: move dquot initialization responsibility into the filesystem dquot: cleanup dquot drop routine dquot: move dquot drop responsibility into the filesystem dquot: cleanup dquot transfer routine dquot: move dquot transfer responsibility into the filesystem dquot: cleanup inode allocation / freeing routines dquot: cleanup space allocation / freeing routines ext3: add writepage sanity checks ext3: Truncate allocated blocks if direct IO write fails to update i_size quota: Properly invalidate caches even for filesystems with blocksize < pagesize quota: generalize quota transfer interface quota: sb_quota state flags cleanup jbd: Delay discarding buffers in journal_unmap_buffer ext3: quota_write cross block boundary behaviour quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota quota: split out compat_sys_quotactl support from quota.c quota: split out netlink notification support from quota.c quota: remove invalid optimization from quota_sync_all ... Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c commit a0a5e3488a51c46f383c5faa86b53828e30ce153 Author: Amerigo Wang Date: Fri Mar 5 22:17:26 2010 +0100 hwmon: Remove the deprecated adt7473 driver adt7473 driver is obsoleted by adt7475 driver. And it is scheduled to be removed in Feb 2010. Signed-off-by: WANG Cong Signed-off-by: Jean Delvare commit dc71afe5ac7e8d049bb991330518e4c898a7d92e Author: Jean Delvare Date: Fri Mar 5 22:17:26 2010 +0100 hwmon: Fix off-by-one kind values Recent changes on the I2C front have left off-by-one array indexes in 3 hwmon drivers. Fix them. Faulty commit: e5e9f44c2 i2c: Drop I2C_CLIENT_INSMOD_2 to 8 Reported-by: Dan Carpenter Signed-off-by: Jean Delvare Cc: Hans de Goede Cc: Andre Prendel Cc: stable@kernel.org commit a44908d742a577fb5ccb9a8c082326d4cea234c2 Author: Jean Delvare Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: (tmp421) Fix temperature conversions The low bits of temperature registers are status bits, they must be masked out before converting the register values to temperatures. Signed-off-by: Jean Delvare Tested-by: Andre Prendel Cc: stable@kernel.org commit 8d59582a867470a3e0c3eced4a01625ae8dc546b Author: Jean Delvare Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: (tmp421) Restore missing inputs An off-by-one error caused some inputs to not be created by the driver when they should. TMP421 gets only one input instead of two, TMP422 gets two instead of three, etc. Fix the bug by listing explicitly the number of inputs each device has. Signed-off-by: Jean Delvare Tested-by: Andre Prendel Cc: stable@kernel.org commit d58de038728221f780e11d50b32aa40d420c1150 Author: George Joseph Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: Driver for Andigilog aSC7621 family monitoring chips Hwmon driver for Andigilog aSC7621 family monitoring chips. Signed-off-by: George Joseph Acked-by: Hans de Goede Signed-off-by: Jean Delvare commit 232449850229deeda84194e8a3c93a49ab6a043e Author: Wolfram Sang Date: Fri Mar 5 22:17:23 2010 +0100 hwmon: (adt7411) Improve locking Add proper locking for the cached variables. Also get rid of ref_is_vdd, which became obsolete. Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit d84ca5b345c2b77ebf053d534ada6af2332a43b6 Author: Wolfram Sang Date: Fri Mar 5 22:17:23 2010 +0100 hwmon: Add driver for ADT7411 voltage and temperature sensor Add basic support for the ADT7411. Reads out all conversion results (via I2C, SPI yet missing) and allows some on-the-fly configuration. Tested with a custom board. Signed-off-by: Sascha Hauer Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 5852f9609d21794c45964129b03365883150a6d0 Author: Sven Anders Date: Fri Mar 5 22:17:22 2010 +0100 hwmon: (w83793) Add watchdog functionality Add watchdog functionality to the Winbond W83793 driver. Signed-off-by: Sven Anders Acked-by: Hans de Goede Signed-off-by: Jean Delvare commit ebec05bdc4f7d3da852aa86fb54b163d9aeb9848 Author: Jean Delvare Date: Fri Mar 5 22:17:22 2010 +0100 hwmon: (g760a) Make rpm_from_cnt static Function rpm_from_cnt is only used internally so it can be made static. Make it inline while we're here, for performance reasons (although hopefully gcc would figure out by itself...) Signed-off-by: Jean Delvare Cc: Herbert Valerio Riedel Acked-by: Martin Michlmayr commit cccfc9c4bb3c7888f8249b36e08d6e115238c613 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Validate auto pwm settings Before switching to automatic fan control mode, make sure that all the trip points make sense. Otherwise, the control loop could lead to weird fan behavior. Signed-off-by: Jean Delvare commit 4f3f51bc21d434f8d91a79438a1957ec0baa9e30 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Add support for old automatic fan speed control Add support for the automatic fan speed control interface as implemented by IT8705F chips up to revision F and IT8712F chips up to revision G. This implementation fits very well in our standard sysfs interface. I implemented the old and not the new interface because the only chip I have at hand is an old one, and the new interface is more difficult to map to the standard sysfs interface. Adding support later should be possible though, if someone with a supported chip is interested. Signed-off-by: Jean Delvare commit 404a552d8ae6847ae17f3c749bd5d312da08efe4 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Drop dead web links in documentation Unfortunately ITE is no longer publicly providing datasheets for their IT87xxF series of chips. They may send them on request if you ask politely. Signed-off-by: Jean Delvare commit d624870ffe6e13df94671be9a0e0e2fb001f1bef Author: Jean Delvare Date: Fri Mar 5 22:17:20 2010 +0100 hwmon: (it87) Add an entry in MAINTAINERS As I've just done a lot of changes to the it87 driver, I volunteer to maintain it for the year to come. Signed-off-by: Jean Delvare commit f5f64501e430784251b23625850ce6d690800acf Author: Jean Delvare Date: Fri Mar 5 22:17:19 2010 +0100 hwmon: (it87) Use strict_strtol instead of simple_strtol For consistency and robustness, use strict_strtol instead of simple_strtol. Signed-off-by: Jean Delvare commit 5f2dc798cadd144659cc9f5b6fc2a0a12c6dbdb0 Author: Jean Delvare Date: Fri Mar 5 22:17:18 2010 +0100 hwmon: (it87) Fix many checkpatch errors and warnings Fix 20 errors and 11 warnings reported by the checkpatch script. The remainining errors would require more work. The remaining warnings will be addressed later. Signed-off-by: Jean Delvare commit d9b327c310030fa80abbbc9eaaca9f1a6228dbf3 Author: Jean Delvare Date: Fri Mar 5 22:17:17 2010 +0100 hwmon: (it87) Add support for beep on alarm The IT87xxF chips support beeping on alarm, if properly wired and configured. There is one control bit for each input type (temperature, fan, voltage.) Let the user see and change them. Signed-off-by: Jean Delvare commit 6a8d7acfbef8ac6bf34421eae980f903cbe36874 Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Create vid attributes by group Only VID-related attributes are left in it87_attributes_opt, so we might as well rename it to it87_attributes_vid and use this group to create all attributes at once. Signed-off-by: Jean Delvare commit 723a0aa0a10f111d7e9e0977d51ac996bf8edbbf Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Refactor attributes creation and removal There is a lot of code redundancy in the creation of the fan and pwm attributes. Move these attributes to arrays so that the code can be simplified. This in turns makes the attributes removal code larger, so move it to a separate function that can be called in both the standard removal case and the error path during probing. Signed-off-by: Jean Delvare commit 94ac7ee616809d1c919f222037330eca211da9e4 Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Expose the PWM/temperature mappings Let the user read the PWM-to-temperature mappings. Until the trip points are also exposed, this is essentially a way to know how the BIOS has set things up. The ability to change the settings will be added later, together with the trip points. Signed-off-by: Jean Delvare commit b99883dcd565e30299a6c5c3250725a4d48a8253 Author: Jean Delvare Date: Fri Mar 5 22:17:15 2010 +0100 hwmon: (it87) Display fan outputs in automatic mode as such The it87 driver doesn't yet support automatic fan control. Let it at least tell the user when a fan output is in automatic mode. Also let the user switch from automatic mode (possibly set by the BIOS) to manual mode and back without losing the settings. Signed-off-by: Jean Delvare commit 53de33427fa3d7dd62cc5ec75ce0d4e6c6d602dd Author: Jean Delvare Date: Fri Mar 5 22:17:15 2010 +0100 hwmon: (lm90) Add SMBus alert support Tested successfully with an ADM1032 chip on its evaluation board. It should work fine with all other chips as well. At this point this is more of a proof-of-concept, we don't do anything terribly useful on SMBus alert: we simply log the event. But this could later evolve into libsensors signaling so that user-space applications can take an appropriate action. Signed-off-by: Jean Delvare Cc: David Brownell Cc: Trent Piepho commit 95238364167edaf93ce2890e5f55326b63194851 Author: Jean Delvare Date: Fri Mar 5 22:17:14 2010 +0100 hwmon: (lm90) Restore configuration on exit Restore the chip configuration when unloading the driver. This ensures we don't leave the chip running if it was initially stopped. Signed-off-by: Jean Delvare commit 6771ea1fff988651593f78c122bc02e80f5100a0 Author: Jean Delvare Date: Fri Mar 5 22:17:13 2010 +0100 hwmon: (lm90) Add support for the Winbond/Nuvoton W83L771AWG/ASG This chips is found on several Zotac Ion ITX boards, amongst others. Signed-off-by: Jean Delvare Cc: MC Matti Cc: Manuel Lamotte-Schubert commit c812a51d11bbe983f4c24e32b59b265705ddd3c2 Merge: 9467c4f d2be165 Author: Linus Torvalds Date: Fri Mar 5 13:12:34 2010 -0800 Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits) KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP KVM: VMX: Update instruction length on intercepted BP KVM: Fix emulate_sys[call, enter, exit]()'s fault handling KVM: Fix segment descriptor loading KVM: Fix load_guest_segment_descriptor() to inject page fault KVM: x86 emulator: Forbid modifying CS segment register by mov instruction KVM: Convert kvm->requests_lock to raw_spinlock_t KVM: Convert i8254/i8259 locks to raw_spinlocks KVM: x86 emulator: disallow opcode 82 in 64-bit mode KVM: x86 emulator: code style cleanup KVM: Plan obsolescence of kernel allocated slots, paravirt mmu KVM: x86 emulator: Add LOCK prefix validity checking KVM: x86 emulator: Check CPL level during privilege instruction emulation KVM: x86 emulator: Fix popf emulation KVM: x86 emulator: Check IOPL level during io instruction emulation KVM: x86 emulator: fix memory access during x86 emulation KVM: x86 emulator: Add Virtual-8086 mode of emulation KVM: x86 emulator: Add group9 instruction decoding KVM: x86 emulator: Add group8 instruction decoding KVM: do not store wqh in irqfd ... Trivial conflicts in Documentation/feature-removal-schedule.txt commit 5717144a01d701614cfdb15f09ed562d720cf3db Author: Aneesh Kumar K.V Date: Fri Mar 5 14:43:43 2010 -0600 fs/9p: Add hardlink support to .u extension For regular file and directories we put the link count in th extension field in a tagged string format. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit c5a7697da9775f7a0e122fa23180becc311772d1 Author: Sripathi Kodi Date: Fri Mar 5 18:51:04 2010 +0000 9P2010.L handshake: .L protocol negotiation This patch adds 9P2010.L protocol negotiation with the server Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 342fee1d5c7dfa05f4e14ec1e583df4553b09776 Author: Sripathi Kodi Date: Fri Mar 5 18:50:14 2010 +0000 9P2010.L handshake: Remove "dotu" variable Removes 'dotu' variable and make everything dependent on 'proto_version' field. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 0fb80abd911a7cb1e6548b5279568dc1e8949702 Author: Sripathi Kodi Date: Fri Mar 5 18:49:11 2010 +0000 9P2010.L handshake: Add mount option Add new mount V9FS mount option to specify protocol version This patch adds a new mount option to specify protocol version. With this option it is possible to use "-o version=" switch to specify 9P protocol version to use. Valid options for version are: 9p2000 9p2000.u 9p2010.L Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit dd6102fbd917889384d89bc427e98e85e8fda000 Author: Sripathi Kodi Date: Fri Mar 5 18:48:00 2010 +0000 9P2010.L handshake: Add VFS flags Add 9P2000.u and 9P2010.L protocol flags to V9FS VFS This patch adds 9P2000.u and 9P2010.L protocol flags into V9FS VFS side code and removes the single flag used for 'extended'. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit c1a7c2262035e83a8f70ebe1328b3451702cf51b Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:02 2010 +0000 net/9p: Handle mount errors correctly. With this patch we have # mount -t 9p -o trans=virtio virtio2 /mnt/ # mount -t 9p -o trans=virtio virtio2 /mnt/ mount: virtio2 already mounted or /mnt/ busy mount: according to mtab, virtio2 is already mounted on /mnt # mount -t 9p -o trans=virtio virtio3 /mnt/ -o debug=0xfff mount: special device virtio3 does not exist Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 37c1209d413242d9560e343c040777049a8dd869 Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:01 2010 +0000 net/9p: Remove MAX_9P_CHAN limit Use a list to track the channel instead of statically allocated array Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit f75580c4afb72c156746b3fc1ec977b1a85d3dee Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:00 2010 +0000 net/9p: Add multi channel support. This is needed for supporting multiple mount points. We can find out the device names to be used with mount by checking /sys/devices/virtio-pci/virtio*/device file if the device file have value 9 then the specific virtio device can be used for mounting. ex: #cat /sys/devices/virtio-pci/virtio1/device 9 now we can mount using # mount -t 9p -o trans=virtio virtio1 /mnt/ Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 3fa04ecd72780da31ba8b329e148179bc24a9c7d Merge: 180b62a 1cda707 Author: Trond Myklebust Date: Fri Mar 5 15:46:18 2010 -0500 Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34 commit 1cda707d52e51a6cafac0aef12d2bd7052d572e6 Author: Trond Myklebust Date: Fri Feb 19 17:03:30 2010 -0800 NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping Signed-off-by: Trond Myklebust commit 5cf95214ccb915591e2214f81de4659302d3e452 Author: Trond Myklebust Date: Fri Feb 19 17:03:29 2010 -0800 NFS: Clean up nfs_sync_mapping Remove the redundant call to filemap_write_and_wait(). Signed-off-by: Trond Myklebust commit 7f2f12d963e7c33a93bfb0b22f0178eb1e6a4196 Author: Trond Myklebust Date: Fri Feb 19 17:03:28 2010 -0800 NFS: Simplify nfs_wb_page() Signed-off-by: Trond Myklebust commit acdc53b2146c7ee67feb1f02f7bc3020126514b8 Author: Trond Myklebust Date: Fri Feb 19 17:03:26 2010 -0800 NFS: Replace __nfs_write_mapping with sync_inode() Now that we have correct COMMIT semantics in writeback_single_inode, we can reduce and simplify nfs_wb_all(). Also replace nfs_wb_nocommit() with a call to filemap_write_and_wait(), which doesn't need to hold the inode->i_mutex. With that done, we can eliminate nfs_write_mapping() altogether. Signed-off-by: Trond Myklebust commit c988950eb6dd6f8e6d98503ca094622729e9aa13 Author: Trond Myklebust Date: Fri Feb 19 17:03:21 2010 -0800 NFS: Simplify nfs_wb_page_cancel() In all cases we should be able to just remove the request and call cancel_dirty_page(). Signed-off-by: Trond Myklebust commit 2928db1ffeacc9717c2d5c230d450bcc377b3ae9 Author: Trond Myklebust Date: Fri Feb 19 17:03:18 2010 -0800 NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages Since nfs_scan_list() doesn't wait for locked pages, we have a race in which it is possible to end up with an inode that needs to send a COMMIT, but which does not have the I_DIRTY_DATASYNC flag set. Signed-off-by: Trond Myklebust commit 5bad5abec4058c5214bfc72cec418348d6747977 Author: Trond Myklebust Date: Fri Feb 19 17:02:24 2010 -0800 NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set Signed-off-by: Trond Myklebust Acked-by: Peter Zijlstra Acked-by: Wu Fengguang commit 420e3646bb7d93a571734034249fbb1ae1a7a5c7 Author: Trond Myklebust Date: Fri Feb 19 17:00:02 2010 -0800 NFS: Reduce the number of unnecessary COMMIT calls If the caller is doing a non-blocking flush, and there are still writebacks pending on the wire, we can usually defer the COMMIT call until those writes are done. Also ensure that we honour the wbc->nonblocking flag. Signed-off-by: Trond Myklebust commit ff778d02bf867e1733a09b34ad6dbb723b024814 Author: Trond Myklebust Date: Fri Feb 19 16:53:39 2010 -0800 NFS: Add a count of the number of unstable writes carried by an inode In order to know when we should do opportunistic commits of the unstable writes, when the VM is doing a background flush, we add a field to count the number of unstable writes. Signed-off-by: Trond Myklebust commit 8fc795f703c5138e1a8bfb88c69f52632031aa6a Author: Trond Myklebust Date: Fri Feb 19 16:46:56 2010 -0800 NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c The sole purpose of nfs_write_inode is to commit unstable writes, so move it into fs/nfs/write.c, and make nfs_commit_inode static. Signed-off-by: Trond Myklebust commit 9467c4fdd66f6810cecef0f1173330f3c6e67d45 Merge: 35c2e96 a9185b4 Author: Linus Torvalds Date: Fri Mar 5 11:53:53 2010 -0800 Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: pass writeback_control to ->write_inode make sure data is on disk before calling ->write_inode commit 35c2e967d067ff02dc944f2434f024419c2fe83a Merge: 6c550ee 1f36f77 Author: Linus Torvalds Date: Fri Mar 5 11:46:31 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Switch !O_CREAT case to use of do_last() Get rid of symlink body copying Finish pulling of -ESTALE handling to upper level in do_filp_open() Turn do_link spaghetty into a normal loop Unify exits in O_CREAT handling Kill is_link argument of do_last() Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open() Leave mangled flag only for setting nd.intent.open.flag Get rid of passing mangled flag to do_last() Don't pass mangled open_flag to finish_open() pull more into do_last() bail out with ELOOP earlier in do_link loop pull the common predecessors into do_last() postpone __putname() until after do_last() unroll do_last: loop in do_filp_open() Shift releasing nd->root from do_last() to its caller gut do_filp_open() a bit more (do_last separation) beginning to untangle do_filp_open() commit 6c550ee41596798cbd873d3df9f8ea0a4ce7ad2f Author: Randy Dunlap Date: Fri Mar 5 09:52:52 2010 -0800 x86: fix mtrr missing kernel-doc Fix missing kernel-doc notation in mtrr/main.c: Warning(arch/x86/kernel/cpu/mtrr/main.c:152): No description found for parameter 'info' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 660f6a360be399f4ebdd6572a3d24afe54e9bb1c Merge: 586fac1 e5a1101 Author: Linus Torvalds Date: Fri Mar 5 10:50:22 2010 -0800 Merge branch 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Issue at least one memory barrier in stop_machine_text_poke() perf probe: Correct probe syntax on command line help perf probe: Add lazy line matching support perf probe: Show more lines after last line perf probe: Check function address range strictly in line finder perf probe: Use libdw callback routines perf probe: Use elfutils-libdw for analyzing debuginfo perf probe: Rename probe finder functions perf probe: Fix bugs in line range finder perf probe: Update perf probe document perf probe: Do not show --line option without dwarf support kprobes: Add documents of jump optimization kprobes/x86: Support kprobes jump optimization on x86 x86: Add text_poke_smp for SMP cross modifying code kprobes/x86: Cleanup save/restore registers kprobes/x86: Boost probes when reentering kprobes: Jump optimization sysctl interface kprobes: Introduce kprobes jump optimization kprobes: Introduce generic insn_slot framework kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE commit 586fac13f8685bf9dfb32e1ee98bfb14f0dd0061 Merge: 1f63b9c 7478138 Author: Linus Torvalds Date: Fri Mar 5 10:47:57 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: padata: Allocate the cpumask for the padata instance crypto: authenc - Move saved IV in front of the ablkcipher request crypto: hash - Fix handling of unaligned buffers crypto: authenc - Use correct ahash complete functions crypto: md5 - Set statesize commit 1f63b9c15b17d5af360c180f5c71537e954d5d3b Merge: b24bc1e 64e290e Author: Linus Torvalds Date: Fri Mar 5 10:47:00 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (36 commits) ext4: fix up rb_root initializations to use RB_ROOT ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl ext4: Fix the NULL reference in double_down_write_data_sem() ext4: Fix insertion point of extent in mext_insert_across_blocks() ext4: consolidate in_range() definitions ext4: cleanup to use ext4_grp_offs_to_block() ext4: cleanup to use ext4_group_first_block_no() ext4: Release page references acquired in ext4_da_block_invalidatepages ext4: Fix ext4_quota_write cross block boundary behaviour ext4: Convert BUG_ON checks to use ext4_error() instead ext4: Use direct_IO_no_locking in ext4 dio read ext4: use ext4_get_block_write in buffer write ext4: mechanical rename some of the direct I/O get_block's identifiers ext4: make "offset" consistent in ext4_check_dir_entry() ext4: Handle non empty on-disk orphan link ext4: explicitly remove inode from orphan list after failed direct io ext4: fix error handling in migrate ext4: deprecate obsoleted mount options ext4: Fix fencepost error in chosing choosing group vs file preallocation. jbd2: clean up an assertion in jbd2_journal_commit_transaction() ... commit b24bc1e61cec2174faf5dfa632da16b6ca17144f Merge: 64ba992 06862f8 Author: Linus Torvalds Date: Fri Mar 5 10:46:04 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: get rid of obsolete definition in header file Squashfs: get rid of obsolete variable in struct squashfs_sb_info Squashfs: add decompressor entries for lzma and lzo Squashfs: add a decompressor framework Squashfs: factor out remaining zlib dependencies into separate wrapper file Squashfs: move zlib decompression wrapper code into a separate file commit a9185b41a4f84971b930c519f0c63bd450c4810d Author: Christoph Hellwig Date: Fri Mar 5 09:21:37 2010 +0100 pass writeback_control to ->write_inode This gives the filesystem more information about the writeback that is happening. Trond requested this for the NFS unstable write handling, and other filesystems might benefit from this too by beeing able to distinguish between the different callers in more detail. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 26821ed40b4230259e770c9911180f38fcaa6f59 Author: Christoph Hellwig Date: Fri Mar 5 09:21:21 2010 +0100 make sure data is on disk before calling ->write_inode Similar to the fsync issue fixed a while ago in commit 2daea67e966dc0c42067ebea015ddac6834cef88 we need to write for data to actually hit the disk before writing out the metadata to guarantee data integrity for filesystems that modify the inode in the data I/O completion path. Currently XFS and NFS handle this manually, and AFS has a write_inode method that does nothing but waiting for data, while others are possibly missing out on this. Fortunately this change has a lot less impact than the fsync change as none of the write_inode methods starts data writeout of any form by itself. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 9b1f56d60acfd634728f91f34922066c6f80ede6 Merge: 64ba992 07000ee Author: Alex Elder Date: Fri Mar 5 11:45:03 2010 -0600 Merge branch 'for-2.6.34-rc1-batch2' into for-linus commit 07000ee686cf19e853fa06f7904eff2cfe230ea3 Author: Dave Chinner Date: Fri Mar 5 04:41:14 2010 +0000 xfs: return inode fork offset in bulkstat for fsr So that fsr can attempt to get the fork offset of the temporary inode it uses the same as the inode it is defragmenting, pass the fork offset out in the bulkstat information. The bulkstat structure has padding that has always been zeroed, so userspace can tell if this field is set or not by use of the xattr present flag and a non-zero value for the fork offset. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8babd8a2e75cccff3167a61176c2a3e977e13799 Author: Dave Chinner Date: Thu Mar 4 01:46:25 2010 +0000 xfs: Increase the default size of the reserved blocks pool The current default size of the reserved blocks pool is easy to deplete with certain workloads, in particular workloads that do lots of concurrent delayed allocation extent conversions. If enough transactions are running in parallel and the entire pool is consumed then subsequent calls to xfs_trans_reserve() will fail with ENOSPC. Also add a rate limited warning so we know if this starts happening again. This is an updated version of an old patch from Lachlan McIlroy. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 3ed3a4343b79a79d10e31f85f2d1afabcead76c6 Author: Dave Chinner Date: Fri Mar 5 02:00:42 2010 +0000 xfs: truncate delalloc extents when IO fails in writeback We currently use block_invalidatepage() to clean up pages where I/O fails in ->writepage(). Unfortunately, if the page has delalloc regions on it, we fail to remove the delalloc regions when we invalidate the page. This can result in tripping a BUG() in xfs_get_blocks() later on if a direct IO read is done on that same region - the delalloc extent is returned when none is supposed to be there. Fix this by truncating away the delalloc regions on the page before invalidating it. Because they are delalloc, we can do this without needing a transaction. Indeed - if we get ENOSPC errors, we have to be able to do this truncation without a transaction as there is no space left for block reservation (typically why we see a ENOSPC in writeback). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 20f6b2c785cf187445f126321638ab8ba7aa7494 Author: Dave Chinner Date: Thu Mar 4 01:46:23 2010 +0000 xfs: check for more work before sleeping in xfssyncd xfssyncd processes a queue of work by detaching the queue and then iterating over all the work items. It then sleeps for a time period or until new work comes in. If new work is queued while xfssyncd is actively processing the detached work queue, it will not process that new work until after a sleep timeout or the next work event queued wakes it. Fix this by checking the work queue again before going to sleep. Signed-off-by: Dave Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 694189328a7e566cb84bd3205503a42b60e87882 Author: Dave Chinner Date: Thu Mar 4 00:57:09 2010 +0000 xfs: Fix a build warning in xfs_aops.c Fix a build warning that slipped through. Dave Chinner had posted an updated version of his patch but the previous version--without this fix--was what got committed. Reported-by: Stephen Rothwell Signed-off-by: Stephen Rothwell Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit d2db09b87eb7b547136d5d25ff1df06820e070bf Author: Frederik Deweerdt Date: Fri Mar 5 16:34:31 2010 +0100 ALSA: hda: uninitialized variable fix Commit eaa9b3a748539651f50e3a234c8854e1b42a839a introduced the following uninitialized warning: sound/pci/hda/patch_realtek.c: In function 'set_capture_mixer': sound/pci/hda/patch_realtek.c:4928: warning: 'pin' is used uninitialized in this function sound/pci/hda/patch_realtek.c:4918: note: 'pin' was declared here It appears indeed that 'pin' needs to be initialized to 0. Signed-off-by: Frederik Deweerdt Signed-off-by: Takashi Iwai commit 06862f884d9c2453daaf0c1d070c69cf444f10b1 Author: Phillip Lougher Date: Thu Feb 25 01:31:13 2010 +0000 Squashfs: get rid of obsolete definition in header file Signed-off-by: Phillip Lougher commit ae4a3179b11a97a5b36a768ae6ac1662d0315ff0 Author: Phillip Lougher Date: Thu Feb 25 00:54:48 2010 +0000 Squashfs: get rid of obsolete variable in struct squashfs_sb_info Signed-off-by: Phillip Lougher commit 6a08ab846cefc82a328cbf9abd96c2e58a6c3664 Author: Joern Engel Date: Fri Mar 5 16:07:04 2010 +0100 [LogFS] Check feature flags commit 0321b69569eadbc13242922925a4316754c5f744 Author: Daniel T Chen Date: Fri Mar 5 09:04:49 2010 -0500 ALSA: hda: Use LPIB for a Biostar Microtech board BugLink: https://launchpad.net/bugs/523953 The OR has verified that position_fix=1 is necessary to work around errors on his machine. Reported-by: MMarking Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 1f36f774b22a0ceb7dd33eca626746c81a97b6a5 Author: Al Viro Date: Sat Dec 26 10:56:19 2009 -0500 Switch !O_CREAT case to use of do_last() ... and now we have all intents crap well localized Signed-off-by: Al Viro commit def4af30cf945a3735ffca865788ea84b30b25d9 Author: Al Viro Date: Sat Dec 26 08:37:05 2009 -0500 Get rid of symlink body copying Now that nd->last stays around until ->put_link() is called, we can just postpone that ->put_link() in do_filp_open() a bit and don't bother with copying. Signed-off-by: Al Viro commit 3866248e5f86d74960a3d1592882490ec3021675 Author: Al Viro Date: Sat Dec 26 07:21:48 2009 -0500 Finish pulling of -ESTALE handling to upper level in do_filp_open() Don't bother with path_walk() (and its retry loop); link_path_walk() will do it. Signed-off-by: Al Viro commit 806b681cbe588bebe8fe47dd24da62f2d1c55851 Author: Al Viro Date: Sat Dec 26 07:16:40 2009 -0500 Turn do_link spaghetty into a normal loop Signed-off-by: Al Viro commit 10fa8e62f2bc33c452516585911f151d88389e4c Author: Al Viro Date: Sat Dec 26 07:09:49 2009 -0500 Unify exits in O_CREAT handling Signed-off-by: Al Viro commit 9e67f36169117e07daf16dc7ca314f1db9e2050a Author: Al Viro Date: Sat Dec 26 07:04:50 2009 -0500 Kill is_link argument of do_last() We set it to 1 iff we return NULL Signed-off-by: Al Viro commit 67ee3ad21d0d0b2cc0b70708de8aed860fadda44 Author: Al Viro Date: Sat Dec 26 07:01:01 2009 -0500 Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open() Note that in case of !O_CREAT we know that nd.root has already been given up Signed-off-by: Al Viro commit 4296e2cbf2138b5831b83f03e81de916ce1a967d Author: Al Viro Date: Thu Dec 24 07:15:41 2009 -0500 Leave mangled flag only for setting nd.intent.open.flag Nothing else uses it anymore Signed-off-by: Al Viro commit 5b369df8263fe7ab4dac2bb08b8f423dc5e33752 Author: Al Viro Date: Thu Dec 24 06:51:13 2009 -0500 Get rid of passing mangled flag to do_last() Signed-off-by: Al Viro commit 9a66179e13504c676f891908a1e94912ec5cdefb Author: Al Viro Date: Thu Dec 24 06:49:47 2009 -0500 Don't pass mangled open_flag to finish_open() Signed-off-by: Al Viro commit a2c36b450ee68470836cb858c58a6ba3a52c5ec5 Author: Al Viro Date: Thu Dec 24 03:39:50 2009 -0500 pull more into do_last() Handling of LAST_DOT/LAST_ROOT/LAST_DOTDOT/terminating slash can be pulled in as well Signed-off-by: Al Viro commit c99658fe970f442199733bcace1a00b087336a0d Author: Al Viro Date: Thu Dec 24 02:27:30 2009 -0500 bail out with ELOOP earlier in do_link loop If we'd passed through 32 trailing symlinks already, there's no sense following the 33rd - we'll bail out anyway. Better bugger off earlier. It *does* change behaviour, after a fashion - if the 33rd happens to be a procfs-style symlink, original code *would* allow it. This one will not. Cry me a river if that hurts you. Please, do. And post a video of that, while you are at it. Signed-off-by: Al Viro commit a1e28038df98e186807ff55a49c1c26d33d530a5 Author: Al Viro Date: Thu Dec 24 02:12:06 2009 -0500 pull the common predecessors into do_last() Signed-off-by: Al Viro commit c41c14056210e4a328659c82b1edaccb0910d18c Author: Al Viro Date: Thu Dec 24 02:08:19 2009 -0500 postpone __putname() until after do_last() Since do_last() doesn't mangle nd->last_name, we can safely postpone __putname() done in handling of trailing symlinks until after the call of do_last() Signed-off-by: Al Viro commit 27bff34300482632caf52ff589a4e7d755b32539 Author: Al Viro Date: Thu Dec 24 02:05:43 2009 -0500 unroll do_last: loop in do_filp_open() Signed-off-by: Al Viro commit 3343eb8209cc69f0d2059f8c484ad7a3e1834c0b Author: Al Viro Date: Thu Dec 24 02:02:38 2009 -0500 Shift releasing nd->root from do_last() to its caller Signed-off-by: Al Viro commit fb1cc555d533869910e20de4b8d5147570afdfad Author: Al Viro Date: Thu Dec 24 01:58:28 2009 -0500 gut do_filp_open() a bit more (do_last separation) Brute-force separation of stuff reachable from do_last: with the exception of do_link:; just take all that crap to a helper function as-is and have it tell the caller if it has to go to do_link. Signed-off-by: Al Viro commit 648fa8611de3d4d43bbd64af3226679d2d0eb609 Author: Al Viro Date: Thu Dec 24 01:26:48 2009 -0500 beginning to untangle do_filp_open() That's going to be a long and painful series. The first step: take the stuff reachable from 'ok' label in do_filp_open() into a new helper (finish_open()). Signed-off-by: Al Viro commit a11106544f33c104706ae42d27219a409b67478e Author: Scott Wood Date: Thu Feb 25 18:09:45 2010 -0600 powerpc/perf: e500 support This implements perf_event support for the Freescale embedded performance monitor, based on the existing perf_event.c that supports server/classic chips. Some limitations: - Performance monitor interrupts are regular EE interrupts, and thus you can't profile places with interrupts disabled. We may want to implement soft IRQ-disabling, with perfmon interrupts exempted and treated as NMIs. - When trying to schedule multiple event groups at once, and using restricted events, situations could arise where scheduling fails even though it would be possible. Consider three groups, each with two events. One group has restricted events, the others don't. The two non-restricted groups are scheduled, then one is removed, which happens to occupy the two counters that can't do restricted events. The remaining non-restricted group will not be moved to the non-restricted-capable counters to make room if the restricted group tries to be scheduled. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit 776943fd6f104a6e8457dc95a17282e69e963666 Author: Ping Cheng Date: Thu Mar 4 21:50:59 2010 -0800 Input: wacom - merge out and in prox events Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 5bc923c505926af927d4f3011da92c243787d6a7 Author: Dan Carpenter Date: Fri Mar 5 00:31:33 2010 -0800 Input: gamecon - fix off by one range check It should be >= GC_MAX not > GC_MAX. Signed-off-by: Dan Carpenter Signed-off-by: Dmitry Torokhov commit 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 Author: Daniel Mack Date: Thu Mar 4 19:46:18 2010 +0100 ALSA: usb/audio.h: Fix field order Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 50152dfaa7d09da85588b66fee7e8c7f541f631d Author: Meelis Roos Date: Thu Mar 4 20:33:07 2010 +0200 ALSA: fix jazz16 compile (udelay) While trying to compile jazz16 isa sound driver on alpha (2.6.33+git), I found a compile failure in jazz16.c (udelay is unknown). Fix it by including delay.h. Signed-foo-by: Meelis Roos Signed-off-by: Takashi Iwai commit 64e290ec69be39f1887fa0b403c1e417b6b038e7 Author: Venkatesh Pallipadi Date: Thu Mar 4 22:25:21 2010 -0500 ext4: fix up rb_root initializations to use RB_ROOT ext4 uses rb_node = NULL; to zero rb_root at few places. Using RB_ROOT as the initializer is more portable in case the underlying implementation of rbtrees changes in the future. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: "Theodore Ts'o" Cc: Eric Paris commit facf92695dcf40836973ce09b7f62d3cc3a89152 Author: Mark Brown Date: Mon Mar 1 19:57:59 2010 +0000 ASoC: Fix S3C64xx IIS driver for Samsung header reorg The reorgs of the Samsung headers have moved the GPIO bank definitions from plat/ to mach/ - the IIS driver needs to be updated to take care of this. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit efd8f0e6f6c1faa041f228d7113bd3a9db802d49 Author: Christoph Hellwig Date: Wed Mar 3 09:05:08 2010 -0500 quota: stop using QUOTA_OK / NO_QUOTA Just use 0 / -EDQUOT directly - that's what it translates to anyway. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 871a293155a24554e153538d36e3a80fa169aefb Author: Christoph Hellwig Date: Wed Mar 3 09:05:07 2010 -0500 dquot: cleanup dquot initialize routine Get rid of the initialize dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_initialize helper to __dquot_initialize and vfs_dq_init to dquot_initialize to have a consistent namespace. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 907f4554e2521cb28b0009d17167760650a9561c Author: Christoph Hellwig Date: Wed Mar 3 09:05:06 2010 -0500 dquot: move dquot initialization responsibility into the filesystem Currently various places in the VFS call vfs_dq_init directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the initialization. For most metadata operations this is a straight forward move into the methods, but for truncate and open it's a bit more complicated. For truncate we currently only call vfs_dq_init for the sys_truncate case because open already takes care of it for ftruncate and open(O_TRUNC) - the new code causes an additional vfs_dq_init for those which is harmless. For open the initialization is moved from do_filp_open into the open method, which means it happens slightly earlier now, and only for regular files. The latter is fine because we don't need to initialize it for operations on special files, and we already do it as part of the namespace operations for directories. Add a dquot_file_open helper that filesystems that support generic quotas can use to fill in ->open. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 9f7547580263d4a55efe06ce5cfd567f568be6e8 Author: Christoph Hellwig Date: Wed Mar 3 09:05:05 2010 -0500 dquot: cleanup dquot drop routine Get rid of the drop dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_drop helper to __dquot_drop and vfs_dq_drop to dquot_drop to have a consistent namespace. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 257ba15cedf1288f0c96118d7e63947231d27278 Author: Christoph Hellwig Date: Wed Mar 3 09:05:04 2010 -0500 dquot: move dquot drop responsibility into the filesystem Currently clear_inode calls vfs_dq_drop directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the drop inside the ->clear_inode superblock operation. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit b43fa8284d7790d9cca32c9c55e24f29be2fa33b Author: Christoph Hellwig Date: Wed Mar 3 09:05:03 2010 -0500 dquot: cleanup dquot transfer routine Get rid of the transfer dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_transfer helper to __dquot_transfer and vfs_dq_transfer to dquot_transfer to have a consistent namespace, and make the new dquot_transfer return a normal negative errno value which all callers expect. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 759bfee658beab14af7b357156461d0eb852be2c Author: Christoph Hellwig Date: Wed Mar 3 09:05:02 2010 -0500 dquot: move dquot transfer responsibility into the filesystem Currently notify_change calls vfs_dq_transfer directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the transfer. Most filesystems already do this, only ufs and udf need the code added, and for jfs it needs to be enabled unconditionally instead of only when ACLs are enabled. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 63936ddaa16b9486e2d426ed7b09f559a5c60f87 Author: Christoph Hellwig Date: Wed Mar 3 09:05:01 2010 -0500 dquot: cleanup inode allocation / freeing routines Get rid of the alloc_inode and free_inode dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Also get rid of the vfs_dq_alloc/vfs_dq_free wrappers and always call the lowlevel dquot_alloc_inode / dqout_free_inode routines directly, which now lose the number argument which is always 1. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5dd4056db84387975140ff2568eaa0406f07985e Author: Christoph Hellwig Date: Wed Mar 3 09:05:00 2010 -0500 dquot: cleanup space allocation / freeing routines Get rid of the alloc_space, free_space, reserve_space, claim_space and release_rsv dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Move shared logic into the common __dquot_alloc_space, dquot_claim_space_nodirty and __dquot_free_space low-level methods, and rationalize the wrappers around it to move as much as possible code into the common block for CONFIG_QUOTA vs not. Also rename all these helpers to be named dquot_* instead of vfs_dq_*. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 49792c806d0bfd53afc789dcdf50dc9bed2c5b83 Author: Dmitry Monakhov Date: Tue Mar 2 15:51:02 2010 +0300 ext3: add writepage sanity checks - There is theoretical possibility to perform writepage on RO superblock. Add explicit check for what case. - Page must being locked before writepage. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 7eb4969e04060dcf3fbd46af9c21b1059b853068 Author: Jan Kara Date: Mon Mar 1 14:02:37 2010 +0100 ext3: Truncate allocated blocks if direct IO write fails to update i_size We have to truncate blocks allocated to file during direct IO when we fail to update i_size properly. Signed-off-by: Jan Kara commit ab94c39b6fa076d4f6d2903dcc54cda35d938776 Author: Jan Kara Date: Mon Feb 22 21:07:17 2010 +0100 quota: Properly invalidate caches even for filesystems with blocksize < pagesize Sometimes invalidate_bdev() can fail to invalidate a part of block device cache because of dirty data. If the filesystem has blocksize smaller than page size, this can happen even for pages containing quota files and thus kernel would operate on stale data. Fix the issue by syncing the filesystem before invalidating the cache. Reviewed-by: Christoph Hellwig Signed-off-by: Jan Kara commit 8ddd69d6df4758bf0cab981481af24cc84419567 Author: Dmitry Monakhov Date: Tue Feb 16 08:31:50 2010 +0300 quota: generalize quota transfer interface Current quota transfer interface support only uid/gid. This patch extend interface in order to support various quotas types The goal is accomplished without changes in most frequently used vfs_dq_transfer() func. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit ad1e6e8da9fe8cb7ecfde8eabacedc3b50fceae4 Author: Dmitry Monakhov Date: Tue Feb 16 08:31:49 2010 +0300 quota: sb_quota state flags cleanup - remove hardcoded USRQUOTA/GRPQUOTA flags - convert int to bool for appropriate functions Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 86963918965eb8fe0c8ae009e7c1b4c630f533d5 Author: Jan Kara Date: Tue Feb 16 20:37:12 2010 +0100 jbd: Delay discarding buffers in journal_unmap_buffer Delay discarding buffers in journal_unmap_buffer until we know that "add to orphan" operation has definitely been committed, otherwise the log space of committing transation may be freed and reused before truncate get committed, updates may get lost if crash happens. This patch is a backport of JBD2 fix by dingdinghua . Signed-off-by: Jan Kara commit e5472147e1c0712d95d973acfdbd862957c77add Author: Dmitry Monakhov Date: Tue Feb 16 19:33:42 2010 +0300 ext3: quota_write cross block boundary behaviour We always assume what dquot update result in changes in one data block But ext3_quota_write() function may handle cross block boundary writes In fact if this ever happen it will result in incorrect journal credits reservation. And later bug_on triggering. As soon this never happen the boundary cross loop is NOOP. In order to make things straight let's remove this loop and assert cross boundary condition. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit ac0e773718dc20551e72900d2e7eada96ac91100 Author: Christoph Hellwig Date: Tue Feb 16 03:44:56 2010 -0500 quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota We already do these checks in the generic code. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5582c76f901d240f57329212b59b4d957ea8d6cf Author: Christoph Hellwig Date: Tue Feb 16 03:44:55 2010 -0500 quota: split out compat_sys_quotactl support from quota.c Instead of adding ifdefs just split it into a new file. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 799a9d44023c069f46bc5933a930eab0bd37d0df Author: Christoph Hellwig Date: Tue Feb 16 03:44:54 2010 -0500 quota: split out netlink notification support from quota.c Instead of adding ifdefs just split it into a new file. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit a56fca23f67282467c08e75c40081da2345dfdbf Author: Christoph Hellwig Date: Tue Feb 16 03:44:53 2010 -0500 quota: remove invalid optimization from quota_sync_all Checking the "VFS" quota enabled and dirty bits from generic code means this code will never get called for other implementations, e.g. XFS and GFS2. Grabbing the reference on the superblock really isn't much overhead for a global Q_SYNC call, so just drop this optimization. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5fb324ad24febe57a8a2e62903dcb7bad546ea71 Author: Christoph Hellwig Date: Tue Feb 16 03:44:52 2010 -0500 quota: move code from sync_quota_sb into vfs_quota_sync Currenly sync_quota_sb does a lot of sync and truncate action that only applies to "VFS" style quotas and is actively harmful for the sync performance in XFS. Move it into vfs_quota_sync and add a wait parameter to ->quota_sync to tell if we need it or not. My audit of the GFS2 code says it's also not needed given the way GFS2 implements quotas, but I'd be happy if this can get a detailed review. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 8c4e4acd660a09e571a71583b5bbe1eee700c9ad Author: Christoph Hellwig Date: Tue Feb 16 03:44:51 2010 -0500 quota: clean up Q_XQUOTASYNC Currently Q_XQUOTASYNC calls into the quota_sync method, but XFS does something entirely different in it than the rest of the filesystems. xfs_quota which calls Q_XQUOTASYNC expects an asynchronous data writeout to flush delayed allocations, while the "VFS" quota support wants to flush changes to the quota file. So make Q_XQUOTASYNC call into the writeback code directly and make the quota_sync method optional as XFS doesn't need in the sense expected by the rest of the quota code. GFS2 was using limited XFS-style quota and has a quota_sync method fitting neither the style used by vfs_quota_sync nor xfs_fs_quota_sync. I left it in for now as per discussion with Steve it expects to be called from the sync path this way. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit c988afb5fa3fc450207c3dfc0ce535f4bfdae4d1 Author: Christoph Hellwig Date: Tue Feb 16 03:44:50 2010 -0500 quota: simplify permission checking Stop having complicated different routines for checking permissions for XQM vs "VFS" quotas. Instead do the checks for having sb->s_qcop and a valid type directly in do_quotactl, and munge the *quotactl_valid functions into a check_quotactl_permission helper that only checks for permissions. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 6ae09575b3c951ad77c07d068b8dbbc09031b2d1 Author: Christoph Hellwig Date: Tue Feb 16 03:44:49 2010 -0500 quota: special case Q_SYNC without device name The Q_SYNC command can be called without the path to a device, in which case it iterates over all superblocks. Special case this variant directly in sys_quotactl so that the other code always gets a superblock and doesn't need to deal with this case. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit f450d4fee42c52e8045131a355b2de03094aa066 Author: Christoph Hellwig Date: Tue Feb 16 03:44:48 2010 -0500 quota: clean up checks for supported quota methods Move the checks for sb->s_qcop->foo next to the actual calls for them, same for sb_has_quota_active checks where applicable. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit c411e5f66a5dd36827a5f9d1392a1afdf69ff075 Author: Christoph Hellwig Date: Tue Feb 16 03:44:47 2010 -0500 quota: split do_quotactl Split out a helper for each non-trivial command from do_quotactl. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 0a5a9c725512461d19397490f3adf29931dca1f2 Author: Jan Kara Date: Tue Feb 9 18:20:39 2010 +0100 quota: Fix warning when a delayed write happens before quota is enabled If a delayed-allocation write happens before quota is enabled, the kernel spits out a warning: WARNING: at fs/quota/dquot.c:988 dquot_claim_space+0x77/0x112() because the fact that user has some delayed allocation is not recorded in quota structure. Make dquot_initialize() update amount of reserved space for user if it sees inode has some space reserved. Also make sure that reserved quota space does not go negative and we warn about the filesystem bug just once. Signed-off-by: Jan Kara commit c469070aea5a0ada45a836937c776fd3083dae2b Author: Dmitry Monakhov Date: Tue Feb 9 17:53:36 2010 +0100 quota: manage reserved space when quota is not active [v2] Since we implemented generic reserved space management interface, then it is possible to account reserved space even when quota is not active (similar to i_blocks/i_bytes). Without this patch following testcase result in massive comlain from WARN_ON in dquot_claim_space() TEST_CASE: mount /dev/sdb /mnt -oquota dd if=/dev/zero of=/mnt/test bs=1M count=1 quotaon /mnt # fs_reserved_spave == 1Mb # quota_reserved_space == 0, because quota was disabled dd if=/dev/zero of=/mnt/test seek=1 bs=1M count=1 # fs_reserved_spave == 2Mb # quota_reserved_space == 1Mb sync # ->dquot_claim_space() -> WARN_ON Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit c7e8d4d6dceeb6fd236991f590d3fa6f97c59874 Author: Christoph Egger Date: Fri Feb 5 14:13:33 2010 +0100 jbd[2]: remove references to BUFFER_DEBUG CONFIG_BUFFER_DEBUG seems to have been removed from the documentation somewhere around 2.4.15 and seemingly hasn't been available even longer. It is, however, still referenced at one place from the jbd code (one is a copy of the other header). Time to clean it up Signed-off-by: Christoph Egger Signed-off-by: Jan Kara commit e1f5c67a1994312300ebc41195e6f5bea2f6c065 Author: Dmitry Monakhov Date: Tue Feb 2 16:05:53 2010 +0300 ext3: trivial quota cleanup The patch is aimed to reorganize and simplify quota code a bit. Quota code is itself complex enouth, but we can make it more readable in some places: - Move quota option parsing to separate functions. - Simplify old-quota and journaled-quota mix check. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit e3c9643597ac4bd6b5db62b5e7d915f8c8fa34b6 Author: Dmitry Monakhov Date: Tue Feb 2 16:05:51 2010 +0300 ext3: mount flags manipulation cleanup Replace intermediate EXT3_MOUNT_XXX flags manipulation to corresponding macro. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 9df93939b735dd273e49cbee290b9f4738500ef4 Author: Jan Kara Date: Wed Jan 6 21:58:48 2010 +0100 ext3: Use bitops to read/modify EXT3_I(inode)->i_state At several places we modify EXT3_I(inode)->i_state without holding i_mutex (ext3_release_file, ext3_bmap, ext3_journalled_writepage, ext3_do_update_inode, ...). These modifications are racy and we can lose updates to i_state. So convert handling of i_state to use bitops which are atomic. Signed-off-by: Jan Kara commit 26245c949c8473ea7352907b5a54bc34487eb87f Author: Jan Kara Date: Wed Jan 6 17:20:35 2010 +0100 quota: Cleanup S_NOQUOTA handling Cleanup handling of S_NOQUOTA inode flag and document it a bit. The flag does not have to be set under dqptr_sem. Only functions modifying inode's dquot pointers have to check the flag under dqptr_sem before going forward with the modification. This way we are sure that we cannot add new dquot pointers to the inode which is just becoming a quota file. The good thing about this cleanup is that there are no more places in quota code which enforce i_mutex vs. dqptr_sem lock ordering (in particular that dqptr_sem -> i_mutex of quota file). This should silence some (false) lockdep warnings with ext4 + quota and generally make life of some filesystems easier. Signed-off-by: Jan Kara commit 8997de30adf5d11e9c807f1d89a894ffed60616b Author: Ben Dooks Date: Thu Mar 4 23:14:44 2010 +0000 ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support Commit 58bac7b8ded70c39bcd5f7037091051c277618aa failed to move the two PLL files s3c2440-pll-12000000.c and s3c2440-pll-16934400.c, so place these in arch/arm/mach-s3c2440 to fix this commit up. As a note, these are not built by the default configuration and thus the failure to move wasn't spotted until much later. Signed-off-by: Ben Dooks commit c6d3830140f1d56b07d8ab56a6e14ca3c492a39a Author: Joern Engel Date: Thu Mar 4 21:36:19 2010 +0100 [LogFS] Only write journal if dirty This prevents unnecessary journal writes. More importantly it prevents an oops due to a journal write on failed mount. commit 9421502b4fc894cc477be8fc49776830e37ca157 Author: Joern Engel Date: Thu Mar 4 21:30:58 2010 +0100 [LogFS] Fix bdev erases Erases for block devices were always just emulated by writing 0xff. Some time back the write was removed and only the page cache was changed to 0xff. Superficialy a good idea with two problems: 1. Touching the page cache isn't necessary either. 2. However, writing out 0xff _is_ necessary for the journal. As the journal is scanned linearly, an old non-overwritten commit entry can be used on next mount and cause havoc. This should fix both aspects. commit 422d2cb8f9afadba1ecd3614f658b6daaaa480fb Author: Yehuda Sadeh Date: Fri Feb 26 15:32:31 2010 -0800 ceph: reset osd after relevant messages timed out This simplifies the process of timing out messages. We keep lru of current messages that are in flight. If a timeout has passed, we reset the osd connection, so that messages will be retransmitted. This is a failsafe in case we hit some sort of problem sending out message to the OSD. Normally, we'll get notification via an updated osdmap if there are problems. If a request is older than the keepalive timeout, send a keepalive to ensure we detect any breaks in the TCP connection. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 4ea41e2de5bba756858bb40f964e3490b6d1a25c Merge: 8d75da8 398007f Author: J. Bruce Fields Date: Thu Mar 4 12:03:16 2010 -0500 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c. commit 0272282f7cffb469cd2676dcb6e58bc942fcf8a8 Author: John Stultz Date: Fri Mar 5 02:04:38 2010 +0900 sh: Convert sh to use read/update_persistent_clock This patch converts the sh architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. Cc: Thomas Gleixner Cc: Andrew Morton Signed-off-by: John Stultz Signed-off-by: Paul Mundt commit 9d6df3fdfc470c313b7ea13dbe8a63fb21ab7365 Author: Scott Wood Date: Thu Feb 25 18:04:33 2010 -0600 powerpc/perf: Build callchain code regardless of hardware event support. It's also useful for software events, as well as future support for other types of hardware counters. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit a71b676fa9b92119c0fb4e3fab34e45a17f15107 Author: Greg Kroah-Hartman Date: Thu Mar 4 08:44:13 2010 -0800 Staging: winbond: fix up wireless api errors The wireless core made a number of api changes that caused the winbond driver to break. This patch fixes those errors by making the needed changes to the driver. Signed-off-by: Greg Kroah-Hartman commit 653c60f37695d054e24b84102bb2426dd2840b8c Author: Andrea Gelmini Date: Sat Feb 27 17:51:25 2010 +0100 powerpc/cpm2: Checkpatch cleanup arch/powerpc/sysdev/cpm2_pic.h:6: ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Andrea Gelmini Signed-off-by: Kumar Gala commit 948e78c3fc9c799b3f9b6c683b83c665942e6bbe Author: Martyn Welch Date: Mon Mar 1 14:41:59 2010 +0000 powerpc/86xx: Renaming following split of GE Fanuc joint venture This patch renames GE Fanuc boards following the split-up of the GE Fanuc joint venture. These boards are now made by GE Intelligent platorms. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 6f3d395a5c77e6ccddd59a5221e1354b22c29531 Author: Anton Vorontsov Date: Thu Feb 18 16:57:27 2010 +0300 powerpc/86xx: Convert gef_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, gef_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 43a5a01bcc5b53c67878f043b4a1b31eaa87a360 Author: Anton Vorontsov Date: Thu Feb 18 16:43:12 2010 +0300 powerpc/qe: Convert qe_ic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, qe_ic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 0e5d359cca2d685311c4eaeb570f2e7e7915da31 Author: Anton Vorontsov Date: Thu Feb 18 16:57:38 2010 +0300 powerpc/82xx: Convert pci_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, pci_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 7e026f72cf05137e0b52b7aa5420e95a76bd3195 Author: Anton Vorontsov Date: Thu Feb 18 16:45:12 2010 +0300 powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, socrates_fpga_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit f341dddf1dadf64be309791f83d7904245f1261d Merge: eaa5eec b02957d Author: Greg Kroah-Hartman Date: Thu Mar 4 08:39:02 2010 -0800 Staging: merge staging patches into Linus's main branch There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman commit 64ba9926759792cf7b95f823402e2781edd1b5d4 Merge: 6895210 50a76fd Author: Linus Torvalds Date: Thu Mar 4 08:26:08 2010 -0800 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: groups support exofs: Prepare for groups exofs: Error recovery if object is missing from storage exofs: convert io_state to use pages array instead of bio at input exofs: RAID0 support exofs: Define on-disk per-inode optional layout attribute exofs: unindent exofs_sbi_read exofs: Move layout related members to a layout structure exofs: Recover in the case of read-passed-end-of-file exofs: Micro-optimize exofs_i_info exofs: debug print even less commit 6895210e89df20520916c94a4dc148a43229053e Merge: 4c10c93 8a4fd1e Author: Linus Torvalds Date: Thu Mar 4 08:24:47 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Make prom entry spinlock NMI safe. sparc64: Kill off old sys_perfctr system call and state. sparc: Update defconfigs. sparc: Provide io{read,write}{16,32}be(). commit 4c10c937cc2eb197db565392db91d429eec71176 Merge: 9bb6769 950f564 Author: Linus Torvalds Date: Thu Mar 4 08:24:06 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits) drivers/ide: Fix continuation line formats ide: fixed section mismatch warning in cmd640.c ide: ide_timing_compute() fixup ide: make ide_get_best_pio_mode() static via82cxxx: use ->pio_mode value to determine pair device speed tx493xide: use ->pio_mode value to determine pair device speed siimage: use ->pio_mode value to determine pair device speed palm_bk3710: use ->pio_mode value to determine pair device speed it821x: use ->pio_mode value to determine pair device speed cs5536: use ->pio_mode value to determine pair device speed cs5535: use ->pio_mode value to determine pair device speed cmd64x: fix handling of address setup timings amd74xx: use ->pio_mode value to determine pair device speed alim15x3: fix handling of UDMA enable bit alim15x3: fix handling of DMA timings alim15x3: fix handling of command timings alim15x3: fix handling of address setup timings ide-timings: use ->pio_mode value to determine fastest PIO speed ide: change ->set_dma_mode method parameters ide: change ->set_pio_mode method parameters ... commit 9bb676966aa85e56af00b353387d3c274a26e480 Merge: 0f2cc4e dd58ffc Author: Linus Torvalds Date: Thu Mar 4 08:20:14 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (28 commits) ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes ioat3: interrupt coalescing ioat: close potential BUG_ON race in the descriptor cleanup path ioat2: kill pending flag ioat3: use ioat2_quiesce() ioat3: cleanup, don't enable DCA completion writes DMAENGINE: COH 901 318 lli sg offset fix DMAENGINE: COH 901 318 configure channel direction DMAENGINE: COH 901 318 remove irq counting DMAENGINE: COH 901 318 descriptor pool refactoring DMAENGINE: COH 901 318 cleanups dma: Add MPC512x DMA driver Debugging options for the DMA engine subsystem iop-adma: redundant/wrong tests in iop_*_count()? dmatest: fix handling of an even number of xor_sources dmatest: correct raid6 PQ test fsldma: Fix cookie issues fsldma: Fix cookie issues dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() dma: make Open Firmware device id constant ... commit 0f2cc4ecd81dc1917a041dc93db0ada28f8356fa Merge: 1fae4cf 9643f5d Author: Linus Torvalds Date: Thu Mar 4 08:15:33 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits) init: Open /dev/console from rootfs mqueue: fix typo "failues" -> "failures" mqueue: only set error codes if they are really necessary mqueue: simplify do_open() error handling mqueue: apply mathematics distributivity on mq_bytes calculation mqueue: remove unneeded info->messages initialization mqueue: fix mq_open() file descriptor leak on user-space processes fix race in d_splice_alias() set S_DEAD on unlink() and non-directory rename() victims vfs: add NOFOLLOW flag to umount(2) get rid of ->mnt_parent in tomoyo/realpath hppfs can use existing proc_mnt, no need for do_kern_mount() in there Mirror MS_KERNMOUNT in ->mnt_flags get rid of useless vfsmount_lock use in put_mnt_ns() Take vfsmount_lock to fs/internal.h get rid of insanity with namespace roots in tomoyo take check for new events in namespace (guts of mounts_poll()) to namespace.c Don't mess with generic_permission() under ->d_lock in hpfs sanitize const/signedness for udf nilfs: sanitize const/signedness in dealing with ->d_name.name ... Fix up fairly trivial (famous last words...) conflicts in drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c commit b02957d58a27525499ab10d272d3b44682a7ae50 Merge: 3a8954e b94c765 Author: Greg Kroah-Hartman Date: Thu Mar 4 08:14:54 2010 -0800 Staging: Merge two branches of coding style fixes together Turns out that multiple people sent pretty much the same patch for the same staging drivers. Commit these in two different branches and merge them together to get a more complete coverage of the cleanup and properly credit everyone for the work that they did. Signed-off-by: Greg Kroah-Hartman commit 62c8cbbfc2367e706317f56ac21959120ae72773 Author: Pawel Moll Date: Fri Feb 19 10:26:31 2010 +0000 sh: Move PMB debugfs entry initialization to later stage ... so the "sh_debugfs_root" is already available. Previously it wasn't and in result its path was "/sys/kernel/debug/pmb" instead of "/sys/kernel/debug/sh/pmb". Signed-off-by: Pawel Moll Signed-off-by: Paul Mundt commit 1fae4cfb97302289bb5df6a8195eb28385d0b002 Merge: c8bf9fe afbc74f Author: Linus Torvalds Date: Thu Mar 4 08:04:22 2010 -0800 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: power_supply: bq27x00: fix voltage and current units power_supply: bq27x00: add status and time properties power_supply: bq27x00: add BQ27500 support power_supply: bq27x00: fix temperature conversion power_supply: bq27x00: remove unused struct fields power_supply: bq27x00: remove double endian swap da9030_battery: fix spelling in comment wm97xx_battery: Clean up some warnings commit b94c765ac31f8eb9c6fe895ba611bb446b799635 Author: Chihau Chau Date: Thu Feb 25 20:20:09 2010 -0300 Staging: dream: camera: sk5k3e2fx: fix code style issues This fixes some code style issues about assignments in if conditions. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit df84f941e9370be6798fa11aa5a77396d8869fdc Author: Chihau Chau Date: Thu Feb 25 19:57:39 2010 -0300 Staging: dream: camera: msm_camera: fix code style issues This fixes some code style issues like to add one space after a while or switch statement and before a open parenthesis '(', and to include KERN_ facility level in the printk() functions. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 3f4b4e779714ae2dd55757617a8033ab338fa7f0 Author: Andrew Elwell Date: Thu Feb 18 23:56:13 2010 +0100 Staging: wlan-ng: More checkpatch.pl error cleanups Signed-off-by: Andrew Elwell Signed-off-by: Greg Kroah-Hartman commit ef1a0ed7f1793531e5fb3ee489cb1e2b627f76fd Author: Andrew Elwell Date: Thu Feb 18 23:56:12 2010 +0100 Staging: wlan-ng - checkpatch.pl fixups Basic fixups in the staging/wlan-ng directory. (First kernel patch - thanks to FOSDEM talk) Signed-off-by: Andrew Elwell Signed-off-by: Greg Kroah-Hartman commit 6705b68d0be284e2f9949f3657ea65d426d0f988 Author: Andrea Gelmini Date: Fri Feb 26 10:14:55 2010 +0100 Staging: comedi: comedi_fops.c: Checkpatch cleanup ERROR: do not initialise externals to 0 or NULL +int comedi_num_legacy_minors = 0; WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_READ) { + kill_fasync(&dev->async_queue, SIGIO, POLL_IN); + } WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_WRITE) { + kill_fasync(&dev->async_queue, SIGIO, POLL_OUT); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 639b9f1ee5987270be2bca4bf8b7e6110d3b47ec Author: Stewart Robertson Date: Sun Feb 21 11:21:37 2010 +0000 Staging: comedi: fix suspect code indent in ni_labpc.c This is a patch to the ni_labpc.c file that fixes suspect code indent for conditional statements found by the checkpatch.pl tool Signed-off-by: Stewart Robertson Signed-off-by: Greg Kroah-Hartman commit 65d6d26c6bcd802ebe2b22a29d9b6bbebfd8d7f8 Author: Maurice Dawson Date: Fri Feb 19 10:53:15 2010 +0000 Staging: comedi: fix yet another brace coding style issue in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up all the brace warnings found by the checkpatch.pl tool Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit 2bb9c335902a5d59fc084170aaae0ccc9d9d4012 Author: Maurice Dawson Date: Fri Feb 19 10:53:14 2010 +0000 Staging: comedi: fix another brace coding style issues in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit 8377e813c75cf5aca46032fb780ca74c923dbe86 Author: Maurice Dawson Date: Fri Feb 19 10:53:13 2010 +0000 Staging: comedi: fix brace coding style issue in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit a917d4c4251314afc196fd7a7d9d10faff2effda Author: Chihau Chau Date: Thu Feb 25 17:40:28 2010 -0300 Staging: comedi: poc: Adding some KERN_ facility level This fixes some coding style issues like include KERN_ facility levels in some printk() and one trailing whitespace error. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit d4023a5ee2f683f57636346c0baf94cda710055a Author: Chihau Chau Date: Thu Feb 25 18:13:00 2010 -0300 Staging: dream: camera: msm_camera: fix some code style issues This fixes some code style issues like else staments after the close braces '}' and to use __func__ instead of __FUNCTION__. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 71508ee489e09dc206ea3f62542dd3bd11c0e201 Author: Alessandro Ghedini Date: Mon Feb 15 12:25:22 2010 +0100 Staging: wlan-ng: fix most of the style issues in hfa384x.h This patch fixes all the errors and the majority of the warnings found with checkpatch.pl script in hfa384x.h, following Gábor Stefanik hints Signed-off-by: Alessandro Ghedini Signed-off-by: Greg Kroah-Hartman commit 49c9b5c7bd6cf87ccc1d820dec8d23ba3ae53f64 Author: Chihau Chau Date: Thu Feb 11 15:47:47 2010 -0300 Staging: dream: camera: msm_camera: fix coding style issues This fixes some coding style issues like to use __func__ instead __FUNCTION__, "foo *bar" instead "foo* bar" and a initial comment with "/* */" instead "//" Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit 0054a361e44bf71b8bb79b863bcf00e04dc4a464 Author: Graham M Howe Date: Wed Feb 10 18:11:47 2010 +0000 Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c This is a patch to the ni_660x.c file that fixes up the brace and 80 character issues found by the checkpatch tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit c2ca6a476a2fde7239a576c1bde8d7cd2ded87a8 Author: Graham M Howe Date: Tue Feb 9 23:42:25 2010 +0000 Staging: comedi: fix bracing coding style issue in ni_65xx.c This is a patch to the ni_65xx.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit dedf3ad1534ff5e30a2eba88afe64bbe7beecfb6 Author: Benjamin Adolphi Date: Sat Feb 6 20:06:50 2010 +0100 Staging: comedi: pcmad: Checkpatch cleanups This fixes all checkpatch issues in the pcmad comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 52d83bde6f10480268c454b3373bfcec8c2e3c3e Author: Chihau Chau Date: Thu Feb 4 22:27:05 2010 -0300 Staging: comedi: poc: fix coding style issues This fixes a line over 80 characters and a brace warnings. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit c8bf9fec478bb8d3c66067be2aaa4082b83da46c Merge: a2e28fc 1ad02bb Author: Linus Torvalds Date: Thu Mar 4 07:52:06 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits) Regulators: wm8400 - cleanup platform driver data handling Regulators: wm8994 - clean up driver data after removal Regulators: wm831x-xxx - clean up driver data after removal Regulators: pcap-regulator - clean up driver data after removal Regulators: max8660 - annotate probe and remove methods Regulators: max1586 - annotate probe and remove methods Regulators: lp3971 - fail if platform data was not supplied Regulators: tps6507x-regulator - mark probe method as __devinit Regulators: tps65023-regulator - mark probe method as __devinit Regulators: twl-regulator - mark probe function as __devinit Regulators: fixed - annotate probe and remove methods Regulators: ab3100 - fix probe and remove annotations Regulators: virtual - use sysfs attribute groups twl6030: regulator: Configure STATE register instead of REMAP regulator: Provide optional dummy regulator for consumers regulator: Assume regulators are enabled if they don't report anything regulator: Convert fixed voltage regulator to use enable_time() regulator: Add WM8994 regulator support regulator: enable max8649 regulator driver regulator: trivial: fix typos in user-visible Kconfig text ... commit a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 Merge: 03a2c4d a3f916f Author: Linus Torvalds Date: Thu Mar 4 07:51:36 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: disable pcmcia ioctl for !ARM, prepare for removal pcmcia: CodingStyle fixes pcmcia: alchemy: fixup wrong comments pcmcia: remove irq_list parameter from pd6729 yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards commit 03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b Merge: a27341c d424b92 Author: Linus Torvalds Date: Thu Mar 4 07:49:37 2010 -0800 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig commit 9919c7619c52d01e89103bca405cc3d4a2b1ac31 Author: Daniel T Chen Date: Wed Mar 3 18:24:26 2010 -0500 ALSA: hda: Use LPIB for Dell Latitude 131L BugLink: https://launchpad.net/bugs/530346 The OR has verified that position_fix=1 is necessary to work around errors on his machine. Reported-by: Tom Louwrier Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit dd74b4653597d1d321efa13935cb029b4d819343 Author: Takashi Iwai Date: Thu Mar 4 16:05:24 2010 +0100 ALSA: hda - Build hda_eld into snd-hda-codec module Now two modules require hda_eld.o, so we need to put it to the common place instead of building into two individual modules. Signed-off-by: Takashi Iwai commit 25045705d4053925a617ed71c5e4b6888e468765 Author: Wei Ni Date: Wed Mar 3 15:11:40 2010 +0800 ALSA: hda - Support NVIDIA MCP89 and GT21x hdmi audio Support nvidia MCP89 and GT21x 8ch hdmi audio. Add some eld support. Signed-off-by: Wei Ni Signed-off-by: Takashi Iwai commit 7445dfc159f90b4bc82fd7d898b53d74520e2f83 Author: Wei Ni Date: Wed Mar 3 15:05:53 2010 +0800 ALSA: hda - Support max codecs to 8 for nvidia hda controller Support max codecs to 8 for nvidia hda controller. Change AZX_MAX_CODECS to 8, and add "#define AZX_DEFAULT_CODECS 4" for default driver. Set azx_max_codecs to 8 for nvidia controller. Signed-off-by: Wei Ni Signed-off-by: Takashi Iwai commit 12c3400a84742f8bb0e4edc822e9ccba58781e0c Author: Jiri Pirko Date: Thu Mar 4 03:32:16 2010 -0800 rndis_wlan: correct multicast_list handling V3 My previous patch (655ffee284dfcf9a24ac0343f3e5ee6db85b85c5) added locking in a bad way. Because rndis_set_oid can sleep, there is need to prepare multicast addresses into local buffer under netif_addr_lock first, then call rndis_set_oid outside. This caused reorganizing of the whole function. Signed-off-by: Jiri Pirko Reported-by: Jussi Kivilinna Signed-off-by: David S. Miller commit 3e75c3b0ca669ce675c52ad36a7998f55f16757f Merge: cf4fee5 29044ad Author: Ingo Molnar Date: Thu Mar 4 12:27:39 2010 +0100 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent commit cf4fee50282312528e1f8adf73b1831d1d6ae389 Author: Tom Zanussi Date: Wed Mar 3 01:04:33 2010 -0600 perf trace: Don't use pager if scripting It's useful for paging through raw traces, but just gets in the way when scripting. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 10c95f4f41889daaa8130e0bd12209825dbe8d39 Author: Tom Zanussi Date: Wed Mar 3 01:04:32 2010 -0600 perf trace/scripting: Remove extraneous header read perf_header__read() is already done in perf_session__open(), so remove it from the script gen case. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit da7196e1f986c846ffa8b2ec385223fad38e8518 Author: Will Deacon Date: Wed Mar 3 11:47:58 2010 +0000 perf, ARM: Modify kuser rmb() call to compile for Thumb-2 The Thumb-2 instruction set does not provide an encoding for sub pc, r0, #95 as present in the rmb() definition used by perf. This results in compilation failure when using a compiler targetting an instruction set other than ARM. This patch redefines rmb() for ARM by casting the address of the kuser helper to a function pointer, therefore getting the compiler to take care of making the call. Patch taken against tip/master. Signed-off-by: Will Deacon Cc: Russell King - ARM Linux Cc: Jamie Iles Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1267616878-2154-1-git-send-email-will.deacon@arm.com> Signed-off-by: Ingo Molnar commit 54dbf96c921513bf98484a20ef366d51944a4c4d Author: Paul E. McKenney Date: Wed Mar 3 07:46:57 2010 -0800 rcu: Suppress RCU lockdep warnings during early boot RCU is used during very early boot, before RCU and lockdep have been initialized. So make the underlying primitives (rcu_read_lock_held(), rcu_read_lock_bh_held(), rcu_read_lock_sched_held(), and rcu_dereference_check()) check for early boot via the rcu_scheduler_active flag. This will suppress false positives. Also introduce a debug_lockdep_rcu_enabled() static inline helper function, which tags the CONTINUE_PROVE_RCU case as likely(), as suggested by Ingo Molnar. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-2-git-send-email-paulmck@linux.vnet.ibm.com> [ v2: removed incomplete debug_lockdep_rcu_update() bits ] Signed-off-by: Ingo Molnar commit 8d53dd546f36073e0d29b0cfc24c665db301e3e7 Author: Paul E. McKenney Date: Wed Mar 3 17:50:18 2010 -0800 rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() Change the pair of rcu_dereference() calls in ftrace_perf_buf_prepare() to rcu_dereference_sched(). Signed-off-by: Paul E. McKenney Acked-by: Frederic Weisbecker Cc: Steven Rostedt Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Frederic Weisbecker LKML-Reference: <1267667418-32233-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 99ee4ca746dda71326db7645463b4075ac1d665c Author: Paul E. McKenney Date: Wed Mar 3 17:50:17 2010 -0800 rcu: Suppress __mpol_dup() false positive from RCU lockdep Common code is used during task creation and after the task has started running. RCU protection is not needed during task creation because no other CPU has access to the under-construction task. Provide the RCU protection anyway to suppress the false positive, as there does not appear to be a good way for the common code to recognize that the task is only accessible to the CPU creating it. Signed-off-by: Paul E. McKenney Cc: Paul Menage Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e6033e3b307fcfae08408e0673266db38392bda4 Author: Paul E. McKenney Date: Wed Mar 3 17:50:16 2010 -0800 rcu: Make rcu_read_lock_sched_held() handle !PREEMPT The rcu_read_lock_sched_held() needs to unconditionally return the value "1" in a !PREEMPT kernel, because under !PREEMPT, -all- kernel code is implicitly preempt-disabled. This patch makes this happen. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit cc5b83a9f884fe8722a275069a5a6fde39988455 Author: Paul E. McKenney Date: Wed Mar 3 07:46:59 2010 -0800 rcu: Add control variables to lockdep_rcu_dereference() diagnostics Add the values of rcu_scheduler_active() and debug_locks() to the lockdep_rcu_dereference() output to help diagnose RCU lockdep splats that occur shortly after the scheduler starts. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-4-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 5ed42b8113667c06a6ff2c72717395b5044d30a1 Author: Paul E. McKenney Date: Wed Mar 3 07:46:58 2010 -0800 rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU This patch removes the check for !rcu_scheduler_active because this check has been incorporated into rcu_dereference_check(). Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 Merge: ae1f303 ac91d85 Author: Ingo Molnar Date: Thu Mar 4 11:51:29 2010 +0100 Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d Merge: 1e259e0 6630125 Author: Ingo Molnar Date: Thu Mar 4 11:47:50 2010 +0100 Merge branch 'perf/core' into perf/urgent Merge reason: Switch from pre-merge topical split to the post-merge urgent track Signed-off-by: Ingo Molnar commit e67143243a1a6b47e1bdcda189ffac46d2a8744d Author: Krishna Gudipati Date: Wed Mar 3 17:44:02 2010 -0800 [SCSI] bfa: Resume BFA operations after firmware mismatch is resolved. bfad.c & bfad_drv.h: * Created a kernel thread from pci_probe that does the bfad start operations after BFA init done on a firmware mismatch. * The kernel thread on a fw mismatch waits for an event from IOC call back and is woken up from bfa_cb_init() on BFA init success. * In normal cases of no firmware mismatch this thread is terminated in pci_probe. bfa_fcs_lport.c, fabric.c, fcs_lport.h & vport.c: * Split the lport init to attach time and init time code, so that proper config attributes are set after firmware mismatch. bfa_iocfc.c: * Handle an IOC timer issue, where the IOC timer would expire before the init completion and send Init fail event to the driver, however IOC init continues and completes successfully at the later stage. The bfa and driver were not handling this kind of deferred init completion. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit db1466b3e1bd1727375cdbfcbea4bcce2f860f61 Author: Paul E. McKenney Date: Wed Mar 3 07:46:56 2010 -0800 rcu: Use wrapper function instead of exporting tasklist_lock Lockdep-RCU commit d11c563d exported tasklist_lock, which is not a good thing. This patch instead exports a function that uses lockdep to check whether tasklist_lock is held. Suggested-by: Christoph Hellwig Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Christoph Hellwig LKML-Reference: <1267631219-8713-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 0e064caf6402d1d67db4233d26beec88ca212919 Merge: 90a6501 f409adf c13f3d3 Author: Ingo Molnar Date: Thu Mar 4 11:45:25 2010 +0100 Merge branches 'core/futexes' and 'core/iommu' into core/urgent Merge reason: Switch from topical split to the stabilization track Signed-off-by: Ingo Molnar commit a046bf0559018ba3d16c412fc4e1aa2be5f11f36 Author: Krishna Gudipati Date: Wed Mar 3 17:43:45 2010 -0800 [SCSI] bfa: Fix to allow creation of only 190 vports on CNA. Brocade CNA currently supports only 190 vports (instead of 191), since there are only 192 unicast cam entries reserved for FCoE. Brocade CNA has a total of 256 unicast cam entries (192 FCoE + 64 LL) 192 cam entries = 1 burned in mac + 1 baseport FPMA mac + 190 vport FPMA macs. Made changes to the code to support only 190 vports. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 82794a2e4153657d12a0c29272e40b47eaadb748 Author: Krishna Gudipati Date: Wed Mar 3 17:43:30 2010 -0800 [SCSI] bfa: New interface to handle firmware upgrade scenario Split bfa_fcs_init() into bfa_fcs_attach() and bfa_fcs_init(). Removed empty function definitions in FCS modules Modified driver to call bfa_fcs_attach() and bfa_fcs_init() as needed. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 5b098082e22c168b7df4c5c3cd924047cee7d995 Author: Krishna Gudipati Date: Wed Mar 3 17:43:19 2010 -0800 [SCSI] bfa: Changes to support FDMI Driver Parameter Added a FCS function to be called during driver init, to set the FDMI Driver parameter. fdmi.c: Created a disabled state when fdmi is disabled. bfad.c: * Added fdmi_enable driver parameter. * Added support to call bfa_fcs_set_fdmi_param() to initialize fcs fdmi setting. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit ab5336189a12b6561a1b5708d782a4e27e2e3b79 Author: Krishna Gudipati Date: Wed Mar 3 17:43:09 2010 -0800 [SCSI] bfa: Enable new halt interrupt in BFA. bfa_intr.c: Enable new halt interrupt in BFA. bfi_ctreg.h: Expose new halt interrupt bit definition to host. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 2f9b8857a914b71ba1b84fb23a0a20a87de41c91 Author: Krishna Gudipati Date: Wed Mar 3 17:42:51 2010 -0800 [SCSI] bfa: Enable IOC auto-recovery and IOC type fix. bfa_ioc.c: - Enable IOC auto-recovery by default. - When CNA is in FC mode, return IOC type as FC (not FCoE) bfa_iocfc.c: - Set fcmode before pci initialization/setup. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 5c1fb1d55672a74d1c318f67cdddbb599df9a76c Author: Krishna Gudipati Date: Wed Mar 3 17:42:39 2010 -0800 [SCSI] bfa: Defined a new LPS event to clear virtual link on a vport Clear virtual links was not propagated upwards to bfa from fw. This resulted in HBA and switch being in an inconsistent state. So defined a new LPS event for clear virtual link on a vport, and also now clear virtual link on a baseport, is sent as a link down event from the fw. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit e5a11016643d1ab7172193591506d33a844734cc Author: Masami Hiramatsu Date: Wed Mar 3 22:38:50 2010 -0500 x86: Issue at least one memory barrier in stop_machine_text_poke() Fix stop_machine_text_poke() to issue smp_mb() before exiting waiting loop, and use cpu_relax() for waiting. Changes in v2: - Don't use ACCESS_ONCE(). Signed-off-by: Masami Hiramatsu Acked-by: Mathieu Desnoyers Cc: systemtap Cc: DLE Cc: Jason Baron LKML-Reference: <20100304033850.3819.74590.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 32cb0dd50672056e510ccab442dc9c3a03be649e Author: Masami Hiramatsu Date: Wed Mar 3 22:38:43 2010 -0500 perf probe: Correct probe syntax on command line help Move @SRC right after FUNC in syntax according to syntax change on command line help. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad LKML-Reference: <20100304033843.3819.10087.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 1154fab73ccbab010cfaa272b6987c624cfd63c6 Author: Stephen Rothwell Date: Mon Mar 1 16:04:45 2010 +1100 SLUB: Fix per-cpu merge conflict The slab tree adds a percpu variable usage case (commit 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 "SLUB: Use this_cpu operations in slub"), but the percpu tree removes the prefixing of percpu variables (commit dd17c8f72993f9461e9c19250e3f155d6d99df22 "percpu: remove per_cpu__ prefix"), thus causing the following compilation error: CC mm/slub.o mm/slub.c: In function ‘alloc_kmem_cache_cpus’: mm/slub.c:2078: error: implicit declaration of function ‘per_cpu_var’ mm/slub.c:2078: warning: assignment makes pointer from integer without a cast make[1]: *** [mm/slub.o] Error 1 Signed-off-by: Pekka Enberg commit e2b093f3e9262353558c6f89510ab2d286b28287 Merge: eaa5eec f3186a9 4c13dd3 44b57f1 91efd77 Author: Pekka Enberg Date: Thu Mar 4 12:07:50 2010 +0200 Merge branches 'slab/cleanups', 'slab/failslab', 'slab/fixes' and 'slub/percpu' into slab-for-linus commit 4c147dd81966bd4ba7f026476237ba67ea72d5d9 Author: Krishna Gudipati Date: Wed Mar 3 17:42:11 2010 -0800 [SCSI] bfa: Added separate MSI-X module parameters. Added separate MSI-X module parameters to selectively enable / disable MSI-X interrupts for both Brocade HBA and CNA's. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4c32531324b83672f100692354b680625bcd7fba Author: David S. Miller Date: Thu Mar 4 00:42:30 2010 -0800 MAINTAINERS: Add netdev to bridge entry. Noticed by Ingo Molnar. Signed-off-by: David S. Miller commit a6f018e324ba91d0464cca6895447c2b89e6d578 Author: Divy Le Ray Date: Wed Mar 3 09:49:47 2010 +0000 cxgb3: fix hot plug removal crash queue restart tasklets need to be stopped after napi handlers are stopped since the latter can restart them. So stop them after stopping napi. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 0eddba525cf4c3a4aab9feaf36b12b465290d4a7 Author: Anton Vorontsov Date: Wed Mar 3 08:18:58 2010 +0000 gianfar: Fix TX ring processing on SMP machines Starting with commit a3bc1f11e9b867a4f49505 ("gianfar: Revive SKB recycling") gianfar driver sooner or later stops transmitting any packets on SMP machines. start_xmit() prepares new skb for transmitting, generally it does three things: 1. sets up all BDs (marks them ready to send), except the first one. 2. stores skb into tx_queue->tx_skbuff so that clean_tx_ring() would cleanup it later. 3. sets up the first BD, i.e. marks it ready. Here is what clean_tx_ring() does: 1. reads skbs from tx_queue->tx_skbuff 2. checks if the *last* BD is ready. If it's still ready [to send] then it it isn't transmitted, so clean_tx_ring() returns. Otherwise it actually cleanups BDs. All is OK. Now, if there is just one BD, code flow: - start_xmit(): stores skb into tx_skbuff. Note that the first BD (which is also the last one) isn't marked as ready, yet. - clean_tx_ring(): sees that skb is not null, *and* its lstatus says that it is NOT ready (like if BD was sent), so it cleans it up (bad!) - start_xmit(): marks BD as ready [to send], but it's too late. We can fix this simply by reordering lstatus/tx_skbuff writes. Reported-by: Martyn Welch Bisected-by: Paul Gortmaker Signed-off-by: Anton Vorontsov Tested-by: Paul Gortmaker Tested-by: Martyn Welch Cc: Sandeep Gopalpet Cc: Stable [2.6.33] Signed-off-by: David S. Miller commit 4c020a961a812ffae9846b917304cea504c3a733 Author: David Dillow Date: Wed Mar 3 16:33:10 2010 +0000 r8169: use correct barrier between cacheable and non-cacheable memory r8169 needs certain writes to be visible to other CPUs or the NIC before touching the hardware, but was using smp_wmb() which is only required to order cacheable memory access. Switch to wmb() which is required to order both cacheable and non-cacheable memory. Noticed by Catalin Marinas and Paul Mackerras. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d0021b252eaf65ca07ed14f0d66425dd9ccab9a6 Author: Neil Horman Date: Wed Mar 3 08:31:23 2010 +0000 tipc: Fix oops on send prior to entering networked mode (v3) Fix TIPC to disallow sending to remote addresses prior to entering NET_MODE user programs can oops the kernel by sending datagrams via AF_TIPC prior to entering networked mode. The following backtrace has been observed: ID: 13459 TASK: ffff810014640040 CPU: 0 COMMAND: "tipc-client" [exception RIP: tipc_node_select_next_hop+90] RIP: ffffffff8869d3c3 RSP: ffff81002d9a5ab8 RFLAGS: 00010202 RAX: 0000000000000001 RBX: 0000000000000001 RCX: 0000000000000001 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000001001001 RBP: 0000000001001001 R8: 0074736575716552 R9: 0000000000000000 R10: ffff81003fbd0680 R11: 00000000000000c8 R12: 0000000000000008 R13: 0000000000000001 R14: 0000000000000001 R15: ffff810015c6ca00 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 RIP: 0000003cbd8d49a3 RSP: 00007fffc84e0be8 RFLAGS: 00010206 RAX: 000000000000002c RBX: ffffffff8005d116 RCX: 0000000000000000 RDX: 0000000000000008 RSI: 00007fffc84e0c00 RDI: 0000000000000003 RBP: 0000000000000000 R8: 00007fffc84e0c10 R9: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fffc84e0d10 R14: 0000000000000000 R15: 00007fffc84e0c30 ORIG_RAX: 000000000000002c CS: 0033 SS: 002b What happens is that, when the tipc module in inserted it enters a standalone node mode in which communication to its own address is allowed <0.0.0> but not to other addresses, since the appropriate data structures have not been allocated yet (specifically the tipc_net pointer). There is nothing stopping a client from trying to send such a message however, and if that happens, we attempt to dereference tipc_net.zones while the pointer is still NULL, and explode. The fix is pretty straightforward. Since these oopses all arise from the dereference of global pointers prior to their assignment to allocated values, and since these allocations are small (about 2k total), lets convert these pointers to static arrays of the appropriate size. All the accesses to these bits consider 0/NULL to be a non match when searching, so all the lookups still work properly, and there is no longer a chance of a bad dererence anywhere. As a bonus, this lets us eliminate the setup/teardown routines for those pointers, and elimnates the need to preform any locking around them to prevent access while their being allocated/freed. I've updated the tipc_net structure to behave this way to fix the exact reported problem, and also fixed up the tipc_bearers and media_list arrays to fix an obvious simmilar problem that arises from issuing tipc-config commands to manipulate bearers/links prior to entering networked mode I've tested this for a few hours by running the sanity tests and stress test with the tipcutils suite, and nothing has fallen over. There have been a few lockdep warnings, but those were there before, and can be addressed later, as they didn't actually result in any deadlock. Signed-off-by: Neil Horman CC: Allan Stephens CC: David S. Miller CC: tipc-discussion@lists.sourceforge.net bearer.c | 37 ++++++------------------------------- bearer.h | 2 +- net.c | 25 ++++--------------------- 3 files changed, 11 insertions(+), 53 deletions(-) Signed-off-by: David S. Miller commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3 Author: Timo Teräs Date: Wed Mar 3 04:01:13 2010 +0000 gre: fix hard header destination address checking ipgre_header() can be called with zero daddr when the gre device is configured as multipoint tunnel and still has the NOARP flag set (which is typically cleared by the userspace arp daemon). If the NOARP packets are not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and use that for route look up (and may lead to bogus xfrm acquires). The multicast address check is removed as sending to multicast group should be ok. In fact, if gre device has a multicast address as destination ipgre_header is always called with multicast address. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit c839d30a41dd92eb32d7fcfa2b4e99042fc64bf2 Author: Mike Galbraith Date: Wed Mar 3 04:46:50 2010 +0000 net: add scheduler sync hint to tcp_prequeue(). Decreases the odds wakee will suffer from frequent cache misses. Signed-off-by: Mike Galbraith Signed-off-by: David S. Miller commit 8f37ada5b5f6bfb4d251a7f510f249cb855b77b3 Author: stephen hemminger Date: Wed Mar 3 08:19:59 2010 +0000 IPv6: fix race between cleanup and add/delete address This solves a potential race problem during the cleanup process. The issue is that addrconf_ifdown() needs to traverse address list, but then drop lock to call the notifier. The version in -next could get confused if add/delete happened during this window. Original code (2.6.32 and earlier) was okay because all addresses were always deleted. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 84e8b803f1e16f3a2b8b80f80a63fa2f2f8a9be6 Author: stephen hemminger Date: Tue Mar 2 13:32:46 2010 +0000 IPv6: addrconf notify when address is unavailable My recent change in net-next to retain permanent addresses caused regression. Device refcount would not go to zero when device was unregistered because left over anycast reference would hold ipv6 dev reference which would hold device references... The correct procedure is to call notify chain when address is no longer available for use. When interface comes back DAD timer will notify back that address is available. Also, link local addresses should be purged when interface is brought down. The address might be changed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5b2a19539c5f59c5a038d213ede723f0245d97cf Author: stephen hemminger Date: Tue Mar 2 13:32:45 2010 +0000 IPv6: addrconf timer race The Router Solicitation timer races with device state changes because it doesn't lock the device. Use local variable to avoid one repeated dereference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 122e4519cd5c224d4b8e681d368132b643e28f60 Author: stephen hemminger Date: Tue Mar 2 13:32:44 2010 +0000 IPv6: addrconf dad timer unnecessary bh_disable Timer code runs in bottom half, so there is no need for using _bh form of locking. Also check if device is not ready to avoid race with address that is no longer active. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 335a64a5c21ed58de21c0130c90c7e647cdcf572 Author: Amit Shah Date: Wed Feb 24 10:37:44 2010 +0530 virtio: console: Use better variable names for fill_queue operation We want to keep track of the number of buffers added to a vq. Use nr_added_bufs instead of 'ret'. Also, the users of fill_queue() overloaded a local 'err' variable to check the numbers of buffers allocated. Use nr_added_bufs instead of err. Signed-off-by: Amit Shah Reported-by: Juan Quintela commit 604b2ad7ccb11569d3b843bb1ce0fbe034e70769 Author: Amit Shah Date: Wed Feb 24 10:36:51 2010 +0530 virtio: console: Fix type of 'len' as unsigned int We declare 'len' as int type but it should be 'unsigned int', as get_buf() wants it to be. Signed-off-by: Amit Shah Reported-by: Juan Quintela commit b07f6b327e798610bebaa581ffb7a226f3bcb96b Author: Paul Mundt Date: Thu Mar 4 16:47:30 2010 +0900 sh: Fix up flush_cache_vmap() on SMP. flush_cache_all() uses broadcast IPIs, so we can't wrap in to that when IRQs are disabled. The local cache flush manages to do what we need here anyways, so just switch to that. Signed-off-by: Paul Mundt commit 281983d6ff2674ca2e4868de628c65809d84fa4c Author: Paul Mundt Date: Thu Mar 4 16:44:20 2010 +0900 sh: fix up MMU reset with variable PMB mapping sizes. Presently we run in to issues with the MMU resetting the CPU when variable sized mappings are employed. This takes a slightly more aggressive approach to keeping the TLB and cache state sane before establishing the mappings in order to cut down on races observed on SMP configurations. At the same time, we bump the VMA range up to the 0xb000...0xc000 range, as there still seems to be some undocumented behaviour in setting up variable mappings in the 0xa000...0xb000 range, resulting in reset by the TLB. Signed-off-by: Paul Mundt commit e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 Merge: 1cd4efd 31f66be Author: David S. Miller Date: Wed Mar 3 22:42:54 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit c437b2733520599a2c6e0dbcdeae611319f84707 Author: Akira Fujita Date: Thu Mar 4 00:39:24 2010 -0500 ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl a) Fix sparse warning in ext4_ioctl() b) Remove unneeded variable in mext_leaf_block() c) Fix spelling typo in mext_check_arguments() Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 7247c0caa23d94a1cb6b307edba9dc45fb0798d4 Author: Akira Fujita Date: Thu Mar 4 00:34:58 2010 -0500 ext4: Fix the NULL reference in double_down_write_data_sem() If EXT4_IOC_MOVE_EXT ioctl is called with NULL donor_fd, fget() in ext4_ioctl() gets inappropriate file structure for donor; so we need to do this check earlier, before calling double_down_write_data_sem(). Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 5fd5249aa36fad98c9fd5edced352939e54f9324 Author: Akira Fujita Date: Thu Mar 4 00:31:06 2010 -0500 ext4: Fix insertion point of extent in mext_insert_across_blocks() If the leaf node has 2 extent space or fewer and EXT4_IOC_MOVE_EXT ioctl is called with the file offset where after the 2nd extent covers, mext_insert_across_blocks() always tries to insert extent into the first extent. As a result, the file gets corrupted because of wrong extent order. The patch fixes this problem. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 74781387822cd7a549123ae2b35862bf802689be Author: Steffen Klassert Date: Thu Mar 4 13:30:22 2010 +0800 padata: Allocate the cpumask for the padata instance The cpumask of the padata instance was used without allocated. This caused boot crashes if CONFIG_CPUMASK_OFFSTACK is enabled. This patch fixes this by doing proper allocation for this cpumask. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 731eb1a03a8445cde2cb23ecfb3580c6fa7bb690 Author: Akinobu Mita Date: Wed Mar 3 23:55:01 2010 -0500 ext4: consolidate in_range() definitions There are duplicate macro definitions of in_range() in mballoc.h and balloc.c. This consolidates these two definitions into ext4.h, and changes extents.c to use in_range() as well. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit bda00de7e8569b1fcde27b68fa59e74e14c5f93a Author: Akinobu Mita Date: Wed Mar 3 23:53:25 2010 -0500 ext4: cleanup to use ext4_grp_offs_to_block() More cleanup to convert open-coded calculations of the first block number of a free extent to use ext4_grp_offs_to_block() instead. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit 5661bd6861b7490394e29aaf74dca812188272e4 Author: Akinobu Mita Date: Wed Mar 3 23:53:39 2010 -0500 ext4: cleanup to use ext4_group_first_block_no() This is a cleanup and simplification patch which takes some open-coded calculations to calculate the first block number of a group and converts them to use the (already defined) ext4_group_first_block_no() function. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a Merge: aa4d72a 56a5d3c Author: Dan Williams Date: Wed Mar 3 21:22:21 2010 -0700 Merge branch 'coh' into dmaengine commit aa4d72ae946a4fa40486b871717778734184fa29 Author: Dan Williams Date: Wed Mar 3 21:21:13 2010 -0700 ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes If the calling convention of ->timer_fn() and ->cleanup_fn() are unified across hardware versions we can drop parameters to ioat_init_channel() and unify ioat_is_dma_complete() implementations. Both ->timer_fn() and ->cleanup_fn() are modified to expect a struct dma_chan pointer. Signed-off-by: Dan Williams commit b9cc98697d1ca35a86bbb708acc6d93993c28f0f Author: Dan Williams Date: Wed Mar 3 21:21:13 2010 -0700 ioat3: interrupt coalescing The hardware automatically disables further interrupts after each event until rearmed. This allows a delay to be injected between the occurence of the interrupt and the running of the cleanup routine. The delay is scaled by the descriptor backlog and then written to the INTRDELAY register which specifies the number of microseconds to hold off interrupt delivery after an interrupt event occurs. According to powertop this reduces the interrupt rate from ~5000 intr/s to ~150 intr/s per without affecting throughput (simple dd to a raid6 array). Signed-off-by: Dan Williams commit aa75db0080603bae27961c0502812dfd0f522bb3 Author: Dan Williams Date: Wed Mar 3 21:21:10 2010 -0700 ioat: close potential BUG_ON race in the descriptor cleanup path Since ioat_cleanup_preamble() and the update of the last completed descriptor are not synchronized there is a chance that two cleanup threads can see descriptors to clean. If the first cleans up all pending descriptors then the second will trigger the BUG_ON. Signed-off-by: Dan Williams commit a27341cd5fcb7cf2d2d4726e9f324009f7162c00 Author: Linus Torvalds Date: Tue Mar 2 08:36:46 2010 -0800 Prioritize synchronous signals over 'normal' signals This makes sure that we pick the synchronous signals caused by a processor fault over any pending regular asynchronous signals sent to use by [t]kill(). This is not strictly required semantics, but it makes it _much_ easier for programs like Wine that expect to find the fault information in the signal stack. Without this, if a non-synchronous signal gets picked first, the delayed asynchronous signal will have its signal context pointing to the new signal invocation, rather than the instruction that caused the SIGSEGV or SIGBUS in the first place. This is not all that pretty, and we're discussing making the synchronous signals more explicit rather than have these kinds of implicit preferences of SIGSEGV and friends. See for example http://bugzilla.kernel.org/show_bug.cgi?id=15395 for some of the discussion. But in the meantime this is a simple and fairly straightforward work-around, and the whole if (x & Y) x &= Y; thing can be compiled into (and gcc does do it) just three instructions: movq %rdx, %rax andl $Y, %eax cmovne %rax, %rdx so it is at least a simple solution to a subtle issue. Reported-and-tested-by: Pavel Vilim Acked-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 3a8954e8f22cf31791d8c524c2839433e39f9368 Author: H Hartley Sweeten Date: Fri Feb 26 17:58:07 2010 -0700 staging: dt3155: revert u_long to u64 usage Commit 9c1390a923ddb6fba1cf9d7440743369140c6d8a replaced all u_int's with u32 and u_long's with u64. Unfortunately, a u_long is still only 32-bits so they should have been replaced with u32 also. This can be verified by the register definitions in dt3155_io.h. It specifically states that the memory mapped registers are 32-bit. Fix this by changing all the u64 to u32. Signed-off-by: H Hartley Sweeten Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 5617f9da4619ec975514e6b385a052e024215da3 Author: Andrea Gelmini Date: Fri Feb 26 17:37:00 2010 +0100 Staging: comedi: drivers.c: Checkpatch cleanup WARNING: Use #include instead of +#include WARNING: braces {} are not necessary for any arm of this statement + if (dev->driver) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (insn->insn == INSN_READ) { + data[0] = (new_data[1] >> (chan - base_bitfield_channel)) & 1; + } WARNING: braces {} are not necessary for single statement blocks + if (async->prealloc_buf && async->prealloc_bufsz == new_size) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (async->buf_page_list[i].virt_addr == NULL) { + break; + } WARNING: braces {} are not necessary for single statement blocks + if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) { + nbytes = free_end - async->buf_write_alloc_count; + } WARNING: braces {} are not necessary for single statement blocks + if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) { + nbytes = 0; + } WARNING: braces {} are not necessary for single statement blocks + if (async->buf_write_ptr >= async->prealloc_bufsz) { + async->buf_write_ptr %= async->prealloc_bufsz; + } Signed-off-by: Andrea Gelmini commit b91665e95d1968c3cd8dd0c3a9a8d617639db1a6 Author: Andrea Gelmini Date: Fri Feb 26 17:36:58 2010 +0100 Staging: arlan: arlan.h: more Checkpatch cleanup ERROR: do not use C99 // comments + volatile u_char radioModule;// shows EEPROM, can be overridden at 0x111 ERROR: do not use C99 // comments + volatile u_char defaultChannelSet; // shows EEProm, can be overriiden at 0x10A Signed-off-by: Andrea Gelmini commit e22245b6c26fbb7dfb948382ceb242edccb3a7e3 Author: Andrea Gelmini Date: Fri Feb 26 17:36:59 2010 +0100 Staging: arlan: Makefile: Checkpatch cleanup ERROR: trailing whitespace +obj-$(CONFIG_ARLAN) += arlan.o $ Signed-off-by: Andrea Gelmini commit aa1468b3faca778274ed0a79da52613fee48672e Author: Andrea Gelmini Date: Fri Feb 26 17:36:57 2010 +0100 Staging: rt3070: md4.h: Checkpatch cleanup WARNING: space prohibited between function name and open parenthesis '(' +void MD4Init (MD4_CTX *); WARNING: space prohibited between function name and open parenthesis '(' +void MD4Update (MD4_CTX *, u8 *, UINT); WARNING: space prohibited between function name and open parenthesis '(' +void MD4Final (u8 [16], MD4_CTX *); ERROR: do not use C99 // comments +#endif //__MD4_H__ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit a5a8695987b4c541f2003640d8583412b8c154ff Author: Andrea Gelmini Date: Fri Feb 26 10:15:11 2010 +0100 Staging: arlan: arlan.h: Checkpatch cleanup ERROR: trailing whitespace + * Copyright (C) 1998 Elmer.Joandi@ut.ee, +37-255-13500^I$ WARNING: Use #include instead of +#include ERROR: do not use C99 // comments +//#define ARLAN_DEBUGGING 1 ERROR: "foo * bar" should be "foo *bar" +extern int arlan_command(struct net_device * dev, int command); ERROR: trailing whitespace + $ ERROR: trailing whitespace +#define IFDEBUG( L ) if ( (L) & arlan_debug ) $ ERROR: space prohibited after that open parenthesis '(' +#define IFDEBUG( L ) if ( (L) & arlan_debug ) ERROR: space prohibited before that close parenthesis ')' +#define IFDEBUG( L ) if ( (L) & arlan_debug ) ERROR: trailing whitespace +#define ARLAN_FAKE_HDR_LEN 12 $ ERROR: space required after that ',' (ctx:VxV) + #define ARLAN_DEBUG(a,b) printk(KERN_DEBUG a, b) ^ ERROR: trailing whitespace +^I#define ARLAN_DEBUG(a,b) $ ERROR: space required after that ',' (ctx:VxV) + #define ARLAN_DEBUG(a,b) ^ ERROR: open brace '{' following struct go on the same line +struct arlan_shmem +{ ERROR: trailing whitespace + /* Header Signature */ $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + int systemId; $ ERROR: open brace '{' following struct go on the same line +struct TxParam +{ ERROR: "foo * bar" should be "foo *bar" + struct arlan_shmem __iomem * card; ERROR: "foo * bar" should be "foo *bar" + struct arlan_shmem * conf; ERROR: trailing whitespace + struct arlan_conf_stru * Conf;^I $ ERROR: "foo * bar" should be "foo *bar" + struct arlan_conf_stru * Conf; ERROR: trailing whitespace + $ ERROR: space required after that ',' (ctx:VxV) +#define READSHM(to,from,atype) {\ ^ ERROR: space required after that ',' (ctx:VxV) +#define READSHM(to,from,atype) {\ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) +#define READSHMEM(from,atype)\ ^ ERROR: space required after that ',' (ctx:VxV) +#define WRITESHM(to,from,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define WRITESHM(to,from,atype) \ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + IFDEBUG(levelSHM) printk(stringSHM,tmpSHM);\ ^ ERROR: space required after that ',' (ctx:VxO) + writeb(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writeb(val,&(to)) ^ ERROR: space required after that ',' (ctx:VxO) + writew(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writew(val,&(to)) ^ ERROR: space required after that ',' (ctx:VxO) + writel(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writel(val,&(to)) ^ ERROR: space prohibited after that open parenthesis '(' + ( ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode) > 0) && \ ERROR: space prohibited after that open parenthesis '(' + ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) ) ERROR: space prohibited before that close parenthesis ')' + ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) ) ERROR: code indent should use tabs where possible + ^IREADSHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage)$ ERROR: space required before the open brace '{' +#define writeControlRegister(dev, v){\ ERROR: space required after that ',' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ^ ERROR: need consistent spacing around '&' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ^ ERROR: space prohibited before that close parenthesis ')' + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ERROR: space required after that ',' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} ^ ERROR: space required after that ';' (ctx:VxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} ^ ERROR: space prohibited before that close parenthesis ')' + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} WARNING: suspect code indent for conditional statements (3, 6) + if (cr & ARLAN_CHANNEL_ATTENTION){ \ + writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\ ERROR: space required before the open brace '{' + if (cr & ARLAN_CHANNEL_ATTENTION){ \ ERROR: space required after that close brace '}' + }else \ ERROR: space required before the open brace '{' +#define clearChannelAttention(dev){ \ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);} ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);} ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);} ^ ERROR: space required before the open brace '{' +#define setInterruptEnable(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required before the open brace '{' +#define clearInterruptEnable(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required before the open brace '{' +#define setClearInterrupt(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;} ^ ERROR: space required before the open brace '{' +#define clearClearInterrupt(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);} ^ ERROR: space required before the open brace '{' +#define setPowerOff(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | (ARLAN_POWER && ARLAN_ACCESS));\ ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required before the open brace '{' +#define setPowerOn(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~(ARLAN_POWER)); } ^ ERROR: space required before the open brace '{' +#define arlan_lock_card_access(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required before the open brace '{' +#define arlan_unlock_card_access(dev){\ ERROR: trailing whitespace + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } $ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } ^ ERROR: space prohibited before that close parenthesis ')' + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit fa93e19dcf8600c87a60160735b1065cd4bb4dbb Author: Andrea Gelmini Date: Fri Feb 26 10:15:10 2010 +0100 Staging: comedi: dt2801.c: Checkpatch cleanup ERROR: code indent should use tabs where possible + 0 = [-10,10]$ ERROR: code indent should use tabs where possible + 0 = [-10,10]$ WARNING: braces {} are not necessary for single statement blocks + if (stat & (DT_S_COMPOSITE_ERROR | DT_S_READY)) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_COMPOSITE_ERROR) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_READY) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_COMPOSITE_ERROR) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_READY) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (!(stat & DT_S_READY)) { + printk("dt2801: !ready in dt2801_writecmd(), ignoring\n"); + } WARNING: braces {} are not necessary for single statement blocks + if (!timeout) { + printk("dt2801: timeout 1 status=0x%02x\n", stat); + } WARNING: braces {} are not necessary for single statement blocks + if (!timeout) { + printk("dt2801: timeout 2 status=0x%02x\n", stat); + } WARNING: braces {} are not necessary for any arm of this statement + if (stat == -ETIME) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 20962c10c19862c58c03eec2434279a5d104c40e Author: Andrea Gelmini Date: Fri Feb 26 10:15:09 2010 +0100 Staging: comedi: dmm32at.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (data[0] == COMEDI_OUTPUT) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 882e5b32b5d68960f46331215fc3c301df508110 Author: Andrea Gelmini Date: Fri Feb 26 10:15:08 2010 +0100 Staging: comedi: cb_pcimdas.c: more Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (fifo_empty) { + break; + } WARNING: braces {} are not necessary for single statement blocks + if (irq) { + printk(", irq %u", irq); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit ecd89ddcabf8646651f152155bff5f8bed9c6e92 Author: Andrea Gelmini Date: Fri Feb 26 10:15:07 2010 +0100 Staging: comedi: das6402.c: Checkpatch cleanup ERROR: Macros with complex values should be enclosed in parenthesis +#define N_WORDS 3000*64 Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit dd105f08c0e9d4081629f96b09abadc0bb51e0d8 Author: Andrea Gelmini Date: Fri Feb 26 10:15:06 2010 +0100 Staging: comedi: hwdrv_apci3120.c: Checkpatch cleanup ERROR: do not initialise statics to 0 or NULL +static unsigned int ui_Temp = 0; WARNING: braces {} are not necessary for any arm of this statement + if (data[1]) { [...] + } else [...] WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) { + devpriv->ui_AiChannelList[i] = data[4 + i]; + } ERROR: that open brace { should be on the previous line + } else /* EOC */ + { WARNING: braces {} are not necessary for any arm of this statement + if (data[1]) { [...] + } else { [...] ERROR: that open brace { should be on the previous line + if (insn->unused[0] == 222) /* second insn read */ + { WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < insn->n; i++) { + data[i] = devpriv->ui_AiReadData[i]; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) { + err++; + } ERROR: that open brace { should be on the previous line + if (cmd->scan_begin_src == TRIG_TIMER) /* Test Delay timing */ + { ERROR: that open brace { should be on the previous line + if (cmd->convert_src == TRIG_TIMER) /* Test Acquisition timing */ + { WARNING: braces {} are not necessary for any arm of this statement + if (cmd->stop_src == TRIG_COUNT) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) { + i_APCI3120_ExttrigEnable(dev); /* activate EXT trigger */ + } WARNING: braces {} are not necessary for single statement blocks + if (dmalen0 > (devpriv->ui_AiDataLength)) { + dmalen0 = devpriv->ui_AiDataLength; + } WARNING: braces {} are not necessary for single statement blocks + if (dmalen1 > (devpriv->ui_AiDataLength)) { + dmalen1 = devpriv->ui_AiDataLength; + } WARNING: braces {} are not necessary for any arm of this statement + if (CR_RANGE(chanlist[i]) < APCI3120_BIPOLAR_RANGES) { [...] + } else { [...] ERROR: that open brace { should be on the previous line + if (devpriv->b_EocEosInterrupt == APCI3120_ENABLE) /* enable this in without DMA ??? */ + { ERROR: that open brace { should be on the previous line + if (data[0] == APCI3120_TIMER) /* initialize timer */ + { ERROR: that open brace { should be on the previous line + } else /* Initialize Watch dog */ + { ERROR: that open brace { should be on the previous line + if (data[0] == 2) /* write new value */ + { ERROR: that open brace { should be on the previous line + if (devpriv->b_Timer2Mode == APCI3120_TIMER) /* start timer */ + { ERROR: that open brace { should be on the previous line + } else /* start watch dog */ + { ERROR: that open brace { should be on the previous line + if (devpriv->b_Timer2Mode == APCI3120_TIMER) /* start timer */ + { ERROR: that open brace { should be on the previous line + } else /* Read watch dog status */ + { WARNING: braces {} are not necessary for single statement blocks + if (!devpriv->b_OutputMemoryStatus) { + ui_Temp = 0; + + } /* if(!devpriv->b_OutputMemoryStatus ) */ ERROR: code indent should use tabs where possible + data[0] Value to be written$ ERROR: code indent should use tabs where possible + data[1] :1 Set digital o/p ON$ ERROR: code indent should use tabs where possible + data[1] 2 Set digital o/p OFF with memory ON$ ERROR: that open brace { should be on the previous line + if (ui_Range) /* if 1 then unipolar */ + { ERROR: that open brace { should be on the previous line + } else /* if 0 then bipolar */ + { ERROR: that open brace { should be on the previous line + do /* Waiting of DA_READY BIT */ + { Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit d539047c7bb3d462b4b505accbb3cc31dce87801 Author: Andrea Gelmini Date: Fri Feb 26 10:15:05 2010 +0100 Staging: comedi: das08_cs.c: Checkpatch cleanup ERROR: code indent should use tabs where possible + NONE$ ERROR: do not initialise statics to 0 or NULL +static struct pcmcia_device *cur_dev = NULL; Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 426054ce11ecb416048aa0f92628fa4ba93c3a0e Author: Andrea Gelmini Date: Fri Feb 26 10:15:04 2010 +0100 Staging: comedi: contec_pci_dio.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (dev->iobase) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit f1c54e82726fe51a55a18d15dc9377b8fd568ca2 Author: Andrea Gelmini Date: Fri Feb 26 10:15:03 2010 +0100 Staging: comedi: cb_pcimdda.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (it->options[2]) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->registers) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 7c2f1946a5d41da3cfc1696944aaa420db5b5145 Author: Andrea Gelmini Date: Fri Feb 26 10:15:02 2010 +0100 Staging: comedi: cb_pcimdas.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (thisboard->has_dio) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->BADR0) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit e3a21d0ac2ee4f6c1be5314e76939867a2d0b470 Author: Andrea Gelmini Date: Fri Feb 26 10:15:01 2010 +0100 Staging: comedi: cb_pcidio.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (devpriv->dio_reg_base) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < thisboard->n_8255; i++) { + subdev_8255_cleanup(dev, dev->subdevices + i); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 20db7d7de7027ddee5df1b51b3d013568273b9df Author: Andrea Gelmini Date: Fri Feb 26 10:15:00 2010 +0100 Staging: comedi: cb_pcidda.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (devpriv->dac) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) { + value |= 1 << (value_width - i); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < max_num_caldacs; i++) { + cal2_bits |= DESELECT_CALDAC_BIT(i); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < max_num_caldacs; i++) { + cal2_bits |= DESELECT_CALDAC_BIT(i); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 2d238b2972bf365153ae8d699177c7a19a5f3056 Author: Andrea Gelmini Date: Fri Feb 26 10:14:59 2010 +0100 Staging: comedi: cb_pcidas.c: Checkpatch cleanup ERROR: "foo * bar" should be "foo *bar" + uint8_t * data); WARNING: braces {} are not necessary for single statement blocks + if (devpriv->s5933_config) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->count = cmd->chanlist_len * cmd->stop_arg; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->ao_count = cmd->chanlist_len * cmd->stop_arg; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->ao_count -= num_points; + } WARNING: braces {} are not necessary for single statement blocks + if (dev->attached == 0) { + return IRQ_NONE; + } WARNING: braces {} are not necessary for single statement blocks + if ((status & (INT | EOAI | LADFUL | DAHFI | DAEMI)) == 0) { + comedi_error(dev, "spurious interrupt"); + } WARNING: braces {} are not necessary for single statement blocks + if (status & (DAHFI | DAEMI)) { + handle_ao_interrupt(dev, status); + } WARNING: braces {} are not necessary for single statement blocks + if (async->cmd.stop_src == TRIG_COUNT) { + devpriv->ao_count -= num_points; + } ERROR: "foo * bar" should be "foo *bar" + uint8_t * data) Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 882e1233a1abb650149496b33eaeb1d09bbc0b7a Author: Andrea Gelmini Date: Fri Feb 26 10:14:58 2010 +0100 Staging: comedi: hwdrv_apci1032.c: Checkpatch cleanup ERROR: do not initialise externals to 0 or NULL +unsigned int ui_InterruptStatus = 0; WARNING: braces {} are not necessary for single statement blocks + else { + outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); + } /* else if(data[1] == ADDIDATA_OR) */ WARNING: braces {} are not necessary for single statement blocks + if (data[1] == 1) { + *data = ui_InterruptStatus; + } /* if(data[1]==1) */ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit a9ecb5bb5847b084d6d8bf5c60549fd5598c053a Author: Andrea Gelmini Date: Fri Feb 26 10:14:57 2010 +0100 Staging: comedi: addi_common.h: Checkpatch cleanup ERROR: code indent should use tabs where possible + const struct comedi_lrange *pr_AiRangelist;^I/* rangelist for A/D */$ ERROR: code indent should use tabs where possible + const struct comedi_lrange *pr_AoRangelist;^I/* rangelist for D/A */$ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 015fadba7c30a082cc8efa0f353be096b75e3952 Author: Andrea Gelmini Date: Fri Feb 26 10:14:56 2010 +0100 Staging: comedi: addi_amcc_S5920.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (i_Counter == 0) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 48d07f2bf3fd6d0bbe7577f1844f7edfaf7399f6 Author: d binderman Date: Sun Feb 21 10:02:59 2010 +0000 Staging: comedi: amplc_pci224.c: coding style cleanups Signed-off-by: David Binderman Signed-off-by: Greg Kroah-Hartman commit 02c7b237f6a01f580319187d4bdbf712b27a5460 Author: Alessio Igor Bogani Date: Fri Feb 26 08:44:27 2010 +0100 Staging: Cleanup useless headers BKL isn't anymore present into these files thus it is no necessary still include smp_lock.h. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 7bd795bfcd7eb2f2962d458bf787d5ee0d1167cd Author: Florian Schilhabel Date: Fri Feb 19 20:12:12 2010 +0100 Staging: rtl8192su: use list_for_each_safe() in ieee80211_crypto_deinit Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit a99840b1aa66d3797bfe0be4fb6982bba62d815b Author: Florian Schilhabel Date: Fri Feb 19 20:11:54 2010 +0100 Staging: rtl8192su: re-enable tx-stats currently, interface statistics look like this: wlan0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx inet addr:xxx.xxx.xxx.xxx Bcast:xxx.xxx.xxx.xxx Mask:xxx.xxx.xxx.xxx UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:435 errors:0 dropped:1 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:456758 (446.0 Kb) TX bytes:0 (0.0 b) after re-enabling the tx-stats it looks like this: wlan0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx inet addr:xxx.xxx.xxx.xxx Bcast:xxx.xxx.xxx.xxx Mask:xxx.xxx.xxx.xxx UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:1269 errors:0 dropped:1 overruns:0 frame:0 TX packets:1049 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1667442 (1.5 Mb) TX bytes:82606 (80.6 Kb) Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit 29a1fbc88b822497a0a4d8e9cb7d8a471e70f339 Author: Florian Schilhabel Date: Fri Feb 19 20:11:37 2010 +0100 Staging: rtl8192su: fix for rtl819xU:Error TX URB for zero byte xxx, error -2 according to 'linux device drivers', ENOENT, ECONNRESET, ESHUTDOWN are not real transmission errors. also, a little cosmetics. Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit 2f22560880786acceb6bc63cbda7125e8d9a2206 Author: Florian Schilhabel Date: Fri Feb 19 20:10:00 2010 +0100 Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c Because the Firmware is loaded from RTL8192SU/rtl8192sfw.bin, it it save, to remove it from r8192SU_HWImg.c Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit c852ab66727558e7fb9c994a12ff30cc3d0e2448 Author: Sven-Thorsten Dietrich Date: Tue Feb 23 13:59:18 2010 -0800 Staging: make drivers use spin_lock_init() This fixes some RT-triggered compile errors and typos. Signed-off-by: Sven-Thorsten Dietrich Acked-by: Marek Lindner Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 21b0838c1a03686277e0cfeda42015e4538b9ea3 Author: Ameya Palande <2ameya@gmail.com> Date: Wed Feb 24 20:18:28 2010 +0200 Staging: crystalhd: Misc improvements for crystalhd_lnx.c This patch does following improvements: 1. Follow kernel style for comments 2. Reorganize code for readability improvement 3. Use PCI helper macros 4. Use __devinit, __devexit, __devexit_p at necessary places 5. Mark functions and data as static when it is not exported Signed-off-by: Ameya Palande <2ameya@gmail.com> Cc: Naren Sankar Cc: Jarod Wilson Cc: Scott Davilla Cc: Manu Abraham Signed-off-by: Greg Kroah-Hartman commit 092579690107ffdf9b146de7e67379d8434e9bb0 Author: Jim Dog Date: Thu Feb 25 11:38:21 2010 +0000 Staging: wlan-ng: Fixed line length issues in prism2usb.c This is a patch to the prism2usb.c that fixes one line which was over the 80 character limit by wrapping it to a new line and removes a commented out configuration for a ZyDAS ZD1201 device since support for this device with this driver is now deprecated. Signed-off-by: Jim Dog Signed-off-by: Greg Kroah-Hartman commit 582de7caf578f3ed1f52bc93ad926a580af885b4 Author: Randy Dunlap Date: Thu Feb 25 14:41:22 2010 -0800 Staging/pohmelfs: fix write_inode parameter warning sparse warns that: drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type so fix pohmelfs_write_inode() to have the expected parameters. Signed-off-by: Randy Dunlap Cc: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 83a0f9bc658b20b06740691d9ee711c5d14b6e8a Author: Randy Dunlap Date: Thu Feb 25 09:55:03 2010 -0800 Staging: fix wlan-ng printk format warning Fix prism2fw.c printk format warning: drivers/staging/wlan-ng/prism2fw.c:209: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 128a5d0223ebef1cb6c0d94b3f87b49e38a11443 Author: Randy Dunlap Date: Wed Feb 24 11:39:20 2010 -0800 Staging: rtl8192* needs semaphore.h The rtl8192* drivers in staging use semaphores, so they need to #include . (similar to staging-rtl8187se-needs-semaphore.h.patch) drivers/staging/rtl8192e/ieee80211/ieee80211.h:2038: error: field 'ips_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211.h:2249: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211.h:2250: error: field 'scan_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c:442: error: implicit declaration of function 'down' drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c:500: error: implicit declaration of function 'up' drivers/staging/rtl8192e/ieee80 211/ieee80211_softmac.c:3165: error: implicit declaration of function 'sema_init' drivers/staging/rtl8192su/ieee80211/ieee80211.h:1330: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192su/ieee80211/ieee80211.h:1331: error: field 'scan_sem' has incomplete type drivers/staging/rtl8192u/ieee80211/ieee80211.h:2010: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192u/ieee80211/ieee80211.h:2011: error: field 'scan_sem' has incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 0f7cf0034c6b9aafea3605ec61145c9b54b1b208 Author: Sylvain Trias Date: Wed Feb 24 00:17:52 2010 +0100 Staging: line6: variax.c: fixed a space a "x ? a : b" coding style issue Fixed a coding style issue. Signed-off-by: Sylvain Trias Signed-off-by: Greg Kroah-Hartman commit ea12ac4fd241a141cc64683f4293f48bed84fd42 Author: Frank Mori Hess Date: Mon Feb 22 15:32:32 2010 -0500 Staging: comedi: Increased timeout for digital output dma loading Increased timeout for digital output dma loading, due to report of it being too short for some hardware. Signed-off-by: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman commit 2021937c6d8ec1212b8f4fa01e86f852c9b96368 Author: OGAWA Hirofumi Date: Tue Feb 23 03:04:42 2010 +0900 Staging: comedi: serial2002: Fix filp_open usage Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman commit 9f7a344b69485dc1052534a4e1b2e5a8f7de086e Author: Benjamin Adolphi Date: Sun Feb 21 21:51:00 2010 +0100 Staging: comedi: amplc_pc236: Checkpatch cleanups This fixes all checkpatch issues in the amplc_pc236 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 669c930c8fe266917865f923db51c3b654ab78a3 Author: Benjamin Adolphi Date: Sun Feb 21 21:44:57 2010 +0100 Staging: comedi: amplc_dio200: Checkpatch cleanups This fixes all checkpatch issues in the amplc_dio200 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit e20ad20d849eb902628553be1fd2dc9ccc40a4bd Author: Benjamin Adolphi Date: Sun Feb 21 21:25:33 2010 +0100 Staging: comedi: aio_iiro_16: Checkpatch cleanups This fixes all checkpatch issues in the aio_iiro_16 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit e41a6f6d9cb7404420d596f27609a3f4f55dcaf5 Author: Stewart Robertson Date: Sun Feb 21 10:13:21 2010 +0000 Staging: comedi: fix coding style issues in ni_labpc.c This is a patch to the ni_labpc.c file that fixes the brace warnings and comments over 80 characters found by the checkpatch.pl tool. Some code still goes over 80 characters because I didn't know what to do with it. Signed-off-by: Stewart Robertson Signed-off-by: Greg Kroah-Hartman commit af71b816cdc623bc7c0b616ededbf3dadaf03156 Author: Marek Lindner Date: Fri Feb 19 16:18:11 2010 +0100 Staging: batman-adv: fix module initialization Make sure that batman-adv does not process packets before its initialization is complete. Some sanity checks added to the receiver function. Signed-off-by: Marek Lindner Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit da6d6c7ac366ad3189e494cd78376db7a4f40d59 Author: Marek Lindner Date: Fri Feb 19 16:18:10 2010 +0100 Staging: batman-adv: avoid crash on memory allocation error skb_share_check() returns NULL if it can't allocate more memory but it still frees the skbuff. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 8d03847c090b12694fb9fa81dbefa7b3e4f10f1d Author: Andrew Lunn Date: Fri Feb 19 16:18:09 2010 +0100 Staging: batman-adv: Fix skbuff leak in VIS code. The vis code takes a copy of the data inside the skbuf if it is interesting for us, so we always need to release the skbuf. Reported-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 837b8248f6206a6b08b3d6defe2946282e432679 Author: Linus Luessing Date: Fri Feb 19 16:18:08 2010 +0100 Staging: batman-adv: atomic variable for vis-srv activation This fixes the bug discovered by Marek Lindner which did not allow turning on the vis-server before an interface has been added. With this patch we are using a global atomic variable for activating and deactiating the vis-server-mode, which can be used before inserting an interface. Signed-off-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit bc0ad071a788625abb23aee4cb3c07d17d501641 Author: Marek Lindner Date: Fri Feb 19 16:18:07 2010 +0100 Staging: batman-adv: remove obsolete variables This patch removes a variable that became obsolete since the skb handling replaced the packet handling thread. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 149de2e58b53cb87c9637a46441c477f0caf74bd Author: Marek Lindner Date: Fri Feb 19 16:18:06 2010 +0100 Staging: batman-adv: avoid having the same error message more than once The routing code has 2 sections which warn about ttl exceeded. The corresponding warnings were identical which makes it hard to debug. In addition, batman-adv does not need to warn about ttl exceeded in case we encountered an echo request as this is commonly used to generate traceroute graphs. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit eb50081d8fb76d5de9d65628d7f41977ece7044b Author: Simon Wunderlich Date: Fri Feb 19 16:18:05 2010 +0100 Staging: batman-adv: don't lock while sending packets As in other parts of batman-adv, we should not lock while sending a packet but keep the lock held for as short as possible. Additionally, we should check whether the interface is active, otherwise batman_if->net_dev might not be available ... Signed-off-by: Simon Wunderlich Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 0fce64362d4f2144586e3ffcff6f259bf8abc2f8 Author: Sven Eckelmann Date: Fri Feb 19 16:18:04 2010 +0100 Staging: batman-adv: depend on NET instead of PACKET in Kconfig The code which uses the raw packet sockets was removed. The only related dependencies are the skb and netdev handling code. This is provided by NET in Kconfig. Signed-off-by: Sven Eckelmann Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 77712e5fbe2e47476823f4853d756cc5ad1dfabc Author: Mark Brown Date: Thu Feb 18 17:19:17 2010 +0000 Staging: iio: Staticise non-exported functions Staticise a number of functions which aren't exported outside their source files, and also add a __user annotation for the buffer in iio_event_chrdev_read(). Signed-off-by: Mark Brown Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 9a16a92c11e82a0a80b4847343cfb8b5c54ed6b6 Author: Graham M Howe Date: Mon Feb 15 10:04:26 2010 +0000 Staging: comedi: fix brace and 80 character coding style issue in ni_daq_700.c This is a patch to the ni_daq_700.c file that fixes up brace and 80 character warnings found by the checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit 3c2aabc41da7e9f957bc826363115a54764fb396 Author: Arthur Benilov Date: Tue Feb 16 15:41:51 2010 +0100 Staging: vme: VMIVME-7805 board support VMIVME-7805 board has a special control register that has to be used in order to activate the VME bus access via the Universe II bridge. This control register also handles endianess convertion. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 33e920d9ebaddbc9cf51cf6e1de7baa8d7b8d6dd Author: Arthur Benilov Date: Tue Feb 16 15:41:21 2010 +0100 Staging: vme: Allocate memory buffers for master windows For VME device I/O operations on master windows the user driver tends to use kern_buf buffer array which is not allocated. This causes an error when reading from master window device files. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 5188d74cc4597a63a0907b8996ca0a2d36f1b970 Author: Arthur Benilov Date: Tue Feb 16 15:40:58 2010 +0100 Staging: vme: Use A24 when requesting slave resource When requesting slave resources A16 addressing mode flag is used to find available windows. Since the ca91cx42 bridge only supports two A16 slave windows but four are requested, the driver fails to initialize. The flag has been changed to A24, which is supported by all slave windows. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 877de4b4866f1cc0a25a4d67d3927304556f5d1f Author: Arthur Benilov Date: Tue Feb 16 15:40:30 2010 +0100 Staging: vme: llseek support in user driver Provide vme_user_llseek() implementation. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit bb9ea89ec8a3d80a835d53afc388ad5f67fd3cb3 Author: Martyn Welch Date: Thu Feb 18 16:22:13 2010 +0000 Staging: vme: Remove legacy unsupported code Remove the code from the drivers that we are not going to implement before submitting for review. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 25331ba2f8e36abe77211765fa879106cdbc43e6 Author: Martyn Welch Date: Thu Feb 18 15:13:45 2010 +0000 Staging: vme: ca91cx42 slot detection Sort out slot detection on the ca91cx42. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 04e10e15f9509d08c5e2194ea2ae680c013d5b63 Author: Martyn Welch Date: Thu Feb 18 15:13:38 2010 +0000 Staging: vme: Add ca91cx42 rmw support Add support for Master Read-Modify-Write cycles on the ca91cx42. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 21e0cf6d2e59e19f77096e73d83157734e7f7782 Author: Martyn Welch Date: Thu Feb 18 15:13:32 2010 +0000 Staging: vme: Correct ca91cx42 resource handling The ca91cx42 driver currently incorrectly handles master windows, setting and retrieving the sizing parameters incorrectly. Also, in the slave window handling, it uses an incorrectly set variable. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 4860ab74d4d577d21fbfe0da3bd0925f3efc8907 Author: Martyn Welch Date: Thu Feb 18 15:13:25 2010 +0000 Staging: vme: add ca91cx42 dma support Add support for the DMA controller in the ca91cx42 bridge. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 2b82beb8c1bc81b3dde69d16cacbc22546681acf Author: Martyn Welch Date: Thu Feb 18 15:13:19 2010 +0000 Staging: vme: Add location monitor support for ca91cx42 Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 8fafb47638012d93134d0ff38adcc5fc661beeb1 Author: Martyn Welch Date: Thu Feb 18 15:13:12 2010 +0000 Staging: vme: Make vme_master_resource naming bus neutral The vme_master_resource structure contains an item called "pci_resource". Rename to make bus agnostic. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 29848ac9f3b33bf171439ae2d66d40e6a71446c4 Author: Martyn Welch Date: Thu Feb 18 15:13:05 2010 +0000 Staging: vme: Enable drivers to handle more than one bridge At the moment the vme bridge drivers are written in a way that only allows them to support one bridge at a time. Modify the drivers to enable more than one bridge to be present per board. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 4f723df45d3952c485ee0125fb6797ad615901c3 Author: Martyn Welch Date: Thu Feb 18 15:12:58 2010 +0000 Staging: vme: Attribute Testing For Dma Request Check the directions in which the DMA controller is expected to operate before giving control of a resource. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 66bd8db52ab48e7189e02d4bf1f23109cc1ede70 Author: Martyn Welch Date: Thu Feb 18 15:12:52 2010 +0000 Staging: vme: Renaming following split of GE Fanuc joint venture This patch corrects author email addresses and Copyright notices as a result of the split up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit a94f530a5ee36f72e0377d081023b8d23dacf7ce Author: Randy Dunlap Date: Tue Feb 16 14:59:07 2010 -0800 Staging: rtl8187se: needs semaphore.h rtl8187se needs to include semaphore.h to prevent build errors: drivers/staging/rtl8187se/ieee80211/ieee80211.h:1004: error: field 'wx_sem' has incomplete type drivers/staging/rtl8187se/ieee80211/ieee80211.h:1005: error: field 'scan_sem' has incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit bd80816b2877879d36011815858c8681408cc625 Author: Bernie Thompson Date: Mon Feb 15 06:46:48 2010 -0800 Staging: udlfb: remove printk and small cleanup Remove last remaining printk and clarify comments Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit dd8015f1c83bfde9966c86a5958abd466a304398 Author: Bernie Thompson Date: Mon Feb 15 06:46:35 2010 -0800 Staging: udlfb: explicit dependencies and warnings Specify Kconfig dependencies, and include warnings for building as a module udlfb is dependent on FB_DEFERRED_IO, FB_SYS_*, and FB_MODE_HELPERS Because many kernels do not include defio (which cannot be built as a module), yet users want to be able to build udlfb as a module later, udlfb has ifdefs and these dependency warnings to help udlfb build with or without certain dependencies, but also print warnings for any lost function. Even though this kind of flexibility isn't common, we've gotten feedback from a significant portion of users that they were frustrated without it. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 3e8f3d6fa672896096068296658a769649186150 Author: Bernie Thompson Date: Mon Feb 15 06:46:26 2010 -0800 Staging: udlfb: Support for fbdev mmap clients (defio) Add support for fbdev mmap clients who don't send damage ioctls Because DisplayLink devices are out on the other end of usb, their "framebuffer" is just normal system memory. So memory mapped writes don't automatically trigger anything. So up to this point, standard fbdev clients who rely on mmap() will get an unchanging screen. This patch makes udlfb a client of Jaya Kumar's defio framework - which sets up page fault triggers, and those faults are accumulated and sent to udlfb on a defferred basis, to process as damage notifications for the framebuffer. Because this involves more overhead than a notification directly from the application (e.g. just passing on X DAMAGE extension notifications), a sysfs attribute is provided by udlfb to control defio support. /sys/class/graphics/fb*/use_defio - writing a "0" to this file before calling mmap() causes defio to not be initialized - instead udlfb will rely on getting damage notifications directly through the damage ioctl. There are unsolved rendering problems with defio (horizontal dead regions on framebuffer, that accumulate over time) which still needs a fix. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 530f43a8a69d9fa10ec6d30652244bb5e2a29694 Author: Bernie Thompson Date: Mon Feb 15 06:46:21 2010 -0800 Staging: udlfb: improved rendering performance Rework rendering for improved performance Approx 10-20% gain avg across several "benchmarks": x11perf, gtkperf, glxgears Moves from a single pre-alloc'd urb protected by a long-held mutex To a list of (4) pre-alloc'd urbs which can be dispatched asynchonously Improved rendering algorithm to hardware with lower CPU consumption, fewer system memory accesses, and slightly higher compression. Better scalability to multiple processors, especially with multiple framebuffers active. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 2469d5dbcafe064859475a8aaf8da00ab33d440c Author: Bernie Thompson Date: Mon Feb 15 06:46:13 2010 -0800 Staging: udlfb: Rework startup and teardown to fix race conditions Rework probe to use refcounts and std functions Because the different parts of the driver (usb, fbdev) tear down in different orders, the driver previously could crash accessing data that had already been freed. Refcounting system used to handle. Reworked probe to make use of refcounts, set mode using std fbops, and set up sysfs and pre-allocated urbs. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 7d9485e2c53caaaed9606a39de1c2746cc9ba262 Author: Bernie Thompson Date: Mon Feb 15 06:46:08 2010 -0800 Staging: udlfb: Add functions to expose sysfs metrics and controls Add sysfs controls for edid and performance metrics There are 8 new files exposed in /sys/class/graphics/fb* edid - returns 128 byte edid blog, suitable for parsing with parse-edid metrics_bytes_identical metrics_bytes_rendered metrics_bytes_sent metrics_cpu_kcycles_used metrics_misc and metrics_reset, which resets all perf metrics to zero The 6 perf metrics are of type atomic_t. So these metrics return precise results for short benchmarks, but any test approx a minute or longer runtime may roll over. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 4574203f45eb26b3fd76a171a77dd298dc1dc1ae Author: Bernie Thompson Date: Mon Feb 15 06:46:04 2010 -0800 Staging: udlfb: clean up function naming Move to more consistent naming scheme All udlfb functions start with udlfb_ All functions for udlfb's fbdev interface start with udlfb_ops_ All functinos for udlfb's usb interface start with udlfb_usb_ Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 4a4854dd2049ddc066a162a0f843dc2a78481060 Author: Bernie Thompson Date: Mon Feb 15 06:45:55 2010 -0800 Staging: udlfb: pre-allocated urb list helpers Add functions to pre-allocate and free usb bulk urbs for core render path. Udlfb currently allocates a single urb, guarded by a mutex, that is a key bottleneck. Because udlfb sends so much data, preallocation is most efficient. Functions will be used by new rendering functions in later patches. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit cc403dc67d10b895fec14b837fa2a6cb6ee6c8bd Author: Bernie Thompson Date: Mon Feb 15 06:45:49 2010 -0800 Staging: udlfb: reorganize function order Reorganize the location of a few things to be closer to related code Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 1d31a9ee698f9b8d72c5813fe62a5184197443c3 Author: Bernie Thompson Date: Mon Feb 15 06:45:43 2010 -0800 Staging: udlfb: checkpatch cleanup Eliminate checkpatch.pl warnings and errors so later patches in series are clean Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit cd18964a1d67c4989474ffca0109ef1c0f8502a3 Author: Larry Finger Date: Sun Feb 14 22:07:57 2010 -0600 Staging: r8187se: Remove dead code from r8185b_init.c Remove dead code from r8185b_init.c. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 8daba6b94dce76254b10de0a9a777f792a120322 Author: Larry Finger Date: Sun Feb 14 22:04:56 2010 -0600 Staging: r8187se: Remove two private variables that have a fixed value For the RTL8187SE, the variable priv->rf_chip is always RF_ZEBRA4 and priv->RegThreeWireMode is always HW_THREE_WIRE_SI. Remove these 2 variables. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit b1b7621b08e49638aa65b5f67cdd35478f00a4c4 Author: Larry Finger Date: Sun Feb 14 21:55:16 2010 -0600 staging: r8187se: Remove write_phy routine Remove a routine that is not used. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 5dd8acc8fd6b0476a2dc49bc6de4712d22c368c0 Author: Svenne Krap Date: Sun Feb 14 18:59:00 2010 +0100 Staging: wlan-ng: multiple safe style cleanups Cleanups as suggested by checkpatch.pl utiltiy. .o's from before and after cleanup have matching SHA1s. Signed-off-by: Svenne Krap Signed-off-by: Greg Kroah-Hartman commit 46800b225f8c9dc264e1e9c15b1e104b9e0af5b5 Author: Svenne Krap Date: Sun Feb 14 18:59:42 2010 +0100 Staging: wlan-ng: clean up assignments in if statements Trivial changes to code-paths. Signed-off-by: Svenne Krap Signed-off-by: Greg Kroah-Hartman commit bc2955ddf48d2da94019680fa46deae88d39b40e Author: Graham M Howe Date: Sat Feb 13 20:21:43 2010 +0000 Staging: comedi: bracing fix to ni_atmio.c This is a patch to ni_atmio.c file to fix up bracing style problems found by checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit cd9d25ba31b2def7f84da1e3cedf21e8ebb90722 Author: Dan Carpenter Date: Fri Feb 12 14:48:01 2010 +0300 staging: vt6655: add missing curly braces It's clear from the indent levels and the context that there are supposed to be curly braces here. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 6de92dd6495e36c0c2cddbee3e7c6a49f608e7cf Author: Larry Finger Date: Thu Feb 11 14:41:24 2010 -0600 Staging: r8187se: Fix for LED not following radio switch The current driver does not follow the state of the RF switch. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 742821ce5fdf691826154fe72ba0884f71a40982 Author: Larry Finger Date: Thu Feb 11 12:07:35 2010 -0600 staging: r8187se: Change to use common eeprom routines in EEPROM_93CX The TODO list includes switching this driver to use the common EEPROM routines in EEPROM_93CX. Signed-off-by: Larry Finger Tested by: Bernhard Schiffner Signed-off-by: Greg Kroah-Hartman commit 13a21ad18cb43574a1a642baf105afdf2a9260c4 Author: Jochen Maes Date: Thu Feb 11 17:10:42 2010 +0100 staging: dream: more Code style fixes Removed parenthesis from return statements, split up assignment and if condition Signed-off-by: Jochen Maes Cc: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 451ff3737d220a17869d7304d5735146f9cc587f Author: Jochen Maes Date: Wed Feb 10 10:27:14 2010 +0100 staging: dream: another Codestyle patch Fixed code style issues. Signed-off-by: Jochen Maes Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit df16b962f06724f006ff06aa9e69971113e2fa46 Author: Jochen Maes Date: Wed Feb 10 00:19:46 2010 +0100 staging: dream: Codestyle fix Fixed Codestyle issues Signed-off-by: Jochen Maes Cc: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 326bdc6537d3f18d894745a344c44c9c34777014 Author: Benjamin Adolphi Date: Sat Feb 6 15:12:32 2010 +0100 Staging: comedi: rti800: more Checkpatch cleanups This fixes all checkpatch issues in the rti800 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 3913add413ab95b1e33738b44e9a2118afb11346 Author: Mark Allyn Date: Fri Feb 5 10:53:34 2010 -0800 Staging: rar_register: add suspend and resume functions Add suspend and resume functions (which are currently stubs returning -ENOSYS) Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 433e63c63eee9fd8ac3735ce5b41797f30d5ce58 Author: Mark Allyn Date: Fri Feb 5 10:53:18 2010 -0800 Staging: rar_register: fix checkpatch errors and debug program file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 9cedb3924bfa3f70d0c562c65e26ce824c686fc4 Author: Mark Allyn Date: Fri Feb 5 10:53:00 2010 -0800 Staging: rar_register: fix checkpatch errors and debug header file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit bafb6f63af819269c23871ba9ca8d9eb3f6893cc Author: Mark Allyn Date: Fri Feb 5 10:52:46 2010 -0800 Staging: rar_register: provide better explanation in Kconfig Provides a better explanation of what this driver is for in the Kconfig file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e33cc5cec039ac6aef68568c06998707bceb0953 Author: Mark Allyn Date: Fri Feb 5 10:52:26 2010 -0800 Staging: rar_register: renaming directory to rar_register Renames the directory in which the driver files are located; again for clarity. Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit ee7dfb7e245e92c011c335e7bac2474967eda192 Author: Mark Allyn Date: Fri Feb 5 10:52:09 2010 -0800 staging: rar_register: renaming driver to rar_register Patch renames rar_driver to rar_register to clarifiy and differentiate from rar_handler that will be submitted later Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e37bcc0de040127281de13a84a608570355c20eb Author: Greg Kroah-Hartman Date: Thu Feb 11 17:15:14 2010 -0800 Staging: mimio: remove the mimio driver It turns out that Mimio has a userspace solution for this product using libusb, and the in-kernel driver is just getting in the way now and causing problems. So they have asked that the in-kernel driver be removed. As the staging driver wasn't quite working anyway, and Mimio supports their libusb solution for all distros, I am removing the in-kernel driver. The libusb solution can be downloaded from: http://www.mimio.com/downloads/mimio_studio_software/linux.asp Cc: Cc: Phil Hannent Cc: Marc Rousseau Cc: stable Signed-off-by: Greg Kroah-Hartman commit ef97e4ef156500eb1c26de57354ad685f0b6127b Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: fix coding style issues in dt3155_io.c This fixes up the sparse and coding style issues found in the dt3155_io.c file. No code is changed, only formatting and removing unused code. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit dcff74ce8b458792c1628ad9f3803fc648f94e11 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: replace u_int and u_long usage Use u32 and u64 instead, that's the proper thing to do. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 5d3921117d7c3bfec5a5877ba0be0430e2aec491 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: replace u_char usage Use u8 instead, that's the proper thing to do. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 062d164719fcbffae6e2fe5e7ba5ab68da12ce33 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:38:13 2010 -0800 Staging: dt3155: coding cleanups for dt3155_io.h This fixes up some coding style issues in the dt3155_io.h file Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit f721ad7a9c4cec5b151134b2ace164861aca0df9 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:37:25 2010 -0800 Staging: dt3155: fix build warnings This fixes the build warnings in the dt3155 driver Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit dee86e8c9279110d787da64cbca5d4bda63d93c6 Author: Greg Kroah-Hartman Date: Sun Feb 7 08:51:51 2010 -0800 Staging: comedi: ssc_dnp: fixed a brace coding style issue Fixed a coding style issue. Created during the keynote presentation at FOSDEM 2010 Signed-off-by: Greg Kroah-Hartman commit 2d2facda0b71609be294aa1fd5f56d2cdbcbb794 Author: Benjamin Adolphi Date: Sat Feb 6 16:17:06 2010 +0100 Staging: comedi: ni_pcidio: Checkpatch cleanups This fixes almost all checkpatch issues in the ni_pcidio comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 83c41dabcca05eacc5917928a3e6a3bdfefad652 Author: Benjamin Adolphi Date: Sat Feb 6 15:08:46 2010 +0100 Staging: comedi: rti802: Checkpatch cleanups This fixes all checkpatch issues in the rti802 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 0acc516aee7b1527ad125a53deff328ef29be9e6 Author: Benjamin Adolphi Date: Sat Feb 6 15:02:50 2010 +0100 Staging: comedi: dt2815: Checkpatch cleanups This fixes all checkpatch issues in the dt2815 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d3c796fd57f33a20b2ca968e0e449382397c8dba Author: Chihau Chau Date: Fri Feb 5 15:23:48 2010 -0300 Staging: samsung-laptop: fix coding style issues This fixes some lines over 80 characters coding style issues. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit e41e5d601e1c035fde488f9543c978b8ae86e1be Author: Yong Zhang Date: Fri Feb 5 21:52:40 2010 +0800 Staging: rt2860: correct onstack wait_queue_head declaration Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy Signed-off-by: Yong Zhang Cc: Greg Kroah-Hartman Cc: Bartlomiej Zolnierkiewicz Cc: Alexander Beregalov Cc: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 01823a13dca4de28ddb55b63c3334ff928b3abbc Author: Tim Schofield Date: Thu Feb 4 19:57:09 2010 +0000 Staging: rtl8192e: fix spacing style issues in r8180_93cx6.c This is a patch to the r8180_93cx6.c file that fixes up spacing issue warnings found by the checkpatch.pl tool Signed-off-by: Tim Schofield Signed-off-by: Greg Kroah-Hartman commit f4098b4f8ac65e0e44bbe579ac7d32b6e05ffa3b Author: Paul Elms Date: Thu Feb 4 08:24:28 2010 +0000 Staging: comedi: fix brace coding style in comedi_fops.c This patch to the comedi_fops.c file fixes a brace warning found by the checkpatch.pl tool Signed-off-by: Paul Elms Signed-off-by: Greg Kroah-Hartman commit 412bd046b0a1726f8b168d5056d21213932f9d84 Author: tony burrows Date: Tue Feb 2 16:52:49 2010 +0000 Staging: comedi: fix brace coding style issues in ni_labpc.c This patch fixes all of the brace style warnings found by the checkpatch.pl tool Signed-off-by: Tony Burrows Signed-off-by: Greg Kroah-Hartman commit c7e10c99565d7a4d2f4bcc37e7bccd6c8120a0a3 Author: Joe Perches Date: Mon Feb 1 23:22:14 2010 -0800 Staging: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 8455cd1bdba3331e07291c455ca70be33ff39860 Author: Richard Kennedy Date: Thu Feb 4 11:33:49 2010 +0000 Staging: wlan-ng: minor cleanups Remove iw_handle_def private initialisations as they are no longer need these. Signed-off-by: Richard Kennedy Signed-off-by: Greg Kroah-Hartman commit bc56894234e55ad53419cfda1bbfc401a8be3e46 Author: Joe Perches Date: Sun Jan 31 12:02:08 2010 -0800 Staging: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Fixed a "is tryied" / tried typo Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 7df1735bebee6d1f3492c79ab110f3a6e67e0244 Author: Benjamin Adolphi Date: Mon Feb 1 00:04:14 2010 +0100 Staging: comedi: adq12b: Checkpatch cleanups 2 This fixes all checkpatch issues in the adq12b comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 27aa7320972a130ba3cd2d4004c2568e7c40f01e Author: Benjamin Adolphi Date: Sun Jan 31 23:29:28 2010 +0100 Staging: comedi: fl512: Checkpatch cleanups This fixes all checkpatch issues in the fl512 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d8dfb3882e12539f34c6eeb01dee6f425e92e892 Author: Benjamin Adolphi Date: Sat Jan 30 13:03:20 2010 +0100 Staging: comedi: ni_65xx: Checkpatch cleanups This fixes all checkpatch issues in the ni_65xx comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit c733110ae3c49a69907b89f37ff1721a157df0f3 Author: Benjamin Adolphi Date: Sat Jan 30 12:40:29 2010 +0100 Staging: comedi: ni_670x: Checkpatch cleanups This fixes all checkpatch issues in the ni_670x comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 900b78088567d2033c58d4e2433c3d2558f56b76 Author: Benjamin Adolphi Date: Fri Jan 29 00:42:30 2010 +0100 Staging: comedi: ni_660x: Checkpatch cleanups This fixes all checkpatch issues in the ni_660x comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 94941bc805d2b77e6b548b83529b3fa5e98a3636 Author: Benjamin Adolphi Date: Fri Jan 29 00:28:46 2010 +0100 Staging: comedi: poc: Checkpatch cleanups This fixes all checkpatch issues in the poc comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit b1e68ea5e1b0829037a1dc97e8a2ef4bb6e9c91d Author: Benjamin Adolphi Date: Fri Jan 29 00:17:06 2010 +0100 Staging: comedi: pcm3730: Checkpatch cleanups This fixes all checkpatch issues in the pcm3730 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 50ae2a521f60a62dce3fedfc3046064a680a6d5e Author: Benjamin Adolphi Date: Fri Jan 29 00:16:19 2010 +0100 Staging: comedi: pcm3724: Checkpatch cleanups This fixes all checkpatch issues in the pcm3724 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 1130ebbaae8ed0dcf8be707449601f8d7dbb7538 Author: Nitin Gupta Date: Thu Jan 28 21:21:35 2010 +0530 Staging: ramzswap: Update copyright notice Update copyright notice. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit c25d75a234df36446dc0d9bb3365ab8b83374d50 Author: Nitin Gupta Date: Thu Jan 28 21:19:59 2010 +0530 Staging: ramzswap: Handle case for invalid backing swap Currently, we crash (issue BUG_ON) if backing swap disk size is zero. This can happen is user specified an extended partition or simply a bad disk as backing swap. A crash is really an unpleasant surprise to user for such trivial problems. Now, we check for this condition and simply fail device initialization if this is the case. Additional cleanups: * use static for all functions * remove extra newline between functions * memset backing_swap_name to NULL on device reset Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 2e882281742f7e483e751bbbaf6c0946b5f8513f Author: Nitin Gupta Date: Thu Jan 28 21:13:41 2010 +0530 Staging: ramzswap: Remove redundant check for zero page ramzswap_free_page() already handles the case for zero filled pages. So, remove redundant logic for the same in ramzswap_write(). Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit de1a21a0f1f614dac0d8cacc13f41e32a15bba98 Author: Nitin Gupta Date: Thu Jan 28 21:13:40 2010 +0530 Staging: ramzswap: Return proper error code on device create failure Currently, we return 0 if create_device() fails and 1 otherwise. Now, proper error code is returned from create_device() and the same is propagated as module error code from ramzswap_init(). Also added some cleanups for ramzswap_init(), improving function structure. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 5d83d5a0b5ee332b724978d657c0af17f14e807e Author: Nitin Gupta Date: Thu Jan 28 21:13:39 2010 +0530 Staging: ramzswap: Set block size to PAGE_SIZE ramzswap block size needs to be set equal to PAGE_SIZE to avoid receiving any unaligned block I/O requests (happens due to readahead logic during swapon). These unaligned accesses produce unnecessary I/O errors, scaring users. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 7eef7533909f3ea50e8b375777242f778e8da11e Author: Nitin Gupta Date: Thu Jan 28 21:13:38 2010 +0530 Staging: ramzswap: Flush block device before reset Make sure we flush block device before freeing all metadata during reset ioctl. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 6a90772886d5d6812f9b2775d3caa0dc002754e0 Author: Nitin Gupta Date: Thu Jan 28 21:13:37 2010 +0530 Staging: ramzswap: Use lock for 64-bit stats 64-bit stats corruption was observed when ramzswap was used on SMP systems. To prevent this, use separate spinlock to protect these stats. Also, replace stat_*() with rzs_stat*() to avoid possible conflict with core kernel code. Eventually, these will be converted to per-cpu counters if this driver finds use on large scale systems and this locking is found to affect scalability. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 1994130e4f881696aad562429fbbafeb73418e5a Author: Larry Finger Date: Mon Jan 25 13:11:49 2010 -0600 Staging: r8187se: Fix a faulty if and do additional cleanups Cleanup the driver and fix a faulty if statement. Signed-off-by: Larry Finger Tested by: Bernhard Schiffner Signed-off-by: Greg Kroah-Hartman commit e501b36bdf85212d537b30babf60dfedf3fdcebd Author: d binderman Date: Tue Jan 26 10:00:25 2010 +0000 Staging: otus: fix memory leak Fix memory leak in drivers/staging/otus Signed-off-by: David Binderman commit 411a861fc4f92cf0f5039928b448dcc7ca31d423 Author: Himanshu Date: Sat Jan 23 17:52:02 2010 +0530 Staging: usbip: Seperate usbip config debug from CONFIG_USB_DEBUG Signed-off-by: Himanshu Signed-off-by: Greg Kroah-Hartman commit a439f5bff51d3e0c93d61ee6886b9dbf29a03da9 Author: Himanshu Chauhan Date: Sat Jan 23 10:36:56 2010 +0530 Staging: usbip: Remove dead code This patch removes the dead uncompiled code in usbip_common.c Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit aad86577b829be29048e0a692e1c28c3ffeda6ca Author: Himanshu Chauhan Date: Sat Jan 23 02:52:41 2010 +0530 Staging: usbip: use print_hex_dump() instead of open coding it. Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit 1e5065dbd6fe53b46d8281db7b4286751dcf607a Author: Himanshu Chauhan Date: Sat Jan 23 01:51:57 2010 +0530 Staging: usbip: minor code cleanup Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit 22e0967f72494564e416b157568ed5876666ad26 Author: Alan Cox Date: Mon Jan 18 15:35:35 2010 +0000 Staging: et131x_kill MAC_STAT_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit bd03d0d5bc253533a6d169a82f56626d552d9471 Author: Alan Cox Date: Mon Jan 18 15:35:30 2010 +0000 Staging: et131x: kill off the rxmac ctrl type Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit fef5ba3ae9760fdc2688b7160fa056e7ef2700bb Author: Alan Cox Date: Mon Jan 18 15:35:24 2010 +0000 Staging: et131x: kill the rxmac ERROR_REG_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dcb0789bb344b76fdeb32876f1e498a5cd19ecc1 Author: Alan Cox Date: Mon Jan 18 15:35:19 2010 +0000 Staging: et131x: Kill MIF_CTL_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 370d52acf7f2a8f4fccbf9fa49defd6e364ae1f3 Author: Alan Cox Date: Mon Jan 18 15:35:13 2010 +0000 Staging: et131x: Kill the SPACE_AVAIL type Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f7ae1957cac1388e7bbe070b13a5f5f5a98107d2 Author: Alan Cox Date: Mon Jan 18 15:35:08 2010 +0000 Staging: et131x: Kill off the rxq_diag types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 287acb63a593c9872005824d6866937617624668 Author: Alan Cox Date: Mon Jan 18 15:35:02 2010 +0000 Staging: et131x: Kill of the MCIF types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b186f33137a124b3d10bcd7b9b35d76247b82014 Author: Alan Cox Date: Mon Jan 18 15:34:57 2010 +0000 Staging: et131x: kill off RXMAC_PF_CTRL_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 70a29a24088211369169b6285f33795be4d3a616 Author: Alan Cox Date: Mon Jan 18 15:34:51 2010 +0000 Staging: et131x: Kill rxmac crc fields More we don't need Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit afa7e5ec93b4e9e991fd3feb0bda2589f785e357 Author: Alan Cox Date: Mon Jan 18 15:34:46 2010 +0000 Staging: et13x: kill off TXMAC_ERR_INT_t This completes the structures within the txmac block so we can now propogate a name change and type removal up a layer and clean up TXMAC as well Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 003e52e85b1cf04c0bccc70c124d67aea3036fda Author: Alan Cox Date: Mon Jan 18 15:34:40 2010 +0000 Staging: et131x: Kill off the TXMAC_ERR_t type This is another one we don't really need to do much to get rid of Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1cb180dc9dadf7739fe5bf9a8f159097abb67590 Author: Alan Cox Date: Mon Jan 18 15:34:35 2010 +0000 Staging: et131x: kill txmac err count typedef Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6720949d55623cb8c4cb6b06f218d8be68780a6f Author: Alan Cox Date: Mon Jan 18 15:34:29 2010 +0000 Staging: et131x: Kil the txmac type Only used for one trivial thing so turn that into something trivial instead Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 69ea5fcb5e33b785f3f554db0ab0c2694da3f22f Author: Alan Cox Date: Mon Jan 18 15:34:24 2010 +0000 Staging: et131x: Collapse all the function definitions into one place We have lots of tiny files right now that could be one Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ec7d9f61012b9ab902810d63c4b5a7c796e4ceed Author: Alan Cox Date: Mon Jan 18 15:34:18 2010 +0000 Staging: et131x: Kill unused error defines Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f1471660df8e88fa7840459e3ea28ac1f3187296 Author: Alan Cox Date: Mon Jan 18 15:34:13 2010 +0000 Staging: et131x: kill MP_ERR_COUNTERS which is unused Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8f12785dd008f4ad94e3c9aad00517e082563935 Author: Alan Cox Date: Mon Jan 18 15:34:07 2010 +0000 Staging: et131x: Kill off RX_RING_t This completes the typedef clean up of the rx specific structures, although there is plenty do on field names and the like Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4ba64c1ba5f26a445255dd7684c175e298d84d07 Author: Alan Cox Date: Mon Jan 18 15:34:02 2010 +0000 Staging: et131x: clean up the pkt_desc_stat_t types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8a66278cf91c9b0bfedd70865954d5fccba02237 Author: Alan Cox Date: Mon Jan 18 15:33:56 2010 +0000 Staging: et131x: Clean up the fbr lookup table All the subtypes are sane so just turn it into something struct and linux like Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 07563ac691c284a5b9402556a270b8cc14164ff8 Author: Alan Cox Date: Mon Jan 18 15:33:51 2010 +0000 Staging: et131x: Fix rx_status typing Use the proper pointer types for the higher level pointers to the rx_status object and kill casts Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f926d216502c55e3d1089e5845045d0c16004428 Author: Alan Cox Date: Mon Jan 18 15:33:45 2010 +0000 Staging: et131x: rx_status_block_t is now clean So kill off the top level type and turn it into a struct Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c9a8ad187a67da5892ff1155960cd14912c49efb Author: Alan Cox Date: Mon Jan 18 15:33:40 2010 +0000 Staging: et131x: kill off the rx interrupt state enum Another verbose enum we don't need Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 61aa21f208314496c4fa6c28c4a96c610831ed5e Author: Alan Cox Date: Mon Jan 18 15:33:34 2010 +0000 Staging: et131x: Clean up the rx status word types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dc26ffc7729e5a35c7019a6fb7d306005fdae518 Author: Alan Cox Date: Mon Jan 18 15:33:29 2010 +0000 Staging: et131x: Kill MAC_STAT_t All the contents of this type are now clean, so kill the top level type as well Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 461e0e8b15864b2f8d7b13a5bf86acf40d7a6fd6 Author: Alan Cox Date: Mon Jan 18 15:33:23 2010 +0000 Staging: et131x: Kill off MMC_t The contents of MMC_t are clean so kill off the MMC_t typedef Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 060a78a07a06d78e64a00a25f4a4a7d5fe7402d1 Author: Alan Cox Date: Mon Jan 18 15:33:18 2010 +0000 Staging: et131x: Kill off TXDMA_t All the contents are clean so kill off the top level typedefs Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2b903327d34a48250da3f559a8906f3a55db9901 Author: Alan Cox Date: Mon Jan 18 15:33:12 2010 +0000 Staging: et131x: GLOBAL_t is now sane so kill the GLOBAL_t itself Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 254472ac59e2298fe3af9edafe291439e7756645 Author: Alan Cox Date: Mon Jan 18 15:33:07 2010 +0000 Staging: et131x: kill EXP_ROM This is another unused type for the bin Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 61d5ed8c62fcceba08812f176de233ea7c78f5da Author: Alan Cox Date: Mon Jan 18 15:33:01 2010 +0000 Staging: et131x: Kill off the rxdma type We have a clean struct of this now so turn the top level typedefs into a struct Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1bd751c1abc1029e8a0ae63ef4f19357c735a2a3 Author: Alan Cox Date: Mon Jan 18 15:32:55 2010 +0000 Staging: et131x: Clean up rxdma_csr This is another set of flags as typedef that can be cleaned up. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 13a79c697f737c19b5dd2f642374d9f289f9b830 Author: Alan Cox Date: Mon Jan 18 15:32:50 2010 +0000 Staging: et131x: fbr_desc is now only sane types Clean up the typdef for fbr_desc itself so we know it is done Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7d9e15eb31debad09ef055290d04e162998b766f Author: Alan Cox Date: Mon Jan 18 15:32:44 2010 +0000 Staging: et131x: kill of FBR_WORD2 This is only used meaningfully as a definition, we never mask and fetch the bits apart Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 09b25c6fa36ea3c961e75cede0f86f1fed5c33b5 Author: Alan Cox Date: Mon Jan 18 15:32:39 2010 +0000 Staging: et131x: kill off the FBR_NUM_DES type This is another 10 bit value with the high bits clear, and where the type doesn't get used anywhere properly anyway Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 5fe68019c600ac0b92475654cbee66208dddb800 Author: Dave Airlie Date: Wed Jan 20 17:29:10 2010 -0500 Staging: crystalhd: fix build on powerpc Add necessary include to fix build on PowerPC Signed-off-by: Dave Airlie Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit cffd4e16cd6e5893148c31f86d1b48db10b64baa Author: Dan Carpenter Date: Mon Jan 18 14:23:20 2010 +0300 Staging: rtl8187se: fix if statement I removed a misplace semicolon. It is clear from the indentation that TxPwrTracking87SE() was only supposed to be called if CheckTxPwrTracking() returned true. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c22202faade08b6b45f14fd86bfb57f79d73464c Author: Ben Hutchings Date: Mon Jan 18 03:25:56 2010 +0000 Staging: rt{2860,2870}sta: Use request_firmware() to load firmware When originally introduced into staging, these drivers had custom firmware-loading code which checked a version number and CRC at the end of each blob. This reintroduces those checks, using crc-ccitt instead of custom code. The removed firmware will be added to the linux-firmware.git repository. Based on work by Darren Salt . Signed-off-by: Ben Hutchings Tested-By: Darren Salt Signed-off-by: Greg Kroah-Hartman commit 8838d2560a8ccbc5e03688d55bf075793b36a04e Author: Ben Hutchings Date: Mon Jan 18 02:50:24 2010 +0000 Staging: rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite() These functions do not modify the data they are passed. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 35f077dca73132dcac2cac1706417229a68f38c3 Author: Roel Kluin Date: Sun Jan 17 16:50:10 2010 +0100 Staging: serqt_usb2: Two branches the same in qt_set_termios() Regardless of the condition, the branches executed the same code Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit a2c3fdb996a926a45622428405a042f011eb03ba Author: Roel Kluin Date: Sun Jan 17 16:44:37 2010 +0100 Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan() Regardless of the condition, the branches execute the same code Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 57ac827c9b17f2cc2f0f86c4fd43c3597c40253c Author: Ian Abbott Date: Wed Jan 20 13:04:51 2010 +0000 Staging: comedi: pcl818: Remove unneeded chanlist_len check For AI command testing, the driver does not need to range-check the length of the channel list as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 64a1f7bd56e0f26bd4dd621805facffde9fbb0a3 Author: Ian Abbott Date: Wed Jan 20 13:04:50 2010 +0000 Staging: comedi: pcl816: Check channel list in AI command test Check the channel list is valid in step 5 of the AI command test. Split function check_and_setup_channel_list() in two. Also, remove unnecessary chanlist_len tests in step 3 of the AI command test as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit c203b521e64e062d94f1ced1510206c0a55d5b55 Author: Ian Abbott Date: Wed Jan 20 13:04:49 2010 +0000 Staging: comedi: pcl812: Update MUX for multi-channel AI command For multi-channel AI commands, the interrupt handler is missing code to switch to the next channel. Add some (untested) code to handle this. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 8f87b832dea11dd00f6a30aaaf934c5c93556cfe Author: Ian Abbott Date: Wed Jan 20 13:04:48 2010 +0000 Staging: comedi: adv_pci1710: Remove unneeded chanlist_len check For AI command testing, the driver does not need to range-check the length of the channel list as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 61283d227c6b39e30afc6346db099521b0b64fa1 Author: Ian Abbott Date: Wed Jan 20 13:04:47 2010 +0000 Staging: comedi: adv_pci1710: Correct AI scan count and channel checks For AI commands, the internal channel list used to check incoming data was only set up partially if the channel list contained repeats. Set it up fully. Also the current scan position was not updated properly when moving a block of data from the FIFO unless a whole number of scans was moved. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit b3559cb1aa5f863e1ce9b94b518be7ddf6680e45 Author: Ian Abbott Date: Wed Jan 20 13:04:46 2010 +0000 Staging: comedi: pcl818: Correct AI scan counting and channel checks For AI commands, the scan counter should be updated after every scan. It was being updated after every sample except for DMA mode where it was being updated after every repeated segment of the channel list. Also AI commands with multiple channels were being terminated with an error prematurely except in DMA mode. This was because the driver was comparing channel numbers received from the hardware (combined with the sample value) with the expected channel numbers to check for a "channel dropout". This test was failing incorrectly because the driver was not keeping the current position within the (repeated segment of the) channel list up to date. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 13de4f000ec491b16a820e4ed59de2c98b7807be Author: Ian Abbott Date: Wed Jan 20 13:04:45 2010 +0000 Staging: comedi: pcl816: Correct AI scan counting For AI commands, the scan counter should be updated after every scan. In DMA mode, it was being updated after every repeated segment of the channel list. In non-DMA mode, it was being updated after every sample. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 7edfa10689615255e65909bb893fd8f8620cff92 Author: Ian Abbott Date: Wed Jan 20 13:04:44 2010 +0000 Staging: comedi: pcl812: Correct AI scan counting The AI scan counter should be updated after every completed scan, not after every channel. Keep track of current channel. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 6c381c5775ea5eb799bdc790dd6d6d43fe966134 Author: Roel Kluin Date: Tue Jan 19 21:46:48 2010 +0100 Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register() Read from the right status register Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 615d5b6c56ff6bfd6ae223e99df26cf28d55f566 Author: Benjamin Adolphi Date: Mon Jan 18 22:32:07 2010 +0100 Staging: comedi: pcl730: Checkpatch cleanups This fixes all checkpatch issues in the pcl730 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit acb60e915a68c44757e12c45a8cede11339b6172 Author: Benjamin Adolphi Date: Mon Jan 18 12:57:42 2010 +0100 Staging: comedi: pcl725: Checkpatch cleanups This fixes all checkpatch issues in the pcl725 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 186539192c37c0ebe95ddac341cf7e037b096966 Author: Benjamin Adolphi Date: Mon Jan 18 12:48:16 2010 +0100 Staging: comedi: pcl724: Checkpatch cleanups This fixes all checkpatch issues in the pcl724 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 266bfbdd3eb7f080612977f22055c82b951b179e Author: Benjamin Adolphi Date: Sat Jan 16 18:58:58 2010 +0100 Staging: comedi: pcl711: Checkpatch cleanups This fixes some checkpatch issues in the pcl711 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit f51f90300010937bc9a2455cef88366448a6e718 Author: Julia Lawall Date: Sat Jan 16 16:59:22 2010 +0100 Staging: go7007: Eliminate useless code The variable s is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 79a22d5c264f5ddfc8573aa7eb234fe62dd1ee32 Author: Benjamin Adolphi Date: Fri Jan 15 18:03:35 2010 +0100 Staging: comedi: rti800: Checkpatch cleanups This fixes some checkpatch issues in the rti800 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 23d53b1768f9396d0e259a9b4e62bfcc03122bab Author: Benjamin Adolphi Date: Fri Jan 15 17:37:47 2010 +0100 Staging: comedi: c6xdigio: Checkpatch cleanups This fixes some checkpatch issues and some spelling mistakes in the c6xdigio comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d2e01434fd9c01687a7cace957f182594cccc829 Author: Benjamin Adolphi Date: Fri Jan 15 12:08:01 2010 +0100 Staging: comedi: adq12b: Checkpatch cleanups This fixes some checkpatch issues in the adq12b comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 0289bb5d18ad57e23a7be681857f070980c66790 Author: Roel Kluin Date: Thu Jan 14 21:25:56 2010 +0100 Staging: rtl8192u: ieee80211: CurrentMPDUDensity assigned to itself in HTUseDefaultSetting() CurrentMPDUDensity was designed to itself. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 3af805735a2538c38ec16014f19d19030544aaef Author: Wu Zhangjin Date: Wed Jan 6 16:33:10 2010 +0800 staging: sm7xx: remove the buggy 2D acceleration support When scrolling the screen on the console with the 2D acceleration support, the whole system may hang. for example, when copying some files from another machine to YeeLoong netbook with the sm7xx video driver via scp and when the screen output is enabled, the system may hang. Before the bug is fixed, remove the 2D acceleration! Signed-off-by: Wu Zhangjin Cc: Teddy Wang Signed-off-by: Greg Kroah-Hartman commit d5a2ffd8e8d602293339f69180aff8914c454d83 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:59 2010 +0100 staging: fix typos "couter" -> "counter" This patch was generated by git grep -l 'couter' drivers/staging | xargs -r perl -p -i -e 's/couter/counter/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9d220c6b54f3d0b141846321814ec1c4e4fbdc67 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:58 2010 +0100 staging: fix typos "aquire" -> "acquire" This patch was generated by git grep -E -i -l '[Aa]quire' drivers/staging | xargs -r perl -p -i -e 's/([Aa])quire/$1cquire/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit a82fd70197e1e59d2127e5536d6a1d502699528d Author: Uwe Kleine-König Date: Tue Jan 12 15:57:57 2010 +0100 staging: fix typos "selct" -> "select" This patch was generated by git grep -E -i -l 's(le|el)ct' drivers/staging | xargs -r perl -p -i -e 's/([Ss])(le|el)ct/$1elect/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 1832664ae124df0c58dc26985e4963b2c39b6b05 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:56 2010 +0100 staging: fix typos "enalbe" -> "enable" This patch was generated by git grep -E -l 'enalbe' drivers/staging | xargs -r perl -p -i -e 's/enalbe/enable/g' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9f64859208f3a56f33f2e893e11df585768f1705 Author: Andy Shevchenko Date: Thu Jan 14 15:07:23 2010 +0200 staging: wlags49: don't use custom implementation of atoi() Kernel has its own method called simple_strtoul() to do such things. Here we are using simple_strtoul(value, NULL, 0) because in original function the recognized base is 10 or 16 and input data is assumed to be unsigned. Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman commit e4c3a24dc5c318e57e5295a54f03eb8ae54d9ffa Author: Ben Hutchings Date: Wed Jan 13 23:36:46 2010 +0000 Staging: sep: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 4401e8243d2e02a991a475eea11885a56f854f69 Author: Ben Hutchings Date: Wed Jan 13 23:36:27 2010 +0000 Staging: sep: include driver name in firmware filenames The current names "cache.image.bin" and "resident.image.bin" are far too generic. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 5d929a71908968905331cda0d52c44570d402110 Author: Ben Hutchings Date: Wed Jan 13 23:36:09 2010 +0000 staging: declare MODULE_FIRMWARE in various drivers Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 32dbb67138fdb8cefa348d29850eb9a9ce964e09 Author: Pavel Vasilyev Date: Mon Jan 11 21:08:02 2010 +0300 Staging: dream: HTC Dream camera, not need sizeof http://bugzilla.kernel.org/show_bug.cgi?id=14825 sizeof(extlen), always will be sizeof( unit32_t) or 4 It seems that something is wrong?!?! Signed-off-by: Pavel Vasilyev Signed-off-by: Greg Kroah-Hartman commit 362f46e3ab6ee4fc771da55067921c39dd13877d Author: Jeff Mahoney Date: Mon Jan 11 10:54:31 2010 -0500 Staging: vme/tsi148: Depend on VIRT_TO_BUS This driver depends on virt_to_bus working correctly, but it doesn't exist on ppc64 (and probably other arches). Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 23639126523b274e094515b609c987e927284920 Author: Jeff Mahoney Date: Mon Jan 11 10:54:30 2010 -0500 Staging: otus: fix assignment makes integer from pointer without a cast warnings This patch fixes some %x pointer printing to %p. It also uses the skb_tail_pointer and skb_mac_header macros for accessing thos members. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit ab59186c7545dcffbeda8a78b75bfcdb14c4566d Author: Jeff Mahoney Date: Mon Jan 11 10:54:29 2010 -0500 Staging: rtl8192u: dont use -mhard-float rtl8192u uses -mhard-float, which doesn't exist on ia64. Since in-kernel floating-point isn't allowed, this is implied anyway. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 1c7ec2e8e0fb6e8acda4f6b9a682cf7f8e650e2f Author: Jeff Mahoney Date: Mon Jan 11 10:54:27 2010 -0500 Staging: rtl8192e: Use skb_tail_pointer rtl8192e uses skb->tail directly. This patch uses the tail pointer macros instead. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 53cf8743d227283e78c27ada407b506014c9223d Author: Jeff Mahoney Date: Mon Jan 11 10:54:25 2010 -0500 Staging: rt2860: Use skb_tail_pointer rt2860 uses skb->tail directly. This patch uses the tail pointer macros instead. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 3bf040c75294ad9470b11902477e2c07af2031bd Author: Minchan Kim Date: Mon Jan 11 16:15:53 2010 +0900 Staging: ramzswap: Free memory when create_device is failed If create_device is failed, it can't free gendisk and request_queue of preceding devices. It cause memory leak. This patch fixes it. Signed-off-by: Minchan Kim Acked-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit b76a32638d9d7d6b421fccce02e667007509bd7b Author: Németh Márton Date: Sun Jan 10 00:18:41 2010 +0100 staging: make i2c device id constant The id_table field of the struct i2c_driver is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit a457732b836b970c82c7ba35b4cfc938c9c543f9 Author: Németh Márton Date: Sun Jan 10 00:18:34 2010 +0100 staging: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 13ac58dac0c6b1edeb060102049b07ebceea9a40 Author: Németh Márton Date: Sun Jan 10 00:18:26 2010 +0100 staging: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 75b16013e29f6058e5bd648e6f4a9c03d262cf4f Author: Jonathan Cameron Date: Sat Jan 9 17:01:33 2010 +0000 staging: iio: Fix incorrect existence check for a shared event pointer. A second smatch detected error. First part fixes in a typo in the comment directly above that I noticed whilst trying to remember what this code actually does. Second part is the actual fix. I'm fairly amazed this one never caused trouble in testing as it is in one of the most common paths. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 75c8075394906b4bda4b056328bd9b401277d9b8 Author: Jonathan Cameron Date: Sat Jan 9 16:57:34 2010 +0000 staging: iio: Ensure mutex is correctly unlocked in __iio_push_event This error was picked up by running the smatch static checker over all the IIO subsytem. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0daa04a586f03de8f9022e29fb41c9dc0de28c4a Author: Simon Horman Date: Tue Jan 12 11:50:09 2010 +1100 Staging: otus: zfTkipInit(): increment another pointer Increment the pointer rather than its value. These appear to be logic errors. Thanks to Dan Carpenter for the first hunk of this change. Cc: Dan Carpenter Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit e36e8c0add960eb523a8a1bc93c7efa744339415 Author: horms@vergenet.net Date: Fri Jan 8 18:57:52 2010 +1100 Staging: otus: Fix ZM_SEQ_DEBUG macro for no-debug case tcp_seq is only initialised in case where ZM_ENABLE_PERFORMANCE_EVALUATION is defined. So move the call to ZM_SEQ_DEBUG() and the decleration of tcp_seq in there too. This allows ZM_SEQ_DEBUG() to be removed from the non-ZM_ENABLE_PERFORMANCE_EVALUATION case in the header file. This resolves several compile warnings for the non-ZM_ENABLE_PERFORMANCE_EVALUATION case. However, the ZM_ENABLE_PERFORMANCE_EVALUATION case seems to be completely broken. $ gcc (Debian 4.4.2-8) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/otus/80211core/cagg.c: In function 'zfAggRxEnabled': drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of comma expression has no effect drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of comma expression has no effect drivers/staging/otus/80211core/cagg.c:1872: warning: statement with no effect ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 3db96cd871e7cfea6e671b262a8ef661b27dadf1 Author: horms@vergenet.net Date: Fri Jan 8 18:57:51 2010 +1100 Staging: otus: remove unused constants Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d74385fd9c81d2168aa3a556abcc55f5e1558626 Author: horms@vergenet.net Date: Fri Jan 8 18:57:50 2010 +1100 Staging: otus: remove unused variables Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d027936949b839a858cd822975491e19ec316621 Author: horms@vergenet.net Date: Fri Jan 8 18:57:49 2010 +1100 Staging: otus: dont mix declarations and code $ gcc (Debian 4.4.2-8) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/otus/ioctl.c: In function 'usbdrv_wpa_ioctl': drivers/staging/otus/ioctl.c:2253: warning: ISO C90 forbids mixed declarations and code ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 90d49b4f32c243215c0620162e6cae6af980047c Author: Jarod Wilson Date: Thu Jan 7 18:37:36 2010 -0500 staging: crystalhd: trim register defines We don't actually need most of the register defines to build, and most of the ones we don't need aren't currently interesting. We'll leave a full copy of all of them in libcrystalhd's source, and only include what we need and/or think might be interesting in the driver. Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit 88d43000098017d93d9bb2f88d33950e6c7a6bf4 Author: Jarod Wilson Date: Thu Jan 7 18:35:58 2010 -0500 staging: crystalhd: add missing fixes for userspace lib build I somehow managed to not actually include these two fixes in the submission that was committed to the staging tree. libcrystalhd should eventually be built against the kernel-provided header, and needs the stdint.h include. The VOID bit is to keep things in sync with the Mac OS X driver and library that Scott Davilla is also working on. Signed-off-by: Scott Davilla Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit 8a8e29752dfdba014b866d3c587d3409e57263dd Author: Peter Huewe Date: Thu Jan 7 21:21:35 2010 +0100 Staging: wlan-ng: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the p80211wext.c fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Cc: stable [2.6.33 only] Signed-off-by: Greg Kroah-Hartman commit 733acf902fbafb6571fce45ee77b1516aaae1bc6 Author: Peter Huewe Date: Fri Jan 8 09:10:13 2010 +0100 Staging: rtl8192u: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the driver fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 95702ef05b9b6554c2669bdb9a6121af9f034171 Author: Peter Huewe Date: Fri Jan 8 09:09:12 2010 +0100 Staging: otus: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the driver fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 0df28be06e08b9a53c26a53974bf3afea4928b3e Author: Peter Huewe Date: Thu Jan 7 19:57:36 2010 +0100 Staging: asus_oled: Add NULL test for kmalloc This patch adds a NULL test to check wether kmalloc was successful or not. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit c424d46fdc79df201707fe815aa8480751918025 Author: Alexander Beregalov Date: Thu Jan 7 03:21:48 2010 +0300 staging: cx25821: avoid NULL pointer dereference Assign dev only if fh is not NULL. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 267c39c918cd0c239148a281d51693f47d2e1e54 Author: Roel Kluin Date: Wed Jan 6 23:27:47 2010 +0100 Staging: v56655: add missing parentheses (in comment) `!' has a higher precedence than `&' so parentheses are required. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 9d4682d070e1f90f75cb27dd44d9cc7ab79577f1 Author: Andrew Lunn Date: Wed Jan 6 07:30:48 2010 +0100 Staging: batman-adv: Update the README for mainline usage. The module now only compiles inside mainline, so remove the comments about different versions of the kernel it can be used with. Also update comments about building with debug enabled and how to use the VIS data now that it no longer natively outputs dot or JSON. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 182374a0bddeef46769d2f8ab56fcccc433b96f3 Author: Evgeniy Polyakov Date: Wed Feb 3 01:04:30 2010 +0300 Staging: Fixed pohmelfs regression because of per-bdi writeback. Since pohmelfs isn't tied to a single block device, it needs to setup a backing dev like nfs/btrfs/etc do. Signed-off-by: Jens Axboe Signed-off-by: Evgeniy Polyakov Cc: stable Signed-off-by: Greg Kroah-Hartman commit e3c0acf44d837d3095ab8222d3271f9ba0d3db44 Author: Dan Carpenter Date: Fri Jan 8 14:51:50 2010 +0300 Staging: pohmelfs: avoid null dereference err_out_put is for when the netfs_trans_alloc() succeeded. Signed-off-by: Dan Carpenter Acked-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 0c14c06cc18bc0d7f968d0bf1e531bcb8ced387d Author: Joe Perches Date: Tue Jan 5 17:20:14 2010 -0800 Staging: pohmelfs: Remove uses of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 74e1cd4555c7b8d2fe9de657658f92f859427025 Author: Alan Cox Date: Mon Jan 4 16:25:02 2010 +0000 Staging: sep: Fix use of legacy ioctl fop SEP doesn't need lock_kernel. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit db376005ab4abe4a57fd96c8e007cf5d3b2e22bf Author: Alan Cox Date: Mon Jan 4 16:24:47 2010 +0000 Staging: sep: Fix build problems from header changes Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 274350fe401474d0c30cd10bbad74b5dbf34f4fe Author: Roel Kluin Date: Thu Dec 31 13:28:32 2009 +0100 Staging: otus: 80211core: Fix &&/|| confusion This always evaluates to true. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit f3557cc180b73308048867b591111df6436987ff Author: Benjamin Adolphi Date: Thu Dec 31 21:54:46 2009 +1300 Staging: rar: Fix all coding style issues. This fixes all coding style issues and some spelling mistakes. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 88e05d854cbbd583d528be9295a74586f920492b Author: Dan Carpenter Date: Wed Dec 30 18:10:18 2009 +0200 Staging: rtl8192su: buffer overflow in r8192U_core.c There was a buffer overflow in the original code. rf_path was 2 and it should have been only 0 or 1. I don't have the hardware for this, so I can't test it. Looking at the code, there are two almost identical sections for updating the hal variables. The first one was clearly wrong and had the array overflow as well. The second one looked correct. I decided to use the second section as is except for whitespace changes. The differences between the two original sections: 1) The second one had more debug output. 2) The second one looped over rf_path instead of corrupting data. 3) The second one had these additional assigments. if (rf_path == 0) { priv->TxPowerLevelOFDM24G[i] = priv->RfTxPwrLevelOfdm1T[rf_path][i] ; priv->TxPowerLevelCCK[i] = priv->RfTxPwrLevelCck[rf_path][i]; } Signed-off-by: Dan Carpenter Cc: Jerry chuang Signed-off-by: Greg Kroah-Hartman commit 00367a6d7caae9c6b077e177aeebad5b0a91ea62 Author: H Hartley Sweeten Date: Mon Dec 28 19:38:22 2009 -0500 Staging: vt6655/device_main.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: Forest Bond Signed-off-by: Greg Kroah-Hartman commit 6756993bafb436af088dacdef92b756f5f96134e Author: H Hartley Sweeten Date: Mon Dec 28 19:33:17 2009 -0500 r8192U_core.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman commit 820793c396846e5885b0d28c68512d08b5cb77cf Author: H Hartley Sweeten Date: Mon Dec 28 19:28:11 2009 -0500 Staging: r8192E_core.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman commit 28a2333413b2fbb74b35d55e1dd8c349dc825a16 Author: H Hartley Sweeten Date: Mon Dec 28 19:21:34 2009 -0500 Staging: et131x_netdev.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: Olaf Hartmann Signed-off-by: Greg Kroah-Hartman commit 1c7e4a7c326c916918b5a29051db4f93973e775a Author: Dan Carpenter Date: Mon Dec 28 19:01:34 2009 +0200 Staging: otus: off by one in usbdrvwext_siwessid() A 33 char ESSID is too long and it could cause a buffer overflow a couple lines below when we put a NULL terminator on the end. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ed30013207ef3e36da4f39db1298ae53f799e29c Author: Dan Carpenter Date: Mon Dec 28 19:00:24 2009 +0200 Staging: cx25821: off by one in cx25821_enum_input() The INPUT(n) macro indexes an array of size 2. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 7a02f549fcc30fe6be0c0024beae9a3db22e1af6 Author: Dan Carpenter Date: Mon Dec 28 18:59:46 2009 +0200 Staging: cx25821: fix double unlock in medusa_video_init() medusa_set_videostandard() takes the lock but it always drops it before returning. This was found with a static checker and compile tested only. :/ Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 4b2ba24399cfcd7c80a20cd3bbedc5df0ebd4345 Author: Dan Carpenter Date: Mon Dec 28 18:59:01 2009 +0200 Staging: comedi: reorder check in pcmmio_attach() The check for dio_num_asics is used to determine if there is more than 1 irq. If it is false then irq[1] is past the end of the array. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 5d3aed742498ffe5692e3f974f3f7ea0e99a93bb Author: Dan Carpenter Date: Mon Dec 28 18:57:51 2009 +0200 Staging: comedi: off by one in doDevConfig() Changed > to >= to avoid array overflow. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ef4ffb7ade54f7669172cf5cead69695e588c06a Author: C yp Date: Wed Jan 6 13:42:00 2010 +0100 Staging: ramzswap: Minor spelling fixes Also removed an extra semicolon. Signed-off-by: Cyp Cc: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 2141ec629c9c9a70c905cfebcc8fa69373dd982a Author: Simon Horman Date: Thu Dec 24 22:42:31 2009 +1100 Staging: dt3155: remove compat code Remove compatibility code as this is not an older version of the kernel. Signed-off-by: Simon Horman Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit cf137d5c49379c5f05fba40baf1535b611410ec0 Author: Simon Horman Date: Wed Dec 23 19:54:54 2009 +1100 Staging: rtl8192su, rtl8192u: use min_t() in store_debug_level() sizeof() returns a size_t but the other types involved are unsigned long, so using min() results in a warning. As sizeof() is called on an 11 character buffer defined immediately above unsigned long is obviously wide enough for the result. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 27b93f80e47a49a0584a4c8fb58bc44f9e026256 Author: Simon Horman Date: Wed Dec 23 19:54:53 2009 +1100 Staging: rtl8192e: remove some functions from the __exit section ieee80211_crypto_tkip_exit(), ieee80211_crypto_deinit() and ieee80211_crypto_ccmp_exit() are called by ieee80211_rtl_init() which are in section __init, so they can't be in section __exit. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 9bfafe825d0af5f4cbb2aaaecad0cf9a459cf6b1 Author: Simon Horman Date: Wed Dec 23 19:54:52 2009 +1100 Staging: rtl8192e: print the elements of tx_pn and rx_pn not the arrays themselves Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit db15438cd5be7380cdf27c8adb8fc71a72da0210 Author: Simon Horman Date: Wed Dec 23 19:54:51 2009 +1100 Staging: rt2870: Remove unnecessary forward declarations Remove unnecessary forward declaration of rtusb_probe() and rtusb_disconnect() Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit c33c2065fc4d424e23547b58900ded5eb4444e9d Author: Simon Horman Date: Wed Dec 23 19:54:50 2009 +1100 Staging: rt2870: rtusb_probe() should be in section __devinit $ make CONFIG_DEBUG_SECTION_MISMATCH=y WARNING: drivers/staging/rt2870/rt2870sta.o(.text+0x2f4c5): Section mismatch in reference from the function rtusb_probe() to the function .devinit.text:rt2870_probe() The function rtusb_probe() references the function __devinit rt2870_probe(). This is often because rtusb_probe lacks a __devinit annotation or the annotation of rt2870_probe is wrong. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 6910dadf3f11254bc0af79f578c7228b4e1334ac Author: Simon Horman Date: Thu Dec 24 22:41:13 2009 +1100 Staging: DT3155: Use pci_get_device() The use of pci_find_device() is deprecated. Signed-off-by: Simon Horman Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit c22090facd354749cfe99a46e903449c7ac07788 Author: Greg Kroah-Hartman Date: Thu Feb 25 16:43:15 2010 -0800 Staging: hv: match on DMI values to know if we should run. The HV core mucks around with specific irqs and other low-level stuff and takes forever to determine that it really shouldn't be running on a machine. So instead, trigger off of the DMI system information and error out much sooner. This also allows the module loading tools to recognize that this code should be loaded on this type of system. Cc: Haiyang Zhang Cc: Hank Janssen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9a775dbd4e8c87b7d35549183145321c7205404e Author: Greg Kroah-Hartman Date: Thu Feb 25 16:42:10 2010 -0800 Staging: hv: add a pci device table This allows the HV core to be properly found and autoloaded by the system tools. It uses the Microsoft virtual VGA device to trigger this. Cc: Haiyang Zhang Cc: Hank Janssen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 0fa37b1ee936811c8aa8fcb72d189d02cf1575b9 Author: Chris Nicholson Date: Sat Feb 20 20:36:23 2010 +0000 Staging: hv: fix brace coding style issue in Channel.c This is a patch to the Channel.c file that fixes up a brace warning found by checkpatch.pl Signed-off-by: Chris Nicholson Signed-off-by: Greg Kroah-Hartman commit f916a34dc066c13ff2c8986657634cef06c07719 Author: Haiyang Zhang Date: Wed Feb 17 20:58:47 2010 +0000 Staging: hv: Rename struct device_context and re-arrange the fields inside Rename struct device_context and re-arrange the fields inside. Rename struct device_context to struct vm_device, and move struct device field to the end according to Document/driver-model standard. Signed-off-by: Hank Janssen Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 26c14cc119204adc218259251919c5198d07dafe Author: Hank Janssen Date: Thu Feb 11 23:02:42 2010 +0000 Staging: hv: Add proper versioning to HV drivers Provide proper versioning information for all HV drivers. With removal of build time/date/and Minor number as requested by Greg KH Signed-off-by: Hank Janssen Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 4408f5319b6c8784120e0784df315b87e8a5dfef Author: C. Bartlett Date: Wed Feb 3 15:34:27 2010 +0000 Staging: hv: fix various coding style issues in RingBuffer.c This is a patch to the RingBuffer.c file that corrects various coding style warnings and errors found by checkpatch.pl [ The real solution here is to get rid of this file entirely, and use the kernel's internal ring buffer api, but until then, make these changes so as to make checkpatch.pl happy, and keep others from continuously sending this type of patch. - gkh] Signed-off-by: Craig Bartlett Cc: Bill Pemberton Cc: Nicolas Palix Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit a73e6b7c508f610eeb315c443d9ac79041124af0 Author: Hank Janssen Date: Fri Jan 22 19:17:50 2010 +0000 Staging: hv: Remove xen legacy code and check for Hyper-V Removed legacy XEN layer from hypervisor setup, and made sure only Hyper-V is Is a valid hypervisor to run on. Signed-off-by: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 4f28900bcf9bb5e6fb0c18fc7ee325df66fe8bbd Author: Greg Kroah-Hartman Date: Fri Jan 8 10:25:01 2010 -0800 Staging: hv: remove unneeded OnClose callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 2d0753464b497287565c2e54d3ae67666852ef57 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:24:42 2010 -0800 Staging: hv: remove unneeded OnOpen callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 354b0a643e89dd3163278c9a0ac9cbcb9ef5c298 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:24:26 2010 -0800 Staging: hv: remove unneeded OnHostReset callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 99358ca725513de0a97971eb019d4a5544d83760 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:21:58 2010 -0800 Staging: hv: storvsc_drv: move unused functions Now that the callback pointer was removed, we can remove the code itself, as it is never used. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 65e65a3e73b31c097e59c6e8d4a9ed1eebbe9d8d Author: Greg Kroah-Hartman Date: Fri Jan 8 10:20:27 2010 -0800 Staging: hv: remove unneeded OnHostRescan callback This callback was never called, so delete the thing. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 4230020c42457e51c98636a328c60e9f3744152c Author: Linus Lüssing Date: Sat Jan 2 11:30:52 2010 +0100 Staging: batman-adv: Dont deactivate aggregation on wrong input A non-integer changes the aggregation mode. Therefore this patch changes the behaviour to explicitly check strict_strtoul()'s return code. Signed-off-by: Linus Lüssing Acked-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit abad5446585b0b9519fad00c05156f373ea114ad Author: Simon Wunderlich Date: Sat Jan 2 11:30:51 2010 +0100 Staging: batman-adv: Remove compat.h Since we are now part of mainline, we don't need compat.h to allow building of the module with old versions of the kernel. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b9b27e4ef6313449a6b40a21e0e9a1bdd9a1d8ce Author: Andrew Lunn Date: Sat Jan 2 11:30:50 2010 +0100 Staging: batman-adv: Use printk(%pM) for MAC addresses printk() since kernel version 2.6.29 has supported printing MAC addresses directly, as an extension to the %p processing. This patch makes use of this for printk() and bat_dbg(). This will remove the overhead of using addr_to_string() which is normally never actually output. Fixed a typo found by Gus Wirth. Signed-off-by: Andrew Lunn Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit a9c2910aa15c5b2559e80d1406176f8456d3e34e Author: Andrew Lunn Date: Sat Jan 2 11:30:49 2010 +0100 Staging: batman-adv: Allow the MAC address to be set Some embedded devices have very limited sources of entropy for the random number generator. It has been observed that the random MAC address on the interface bat0 is not always random. When testing with a collection of identical hardware, sometimes the bat0 device the same MAC address on multiple devices, causing mayhem. This patch allows the MAC address to be set by the user. Signed-off-by: Andrew Lunn Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit e70171957a3ac67fd62af0c66efe7b7749121899 Author: Simon Wunderlich Date: Sat Jan 2 11:30:48 2010 +0100 Staging: batman-adv: receive packets directly using skbs This patch removes the (ugly and racy) packet receiving thread and the kernel socket usage. Instead, packets are received directly by registering the ethernet type and handling skbs instead of self-allocated buffers. Some consequences and comments: * we don't copy the payload data when forwarding/sending/receiving data anymore. This should boost performance. * packets from/to different interfaces can be (theoretically) processed simultaneously. Only the big originator hash lock might be in the way. * no more polling or sleeping/wakeup/scheduling issues when receiving packets * this might introduce new race conditions. * aggregation and vis code still use packet buffers and are not (yet) converted. * all spinlocks were converted to irqsave/restore versions to solve some lifelock issues when preempted. This might be overkill, some of these locks might be reverted later. * skb copies are only done if neccesary to avoid overhead performance differences: * we made some "benchmarks" with intel laptops. * bandwidth on Gigabit Ethernet increased from ~500 MBit/s to ~920 MBit/s * ping latency decresed from ~2ms to ~0.2 ms I did some tests on my 9 node qemu environment and could confirm that usual sending/receiving, forwarding, vis, batctl ping etc works. Signed-off-by: Simon Wunderlich Acked-by: Sven Eckelmann Acked-by: Marek Lindner Acked-by: Linus Lüssing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit c4bf05d3960981a4291bcc9580f3d73eb4dcbe84 Author: Simon Wunderlich Date: Sat Jan 2 11:30:47 2010 +0100 Staging: batman-adv: check all kmalloc()s there are some kmallocs left which are not checked whether they succeeds or not, which might lead to corrupted data structures if the system memory is full. This patch should clean up the remaining unchecked kmalloc()s. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit e9b764506aeb06ada6a7d0a24eda3e6eb70bade1 Author: Marek Lindner Date: Sat Jan 2 11:30:46 2010 +0100 Staging: batman-adv: splitting /proc vis file into vis_server and vis_data The /proc vis file was used to enable/disable the vis server and to output the vis data at the same time. This behaviour was confusing and lacked a proper method to display the current vis server status. This patch seperates the 2 functionalities: * use vis_server to enable/disable the vis server and to retrieve its status * use vis_data to retrieve the vis raw data (if the server is enabled) Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 6051d44cb1210e79b39143921b9e162983a03005 Author: Linus Luessing Date: Sat Jan 2 11:30:45 2010 +0100 Staging: batman-adv: remove obsoleted vis_format /proc file batman-adv used to export the vis data using different formats that were switchable via /proc/net/batman-adv/vis_format. The various formats moved to user space and rendered this configuration switch useless. Signed-off-by: Linus Luessing Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b801fede6bd94a4b3b0bd4ba1f35f69a6b34158b Author: Andrew Lunn Date: Sat Jan 2 11:30:44 2010 +0100 Staging: batman-adv: moving vis output formats out of the kernel The batman-adv kernel module is able to output visualization data using the dot draw or JSON format. This patch transforms the output into a generic format (called vis raw). User space tool may convert the raw data to support a variety of formats without the need of modifying the kernel module. Signed-off-by: Andrew Lunn Signed-off-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit b665aac8a7b44bbffc32dfff8543227704136ed5 Author: Marek Lindner Date: Sat Jan 2 11:30:43 2010 +0100 Staging: batman-adv: fix minor orig table layout bug The originator table contained a TAB instead of a space which broke the layout as well as the batctl parser. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 9bbf1ecdb36e2395eecbf04229eaaedce3589db5 Author: Linus Lüssing Date: Sat Jan 2 11:30:42 2010 +0100 Staging: batman-adv: Fixes rounding issues in vis.c This patches fixes two rounding issues in vis.c for sending and purging vis packets. Before, the timers and timeouts always got rounded down to seconds, though we want a precision in milliseconds. This also fixes a kernel panic that occures when lowering the timer for sending vis packets (vis_interval) to less than 1000ms in main.c manually. Signed-off-by: Linus Lüssing Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit cec4a69cfc2bc780b4107193cb9bd621b67ab2b6 Author: Sven Eckelmann Date: Sat Jan 2 11:30:41 2010 +0100 Staging: batman-adv: Use forw_bcast_list_lock always with disabled interrupts forw_bcast_list_lock is spin_locked in both process and softirq context. SoftIRQ calls the spinlock with disabled IRQ and normal process context with enabled IRQs. When process context is inside an spin_locked area protected by forw_bcast_list_lock and gets interrupted by an IRQ, it could happen that something tries to lock forw_bcast_list_lock again in SoftIRQ context. It cannot proceed further since the lock is already taken somewhere else, but no reschedule will happen inside the SoftIRQ context. This leads to an complete kernel hang without any chance of resurrection. All functions called in process context must disable IRQs when they try to get get that lock to to prevent any reschedule due to IRQs. Signed-off-by: Sven Eckelmann Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 5ea84fa369baa3d36fa8a78e9af3dc71bbcbca51 Author: Simon Wunderlich Date: Sat Jan 2 11:30:40 2010 +0100 Staging: batman-adv: consistent spelling of "neighbors" we have written "neighbors", "neighbours" and bad spelled versions of this word, this patch should make it consistent. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b6c359767bc743a7b6830660daa8f7e5c4273ad8 Author: Simon Wunderlich Date: Sat Jan 2 11:30:39 2010 +0100 Staging: batman-adv: initialize static hash iterators instead of dynamically registering hash iterators, calling functions are changed to register the iterator objects statically. The two advantages are: * no memory leaks when aborting from hash_iterate() * no calls to kmalloc/kfree, therefore a little faster/safer Tested with 9 QEMU instances, no obvious regression found. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4ce21a7faf320bdb750a2e1639f8f2dbb27bdb89 Author: Andrew Lunn Date: Sat Jan 2 11:30:38 2010 +0100 Staging: batman-adv: Replace KERN_DEBUG with bat_dbg Ameya Palande requested we replace printk(KERN_DEBUG "") by pr_debug() I decided it was better to use our debug macro. Signed-off-by: Andrew Lunn Acked-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit 183cd9ee543c9364fa42be8d30265fd47a914b59 Author: Simon Wunderlich Date: Sat Jan 2 11:30:37 2010 +0100 Staging: batman-adv: update README for latest kernel state in the README that we also (compile) support 2.6.32 Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit acdfd0e088502dc225f594b5a5598cab53ffd375 Author: Sven Eckelmann Date: Sat Jan 2 11:30:36 2010 +0100 Staging: batman-adv: Remove NULL pointer check It is safe to call kfree(NULL) which makes this extra check unneeded. It was found using checkpatch.pl from linux-2.6 Signed-off-by: Sven Eckelmann Acked-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 23a51a8061567a47347ade59edf2a0bde0eece30 Author: Roel Kluin Date: Sat Dec 26 20:00:47 2009 +0100 Staging: rt2860: test off by one in RtmpAsicSendCommandToMcu() `i' reaches 101 after the loop, so if it was 100 then it succeeded in the last iteration. This is probably unlikely to cause problems. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 716323c09319ae5e6c9e413a6378d61a77b26996 Author: Roel Kluin Date: Wed Dec 23 02:36:43 2009 +0100 Staging: rtl8192u: ieee80211: add missing parentheses not(!) has a higher precedence than bit and(&). Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 7963eb432be2ebbf7e740bcdf6b385cc68fb7627 Author: Jarod Wilson Date: Mon Jan 4 18:02:27 2010 -0500 staging: add Broadcom Crystal HD driver This patch supersedes the earlier ones sent by Manu Abraham to add the Broadcom Crystal HD driver to the staging tree, per discussion with him about it. I've been working with Broadcom's Naren Sankar on this driver for a number of months, and had already talked Naren about submitting this on Broadcom's behalf, didn't expect anyone else to jump on submitting it as quickly as Manu did. ;) This version is a one-shot deal, incorporating the original driver, Manu's coding style clean-ups, udev device creation support from Edgar 'gimli' Hucek, and a number of other small tweaks from myself and Scott Davilla, the other individual who has been working closely on this code with Naren and I. I've tested this iteration of the code lightly on a mini pci-e board in a ThinkPad T61p running x86_64 Fedora 12, with the expected results, and will test further on other systems with other variants of the card (I have three varieties of this device currently in hand). Scott has also tested on assorted primarily i686 varieties of Ubuntu, and Naren has tested with both Fedora and Ubuntu, iirc. Note: only the 70012 is currently supported by this driver, 70015 support will follow later. Also note that Blu-Ray support isn't enabled (at the firmware level), due to misc fun related to the BD encryption scheme, DRM, etc. :\ I *do* have a git tree containing the driver, lib, gst plugin and firmware that I'm working from at the moment[*], as there are inter- dependencies between the driver and lib, and the driver can be used with kernels going a ways back (I've only tested back to 2.6.18 as it exists in Red Hat Enterprise Linux 5). I'm exporting from there, into a linux-next tree, then generating patches from there. The goal is to feed everything upstream as quickly as possible, but there are users who want this code for earlier kernels too... The firmware will be submitted for inclusion in dwmw2's linux-firmware tree once there is a suitable redistribution-no-modification type of license on it (I believe Naren is working with Broadcom legal to get that in place). Changelog from initial Broadcom release to here: commit d20475d444610c5683d09e63f707f5bb22359062 Author: Jarod Wilson Date: Mon Jan 4 13:55:16 2010 -0500 include: lib doesn't build w/o the removed stdint include So add it back... Signed-off-by: Jarod Wilson commit c181070a330530b792d2b80e3ec6ab12a5a57394 Author: Scott Davilla Date: Mon Jan 4 13:38:37 2010 -0500 include: don't define VOID if its already defined Signed-off-by: Scott Davilla Signed-off-by: Jarod Wilson commit 33d8a2b691e81212e398f53770578d79650bf0bc Author: Jarod Wilson Date: Mon Jan 4 13:12:10 2010 -0500 driver: create crystalhd device using udev Based on: http://sourceforge.net/apps/trac/archvdr/browser/trunk/archvdr/crystalhd/use_udev.patch Signed-off-by: Edgar ( gimli ) Hucek Formatting tweaks, error-handling path fixups and any bugs added by Jarod. Signed-off-by: Jarod Wilson commit c44c64dea5537814796fcbe2d9db0209383c78b9 Author: Manu Abraham Date: Mon Jan 4 10:32:47 2010 -0500 crystalhd: coding style cleanups Signed-off-by: Manu Abraham Signed-off-by: Jarod Wilson commit cffa6da7467ff697a656d1dfff54bb0513a053dc Author: Jarod Wilson Date: Mon Jan 4 10:17:27 2010 -0500 crystalhd: run dos2unix over everything, this is linux source... Signed-off-by: Jarod Wilson commit 7fa38a282db7af5a5746055f7c6cef8a9b8ee138 Author: Jarod Wilson Date: Mon Jan 4 10:02:33 2010 -0500 crystalhd: initial import of released Broadcom code Straight import of: http://www.broadcom.com/docs/support/crystalhd/crystalhd_linux_20091229.zip Unfortunately, we're unable to publicly publish all the history that got us from the initial internal code to what was released here, but such is life, we can just be happy we've got this open-sourced now. :) Signed-off-by: Jarod Wilson Signed-off-by: Naren Sankar Signed-off-by: Scott Davilla Signed-off-by: Manu Abraham Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit ca1f29c01aaa37d522dc6ce311769731f5f1919e Author: Greg Kroah-Hartman Date: Tue Dec 22 16:38:10 2009 -0800 Staging: altpciechdma: remove driver No one seems to be able to maintain this, or merge it into mainline, so remove it. Acked-by: Leon Woestenberg Signed-off-by: Greg Kroah-Hartman commit 2d629030ca649bd4a7356befedbe7bbefa840b21 Author: Greg Kroah-Hartman Date: Tue Dec 22 16:35:21 2009 -0800 Staging: p9auth: remove driver from tree No one seems to be maintaining this anymore, and it is not on any track to be merged to mainline. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit a945db65436a2666927b555d752e67a1bd193a9c Author: Greg Kroah-Hartman Date: Tue Dec 22 16:29:26 2009 -0800 staging: remove the b3dfg driver It has no users, and no developers to maintain it to get it merged into mainline. So sad. Cc: Daniel Drake Cc: Justin Bronder Cc: Duane Griffin Signed-off-by: Greg Kroah-Hartman commit 8c6356e2a57044614799de3f1e7f40561724893a Author: Greg Kroah-Hartman Date: Tue Dec 22 15:19:21 2009 -0800 Staging: dt3155: coding style cleanups for the .h files This cleans up some of the coding style issues in the .h files. More remains to be done. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 1769fd86e13eadeca64881fb8494a17afeccbbbf Author: Greg Kroah-Hartman Date: Tue Dec 22 15:18:28 2009 -0800 Staging: dt3155: coding style cleanups for allocator code This fixes up the worst of the coding style errors for the allocator code. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 8125e2f66800f9e16e632df20fa3195c07f6aaf9 Author: Simon Horman Date: Mon Dec 21 15:09:53 2009 +1100 Staging: wlan-ng: initialise mibitem $ gcc --version gcc (Debian 4.4.2-5) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_dorequest’: drivers/staging/wlan-ng/p80211wext.c:139: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:139: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwretry’: drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwretry’: drivers/staging/wlan-ng/p80211wext.c:1057: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1057: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwtxpow’: drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwtxpow’: drivers/staging/wlan-ng/p80211wext.c:1123: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1123: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwfrag’: drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwfrag’: drivers/staging/wlan-ng/p80211wext.c:933: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:933: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwrts’: drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwrts’: drivers/staging/wlan-ng/p80211wext.c:866: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:866: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwrate’: drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwfreq’: drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwfreq’: drivers/staging/wlan-ng/p80211wext.c:320: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwmode’: drivers/staging/wlan-ng/p80211wext.c:401: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:401: warning: ‘mibitem.status’ may be used uninitialized in this function ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit e8ffaa3a06a71a5a02373cfcb5f474f9a181ec68 Author: Simon Horman Date: Mon Dec 21 15:08:15 2009 +1100 Staging: prism2-usb: Build should select WIRELESS_EXT The prevailing idiom is to select WIRELESS_EXT not depend on it. Depending leaves this driver in a situation where it can only be built if another driver that selects WIRELESS_EXT has been enabled. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d512a142f0a3d5ce138880fb2a70462542d5f711 Author: Simon Horman Date: Mon Dec 21 15:07:50 2009 +1100 Staging: rtl8192su: Use z format qualifier for output of sizeof() $ gcc --version gcc (Debian 4.4.2-5) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_ADDBAReq’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:342: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_ADDBARsp’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:443: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_DELBA’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:573: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ ... Also some style fixes for these lines: + Fix excessively long lines + Remove leading space before struct + Remove unnecessary parentheses Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 784d3119475652d34a8d8ec3911e39c5e3d3036f Author: Simon Horman Date: Mon Dec 21 15:07:10 2009 +1100 Staging: rtl8192su: Build should select WIRELESS_EXT The prevailing idiom is to select WIRELESS_EXT not depend on it. Depending leaves this driver in a situation where it can only be built if another driver that selects WIRELESS_EXT has been enabled. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 8c172dde41db666f7a5f3bb62205da017e23c0ec Author: Justin Madru Date: Fri Dec 18 15:52:53 2009 -0800 Staging: s5k3e2fx.c: simplify complexity by factoring the code was looping, setting s_move[i] to the following calculations if (actual_step>= 0) s_move[i] = ((((i + 1) * gain + 0x200) - (i * gain + 0x200)) / 0x400); else s_move[i] = ((((i + 1) * gain - 0x200) - (i * gain - 0x200)) / 0x400); but, this code reduces to the expression s_move[i] = gain>> 10; The reason for the complexity was to generate a step function with integer division and rounding to land on specific values. But these calculations can be simplified to the following code: gain = ((actual_step<< 10) / 5)>> 10; for (i = 0; i<= 4; i++) s_move[i] = gain; Signed-off-by: Justin Madru Reviewed-by: Ray Lee Signed-off-by: Greg Kroah-Hartman commit 096417e087a391dc78780cc1843369a521635522 Author: Pekka Enberg Date: Fri Dec 18 23:08:22 2009 +0200 Staging: w35und: Remove unused typedefs MLME_DEAUTHREQ_PARA and MLME_DISASSOCREQ_PARA Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 8fab4020fa1aa5ee3ad4e409323be9edfbd6c20e Author: Pekka Enberg Date: Fri Dec 18 23:08:21 2009 +0200 Staging: w35und: Remove unused typedef RXLAYER1 Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 2b6e6df4d911e5ef1f438b84ee00cfc48865aff3 Author: Pekka Enberg Date: Fri Dec 18 23:08:20 2009 +0200 Staging: w35und: Remove unused typedef TXRETRY_REC Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 23b0dce239426ff8a7068b8d617d0c6eb4544cf7 Author: Pekka Enberg Date: Fri Dec 18 23:08:19 2009 +0200 Staging: w35und: Remove unused typedef CHAN_LIST Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 440a233db4c117f34397abd3722d5802fe1b8c30 Author: Pekka Enberg Date: Fri Dec 18 23:08:18 2009 +0200 Staging: w35und: Convert typedef ChanInfo to struct chan_info Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 395af561825095b2df30ed2ee86c3ed898783e8f Author: Pekka Enberg Date: Fri Dec 18 23:08:17 2009 +0200 Staging: w35und: Remove unused typedef _EVENTLOG Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 92ce4703920dc1bb380c12498a2f6bb825effbc7 Author: Pekka Enberg Date: Fri Dec 18 23:08:16 2009 +0200 Staging: w35und: Convert typedef RadioOff to struct radio_off Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 1bc5e651295ab35fc7d396d940cf9a1e530c0a7e Author: Pekka Enberg Date: Fri Dec 18 23:08:15 2009 +0200 Staging: w35und: Convert typedef LOCAL_PARA to struct wb_local_para Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 3fc0d278e3198c8aa9baa71c49a8364d31686ba9 Author: Adam Buchbinder Date: Fri Dec 18 15:43:52 2009 -0500 staging: Fix misspelling of "invocation" in comment. A comment misspells "invocation"; this fixes it. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 39cfb97b0d89a99c8e50782b17e65114b89c2e59 Author: Adam Buchbinder Date: Fri Dec 18 15:43:51 2009 -0500 staging: Fix misspelling of "should" and "shouldn't" in comments. Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 2ed71d5a14c887b7632aa21579ff7fc5770381d8 Author: Adam Buchbinder Date: Fri Dec 18 15:43:50 2009 -0500 staging: Fix misspelling of "successful" and variants. Some comments and one message misspell "successful" or variants of the word; this fixes them. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 59277b679f8b5ce594e367759256668eba652d0d Author: Bernie Thompson Date: Tue Nov 24 15:52:21 2009 -0800 Staging: udlfb: add dynamic modeset support Add dynamic modeset support udlfb uses EDID to find the monitor’s preferred mode udlfb no longer has fixed mode tables – it’s able to set any mode dynamically, from the standard VESA timing characteristics of the monitor. Draws from probe and setmode code of both displaylink-mod 0.3 branch of Roberto De Ioris, and Jaya Kumar's displaylinkfb. Lays foundation for defio support and making backbuffer optional. With additional changes to minimize diffs and clean for checkpatch.pl style. Does not yet include new ioctls or refcount/mutex code from displaylink-mod. Tested to work with existing xf-video-displaylink X server unmodified. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 293c0db0dd2a7f1a8074645faa9d3a0294623002 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:04:54 2009 -0800 Staging: dt3155: add it to the build Now it will build with the rest of the kernel Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit bad9f950c011c50e8302b48244229c0250add9b4 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:06:11 2009 -0800 Staging: dt3155: add TODO file Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit ae7fd7b818e728fd90e08460dd45ce81e79c99b0 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:05:25 2009 -0800 Staging: dt3155: add needed #include This is needed so the code properly builds Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit aa337ef1fbc9650f8b5b9087af1dac33f71eb01c Author: Scott Smedley Date: Fri Dec 18 10:54:26 2009 -0800 Staging: add dt3155 driver This is a driver for the DT3155 Digitizer Signed-off-by: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit da94a755cabe96d2c00af2b1b1aff84307c437fe Author: Radu Voicilas Date: Mon Dec 7 18:20:09 2009 -0800 Staging: rtl8192e: Small code fixes for r819xE_firmware.c Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 4db3d5e4e7fce813648215d99fdc5d0fcb73128c Author: Radu Voicilas Date: Mon Dec 7 18:20:08 2009 -0800 Staging: rtl8192e: Code style fixes for r819xE_phy.h Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 1719e1190a019c65750bc515b3ff2ec694e52bc2 Author: Radu Voicilas Date: Mon Dec 7 18:20:07 2009 -0800 Staging: rtl8192e: Code style fix for r819xE_phyreg.h Changed all the comments to conform to the standard, aligned register values. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 8f2668418f182ac6b50b994851c36bd0a116e4f8 Author: Radu Voicilas Date: Fri Dec 4 20:43:16 2009 -0800 Staging: rtl8192e: fix more coding style issues. Fixes to the way code looks. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 65a4378471510787e080188f933913315f1afa0c Author: david woo Date: Tue Dec 22 09:40:36 2009 -0800 Staging: rtl9192e: fix power usage issues This patch should allow the driver to consume a lot less power. Signed-off-by: david woo Signed-off-by: Greg Kroah-Hartman commit 789d9dbdad5cb24fbf0c0e4fa5c5f1b792e4e81e Author: Radu Voicilas Date: Fri Dec 4 20:42:53 2009 -0800 Staging: rtl8192e: fix some codingstyle issues dot11d.h needed a good refactoring - I've dropped some of the // comments or transformed them to match the kernel documentation. r8180_93cx6.h - fixed a little bit the copyright section. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit f70615a8f134c4ebe3c2848bb43a68335406a001 Author: Huang Weiyi Date: Sun Dec 13 22:06:25 2009 +0800 Staging: ramzswap: remove unused #include Remove unused #include ('s) in drivers/staging/ramzswap/ramzswap_drv.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 6309017f050af5bb66350ec25a2a1dd0c5643422 Author: Huang Weiyi Date: Sun Dec 13 21:14:10 2009 +0800 Staging: wlags49_h2: remove duplicated #include Remove duplicated #include('s) in drivers/staging/wlags49_h2/wl_pci.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit c4ad074f11acc46a4ded25dec4f4c2b8d2d4ebb8 Author: Ameya Palande <2ameya@gmail.com> Date: Mon Dec 14 13:57:59 2009 +0200 Staging: iio: checkinclude.pl fix Remove which is included twice Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Greg Kroah-Hartman commit 734cc82a65cd5abc1b616fb0699eb2c251de7831 Author: Andrew Lunn Date: Sat Dec 12 23:39:46 2009 +0100 Staging: batman-adv: Fix the naming of the debug option. So that the configuration hierarchy is correct, set the debug option to have the same base as the main BATMAN option. Signed-off-by: Andrew Lunn Signed-off-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit 8a2e042c2d9b4f1252dbbbb7c31bd3f8af19c8f2 Author: Andrew Lunn Date: Sat Dec 12 23:39:45 2009 +0100 Staging: batman-adv: Split originator handling parts out of routing.c Bug found and fixed in origional version by Linus Luessing. Signed-off-by: Simon Wunderlich Signed-off-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4088c7ca57b6dbe25683bb16f25233cce373996c Author: Andrew Lunn Date: Sat Dec 12 23:39:44 2009 +0100 Staging: batman-adv: Always receive when discarding. It does not matter if the interface is to be activated or not, we must read the packet in order that it be discarded. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit da6b9ba95f2ce3f923013ce09793ab16f05bac25 Author: Andrew Lunn Date: Sat Dec 12 23:39:43 2009 +0100 Staging: batman-adv: stop persistent warnings if a device is deactivated. Without this change we spam the kernel log on every packet received on any other interface when an interface has been added, but is not yet active, ie UP. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4efe0b06559e8cb39c3d6a9bd01cc99604dfd247 Author: Andrew Lunn Date: Sat Dec 12 23:39:42 2009 +0100 Staging: batman-adv: Refactor routing.c Break up a lot of the big functions up into many smaller ones. This helps with readability and there is now a lot less code squashed against the right hand margin. Signed-off-by: Andrew Lunn Acked-by: Marek Lindner Acked-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit bad2239e87d73fd999a9c5d5efa5024b16046c6c Author: Andrew Lunn Date: Sat Dec 12 23:39:41 2009 +0100 Staging: batman-adv: replace internal logging mechanism. batman-adv used its own logging infrastructure. Replace this with standard kernel logging, printk(), with compile time and runtime options to enable/disable different debug levels. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit e89230ec9154870a165de7e4acc411e1e7eec345 Author: Peter Huewe Date: Tue Dec 15 05:04:22 2009 +0100 Staging: asus_oled: Add defines for asus vendor_id and device_id to be consistent with hid-ids.h This almost trivial patch replaces the hardcoded values for the vendor and device ids with defines, as they are used in drivers/hid/hid-ids.h For me this seems to be more consistent, however as drivers/hid/hid-ids.h is not within the default include directory I had to redefine the defines here (maybe move the hid-ids.h to include/linux ?) Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 8d4ecdda9870d0999ebb8ed59293f420b5d244fd Author: Ameya Palande <2ameya@gmail.com> Date: Fri Dec 11 19:10:12 2009 +0200 Staging: mimio: checkpatch.pl line > 80 chars fixes Rearrange code and cleanup the information to get rid of checkpatch.pl line > 80 chars complaints. Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Greg Kroah-Hartman commit 2c6211606dafaeec51e471cd6aa277fbf45fe80c Author: Ameya Palande <2ameya@gmail.com> Date: Fri Dec 11 19:10:11 2009 +0200 Staging: mimio: Remove dead code Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Greg Kroah-Hartman commit d753fa1df300fe9215a08603f1f8ac18825839eb Author: Ameya Palande <2ameya@gmail.com> Date: Fri Dec 11 19:10:10 2009 +0200 Staging: mimio: Fix checkpatch.pl spacing errors Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Greg Kroah-Hartman commit 0ee9f67c4028500a4348e8bc87ee7ec1139b8259 Author: Joe Perches Date: Sun Dec 6 11:34:52 2009 -0800 Staging: rtl8187x: Use %pM for mac address output Uncompiled. Doesn't currently build anyway. Converted MAC_FMT to %pM Converted some %02x%02x%02x%02x%02x%02x to %pm Converted MAC_ARG to direct use Removed MAC_FMT and MAC_ARG macros Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit a5c252411f16dce1f9586090ffa8210273a4c8fb Author: kirjanov@gmail.com Date: Fri Dec 18 11:02:09 2009 +0300 staging: slicoss Use pci_set_consistent_dma_mask. Use pci_set_consistent_dma_mask() in the case of 64-bit consistent allocations. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit 30ae835f89cac13156fdef84412870f3179f3f22 Author: kirjanov@gmail.com Date: Fri Dec 18 11:00:19 2009 +0300 staging: slicoss Use compare_ether_addr. Use compare_ether_addr. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit 5d372900aa6b14142cc7d7145cc8be1cb6c0d7b6 Author: kirjanov@gmail.com Date: Fri Dec 18 10:59:04 2009 +0300 staging: slicoss Use PCI_DEVICE_TABLE. Use PCI_DEVICE_TABLE: defines array as const and puts it into the __devinitconst section. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit 6c7aeb654d0d7f6d3b8de864c60868aa61f1e283 Author: kirjanov@gmail.com Date: Fri Dec 18 10:57:45 2009 +0300 staging: slicoss Use dev->stats rather than adapter->stats. Use dev->stats rather than adapter->stats. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit d9c057ab0b19e4995884f412b7d15b6c08b1b54e Author: kirjanov@gmail.com Date: Fri Dec 18 10:56:21 2009 +0300 staging: slicoss No need to check pointer in debugfs_remove() No need to check pointer expicitly since it has been done in debugfs_remove() Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit f8771fa67d63c57e9eedf034939261865edc2065 Author: kirjanov@gmail.com Date: Fri Dec 18 10:54:27 2009 +0300 staging: slicoss No need type casting when using netdev_priv No need type casting when using netdev_priv. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit a71b9978819ce25f911af16fc4d7b96fcdf665d4 Author: kirjanov@gmail.com Date: Fri Dec 18 10:52:45 2009 +0300 staging: slicoss Check for valid hw address Check for valid hw address. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit 203fe0d2e99598eb960baf2cc4b88b6e794e5a20 Author: kirjanov@gmail.com Date: Fri Dec 18 10:51:07 2009 +0300 staging: slicoss Convert to netdev_tx_t Convert to netdev_tx_t. Signed-off-by: Denis Kirjanov Signed-off-by: Greg Kroah-Hartman commit 42d4eff70f57eb889678d40d46a2c01ffd29d9a6 Author: Martyn Welch Date: Tue Dec 15 08:43:15 2009 +0000 Staging: vme: Allow drivers to co-exist Unable to build both drivers at the same time due to classing variables that should be declared static but aren't. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 3cb1b8a77402df3091ba7ecaede9b22484bf51b9 Author: Martyn Welch Date: Tue Dec 15 08:43:09 2009 +0000 Staging: vme: Remove old structures for implemented features Functionality for master RMW and location monitors has been implemented. Remove the commented out structures from the original codebase. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit ead1f3e301e2d886ef89f8d0c82b4d495f2a81c2 Author: Martyn Welch Date: Tue Dec 15 08:43:02 2009 +0000 Staging: vme: Fix checkpatch errors on VME core. Running checkpatch on the core VME code highlights many errors. Fix them. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 12b2d5c0895a03e941e7c145d9d23a45908a857b Author: Martyn Welch Date: Tue Dec 15 08:42:56 2009 +0000 Staging: vme: Allow override of geographical address on ca91c142 Geographical addressing only works if the VME backplane supports it. There are a large number of old backplanes which do not support geographical addressing. These boards will generally report a slot ID of zero - which is an invalid ID in the slot numbering scheme. Allow the geographical address to be over-ridden on the ca91c142 so that a slot ID can be provided manually in these circumstances. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 638f199db463a8f2b1535c45ab27d04bb1a55baf Author: Martyn Welch Date: Tue Dec 15 08:42:49 2009 +0000 Staging: vme: Allow override of geographical address on tsi148 Geographical addressing only works if the VME backplane supports it. There are a large number of old backplanes which do not support geographical addressing. These boards will generally report a slot ID of zero - which is an invalid ID in the slot numbering scheme. Allow the geographical address to be over-ridden on the tsi148 so that a slot ID can be provided manually in these circumstances. Signed-off-by: Markus Kraemer Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 51616e21066d040988a33effa82d4ef37fd60959 Author: Martyn Welch Date: Tue Dec 15 08:42:43 2009 +0000 Staging: vme: Correct vme_user error message typo Correction of erroneous error message in vme_user.c. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 1c47faa0af6f9316e863174f6d30ede60ebf7e36 Author: Roel Kluin Date: Thu Dec 10 16:39:44 2009 +0100 Staging: otus: Fix branch in zfProtRspSim() This semicolon is misplaced. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit cb13887657ec7130ff3e4ea7f78cda2e8a943b30 Author: Thiago Farina Date: Sun Nov 22 17:00:00 2009 -0500 Staging: otus: fix some sparse warnings *apdbg.c: use NULL pointer instead of 0 interger. Also make two functions private. Signed-off-by: Thiago Farina Signed-off-by: Greg Kroah-Hartman commit bb0bfc2a6b3bc0a680b45690e8e427515cf229a7 Author: Huang Weiyi Date: Sun Dec 13 21:13:54 2009 +0800 Staging: dream: remove duplicated #include Remove duplicated #include('s) in drivers/staging/dream/smd/smd_rpcrouter.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit ccf972bd6bcb35ebd38e0a530c86088e45102aa4 Author: Pavel Machek Date: Sat Nov 21 09:16:47 2009 +0100 Staging: dream: fix memory leak in camera error path cppcheck found that ctrl_pmsm is leaked if the open operation fails. Signed-off-by: Eric Sesterhenn Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit e79753edf88d858a3783c946c12cc4726f6590f6 Author: Pavel Machek Date: Sat Nov 21 09:16:12 2009 +0100 Staging: dream: add missing include files Add missing files/includes neccessary for Dream compilation. Mark flash support as broken -- it is not present on released Dream, anyway. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit fcc55b309fc0d037b5d435712cf70589c6a0c7be Author: Bruce Beare Date: Fri Nov 20 15:46:11 2009 -0800 Staging: comedi: pcmad: [PATCH 3/3] cleanup printk() warnings cleanup printk() warnings for including the facility level. cleanup add a printk("\n") to terminate the print for the non-error case. Signed-off-by: Bruce Beare Signed-off-by: Greg Kroah-Hartman commit 71a74bd951dd292dcda623539fa7b45005d72436 Author: Bruce Beare Date: Fri Nov 20 15:46:10 2009 -0800 Staging: comedi: pcmad: Cleanup: Remove unneeded braces Signed-off-by: Bruce Beare Signed-off-by: Greg Kroah-Hartman commit 90454a28d2e825e13f4a0334e017a438e4ccfc8a Author: Bruce Beare Date: Fri Nov 20 15:46:09 2009 -0800 Staging: comedi: pcmad: Cleanup: code indent warning messages use tabs instead of leading spaces Signed-off-by: Bruce Beare Signed-off-by: Greg Kroah-Hartman commit 9643f5d94aadd47a5fa9754fb60f2c957de05903 Merge: 2bd3a997 c44dcc5 Author: Al Viro Date: Wed Mar 3 17:12:40 2010 -0500 Merge branch 'for-fsnotify' into for-linus commit c7bbf52aa4fa332b84c4f2bb33e69561ee6870b4 Author: H. Peter Anvin Date: Wed Mar 3 13:38:48 2010 -0800 x86, mrst: Fix whitespace breakage in apb_timer.c Checkin bb24c4716185f6e116c440462c65c1f56649183b: "Moorestown APB system timer driver" suffered from severe whitespace damage in arch/x86/kernel/apb_timer.c due to using Microsoft Lookout to send a patch. Fix the whitespace breakage. Reported-by: Jacob Pan Signed-off-by: H. Peter Anvin commit 282572b5ab99cf27073210ca60b80dd085e1a469 Author: Dan Carpenter Date: Wed Mar 3 10:13:49 2010 +0300 ALSA: riptide: clean up while loop If getpaths() returned an odd number this would be a buffer under-run and an endless loop. It turns out that getpaths() can only return even numbers, but let's make it easy for people auditing code. With the new code you don't need to look at getpaths(). This silences a smatch warning. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit e61e642c2a0dc283c52cec76a223ac0699773633 Author: Jaroslav Kysela Date: Wed Mar 3 11:11:57 2010 +0100 ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit b30477d5e2961bfd90ad4146c517871ca8a6bebc Author: Jaroslav Kysela Date: Wed Mar 3 11:05:55 2010 +0100 ALSA: timer - pass real event in snd_timer_notify1() to instance callback Do not use hardcoded SNDRV_TIMER_EVENT_START value. Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8 Author: Clemens Ladisch Date: Wed Mar 3 09:16:18 2010 +0100 ALSA: oxygen: change || to && In the original code the condition was always true (hopefully) because WM8776_HPLVOL is zero. Signed-off-by: Dan Carpenter Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit fd8d47351d2e241f3168eeb697ce55cc28c75b78 Author: Krzysztof Helt Date: Wed Mar 3 19:41:44 2010 +0100 ALSA: opti92x: use PnP data to select Master Control port The Master Control port (MC) is available as the last PnP resource (OPT005). Use this value instead fo guessing. Also, add some comments to the code. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 9b1d0998d24f9c207d5fbdd0b8bac07284e0eda7 Author: Jan Kara Date: Wed Mar 3 16:19:32 2010 -0500 ext4: Release page references acquired in ext4_da_block_invalidatepages We forget to release page references we acquire in ext4_da_block_invalidatepages. Luckily, this function gets called only if we are not able to allocate blocks for delay-allocated data so that function should better never be called. Also cleanup handling of index variable. Reported-by: Wu Fengguang Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 Author: J. Bruce Fields Date: Wed Mar 3 16:13:29 2010 -0500 nfsd4: fix minor memory leak There's no need to allocate this cred more than once. Signed-off-by: J. Bruce Fields commit 31f66be44a657a14e0ab3536e4877c66c9ce031e Author: Helmut Schaa Date: Wed Mar 3 17:42:55 2010 +0100 rt2x00: Export rt2x00soc_probe from rt2x00soc Export rt2x00soc_probe from rt2x00soc as it is used in rt2800pci. Otherwise loading rt2800pci gives "rt2800pci: Unknown symbol rt2x00soc_probe". Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 4fa004373133ece3d9b1c0a7e243b0e53760b165 Author: Sujith Date: Mon Mar 1 14:42:57 2010 +0530 mac80211: Fix HT rate control configuration Handling HT configuration changes involved setting the channel with the new HT parameters and then issuing a rate_update() notification to the driver. This behavior changed after the off-channel changes. Now, the channel is not updated with the new HT params in enable_ht() - instead, it is now done when the scan work terminates. This results in the driver depending on stale information, defaulting to non-HT mode always. Fix this by passing the new channel type to the driver. Cc: stable@kernel.org Signed-off-by: Sujith Signed-off-by: John W. Linville commit 3010673ef5f7bef4b4685566a0713de1b4306c93 Author: Jacob Pan Date: Tue Mar 2 21:01:34 2010 -0800 x86, mrst: Fix APB timer per cpu clockevent The current APB timer code incorrectly registers a static copy of the clockevent device for the boot CPU. The per cpu clockevent should be used instead. This bug was hidden by zero-initialized data; as such it did not get exposed in testing, but was discovered by code review. Signed-off-by: Jacob Pan LKML-Reference: <1267592494-7723-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin commit 2bd3a997befc226ab4b504f05c5cbba305f3e0e6 Author: Eric W. Biederman Date: Tue Mar 2 23:53:19 2010 -0800 init: Open /dev/console from rootfs To avoid potential problems with an empty /dev open /dev/console from rootfs instead of waiting to mount our root filesystem and mounting it there. This effectively guarantees that there will be a device node, and it won't be on a filesystem that we will ever unmount, so there are no issues with leaving /dev/console open and pinning the filesystem. This is actually more effective than automatically mounting devtmpfs on /dev because it removes removes the occasionally problematic assumption that /dev/console exists from the boot code. With this patch I was able to throw busybox on my /boot partition (which has no /dev directory) and boot into userspace without problems. The only possible negative consequence I can think of is that someone out there deliberately used did not use a character device that is major 5 minor 2 for /dev/console. Does anyone know of a situation in which that could make sense? Signed-off-by: Eric W. Biederman Signed-off-by: Al Viro commit 2329e392accdb1b277927e8d9cbf568ba3f3856d Author: André Goddard Rosa Date: Tue Feb 23 04:04:27 2010 -0300 mqueue: fix typo "failues" -> "failures" Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit 8d8ffefaaf63f0468f17fbd1270165e739cf335e Author: André Goddard Rosa Date: Tue Feb 23 04:04:26 2010 -0300 mqueue: only set error codes if they are really necessary ... postponing assignments until they're needed. Doesn't change code size. Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit 04db0dde0ee1c29110642dff57fba9e438eb805c Author: André Goddard Rosa Date: Tue Feb 23 04:04:25 2010 -0300 mqueue: simplify do_open() error handling It reduces code size: text data bss dec hex filename 9925 72 16 10013 271d ipc/mqueue-BEFORE.o 9885 72 16 9973 26f5 ipc/mqueue-AFTER.o Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit 8834cf796a4320be2d3a70b1e4f9aba732a0f4ee Author: André Goddard Rosa Date: Tue Feb 23 04:04:24 2010 -0300 mqueue: apply mathematics distributivity on mq_bytes calculation Code size reduction: text data bss dec hex filename 9941 72 16 10029 272d ipc/mqueue-BEFORE.o 9925 72 16 10013 271d ipc/mqueue-AFTER.o Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit c8308b1c91056b09e96d40dbde4880ea685c377e Author: André Goddard Rosa Date: Tue Feb 23 04:04:23 2010 -0300 mqueue: remove unneeded info->messages initialization ... and abort earlier if we couldn't allocate the message pointers array, avoiding the u->mq_bytes accounting logic. It reduces code size: text data bss dec hex filename 9949 72 16 10037 2735 ipc/mqueue-BEFORE.o 9941 72 16 10029 272d ipc/mqueue-AFTER.o Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit 4294a8eedb17bbc45e1e7447c2a4d05332943248 Author: André Goddard Rosa Date: Tue Feb 23 04:04:28 2010 -0300 mqueue: fix mq_open() file descriptor leak on user-space processes We leak fd on lookup_one_len() failure Signed-off-by: André Goddard Rosa Signed-off-by: Al Viro commit e555317c083fda01f516d2153589e82514e20e70 Author: Daniel Mack Date: Fri Feb 26 14:36:54 2010 +0800 ASoC: fix ak4104 register array access Don't touch the variable 'reg' to construct the value for the actual SPI transport. This variable is again used to access the driver's register cache, and so random memory is overwritten. Compute the value in-place instead. Signed-off-by: Daniel Mack Acked-by: Liam Girdwood Cc: stable@kernel.org Signed-off-by: Mark Brown commit bb1c04784d39b95a4382bd283f3048c4eb859b58 Author: Jassi Brar Date: Thu Feb 25 11:24:53 2010 +0900 ASoC: soc_pcm_open: Add missing bailout tag The codec_dai needs to be shutdown should the machine startup fails. This patch adds another bailout tag for that case and rename the tag for configuration failures. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown commit 4919c5e45a91b5db5a41695fe0357fbdff0d5767 Author: Al Viro Date: Wed Mar 3 14:13:08 2010 -0500 fix race in d_splice_alias() rehashing the negative placeholder opens a race with d_lookup(); we unhash it almost immediately (by d_move()), but the race window is there. Since d_move() doesn't rely on target being hashed, we don't need that d_rehash() at all. Signed-off-by: Al Viro commit bec1052e5be6a70f03f6adc650f3a6e4c2f44ddf Author: Al Viro Date: Wed Mar 3 14:12:08 2010 -0500 set S_DEAD on unlink() and non-directory rename() victims Signed-off-by: Al Viro commit db1f05bb85d7966b9176e293f3ceead1cb8b5d79 Author: Miklos Szeredi Date: Wed Feb 10 12:15:53 2010 +0100 vfs: add NOFOLLOW flag to umount(2) Add a new UMOUNT_NOFOLLOW flag to umount(2). This is needed to prevent symlink attacks in unprivileged unmounts (fuse, samba, ncpfs). Additionally, return -EINVAL if an unknown flag is used (and specify an explicitly unused flag: UMOUNT_UNUSED). This makes it possible for the caller to determine if a flag is supported or not. CC: Eugene Teo CC: Michael Kerrisk Signed-off-by: Miklos Szeredi Signed-off-by: Al Viro commit 440b3c6c160f7d0a985f24ad1f4c24e00ee2d936 Author: Al Viro Date: Fri Feb 5 09:37:21 2010 -0500 get rid of ->mnt_parent in tomoyo/realpath Signed-off-by: Al Viro commit 0ceeca5a08abb1d880f0cc0ea812ad14932070e0 Author: Al Viro Date: Fri Feb 5 09:34:36 2010 -0500 hppfs can use existing proc_mnt, no need for do_kern_mount() in there Signed-off-by: Al Viro commit 8089352a13b785d4e0df63d87bd2b71c76bb9aee Author: Al Viro Date: Fri Feb 5 09:30:46 2010 -0500 Mirror MS_KERNMOUNT in ->mnt_flags Signed-off-by: Al Viro commit d498b25a4f877be535246c4e5b6ee5890781a477 Author: Al Viro Date: Fri Feb 5 02:21:06 2010 -0500 get rid of useless vfsmount_lock use in put_mnt_ns() It hadn't been needed since we'd sanitized the logics in mark_mounts_for_expiry() (which, in turn, used to be a rudiment of bad old times when namespace_sem was per-ns). Signed-off-by: Al Viro commit 47cd813f2984569570021ce3d34cdf9cb20aa6a2 Author: Al Viro Date: Fri Feb 5 02:01:14 2010 -0500 Take vfsmount_lock to fs/internal.h no more users left outside of fs/*.c (and very few outside of fs/namespace.c, actually) Signed-off-by: Al Viro commit 37afdc7960ab493f827b5df9dc1b71b63b44331c Author: Al Viro Date: Fri Feb 5 01:41:33 2010 -0500 get rid of insanity with namespace roots in tomoyo passing *any* namespace root to __d_path() as root is equivalent to just passing it {NULL, NULL}; no need to bother with finding the root of our namespace in there. Signed-off-by: Al Viro commit 9f5596af44514f99e3a654a4f7cb813354b9e516 Author: Al Viro Date: Fri Feb 5 00:40:25 2010 -0500 take check for new events in namespace (guts of mounts_poll()) to namespace.c Signed-off-by: Al Viro commit e21e7095a78867364d7aa9223d833ccb966f93f3 Author: Al Viro Date: Mon Feb 1 11:05:16 2010 -0500 Don't mess with generic_permission() under ->d_lock in hpfs Just use dentry_unhash() there Signed-off-by: Al Viro commit 391e8bbd38474b9f85b1f3933394a79ea66fe1e2 Author: Al Viro Date: Sun Jan 31 21:28:48 2010 -0500 sanitize const/signedness for udf Signed-off-by: Al Viro commit 072f98b4637eddcbdf2178fc84f382e2ee522f08 Author: Al Viro Date: Sun Jan 31 21:03:58 2010 -0500 nilfs: sanitize const/signedness in dealing with ->d_name.name Signed-off-by: Al Viro commit 0319003d0d229735770c185ddf132c666e9cd01a Author: Al Viro Date: Sun Jan 31 21:02:09 2010 -0500 nilfs really shouldn't slap struct dentry on stack... ... especially when it only needs (and initializes) .d_name of it Signed-off-by: Al Viro commit 89031bc79782a93fc65adabd0e123c89645bee6e Author: Al Viro Date: Sun Jan 31 20:49:54 2010 -0500 sanitize const/signedness of ufs a bit Signed-off-by: Al Viro commit 7e7742ee005c887b86fd1fd38d5b48419329dfa0 Author: Al Viro Date: Sun Jan 31 17:09:29 2010 -0500 sanitize signedness/const for pointers to char in hpfs a bit Signed-off-by: Al Viro commit 1f707137b55764740981d022d29c622832a61880 Author: Al Viro Date: Sat Jan 30 22:51:25 2010 -0500 new helper: iterate_mounts() apply function to vfsmounts in set returned by collect_mounts(), stop if it returns non-zero. Signed-off-by: Al Viro commit 462d60577a997aa87c935ae4521bd303733a9f2b Author: Al Viro Date: Sat Jan 30 16:11:21 2010 -0500 fix NFS4 handling of mountpoint stat RFC says we need to follow the chain of mounts if there's more than one stacked on that point. Signed-off-by: Al Viro commit 3088dd7080d1ecc6d18c27ef9e617cbbd2a2e51e Author: Al Viro Date: Sat Jan 30 15:47:29 2010 -0500 Clean follow_dotdot() up a bit No need to open-code follow_up() in it and locking can be lighter. Signed-off-by: Al Viro commit de27a5bf9caef3f1fca1f315aa58eee54fbf929a Author: Al Viro Date: Sat Jan 30 15:27:27 2010 -0500 fix mnt_mountpoint abuse in smack (mnt,mnt_mountpoint) pair is conceptually wrong; if you want to use it for generating pathname and for nothing else *and* if you know that vfsmount tree is unchanging, you can get away with that, but the right solution for that is (mnt,mnt_root). Signed-off-by: Al Viro commit f694869709cc39a5fbde21aa40f22999ddad0e6e Author: Al Viro Date: Sat Jan 30 13:51:04 2010 -0500 a couple of mntget+dget -> path_get in nfs4proc Signed-off-by: Al Viro commit 6eae7974d0490a9dbc3091f702ea1650871652a9 Author: Al Viro Date: Sat Jan 30 13:44:07 2010 -0500 Switch alloc_nfs_open_context() to struct path Signed-off-by: Al Viro commit 2096f759abcb42200a81d776f597362fd9265024 Author: Al Viro Date: Sat Jan 30 13:16:21 2010 -0500 New helper: path_is_under(path1, path2) Analog of is_subdir for vfsmount,dentry pairs, moved from audit_tree.c Signed-off-by: Al Viro commit 495d6c9c6595ec7b37910dfd42634839431d21fd Author: Valerie Aurora Date: Tue Jan 26 14:20:47 2010 -0500 VFS: Clean up shared mount flag propagation The handling of mount flags in set_mnt_shared() got a little tangled up during previous cleanups, with the following problems: * MNT_PNODE_MASK is defined as a literal constant when it should be a bitwise xor of other MNT_* flags * set_mnt_shared() clears and then sets MNT_SHARED (part of MNT_PNODE_MASK) * MNT_PNODE_MASK could use a comment in mount.h * MNT_PNODE_MASK is a terrible name, change to MNT_SHARED_MASK This patch fixes these problems. Signed-off-by: Al Viro commit 2ecdc82ef0b03e67ce5ecee79d0d108177a704df Author: Christoph Hellwig Date: Tue Jan 26 17:27:20 2010 +0100 kill unused invalidate_inode_pages helper No one is calling this anymore as everyone has switched to invalidate_mapping_pages long time ago. Also update a few references to it in comments. nfs has two more, but I can't easily figure what they are actually referring to, so I left them as-is. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 270ba5f7c5dac0bfb564aa35a536fb31ad4075bd Author: Richard Kennedy Date: Tue Jan 26 14:12:43 2010 +0000 fs: re-order super_block to remove 16 bytes of padding on 64bit builds re-order structure super_block to remove 16 bytes of alignment padding on 64bit builds. This shrinks the size of super_block from 712 to 696 bytes so requiring one fewer 64 byte cache lines. Signed-off-by: Richard Kennedy ----- patch against 2.6.33-rc5 compiled & tested on x86_64 AMDX2 desktop machine. I've been running with this patch applied for several weeks with no problems. regards Richard Signed-off-by: Al Viro commit f1771ffaac29a7a4e321ddd94d7873bc0dcefd41 Author: Al Viro Date: Mon Jan 25 18:36:07 2010 -0500 Simplify failure exits in s390/hypfs fill_super() ->kill_sb() will be called after any failure exit, so no need to duplicate what it can do. Signed-off-by: Al Viro commit fc7bed8c802de3b064a56a43ec8574aa8d412de3 Author: Al Viro Date: Mon Jan 25 18:30:38 2010 -0500 Don't bother with d_genocide in rpc_pipe kill_litter_super() from ->kill_sb() will take care of the junk commit 5b7e934d887c67fe093b61f1308bc2d9c49381ff Author: Al Viro Date: Sun Jan 24 00:28:52 2010 -0500 Use kill_litter_super() in autofs4 ->kill_sb() ... and get rid of open-coding its guts (i.e. RIP autofs4_force_release()) Signed-off-by: Al Viro commit 3899167dbd6832a3d8d7171b425257ad46b6c40c Author: Al Viro Date: Sat Jan 23 20:10:29 2010 -0500 Get rid of mnt_mountpoint abuses in ext4 path to mnt/mnt->mnt_root is no worse than that to mnt->mnt_parent/mnt->mnt_mountpoint *and* needs no pinning the sucker down (mnt is not going away and mnt->mnt_root won't change) Signed-off-by: Al Viro commit f598f9f1252b33410ffc52f51e117645ac5116c4 Author: Al Viro Date: Sat Jan 23 20:08:53 2010 -0500 Sanitize autofs_dev_ioctl_ismountpoint() Signed-off-by: Al Viro commit b1e4594ba097634e9436cc4c6ba95f70a2d627ff Author: Al Viro Date: Mon Jan 18 01:38:00 2010 -0500 switch infiniband uverbs to anon_inodes Signed-off-by: Al Viro commit 281befa5592b0c5f9a3856b5666c62ac66d3d9ee Author: Dan Williams Date: Wed Mar 3 11:47:43 2010 -0700 ioat2: kill pending flag The pending == 2 case no longer exists in the driver so, we can use ioat2_ring_pending() outside the lock to determine if there might be any descriptors in the ring that the hardware has not seen. Signed-off-by: Dan Williams commit b372ec2d900a5b50e47ef9e9624536ad146236be Author: Dan Williams Date: Wed Mar 3 11:47:42 2010 -0700 ioat3: use ioat2_quiesce() Replace open coded ioat2_quiesce() call in ioat3_restart_channel Signed-off-by: Dan Williams commit 773d9e2d8dbf02cfaf65786cf9100eef02c9fda4 Author: Dan Williams Date: Wed Mar 3 11:47:42 2010 -0700 ioat3: cleanup, don't enable DCA completion writes We already disallow raid operations while DCA is globally enabled, so having it locally enabled is a nop and confusing when reading the code. Signed-off-by: Dan Williams commit 2f99cc6e4688faf5f03f9afe5e1c6097278c75b2 Author: Al Viro Date: Sat Jan 16 14:10:21 2010 -0500 add several pieces to shared subtree documentation * document locking * add the missing part of data structure invariants (relationship between mnt_share and mnt_slave lists in case of a peer group among slaves). Signed-off-by: Al Viro commit 796a6b521d0eadb338adf8cf7e482351c3a8a7b4 Author: Al Viro Date: Sat Jan 16 13:28:47 2010 -0500 Kill CL_PROPAGATION, sanitize fs/pnode.c:get_source() First of all, get_source() never results in CL_PROPAGATION alone. We either get CL_MAKE_SHARED (for the continuation of peer group) or CL_SLAVE (slave that is not shared) or both (beginning of peer group among slaves). Massage the code to make that explicit, kill CL_PROPAGATION test in clone_mnt() (nothing sets CL_MAKE_SHARED without CL_PROPAGATION and in clone_mnt() we are checking CL_PROPAGATION after we'd found that there's no CL_SLAVE, so the check for CL_MAKE_SHARED would do just as well). Fix comments, while we are at it... Signed-off-by: Al Viro commit c177c2ac8c5aa83ed181db44543c3b38fd1f17a6 Author: Al Viro Date: Thu Jan 14 00:59:16 2010 -0500 Switch gfs2 to nd_set_link() Signed-off-by: Al Viro commit 8737c9305bd5602b11f7eb4655d5695d4a42a0c6 Author: Al Viro Date: Thu Dec 24 06:47:55 2009 -0500 Switch may_open() and break_lease() to passing O_... ... instead of mixing FMODE_ and O_ Signed-off-by: Al Viro commit d208bbdda991b8808d9c033ce4d31cb1bd87dcfc Author: Nick Piggin Date: Mon Dec 21 16:28:53 2009 -0800 fs: improve remount,ro vs buffercache coherency Invalidate sb->s_bdev on remount,ro. Fixes a problem reported by Jorge Boncompte who is seeing corruption trying to snapshot a minix filesystem image. Some filesystems modify their metadata via a path other than the bdev buffer cache (eg. they may use a private linear mapping for their metadata, or implement directories in pagecache, etc). Also, file data modifications usually go to the bdev via their own mappings. These updates are not coherent with buffercache IO (eg. via /dev/bdev) and never have been. However there could be a reasonable expectation that after a mount -oremount,ro operation then the buffercache should subsequently be coherent with previous filesystem modifications. So invalidate the bdev mappings on a remount,ro operation to provide a coherency point. The problem was exposed when we switched the old rd to brd because old rd didn't really function like a normal block device and updates to rd via mappings other than the buffercache would still end up going into its buffercache. But the same problem has always affected other "normal" block devices, including loop. [akpm@linux-foundation.org: repair comment layout] Reported-by: "Jorge Boncompte [DTI2]" Tested-by: "Jorge Boncompte [DTI2]" Signed-off-by: Nick Piggin Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Al Viro commit ec4f860597af41c6b71f4de86d8e86f710bfab54 Author: H Hartley Sweeten Date: Tue Jan 5 13:45:18 2010 -0700 fs/dcache.c: CodingStyle cleanup Cleanup EXPORT* macros according to Documantation/CodingStyle. Move EXPORT* macros to the line immediately after the closing function brace. Signed-off-by: H Hartley Sweeten Signed-off-by: Al Viro commit 587d4a17d837ac0f17edb26f1b6c80c0abda6343 Author: Helight.Xu Date: Wed Dec 30 13:24:41 2009 +0800 some clean up in fs/proc EXPORT_SYMBOL(proc_symlink); EXPORT_SYMBOL(proc_mkdir); EXPORT_SYMBOL(create_proc_entry); EXPORT_SYMBOL(proc_create_data); EXPORT_SYMBOL(remove_proc_entry); Those EXPORT_SYMBOL shouldn't be in fs/proc/root.c, should be in fs/proc/generic.c. Signed-off-by: Helight.Xu Signed-off-by: Al Viro commit 193cf4b99113a4550598ba9e8343e591fc062e23 Author: Boaz Harrosh Date: Tue Jan 12 16:18:08 2010 +0200 libfs: Unexport and kill simple_prepare_write Remove the EXPORT_UNUSED_SYMBOL of simple_prepare_write Collapse simple_prepare_write into it's only caller, though making it simpler and clearer to understand. Signed-off-by: Boaz Harrosh Signed-off-by: Al Viro commit ad2a722f196d2b014f49e6c37e072df71eb3695f Author: Boaz Harrosh Date: Tue Jan 12 15:13:47 2010 +0200 libfs: Open code simple_commit_write into only user * simple_commit_write was only called by simple_write_end. Open coding it makes it tiny bit less heavy on the arithmetic and much more readable. * While at it use zero_user() for clearing a partial page. * While at it add a docbook comment for simple_write_end. Signed-off-by: Boaz Harrosh Signed-off-by: Al Viro commit 4b1ae27a96d9860e6c4348673e8fb6a0322511fe Author: Al Viro Date: Wed Mar 3 12:58:31 2010 -0500 Revert "autofs4: always use lookup for lookup" This reverts commit 213614d583748d00967a91cacd656f417efb36ce. Alas, ->d_revalidate() can't rely on ->lookup() finishing what it's started; if d_alloc() in do_lookup() fails, we are not going to call ->lookup() at all. Signed-off-by: Al Viro commit eaa5eec739637f32f8733d528ff0b94fd62b1214 Merge: 2a32f2d d95cf4d Author: Linus Torvalds Date: Wed Mar 3 09:25:37 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Simplify ECC override handling commit 2a32f2db132264c356aea30a8270d3e68d96c509 Merge: feaf77d f414966 Author: Linus Torvalds Date: Wed Mar 3 09:11:02 2010 -0800 Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: resource: Fix broken indentation resource: Fix generic page_is_ram() for partial RAM pages x86, paravirt: Remove kmap_atomic_pte paravirt op. x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y commit 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb Author: David S. Miller Date: Wed Mar 3 09:06:03 2010 -0800 sparc64: Make prom entry spinlock NMI safe. If we do something like try to print to the OF console from an NMI while we're already in OpenFirmware, we'll deadlock on the spinlock. Use a raw spinlock and disable NMIs when we take it. Signed-off-by: David S. Miller commit feaf77d51a6e2e95f60c8095ac7282e610ede798 Merge: eca281a 0d561f1 Author: Linus Torvalds Date: Wed Mar 3 08:53:49 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: add reader's lock for cno in nilfs_ioctl_sync nilfs2: delete unnecessary condition in load_segment_summary nilfs2: move iterator to write log into segment buffer nilfs2: get rid of s_dirt flag use nilfs2: get rid of nilfs_segctor_req struct nilfs2: delete unnecessary condition in nilfs_dat_translate nilfs2: fix potential hang in nilfs_error on errors=remount-ro nilfs2: use mnt_want_write in ioctls where write access is needed nilfs2: issue discard request after cleaning segments commit eca281aad0c293e7698edea5834c252dd8108afa Merge: 7f5b09c 9df5778 Author: Linus Torvalds Date: Wed Mar 3 08:53:17 2010 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (36 commits) Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h ocfs2: send SIGXFSZ if new filesize exceeds limit -v2 ocfs2/userdlm: Add tracing in userdlm ocfs2: Use a separate masklog for AST and BASTs dlm: allow dlm do recovery during shutdown ocfs2: Only bug out in direct io write for reflinked extent. ocfs2: fix warning in ocfs2_file_aio_write() ocfs2_dlmfs: Enable the use of user cluster stacks. ocfs2_dlmfs: Use the stackglue. ocfs2_dlmfs: Don't honor truncate. The size of a dlmfs file is LVB_LEN ocfs2: Pass the locking protocol into ocfs2_cluster_connect(). ocfs2: Remove the ast pointers from ocfs2_stack_plugins ocfs2: Hang the locking proto on the cluster conn and use it in asts. ocfs2: Attach the connection to the lksb ocfs2: Pass lksbs back from stackglue ast/bast functions. ocfs2_dlmfs: Move to its own directory ocfs2_dlmfs: Use poll() to signify BASTs. ocfs2_dlmfs: Add capabilities parameter. ocfs2: Handle errors while setting external xattr values. ocfs2: Set inline xattr entries with ocfs2_xa_set() ... commit 7f5b09c15ab989ed5ce4adda0be42c1302df70b7 Merge: 9446808 cedf8a7 Author: Linus Torvalds Date: Wed Mar 3 08:48:58 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (220 commits) USB: backlight, appledisplay: fix incomplete registration failure handling USB: pl2303: remove unnecessary reset of usb_device in urbs USB: ftdi_sio: remove obsolete check in unthrottle USB: ftdi_sio: remove unused tx_bytes counter USB: qcaux: driver for auxiliary serial ports on Qualcomm devices USB: pl2303: initial TIOCGSERIAL support USB: option: add Longcheer/Longsung vendor ID USB: fix I2C API usage in ohci-pnx4008. USB: usbmon: mask seconds properly in text API USB: sisusbvga: no unnecessary GFP_ATOMIC USB: storage: onetouch: unnecessary GFP_ATOMIC USB: serial: ftdi: add CONTEC vendor and product id USB: remove references to port->port.count from the serial drivers USB: tty: Prune uses of tty_request_room in the USB layer USB: tty: Add a function to insert a string of characters with the same flag USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration() USB: tty: kill request_room for USB ACM class USB: tty: sort out the request_room handling for whiteheat USB: storage: fix misplaced parenthesis USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers ... commit 94468080220162f74dc6ce5c3e95e5fec8022902 Merge: fb7b096 137ee2f Author: Linus Torvalds Date: Wed Mar 3 08:47:22 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits) jsm: fixing error if the driver fails to load jsm: removing the uart structure and filename on error tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call tty: Keep the default buffering to sub-page units tty: Fix up char drivers request_room usage tty: Fix the ldisc hangup race serial: timberdale: Remove dependancies nozomi: Tidy up the PCI table nozomi: Fix mutex handling nozomi: Add tty_port usage sdio_uart: Use kfifo instead of the messy circ stuff serial: bcm63xx_uart: allow more than one uart to be registered. serial: bcm63xx_uart: don't use kfree() on non kmalloced area. serial: bfin_5xx: pull in linux/io.h for ioremap prototypes serial: bfin_5xx: kgdboc should accept gdb break only when it is active serial: bfin_5xx: need to disable DMA TX interrupt too serial: bfin_5xx: remove useless gpio handling with hard flow control Char: synclink, remove unnecessary checks tty: declare MODULE_FIRMWARE in various drivers ip2: Add module parameter. ... commit fb7b096d949fa852442ed9d8f982bce526ccfe7e Merge: a626b46 fad5399 Author: Linus Torvalds Date: Wed Mar 3 08:15:37 2010 -0800 Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) x86: Fix out of order of gsi x86: apic: Fix mismerge, add arch_probe_nr_irqs() again x86, irq: Keep chip_data in create_irq_nr and destroy_irq xen: Remove unnecessary arch specific xen irq functions. smp: Use nr_cpus= to set nr_cpu_ids early x86, irq: Remove arch_probe_nr_irqs sparseirq: Use radix_tree instead of ptrs array sparseirq: Change irq_desc_ptrs to static init: Move radix_tree_init() early irq: Remove unnecessary bootmem code x86: Add iMac9,1 to pci_reboot_dmi_table x86: Convert i8259_lock to raw_spinlock x86: Convert nmi_lock to raw_spinlock x86: Convert ioapic_lock and vector_lock to raw_spinlock x86: Avoid race condition in pci_enable_msix() x86: Fix SCI on IOAPIC != 0 x86, ia32_aout: do not kill argument mapping x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path x86, irq: Update the vector domain for legacy irqs handled by io-apic x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's ... commit a626b46e17d0762d664ce471d40bc506b6e721ab Merge: c1dcb4b dce46a0 Author: Linus Torvalds Date: Wed Mar 3 08:15:05 2010 -0800 Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) early_res: Need to save the allocation name in drop_range_partial() sparsemem: Fix compilation on PowerPC early_res: Add free_early_partial() x86: Fix non-bootmem compilation on PowerPC core: Move early_res from arch/x86 to kernel/ x86: Add find_fw_memmap_area Move round_up/down to kernel.h x86: Make 32bit support NO_BOOTMEM early_res: Enhance check_and_double_early_res x86: Move back find_e820_area to e820.c x86: Add find_early_area_size x86: Separate early_res related code from e820.c x86: Move bios page reserve early to head32/64.c sparsemem: Put mem map for one node together. sparsemem: Put usemap for one node together x86: Make 64 bit use early_res instead of bootmem before slab x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA x86: Make early_node_mem get mem > 4 GB if possible x86: Dynamically increase early_res array size x86: Introduce max_early_res and early_res_count ... commit c7d5a0050773e98d1094eaa9f2a1a793fafac300 Author: David S. Miller Date: Wed Mar 3 08:08:49 2010 -0800 sparc64: Kill off old sys_perfctr system call and state. People should be using the perf events interfaces, and the way these system call facilities used the %pcr conflicts with the usage of the NMI watchdog and perf events. Signed-off-by: David S. Miller commit c1dcb4bb1e3e16e9baee578d9bb040e5fba1063e Merge: 60f8a8d 6fdb2ee Author: Linus Torvalds Date: Wed Mar 3 08:08:44 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits) firewire: ohci: extend initialization log message firewire: ohci: fix IR/IT context mask mixup firewire: ohci: add module parameter to activate quirk fixes firewire: ohci: use an ID table for quirks detection firewire: ohci: reorder struct fw_ohci for better cache efficiency firewire: ohci: remove unused dualbuffer IR code firewire: core: combine a bit of repeated code firewire: core: change type of a data buffer firewire: cdev: increment ABI version number firewire: cdev: add more flexible cycle timer ioctl firewire: core: rename an internal function firewire: core: fix an information leak firewire: core: increase stack size of config ROM reader firewire: core: don't fail device creation in case of too large config ROM blocks firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500 firewire: remove incomplete Bus_Time CSR support firewire: get_cycle_timer optimization and cleanup firewire: ohci: enable cycle timer fix on ALi and NEC controllers firewire: ohci: work around cycle timer bugs on VIA controllers firewire: make PCI device id constant ... commit 60f8a8d4c6c46bb080e8e65d30be31b172a39a78 Merge: b037bba b2d82ee Author: Linus Torvalds Date: Wed Mar 3 08:08:21 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix large stack use fuse: cleanup in fuse_notify_inval_...() commit fac829fdcaf451a20106cbc468ff886466320956 Author: James Bottomley Date: Wed Mar 3 11:06:56 2010 +0530 [SCSI] raid_attrs: fix dependency problems RAID attributes uses scsi_is_sdev_device() to gate some SCSI specific checking code. This causes two problems. Firstly if SCSI == n just defining scsi_is_sdev_device() to return false might not be enough to prevent gcc from emitting the code (and thus referring to undefined symbols), so this needs surrounding with an ifdef. Secondly, using scsi_is_sdev_device() when SCSI is either y or m gives a subtle problem in the m case: raid_attrs must also be m to use the symbol. Do the usual Kconfig jiggery-pokery to fix this. Reported-by: Randy Dunlap Signed-off-by: James Bottomley commit 98e1e0f07c3f1820b8ac424569ee9e9916d3665b Author: Boaz Harrosh Date: Fri Feb 19 11:46:24 2010 -0800 [SCSI] libosd: Fix unchecked err return found by smatch Doing CHECK="smatch --two-passes gives: drivers/scsi/osd/osd_initiator.c +1435 osd_finalize_request warning: assignment to 'ret' was never used Which is an unchecked possible allocation failure, Fixed. Reported-by: Dan Carpenter Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley commit b037bba71bca77c7247e7c2079f227ad7b961c34 Merge: a03696e 51c1410 Author: Linus Torvalds Date: Wed Mar 3 07:41:24 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (45 commits) compal-laptop: Make it depend on CONFIG_RFKILL classmate-laptop: Added some keys present in other devices MAINTAINERS: Add git tree to x86 Platform Drivers asus-acpi: remove duplicate comparison of asus_model strings toshiba-acpi: fix multimedia keys on some machines dell-laptop: Fix errors on failure and exit paths dell-laptop: Fix build error by making buffer_mutex static asus-laptop: fix style problems reported by checkpath.pl asus-laptop: use device_create_file() instead of platform_group asus-laptop: clean led code asus-laptop: add gps rfkill asus-laptop: set initial lcd state asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init() asus-laptop: add backlight changes notifications asus-laptop: add bluetooth keys found on M9V asus-laptop: switch to sparse keymap library asus-laptop: rename wireless_status to wlan_status to avoid confusion asus-laptop: add error check for write_acpi_int calls asus-laptop: stop using ASUS_HANDLE and use relative methods instead asus-laptop: rename function talking directly to acpi with asus_xxx scheme ... commit a03696e912cd544e1504a79e49600cdb535f42db Merge: 0a135ba 0c43ea5 Author: Linus Torvalds Date: Wed Mar 3 07:34:47 2010 -0800 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Document the message size limit i2c-algo-pca: Drop duplicate variable i2c: Hook up runtime PM support i2c-parport-light: Add SMBus alert support i2c-parport: Add SMBus alert support i2c: Separate Kconfig option for i2c-smbus i2c: Add SMBus alert support i2c-parport: Give powered devices some time to settle i2c-tiny-usb: Fix a comment on bus frequency i2c-i801: Add Intel Cougar Point device IDs i2c: Make PCI device ids constant commit 0a135ba14d71fb84c691a5386aff5049691fe6d7 Merge: 4850f52 a29d8b8 Author: Linus Torvalds Date: Wed Mar 3 07:34:18 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: add __percpu sparse annotations to what's left percpu: add __percpu sparse annotations to fs percpu: add __percpu sparse annotations to core kernel subsystems local_t: Remove leftover local.h this_cpu: Remove pageset_notifier this_cpu: Page allocator conversion percpu, x86: Generic inc / dec percpu instructions local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c module: Use this_cpu_xx to dynamically allocate counters local_t: Remove cpu_local_xx macros percpu: refactor the code in pcpu_[de]populate_chunk() percpu: remove compile warnings caused by __verify_pcpu_ptr() percpu: make accessors check for percpu pointer in sparse percpu: add __percpu for sparse. percpu: make access macros universal percpu: remove per_cpu__ prefix. commit 4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c Merge: 3ff1562 4818972 Author: Linus Torvalds Date: Wed Mar 3 07:33:50 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: print glock numbers in hex GFS2: ordered writes are backwards GFS2: Remove old, unused linked list code from quota GFS2: Remove loopy umount code GFS2: Metadata address space clean up commit 3ff1562ea48cddaa5ac1adcb8892227389a4c96c Merge: 88b6803 fe8875e Author: Linus Torvalds Date: Wed Mar 3 07:33:17 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (48 commits) IB/srp: Clean up error path in srp_create_target_ib() IB/srp: Split send and recieve CQs to reduce number of interrupts RDMA/nes: Add support for KR device id 0x0110 IB/uverbs: Use anon_inodes instead of private infinibandeventfs IB/core: Fix and clean up ib_ud_header_init() RDMA/cxgb3: Mark RDMA device with CXIO_ERROR_FATAL when removing RDMA/cxgb3: Don't allocate the SW queue for user mode CQs RDMA/cxgb3: Increase the max CQ depth RDMA/cxgb3: Doorbell overflow avoidance and recovery IB/core: Pack struct ib_device a little tighter IB/ucm: Clean whitespace errors IB/ucm: Increase maximum devices supported IB/ucm: Use stack variable 'base' in ib_ucm_add_one IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one IB/umad: Clean whitespace IB/umad: Increase maximum devices supported IB/umad: Use stack variable 'base' in ib_umad_init_port IB/umad: Use stack variable 'devnum' in ib_umad_init_port IB/umad: Remove port_table[] IB/umad: Convert *cdev to cdev in struct ib_umad_port ... commit 88b68033b99b16b42e734ab56a4ed6bc1d53516a Author: Randy Dunlap Date: Mon Mar 1 22:06:25 2010 -0800 docbook: fix errors from x86 headers merger Fix docbook errors for x86 headers that were recently merged: docproc: arch/x86/include/asm/atomic_32.h: No such file or directory docproc: arch/x86/include/asm/io_32.h: No such file or directory Signed-off-by: Randy Dunlap Cc: Brian Gerst Signed-off-by: Linus Torvalds commit 4846546f7e3d9ae802c941b0e4f65362c7118bd9 Merge: 832d30c d7b619c Author: Linus Torvalds Date: Wed Mar 3 07:32:10 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] pSesInfo->sesSem is used as mutex. Rename it to session_mutex and [CIFS] Use unsigned ea length for clarity cifs: set server_eof in cifs_fattr_to_inode [CIFS] Minor cleanup to EA patch cifs: merge CIFSSMBQueryEA with CIFSSMBQAllEAs cifs: verify lengths of QueryAllEAs reply cifs: increase maximum buffer size in CIFSSMBQAllEAs cifs: rename name_len to list_len in CIFSSMBQAllEAs cifs: clean up indentation in CIFSSMBQAllEAs cifs: add parens around smb_var in BCC macros commit 1ad02bbce64e5226b0582af85df4e481e2f6b7b9 Author: Dmitry Torokhov Date: Thu Feb 25 01:55:37 2010 -0800 Regulators: wm8400 - cleanup platform driver data handling On Wed, Feb 24, 2010 at 08:40:56PM +0000, Mark Brown wrote: > On Wed, Feb 24, 2010 at 11:21:26AM -0800, Dmitry Torokhov wrote: > > On Wed, Feb 24, 2010 at 07:14:03PM +0000, Mark Brown wrote: > > > > This doesn't help unless you also provide a way for users to obtain a > > > struct wm8400. > > > Why would they need it? Only code that creates instances of wm8400 needs > > to know the definition of the sturcture, the rest can simply pass the > > pointer around. > > > I guess there is disconnect between us and I do not see any users of > > wm8400_register_regulator() in linux-next... Is there another tree I > > could peek at? > > There are no users in mainline. This would be called by board specific > code from the init callback of the wm8400 - you'd need to pass that > callback the struct wm8400. > > In any case, this is clearly an unrelated change to whatever else you > were doing to the driver so should be split off into a separate patch, > but if this is being changed at all then it'd be much more sensible to > change it to use a more modern pattern which completely removes the > wm8400_register_regulator() function and just uses platform data. Fair enough, I removed the offending part, updated patch below. -- Dmitry regulator: wm8400 - cleanup platform driver data handling Driver data set by platform_set_drvdata() is for private use of the driver currently bound to teh device and not for use by parent, subsystem and anyone else. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 598b3578ab9ee8e3eef322128485719668d8b93b Author: Dmitry Torokhov Date: Tue Feb 23 23:38:44 2010 -0800 Regulators: wm8994 - clean up driver data after removal It is a good tone to reset driver data after unbinding the device. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit eb66d565e8eb73ab0c471fd3dac822dc663fe8ea Author: Dmitry Torokhov Date: Tue Feb 23 23:38:39 2010 -0800 Regulators: wm831x-xxx - clean up driver data after removal It is a good tone to reset driver data after unbinding the device. Also set up drivers owner. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 6a74857d1b75e4f58f1a09472b972058499258a4 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:33 2010 -0800 Regulators: pcap-regulator - clean up driver data after removal It is a good tone to reset driver data after unbinding the device. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 308f100f2ef8e8b9f65b0f3c2a1c7044ec0e65a5 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:28 2010 -0800 Regulators: max8660 - annotate probe and remove methods Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit bd88c9b285b76f329243d5c80960c23a04004043 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:23 2010 -0800 Regulators: max1586 - annotate probe and remove methods Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit ebbed04fe7f89c9cb00df32f7123bc1b84b456cb Author: Dmitry Torokhov Date: Tue Feb 23 23:38:17 2010 -0800 Regulators: lp3971 - fail if platform data was not supplied There is no point in completing probe if platform data is missing so let's abort loading early. Also, use kcalloc when allocating several instances of the same data structure and mark setup_regulators() as __devinit since it is only called from lp3971_i2c_probe() which is __devinit. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 56c23492b2266fcbe38f26a3de217902c70a895b Author: Dmitry Torokhov Date: Tue Feb 23 23:38:12 2010 -0800 Regulators: tps6507x-regulator - mark probe method as __devinit Also move error handling in probe() out of line and do not bother to reset fields in structures that are about to be freed. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 54d13ab1038911249fc5769efee87fed000623c0 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:06 2010 -0800 Regulators: tps65023-regulator - mark probe method as __devinit Also move error handling in probe() out of line and do not bother to reset fields in structures that are about to be freed. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 24c29020bac8a35729e1f58270b3622abc2941a2 Author: Dmitry Torokhov Date: Tue Feb 23 23:38:01 2010 -0800 Regulators: twl-regulator - mark probe function as __devinit Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 8ab3343dc61552cb8ad653e1013b1853cea9bea6 Author: Dmitry Torokhov Date: Tue Feb 23 23:37:55 2010 -0800 Regulators: fixed - annotate probe and remove methods Add __devinit/__devexit markings to probe and remove methids of the driver, change types of variables containing boolean data to boolean, set up driver's owner field so we have proper sysfs link between driver and the module. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 98bf7c057b35eaf418ac063c4aba4f9f86220b09 Author: Dmitry Torokhov Date: Tue Feb 23 23:37:50 2010 -0800 Regulators: ab3100 - fix probe and remove annotations Probe and remove methods should not be marked as __init/__exit but rather __devinit/__devexit so that the needed sections stay in memory in presence of CONFIG_HOTPLUG. This is needed even on non hotpluggable buses. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4cf95663c829ddd47c76ba5b749e88864beef0a7 Author: Dmitry Torokhov Date: Tue Feb 23 23:37:44 2010 -0800 Regulators: virtual - use sysfs attribute groups Instead of open-coding sysfs attribute group use canned solution. Also add __devinit/__devexit markups for probe and remove methods and use 'bool' where it makes sense. Signed-off-by: Dmitry Torokhov Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 2ebcf63245b4496808712ed884f6a330d73bc807 Author: Rajendra Nayak Date: Wed Feb 17 20:54:15 2010 +0530 twl6030: regulator: Configure STATE register instead of REMAP This is no REMAP register on twl6030, instead there is a STATE register to drive a resource to a given state. The state register can be used to specify what state the resource should enter when its associated with a GRP. Register Bit field description is as below. The patch programmes the corresponding STATE registers for all LDO's to turn ON when assocaited with GRP_P1. STATE REG: Bit7 |Bit6 |Bit5 |Bit4 |Bit3 |Bit2 |Bit1 |Bit0 P3_GRP |P2_GRP |P1_GRP |RES |RES |RES |State1 |State0 State can be specified as below 00: OFF 01: ON 10: OFF 11: SLEEP Signed-off-by: Rajendra Nayak Cc: Liam Girdwood Cc: Samuel Ortiz Cc: Mark Brown Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 34abbd68efe09765465b81dfedeee9994f13302f Author: Mark Brown Date: Fri Feb 12 10:18:08 2010 +0000 regulator: Provide optional dummy regulator for consumers In order to ease transitions with drivers are boards start using regulators provide an option to cause all regulator_get() calls to succeed, with a dummy always on regulator being supplied where one has not been configured. A warning is printed whenever the dummy regulator is used to aid system development. This regulator does not implement any regulator operations but will allow simple consumers which only do enable() and disable() calls to run. It is kept separate from the fixed voltage regulator to avoid Kconfig confusion on the part of users when it is extended to allow boards to explicitly use the dummy regulator to simplify cases where the majority of supplies are from fixed regulators without software control. This option is currently only effective for systems which do not specify full constriants. If required an override could also be provided to allow these systems to use the dummy regulator, though it is likely that unconfigured supplies on such systems will lead to error due to regulators being powered down more aggressively when not in use. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 9a7f6a4c6edc84748c6477c9df56691a0e61b8fd Author: Mark Brown Date: Thu Feb 11 17:22:45 2010 +0000 regulator: Assume regulators are enabled if they don't report anything If a regulator driver does not provide a way to query if the driver is enabled then assume that it is enabled. This is very likely to reflect the actual state is more useful for callers than reporting an error. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 17133dc82422cb118c843c3e9bbd565c37506ec8 Author: Mark Brown Date: Thu Jan 28 10:21:05 2010 +0000 regulator: Convert fixed voltage regulator to use enable_time() It had an open coded version in enable(). Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 69dc16c325bef32b0a1a1abf15ae4047174cafc1 Author: Mark Brown Date: Mon Jan 25 19:41:57 2010 +0000 regulator: Add WM8994 regulator support The WM8994 contains two LDOs with mixed hardware/software control to minimise the number of external supplies required while delivering optimal voltages to minimise power consumption. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit a71b797fdc672714bfff1fdc142042a95e97d7ba Author: Haojian Zhuang Date: Mon Jan 25 10:24:09 2010 -0500 regulator: enable max8649 regulator driver Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 79ac9bc32094be15732c421ea1d9a18751ec1ecf Author: Alex Chiang Date: Mon Jan 25 21:14:37 2010 -0700 regulator: trivial: fix typos in user-visible Kconfig text Fix Kconfig text for some Wolfson Micro devices. Cc: Mark Brown Signed-off-by: Alex Chiang Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit f4b97b36b7c6b2d4455f27d6371869f915cbe8fd Author: Alberto Panizzo Date: Tue Jan 19 12:48:54 2010 +0100 regulator: mc13783: consider Power Gates as digital regulators. GPO regulators are digital outputs that can be enabled or disabled by a dedicated bit in mc13783 POWERMISC register. In this family can be count in also Power Gates (PWGT1 and 2): enabled by a dedicated pin a Power Gate is an hardware driven supply where the output (PWGTnDRV) follow this law: Bit PWGTxSPIEN | Pin PWGTxEN | PWGTxDRV | Read Back 0 = default | | | PWGTxSPIEN ---------------+-------------+----------+------------ 1 | x | Low | 0 0 | 0 | High | 1 0 | 1 | Low | 0 As read back value of control bit reflects the PWGTxDRV state (not the control value previously written) and mc13783 POWERMISC register contain only regulator related bits, a dedicated function to manage these bits is created here with the aim of tracing the real value of PWGTxSPIEN bits and reproduce it on next writes. All POWERMISC users _must_ use the new function to not accidentally disable Power Gates supplies. v2 changes: -Better utilization of abstraction layers. -Voltage query support. GPO's and PWGTxDRV are fixed voltage regulator with voltage value of 3.1V and 5.5V respectively. Signed-off-by: Alberto Panizzo Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit eda79a3041a2cada0d4ee9491c99c3874b322356 Author: Adrian Hunter Date: Tue Jan 12 12:25:13 2010 +0200 regulator: Add 'start-up time' to fixed voltage regulators Add a field to specify a delay for the start-up time of a fixed voltage regulator. Signed-off-by: Adrian Hunter Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 75c8ac22e4b8ebea8169a090e64d034a96758644 Author: Mark Brown Date: Mon Jan 4 17:24:01 2010 +0000 regulator: Implement enable_time() for WM835x ISINKs Signed-off-by: Mark Brown commit 31aae2beeb3d601d556b6a8c39085940ad1e9f42 Author: Mark Brown Date: Mon Dec 21 12:21:52 2009 +0000 regulator: Allow regulators to specify the time taken to ramp on enable Regulators may sometimes take longer to enable than the control operation used to do so, either because the regulator has ramp rate control used to limit inrush current or because the control operation is very fast (GPIO being the most common example of this). In order to ensure that consumers do not rely on the regulator before it is enabled provide an enable_time() operation and have the core delay for that time before returning to the caller. This is implemented as a function since the ramp rate may be specified in voltage per unit time and therefore the time depend on the configuration. In future it would be desirable to allow the bulk operations to run the delays for multiple enables in parallel but this is not currently supported. Signed-off-by: Mark Brown commit 84b6826306119dc3c41ef9d7ed6c408112f63301 Author: Mark Brown Date: Tue Dec 1 21:12:27 2009 +0000 regulator: Add notifier event on regulator disable The intended use case is for drivers which disable regulators to save power but need to do some work to restore the hardware state when restarting. If the supplies are not actually disabled due to board limits or sharing with other active devices this notifier allows the driver to avoid unneeded reinitialisation, particularly when used with runtime PM. Signed-off-by: Mark Brown commit 6faa7e0a4bb1215fb0a0093a0d426a72599e5982 Author: Tobias Klauser Date: Wed Dec 23 14:13:17 2009 +0100 regulator/lp3971: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1bd588fd9d2611d2573066f49477fb5be2aa13de Author: Alberto Panizzo Date: Mon Dec 14 18:26:38 2009 +0100 regulator: add voltage selection capability to mc13783 regulators v2 . This patch, complete the mc13783 regulator subsystem driver with voltage selecting capability. Main Switches (SW1AB, SW2AB) are not supported yet. version 2 diffs: - delete the "Switchers PLL" enable and multiplication factor value selecting capability because it is not a voltage or current regulator. This will be a part of Main switcher supporting task. - Correct many coding style problems pointed me out. Signed-off-by: Alberto Panizzo Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 50beceba7fdf5f10a04d8a053e62d40b742099ad Author: Steffen Klassert Date: Wed Mar 3 22:41:08 2010 +0800 crypto: authenc - Move saved IV in front of the ablkcipher request In crypto_authenc_encrypt() we save the IV behind the ablkcipher request. To save space on the request, we overwrite the ablkcipher request with a ahash request after encryption. So the IV may be overwritten by the ahash request. This patch fixes this by placing the IV in front of the ablkcipher/ahash request. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit bb2d3de1885cd69a5fc92af99c4e0c05eb5fc122 Author: Martin K. Petersen Date: Tue Mar 2 08:44:34 2010 -0500 [SCSI] sd: Fix VPD buffer allocations Commit e3deec09 incorrectly assumed that the B0 and B1 page lengths were limited to 32 bytes. The B0 VPD page length is defined to be 64 bytes when the device supports thin provisioning. B1 is always defined to be 64 bytes. Signed-off-by: Martin K. Petersen Reported-by: Dan Carpenter Signed-off-by: James Bottomley commit 74315ad00b8ed41e9f97fe322942fa9883517ed1 Author: James Smart Date: Fri Feb 26 14:16:25 2010 -0500 [SCSI] lpfc 8.3.10: Update Driver version to 8.3.10 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 0c9ab6f5cb28199ef5de84874d135ed44f64d92b Author: James Smart Date: Fri Feb 26 14:15:57 2010 -0500 [SCSI] lpfc 8.3.10: Added round robin FCF failover - Added round robin FCF failover on initial or FCF rediscovery FLOGI failure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit fc2b989be9190f3311a5ae41289828e24897a20e Author: James Smart Date: Fri Feb 26 14:15:29 2010 -0500 [SCSI] lpfc 8.3.10: Fix Discovery issues - Prevent Vport discovery after reg_new_vport completes when physical logged in using FDISC. - Remove fast FCF failover fabric name matching. Allow failover to FCFs connected to different fabrics. - Added fast FCF failover in response to FCF DEAD event on current FCF record. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e2aed29f29d0d289df3b0b627b122832d4dc80fe Author: James Smart Date: Fri Feb 26 14:15:00 2010 -0500 [SCSI] lpfc 8.3.10: Added management for LP21000 through BSG. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 0f65ff680f90281d49ee864965f06774eba9657d Author: James Smart Date: Fri Feb 26 14:14:23 2010 -0500 [SCSI] lpfc 8.3.10: Update SLI interface areas - Clear LPFC_DRIVER_ABORTED on FCP command completion. - Clear exchange busy flag when I/O is aborted and found on aborted list. - Free sglq when XRI_ABORTED event is processed before release of IOCB. - Only process iocb as aborted when LPFC_DRIVER_ABORTED is set. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e40a02c12581f710877da372b5d7e15b68a1c5c3 Author: James Smart Date: Fri Feb 26 14:13:54 2010 -0500 [SCSI] lpfc 8.3.10: Fix user interface issues - Add Logging message for critial errors. - Remove unused variable from lpfc_nodev_tmo_show - Update supress_link_up parameter with #define values. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9f1177a3f8eee22427eb97e6e00b62ff0be2871f Author: James Smart Date: Fri Feb 26 14:12:57 2010 -0500 [SCSI] lpfc 8.3.10: Fix Initialization issues - Add NULL checks to the pointers for the config_async mailbox and dump_wakeup_params mailbox. - Add code to check return value of lpfc_read_sparams everywhere and handle failures appropriately. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 43aebfa12e7631124472237dc945c27af54ca646 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:32 2010 -0600 [SCSI] hpsa: remove unused members next, prev, and retry_count from command list structure. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 33a2ffce51d9598380d73c515a27fc6cff3bd9c4 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:27 2010 -0600 [SCSI] hpsa: Increase the number of scatter gather elements supported. This uses the scatter-gather chaining feature of Smart Array controllers. 32 scatter-gather elements are embedded in the "command list", and the last element in the list may be marked as a "chain pointer", and point to an additional block of scatter gather elements. The precise number of scatter gather elements supported is dependent on the particular kind of Smart Array, and is determined at runtime by querying the hardware. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit db61bfcfe2a68dc71402c270686cd73b80971efc Author: Stephen M. Cameron Date: Thu Feb 25 14:03:22 2010 -0600 [SCSI] hpsa: Clarify calculation of padding for commandlist structure Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ff9fea94546afa2a496c15354533f06088347f6e Author: Stephen M. Cameron Date: Thu Feb 25 14:03:17 2010 -0600 [SCSI] hpsa: mark hpsa_pci_init as __devinit Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 31468401ccf64322ca99fe05fbe64f1551240f57 Author: Mike Miller Date: Thu Feb 25 14:03:12 2010 -0600 [SCSI] hpsa: remove scan thread The intent of the scan thread was to allow a UNIT ATTENTION/LUN DATA CHANGED condition encountered in the interrupt handler to trigger a rescan of devices, which can't be done in interrupt context. However, we weren't able to get this to work, due to multiple such UNIT ATTENTION conditions arriving during the rescan, during updating of the SCSI mid layer, etc. There's no way to tell the devices, "stand still while I scan you!" Since it doesn't work, there's no point in having the thread, as the rescan triggered via ioctl or sysfs can be done without such a thread. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e9ea04a65ad842452cbee92b5c865af7fed17f63 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:06 2010 -0600 [SCSI] hpsa: return -ENOMEM, not -1 Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5512672f75611e9239669c6a4dce648b8d60fedd Author: Stephen M. Cameron Date: Thu Feb 25 14:03:01 2010 -0600 [SCSI] hpsa: fix scsi status mis-shift The SCSI status does not need to be shifted. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit f0edafc6628f924a424ab4059df74f46f4f4241e Author: Stephen M. Cameron Date: Thu Feb 25 14:02:56 2010 -0600 [SCSI] hpsa: fix firmwart typo Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 667e23d4e968f6826dc5d3e81238a7f1f343fb4f Author: Stephen M. Cameron Date: Thu Feb 25 14:02:51 2010 -0600 [SCSI] hpsa: allow modifying device queue depth. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit b0f4d4cf12d0eaa0bd766686bba843fc105b6a60 Author: Brian King Date: Sun Feb 21 10:37:58 2010 -0600 [SCSI] ibmvfc: Add suspend/resume support Adds support for resuming from suspend for IBM VFC devices. We may have lost an interrupt over the suspend, so we just kick the interrupt handler to process anything that is outstanding. We expect to find a transport event indicating we need to reestablish our CRQ. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 64355b929dec0cb6271e4ac7834c9cf262961e40 Author: Brian King Date: Sun Feb 21 10:37:57 2010 -0600 [SCSI] ibmvscsi: Add suspend/resume support Adds support for resuming from suspend for IBM VSCSI devices. We may have lost an interrupt over the suspend, so we just kick the interrupt handler to process anything that is outstanding. We expect to find a transport event indicating we need to reestablish our CRQ. Signed-off-by: Brian King Signed-off-by: James Bottomley commit c03af1ae1cce97a5530b907ea03625ce6e00214e Author: Jayamohan Kallickal Date: Sat Feb 20 08:05:43 2010 +0530 [SCSI] be2iscsi: Alloc only one EQ if intr mode This patch ensures that we alloc only one EQ if we are if we are not in msix mode Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit ed58ea2ab58c7d80a07a829a1cc2c4161c300494 Author: Jayamohan Kallickal Date: Sat Feb 20 08:05:07 2010 +0530 [SCSI] be2iscsi: Fixing memory allocation for connection This patch fixes some situations where enough resources were not avaialable when targets exceeded a certain limit Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 90a289e87648f80b63178c463aa7daaf5205805c Author: Jayamohan Kallickal Date: Sat Feb 20 08:04:28 2010 +0530 [SCSI] be2iscsi: Remove debug code This patch removes some debug lines which are unnecessary and also aligns some lines in code Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit dafab8e079f432268cca5cf378b92d6acfacc393 Author: Jayamohan Kallickal Date: Sat Feb 20 08:03:56 2010 +0530 [SCSI] be2iscsi: cleans up abort handling This patch cleans up abort handling when TMF is sent Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 944b2fbce26ce39555363fd092386807fa5ea08c Author: Jayamohan Kallickal Date: Sat Feb 20 08:03:24 2010 +0530 [SCSI] be2iscsi: Fix for a possible udelay while holding lock This patch fixes a situation where we could call udelay while holding spin_lock Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 4183122dbc7c489f11971c5afa8e42011bca7fa2 Author: Jayamohan Kallickal Date: Sat Feb 20 08:02:39 2010 +0530 [SCSI] be2iscsi: Cleanup of resets for device and target This patch cleans up device and target reset handling for the driver Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 309ce156aa27f29338438011d292a8d6496623d3 Author: Jayamohan Kallickal Date: Sat Feb 20 08:02:10 2010 +0530 [SCSI] libiscsi: Make iscsi_eh_target_reset start with session reset The iscsi_eh_target_reset has been modified to attempt target reset only. If it fails, then iscsi_eh_session_reset will be called. Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 6c5ae5b278e29c1a23fd562e1a5276c2e2ea1738 Author: David S. Miller Date: Wed Mar 3 02:55:24 2010 -0800 sparc: Update defconfigs. Signed-off-by: David S. Miller commit d7b4627f5f3390a2f350f16c047b3fc3eccce6d8 Author: Wayne Boyer Date: Fri Feb 19 13:24:38 2010 -0800 [SCSI] ipr: adds PCI ID definitions for new adapters This patch adds the PCI ID definitions for new adapters based on the next generation 64 bit IOA PCI interface chip. New entries have been added to the ipr_pci_table[] array for the adapters and to the ipr_chip[] array for the new versions of the chip. Older entries have been removed for cards that did not ship. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 5aa3a333eaae1016f5a72f9e0e2dce39c08762f8 Author: Wayne Boyer Date: Fri Feb 19 13:24:32 2010 -0800 [SCSI] ipr: add support for new IOASCs This patch adds support for new errors that can be received from adapters using the next generation 64 bit IOA PCI interface chip. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 214777ba125e2902c9b84c764be38099c94d0bd2 Author: Wayne Boyer Date: Fri Feb 19 13:24:26 2010 -0800 [SCSI] ipr: add support for multiple stages of initialization This patch adds support for using the new IOA initialization feedback register. It also enables 64 bit support in the ipr_ioafp_identify_hrrq and ipr_mask_and_clear_interrupts routines. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit f72919ec2bbbe1c42cdda7857a96c0c40e1d78aa Author: Wayne Boyer Date: Fri Feb 19 13:24:21 2010 -0800 [SCSI] ipr: implement shutdown changes and remove obsolete write cache parameter This patch adds a reboot notifier that will issue a shutdown prepare command to all adapters. This helps to prevent a problem where the primary adapter can get shut down before the secondary adapter and cause the secondary adapter to fail over and log and error. This patch also removes the "enable_cache" paramater as it is obsolete. Write cache for an adapter is now controlled from the iprconfig utility. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit dcbad00e6b403089b1846e788bc1a0c67b2bfd2d Author: Wayne Boyer Date: Fri Feb 19 13:24:14 2010 -0800 [SCSI] ipr: add hardware assisted smart dump functionality This patch adds the hardware assisted smart dump functionality for the next generation IOA PCI interface chip. Signea-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 4565e3706329f65b5e64328b5369c53b6ab2715c Author: Wayne Boyer Date: Fri Feb 19 13:24:07 2010 -0800 [SCSI] ipr: add error handling updates for the next generation chip Add support for the new log data notification and overlay IDs. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 3e7ebdfa58ddaef361f9538219e66a7226fb1e5d Author: Wayne Boyer Date: Fri Feb 19 13:23:59 2010 -0800 [SCSI] ipr: update the configuration table code for the next generation chip This patch changes the configuration table structures and related code such that both 32 bit and 64 bit based adapters can work with the driver. This patch also implements the code to generate the virtual bus/id/lun values for devices connected to the new adapters. It also implements support for the new device resource path. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit a74c16390a47dcb6c96b20b572ffc9936073d4b1 Author: Wayne Boyer Date: Fri Feb 19 13:23:51 2010 -0800 [SCSI] ipr: define new offsets to registers for the next generation chip This patch adds the entry to the ipr_chip_cfg array that defines the register offsets for the next generation 64 bit IOA PCI interface chip. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit a32c055feed74246747bf4f45adb765136d3a4d3 Author: Wayne Boyer Date: Fri Feb 19 13:23:36 2010 -0800 [SCSI] ipr: add support for new adapter command structures for the next generation chip Change the adapter command structures such that both 32 bit and 64 bit based adapters can work with the driver. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 1bff4dbb79a2bc0ee4881c8ea6a4fbed64ea6309 Author: David S. Miller Date: Wed Mar 3 02:30:37 2010 -0800 sparc: Provide io{read,write}{16,32}be(). Signed-off-by: David S. Miller commit 6c71dcb28ff9b63b814a0b76a256f5dae08d3e0d Author: Hannes Reinecke Date: Wed Dec 2 14:28:48 2009 -0600 [SCSI] scsi_dh_emc: fix mode select request setup This patch fixes the request setup code for mode selects. I got the fixes from Hannes Reinecke while trying to hunt down some problems and merged it into one patch. I am sending it because Hannes is busy with other things. The patch fixes: - setting of the length for mode selects. - setting of the data direction for mode select 10. Signed-off-by: Hannes Reinecke Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1cd4efddc4512ccbd9fe317f688f361605ca0c88 Author: Randy Dunlap Date: Wed Mar 3 01:23:22 2010 -0800 bridge: depends on INET br_multicast calls ip_send_check(), so it should depend on INET. built-in: br_multicast.c:(.text+0x88cf4): undefined reference to `ip_send_check' or modular: ERROR: "ip_send_check" [net/bridge/bridge.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4d63cb4d8638fdf2e3bf874936335a08e3b5d8fe Author: Vladislav Zolotarov Date: Wed Mar 3 01:09:21 2010 -0800 bnx2x: Removed FW 5.2.7 Removed FW 5.2.7. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4d27b87785a743fdae653d395a3a4e763269c53c Author: Dan Carpenter Date: Tue Mar 2 21:07:24 2010 +0000 davinci_emac: off by one This off by one error was found by smatch. drivers/net/davinci_emac.c +2390 emac_dev_open(13) error: buffer overflow 'priv->mac_addr' 6 <= 6 Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit bf829370a8d664d87a61697c8a0d6d780c336aa4 Author: Dan Carpenter Date: Tue Mar 2 22:22:41 2010 +0000 cassini: fix off by one There are only 6 link_modes. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit d4612cb86ed8db8956b6b19435f8a30de6c67ffe Author: Marcel Holtmann Date: Tue Mar 2 15:48:23 2010 +0000 Bluetooth: Use single_open() for inquiry cache within debugfs The inquiry cache information in debugfs should be using seq_file support and not allocating memory on the stack for the string. Since the usage of these information is really seldom, using single_open() for it is good enough. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 1162563f82b434e3099c9e6c1bbdba846d792f0d Author: Jiri Pirko Date: Tue Mar 2 20:40:01 2010 +0000 af_packet: move strict addr_len check right before dev_[mc/unicast]_[add/del] My previous patch 914c8ad2d18b62ad1420f518c0cab0b0b90ab308 incorrectly changed the length check in packet_mc_add to be more strict. The problem is that userspace is not filling this field (and it stays zeroed) in case of setting PACKET_MR_PROMISC or PACKET_MR_ALLMULTI. So move the strict check to the point in path where the addr_len must be set correctly. Signed-off-by: Jiri Pirko Reported-by: Pavel Roskin Signed-off-by: David S. Miller commit 9fe969345b10931319b3f1e7034fbdeb786de234 Author: Sarveshwar Bandi Date: Tue Mar 2 22:37:28 2010 +0000 be2net: download NCSI section during firmware update Adding code to update NCSI section while updating firmware on the controller. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 48a29516e8b0b8cd59f5afec90a14f49dd9cf967 Author: Dan Carpenter Date: Tue Mar 2 22:46:10 2010 +0000 cpmac: use after free The original code dereferenced "cpmac_mii" after calling "mdiobus_free(cpmac_mii);" Signed-off-by: Dan Carpenter Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 Author: Herbert Xu Date: Tue Mar 2 02:51:56 2010 +0000 ipsec: Fix bogus bundle flowi When I merged the bundle creation code, I introduced a bogus flowi value in the bundle. Instead of getting from the caller, it was instead set to the flow in the route object, which is totally different. The end result is that the bundles we created never match, and we instead end up with an ever growing bundle list. Thanks to Jamal for find this problem. Reported-by: Jamal Hadi Salim Signed-off-by: Herbert Xu Acked-by: Steffen Klassert Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc Merge: b1681c5 8495fb1 Author: David S. Miller Date: Tue Mar 2 23:57:59 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6 commit a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb Author: Dominik Brodowski Date: Fri Jan 15 23:55:21 2010 +0100 pcmcia: disable pcmcia ioctl for !ARM, prepare for removal The PCMCIA ioctl -- deprecated for years -- suffers from insufficient locking. As it already has been deprecated for years, with its removal long overdue, limit it to !SMP and !PREEMPT. Furthermore, the last legitimate use of the ioctl to be reported relates to the ARM architecture in 2008.[1] Attempts to resolve this issue turned out unsuccessful so far.[2] Other usages have only been reported as hear-say. If there are any legitiate and necessary use-cases remaining, please speak out before the end of the grace period until 2.6.3{5,6}(-rc1). [1] http://lists.infradead.org/pipermail/linux-pcmcia/2008-April/005440.html see also: http://lkml.org/lkml/2008/2/27/291 [2] http://lists.infradead.org/pipermail/linux-pcmcia/2008-April/005450.html http://lists.infradead.org/pipermail/linux-pcmcia/2010-January/006740.html see also: http://lists.infradead.org/pipermail/linux-pcmcia/2008-April/005453.html CC: Russell King CC: Alan Cox CC: Robert P. J. Day CC: Jaswinder Singh Rajput CC: linux-kernel@vger.kernel.org Signed-off-by: Dominik Brodowski commit 6e83ee075ed74941ccaad4fec503f6b24646e7e0 Author: Dominik Brodowski Date: Tue Mar 2 08:57:33 2010 +0100 pcmcia: CodingStyle fixes Fix most of the remaining CodingStyle issues in drivers/pcmcia , which related to wrong indent -- PCMCIA historically used 4 spaces. Also, remove a custom min() implementation with the generic one. Signed-off-by: Dominik Brodowski commit 09e1172317d1038918c5a139ba31155610f802b5 Author: Paul Mundt Date: Wed Mar 3 13:16:31 2010 +0900 sh: establish PMB mappings for NUMA nodes. In the case of NUMA emulation when in range PPNs are being used for secondary nodes, we need to make sure that the PMB has a mapping for it before setting up the pgdat. This prevents the MMU from resetting. Signed-off-by: Paul Mundt commit a1042aa248e4ea7f39d5ce13f080cbf3b6c42618 Author: Paul Mundt Date: Wed Mar 3 13:13:25 2010 +0900 sh: check for existing mappings for bolted PMB entries. When entries are being bolted unconditionally it's possible that the boot loader has established mappings that are within range that we don't want to clobber. Perform some basic validation to ensure that the new mapping is out of range before allowing the entry setup to take place. Signed-off-by: Paul Mundt commit 29044ad1509ecc229f1d5a31aeed7a8dc61a71c4 Author: Frederic Weisbecker Date: Wed Mar 3 02:25:22 2010 +0100 x86/stacktrace: Don't dereference bad frame pointers Callers of a stacktrace might pass bad frame pointers. Those are usually checked for safety in stack walking helpers before any dereferencing, but this is not the case when we need to go through one more frame pointer that backlinks the irq stack to the previous one, as we don't have any reliable address boudaries to compare this frame pointer against. This raises crashes when we record callchains for ftrace events with perf because we don't use the right helpers to capture registers there. We get wrong frame pointers as we call task_pt_regs() even on kernel threads, which is a wrong thing as it gives us the initial state of any kernel threads freshly created. This is even not what we want for user tasks. What we want is a hot snapshot of registers when the ftrace event triggers, not the state before a task entered the kernel. This requires more thoughts to do it correctly though. So first put a guardian to ensure the given frame pointer can be dereferenced to avoid crashes. We'll think about how to fix the callers in a subsequent patch. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: 2.6.33.x Cc: Arnaldo Carvalho de Melo commit d8111cd91abee016d62b401e057fee66ba80be67 Author: Jacob Pan Date: Tue Mar 2 09:19:28 2010 -0800 x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC PCI_IOAPIC is used for PCI hotplug, Moorestown does not have ACPI PCI hotplug, as it does not have ACPI. This unnecessary dependency causes X86_MRST fail to be selected if ACPI is not selected. Signed-off-by: Jacob Pan LKML-Reference: <1267550368-7435-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin commit ac91d85456372a90af5b85eb6620fd2efb1e431b Author: Lai Jiangshan Date: Tue Mar 2 17:54:50 2010 +0800 tracing: Fix warning in s_next of trace file ops This warning in s_next() can be triggered by lseek(): [] ? s_next+0x77/0x80 [] warn_slowpath_common+0x81/0xa0 [] ? s_next+0x77/0x80 [] warn_slowpath_null+0x1a/0x20 [] s_next+0x77/0x80 [] traverse+0x117/0x200 [] seq_lseek+0xa3/0x120 [] ? seq_lseek+0x0/0x120 [] vfs_llseek+0x41/0x50 [] sys_llseek+0x66/0xa0 [] sysenter_do_call+0x12/0x26 The iterator "leftover" variable is zeroed in the opening of the trace file. But lseek can call s_start() which will call s_next() without reseting the "leftover" variable back to zero, which might trigger the WARN_ON_ONCE(iter->leftover) that is in s_next(). Cc: stable@kernel.org Signed-off-by: Lai Jiangshan LKML-Reference: <4B8CE06A.9090207@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit cbb9bf65ae25dee772e85589136e7dd1c3e743ae Author: Szilveszter Ördög Date: Wed Mar 3 08:03:23 2010 +0800 crypto: hash - Fix handling of unaligned buffers The correct way to calculate the start of the aligned part of an unaligned buffer is: offset = ALIGN(offset, alignmask + 1); However, crypto_hash_walk_done() has: offset += alignmask - 1; offset = ALIGN(offset, alignmask + 1); which actually skips a whole block unless offset % (alignmask + 1) == 1. This patch fixes the problem. Signed-off-by: Szilveszter Ördög Signed-off-by: Herbert Xu commit 882d01f96bc1909455696aae6eb7ce4df3e908c8 Merge: 64ed28a d608c73 Author: Russell King Date: Tue Mar 2 23:40:15 2010 +0000 Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile commit 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 Merge: b93a4af 17ccb83 Author: Russell King Date: Tue Mar 2 23:31:07 2010 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable Conflicts: arch/arm/Kconfig commit b93a4afcff7be859e30cad2a305731516057d6cf Merge: 62c132a 9b1489e Author: Russell King Date: Tue Mar 2 23:29:32 2010 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable Conflicts: arch/arm/Makefile commit d424b925f7092b9d95e0a8556872349abe79d9b6 Author: Dave Airlie Date: Wed Mar 3 09:26:35 2010 +1000 vga_switcheroo: disable default y by new rules. Another undocumented rule of kernel folklore, no default y config options anymore, apparantly hinting to distros they might want something isn't preferred anymore. Signed-off-by: Dave Airlie commit 2f41a7f11c4bb93c41715008a693cadaee5efd82 Author: Dave Airlie Date: Wed Mar 3 09:20:25 2010 +1000 drm/nouveau: fix *staging* driver build with switcheroo off. This driver is in *staging*. Fix the build with the switcheroo off. Signed-off-by: Dave Airlie commit cedf8a78421943441b9011ce7bcdab55f07d2ea6 Author: Bruno Prémont Date: Fri Feb 26 13:02:04 2010 +0100 USB: backlight, appledisplay: fix incomplete registration failure handling On error while registering backlight, return it to caller instead of returning 0. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Signed-off-by: Greg Kroah-Hartman commit 124d255382ddd37ffa920e9f5183efa54bbfe4f2 Author: Johan Hovold Date: Thu Feb 25 20:52:30 2010 +0100 USB: pl2303: remove unnecessary reset of usb_device in urbs URBs are initialised at probe and do not change. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit a880830e48e6fb7694de76ebb4a6c6bb0800f758 Author: Johan Hovold Date: Thu Feb 25 20:19:10 2010 +0100 USB: ftdi_sio: remove obsolete check in unthrottle No need to check ASYNCB_INITIALIZED anymore as commit e1108a63e10d344284011cccc06328b2cd3e5da3 (usb_serial: Use the shutdown() operation) make sure that there is no longer any call to unthrottle after device specific close (in which the read urb is killed). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 04b922c41710d770460c4663f69eabb0bf670be9 Author: Johan Hovold Date: Thu Feb 25 20:18:13 2010 +0100 USB: ftdi_sio: remove unused tx_bytes counter Remove counter that is never exported. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 019ccc73201e933fe7d8119c90a812d347e325f9 Author: Dan Williams Date: Thu Feb 25 10:39:20 2010 -0800 USB: qcaux: driver for auxiliary serial ports on Qualcomm devices qcaux: add driver for QCDM-capable ports on various devices Many Qualcomm-based devices provide a CDC-ACM port which accepts normal AT commands and PPP connections. But they only provide one which makes status or signal strength requests impossible while PPP is active. They also provide secondary USB interfaces that talk the Qualcomm Diagnostic Monitor (QCDM) protocol which can be used for status and strength. Make those QCDM ports accessible. Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit 67b9946dd07eeef8188e4cab816d2c370bcaa7b2 Author: John Tsiombikas Date: Thu Feb 25 17:09:08 2010 +0200 USB: pl2303: initial TIOCGSERIAL support I've got a trivial patch for the pl2303 driver, that's what I needed to make the wacom serial tablet driver work properly. It uses the TIOCGSERIAL ioctl to determine if it's talking to a serial device or not, which I gather is rather common, but the pl2303 driver didn't implement that ioctl. Here's a patch, I'm not sure it's absolutely correct, I mostly looked at other similar usbserial drivers to see what I must do, but it works for me. Signed-off-by: John Tsiombikas Signed-off-by: Greg Kroah-Hartman commit ac7d4ca9e0b27d7705d273f17afd29828db35ee6 Author: Dan Williams Date: Tue Feb 16 18:43:29 2010 -0800 USB: option: add Longcheer/Longsung vendor ID Longcheer is a Chinese company that manufactures the devices which a bunch of different companies like Alcatel, 4G Systems, and Mobidata rebrand. While I can't find Longcheer's USB ID registered anywhere, it's pretty clear the ID is theirs. Signed-off-by: Dan Williams Cc: stable Signed-off-by: Greg Kroah-Hartman commit 8740cc7d0c532e098cc428251c08befd14f087d8 Author: Luotao Fu Date: Fri Feb 19 15:42:00 2010 +0100 USB: fix I2C API usage in ohci-pnx4008. i2c_board_info doesn't contain a member called name. i2c_register_client call does not exist. Signed-off-by: Luotao Fu Acked-by: Jean Delvare Cc: stable Signed-off-by: Greg Kroah-Hartman commit 47cb17089c059d24e5da03f2b44ee3a089075b78 Author: Pete Zaitcev Date: Fri Feb 19 23:55:57 2010 -0700 USB: usbmon: mask seconds properly in text API The code does not implement the comment, so timestamps for long traces become confusing instead of wrapping neatly as expected. This was actually observed. Fortunately for API being in debugfs, we can just fix this instead of staying bug-for-bug compatible. Double fortunately, the stable binary API is not affected. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 444dc54c28740d90cb2d5f38e8163bcb46c5a885 Author: Oliver Neukum Date: Sat Feb 20 01:40:54 2010 +0100 USB: sisusbvga: no unnecessary GFP_ATOMIC If a driver can wait on an event, it can also use GFP_KERNEL. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3756c7c091f4ca8bcaf89ee3855a326d69209716 Author: Oliver Neukum Date: Sat Feb 20 02:03:19 2010 +0100 USB: storage: onetouch: unnecessary GFP_ATOMIC No need to use GFP_ATOMIC to allocate buffers. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 46b72d78cb022714c89a9ebc00b9581b550cfca7 Author: Daniel Sangorrin Date: Mon Feb 22 11:03:11 2010 +0900 USB: serial: ftdi: add CONTEC vendor and product id This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds identifiers for CONTEC USB serial converter. I tested it with the device COM-1(USB)H Signed-off-by: Daniel Sangorrin Cc: Andreas Mohr Signed-off-by: Greg Kroah-Hartman commit 1f87158e44e79e62c8250f278c225ce4ab695f4b Author: Alan Stern Date: Wed Feb 17 10:05:47 2010 -0500 USB: remove references to port->port.count from the serial drivers This patch (as1344) removes references to port->port.count from the USB serial drivers. Now that serial ports are properly reference counted, port.count checking is unnecessary and incorrect. Drivers should assume that the port is in use from the time the open method runs until the close method is called. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a108bfcb372d8c4452701039308fb95747911c59 Author: Alan Cox Date: Thu Feb 18 16:44:01 2010 +0000 USB: tty: Prune uses of tty_request_room in the USB layer We have lots of callers that do not need to do this in the first place. Remove the calls as they both cost CPU and for big buffers can mess up the multi-page allocation avoidance. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2832fc11f1360668482beec06dbcd631ae5f0cf1 Author: Alan Cox Date: Thu Feb 18 16:43:54 2010 +0000 USB: tty: Add a function to insert a string of characters with the same flag The USB drivers often want to insert a series of bytes all with the same flag set - provide a helper for this case. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e4a3d94658b5760fc947d7f7185c57db47ca362a Author: Roel Kluin Date: Thu Feb 18 02:36:23 2010 +0100 USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration() While looping over the interfaces, if usb_hcd_alloc_bandwidth() fails it calls hcd->driver->reset_bandwidth(), so there was no need to reinstate the interface again. If no break occurred, the index equals config->desc.bNumInterfaces. A subsequent usb_control_msg() failure resulted in a read from config->interface[config->desc.bNumInterfaces] at label reset_old_alts. In either case the last interface should be skipped. Signed-off-by: Roel Kluin Acked-by: Alan Stern Acked-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit b6a2f10ca045c9b0a4732c38485ad6ca1b663bf4 Author: Alan Cox Date: Wed Feb 17 13:07:05 2010 +0000 USB: tty: kill request_room for USB ACM class Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 67ccbd6f1af3025af3224be5c4f992aaf8811334 Author: Alan Cox Date: Wed Feb 17 13:06:57 2010 +0000 USB: tty: sort out the request_room handling for whiteheat This driver has its own (surplus) backup queue system which wants removing from the receive overflow logic. Do this at the same time as removing the request_room logic Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 5d3034ab8faea229942e79d867d18722d5375b12 Author: Roel Kluin Date: Wed Feb 17 11:50:26 2010 +0100 USB: storage: fix misplaced parenthesis Due to a misplaced parenthesis the usbat_write_block() return value was not stored, but a boolean. USB_STOR_TRANSPORT_NO_SENSE and USB_STOR_TRANSPORT_ERROR were returned as USB_STOR_TRANSPORT_FAILED. Signed-off-by: Roel Kluin Cc: Joe Perches Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6d61ae9112960a2b3ed3360602dfb3bfd357954f Author: Dennis O'Brien Date: Mon Feb 15 08:50:38 2010 -0800 USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers This patch removes the vstusb driver and support from the Linux tree. This driver provided support for Vernier Software & Technology devices and spectrometers (Ocean Optics). This driver is being replaced by a user space - libusb - implementation. Signed-off-by: Jim Collar Signed-off-by: Greg Kroah-Hartman commit cd780694920fbf869b23c8afb0bd083e7b0448c7 Author: Alan Stern Date: Thu Feb 25 13:19:37 2010 -0500 USB: fix the idProduct value for USB-3.0 root hubs This patch (as1346) changes the idProduct value for USB-3.0 root hubs from 0x0002 (which we already use for USB-2.0 root hubs) to 0x0003. Signed-off-by: Alan Stern Acked-by: Sarah Sharp CC: stable Signed-off-by: Greg Kroah-Hartman commit 49d6271b85a3e18062eaf4d6f8d899abe00a7725 Author: Alan Stern Date: Fri Feb 26 11:49:39 2010 -0500 usb-storage: use max_hw_sectors instead of max_sectors This patch (as1347) makes some adjustments to the way usb-storage handles the request-queue parameters. USB host controllers are able to handle arbitrarily long scatter-gather lists, since they are limited only by main memory and not by the controller hardware. Hence the sg_tablesize field in the host template can be increased to the maximum value. Drivers like usb-storage aren't supposed to touch the queue's max_sectors parameter; instead they are supposed to use the max_hw_sectors value. Accordingly, the patch replaces calls of queue_max_sectors() with calls of queue_max_hw_sectors(). Oddly enough, the blk_queue_max_sectors() routine is nevertheless still appropriate. The existing code imposes a limit of SCSI_DEFAULT_MAX_SECTORS (1024) on the values accepted by the max_sectors attribute file. There's no reason not to accept larger values, so the limit is removed. (It would be nice to change the file's name to max_hw_sectors, but the old name is already a well-established API.) Signed-off-by: Alan Stern CC: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit efe7daf2231a6beb59f0f641461d19fa62fb83ab Author: Sergei Shtylyov Date: Fri Feb 12 23:52:34 2010 +0400 USB: OHCI: DA8xx/OMAP-L1x glue layer Texas Instruments DA8xx/OMAP-L1x OHCI glue layer. This OHCI implementation is not without quirks: there's only one physical port despite the root hub reporting two; the port's power control and over-current status bits are not connected to any pins, however, at least on the DA830 EVM board, those signals are connected via GPIO, thus the provision was made for overriding the OHCI port power and over-current bits at the board level... Signed-off-by: Mikhail Cherkashin Signed-off-by: Sergei Shtylyov Signed-off-by: Greg Kroah-Hartman commit bdee2d8432f5af5af953896182a59ec1c5d6fa3a Author: Anand Gadiyar Date: Fri Feb 12 17:49:00 2010 +0530 USB: ehci: omap: Update TODO list in comments DPLL5 programming was moved out of this file before submission. Update the TODO list in the comments to reflect this Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 9b43cffbbd3e9f77e16826513f26544cce3b5864 Author: Anand Gadiyar Date: Fri Feb 12 17:48:59 2010 +0530 USB: ehci: omap: use default interrupt threshold The current driver reduces the interrupt threshold to 1 microframe. This was an accidental change and is not really required. The default of 8 microframes will do just fine. So change it back. Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit bdb581bd6bd59a3303974977544d679d849214d1 Author: Anand Gadiyar Date: Fri Feb 12 17:54:59 2010 +0530 USB: omap: ehci: kill 2 compile warnings Kill these compile warnings: CC [M] drivers/usb/host/ehci-hcd.o drivers/usb/host/ehci-dbg.c:45: warning: 'dbg_hcs_params' defined but not used drivers/usb/host/ehci-dbg.c:89: warning: 'dbg_hcc_params' defined but not used Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit b87c6e86dac1bb5222279cc8ff7e09529e1c4ed9 Author: Elina Pasheva Date: Mon Feb 15 14:50:14 2010 -0800 USB: serial: sierra driver indat_callback fix A crash has been reported with sierra driver on disconnect with Ubuntu/Lucid distribution based on kernel-2.6.32. The cause of the crash was determined as "NULL tty pointer was being referenced" and the NULL pointer was passed by sierra_indat_callback(). This patch modifies sierra_indat_callback() function to check for NULL tty structure pointer. This modification prevents a crash from happening when the device is disconnected. This patch fixes the bug reported in Launchpad: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/511157 Signed-off-by: Elina Pasheva Cc: stable Signed-off-by: Greg Kroah-Hartman commit 7650cd9678df29b01d1e46a9d2ce7e5d8c72b3ce Author: Elina Pasheva Date: Thu Feb 11 18:37:40 2010 -0800 USB: serial: sierra driver adding reset_resume function This patch adds a new function to the sierra.c driver, sierra_reset_resume(). This new function completes the suite of Dynamic Power Management commands in the sierra.c driver. Signed-off-by: Elina Pasheva Signed-off-by: Greg Kroah-Hartman drivers/usb/serial/sierra.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) commit 05197921ff3dad52d99fd1647974c57d9c28d40e Author: Edward Shao Date: Thu Feb 11 03:37:30 2010 +0800 USB: xhci: Fix finding extended capabilities registers According "5.3.6 Capability Parameters (HCCPARAMS)" of xHCI rev0.96 spec, value of xECP register indicates a relative offset, in 32-bit words, from Base to the beginning of the first extended capability. The wrong calculation will cause BIOS handoff fail (not handoff from BIOS) in some platform with BIOS USB legacy sup support. Signed-off-by: Edward Shao Cc: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit cceffe9348f93188d7811bda95924d4bd3040d0f Author: Alan Stern Date: Mon Feb 8 09:45:12 2010 -0500 USB: remove debugging message for uevent constructions This patch (as1332) removes an unneeded and annoying debugging message announcing all USB uevent constructions. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 49d3380e3f1297ff7bdc700c0a7fe6c3a036b3ab Author: Alan Cox Date: Mon Feb 8 10:10:04 2010 +0000 tty: Fix various bogus WARN checks in the usb serial layer We are now refcounted and all the port.count checking is no longer valid and in fact produces false warnings. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit bd07c551aae5d2200c7b195142e5ba63f26424da Author: Alan Cox Date: Mon Feb 8 10:10:44 2010 +0000 USB: cp210x: Add 81E8 (Zephyr Bioharness) As reported in http://bugzilla.kernel.org/show_bug.cgi?id=10980 Signed-off-by: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman commit efcbd3df079a6f8a8a2d5207c4e8429e02356c79 Author: Joe Perches Date: Fri Feb 5 18:09:49 2010 -0800 USB: Extend and neaten dbg macros Add format/argument validation for #ifndef DEBUG dbg macro Neaten dbg macro definitions Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit f45ba776da4fe6c9a9eddd42b0fd5d1f15c260f3 Author: Joe Perches Date: Fri Feb 5 17:51:13 2010 -0800 USB: Convert concatenated __FILE__ to %s, __FILE__ Reduces string space a bit Neaten a macro redefine of dbg Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 759f3634267a67ac90f3fa7fc06510dfd43b4e45 Author: Joe Perches Date: Fri Feb 5 16:50:08 2010 -0800 USB: serial: Remove unnecessary \n's from dbg uses #define dbg adds the newline, messages shouldn't. Converted dbg("%s", "some string") to dbg("some string") Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 815e173e1d71742f1135fb4d4931e8115a3ca0ef Author: Jason Wessel Date: Fri Feb 5 11:49:05 2010 -0600 USB: ehci-dbgp: split PID register updates for IN and OUT pipes This patch addresses two problems: 1) Bulk reads should always use the DATA0 for the pid, and the write PID should toggle between DATA0 and DATA1. The fix is using dbgp_pid_write_update() and dbgp_pid_read_update(). 2) The delay loop for waiting for a transaction was not long enough to always complete the initial handshake inside dbgp_wait_until_done(). After the initial handshake the maximum delay length is never reached. The combined result of these two changes allows for the removal of the forced resynchronization where a bulk write was issued with a dummy data payload only to get the device to start accepting data writes again. CC: Eric Biederman CC: Yinghai Lu Signed-off-by: Jason Wessel Signed-off-by: Greg Kroah-Hartman commit 5272098365514ab232fa6a695d58c3961fec6b7a Author: Forest Bond Date: Fri Feb 5 11:30:28 2010 -0500 USB: serial: Add support for ViVOtech ViVOpay devices. Add support for USB serial interface provided by ViVOtech ViVOpay devices via new driver vivopay-serial. Currently only the ViVOpay 8800 device is supported, but support for similar devices can be added by adding the appropriate device IDs to the driver. Signed-off-by: Forest Bond Signed-off-by: Greg Kroah-Hartman commit 640e95abdfae9fef5949084c92e80c8f2f8b5ec5 Author: Eirik Aanonsen Date: Fri Feb 5 09:49:25 2010 +0100 USB: atmel uaba: Adding invert vbus_pin Adding vbus_pin_inverted so that the usb detect pin can be active high or low depending on HW implementation also replaced the gpio_get_value(udc->vbus_pin); with a call to vbus_is_present(udc); This allows the driver to be loaded and save about 0,15W on the consumption. Signed-off-by: Eirik Aanonsen Signed-off-by: Greg Kroah-Hartman commit 90f7976880bbbf9968629500972f8e2f80401217 Author: Christoph Egger Date: Fri Feb 5 13:24:12 2010 +0100 USB: Remove unsupported usb gadget drivers A bunch of USB gadget drivers where never ported from the linux 2.4 series to 2.6 kernels. However there's some code still in the tree for them which isn't used and is probably untested for ages. As the chance of these drivers being forward ported is probably quite small now it might be time to get rid of them. Signed-off-by: Christoph Egger Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8e7e61dfbf1ec6418bf89505980b158a8d00d877 Author: Peter Korsgaard Date: Thu Feb 4 17:15:25 2010 +0100 USB: f_mass_storage: fix crash on bind() error init_completion() hasn't been called yet and the thread isn't created if we end up here, so don't call complete() on thread_notifier. Signed-off-by: Peter Korsgaard Acked-by: Michal Nazarewicz Cc: stable Signed-off-by: Greg Kroah-Hartman commit 2b626dc134d38d0001b98acf8c7293b6bc5ee86d Author: Oliver Neukum Date: Wed Feb 3 17:10:22 2010 +0100 USB: cdc-acm: fix possible deadlock with multiple openers The lock must be dropped before usb_autopm_interface_put() is called Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d7e18a9f2c506467ec7a9c066da45a0f60c6f5a6 Author: Michal Nazarewicz Date: Wed Feb 3 11:37:17 2010 +0100 USB: g_mass_storage: min(...) warning fixed This patch fixes warning caused by calling min() macro with arguments of different types: drivers/usb/gadget/f_mass_storage.c:623: warning: \ comparison of distinct pointer types lacks a cast Reported-by: Stephen Rothwell Signed-off-by: Michal Nazarewicz Cc: Marek Szyprowski Cc: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit 08e6c972da616d057b63fd3f89ce0eb539952f06 Author: Roel Kluin Date: Tue Feb 2 14:47:17 2010 -0800 USB: musb: test always evaluates to false The removed part always evaluates to false. Signed-off-by: Roel Kluin Cc: Felipe Balbi Cc: Greg Kroah-Hartman Acked-by: David Brownell Signed-off-by: Andrew Morton commit db8516f61b481e82cec398474ed716d926de7f94 Author: Catalin Marinas Date: Tue Feb 2 15:31:02 2010 +0000 USB: isp1760: Flush the D-cache for the pipe-in transfer buffers When the HDC driver writes the data to the transfer buffers it pollutes the D-cache (unlike DMA drivers where the device writes the data). If the corresponding pages get mapped into user space, there are no additional cache flushing operations performed and this causes random user space faults on architectures with separate I and D caches (Harvard) or those with aliasing D-cache. Signed-off-by: Catalin Marinas Cc: Matthew Dharm Cc: Greg KH Cc: Sebastian Siewior Cc: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 9714080d20f2ec4b671a06ce69367d91fa9e227e Author: Mitchell Solomon Date: Fri Feb 12 13:23:18 2010 -0500 USB: add new ftdi_sio device ids PID patch for my products Signed-off-by: Mitchell Solomon Cc: stable Signed-off-by: Greg Kroah-Hartman commit bd09a9f5318d0a088605911325d6e6e8530bdc9a Author: Alessio Igor Bogani Date: Tue Feb 2 16:18:28 2010 +0100 USB: ftdi_sio: Replace BKL with a mutex As Alan Cox have pinpointed the driver still required protection against parallels calls to the config ioctl(). If lock is still necessary the use of BKL is abused here. So replace BKL with a more convenient mutex. Signed-off-by: Alessio Igor Bogani Cc: Greg Kroah-Hartman Cc: Johan Hovold Cc: Alan Cox Cc: Daniel Mack Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a79df50bbad3b58efb5f2c730ca20573a674de10 Author: Thomas Gleixner Date: Fri Jan 29 20:38:59 2010 +0000 usb: gadgetfs: Convert semaphore to mutex The semaphore data->lock is semantically a mutex. Convert it to a real mutex. Signed-off-by: Thomas Gleixner Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit b00ce11f00c9e86442de000e8bd3dd42f089c8e1 Author: Michal Nazarewicz Date: Wed Jan 27 11:14:28 2010 +0100 USB: g_mass_storage: superfluous and missing packets fixed The mass storage function responded needlessly to a set configuration packet. This was a leftover from converting gadget (file storage gadget) into a composite function. Moreover, it has failed to respond to get max LUN request. Adding request queueing made the function work better. Signed-off-by: Michal Nazarewicz Signed-off-by: Marek Szyprowski Cc: Alan Stern Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7f1ee82695654faf0a93fc0abf3b08eb354ef1f6 Author: Michal Nazarewicz Date: Thu Jan 28 13:05:26 2010 +0100 USB: mass_storage: eject LUNs on thread exit Adds a fallback which forces all LUNs ejection (including non-removable and with prevent_medium_removal flag) when mass storage function (MSF) worker thread exits and gadget fails to handle the situation. Previously, if thread_exits was not specified mass storage function (MSF) did nothing when exiting thread as it's unclear for *function* what to do when it's thread terminates so responsibility of handling this situation was left to the *gadget* using the function. The g_mass_storage handled the situation by unregistering itself (the same thing that file storage gadget does). However, g_multi did nothing and so MSF did not eject LUNs which prevented file system unmounting. Signed-off-by: Michal Nazarewicz Reviewed-by: Kyungmin Park Cc: David Brownell Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9f445cb29918dc488b7a9a92ef018599cce33df7 Author: Cliff Cai Date: Thu Jan 28 20:44:18 2010 -0500 USB: musb: disable double buffering for older RTL versions Trying to use double buffer modes in RTL versions <2.0 may result in infinite hangs or data corruption. So avoid them with older versions. Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 0ded2f146acfaf71e5f4c15b80cf89b3af48134c Author: Cliff Cai Date: Thu Jan 28 20:43:44 2010 -0500 USB: musb: set version of Blackfin version All current Blackfin parts are using RTL v1.9, but they don't expose the hardware registers to probe this dynamically. So hardcode the version to v1.9 for now. Need to move the local hwvers related defines higher up in the header so that sub-musb headers may utilize them. Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 5e23e90f33888769ffe253663cc5f3ea0bb6da49 Author: Robert Jarzmik Date: Wed Jan 27 18:38:03 2010 +0100 USB: pxa27x_udc: Fix deadlocks on request queueing As reported by Antonio, there are cases where the ep->lock can be taken twice, triggering a deadlock. The typical sequence is : irq_handler \ -> gadget.complete() \ -> pxa27x_udc.pxa_ep_queue() : ep->lock is taken \ -> gadget.complete() \ -> pxa27x_udc.pxa_ep_queue() : ep->lock is taken ==> *deadlock* The patch fixes this by : - releasing the lock each time gadget.complete() is called - adding a check in handle_ep() to detect a recursive call, in which case the function becomes on no-op. The patch is still not good enough for ep0. For this unique endpoint, another well thought over patch will be needed. Reported-by: Antonio Ospite Tested-by: Antonio Ospite Signed-off-by: Robert Jarzmik Cc: David Brownell Cc: Eric Miao Signed-off-by: Greg Kroah-Hartman commit fb088e335d78f866be2e56eac6d500112a96aa11 Author: Mike Dunn Date: Tue Jan 26 12:12:12 2010 -0500 USB: serial: add support for serial port on the moschip 7715 Add support for the serial port on devices based on the MosChip 7715, which provides a serial and parallel port on a single usb interface. This is added to the existing driver for the Moschip 7720 dual serial port device. The 7715 is very similiar to the 7720, requiring only the addition of a calc_num_ports() function, a separate interrupt-in endpoint callback, and some manipulation of the port pointers added to the attach() function to correct the fact that the usbserial core erroneously assigns the first bulk in/out endpoint pair to the serial port (the 7715 uses these for its parallel port). There is no support for the 7715's parallel port yet. Signed-off-by: Mike Dunn Signed-off-by: Greg Kroah-Hartman commit f10718f5b812a2c55e37396518d426f88d5e35fc Author: Dan Carpenter Date: Mon Jan 25 14:53:33 2010 +0300 USB: io_edgeport: eliminate get_string() Johan Hovold points out that get_string() is basically just a re-implimentation of usb_string(). It is also buggy. It does DMA on the stack and it doesn't handle negative returns from usb_get_descriptor(). Plus unicode_to_ascii() is a rubbish function and moving to usb_string() avoids using it. Let's eliminate get_string() entirely. Reported-by: Johan Hovold Signed-off-by: Dan Carpenter Acked-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 5b520259ab6d661b8d5eb39dd17cc5e4e4553c62 Author: FUJITA Tomonori Date: Mon Jan 25 11:07:19 2010 +0900 USB: s3c-hsotg: replace deprecated dma_sync_single() This replaces deprecated dma_sync_single() with dma_sync_single_for_cpu(). There is no functional change because dma_sync_single() simply calls dma_sync_single_for_cpu(): static inline void __deprecated dma_sync_single(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { dma_sync_single_for_cpu(dev, addr, size, dir); } This fixes the following compile warnings: drivers/usb/gadget/s3c-hsotg.c: In function 's3c_hsotg_unmap_dma': drivers/usb/gadget/s3c-hsotg.c:376: warning: 'dma_sync_single' is deprecated (declared at /home/fujita/git/linux-2.6/include/linux/dma-mapping.h:109) drivers/usb/gadget/s3c-hsotg.c: In function 's3c_hsotg_map_dma': drivers/usb/gadget/s3c-hsotg.c:758: warning: 'dma_sync_single' is deprecated (declared at /home/fujita/git/linux-2.6/include/linux/dma-mapping.h:109) Signed-off-by: FUJITA Tomonori Acked-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit ab3bbfa1af64a978ffff45861a1b694313a03537 Author: Felipe Balbi Date: Thu Jan 21 15:33:58 2010 +0200 USB: musb: only print info message if probe() is successful we were printing the info about musb probe too early where it was still possible for things to go wrong. Move the down right before the return 0 statement. While at that also convert pr_info to dev_info. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit da5108e1a350c84b185b5f11aa58fea93a204fe0 Author: Felipe Balbi Date: Thu Jan 21 15:33:57 2010 +0200 USB: musb: unmap base if we can't probe when probe() fails, we should iounmap() the mapped address. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 3d268645d50989bc874fadf20db6fd6d17b380dc Author: Felipe Balbi Date: Thu Jan 21 15:33:56 2010 +0200 USB: musb: tusb6010: use resource_size Trivial patch, no functional changes. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c58bfa6b97731590e42cba6bd13829c4e480992f Author: Felipe Balbi Date: Thu Jan 21 15:33:55 2010 +0200 USB: musb: deprecate what we don't use after 2.6.34, those fields will be removed from struct musb_hdrc_platform_data, it's expected that other architectures are fixed by then. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit ad517e9ed8723363ebff0c5b413cbaa503aeb0ce Author: Felipe Balbi Date: Thu Jan 21 15:33:54 2010 +0200 USB: musb: we already tested for dyn_fifo ... and even added a flag to struct musb, so let's use that. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 8573e6a673fc99bd89a6c08ef9841d8b52f9d3c5 Author: Felipe Balbi Date: Thu Jan 21 15:33:53 2010 +0200 USB: musb: get rid of omap_readl/writel we have those addresses already ioremaped, so let's use our __raw_readl/writel wrappers. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 4f712e010b2da1cc01c178922f2eb5aaeae461b6 Author: Ajay Kumar Gupta Date: Thu Jan 21 15:33:52 2010 +0200 usb: musb: Add context save and restore support Adding support for MUSB register save and restore during system suspend and resume. Changes: - Added musb_save/restore_context() functions - Added platform specific musb_platform_save/restore_context() to handle platform specific jobs. - Maintaining BlackFin compatibility by adding read/write functions for registers which are not available in BlackFin Tested system suspend and resume on OMAP3EVM board. Signed-off-by: Anand Gadiyar Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 8af6096caf8b3fb7ee33e636c44a29f373d27df5 Author: Christoph Egger Date: Thu Jan 21 14:58:47 2010 +0100 USB: remove obsolete config in kernel source (USB_HCD_DMA) The configuration Option USB_HCD_DMA is not reachable in KConfig so this piece of Code is effectively dead and useless. Remove it to avoid confusion. Signed-off-by: Christoph Egger Signed-off-by: Greg Kroah-Hartman commit 0880aef49e40abd1ed34ab713e8b024e8bc2021e Author: Chris Frey Date: Tue Jan 26 17:07:29 2010 -0500 USB: usbfs_snoop: add data logging back in Uses the new snoop function from commit 4c6e8971cbe0148085, but includes the buffer data where appropriate, as before. Signed-off-by: Chris Frey Signed-off-by: Greg Kroah-Hartman commit 0978f8c55cdc7c06b2f1440b030e93fda2c53b2b Author: Mark Brown Date: Mon Jan 18 13:18:35 2010 +0000 USB: s3c-hsotg: Staticise non-exported functions Keeps sparse happy if nothing else. Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit 385f690bc058ba2555640740a1957826a40e4615 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:24:03 2010 -0200 USB: trivial: missing newline in usb core warning message Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman commit 330e3c4cc7179f9f3916cd147bf289467e16b169 Author: Andreas Mohr Date: Sun Jan 17 11:45:57 2010 +0100 USB: ftdi_sio: correct spelling in implementation file - correct spelling - correct non-tabbed .tiocmget/.tiocmset entries Signed-off-by: Andreas Mohr Signed-off-by: Greg Kroah-Hartman commit 0a2a37752e8c62f7bf160ad196c9384095d347fd Author: Andreas Mohr Date: Sun Jan 17 11:45:47 2010 +0100 USB: ftdi_sio: correct spelling in header files - correct spelling/whitespace in ftdi_sio.h and ftdi_sio_ids.h Signed-off-by: Andreas Mohr Signed-off-by: Greg Kroah-Hartman commit a45a1e07aa5e4d3dc952c264f87184c5ac8c0a62 Author: Julia Lawall Date: Sat Jan 16 16:59:51 2010 +0100 USB: serial: Eliminate useless code The variables priv and portdata are initialized twice to the same (side effect-free) expressions. Drop one initialization in each case. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit aa7907407adf1358ee39be0e98beaf4c129a78d6 Author: Marcel Holtmann Date: Fri Jan 15 22:13:58 2010 -0800 USB: gadget: Add DEVTYPE support for Ethernet functions The problem with Ethernet based networking devices is to clearly identify what's their usage. Special interfaces like bridges, WiFi, Bluetooth, WiMAX or WWAN are already using DEVTYPE identification. This patch marks the Ethernet functions of gadgets from the device type "gadget". Automatic setup of these interfaces can now happen from userspace without the need of hardcoding the network interface name. Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman commit a8d4211f33a9573f7b1bdcfd9c9c48631d1515ee Author: Greg Kroah-Hartman Date: Thu Jan 21 14:54:10 2010 -0800 USB: remove the berry_charge driver The Barry project's userspace program, bcharge, can better handle this device and functionality, and it also works with the latest phones, which this driver does not support. So remove it, as the userspace code should be used instead. Cc: Chris Frey Signed-off-by: Greg Kroah-Hartman commit 2a9d0083f63da961a8cd4fdf9f4e8e6433c36966 Author: Oliver Neukum Date: Thu Jan 14 16:23:56 2010 +0100 USB: BKL removal from ioctl path of usbfs Total removal from the ioctl code path except for the outcall to external modules. Locking is ensured by the normal locks of usbfs. Signed-off-by: Oliver Neukum Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9fd5c675864263e9f0e6bdb2d752bb380b32a01b Author: Oliver Neukum Date: Thu Jan 14 16:13:46 2010 +0100 USB: BKL removal: frontier BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit eedf1f17d40e24ae80007bcbe7b7e997c32995c8 Author: Oliver Neukum Date: Thu Jan 14 16:13:24 2010 +0100 USB: BKL removal: vstusb BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3c02b1d79e04e86f8bd2ff56da3743c2980f3e34 Author: Oliver Neukum Date: Thu Jan 14 16:12:53 2010 +0100 USB: BKL removal: legousbtower BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 6248c52f6abd5783ecdd042f6107bd172168961e Author: Oliver Neukum Date: Thu Jan 14 16:12:27 2010 +0100 USB: BKL removal: ldusb BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 92846fbb861f64b9db21f06d6878ca02c67554dc Author: Oliver Neukum Date: Thu Jan 14 16:12:01 2010 +0100 USB: BKL removal: ftdi-elan BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 937f7131d7ea7762851c89a410c83e1c4b393234 Author: Oliver Neukum Date: Thu Jan 14 16:11:32 2010 +0100 USB: BKL removal: adutux BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit dbdae3bd4af15c32e3b5eb6e608c1e2ea751b07f Author: Oliver Neukum Date: Thu Jan 14 16:11:03 2010 +0100 USB: BKL removal: idmouse BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 511e2d0218d04f544065eb277ad475bf14881efe Author: Oliver Neukum Date: Thu Jan 14 16:10:38 2010 +0100 USB: BKL removal: rio500 This driver had used BKL to guard against disconnect but was incorrectly converted leaving an SMP race. BKL was added to disconnect() to fix this race BKL was removed from ioctl() as the mutex is sufficient on its own. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5a207b431174ecc8f995230d19c79242160b8888 Author: Oliver Neukum Date: Thu Jan 14 16:10:05 2010 +0100 USB: BKL removal: mdc800 BKL not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 94015f6e6ba11040f75f4b42aada8de23965290e Author: Oliver Neukum Date: Thu Jan 14 16:09:26 2010 +0100 USB: BKL removal: cdc-wdm BKL not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 0022457a5469d328219dfb1ea5bd89d076e28372 Author: Oliver Neukum Date: Thu Jan 14 16:08:42 2010 +0100 USB: BKL removal: usbtmc BKL not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit b92a97efe00cf4e3555585f40dbe96512bba8f95 Author: Oliver Neukum Date: Thu Jan 14 16:08:13 2010 +0100 USB: BKL removal: usb-skeleton BKL not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit c8b492a86d71d43fb32e29282e6405663177b9e4 Author: Oliver Neukum Date: Thu Jan 14 16:07:37 2010 +0100 usb: BKL removal: usblp BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum Acked-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4e0961d53020b0fed83168d469ce44e1b3f25898 Author: Ben Hutchings Date: Wed Jan 13 23:39:43 2010 +0000 USB: isight-firmware: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 01412a219cae5f75ced3aacf1cb56cbe386af9ce Author: Oliver Neukum Date: Wed Jan 13 15:33:43 2010 +0100 USB: Reduce scope of BKL in usb ioctl handling This pushes BKL down in ioctl handling and drops it for some important ioctls Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 86266452f80545285c14e20a8024f79c4fb88a86 Author: Oliver Neukum Date: Wed Jan 13 15:33:15 2010 +0100 USB: Push BKL on open down into the drivers Straightforward push into the drivers to allow auditing individual drivers separately Signed-off-by: Oliver Neukum Acked-by: Mauro Carvalho Chehab Cc: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit f9de332ebf9df71892d52f7eb64af101a647349f Author: Oliver Neukum Date: Wed Jan 13 15:32:21 2010 +0100 USB: Remove BKL from lseek implementations Replace it by mutex_lock(&file->f_dentry->d_inode->i_mutex); following the example of the generic method Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 063e20eb980f281d8456c3b48f146107f5cb2338 Author: Oliver Neukum Date: Wed Jan 13 15:31:48 2010 +0100 USB: Remove BKL from usbdev_open() Locking had long been changed making BKL redundant. Simply remove it. Signed-off-by: Oliver Neukum Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 554f76962d3a6eb5110415f1591aca83f96a84ae Author: Oliver Neukum Date: Wed Jan 13 15:30:47 2010 +0100 USB: Remove BKL from poll() Replace BKL with usbfs_mutex to protect a global counter and a per file data structure Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 08add0c780b9f5c35de49d83abb7a4e14a9cd457 Author: Thiago Farina Date: Mon Jan 11 20:45:26 2010 -0500 USB: atm: Use FIELD_SIZEOF, trivial cleanup. Signed-off-by: Thiago Farina Signed-off-by: Greg Kroah-Hartman commit a74171005f2f6474e05bdfccb05c9f0d68224a49 Author: Gernot Hillier Date: Mon Jan 11 09:35:17 2010 +0100 USB: serial: option.c: Add 4G W14 stick to blacklist for option_send_setup The 4G XS Stick W14 seems to not understand RTS/DTR setting in option_send_setup causing long timeouts on any open() which disturbs a lot of well-known userspace applications like minicom or ModemManager. Therefore, we enable OPTION_BLACKLIST_SENDSETUP blacklisting for it. Signed-off-by: Gernot Hillier Signed-off-by: Greg Kroah-Hartman commit cc175ce2c01fc78dbf98a2b00f23d8863de20764 Author: Gernot Hillier Date: Mon Jan 11 09:30:00 2010 +0100 USB: serial: option.c: Add blacklisting infrastructure for special device handling As suggested by Matthias Urlichs, this patch adds a somehow generic mechanism for special handling of devices which don't support all bits expected by this driver. The blacklisting code is heavily stolen from sierra.c, but extended to support different special cases. For now, one case is implemented (OPTION_BLACKLIST_SENDSETUP), targeted at the 4G W14 device: devices which don't understand the setting of RTS/DTR in option_send_setup() causing a USB timeout of 5 s in any userspace open() which leads to errors in most userspace applications. In addition, I prepared another case for devices with interfaces which shall not be accessed by this driver (targeted at the D-Link DWM 652). However, OPTION_BLACKLIST_RESERVED_IF is not fully implemented yet as I have no device to test this. Anyone volunteering to help here? If not, I'll contact the guys who added D-Link DWM 652 support soon. Signed-off-by: Gernot Hillier Signed-off-by: Greg Kroah-Hartman commit 79da01d79e0f2c8d2d6f1b823fce429877c423a7 Author: Gernot Hillier Date: Mon Jan 11 09:06:44 2010 +0100 USB: serial: option.c: Add chipset information for 4G W14 Carsten Juttner thankfully investigated a bit and found out some details about the chipset used in the 4G W14 device I recently added to option.c. I think this information is useful for reference, so I'd be happy if you could include those bits. Signed-off-by: Gernot Hillier Signed-off-by: Greg Kroah-Hartman commit 1ba2557f298a64af4419ca094c5ecf99dc775354 Author: Németh Márton Date: Sun Jan 10 15:35:23 2010 +0100 USB goku_udc: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make pci_ids also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 07824d3d69e923a5173f9066469c81d83c8d6eab Author: Németh Márton Date: Sun Jan 10 15:35:14 2010 +0100 USB gadget: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make ace_of_match also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit c4386ad07c318ae6188190e63b517ecc5ee3c883 Author: Németh Márton Date: Sun Jan 10 15:35:03 2010 +0100 USB host: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 1e927d96cb5db0851cc5b9031f476b12a3e05182 Author: Németh Márton Date: Sun Jan 10 15:34:53 2010 +0100 USB hub: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 33b9e16243fd69493be3ddda7be73226c8be586a Author: Németh Márton Date: Sun Jan 10 15:34:45 2010 +0100 USB misc: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 9052127f631c8d71d5149da08d48014283faff2f Author: Németh Márton Date: Sun Jan 10 15:34:36 2010 +0100 USB image: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 7d40d7e85a25e01948bcb4dc3eda1355af318337 Author: Németh Márton Date: Sun Jan 10 15:34:24 2010 +0100 USB serial: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 6ef4852b1326301f6e9657e99b2c3221be1a3a44 Author: Németh Márton Date: Sun Jan 10 15:33:45 2010 +0100 USB class: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 1bd4f29d0af5b4b1c022d8fded14665dd5932905 Author: Németh Márton Date: Sun Jan 10 15:33:33 2010 +0100 USB skeleton: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 94089d56e456d2814c379538919180957a254e4a Author: Roel Kluin Date: Sat Jan 9 21:57:44 2010 +0100 USB: musb: don't dereference NULL tusb_dma in dma_controller_destroy() Test whether tusb_dma is not NULL before dereferencing Signed-off-by: Roel Kluin Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit f7410ced7f931bb1ad79d1336412cf7b7a33cb14 Author: Herbert Xu Date: Sun Jan 10 20:15:03 2010 +1100 USB: Move hcd free_dev call into usb_disconnect to fix oops USB: Move hcd free_dev call into usb_disconnect I found a way to oops the kernel: 1. Open a USB device through devio. 2. Remove the hcd module in the host kernel. 3. Close the devio file descriptor. The problem is that closing the file descriptor does usb_release_dev as it is the last reference. usb_release_dev then tries to invoke the hcd free_dev function (or rather dereferencing the hcd driver struct). This causes an oops as the hcd driver has already been unloaded so the struct is gone. This patch tries to fix this by bringing the free_dev call earlier and into usb_disconnect. I have verified that repeating the above steps no longer crashes with this patch applied. Signed-off-by: Herbert Xu Cc: stable Signed-off-by: Greg Kroah-Hartman commit d23356da714595b888686d22cd19061323c09190 Author: Pete Zaitcev Date: Fri Jan 8 15:39:22 2010 -0700 USB: fix crash in uhci_scan_schedule When hardware is removed on a Stratus, the system may crash like this: ACPI: PCI interrupt for device 0000:7c:00.1 disabled Trying to free nonexistent resource <00000000a8000000-00000000afffffff> Trying to free nonexistent resource <00000000a4800000-00000000a480ffff> uhci_hcd 0000:7e:1d.0: remove, state 1 usb usb2: USB disconnect, address 1 usb 2-1: USB disconnect, address 2 Unable to handle kernel paging request at 0000000000100100 RIP: [] :uhci_hcd:uhci_scan_schedule+0xa2/0x89c #4 [ffff81011de17e50] uhci_scan_schedule at ffffffff88021918 #5 [ffff81011de17ed0] uhci_irq at ffffffff88023cb8 #6 [ffff81011de17f10] usb_hcd_irq at ffffffff801f1c1f #7 [ffff81011de17f20] handle_IRQ_event at ffffffff8001123b #8 [ffff81011de17f50] __do_IRQ at ffffffff800ba749 This occurs because an interrupt scans uhci->skelqh, which is being freed. We do the right thing: disable the interrupts in the device, and do not do any processing if the interrupt is shared with other source, but it's possible that another CPU gets delayed somewhere (e.g. loops) until we started freeing. The agreed-upon solution is to wait for interrupts to play out before proceeding. No other bareers are neceesary. A backport of this patch was tested on a 2.6.18 based kernel. Testing of 2.6.32-based kernels is under way, but it takes us forever (months) to turn this around. So I think it's a good patch and we should keep it. Tracked in RH bz#516851 Signed-Off-By: Pete Zaitcev Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9bbdf1e0afe771ca7650f9f476769310bee9d8f3 Author: Alan Stern Date: Fri Jan 8 12:57:28 2010 -0500 USB: convert to the runtime PM framework This patch (as1329) converts the USB stack over to the PM core's runtime PM framework. This involves numerous changes throughout usbcore, especially to hub.c and driver.c. Perhaps the most notable change is that CONFIG_USB_SUSPEND now depends on CONFIG_PM_RUNTIME instead of CONFIG_PM. Several fields in the usb_device and usb_interface structures are no longer needed. Some code which used to depend on CONFIG_USB_PM now depends on CONFIG_USB_SUSPEND (requiring some rearrangement of header files). The only visible change in behavior should be that following a system sleep (resume from RAM or resume from hibernation), autosuspended USB devices will be resumed just like everything else. They won't remain suspended. But if they aren't in use then they will naturally autosuspend again in a few seconds. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0c590e2361511997430130e10e372217c1128da6 Author: Alan Stern Date: Fri Jan 8 12:57:14 2010 -0500 USB: rearrange functions in driver.c This patch (as1328) reorders the functions in drivers/usb/core/driver.c so as to put all the routines dependent on CONFIG_PM in one place. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 5899f1e020c8d53b2b6fbd6a6cf39c891ccdfade Author: Alan Stern Date: Fri Jan 8 12:57:02 2010 -0500 USB: change handling of negative autosuspend delays This patch (as1327) changes the way negative autosuspend delays prevent device from autosuspending. The current code checks for negative values explicitly in the autosuspend_check() routine. The updated code keeps things from getting that far by using usb_autoresume_device() to increment the usage counter when a negative delay is set, and by using usb_autosuspend_device() to decrement the usage counter when a non-negative delay is set. This complicates the set_autosuspend() attribute method code slightly, but it will reduce the overall power management overhead. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 088f7fec8a0e683db72fd8826c5d3ab914e197b1 Author: Alan Stern Date: Fri Jan 8 12:56:54 2010 -0500 USB: implement usb_enable_autosuspend This patch (as1326) adds usb_enable_autosuspend() and usb_disable_autosuspend() routines for use by drivers. If a driver knows that its device can handle suspends and resumes correctly, it can enable autosuspend all by itself. This is equivalent to the user writing "auto" to the device's power/level attribute. The implementation differs slightly from what it used to be. Now autosuspend is disabled simply by doing usb_autoresume_device() (to increment the usage counter) and enabled by doing usb_autosuspend_device() (to decrement the usage counter). The set_level() attribute method is updated to use the new routines, and the USB Power-Management documentation is updated. The patch adds a usb_enable_autosuspend() call to the hub driver's probe routine, allowing the special-case code for hubs in quirks.c to be removed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0c4db6df915bc470f0cd32fe48287fa6eb6adfb4 Author: Alan Stern Date: Fri Jan 8 12:56:42 2010 -0500 USB: use the device lock for persist_enabled This patch (as1325) changes the locking for the persist_enabled flag in struct usb_device. Now it is protected by the device lock, along with all its neighboring bit flags, instead of the PM lock (which is about to vanish anyway). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0534d46848990e8eed7cd0832d745d813e827261 Author: Alan Stern Date: Fri Jan 8 12:56:30 2010 -0500 USB: consolidate remote wakeup routines This patch (as1324) makes a small change to the code used for remote wakeup of root hubs. hcd_resume_work() now calls the hub driver's remote-wakeup routine instead of implementing its own version. The patch is complicated by the need to rename remote_wakeup() to usb_remote_wakeup(), make it non-static, and declare it in a header file. There's also the additional complication required to make everything work when CONFIG_PM isn't set; the do-nothing inline routine had to be moved into the header file. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 62e299e61a6ffe8131fa85a984c3058b68586f5d Author: Alan Stern Date: Fri Jan 8 12:56:19 2010 -0500 USB: change locking for device-level autosuspend This patch (as1323) changes the locking requirements for usb_autosuspend_device(), usb_autoresume_device(), and usb_try_autosuspend_device(). This isn't a very important change; mainly it's meant to make the locking more uniform. The most tricky part of the patch involves changes to usbdev_open(). To avoid an ABBA locking problem, it was necessary to reduce the region protected by usbfs_mutex. Since that mutex now protects only against simultaneous open and remove, this posed no difficulty -- its scope was larger than necessary. And it turns out that usbfs_mutex is no longer needed in usbdev_release() at all. The list of usbfs "ps" structures is now protected by the device lock instead of by usbfs_mutex. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0f3dda9f7ff2db8dbf4d6fbab4d4438251446002 Author: Alan Stern Date: Fri Jan 8 12:56:04 2010 -0500 USB: rearrange code in usb_probe_interface This patch (as1322) reverses the two outcomes of an "if" statement in usb_probe_interface(), to avoid an unnecessary level of indentation. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d837e219daf3bf0cc84fcfb9781807d9fe8d03b5 Author: Sarah Sharp Date: Tue Jan 5 14:33:29 2010 -0800 USB: Use bInterfaceNumber in bandwidth allocations. USB devices do not have to sort interfaces in their descriptors based on the interface number, and they may choose to skip interface numbers. The USB bandwidth allocation code for installing a new configuration assumes the for loop variable will match the interface number. Make it use the interface number (bInterfaceNumber) in the descriptor instead. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 46216e4fbe8c62059b5440dec0b236f386248a41 Author: Jan Dumon Date: Tue Jan 5 15:53:26 2010 +0100 USB: unusual_devs: Add support for multiple Option 3G sticks Enable the SD-Card interface on multiple Option 3G sticks. The unusual_devs.h entry is necessary because the device descriptor is vendor-specific. That prevents usb-storage from binding to it as an interface driver. Signed-off-by: Jan Dumon Signed-off-by: Phil Dibowitz Cc: stable Signed-off-by: Greg Kroah-Hartman commit bce54fed941e03695ab557100a4bd1e457abca42 Author: Felipe Balbi Date: Tue Jan 5 16:10:14 2010 +0200 arm: defconfig: rx51: enable phonet and g_nokia trivial patch enabling g_nokia on rx51_defconfig. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit f358f5b40af67caf28b627889d007294614170b2 Author: Felipe Balbi Date: Tue Jan 5 16:10:13 2010 +0200 USB: gadget: introduce g_nokia gadget driver g_nokia is the gadget driver implementing WMCDC Wireless Handset Control Model for the N900 device. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 9c9a7dbf9a73191a24a13b9a0412355254a122c7 Author: Sarah Sharp Date: Mon Jan 4 12:20:17 2010 -0800 USB: xhci: Fix compile issues with xhci_get_slot_state() Randy Dunlap reported this error when compiling the xHCI driver: linux-next-20100104/drivers/usb/host/xhci.h:1214: sorry, unimplemented: inlining failed in call to 'xhci_get_slot_state': function body not available The xhci_get_slot_state() function belongs in xhci-dbg.c, since it involves debugging internal xHCI structures. However, it is only used in xhci-hcd.c. Some toolchains may have issues since the inlined function body is not in the xhci.h header file. Remove the inline keyword to avoid this. Reported-by: Randy Dunlap Signed-off-by: Sarah Sharp Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit c38b94017c74061cabc342d3222387e0a5e8b6cd Author: Thiago Farina Date: Fri Jan 1 16:42:34 2010 -0500 USB: c67x00: use resource_size(). Signed-off-by: Thiago Farina Signed-off-by: Greg Kroah-Hartman commit 4585ef11d23aa9dbbf776b135ba70577df97587b Author: Julia Lawall Date: Wed Dec 30 15:34:37 2009 +0100 USB: FHCI: Correct the size argument to kzalloc urb_priv->tds has type struct td **, not struct td *, so the elements of the array should have pointer type, not structure type. Convert kzalloc to kcalloc as well. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @disable sizeof_type_expr@ type T; T **x; @@ x = <+...sizeof( - T + *x )...+> // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 0f2c2d7bbb51338fdcda9670795a6c6e348622d9 Author: Johan Hovold Date: Thu Dec 31 16:48:01 2009 +0100 USB: cypress_m8: use put_unaligned_le32() where necessary Cc: Lonnie Mendez Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 5be796f0b842c5852d7397a82f8ebd6be8451872 Author: Johan Hovold Date: Thu Dec 31 16:47:59 2009 +0100 USB: ch341: use get_unaligned_le16 in break_ctl Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d0ef90b49857b403c1cfa62fce229c967dd4be40 Author: Dan Carpenter Date: Thu Dec 31 17:42:55 2009 +0200 USB: serial: fix DMA buffers on stack for io_edgeport.c The original code was passing a stack variable as a dma buffer, so I made it an allocated variable. Instead of adding a bunch of kfree() calls, I changed all the error return paths to gotos. Also I noticed that the error checking wasn't correct because usb_get_descriptor() can return negative values. While I was at it, I made an unrelated white space change by moving the unicode_to_ascii() on to one line. Signed-off-by: Dan Carpenter Cc: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 96679f6bd5e1ccb30671b81636b4fdc326e46d8a Author: Johan Hovold Date: Mon Dec 28 23:01:58 2009 +0100 USB: kobil_sct: clean up kobil_set_termios Kill string that is allocated and generated using speed and parity settings but is never used (and never has been). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 401711cb575bbbdb100bc1a14cb2024dfc9b4869 Author: Johan Hovold Date: Mon Dec 28 23:01:57 2009 +0100 USB: visor: fix DMA buffers on stack Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d2126326bd71b56fcaa5e86474433d11e253f84d Author: Johan Hovold Date: Mon Dec 28 23:01:56 2009 +0100 USB: oti6858: fix DMA buffer on stack Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 9e221a35f82cbef0397d81fed588bafba95b550c Author: Johan Hovold Date: Mon Dec 28 23:01:55 2009 +0100 USB: mos7840: fix DMA buffers on stack and endianess bugs Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit eb771e2c6507e0a317e576a3147252ebcb64035a Author: Johan Hovold Date: Mon Dec 28 23:01:54 2009 +0100 USB: mos7720: fix DMA buffers on stack and clean up send_mos_cmd Change data-argument type from (void *) to (u8 *) to prevent endianess problems. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit abf492e7b3ae74873688cf9960283853a3054471 Author: Johan Hovold Date: Mon Dec 28 23:01:52 2009 +0100 USB: kl5kusb105: fix DMA buffers on stack Cc: Oliver Neukum Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit ca65d256c8f1604f8ec8e258109d23280687186c Author: Johan Hovold Date: Mon Dec 28 23:01:51 2009 +0100 USB: keyspan_pda: fix DMA buffers on stack Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e9305d2f4b5ffa9ea0261212d542956bede2a2ff Author: Johan Hovold Date: Mon Dec 28 23:01:50 2009 +0100 USB: io_ti: fix DMA buffers on stack Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 974fccb7aba8ca4ff887836e26c0ac4c99d041ca Author: Johan Hovold Date: Mon Dec 28 23:01:49 2009 +0100 USB: cypress_m8: fix endianess bug Cc: Lonnie Mendez Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0954644bf5a5a2281746516ce0f5df988d504c31 Author: Johan Hovold Date: Mon Dec 28 23:01:48 2009 +0100 USB: cypress_m8: fix DMA buffer on stack Cc: Lonnie Mendez Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 52372ccb5a19d35b68b79118fafdced0c12f0ec9 Author: Johan Hovold Date: Mon Dec 28 23:01:47 2009 +0100 USB: ch341: use le16_to_cpup to be explicit about endianess Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f2b5cc834b69d2999b749144481de9a94f01bc48 Author: Johan Hovold Date: Mon Dec 28 23:01:46 2009 +0100 USB: ch341: fix DMA buffer on stack Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6a9b15fed4dca1f90e41ae0cfe35aaa39a20f495 Author: Johan Hovold Date: Mon Dec 28 23:01:45 2009 +0100 USB: ch341: replace printk warnings with dev_err Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 881142660697bba0f3ef44f070d80632082c978f Author: Ajay Kumar Gupta Date: Mon Dec 28 13:40:46 2009 +0200 usb: host: ehci: adding regulator framework in ehci-omap.c driver. OMAP3 has three HS USB ports so it can have three different regulator for each PHY connected to each port. Currently these regulators are assumed to be optional and driver doesn't fail but continue with the initialization if it doesn't get any regulators. Regulator supply names has to be mapped in board files as 'hsusbN' where 'N' is port number and can be {0, 1 ,2}. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit d3ae8562d43fe2b97d605dd67dc67bf8fa9b956a Author: Ajay Kumar Gupta Date: Mon Dec 28 13:40:45 2009 +0200 usb: host: ehci: fix missing kfree in remove path also Added missing kfree() in ehci_hcd_omap_remove(). Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 5fc4e77911f457b6aa910c704eebe3a58d334116 Author: Ajay Kumar Gupta Date: Mon Dec 28 13:40:42 2009 +0200 usb: musb: Add 'extvbus' in musb_hdrc_platform_data Some of the board might use external Vbus power supply on musb interface which would require to program ULPI_BUSCONTROL register. Adding 'extvbus' flag which can be set from such boards which will be checked at musb driver files before programming ULPI_BUSCONTROL. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 51bf0d0e6cc1f9679a973f61d07cb48e71f9c992 Author: Ajay Kumar Gupta Date: Mon Dec 28 13:40:41 2009 +0200 usb: musb: save dynfifo in musb struct Save dynamic FIFO read only information for later uses during musb_save/restore_context functions. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 1c25fda4a09e8229800979986ef399401053b46e Author: Arnaud Mandy Date: Mon Dec 28 13:40:40 2009 +0200 usb: musb: handle irqs in the order dictated by programming guide MUSB's programming guide dictates how we should handle its irqs and in which order. Follow that. Signed-off-by: Arnaud Mandy Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 1ca9e9ca314c4757409a7f4e9c1f12229a175834 Author: Bryan Wu Date: Mon Dec 28 13:40:39 2009 +0200 usb: musb: clean up commit 'workaround Blackfin FIFO anomalies' The version applied had a few comments which are now done. Thanks to Sergei for pointing out. Signed-off-by: Bryan Wu Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 565969237ab6e73ce7192684d00d5b890ee308fa Author: Swaminathan S Date: Mon Dec 28 13:40:38 2009 +0200 usb: musb: Fix cppi_channel_abort() function to handle Tx abort correctly This patch fixes the Tx abort/teardown logic. We now wait for the teardown completion interrupt and acknowledge the same by setting the tx_complete register to 0. This change is needed to ensure that abort processing works on DM365 platform. Without this change after completion of abort processing the system is overwhelmed with continuous stream of abort interrupts. This change has been tested on all CPPI3.x platforms (DM644x, DM646x, DM35x, DM36x). Signed-off-by: Swaminathan S Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 5274dab6cb99c529b2e7f16bbc8ff9a79be46e7f Author: Swaminathan S Date: Mon Dec 28 13:40:37 2009 +0200 usb: musb: workaround toggle bug when doing bulk transfer after isoc This patch implements the work around for a Mentor controller related bug where it's observed a BULK Tx toggle error on the bus when a BULK IO gets scheduled on an endpoint that was earlier used for handling ISOC transaction and needed to start on 1 toggle. When such a situation arises even if the TXCSR toggle bits are programmed correctly by the musb driver the data gets transmitted with 0 toggle which leads to toggle error on the bus and the BULK transaction fails. In case of MSC write, the device gets reset by the Host. This Mentor bug is observed on almost all Mentor versions (1.3, 1.5, 1.8). Confirmed on DM644x, DM355, DM365, OMAPL13x platforms. Signed-off-by: Swaminathan S Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit f933a0c0fe0ea5f49a35bcd45e3e4850e0606cba Author: Anand Gadiyar Date: Mon Dec 28 13:40:36 2009 +0200 usb: musb: workaround MUSB DMA_INTR sometimes reads zero MUSB DMA_INTR register may sometimes read zero when infact there was a pending interrupt. Workaround this by reading the DMA_COUNT values for all enabled channels when this condition occurs. Flag these channels as the ones needing to be serviced. Additionally, the absence of a debug print meant we would never catch a spurious DMA interrupt in MUSB. So this patch adds a debug print in the IRQ handler. Signed-off-by: Anand Gadiyar Cc: Ajay Kumar Gupta Cc: David Brownell Cc: Sergei Shtylyov Cc: Vikram Pandita Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 452f0394376d2cc882e4c4a593fc290c042799a9 Author: Anand Gadiyar Date: Mon Dec 28 13:40:35 2009 +0200 usb: musb: hsdma: add wrapper for reading DMA count Add a wrapper for reading the DMA count register, analogous to the one for writing to this register. Signed-off-by: Anand Gadiyar Cc: Vikram Pandita Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 3b151526eda87901532390e11bba0dd59119f667 Author: Ajay Kumar Gupta Date: Mon Dec 28 13:40:34 2009 +0200 USB: musb: Add new fifo table for a OMAP3 errata We have observed MSC data read corruption when USB LAN device is also connected and it's interface is up. Silicon team has confirmed an errata where in all the active transfers should use FIFO space either in first 8K or next 8K. So far we have observed the issue in above use case scenario. As a workaround to it, adding a new FIFO config (5) fitting well within first 8K which can be used for such use cases. Signed-off-by: Ajay Kumar Gupta Acked-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 8f20960cd772fe42a9cdd36312b2247bc2800ffb Author: Felipe Balbi Date: Mon Dec 28 13:02:48 2009 +0200 usb: otg: twl4030: move to request_threaded_irq move to request_threaded_irq() on twl4030 children. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c9188ad25dde86e929bd567166b5a1366a3a9059 Author: Robert P. J. Day Date: Mon Dec 28 06:31:08 2009 -0500 USB: Correct CONFIG variable typo. Signed-off-by: Robert P. J. Day Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3a90f81872b00a7526c2bb1ed7664fe5af727f39 Author: Oliver Neukum Date: Mon Dec 28 00:52:17 2009 +0100 USB: usblp: Remove checks no longer needed with the new runtime PM system Under the new system a device cannot be suspended against the driver's wish. Therefore this condition no longer needs to be checked for. Signed-off-by: Oliver Neukum Cc: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit c1284d7726c57c9d2bbc65cd08173fe7f9e637df Author: Johan Hovold Date: Thu Dec 24 12:42:11 2009 +0100 USB: ftdi_sio: remove unnecessary initialisations Return values are being initialised to zero only to be unconditionally assigned to a few instructions later. This may give the impression that zero is returned on success, which is not the case. Note also that ftdi_NDI_device_setup never reports errors. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit a3f8168b7a3a7d9dfb9bb9caa1e009a5ce2a8493 Author: Johan Hovold Date: Thu Dec 24 12:42:10 2009 +0100 USB: ftdi_sio: clean up modem status handling Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 66e47e6006a558b33c6f15bd2e072d52c40e0159 Author: Johan Hovold Date: Thu Dec 24 12:42:09 2009 +0100 USB: ftdi_sio: fix DMA buffers on stack Also remove unnecessary buffer allocations for zero-length transfers. Reported-by: Matti Aarnio Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 54f328d0c7221675e3c1647e1918172fec1b92c9 Author: Johan Hovold Date: Thu Dec 24 12:42:08 2009 +0100 USB: ftdi_sio: fix latency-timeout endianess bug Also fixes DMA transfer to stack for latency buffer. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 4357369d024c709d91864af88f02d7ac08d0f470 Author: Johan Hovold Date: Thu Dec 24 12:42:07 2009 +0100 USB: ftdi_sio: use error code from usb stack in read_latency_timer Use same semantics as for write_latency_timer. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 551cdbbeb118bd5ed301f8749aef69219284399b Author: Greg Kroah-Hartman Date: Thu Jan 14 11:08:04 2010 -0800 USB: rename USB_SPEED_VARIABLE to USB_SPEED_WIRELESS It's really the wireless speed, so rename the thing to make more sense. Based on a recommendation from David Vrabel Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 16985408b5c48585762ec3b9b7bae1dec4ad7437 Author: Dan Streetman Date: Wed Jan 6 09:56:53 2010 -0500 USB: retain USB device power/wakeup setting across reconfiguration Currently a non-root-hub USB device's wakeup settings are initialized when the device is set to a configured state using device_init_wakeup(), but this is not correct as wakeup is split into "capable" (can_wakeup) and "enabled" (should_wakeup). The settings should be initialized instead in the device initialization (usb_new_device) with the "capable" setting disabled and the "enabled" setting enabled. The "capable" setting should be set based on the device being configured or unconfigured, and "enabled" setting set based on the sysfs power/wakeup control. This patch retains the sysfs power/wakeup setting of a non-root-hub USB device over a USB device re-configuration, which can happen (for example) after a suspend/resume cycle. Signed-off-by: Dan Streetman Cc: David Brownell Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ce126644aa10bf1d8f1c1929b65adab026095761 Author: Julian Calaby Date: Tue Jan 5 23:58:20 2010 +1100 USB: cdc_acm: Silence "It is not a modem." error for pbLua devices The pbLua console port is known to not be a modem, so it is unnecessary to be told this when it is plugged in. Add NOT_A_MODEM quirk to tell the driver that we know this already and hence not to warn us, and mark the pbLua console port. Signed-off-by: Julian Calaby Cc: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 7c5d8c394a077a686cfa646cd85dc159a2a940cc Author: Julian Calaby Date: Tue Jan 5 23:57:46 2010 +1100 USB: cdc_acm: Add support for pbLua console port The pbLua firmware (http://pblua.com/) for the Lego Mindstorms NXT provides a CDC ACM port for it's serial console. This used to be detected automatically, but this support has been dropped, probably for sensible reasons. Explicitly add support for this device by adding an item to the device ID table. Signed-off-by: Julian Calaby Cc: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 2bc0d109326e9f2b25fa1dfcc9de2489e1e00e36 Author: Pete Zaitcev Date: Tue Jan 5 11:50:07 2010 -0700 usbmon: add bus number to text API Due to a simple oversight when bus zero was added, the text API fails to deliver the bus number in 'E' messages (which are equivalent of 'C' messages, only for error case). This makes it harder, for instance, use a search-and-highlight in a text editor. So fix it. Also, Alan Stern requested adding timestamps to 'E' messages. This is purely cosmetic, but makes it easier to read the trace. This is done for both text and binary APIs. Signed-off-by: Pete Zaitcev Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7ed069c12c866c5c06e4e05d26878797e3731829 Author: Felipe Balbi Date: Tue Dec 15 11:08:39 2009 +0200 USB: musb: remove some of the never defined defines just makes the musb init code a bit cleaner. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 94375751d1d8af70df08beebdc32595f9e4537e1 Author: Felipe Balbi Date: Tue Dec 15 11:08:38 2009 +0200 USB: musb: move to sysfs_groups it's easier to keep up and add more sysfs entries as necessary. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit b3b1cc3ba62374e71155ba8c09ee481c3c2d923e Author: Felipe Balbi Date: Tue Dec 15 11:08:43 2009 +0200 USB: musb: move two printk to dev_err trivial cleanup, no functional changes. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 195e9e4691ad0544746540852e03d7c8c6c877ea Author: Felipe Balbi Date: Tue Dec 15 11:08:42 2009 +0200 USB: musb: use resource_size() it makes ioremap() usage looks cleaner. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 767ffec15e25b34c7194e47f0ad1fbf63a568d44 Author: Cliff Cai Date: Mon Dec 21 10:42:39 2009 -0500 USB: gadget: add INT support for Blackfin musb Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 3a8a3b1cee6c525661732b8bcf29ac63d42945ed Author: Bryan Wu Date: Mon Dec 21 10:43:06 2009 -0500 USB: gadget: use ep5 for bulk-in and ep6 for bulk-out for Blackfin MUSB Normally, the musb uses ep1 as the bidirectional bulk endpoint. This won't work on the Blackfin musb as all endpoints (except ep0) are unidirectional. Further, ep1-ep4 have a small 128 byte FIFO which makes them undesirable for bulk endpoints (which need more like a 512 byte FIFO). This leaves us with ep5-ep7 which have 1024 byte FIFOs and can be configured as either in/out and bulk/interrupt/iso on the fly. Signed-off-by: Bryan Wu Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ca0e9485afb8db3abf58235abf6afded2df0db17 Author: Michael Hennerich Date: Mon Dec 21 11:16:00 2009 -0500 USB: host: SL811: allow the hcd on Blackfin systems Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 8ca5bfab154487fd75a946e6e95d3519eb74be6a Author: Michael Hennerich Date: Mon Dec 21 12:53:24 2009 -0500 USB: host: SL811: fix unaligned accesses Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 6ebb7d1b4b98162e332ff43a8739c2c1c690b140 Author: Julia Lawall Date: Sat Dec 19 08:17:44 2009 +0100 USB: isp1362: Use kzalloc for allocating only one thing Use kzalloc rather than kcalloc(1,...) The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - kcalloc(1, + kzalloc( ...) // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit c312659c5ff1e54bac2d91e1ce1005d58784a7b5 Author: Mike Frysinger Date: Fri Dec 18 16:33:03 2009 -0500 USB: cypress_m8: allow unstable baud rates I've got a crappy cypress converter here, and while running at higher baud rates craps out on throughput, it works fine with lower ones. While it'd be nice to simply use a lower baud rate, not all devices can be configured this way, and it is possible to (slowly) interact at higher rates by sending a byte at a time. So let people force higher rates when they need it via a module parameter. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 2805eb13c3b5be7bd6ec7380502bc054b570afd5 Author: Mike Frysinger Date: Fri Dec 18 16:33:02 2009 -0500 USB: cypress_m8: unify confusing new baudrate check The current code has a confusing duplicate new_baudrate init when setting the serial parameters. So just combine the if statement checks to avoid this. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 64319dd74f3d45f13b6d0aafa91104eb105f1829 Author: Mike Frysinger Date: Fri Dec 18 16:33:01 2009 -0500 USB: cypress_m8: stop using USB debug driver config The USB_SERIAL_DEBUG Kconfig is for the USB serial debug driver, not for generically enabling debug output in random USB serial drivers. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ef955341f692475236f0fbe6853f49337dff77a5 Author: Oliver Neukum Date: Sat Jan 16 01:33:03 2010 +0100 USB: Export QUIRK_RESET_MORPHS through sysfs Some devices which use mode switching revert to their primary mode as they are reset. They must not be reset for error handling. As user spaces makes the switch it also has to tell the kernel that a device is quirky. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5d3987796c7a747e5ed3ded1eb64a9632d52a1a4 Author: Oliver Neukum Date: Fri Dec 18 12:14:21 2009 +0100 USB: storage: Never reset devices that will morph to an old mode Some devices must be switched to a new mode to fully use them. A reset would make them revert to the old mode. Therefore a reset must not be used for error handling with such devices. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d1b5b5c0a8a8204f0c51d5eb99736ecfb2fd5b4e Author: Felipe Balbi Date: Thu Dec 17 13:01:37 2009 +0200 USB: otg: twl4030: add support for notifier it's expected that the transceiver driver will initialize and call the notifier chain when necessary. Implement that for twl4030-usb driver. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit e9a20171dfa0aa134d2211126d1310f2daea52cf Author: Felipe Balbi Date: Thu Dec 17 13:01:36 2009 +0200 USB: otg: add notifier support The notifier will be used to communicate usb events to other drivers like the charger chip. This can be used as source of information to kick usb charger detection as described by the USB Battery Charging Specification 1.1 and/or to pass bMaxPower field of selected usb_configuration to charger chip in order to use that information as input current on the charging profile setup. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 8bc1d21776bb012e41ed062c6d842cfe7c82998a Author: Julia Lawall Date: Thu Dec 17 13:57:33 2009 +0000 USB: wusb: check CHID is all zeros before stopping the host An incorrect sizeof() resulted in only 4 (or 8) octets of the CHID being checked instead of all 16 octets. A randomly generated CHID had a probability of being unable to start a WUSB host of less than 1 in 2 billion. Signed-off-by: Julia Lawall Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 319c3ea451e19f72b578661e26fb33739af5ae1c Author: Oliver Neukum Date: Wed Dec 16 19:43:59 2009 +0100 USB: xhci: No GFP_KERNEL in block error handling xhci_add_endpoint() is used in the reset path. It must use GFP_NOIO to avoid a possible deadlock. Signed-off-by: Oliver Neukum Acked-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 97d35f95552c9a0ee4777a7f04431a9fd1260478 Author: Oliver Neukum Date: Wed Dec 16 17:05:57 2009 +0100 USB: cdc-acm: Update to new autopm API Update cdc-acm to the async methods eliminating the workqueue Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 1f141ca2b1f40088203fba061cc7b1f8da7c38ab Author: H Hartley Sweeten Date: Mon Dec 14 18:22:42 2009 -0500 USB: ehci-au1xxx.c: use platform_get_resource() and resource_size() Use platform_get_resource() to fetch the memory resource and resource_size() for calculate the length. Signed-off-by: H Hartley Sweeten Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit f65c3540d316982c906e6ece7ccad00bba84574e Author: H Hartley Sweeten Date: Mon Dec 14 18:15:35 2009 -0500 USB: ehci-atmel.c: use resource_size() Use resource_size(). Signed-off-by: H Hartley Sweeten Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5672b7e6a99a91838c1b595a80d43006bcd9a178 Author: H Hartley Sweeten Date: Mon Dec 14 18:13:00 2009 -0500 USB: ehci-orion.c: use resource_size() Use resource_size(). Signed-off-by: H Hartley Sweeten Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit d8bb0fd26b555f505019b9b68b6d581fb9f80348 Author: H Hartley Sweeten Date: Mon Dec 14 17:59:22 2009 -0500 USB: at91_udc.c: use resource_size() Use resource_size(). Signed-off-by: H Hartley Sweeten Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3ba37bdaef3bea9fa166eae6051949d629e7ea83 Author: H Hartley Sweeten Date: Mon Dec 14 18:04:49 2009 -0500 USB: atmel_usba_udc.c: use resource_size() Use resource_size(). Signed-off-by: H Hartley Sweeten Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5c90e314a62f09bf4dda4ec5cf50b904540ffa34 Author: H Hartley Sweeten Date: Mon Dec 14 18:05:02 2009 -0500 USB: pxa27x_udc.c: use resource_size() Use resource_size(). Signed-off-by: H Hartley Sweeten Cc: David Brownell Acked-by: Robert Jarzmik Signed-off-by: Greg Kroah-Hartman commit 1af107744253b01b4cf119a9bb3369376b01658b Author: Anton Vorontsov Date: Mon Dec 14 18:41:12 2009 +0300 USB: ehci-fsl: Add power management support EHCI FSL controller preserve its state during sleep mode, so nothing fancy needs to be done. Though, during 'deep sleep' mode (as found in MPC831x CPUs) the controller turns off and needs to be reinitialized upon resume. This patch adds support for hibernation and resuming after deep sleep. Based on Dave Liu and Jerry Huang's work[1]. [1] http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-power-mangement.patch Signed-off-by: Anton Vorontsov Signed-off-by: Greg Kroah-Hartman commit dad3843f035a273f9b64e133467e8dcbfaf0ce60 Author: Anton Vorontsov Date: Mon Dec 14 18:41:05 2009 +0300 USB: ehci-fsl: Fix sparse warnings This patch fixes following warnings: ehci-fsl.c:43:5: warning: symbol 'usb_hcd_fsl_probe' was not declared. Should it be static? ehci-fsl.c:150:6: warning: symbol 'usb_hcd_fsl_remove' was not declared. Should it be static? Signed-off-by: Anton Vorontsov Signed-off-by: Greg Kroah-Hartman commit 22e186948a262c9cd377fb43aa50bb3c3f01c468 Author: Dmitri Epshtein Date: Mon Dec 14 17:17:34 2009 +0200 USB: ehci: fix audio record functionality for some Full speed sound blaster devices This patch fix audio record functionality for some Full speed sound blaster devices. Issue: Sometimes transaction complete indication is coming from HW one frame later. Solution: If scan_periodic process now frame or previous frame now-1 and sitd transaction is not finished yet, exit scan_periodic function and check the same transaction in the next frame. Signed-off-by: Dimitry Epshtein Signed-off-by: Saeed Bishara Cc: David Brownell Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d63c66d2d08f52487f3ef32f1c9b1231d848966b Author: Dmitri Epshtein Date: Mon Dec 14 17:17:33 2009 +0200 USB: ehci: add call of free_cached_itd_list() function in disable_periodic() Sometimes disable_periodic() stop scan_periodic before than free_cached_itd_list() was called. In such case USB Host stacked during disconnect operation Solution: add call of free_cached_itd_list() function in disable_periodic() Signed-off-by: Dimitry Epshtein Signed-off-by: Saeed Bishara Cc: David Brownell Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a5f0efaba4c2b644e6248648f75b0a8a522359f6 Author: Sarah Sharp Date: Wed Dec 9 15:59:17 2009 -0800 USB: Add call to notify xHC of a device reset. Add a new host controller driver method, reset_device(), that the USB core will use to notify the host of a successful device reset. The call may fail due to out-of-memory errors; attempt the port reset sequence again if that happens. Update hub_port_init() to allow resetting a configured device. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 2a8f82c4ceaffcfd64531dbdee1d1bc227387882 Author: Sarah Sharp Date: Wed Dec 9 15:59:13 2009 -0800 USB: xhci: Notify the xHC when a device is reset. When a USB device is reset, the xHCI hardware must know, in order to match the device state and disable all endpoints except control endpoint 0. Issue a Reset Device command after a USB device is successfully reset. Wait on the command to finish, and then cache or free the disabled endpoint rings. There are four different USB device states that the xHCI hardware tracks: - disabled/enabled - device connection has just been detected, - default - the device has been reset and has an address of 0, - addressed - the device has a non-zero address but no configuration has been set, - configured - a set configuration succeeded. The USB core may issue a port reset when a device is in any state, but the Reset Device command will fail for a 0.96 xHC if the device is not in the addressed or configured state. Don't consider this failure as an error, but don't free any endpoint rings if this command fails. A storage driver may request that the USB device be reset during error handling, so use GPF_NOIO instead of GPF_KERNEL while allocating memory for the Reset Device command. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 6219c047d3fe18dee4916d6898fc94f5a7ffd156 Author: Sarah Sharp Date: Wed Dec 9 15:59:11 2009 -0800 USB: xhci: Allow roothub ports to be disabled. Add the hub emulation code to allow ports on an xHCI root hub to be disabled. Add the code to clear the port enabled/disabled bit, and clear the port enabled/disabled change bit. Like EHCI, the port cannot be enabled by setting the port enabled/disabled bit. Instead, a port is enabled by the host controller after a reset. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 34fb562a436ca50e13c05e7584c9d62f151052bf Author: Sarah Sharp Date: Wed Dec 9 15:59:08 2009 -0800 USB: xhci: Refactor code to clear port change bits. Refactor the code to clear the port change bits in the port status register. All port status change bits are write one to clear. Remove a redundant port status read that was supposed to unblock any posted writes. We read the port after the write to get the updated status for debugging, so the port read after that is unnecessary. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit b45b506911247008f694dcaf1d8220a4942ebc4f Author: Sarah Sharp Date: Wed Dec 9 15:59:06 2009 -0800 USB: xhci: Refactor test for vendor-specific completion codes. All commands that can be issued to the xHCI hardware can come back with vendor-specific "informational" completion codes. These are to be treated like a successful completion code. Refactor out the code to test for the range of these codes and print debugging messages. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit a1d78c16bd31a715785e21967ac6110b386a3c1f Author: Sarah Sharp Date: Wed Dec 9 15:59:03 2009 -0800 USB: xhci: Allow allocation of commands without input contexts. The xhci_command structure is the basic structure for issuing commands to the xHCI hardware. It contains a struct completion (so that the issuing function can wait on the command), command status, and a input context that is used to pass information to the hardware. Not all commands need the input context, so make it optional to allocate. Allow xhci_free_container_ctx() to be passed a NULL input context, to make freeing the xhci_command structure simple. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 412566bd716397e28e81fc9b20804bc6a6daf14d Author: Sarah Sharp Date: Wed Dec 9 15:59:01 2009 -0800 USB: xhci: Refactor code to free or cache endpoint rings. Refactor out the code to cache or free endpoint rings from recently dropped or disabled endpoints. This code will be used by a new function to reset a device and disable all endpoints except control endpoint 0. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit c01591bd6ece72e1c099cbc25ed812e1add579dc Author: Sarah Sharp Date: Wed Dec 9 15:58:58 2009 -0800 USB: xhci: Fix error path when configuring endpoints. If we fail to queue an evaluate context command or a configure endpoint command to the command ring in xhci_configure_endpoint(), we need to remove the xhci_command structure from the device's command list before returning. If the command is left on the command list, it will sit there indefinitely, blocking commands submitted after this fails. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit f661c6f8c67bd55e93348f160d590ff9edf08904 Author: Alan Stern Date: Fri Dec 11 16:20:20 2009 -0500 USB: check the endpoint type against the pipe type This patch (as1316) adds some error checking to usb_submit_urb(). It's conditional on CONFIG_USB_DEBUG, so it won't affect normal users. The new check makes sure that the actual type of the endpoint described by urb->pipe agrees with the type encoded in the pipe value. The USB error code documentation is updated to include the code returned by the new check, and the usbfs SUBMITURB handler is updated to use the correct pipe type when legacy user code tries to submit a bulk transfer to an interrupt endpoint. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a91b0c502285fd0c569fae1222fdd945ef739233 Author: Francesco Lavra Date: Tue Dec 8 09:54:11 2009 +0100 cdc_acm: add reset_resume method Add reset resume logic to the cdc acm driver Signed-off-by: Francesco Lavra Acked-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit af2ac1a091bc8bee73d7837b73ebfb00b917aece Author: Pete Zaitcev Date: Mon Dec 7 20:29:05 2009 -0700 USB: serial mct_usb232: move DMA buffers to heap My distro kernel (Fedora Rawhide) started throwing warnings from DMA API checker, so I have no choice but band-aid it quick. There's no attempt to reuse DMA buffers. Control messages are only sent rarely anyway. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4fdb31d9665a9106190d9f8888cf06252c20f3ce Author: Enrico Scholz Date: Sun Oct 11 11:52:48 2009 +0200 USB: pxa27x_udc: avoid compiler warnings and misbehavior on buggy hardware hardware reports wrong interrupt. Although such a situation should not happen, the compiler complains about this access. This patch adds a sanity check and generates warning to detect such issues. Signed-off-by: Enrico Scholz Acked-by: Robert Jarzmik Signed-off-by: Greg Kroah-Hartman commit 2f0e40aba1cafe3a834bfcbac8f1e704d496dab9 Author: Valentin Longchamp Date: Wed Jan 20 19:43:23 2010 +0100 USB: fix occasional ULPI timeouts with ehci-mxc On various mxc boards, the intial ULPI reads resulted in a timeout which prevented the transceiver to be identified and thus the ehci device to be probed. Initializing the hardware lines connected to the transceiver (through pdata->init call) before actually enabling clocks and configuring registers in the devices fixes this problem. Signed-off-by: Valentin Longchamp Signed-off-by: Greg Kroah-Hartman commit cabe6cc2be287d0020d70944e8d0d0304e484a6c Author: Mark Adamson Date: Tue Nov 24 09:39:10 2009 +0000 USB: ftdi_sio: remove support for 5 and 6 data bits Removed CS5 and CS6 from data bits since these are not supported in FTDI hardware. Signed-off-by: Mark J. Adamson Signed-off-by: Greg Kroah-Hartman commit 8c4f99cd54469d643e27a743045da848f7b63fe5 Author: Johan Hovold Date: Sun Nov 22 21:25:20 2009 +0100 USB: ftdi_sio: fix initialisation of latency timeout Latency timeout was read but never stored on port probe. When ASYNC_LOW_LATENCY was cleared the device timeout would get set to 0 rather than the default 16ms. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit b4fc2aeef23b4b35809054ddf495f9efdc3ac9d6 Author: Johan Hovold Date: Sun Nov 22 17:42:34 2009 +0100 USB: serial: fix typo in debug message Fixes confusing "serial_chars_in_buffer = port 0" messages. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0076b4bec5cffff856ec4a91830c902fbd7870df Author: Johan Hovold Date: Sun Nov 22 17:25:08 2009 +0100 USB: ftdi_sio: remove obsolete comment We always push characters to ldisc immediately regardless of ASYNC_LOW_LATENCY. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e2b5cbfe77ecbbeccc38a486e054a59aaaf028c8 Author: Johan Hovold Date: Sun Nov 22 17:01:13 2009 +0100 USB: ftdi_sio: fix error message on close Resubmitting read urb fails with -EPERM if completion handler runs while urb is being killed on close. This should not be reported as an error. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 30fa3d8ed0a61703281bde948f7590d843308b4a Author: Simon Arlott Date: Sat Nov 21 15:16:38 2009 +0000 USB: cxacru: increment driver version Changes: Return an empty string for modulation when there is no connection Fix sysfs unload race conditions Log firmware load process, remove delay Add new configuration interface Remove cxacru-cf.bin Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 817db5b34e70650c488f22b072b7efb950812adb Author: Simon Arlott Date: Sat Nov 21 15:15:47 2009 +0000 USB: cxacru: remove cxacru-cf.bin loader This has never worked properly because wsize passed to cxacru_cm() is incorrectly set to the number of values instead of the data bytes. The maximum number of values that can be set at once is 7 which means the device will not get enough data to work with and none of the configuration values will be used. At least one existing cxacru-cf.bin file contains invalid data which will prevent the modem from syncing properly. Fixing it is likely to break existing systems, and the new sysfs interface for setting configuration parameters can provide the same functionality. A script is provided to convert from the original format. Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 4ac37208e9b30b36b615ed22a79b4ee787fdc9b5 Author: Simon Arlott Date: Sat Nov 21 15:14:01 2009 +0000 USB: cxacru: add write-only sysfs attribute for modem configuration The modem can be configured using CM_REQUEST_CARD_DATA_SET, although CM_REQUEST_CARD_DATA_GET does not return any data. Tested by setting the modulation (0x0a) option. There is a list of parameters in the following archive, but the meaning of many of them is not well documented: http://sourceforge.net/project/shownotes.php?release_id=301825 This source also indicates that the highest parameter set is 0x4a but this varies by model so an arbitrary limit of 0x7f has been used (the index is a 32-bit integer). Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 885582c48e5fbf47ccc4273aaa5f2f56ad513253 Author: Simon Arlott Date: Sat Nov 21 15:12:56 2009 +0000 USB: cxacru: firmware writes on OHCI are slow, log progress Firmware writing takes 256ms per 4KB with OHCI, which is very slow compared to 7ms per 4KB with UHCI. Until I have access to a hardware USB analyser it may not be possible to determine why this happens. Instead of appearing to do nothing, log progress when writing firmware and then log the ATM device information when finished. Remove an unnecessary 4 second delay. Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit c68bb0d738897ed39b90c7ccb22e01c938117051 Author: Simon Arlott Date: Sat Nov 21 15:12:21 2009 +0000 USB: cxacru: document how to interact with the flash memory These commands were found by accident... fortunately it still works even if the flash memory is erased, despite having no USB device IDs. Some example sysfs code for raw command access: http://simon.arlott.org/pub/cxacru/raw.c Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 9fc950d322380dda8e9bc8debe89766085e7a0eb Author: Simon Arlott Date: Sat Nov 21 15:33:51 2009 +0000 USB: cxacru: check device isn't being removed during sysfs calls It is possible for usb_get_intfdata() to return NULL if sysfs is accessed while the module is being unloaded or the device is being removed. Move the access code to an inline function in usbatm.h, and return -ENODEV if any of the pointers are NULL. It should not be possible for the instance data or atm device to be invalid until after unbind() completes and the sysfs attributes have been removed. Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 5d0a9c7932c45435de72b5a5b2825c7eb34186a4 Author: Simon Arlott Date: Sat Nov 21 15:07:14 2009 +0000 USB: cxacru: check data length is not negative When attempting to read data that is not actually an array of values, the length may be negative which causes an Oops due to a likely access off the end of the data array. This bug should not occur under normal use unless the device returns an invalid response. Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 1bfbd283cd3082b6cadfbf340faf7d35b8a36b83 Author: Simon Arlott Date: Sat Nov 21 15:03:23 2009 +0000 USB: cxacru: return an empty value for modulation if there is no connection When there is no connection, return an empty string instead of "0" for the connection modulation. Signed-off-by: Simon Arlott Signed-off-by: Greg Kroah-Hartman commit 4e0fa90d1de10d68429afa9353e10bb9436455db Author: Martin Fuzzey Date: Sat Nov 21 12:14:58 2009 +0100 USB: MXC: add platform resources for i.MX21 USB host controller. Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit 3eb352c73c99602fd379782284ea2de1476c4f9d Author: Martin Fuzzey Date: Sat Nov 21 12:14:54 2009 +0100 USB: MXC: use DMA_BIT_MASK macro rather than hardcoded constants. Also fixes tab/space issue causing checkpatch to complain. Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit 23d3e7a6598066ed39771cf2030c6bbb581c7812 Author: Martin Fuzzey Date: Sat Nov 21 12:14:48 2009 +0100 USB: MXC: Add i.MX21 specific USB host controller driver. This driver is a Full / Low speed only USB host for the i.MX21. Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit 832d30ca72c0a59058e66e097f5ea11f99640819 Merge: 3a5b27b b4ccebd Author: Linus Torvalds Date: Tue Mar 2 14:47:24 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (38 commits) SELinux: Make selinux_kernel_create_files_as() shouldn't just always return 0 TOMOYO: Protect find_task_by_vpid() with RCU. Security: add static to security_ops and default_security_ops variable selinux: libsepol: remove dead code in check_avtab_hierarchy_callback() TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain security: fix a couple of sparse warnings TOMOYO: Remove unneeded parameter. TOMOYO: Use shorter names. TOMOYO: Use enum for index numbers. TOMOYO: Add garbage collector. TOMOYO: Add refcounter on domain structure. TOMOYO: Merge headers. TOMOYO: Add refcounter on string data. TOMOYO: Reduce lines by using common path for addition and deletion. selinux: fix memory leak in sel_make_bools TOMOYO: Extract bitfield syslog: clean up needless comment syslog: use defined constants instead of raw numbers syslog: distinguish between /proc/kmsg and syscalls selinux: allow MLS->non-MLS and vice versa upon policy reload ... commit 137ee2f5d173a0e859e35bfb900261418eb88ace Author: Breno Leitao Date: Thu Feb 25 15:31:50 2010 -0300 jsm: fixing error if the driver fails to load Currently if the driver fails to register on port, the kernel crashes with the following stack: cpu 0x1: Vector: 300 (Data Access) at [c0000000e0303090] pc: c00000000039aa74: .__mutex_lock_slowpath+0x44/0x10c lr: c00000000039aa58: .__mutex_lock_slowpath+0x28/0x10c [c0000000e03033c0] c00000000026b074 .uart_remove_one_port+0xbc/0x16c [c0000000e0303460] d0000000000e0554 .jsm_remove_uart_port+0x8c/0x10c [jsm] [c0000000e03034f0] d0000000000dc034 .jsm_remove_one+0x34/0x108 [jsm] [c0000000e0303590] c0000000001f4aa0 .pci_device_remove+0x48/0x74 ... This patch just fixes the code flow to abort the load when an error is detected. Signed-off-by: Breno Leitao Signed-off-by: Greg Kroah-Hartman commit 54862ee005943d0fdb13d4e54220f234676e05f5 Author: Breno Leitao Date: Thu Feb 25 15:31:49 2010 -0300 jsm: removing the uart structure and filename on error If jsm fails to load, then remove the uart stuff, otherwise, the things (as files), will be there forever (even when the module is unloaded). If you try to reload the module, the following message appears: kobject_add_internal failed for ttyn1 with -EEXIST, don't try to register things with the same name in the same directory. This patch remove the uart things when the driver fails. Signed-off-by: Breno Leitao Signed-off-by: Greg Kroah-Hartman commit eec9fe7d1ab4a0dfac4cb43047a7657fffd0002f Author: Ari Entlich Date: Fri Feb 19 09:37:55 2010 -0500 tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call This new VT mode (VT_PROCESS_AUTO) does everything that VT_PROCESS does except that it doesn't wait for a VT_RELDISP ioctl before switching away from a VT with that mode. If the X server eventually uses this new mode, debugging and crash recovery should become easier. This is because even when currently in the VT of a frozen X server it would still be possible to switch out by doing SysRq-r and then CTRL-, sshing in and doing chvt , or any other method of VT switching. The general concensus on #xorg-devel seems to be that it should be safe to use this with X now that we have KMS. This also moves the VT_ACKACQ define to a more appropriate place, for clarity's sake. Signed-off-by: Ari Entlich Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit d9661adfb8e53a7647360140af3b92284cbe52d4 Author: Alan Cox Date: Thu Feb 18 16:43:47 2010 +0000 tty: Keep the default buffering to sub-page units We allocate during interrupts so while our buffering is normally diced up small anyway on some hardware at speed we can pressure the VM excessively for page pairs. We don't really need big buffers to be linear so don't try so hard. In order to make this work well we will tidy up excess callers to request_room, which cannot itself enforce this break up. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4165fe4ef7305609a96c7f248cefb9c414d0ede5 Author: Alan Cox Date: Wed Feb 17 13:07:13 2010 +0000 tty: Fix up char drivers request_room usage We can't change them all but quite a few misuse it. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 638b9648ab51c9c549ff5735d3de519ef6199df3 Author: Alan Cox Date: Mon Feb 8 10:09:26 2010 +0000 tty: Fix the ldisc hangup race This was noticed by Matthias Urlichs and he proposed a fix. This patch does the fixing a different way to avoid introducing several new race conditions into the code. The problem case is TTY_DRIVER_RESET_TERMIOS = 0. In that case while we abort the ldisc change, the hangup processing has not cleaned up and restarted the ldisc either. We can't restart the ldisc stuff in the set_ldisc as we don't know what the hangup did and may touch stuff we shouldn't as we are no longer supposed to influence the tty at that point in case it has been re-opened before we get rescheduled. Instead do it the simple way. Always re-init the ldisc on the hangup, but use TTY_DRIVER_RESET_TERMIOS to indicate that we should force N_TTY. Signed-off-by: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman commit 97c22394bb5dc89683ac150f1003d47e6e9418d9 Author: Alan Cox Date: Mon Feb 8 10:03:58 2010 +0000 serial: timberdale: Remove dependancies MFD_TIMBERDALE doesn't appear to be defined anywhere. However the code in question can build happily without platform specifics so remove the check Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b2a3dbc3ed401828c4de0f08d08d96d0f5ea5b0b Author: Alan Cox Date: Mon Feb 8 10:07:15 2010 +0000 nozomi: Tidy up the PCI table Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e8c65d143a9903cb553c0d80c819428c5b839a02 Author: Alan Cox Date: Mon Feb 8 10:07:04 2010 +0000 nozomi: Fix mutex handling The original author didn't realise the kernel lock was a drop while sleep lock so did clever (and wrong) things to work around the non need to avoid deadlocks. Remove the cleverness and the comment (as we don't hold the BKL now anyway in those paths) Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 266794eb71cfee65b38371954b9db2f6dbda207c Author: Alan Cox Date: Mon Feb 8 10:06:45 2010 +0000 nozomi: Add tty_port usage The Nozomi tty handling is very broken on the open/close side (See http://bugzilla.kernel.org/show_bug.cgi?id=13024 for one example). In particular it marks the tty as closed on the first close() not on the last. Most of the logic is pretty solid except for the open/close path so switch to the tty_port helpers and let them do all the heavy lifting. This is also fixes all the POSIX behaviour violations in the open/close paths. Begin by adding the tty port usage Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8b197a5ce7a7218bb9fc721647ba0d5734f27348 Author: Alan Cox Date: Mon Feb 8 10:08:39 2010 +0000 sdio_uart: Use kfifo instead of the messy circ stuff Revised patch to use the new kfifo API. This replaces the one that was dropped from -next due to collisions with the kfifo API changes. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6a2c7eabfd09ca7986bf96b8958a87ca041a19d8 Author: Maxime Bizon Date: Sat Jan 30 18:42:57 2010 +0100 serial: bcm63xx_uart: allow more than one uart to be registered. The bcm6358 CPU has two uarts, make it possible to use the second one. Signed-off-by: Maxime Bizon Signed-off-by: Greg Kroah-Hartman commit a6d07d14bb5cc83237fb259014c1787ffdb83ccb Author: Maxime Bizon Date: Sat Jan 30 18:42:56 2010 +0100 serial: bcm63xx_uart: don't use kfree() on non kmalloced area. Signed-off-by: Maxime Bizon Signed-off-by: Greg Kroah-Hartman commit 599b714ce1ff578f0ff2bc1441122be87c0fa478 Author: Mike Frysinger Date: Tue Jan 19 06:13:13 2010 -0500 serial: bfin_5xx: pull in linux/io.h for ioremap prototypes Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit cdc592d5d496e5c813d9632d0d1e334658927af7 Author: Sonic Zhang Date: Tue Jan 19 06:13:12 2010 -0500 serial: bfin_5xx: kgdboc should accept gdb break only when it is active If we always check for gdb breaks even when it isn't active, we get false positives on normal code and the system panics. URL: http://blackfin.uclinux.org/gf/tracker/5277 Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee Author: Graf Yang Date: Tue Jan 19 06:13:11 2010 -0500 serial: bfin_5xx: need to disable DMA TX interrupt too If we don't disable the DMA TX channel, an inopportune timeout will trigger the interrupt handler and may cause a dead lock with the spin_lock. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit b2ced4f69ea87399a37b4485280c52034a0161a8 Author: Sonic Zhang Date: Tue Jan 19 06:13:10 2010 -0500 serial: bfin_5xx: remove useless gpio handling with hard flow control For UARTs that have dedicated hardware flow control support, there will be no gpios to request/free as they are part of the normal peripheral pins. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ca1cce49c2778439d00bbf516f70386f3d3b71e5 Author: Jiri Slaby Date: Sun Jan 10 12:30:16 2010 +0100 Char: synclink, remove unnecessary checks Stanse found a potential null dereference in mgsl_put_char and mgsl_write. There is a check for tty being NULL, but it is dereferenced earlier. Actually, tty cannot be NULL in .write and .put_char, so remove the tests. Signed-off-by: Jiri Slaby Cc: Andrew Morton Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e6c4ef984ebbd1a0458503417da91f3de47cbbe0 Author: Ben Hutchings Date: Wed Jan 13 23:34:18 2010 +0000 tty: declare MODULE_FIRMWARE in various drivers Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 02c95a62d8a0ad0ce71653b9f860b534f89ecc7b Author: Rakib Mullick Date: Sat Jan 23 18:53:51 2010 +0600 ip2: Add module parameter. Stephen Rothwell found the following warning (x86_64 allmodconfig): drivers/char/ip2/ip2main.c:511: warning: 'ip2_setup' defined but not used This patch adds module parameter to fix the above warning. Signed-off-by: Rakib Mullick Signed-off-by: Greg Kroah-Hartman commit 795877cfa4a4db0982ac21e095dad9fbdc909647 Author: Rakib Mullick Date: Wed Dec 9 12:34:18 2009 -0800 ip2: remove #ifdef MODULE from ip2main.c On the kernel command line we can pass "module parameters". So #ifdef MODULE is obsolute now. Remove it completely. When CONFIG_PCI=n and building ip2main.c then we are hit by the following warning. So move *pdev into #ifdef CONFIG_PCI. drivers/char/ip2/ip2main.c: In function `ip2_loadmain': drivers/char/ip2/ip2main.c:542: warning: unused variable `pdev' Signed-off-by: Rakib Mullick Acked-by: Michael H. Warfield Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c6fc826e4c51d2c54913c2a6d800159a2c7dac4b Author: Rakib Mullick Date: Wed Dec 9 12:34:18 2009 -0800 tty: moxa: remove #ifdef MODULE completely. We can pass "module parameters" on the kernel command line even when !MODULE. So, #ifdef MODULE becomes obsolete. Also move the declaration moxa_board_conf at the start of the function, since we were hit by the following warning. drivers/char/moxa.c: In function `moxa_init': drivers/char/moxa.c:1040: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Rakib Mullick Acked-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ecfcbee729389bc47576695c529d351d60946ca7 Author: Roel Kluin Date: Wed Dec 9 12:34:16 2009 -0800 hvc_console: fix test on unsigned in hvc_console_print() vtermnos[] is unsigned, so this test was wrong. Signed-off-by: Roel Kluin Cc: Benjamin Herrenschmidt Cc: Hendrik Brueckner Cc: Christian Borntraeger Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit db91340b2e874693f14e9e937152e7433d7ac753 Author: Joe Perches Date: Wed Dec 9 12:34:16 2009 -0800 serial: isicom.c: use pr_fmt and pr_ Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Convert printks to pr_ Convert some embedded function names to %s...__func__ Remove a period after exclamation points. Remove #define pr_dbg which could be used by future kernel.h includes Signed-off-by: Joe Perches Acked-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f43a510de8af5748637de21c96f82232b24920e4 Author: Jiri Slaby Date: Wed Dec 9 12:34:15 2009 -0800 tty: char: mxser, remove unnecessary tty test Stanse found unnecessary test in mxser_startup. tty is dereferenced earlier, the test is superfluous. Remove it. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2090436357c20afad377a61c789f502c36d637de Author: Bartlomiej Zolnierkiewicz Date: Wed Dec 9 12:34:14 2009 -0800 serial: cyclades: allow overriding ISA defaults also when the driver is built-in Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a357e777b5982d5f460a2783d697a8a90d497348 Author: Jiri Slaby Date: Wed Dec 9 12:34:13 2009 -0800 serial: Char: cyclades, fix compiler warning With gcc 4.0.2: drivers/char/cyclades.c: In function 'cyy_interrupt': drivers/char/cyclades.c:581: warning: 'info' may be used uninitialized in this function introduced by : commit 3aeea5b92210083c7cffd4f08a0bb141d3f2d574 : Author: Jiri Slaby : AuthorDate: Sat Sep 19 13:13:16 2009 -0700 : Commit: Live-CD User : CommitDate: Sat Sep 19 13:13:16 2009 -0700 : : cyclades: introduce cyy_readb/writeb In fact the true branch which uses uninitialized 'info' can never happen because chip is always less than ->nchips and channel is always less than 4 which we alloc. So behave similar to rx handling and remove the test completely. I wonder why gcc 4.4.1 doesn't spit a word. Reported-by: Andrew Morton Cc: Alan Cox Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1e091751cdb2c28f9f25041be0dcb4d33e4a833d Author: Roel Kluin Date: Mon Dec 21 16:26:49 2009 -0800 serial: fix test of unsigned The variables were unsigned so the tests did not work. Signed-off-by: Roel Kluin Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2a52fcb54fdf4b557730022aefcc794d567591fb Author: Kiros Yeh Date: Mon Dec 21 16:26:48 2009 -0800 serial: add support for Korenix JetCard Add different model (with a different PCI ID) to support Korenix JetCard. Signed-off-by: Kiros Yeh Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bbcd18d1b37413d25eaf4580682b1b8e4a09ff5e Author: Baruch Siach Date: Mon Dec 21 16:26:46 2009 -0800 serial: imx: fix NULL dereference Oops when pdata == NULL The platform code doesn't have to provide platform data to get sensible default behaviour from the imx serial driver. This patch does not handle NULL dereference in the IrDA case, which still requires a valid platform data pointer (in imx_startup()/imx_shutdown()), since I don't know whether there is a sensible default behaviour, or should the operation just fail cleanly. Signed-off-by: Baruch Siach Cc: Baruch Siach Cc: Alan Cox Cc: Sascha Hauer Cc: Oskar Schirmer Cc: Fabian Godehardt Cc: Daniel Glöckner Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ac6ec5b1de5d1d5afcbe88d73c05df71dca0ac39 Author: Ira W. Snyder Date: Mon Dec 21 16:26:45 2009 -0800 serial: 8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card This patch is heavily based on an earlier patch found on the linux-serial mailing list [1], written by Darius Augulis. The previous incarnation of this patch only supported a 2x serial port card. I have added support for my SYBA 6x serial port card, and tested on x86. [1]: http://marc.info/?l=linux-serial&m=124975806304760 Signed-off-by: Ira W. Snyder Cc: Darius Augulis Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit de538eb3441e8b9f7aedb3a37e46c005538451dc Author: Paul Fulghum Date: Wed Dec 9 12:31:39 2009 -0800 serial: synclink_gt: dropped transmit data bugfix Fix transmit bug that could drop send data if write() called close to serial transmitter going idle after sending previous data. Bug is caused by incorrect use of device information member tx_count. Driver originally processed one data block (write call) at a time, waiting for transmit idle before sending more. tx_count recorded how much data was loaded in DMA buffers on write(), and was cleared on send completion. tx_count use was overloaded to record accumulated data from put_char() callback when transmitter was idle. A bug was introduced when transmit code was reworked to allow multiple blocks of data in the tx DMA buffers which keeps transmitter from going idle between blocks. tx_count was set to size of last block loaded, cleared when tx went idle, and monitored to know when to restart transmitter without proper synchronization. tx_count could be cleared when unsent data remained in DMA buffers and transmitter required restarting, effectively dropping unsent data. Solution: 1. tx_count now used only to track accumulated data from put_char 2. DMA buffer state tracked by direct inspection of descriptors with spinlock synchronization 3. consolidate these tasks in tx_load() : a. check for available buffer space b. load buffers c. restart DMA and or serial transmitter as needed These steps were previously duplicated in multiple places, sometimes incompletely. 4. fix use of tx_count as active transmit indicator, instead using tx_active which is meant for that purpose Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8fe2d54145a51238308d333f9dc57c5df575ff78 Author: Albin Tonnerre Date: Wed Dec 9 12:31:32 2009 -0800 serial: atmel_serial: add poll_get_char and poll_put_char uart_ops Permits using KGDB over the console with the atmel_serial driver. [akpm@linux-foundation.org: s/barrier/cpu_relax/] Signed-off-by: Albin Tonnerre Acked-by: Andrew Victor Acked-by: Haavard Skinnemoen Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8b505ca8e2600eb9e7dd2d6b2682a81717671374 Author: Thiago Farina Date: Wed Dec 9 12:31:30 2009 -0800 serial: 68328serial.c: remove BAUD_TABLE_SIZE macro This macro is a duplicate of ARRAY_SIZE defined in kernel api, so just use that instead. Signed-off-by: Thiago Farina Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b5d228cc4f854aebcefac987d111fc072ecd15e0 Author: Shmulik Ladkani Date: Wed Dec 9 12:31:29 2009 -0800 serial: copy UART properties of UPF_FIXED_TYPE ports provisioned using early_serial_setup Augment the UPF_FIXED_TYPE logic, which currently applies to UART ports provisioned using platform_device_register. The suggested patch applies same logic into 'serial8250_register_ports', making UART ports provisioned using early_serial_setup inherit their properties from the uart_config entry. Signed-off-by: Shmulik Ladkani Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ccf68e59e93181df9353c0cc721459d18ff200b6 Author: sonic zhang Date: Wed Dec 9 12:31:28 2009 -0800 serial: fit blackfin uart over sport driver into common uart infrastructure Fit blackfin uart over sport driver into common uart inftrastructure. It is based on the early platform interfaces to get the platform data early when the console is initilized. 1. Enable sport uart driver to change uart baud, data bit, stop bit at runtime. Bind the index of uart device nodes to physical index of sports. 2. Move all platform data into arch specific board files. Register and probe platform device data in both early and normal stages. 3. Console is registered in sport uart driver as well. 4. Remove 500 us block waiting in sport tx stop code by putting a dummy data into tx fifo to make sure the sport tx stops when all bytes are shifted out except for the dummy data. 5. clean up a bit and fix up coding style. Signed-off-by: Sonic Zhang Cc: Alan Cox Cc: Mike Frysinger Cc: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9df5778ecee8b301b447fc05706792d5f447ace5 Author: Tristan Ye Date: Tue Mar 2 13:59:42 2010 +0800 Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h Currently we were adding ioctl cmds/structures for ocfs2 into ocfs2_fs.h which was used for define ocfs2 on-disk layout. That sounds a little bit confusing, and it may be quickly polluted espcially when growing the ocfs2_info_request ioctls afterwards(it will grow i bet). As a result, such OCFS2 IOCs do need to be placed somewhere other than ocfs2_fs.h, a separated ocfs2_ioctl.h will be added to store such ioctl structures and definitions which could also be used from userspace to invoke ioctls call. Signed-off-by: Tristan Ye Signed-off-by: Joel Becker commit f25e188c892a9a82f8c3babf6fda304fff8cb3cc Author: Manuel Lauss Date: Mon Mar 1 21:40:56 2010 +0100 pcmcia: alchemy: fixup wrong comments Commit 11b897cf84c37e6522db914793677e933ef311fb changed expected pcmcia area addresses from the 32bit pseudo to the real 36bit addresses, but did not update the comments. Signed-off-by: Manuel Lauss Signed-off-by: Dominik Brodowski commit f9097dce5d799462e086adca28815dac5006bb30 Author: Komuro Date: Sun Feb 28 15:39:33 2010 +0900 pcmcia: remove irq_list parameter from pd6729 Remoe the irq_list parameter from pd6729, as it can and should be set via sysfs (and -- if available -- pcmciautils, which reads the information from /etc/pcmcia/config.opts ) [linux@dominikbrodowski.net: updated commit message] Signed-off-by: Komuro Signed-off-by: Dominik Brodowski commit f3d4ae431d819200bb61e943cb23572b10744e93 Author: Michal Pecio Date: Tue Feb 2 14:39:47 2010 -0800 yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards Indigos are well known for distortions when running on some buggy ENE controllers. There is a workaround in the yenta driver, but for some reason it isn't activated on CB712. However, I own a laptop with such chip and it seems that it also is affected - I can clearly hear occasional cracks, especially under heavy network load, and in Windows XP the card is completely unusable. This simple change fixed things for me. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15191 [linux@dominikbrodowski.net: extend it to the other ENE bridges] Signed-off-by: Michal Pecio Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 56a5d3cf21c71963c8fc506e9b9d3f71641d9c71 Author: Linus Walleij Date: Tue Mar 2 20:12:56 2010 +0100 DMAENGINE: COH 901 318 lli sg offset fix This makes the COH 901 318 respect the scatter offset field by using the sg_phys() rather than the sg_dma_address() so we get a pointer to the actual data we want to send rather than the beginning of the buffer. Also initialize the lli:s a bit more thoroughly. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 516fd4305e5f5718475e81fe5c17c95888a8157b Author: Linus Walleij Date: Tue Mar 2 20:12:46 2010 +0100 DMAENGINE: COH 901 318 configure channel direction This makes the COH 901 318 configure channel direction (to or from device) dynamically, instead of being passed in from the platform data. This was necessary in order to get the MMC/SD-card channel bidirectional (all other channels on the U300 were either RX or TX but this one was both). This also sets memcpy() alignent to even 2^2 (32bit) boundaries, which makes the memcpy() stress tests start working. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 0b58828c923e57f1bfbbd2c4277ceb60666314fa Author: Linus Walleij Date: Tue Mar 2 14:17:44 2010 -0700 DMAENGINE: COH 901 318 remove irq counting This removes the pointless irq counting for the COH 901 318, as it turns out the hardware will only ever fire one IRQ for a linked list anyway. In the process also a missing spinlock was introduced. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit b87108a772e001af3fa79f9cfd87b190375f47a2 Author: Linus Walleij Date: Tue Mar 2 14:17:20 2010 -0700 DMAENGINE: COH 901 318 descriptor pool refactoring This centralize some spread-out initialization of descriptors into one function and cleans up the error paths. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 848ad121240f539e14a59eddd69e164aea9560b2 Author: Linus Walleij Date: Tue Mar 2 14:17:15 2010 -0700 DMAENGINE: COH 901 318 cleanups This cleans up the some debug code that was not working in the COH 901 318 driver, adds some helpful comments and rearrange the code a bit. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit ccdb357ccb77cc4cbe4f7abee9efd19957f0753a Author: J. Bruce Fields Date: Tue Mar 2 15:49:21 2010 -0500 svcrpc: treat uid's as unsigned We should consistently treat uid's as unsigned--it's confusing when the display of uid's in the cache contents isn't consistent with their representation in upcalls. Signed-off-by: J. Bruce Fields commit b08dfd0435333818a03b38867c556ebcbb3abc02 Author: Johannes Berg Date: Fri Jan 29 11:54:56 2010 -0800 iwlwifi: load firmware asynchronously before mac80211 registration At the wireless summit in Portland we discussed a way of loading firmware asynchronously from ->probe() before registration to mac80211, in order to register with the wireless subsystems with complete information in cases where firmware is required to know parameters. This is not yet the case in iwlwifi, but for some new features we're working on it will be the case since those will only be supported by new firmware images. Hence, to start with, convert iwlwifi to load firmware asynchronously from probe, unbinding the device when firmware loading fails, and only registering with the wireless subsystems after firmware has been loaded successfully. Future patches will hook into this to register the new firmware capabilities, depending on the firmware API version. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 535765179fd4e8af26b69d2240d7ec33702a370a Author: Johannes Berg Date: Wed Dec 23 13:15:30 2009 +0100 ar9170: load firmware asynchronously This converts ar9170 to load firmware asynchronously out of ->probe() and only register with mac80211 when all firmware has been loaded successfully. If, on the other hand, any firmware fails to load, it will now unbind from the device. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6e93d7195e75741e9ebe23ca5591977d0b39ecc0 Author: Helmut Schaa Date: Tue Mar 2 16:34:49 2010 +0100 rt2x00: fix rt2800pci compilation with SoC Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c: error: incompatible type for argument 2 of 'rt2x00soc_probe'". Fix this by using &rt2800pci_ops instead of rt2800pci_ops. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 51b2853fd91a3c8fd9f3adc1549569d2c1dc2a2d Author: Bryan Polk Date: Mon Mar 1 12:23:28 2010 -0500 rt2x00: Add USB ID for CEIVA adapter to rt73usb This adds support for CEIVA USB wireless adapters to the rt73usb driver. Signed-off-by: Bryan Polk Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9c87ba6734422034fccb938da1039ed63da1395c Author: Jouni Malinen Date: Sun Feb 28 12:13:46 2010 +0200 mac80211: Fix reassociation processing (within ESS roaming) Commit e1dd33f60ced091114e4aacf141e0d03b88d3e13 changed cfg80211 to allow association commands while in associated state to enable support for roaming within an ESS. However, this was not enough to resolve all cases with mac80211 which needs some additional handling of the reassociation case to clear internal state with the BSS that was in use previously. This patch makes ieee80211_mgd_assoc() accept a valid reassociation command and clean the association state with the previous BSS. This fixes roaming between BSSes in an ESS when using wpa_supplicant with -Dnl80211. Signed-off-by: Jouni Malinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit a9f042cbe5284f34ccff15f3084477e11b39b17b Author: Ming Lei Date: Sun Feb 28 00:56:24 2010 +0800 ath9k: fix lockdep warning when unloading module Since txq->axq_lock may be hold in softirq context, it must be acquired with spin_lock_bh() instead of spin_lock() if softieq is enabled. The patch fixes the lockdep warning below when unloading ath9k modules. ================================= [ INFO: inconsistent lock state ] 2.6.33-wl #12 --------------------------------- inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. rmmod/3642 [HC0[0]:SC0[0]:HE1:SE1] takes: (&(&txq->axq_lock)->rlock){+.?...}, at: [] ath_tx_node_cleanup+0x62/0x180 [ath9k] {IN-SOFTIRQ-W} state was registered at: [] __lock_acquire+0x2f6/0xd35 [] lock_acquire+0xcd/0xf1 [] _raw_spin_lock_bh+0x3b/0x6e [] spin_lock_bh+0xe/0x10 [ath9k] [] ath_tx_tasklet+0xcd/0x391 [ath9k] [] ath9k_tasklet+0x70/0xc8 [ath9k] [] tasklet_action+0x8c/0xf4 [] __do_softirq+0xf8/0x1cd [] call_softirq+0x1c/0x30 [] do_softirq+0x4b/0xa3 [] irq_exit+0x4a/0x8c [] do_IRQ+0xac/0xc3 [] ret_from_intr+0x0/0x16 [] cpuidle_idle_call+0x9e/0xf8 [] cpu_idle+0x62/0x9d [] rest_init+0x7e/0x80 [] start_kernel+0x3e8/0x3f3 [] x86_64_start_reservations+0xa7/0xab [] x86_64_start_kernel+0xf8/0x107 irq event stamp: 42037 hardirqs last enabled at (42037): [] _raw_spin_unlock_irqrestore+0x47/0x56 hardirqs last disabled at (42036): [] _raw_spin_lock_irqsave+0x2b/0x88 softirqs last enabled at (42000): [] spin_unlock_bh+0xe/0x10 [ath9k] softirqs last disabled at (41998): [] _raw_spin_lock_bh+0x18/0x6e other info that might help us debug this: 4 locks held by rmmod/3642: #0: (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x17/0x19 #1: (&wdev->mtx){+.+.+.}, at: [] cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] #2: (&ifmgd->mtx){+.+.+.}, at: [] ieee80211_mgd_deauth+0x3f/0x17e [mac80211] #3: (&local->sta_mtx){+.+.+.}, at: [] sta_info_destroy_addr+0x2b/0x5e [mac80211] stack backtrace: Pid: 3642, comm: rmmod Not tainted 2.6.33-wl #12 Call Trace: [] valid_state+0x178/0x18b [] ? save_stack_trace+0x2f/0x4c [] ? check_usage_backwards+0x0/0x88 [] mark_lock+0x113/0x230 [] __lock_acquire+0x36a/0xd35 [] ? native_sched_clock+0x2d/0x5f [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] lock_acquire+0xcd/0xf1 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_off+0xd/0xf [] _raw_spin_lock+0x36/0x69 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_on+0xd/0xf [] ath9k_sta_remove+0x22/0x26 [ath9k] [] __sta_info_destroy+0x1ad/0x38c [mac80211] [] sta_info_destroy_addr+0x3e/0x5e [mac80211] [] ieee80211_set_disassoc+0x175/0x180 [mac80211] [] ieee80211_mgd_deauth+0x58/0x17e [mac80211] [] ? __mutex_lock_common+0x37f/0x3a4 [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ieee80211_deauth+0x1e/0x20 [mac80211] [] __cfg80211_mlme_deauth+0x130/0x13f [cfg80211] [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ? trace_hardirqs_off+0xd/0xf [] __cfg80211_disconnect+0x111/0x189 [cfg80211] [] cfg80211_netdev_notifier_call+0x2ce/0x46d [cfg80211] [] notifier_call_chain+0x37/0x63 [] raw_notifier_call_chain+0x14/0x16 [] call_netdevice_notifiers+0x1b/0x1d [] dev_close+0x6a/0xa6 [] rollback_registered_many+0xb6/0x2f4 [] unregister_netdevice_many+0x1b/0x66 [] ieee80211_remove_interfaces+0xc5/0xd0 [mac80211] [] ieee80211_unregister_hw+0x47/0xe8 [mac80211] [] ath9k_deinit_device+0x7a/0x9b [ath9k] [] ath_pci_remove+0x38/0x76 [ath9k] [] pci_device_remove+0x2d/0x51 [] __device_release_driver+0x7b/0xd1 [] driver_detach+0x98/0xbe [] bus_remove_driver+0x94/0xb7 [] driver_unregister+0x6c/0x74 [] pci_unregister_driver+0x46/0xad [] ath_pci_exit+0x15/0x17 [ath9k] [] ath9k_exit+0xe/0x2f [ath9k] [] sys_delete_module+0x1c7/0x236 [] ? retint_swapgs+0x13/0x1b [] ? trace_hardirqs_on_caller+0x119/0x144 [] ? audit_syscall_entry+0x11e/0x14a [] system_call_fastpath+0x16/0x1b wlan1: deauthenticating from 00:23:cd:e1:f9:b2 by local choice (reason=3) PM: Removing info for No Bus:wlan1 cfg80211: Calling CRDA to update world regulatory domain PM: Removing info for No Bus:rfkill2 PM: Removing info for No Bus:phy1 ath9k 0000:16:00.0: PCI INT A disabled Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit 86baf712295a00d664da8566186b67041c89b15b Author: Dan Carpenter Date: Sat Feb 27 09:12:34 2010 +0300 zd1211rw: fix potential array underflow The first chunk fixes a debugging assert to print a warning about array underflows. The second chunk corrects a potential array underflow. I also removed an assert in the second chunk because it can no longer happen. Signed-off-by: Dan Carpenter Acked-by: Benoit Papillault Signed-off-by: John W. Linville commit 3082a2b7b1af1b1508c1c3fa589566064f926f40 Author: Matthew Garrett Date: Tue Feb 16 16:36:25 2010 -0500 rfkill: Add support for KEY_RFKILL Add support for handling KEY_RFKILL in the rfkill input module. This simply toggles the state of all rfkill devices. The comment in rfkill.h is also updated to reflect that RFKILL_TYPE_ALL may be used inside the kernel. Signed-off-by: Matthew Garrett Acked-by: Marcel Holtmann Signed-off-by: John W. Linville commit 6510b8917948283005a125c8337d3312a8a0561c Author: Stanislaw Gruszka Date: Fri Feb 26 15:10:28 2010 +0100 airo: return from set_wep_key() when key length is zero Even if keylen == 0 is a bug and should not really happen, better avoid possibility of passing bad value to firmware. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit f41496607e03ab99f263b8e26689ad0fc853007f Author: H. Peter Anvin Date: Tue Mar 2 11:21:09 2010 -0800 resource: Fix broken indentation Fix broken indentation in patch 37b99dd5372cff42f83210c280f314f10f99138e. Reported-by: Linus Torvalds Cc: Wu Fengguang LKML-Reference: <20100301135551.GA9998@localhost> Signed-off-by: H. Peter Anvin commit 180b62a3d837613fcac3ce89576526423926c3c3 Author: Andy Adamson Date: Tue Mar 2 13:19:36 2010 -0500 nfs41 fix NFS4ERR_CLID_INUSE for exchange id Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 Merge: 5057bfa 21df20f Author: Linus Torvalds Date: Tue Mar 2 10:41:26 2010 -0800 Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (49 commits) OMAP: DSS2: Taal: Fix TE when resuming OMAP: DSS2: Taal: Fix ESD check OMAP: DSS2: OMAPFB: Constify some function parameters OMAP: DSS2: OMAPFB: install omapfb.h OMAP: DSS2: DSI: add error prints OMAP: DSS2: TPO-TD03MTEA1: fix function names OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE OMAP: DSS2: DSI: remove external TE support OMAP: DSS2: move timing functions OMAP: DSS2: move set/get_wss() OMAP: DSS2: move enable/disable/suspend/resume OMAP: DSS2: move update() and sync() OMAP: DSS2: move set/get_update_mode() OMAP: DSS2: move enable/get_te() OMAP: DSS2: move get_recommended_bpp() OMAP: DSS2: move get_resolution() OMAP: DSS2: move enable/disable_channel to overlay manager OMAP: DSS2: move wait_vsync() OMAP: DSS2: move get/set_rotate() ... commit 5057bfaff82e12f01a2ffd58f55535cbd7c5c3a2 Merge: 6c0ad5d d702d12 Author: Linus Torvalds Date: Tue Mar 2 10:34:25 2010 -0800 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (214 commits) omap2: Initialize Menelaus and MMC for N8X0 AM3517 EVM: correct typo - tca6416 mispelt as tca6516 AM3517 EVM: Enable I2C support AM35x: Enable OMAP_MUX in defconfig AM35x: Add missing GPIO mux config for EHCI port Zoom3: Defconfig update omap: i2c: Fix muxing for command line enabled bus OMAP4: clock: Remove clock hacks from timer-gp.c OMAP4: clock: Add dummy clock nodes for interface clocks OMAP4: clock: Rename leaf clock nodes to end with a _ick or _fck OMAP2+ clock: revise omap2_clk_{disable,enable}() OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code OMAP clockdomain: if no autodeps exist, don't try to add or remove them OMAP hwmod: add hwmod class support OMAP hwmod: convert header files with static allocations into C files OMAP hwmod: convert hwmod to use hardware clock names rather than clkdev dev+con OMAP clock: add omap_clk_get_by_name() for use by OMAP hwmod core code OMAP3: clock: add capability to change rate of dpll4_m5_ck_3630 OMAP4 clock: drop the ALWAYS_ENABLED clock flag OMAP clock: drop RATE_FIXED clock flag ... commit 6c0ad5dfd3d5ad6def89b485ee52834547da239b Merge: b7f3a20 9599945 Author: Linus Torvalds Date: Tue Mar 2 10:33:36 2010 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "blkdev: fix merge_bvec_fn return value checks" commit 6630125419ef37ff8781713c5e9d416f2a4ba357 Author: Arnaldo Carvalho de Melo Date: Tue Mar 2 15:25:38 2010 -0300 perf archive: Don't try to collect files without a build-id To avoid these error: [root@doppio ~]# perf archive tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: Exiting with failure status due to previous errors [root@doppio ~]# More work is needed to support archiving symtabs for binaries without a build-id, perhaps creating a perf.data UUID + adding build-ids for the binaries copied into the cache and then have this perf.data session UUID be a directory with symlinks to the by now calculated build-id of the files inside it. Or just do an extra pass and insert the calculated build-ids in the perf.data header. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Ingo Molnar commit 9599945bac93b344519ea97f502cf537124b5a6e Author: Jens Axboe Date: Tue Mar 2 19:17:34 2010 +0100 Revert "blkdev: fix merge_bvec_fn return value checks" This reverts commit 9f7cdbc33f36d28e57eaba0093f68f0d14c38c5b. It's causing oopses om dm setups, so revert it until we investigate. Reported-by: Dmitry Torokhov Tested-by: Steven Rostedt Signed-off-by: Jens Axboe commit ebed9203b68a4f333ce5d17e874b26c3afcfeff1 Author: Trond Myklebust Date: Tue Mar 2 13:06:22 2010 -0500 NFS: Fix an allocation-under-spinlock bug sunrpc_cache_update() will always call detail->update() from inside the detail->hash_lock, so it cannot allocate memory. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 9fcfe0c83c3b04a759cde6b8c5f961237f17808b Author: Trond Myklebust Date: Tue Mar 2 13:06:21 2010 -0500 SUNRPC: Handle EINVAL error returns from the TCP connect operation This can, for instance, happen if the user specifies a link local IPv6 address. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 0f79fd6f5c52e05918e44996b0a1b18383d0fbc2 Author: Trond Myklebust Date: Tue Mar 2 13:06:21 2010 -0500 NFSv4.1: Various fixes to the sequence flag error handling Ensure that we change the EXCHANGE_ID verifier (i.e. clp->cl_boot_time) when we want to reset all state. This is mainly needed when the server tells us that it is revoking our open or lock stateids. Handle revoking of recallable state by expiring the delegations. Handle callback path issues by expiring the delegations and then resetting the session. Signed-off-by: Trond Myklebust commit 0851de06174e9800e76b26e4be0ca94294c09c8c Author: Alexandros Batsakis Date: Fri Feb 5 03:45:06 2010 -0800 nfs4: renewd renew operations should take/put a client reference renewd sends RENEW requests to the NFS server in order to renew state. As the request is asynchronous, renewd should take a reference to the nfs_client to prevent concurrent umounts from freeing the client Signed-off-by: Alexandros Batsakis Signed-off-by: Trond Myklebust commit 7135840fc74699513d50e0c9c64922f2d38aa5e3 Author: Alexandros Batsakis Date: Fri Feb 5 03:45:05 2010 -0800 nfs41: renewd sequence operations should take/put client reference renewd sends SEQUENCE requests to the NFS server in order to renew state. As the request is asynchronous, renewd should take a reference to the nfs_client to prevent concurrent umounts from freeing the session/client Signed-off-by: Alexandros Batsakis Signed-off-by: Trond Myklebust commit dc96aef96a75348b4d1b01c4c0429ab52780683e Author: Alexandros Batsakis Date: Fri Feb 5 03:45:04 2010 -0800 nfs: prevent backlogging of renewd requests If the renewd send queue gets backlogged (e.g., if the server goes down), we will keep filling the queue with periodic RENEW/SEQUENCE requests. This patch schedules a new renewd request if and only if the previous one returns (either success or failure) Signed-off-by: Alexandros Batsakis [Trond.Myklebust@netapp.com: moved nfs4_schedule_state_renewal() into separate nfs4_renew_release() and nfs41_sequence_release() callbacks to ensure correct behaviour on call setup failure] Signed-off-by: Trond Myklebust commit 888ef2e3f8b7b8daeb031bfb4ad1fd4fa817e193 Author: Alexandros Batsakis Date: Fri Feb 5 03:45:03 2010 -0800 nfs: kill renewd before clearing client minor version renewd should be synchronously killed before we destroy the session in nfs4_clear_minor_version Signed-off-by: Alexandros Batsakis [Trond.Myklebust@netapp.com: clean up to remove 'unused function warning when !CONFIG_NFS_V4] Signed-off-by: Trond Myklebust commit b7f3a209e9b09b3110ea084836c75f2cd26b29f2 Merge: 6d6b89b 4b17764 Author: Linus Torvalds Date: Tue Mar 2 07:56:44 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: sparc: Support show_unhandled_signals. sparc: use __ratelimit sunxvr500: Additional PCI id for sunxvr500 driver sparc: use asm-generic/scatterlist.h sparc64: If 'slot-names' property exist, create sysfs PCI slot information. sparc: remove trailing space in messages sparc: remove redundant return statements commit 6d6b89bd2e316b78d668f761d380837b81fa71ef Merge: 13dda80 2507c05 Author: Linus Torvalds Date: Tue Mar 2 07:55:08 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits) virtio_net: remove forgotten assignment be2net: fix tx completion polling sis190: fix cable detect via link status poll net: fix protocol sk_buff field bridge: Fix build error when IGMP_SNOOPING is not enabled bnx2x: Tx barriers and locks scm: Only support SCM_RIGHTS on unix domain sockets. vhost-net: restart tx poll on sk_sndbuf full vhost: fix get_user_pages_fast error handling vhost: initialize log eventfd context pointer vhost: logging thinko fix wireless: convert to use netdev_for_each_mc_addr ethtool: do not set some flags, if others failed ipoib: returned back addrlen check for mc addresses netlink: Adding inode field to /proc/net/netlink axnet_cs: add new id bridge: Make IGMP snooping depend upon BRIDGE. bridge: Add multicast count/interval sysfs entries bridge: Add hash elasticity/max sysfs entries bridge: Add multicast_snooping sysfs toggle ... Trivial conflicts in Documentation/feature-removal-schedule.txt commit 21df20fcfb4e88f4cd4991e9e67de549e6480adf Author: Tomi Valkeinen Date: Tue Mar 2 12:13:55 2010 +0200 OMAP: DSS2: Taal: Fix TE when resuming TE was not initialized properly on power on, which broke TE when resuming from suspend. Signed-off-by: Tomi Valkeinen commit 51c1410bd651609aafbcc3a2294df26a47bf6137 Author: Ingo Molnar Date: Tue Mar 2 09:53:45 2010 -0500 compal-laptop: Make it depend on CONFIG_RFKILL -tip testing found this build failure (x86 randconfig): drivers/built-in.o: In function `setup_rfkill': compal-laptop.c:(.text+0x36abe8): undefined reference to `rfkill_alloc' compal-laptop.c:(.text+0x36abfc): undefined reference to `rfkill_register' compal-laptop.c:(.text+0x36ac30): undefined reference to `rfkill_alloc' compal-laptop.c:(.text+0x36ac44): undefined reference to `rfkill_register' Which can happen with CONFIG_COMPAL_LAPTOP=y but COMPAL_LAPTOP=m. Signed-off-by: Ingo Molnar commit a58db59a263d4232710af816f3857254b5823633 Merge: 881a6c2 88cc837 Author: Matthew Garrett Date: Tue Mar 2 09:51:48 2010 -0500 Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into x86-platform commit b622d644c7d61a5cb95b74e7b143c263bed21f0a Author: Peter Zijlstra Date: Mon Feb 1 15:36:30 2010 +0100 perf_events, x86: Fixup fixed counter constraints Patch 1da53e0230 ("perf_events, x86: Improve x86 event scheduling") lost us one of the fixed purpose counters and then ed8777fc13 ("perf_events, x86: Fix event constraint masks") broke it even further. Widen the fixed event mask to event+umask and specify the full config for each of the 3 fixed purpose counters. Then let the init code fill out the placement for the GP regs based on the cpuid info. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 320ebf09cbb6d01954c9a060266aa8e0d27f4638 Author: Peter Zijlstra Date: Tue Mar 2 12:35:37 2010 +0100 perf, x86: Restrict the ANY flag The ANY flag can show SMT data of another task (like 'top'), so we want to disable it when system-wide profiling is disabled. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 77ba115c478d442024964b217f9f12192018cc77 Author: Steffen Klassert Date: Tue Mar 2 21:59:54 2010 +0800 crypto: authenc - Use correct ahash complete functions We accidentally assigned the ahash update complete function to the wrong function pointer in crypto_authenc_verify. This patch fixes this. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit eebb111f5f4aa7b91ffc046b84b24c1b75e391d1 Author: Herbert Xu Date: Tue Mar 2 21:58:16 2010 +0800 crypto: md5 - Set statesize As md5 now has export/import functions, it must set the attribute statesize. Otherwise anything that relies on import/export may fail as they will see a zero statesize. Signed-off-by: Herbert Xu commit 67eeb5685d2a211c0252ac7884142e503c759500 Author: Dmitry Monakhov Date: Tue Mar 2 08:08:51 2010 -0500 ext4: Fix ext4_quota_write cross block boundary behaviour We always assume what dquot update result in changes in one data block But ext4_quota_write() function may handle cross block boundary writes In fact if this ever happen it will result in incorrect journal credits reservation, and later a BUG_ON. As soon this never happen the boundary cross loop is NOOP. In order to make things straight let's remove this loop and assert cross boundary condition. Signed-off-by: Dmitry Monakhov Signed-off-by: "Theodore Ts'o" commit 273df556b6ee2065bfe96edab5888d3dc9b108d8 Author: Frank Mayhar Date: Tue Mar 2 11:46:09 2010 -0500 ext4: Convert BUG_ON checks to use ext4_error() instead Convert a bunch of BUG_ONs to emit a ext4_error() message and return EIO. This is a first pass and most notably does _not_ cover mballoc.c, which is a morass of void functions. Signed-off-by: Frank Mayhar Signed-off-by: "Theodore Ts'o" commit b7adc1f363e72e9131a582cc2cb00eaf83f51a39 Author: Jiaying Zhang Date: Tue Mar 2 13:26:36 2010 -0500 ext4: Use direct_IO_no_locking in ext4 dio read Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit 744692dc059845b2a3022119871846e74d4f6e11 Author: Jiaying Zhang Date: Thu Mar 4 16:14:02 2010 -0500 ext4: use ext4_get_block_write in buffer write Allocate uninitialized extent before ext4 buffer write and convert the extent to initialized after io completes. The purpose is to make sure an extent can only be marked initialized after it has been written with new data so we can safely drop the i_mutex lock in ext4 DIO read without exposing stale data. This helps to improve multi-thread DIO read performance on high-speed disks. Skip the nobh and data=journal mount cases to make things simple for now. Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit c7064ef13b2181a489836349f9baf87df0dab28f Author: Jiaying Zhang Date: Tue Mar 2 13:28:44 2010 -0500 ext4: mechanical rename some of the direct I/O get_block's identifiers This commit renames some of the direct I/O's block allocation flags, variables, and functions introduced in Mingming's "Direct IO for holes and fallocate" patches so that they can be used by ext4's buffered write path as well. Also changed the related function comments accordingly to cover both direct write and buffered write cases. Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit 14be1f7454ea96ee614467a49cf018a1a383b189 Author: Dimitri Sivanich Date: Mon Mar 1 11:48:15 2010 -0600 x86: Fix sched_clock_cpu for systems with unsynchronized TSC On UV systems, the TSC is not synchronized across blades. The sched_clock_cpu() function is returning values that can go backwards (I've seen as much as 8 seconds) when switching between cpus. As each cpu comes up, early_init_intel() will currently set the sched_clock_stable flag true. When mark_tsc_unstable() runs, it clears the flag, but this only occurs once (the first time a cpu comes up whose TSC is not synchronized with cpu 0). After this, early_init_intel() will set the flag again as the next cpu comes up. Only set sched_clock_stable if tsc has not been marked unstable. Signed-off-by: Dimitri Sivanich Acked-by: Venkatesh Pallipadi Acked-by: Peter Zijlstra LKML-Reference: <20100301174815.GC8224@sgi.com> Signed-off-by: Ingo Molnar commit 864c11080cf365720103042444534a1e94d42bac Author: Arseniy Lartsev Date: Tue Mar 2 14:52:28 2010 +0300 ALSA: usbaudio: Fix wrong bitrate for Creative Creative VF0470 Live Cam This patch works around misbehaviour of Creative Creative VF0470 Live Cam which reports 16 kHz sample rate for audio capture while actually producing 8 kHz stream. Signed-off-by: Arseniy Lartsev Signed-off-by: Takashi Iwai commit 2507c05ff55fbf38326b08ed27eaed233bc75042 Author: Jiri Pirko Date: Tue Mar 2 03:57:33 2010 -0800 virtio_net: remove forgotten assignment This is no longer needed. I missed to remove this in 567ec874d15b478c8eda7e9a5d2dcb05f13f1fb5 ("net: convert multiple drivers to use netdev_for_each_mc_addr, part6") Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit f31e50a802baae939c49819b8acd8f077019d398 Author: Sathya Perla Date: Tue Mar 2 03:56:39 2010 -0800 be2net: fix tx completion polling In tx/mcc polling, napi_complete() is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napi complete() after tx/mcc compl processing but before re-enabling interrupts (via a cq notify). Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit b88aafd365bc6a2222e2d03ff320adea3a37f628 Author: Herton Ronaldo Krzesinski Date: Tue Mar 2 03:44:41 2010 -0800 sis190: fix cable detect via link status poll Some sis190 devices don't report LinkChange, so do polling for link status. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11926 Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: David S. Miller commit bc505f373979692d51a86d40925f77a8b09d17b9 Author: Michael S. Tsirkin Date: Sun Nov 29 17:52:00 2009 +0200 virtio: set pci bus master enable bit As all virtio devices perform DMA, we must enable bus mastering for them to be spec compliant. This patch fixes hotplug of virtio devices with Linux guests and qemu 0.11-0.12. Tested-by: Alexander Graf Signed-off-by: Michael S. Tsirkin commit 0c43ea544c1086fbbed5a6c99ea58eb64674ea8f Author: Zhangfei Gao Date: Tue Mar 2 12:23:49 2010 +0100 i2c: Document the message size limit i2c_master_send & i2c_master_recv do not support more than 64 kb transfer, since msg.len is u16. Signed-off-by: Zhangfei Gao Signed-off-by: Jean Delvare commit eec74a257f0a695688ba44c0f6c1e92dc81459be Author: Jean Delvare Date: Tue Mar 2 12:23:47 2010 +0100 i2c-algo-pca: Drop duplicate variable Thanks to -Wshadow. Signed-off-by: Jean Delvare Reviewed-by: Wolfram Sang commit 6de468ae2df0ee6fbee668d946811638b57361f6 Author: Mark Brown Date: Tue Mar 2 12:23:46 2010 +0100 i2c: Hook up runtime PM support Allow I2C drivers to make use of the runtime PM framework by adding bus implementations of the runtime PM operations. These simply immediately suspend when the device is idle. The runtime PM framework provides drivers with off the shelf refcounts for enables and sysfs control for managing runtime suspend from userspace so is useful even without meaningful input from the bus. Signed-off-by: Mark Brown Signed-off-by: Jean Delvare commit 927ab2f80745ec26f1e83e6ca15a5b29e134c8e5 Author: Jean Delvare Date: Tue Mar 2 12:23:45 2010 +0100 i2c-parport-light: Add SMBus alert support Add support for the SMBus alert mechanism to the i2c-parport-light driver. The ADM1032 evaluation board at least is properly wired for this. Signed-off-by: Jean Delvare Cc: David Brownell Cc: Trent Piepho commit 35859254483bce479024781885bc02d860552995 Author: Jean Delvare Date: Tue Mar 2 12:23:44 2010 +0100 i2c-parport: Add SMBus alert support Add support for the SMBus alert mechanism to the i2c-parport driver. The ADM1032 evaluation board at least is properly wired for this. Signed-off-by: Jean Delvare Cc: David Brownell Cc: Trent Piepho commit e2ca307439fb9df922c3e8891289a2ac05812fb7 Author: Jean Delvare Date: Tue Mar 2 12:23:43 2010 +0100 i2c: Separate Kconfig option for i2c-smbus Having a separate Kconfig option for i2c-smbus makes it possible to build that support as a module even when i2c-core itself is built-in. Bus drivers which implement SMBus alert should select this option, so in most cases this option is hidden and the user doesn't have to care about it. Signed-off-by: Jean Delvare Cc: David Brownell Cc: Trent Piepho commit b5527a7766f0505dc72efe3cefe5e9dea826f611 Author: Jean Delvare Date: Tue Mar 2 12:23:42 2010 +0100 i2c: Add SMBus alert support SMBus alert support. The SMBus alert protocol allows several SMBus slave devices to share a single interrupt pin on the SMBus master, while still allowing the master to know which slave triggered the interrupt. This is based on preliminary work by David Brownell. The key difference between David's implementation and mine is that his was part of i2c-core, while mine is split into a separate, standalone module named i2c-smbus. The i2c-smbus module is meant to include support for all SMBus extensions to the I2C protocol in the future. The benefit of this approach is a zero cost for I2C bus segments which do not need SMBus alert support. Where David's implementation increased the size of struct i2c_adapter by 7% (40 bytes on i386), mine doesn't touch it. Where David's implementation added over 150 lines of code to i2c-core (+10%), mine doesn't touch it. The only change that touches all the users of the i2c subsystem is a new callback in struct i2c_driver (common to both implementations.) I seem to remember Trent was worried about the footprint of David'd implementation, hopefully mine addresses the issue. Signed-off-by: Jean Delvare Acked-by: Jonathan Cameron Cc: David Brownell Cc: Trent Piepho commit 6d376fcc28d98f7f8f652755ae4dca1ff7240563 Author: Jean Delvare Date: Tue Mar 2 12:23:41 2010 +0100 i2c-parport: Give powered devices some time to settle When the i2c-parport adapter is reponsible for powering devices, it would seem reasonable to give them some time to settle before trying to access them. Signed-off-by: Jean Delvare commit c05d490234b7cf1715d9568d2041d9bc598a0b45 Author: Jean Delvare Date: Tue Mar 2 12:23:40 2010 +0100 i2c-tiny-usb: Fix a comment on bus frequency The description of the delay parameter is incomplete, it suggests that there is a direct relation between the delay value and the bus frequency. In fact, due to additional delays in the i2c bitbanging code, the i2c clock is always much slower. Signed-off-by: Jean Delvare Cc: Till Harbaum commit 393764340beb595c1ad7dd2d2243c2b6551aaa71 Author: Seth Heasley Date: Tue Mar 2 12:23:39 2010 +0100 i2c-i801: Add Intel Cougar Point device IDs Add the Intel Cougar Point (PCH) SMBus controller device IDs. Signed-off-by: Seth Heasley Signed-off-by: Jean Delvare commit 4111ecd2178dbc262bf384c5e472de346d593341 Author: Márton Németh Date: Tue Mar 2 12:23:37 2010 +0100 i2c: Make PCI device ids constant The id_table field of the struct pci_driver is constant in so it is worth to make initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Signed-off-by: Jean Delvare commit 4ab408dea0f0dba4dec0555f4f35b7ae703f5e91 Author: Eric Dumazet Date: Mon Mar 1 03:09:26 2010 +0000 net: fix protocol sk_buff field Commit e992cd9b72a18 (kmemcheck: make bitfield annotations truly no-ops when disabled) allows us to revert a workaround we did in the past to not add holes in sk_buff structure. This patch partially reverts commit 14d18a81b5171 (net: fix kmemcheck annotations) so that sparse doesnt complain: include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. Reported-by: Stefan Richter Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 85b3526932645269f67fee3583fa2aa500ab4f34 Author: Sridhar Samudrala Date: Mon Mar 1 09:53:04 2010 +0000 bridge: Fix build error when IGMP_SNOOPING is not enabled Fix the following build error when IGMP_SNOOPING is not enabled. In file included from net/bridge/br.c:24: net/bridge/br_private.h: In function 'br_multicast_is_router': net/bridge/br_private.h:361: error: 'struct net_bridge' has no member named 'multicast_router' net/bridge/br_private.h:362: error: 'struct net_bridge' has no member named 'multicast_router' net/bridge/br_private.h:363: error: 'struct net_bridge' has no member named 'multicast_router_timer' Signed-off-by: Sridhar Samudrala Acked-by: Randy Dunlap Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 156366d31524dc6b88836f06dccb1be13dbef5f1 Merge: 7f9320d 0a566ec Author: Takashi Iwai Date: Tue Mar 2 11:27:46 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc Conflicts: sound/usb/usbaudio.c commit 0a566ec25627bdd360f7294aa2e52f9d121233b4 Author: Clemens Ladisch Date: Tue Mar 2 08:47:20 2010 +0100 ALSA: ua101: removing debugging code Remove some code that is no longer needed now that the relevant parts of the driver have been tested. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 7f9320d415fab5c05097c77eea7a77f2f6341f24 Author: Andrea Gelmini Date: Sat Feb 27 17:51:29 2010 +0100 ALSA: sound/usb/caiaq/midi.h: Checkpatch cleanup sound/usb/caiaq/midi.h:6: ERROR: "foo* bar" should be "foo *bar" Signed-off-by: Andrea Gelmini Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit 3ea49652f679c2b571ca214c605ec80cb056ec10 Author: Andrea Gelmini Date: Sat Feb 27 17:51:19 2010 +0100 sound/oss/coproc.h: Checkpatch cleanup sound/oss/coproc.h:7: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Takashi Iwai commit 76b53774c51c4eaec646578a2e1b3716befedf1c Author: Andrea Gelmini Date: Sat Feb 27 17:51:03 2010 +0100 sound/oss/v_midi.h: Checkpatch cleanup sound/oss/v_midi.h:5: ERROR: code indent should use tabs where possible sound/oss/v_midi.h:7: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Takashi Iwai commit 28aedaf7bf6e4b629aea333978e8bb440bd1eb4f Author: Norberto Lopes Date: Sun Feb 28 20:16:53 2010 +0100 ALSA: sound/pci/hda/hda_codec.c: various coding style fixes Signed-off-by: Norberto Lopes Acked-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 20645d70bdcdcc29b1b92011780d233008a8adcf Author: Takashi Iwai Date: Tue Mar 2 11:14:01 2010 +0100 ALSA: hda - Add missing hp_pins definitions for ALC269 quirks In 2.6.33 ACL269 unsol event handler was changed to look up the pre-defined pins, but the headphone pins aren't defined properly in each quirk. This patch adds the missing definitions, and fixes the speaker auto-mute regression on some ASUS (and possibly other) laptops. Signed-off-by: Takashi Iwai Cc: commit 6eb3c735d29e799810ce82118f9260d0044327b7 Author: Paul Mundt Date: Tue Mar 2 17:22:29 2010 +0900 sh: fixed virt/phys mapping helpers for PMB. This moves the pmb_remap_caller() mapping logic out in to pmb_bolt_mapping(), which enables us to establish fixed mappings in places such as the NUMA code. Signed-off-by: Paul Mundt commit ad6759fbf35d104dbf573cd6f4c6784ad6823f7e Author: john stultz Date: Mon Mar 1 12:34:43 2010 -0800 timekeeping: Prevent oops when GENERIC_TIME=n Aaro Koskinen reported an issue in kernel.org bugzilla #15366, where on non-GENERIC_TIME systems, accessing /sys/devices/system/clocksource/clocksource0/current_clocksource results in an oops. It seems the timekeeper/clocksource rework missed initializing the curr_clocksource value in the !GENERIC_TIME case. Thanks to Aaro for reporting and diagnosing the issue as well as testing the fix! Reported-by: Aaro Koskinen Signed-off-by: John Stultz Cc: Martin Schwidefsky Cc: stable@kernel.org LKML-Reference: <1267475683.4216.61.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 57e413d95b0f92b9a5569408ddc3441e0f20e856 Author: Ping Cheng Date: Mon Mar 1 23:50:24 2010 -0800 Input: wacom - replace WACOM_PKGLEN_PENABLED Replacing WACOM_PKGLEN_PENABLED with WACOM_PKGLEN_GRAPHIRE since they both represent the same value, 8. This value will be used for both Tablet PC and Bamboo with touch devices. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit fe8875e5a41a36ef26072cf05731df5493ade0e1 Merge: f577215 a265e55 Author: Roland Dreier Date: Mon Mar 1 23:52:31 2010 -0800 Merge branch 'misc' into for-next Conflicts: drivers/infiniband/core/uverbs_main.c commit f57721507ffeaf8785f7f17254651de4d8b45e09 Merge: 3bbddba da9d2f0 Author: Roland Dreier Date: Mon Mar 1 23:51:57 2010 -0800 Merge branch 'srp' into for-next commit 3bbddbada87f30da8bcc5de7b9d06d8f2495aba5 Merge: a835fb3 09124e1 Author: Roland Dreier Date: Mon Mar 1 23:51:57 2010 -0800 Merge branch 'nes' into for-next commit a835fb30954fe92a569206f9f684a755fbed395c Merge: 5c2187f a478868 Author: Roland Dreier Date: Mon Mar 1 23:51:56 2010 -0800 Merge branch 'mlx4' into for-next commit 5c2187f0a184d6c5ec87aab403b79a8bb24a7988 Merge: 7f16816 88ec415 Author: Roland Dreier Date: Mon Mar 1 23:51:56 2010 -0800 Merge branch 'iser' into for-next commit 7f1681622a7b70b083f0034afb837c06f8ba2612 Merge: 85f938a 757bebb Author: Roland Dreier Date: Mon Mar 1 23:51:56 2010 -0800 Merge branch 'ipoib' into for-next commit 85f938a70cad96c6dc631ad4c40e342814193a96 Merge: 216fe70 45e354e Author: Roland Dreier Date: Mon Mar 1 23:51:55 2010 -0800 Merge branch 'ehca' into for-next commit 216fe702f7f5d440a5c54488f020624897fd5e2d Merge: e8094e6 68baf49 Author: Roland Dreier Date: Mon Mar 1 23:51:55 2010 -0800 Merge branch 'cxgb3' into for-next commit e8094e667aa89a7c455da1da9daf8a5ed063da8d Merge: 17a55f7 cf4f7e8 Author: Roland Dreier Date: Mon Mar 1 23:51:54 2010 -0800 Merge branch 'cma' into for-next commit da9d2f07306fc29a2f10885c2b0a463f3863c365 Author: Roland Dreier Date: Wed Feb 24 15:07:59 2010 -0800 IB/srp: Clean up error path in srp_create_target_ib() Instead of repeating the error unwinding steps in each place an error can be detected, use the common idiom of gotos into an error flow. Signed-off-by: Roland Dreier commit 9c03dc9f19351edf25c1107e3cfd3cc538c7ab9e Author: Bart Van Assche Date: Tue Feb 2 19:23:54 2010 +0000 IB/srp: Split send and recieve CQs to reduce number of interrupts We can reduce the number of IB interrupts from two interrupts per srp_queuecommand() call to one by using separate CQs for send and receive completions and processing send completions by polling every time a TX IU is allocated. Receive completion events still trigger an interrupt. Signed-off-by: Bart Van Assche Signed-off-by: Roland Dreier commit 4cfa8e75d6854699597e21fd570721d63f899934 Author: Paul Mundt Date: Tue Mar 2 16:49:50 2010 +0900 sh: make pmb iomapping configurable. This plugs in an early_param for permitting transparent PMB-backed ioremapping to be enabled/disabled. For the time being, we use a default-disabled policy. Signed-off-by: Paul Mundt commit 90e7d649d86f21d478dc134f74c88e19dd472393 Author: Paul Mundt Date: Tue Feb 23 16:20:53 2010 +0900 sh: reworked dynamic PMB mapping. This implements a fairly significant overhaul of the dynamic PMB mapping code. The primary change here is that the PMB gets its own VMA that follows the uncached mapping and we attempt to be a bit more intelligent with dynamic sizing, multi-entry mapping, and so forth. Signed-off-by: Paul Mundt commit dce46a04d55d6358d2d4ab44a4946a19f9425fe2 Author: Yinghai Lu Date: Mon Mar 1 18:48:52 2010 -0800 early_res: Need to save the allocation name in drop_range_partial() During free_early_partial(), reserve_early_without_check() could end extending the early_res area from __check_and_double_early_res(); as a result, the location of the name for the current reservation could change. Therefore, we need to save a local copy of the name. [ hpa: rewrote comment and checkin description ] Signed-off-by: Yinghai Lu LKML-Reference: <4B8C7C94.7070000@kernel.org> Signed-off-by: H. Peter Anvin commit 94316cdadb0067ba6d1f08b9a6f84fe755bdaa38 Author: Paul Mundt Date: Tue Mar 2 15:54:47 2010 +0900 sh: Fix up cpumask_of_pcibus() for the NUMA build. Trivial build fix, following the change from asm-generic/topology.h. Signed-off-by: Paul Mundt commit b8b8afe236e97b6359d46d3a3f8c46455e192271 Author: Toshiyuki Okajima Date: Tue Mar 2 00:21:35 2010 -0500 ext4: make "offset" consistent in ext4_check_dir_entry() The callers of ext4_check_dir_entry() usually pass in the "file offset" (ext4_readdir, htree_dirblock_to_tree, search_dirblock, ext4_dx_find_entry, empty_dir), but a few callers (add_dirent_to_buf, ext4_delete_entry) only pass in the buffer offset. To accomodate those last two (which would be hard to fix otherwise), this patch changes ext4_check_dir_entry() to print the physical block number and the relative offset as well as the passed-in offset. Signed-off-by: Toshiyuki Okajima Signed-off-by: "Theodore Ts'o" commit 0fb6f739bb612bc989d295056877374b749e721b Author: Piotr Ziecik Date: Fri Feb 5 03:42:52 2010 +0000 dma: Add MPC512x DMA driver Adds initial version of MPC512x DMA driver. Only memory to memory transfers are currenly supported. Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Anatolij Gustschin Cc: John Rigby Acked-by: Grant Likely Signed-off-by: Dan Williams commit 6c664a8915f5341c2e7f1df0bb4b9b4a88f6ad77 Author: Linus Walleij Date: Tue Feb 9 22:34:54 2010 +0100 Debugging options for the DMA engine subsystem This adds Kconfig options for DEBUG and VERBOSE_DEBUG to the DMA engine subsystem, I got tired of editing the Makefile manually each time I want to debug things in here, modelled this on the debug switches for other subsystems and works like a charm when working on our DMA engines. Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 6e3617e579e070d3655a93ee9ed7149113e795e0 Author: Dmitry Monakhov Date: Mon Mar 1 23:29:39 2010 -0500 ext4: Handle non empty on-disk orphan link In case of truncate errors we explicitly remove inode from in-core orphan list via orphan_del(NULL, inode) without modifying the on-disk list. But later on, the same inode may be inserted in the orphan list again which will result the on-disk linked list getting corrupted. If inode i_dtime contains valid value, then skip on-disk list modification. Signed-off-by: Dmitry Monakhov Signed-off-by: "Theodore Ts'o" commit da1dafca84413145f5ac59998b4cdd06fb89f721 Author: Dmitry Monakhov Date: Mon Mar 1 23:15:02 2010 -0500 ext4: explicitly remove inode from orphan list after failed direct io Otherwise non-empty orphan list will be triggered on umount. Signed-off-by: Dmitry Monakhov Signed-off-by: "Theodore Ts'o" commit f39490bcd1691d65dc33689222a12e1fc13dd824 Author: Dmitry Monakhov Date: Mon Mar 1 23:14:36 2010 -0500 ext4: fix error handling in migrate Set i_nlink to zero for temporary inode from very beginning. otherwise we may fail to start new journal handle and this inode will be unreferenced but with i_nlink == 1 Since we hold inode reference it can not be pruned. Also add missed journal_start retval check. Signed-off-by: Dmitry Monakhov Signed-off-by: "Theodore Ts'o" commit 437ca0fda3b442dff9e591581b5e1ffdfec24660 Author: Dmitry Monakhov Date: Mon Mar 1 22:29:21 2010 -0500 ext4: deprecate obsoleted mount options Declare following list of mount options as deprecated: - bsddf, miniddf - grpid, bsdgroups, nogrpid, sysvgroups Declare following list of default mount options as deprecated: - bsdgroups Signed-off-by: Dmitry Monakhov Signed-off-by: "Theodore Ts'o" commit c6efd46b98f30863ca3a9982312db87b826cf715 Author: Paul Mundt Date: Tue Mar 2 11:53:54 2010 +0900 serial: sh-sci: Tidy up build warnings. The recent sh-sci DMA support introduces a number of trivial build warnings, clean them up. Signed-off-by: Paul Mundt commit 7d0b0a4434dd97d8e0731241aee586460f7fb7bd Author: Paul Mundt Date: Tue Mar 2 11:52:28 2010 +0900 sh: Fix up ctrl_read/write stragglers in migor setup. ctrl_read/writeX are deprecated, this converts them over to their __raw_read/write() counterparts. Signed-off-by: Paul Mundt commit 9adae9720998c10a882d4c6f9a82527bf8f62d59 Merge: 73a19e4 105244e 4b62c0f Author: Paul Mundt Date: Tue Mar 2 11:49:25 2010 +0900 Merge branches 'sh/dmaengine', 'sh/hw-breakpoints' and 'sh/trivial' commit 73a19e4c0301908ce6346715fd08a74308451f5a Author: Guennadi Liakhovetski Date: Tue Mar 2 11:39:15 2010 +0900 serial: sh-sci: Add DMA support. Support using DMA for sending and receiving data over SCI(F) interfaces of various SH SoCs. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 62c132a8008991530839401674ce8e1b12b005d3 Author: Eric Miao Date: Tue Mar 2 10:24:14 2010 +0800 [ARM] pxa: fix typo in mxm8x10.h Signed-off-by: Eric Miao commit c014906a870ce70e009def0c9d170ccabeb0be63 Author: Guennadi Liakhovetski Date: Thu Feb 18 16:30:02 2010 +0000 dmaengine: shdma: extend .device_terminate_all() to record partial transfer This patch extends the .device_terminate_all() method of the shdma driver to return number of bytes transfered in the current descriptor. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c8e3149ba7de24dfd4c37bb0df23c878cdecd8d4 Author: Guennadi Liakhovetski Date: Thu Feb 18 15:24:17 2010 +0000 sh: merge sh7722 and sh7724 DMA register definitions DMA CHCR register layout is equal on sh7722 and sh7724, reuse definitions. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit bff932cf6eda730fa42c363f7cfcc98c39240a24 Author: Guennadi Liakhovetski Date: Thu Feb 11 16:50:22 2010 +0000 sh: activate runtime PM for dmaengine on sh7722 and sh7724 Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 20f2a3b5d57701c54bdd59b89dd37fe775926bae Author: Guennadi Liakhovetski Date: Thu Feb 11 16:50:18 2010 +0000 dmaengine: shdma: add runtime PM support. Provided platforms implement runtime PM, this disables the controller, when not in use. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 8b1935e6a36b0967efc593d67ed3aebbfbc1f5b1 Author: Guennadi Liakhovetski Date: Thu Feb 11 16:50:14 2010 +0000 dmaengine: shdma: separate DMA headers. Separate SH DMA headers into ones, commonly used by both drivers, and ones, specific to each of them. This will make the future development of the dmaengine driver easier. Signed-off-by: Guennadi Liakhovetski Acked-by: Mark Brown Signed-off-by: Paul Mundt commit 027811b9b81a6b3ae5aa20c3302897bee9dcf09e Author: Guennadi Liakhovetski Date: Thu Feb 11 16:50:10 2010 +0000 dmaengine: shdma: convert to platform device resources The shdma dmaengine driver currently uses numerous macros to support various platforms, selected by ifdef's. Convert it to use platform device resources and lists of channel descriptors to specify register locations, interrupt numbers and other system-specific configuration variants. Unavoidably, we have to simultaneously convert all shdma users to provide those resources. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 47a4dc26eeb89a3746f9b1e2092602b40469640a Author: Guennadi Liakhovetski Date: Thu Feb 11 16:50:05 2010 +0000 dmaengine: shdma: fix DMA error handling. Present DMA error ISR in shdma.c is bogus, it locks the system hard in multiple ways. Fix it to abort all queued transactions on all channels on the affected controller and giving submitters a chance to get a DMA_ERROR status for aborted transactions. Afterwards further functionality is again possible without the need to re-load the driver. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 920925f90fa6455f7e8c9db0e215e706cd7dedeb Author: Guennadi Liakhovetski Date: Tue Jan 19 08:09:10 2010 +0000 sh: audio support for the sh7722 Migo-R board Configure SIU port B pins and register the WM8978 audio codec. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 331af0c15284798f678057a52039ef24f7c04f22 Author: Guennadi Liakhovetski Date: Tue Jan 19 08:09:06 2010 +0000 sh: add DMA slave definitions and SIU platform data to sh7722 setup This patch is required to use the SIU ASoC driver on sh7722 systems. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 81d0d950e5037a26b71e568ff235ff9e998f4ab3 Author: Yinghai Lu Date: Sat Feb 27 09:29:38 2010 -0800 sparsemem: Fix compilation on PowerPC Stephen reported: build (powerpc ppc64_defconfig) produced these warnings: mm/sparse.c: In function 'sparse_init': mm/sparse.c:488: warning: unused variable 'map_count' mm/sparse.c:484: warning: unused variable 'size2' mm/sparse.c:481: warning: unused variable 'map_map' mm/sparse.c: At top level: mm/sparse.c:442: warning: 'sparse_early_mem_maps_alloc_node' defined but not used Introduced by commit 9bdac914240759457175ac0d6529a37d2820bc4d ("sparsemem: Put mem map for one node together"). Conditionalize the bits appropriately based on the setting of CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER. Reported-by: Stephen Rothwell Tested-by: Stephen Rothwell Signed-off-by: Yinghai Lu LKML-Reference: <4B895682.1080706@kernel.org> Signed-off-by: H. Peter Anvin commit f1f724e4b523d444c5a598d74505aefa3d6844d2 Author: Christoph Hellwig Date: Mon Mar 1 11:30:31 2010 +0000 xfs: fix locking for inode cache radix tree tag updates The radix-tree code requires it's users to serialize tag updates against other updates to the tree. While XFS protects tag updates against each other it does not serialize them against updates of the tree contents, which can lead to tag corruption. Fix the inode cache to always take pag_ici_lock in exclusive mode when updating radix tree tags. Signed-off-by: Christoph Hellwig Reported-by: Patrick Schreurs Tested-by: Patrick Schreurs Signed-off-by: Alex Elder commit cc483f102c3f703e853c96f95a654f0106fb2603 Author: Tao Ma Date: Mon Mar 1 19:06:35 2010 -0500 ext4: Fix fencepost error in chosing choosing group vs file preallocation. The ext4 multiblock allocator decides whether to use group or file preallocation based on the file size. When the file size reaches s_mb_stream_request (default is 16 blocks), it changes to use a file-specific preallocation. This is cool, but it has a tiny problem. See a simple script: mkfs.ext4 -b 1024 /dev/sda8 1000000 mount -t ext4 -o nodelalloc /dev/sda8 /mnt/ext4 for((i=0;i<5;i++)) do cat /mnt/4096>>/mnt/ext4/a #4096 is a file with 4096 characters. cat /mnt/4096>>/mnt/ext4/b done debuge4fs -R 'stat a' /dev/sda8|grep BLOCKS -A 1 And you get BLOCKS: (0-14):8705-8719, (15):2356, (16-19):8465-8468 So there are 3 extents, a bit strange for the lonely 15th logical block. As we write to the 16 blocks, we choose file preallocation in ext4_mb_group_or_file, but in ext4_mb_normalize_request, we meet with the 16*1024 range, so no preallocation will be carried. file b then reserves the space after '2356', so when when write 16, we start from another part. This patch just change the check in ext4_mb_group_or_file, so that for the lonely 15 we will still use group preallocation. After the patch, we will get: debuge4fs -R 'stat a' /dev/sda8|grep BLOCKS -A 1 BLOCKS: (0-15):8705-8720, (16-19):8465-8468 Looks more sane. Thanks. Signed-off-by: Tao Ma Signed-off-by: "Theodore Ts'o" commit 31436bbe8f85f79fc0ddb963edb3d29f6e2b3bae Author: Daniel Mack Date: Wed Feb 24 18:50:16 2010 +0100 [ARM] pxa/raumfeld: set GPIO drive bits for LED pins Set GPIO bits to pull the pins connected to LEDs for lower power mode. We want all LEDs off when devices are in suspend. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 438a22fe26c3fdeb422d92072523d5b35d849dc3 Author: Marc Zyngier Date: Thu Feb 18 20:33:02 2010 +0000 [ARM] pxa/zeus: Add support for mcp2515 CAN bus Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit fcfdc67ff2b104355683f7264a6559a0cc360646 Author: Marc Zyngier Date: Thu Feb 18 20:31:43 2010 +0000 [ARM] pxa/zeus: Add support for onboard max6369 watchdog Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 90ac0dfd9f5931c9011b35ced0ba576e32656fb2 Author: Marc Zyngier Date: Thu Feb 18 20:30:31 2010 +0000 [ARM] pxa/zeus: Add Eurotech as the manufacturer Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 7ff27dfa6e484ff5d901ec075a623c06c46d7a0f Author: Marc Zyngier Date: Thu Feb 18 20:29:24 2010 +0000 [ARM] pxa/zeus: Correct the USB host initialisation flags Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 662b0836a667158284c8a4a091de745fd5637ff1 Author: Marc Zyngier Date: Fri Feb 19 14:07:37 2010 +0800 [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress Zeus console port is wired to a 8250-compatible device (pxa UARTs are reserved to other uses). This patch allows such a configuration in the uncompress sequence. Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit c95efee13303d9ff9e67f2600174f492039311ce Author: Eric Miao Date: Fri Feb 19 13:49:39 2010 +0800 [ARM] pxa: refactor uncompress.h for non-PXA uarts The original patch came from Marc Zyngier where support of 8250-compatible UART is required to show the uncompress information. Modified a little bit here, including changes below: 1. #include is actually not necessary 2. introduced uart_{read,write}() for different base and shift 3. introduced uart_is_enabled() and assumed enabled always for non-PXA uarts Signed-off-by: Eric Miao Acked-by: Marc Zyngier commit 2029e5643a3c4fdd4ad20169fb950cc16e023d0c Author: Eric Miao Date: Tue Feb 2 23:39:35 2010 -0800 [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs The irq_chip is not yet registered, so no default irq_chip.mask_ack(), which we have to handle it correctly manually here. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit df0c382436df5bdd74030baafa294b75c231ec8c Author: Haojian Zhuang Date: Wed Feb 3 10:01:18 2010 -0500 [ARM] mmp2: add handling on PMIC IRQ Since PMIC INT pin is a special pin of CPU, the status of PMIC INT pin needs to be cleared after PMIC IRQ occured. Now append the clear operation in irq chip handler. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ce0ac4235972cc2533e4e2095396208b59117c57 Author: Haojian Zhuang Date: Thu Jan 28 12:34:59 2010 +0800 [ARM] mmp2: add support for board IRQs Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0913b86ff7fe220a50c82baca4431e7d5a8da5c8 Author: Haojian Zhuang Date: Thu Jan 28 12:27:36 2010 +0800 [ARM] mmp2: add missing ICU register definitions Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 16144bfb83bb8319c07c18b57eac15368708d02c Author: Haojian Zhuang Date: Mon Jan 25 06:03:54 2010 -0500 [ARM] mmp2: add gpio initialization Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 247b4592f385622774de877f568fc30eb37dc831 Author: Haojian Zhuang Date: Mon Jan 25 06:03:25 2010 -0500 [ARM] mmp2: add mfpr setting Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4e3b4da98e20c5dc58e544ac5b321c1942071f7f Author: Haojian Zhuang Date: Mon Jan 25 06:02:50 2010 -0500 [ARM] mmp2: add mask function in irq-mmp2.c Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit e8e6cb325671daa17c776ad53b70fd6213260368 Author: Eric Miao Date: Tue Jan 5 15:28:26 2010 +0800 MAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) support Cc: Haojian Zhuang Signed-off-by: Eric Miao commit e1cb7db2ef7f911dbe0edd5ff8d2216a817738d0 Author: Haojian Zhuang Date: Wed Jan 6 09:07:15 2010 -0500 [ARM] mmp: support jasper development board Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ccffb1ad1f354aee0bdf33b6486ebb9476223c1b Author: Haojian Zhuang Date: Tue Jan 5 15:02:19 2010 +0800 [ARM] mmp: add default configuration for MMP2 Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 2f7e8faef5a50efaa1c173e99bdaa29e0129bb99 Author: Haojian Zhuang Date: Fri Dec 4 09:41:28 2009 -0500 [ARM] mmp: add support for Marvell MMP2 Marvell MMP2 (aka ARMADA610) is a SoC based on PJ4 core. It's ARMv6 compatible. Support basic interrupt handler and timer, and basic support for MMP2 based FLINT platform. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 978da5bcdb33f6e030fa3304662e2455a018f1b0 Author: Eric Miao Date: Tue Jan 5 15:06:37 2010 +0800 [ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips Signed-off-by: Eric Miao commit e6dac5e1b6ea7be4b0092ae0ac96b352a8c028db Author: Haojian Zhuang Date: Tue Jan 12 09:07:45 2010 +0800 [ARM] mmp: update pxa168_defconfig and include avengers lite support Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 9896de72d20686f4dbc9cdd64ca178c80d6838b6 Author: Haojian Zhuang Date: Tue Jan 12 08:54:50 2010 +0800 [ARM] mmp: avengers lite (pxa168) board bring up Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0925e2f0fc5a55621cb80afbb6d4543c62e6a653 Author: Stefan Schmidt Date: Sat Feb 13 21:59:32 2010 +0100 [ARM] pxa/imote2: Remove redundant pin entry for nCS. Also remove a trailing whitespace while being there. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit d496936f954f9886ac7037d013cdf3c279e627bd Author: Stefan Schmidt Date: Sun Feb 14 10:19:21 2010 +0100 [ARM] pxa/imote2: Add defconfig for the imote2 platform. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit f9efc9df94fd126f7d585339e64edec0c03e904b Author: Eric Miao Date: Tue Feb 9 19:46:01 2010 +0800 ASoC: Remove legacy SSP API usage from pxa-ssp.c Acked-by: Mark Brown Signed-off-by: Eric Miao commit a056bef45529810183f56944dcea8b4e297c2dc3 Author: Eric Miao Date: Tue Feb 9 11:10:10 2010 +0800 [ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP API Signed-off-by: Eric Miao commit 98acdbe4cf83f5a2e21c7aac830146b5d6da9282 Author: Stefan Schmidt Date: Tue Feb 16 22:42:55 2010 +0100 [ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled Add some safety check for CONFIG_PM around zeus_power_off(). Without it linking can fail like this: arch/arm/mach-pxa/built-in.o: In function `zeus_power_off': e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend' Signed-off-by: Stefan Schmidt Acked-by: Marc Zyngier Signed-off-by: Eric Miao commit cfab57e0e44631b1369e05efa54031b993511c2f Author: Stefan Schmidt Date: Tue Feb 16 22:41:52 2010 +0100 [ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set. This function gets only called from scoop_suspend() and scoop_resume() which are only built in if we have CONFIG_PM set. Make it the same for check_scoop_reg(). This fixes the following warning: arch/arm/common/scoop.c:143: warning: ‘check_scoop_reg’ defined but not used Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit 1f3b536be7bfb3930cf7dc6d995d82877f25d6cf Author: Edwin Peer Date: Fri Feb 5 18:31:48 2010 +0200 [ARM] pxa: add support for Embedian MXM-8x10 Signed-off-by: Edwin Peer Signed-off-by: Eric Miao commit 0dc726bb264ca5ecfdfab94a6937e0e9b9b26f64 Author: Eric Miao Date: Sun Dec 27 23:01:25 2009 +0800 [ARM] pxa: move board board IRQ definitions out of irqs.h Signed-off-by: Eric Miao commit 19851c58e680f71d087b79b53edbf814193e1d33 Author: Eric Miao Date: Sat Dec 26 16:23:02 2009 +0800 [ARM] sa1111: allow cascaded IRQs to be used by platforms Signed-off-by: Eric Miao commit 08fa159003aa510027951671b94aadc380ab2d2a Author: Eric Miao Date: Sat Dec 26 12:32:38 2009 +0800 [ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driver The IRQs for card detect and status change are currently hardcoded in SA1111 PCMCIA driver, which can be actually obtained from the .irq[] from 'struct sa1111_dev' to keep it generic. Signed-off-by: Eric Miao commit ac609d266e4af4ebf586d610bd76e04dddae0c4c Author: Eric Miao Date: Thu Feb 4 18:07:33 2010 -0800 [ARM] locomo: allow cascaded IRQ base to be specified by platforms Signed-off-by: Eric Miao commit 00dd8027b913088ff9b656c5aaa6336c303b7f26 Author: Eric Miao Date: Fri Dec 25 12:18:33 2009 +0800 [ARM] locomo: remove unused IRQs and avoid unnecessary cascade IRQ_LOCOMO_* are never used elsewhere, remove these definitions. As well as the cascade of these IRQs. IRQ_LOCOMO_*_BASE changed to IRQ_LOCOMO_*. IRQ_LOCOMO_LT and IRQ_LOCOMO_SPI are likely to be used in a same way as IRQ_LOCOMO_KEY. IRQ_LOCOMO_GPIO and the demultiplex handler should really be living somewhere else. Signed-off-by: Eric Miao commit da8065ac3ea29d1bfdb5a163be346fbe35066f8d Author: Eric Miao Date: Thu Feb 4 17:13:55 2010 -0800 [ARM] locomo: avoid unnecessary cascaded keyboard IRQ It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced locomokbd_{open,close} for masking/unmasking of the keyboard IRQ. Signed-off-by: Eric Miao commit efe7f8bda015b03ab1420b5bca538d18e6559863 Author: Eric Miao Date: Wed Dec 23 14:52:07 2009 +0800 [ARM] sa1100: remove unreferenced IRQ definitions These IRQ definitions related to LOCOMO are never referenced anywhere, thus could be safely removed. Signed-off-by: Eric Miao commit f69a6548c9d5dd29ecaed1c714b41487c458ce8b Author: Eric Miao Date: Fri Jan 1 15:28:21 2010 +0800 [ARM] pxa/tosa: make use of the matrix keypad driver Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit 96f6a13a6d8a6370fb9a8c828d549f3ddea8d0c5 Author: Eric Miao Date: Mon Jan 4 13:34:05 2010 +0800 [ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers Cc: Mike Rapoport Signed-off-by: Eric Miao commit 846c864cac520eaa10e845f585f05af643aa848a Author: Eric Miao Date: Mon Jan 4 17:14:21 2010 +0800 [ARM] pxa: remove now unnecessary pxa_gpio_mode() calls in ac97 Now most (if not all) PXA platforms have been switched to the new MFP API, it's rather safe to remove these unnecessary pxa_gpio_mode() calls in pxa2xx-ac97-lib.c now. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit c11b6a420b092a576e003bbb520392268338d97b Author: Eric Miao Date: Mon Jan 4 17:00:13 2010 +0800 [ARM] pxa: add the missing AC97 pin configurations Missing AC97 pin configurations are added where pxa_set_ac97_info() are called for all pxa25x/pxa27x platforms. Where no exact configuration is provided, use the default as in sound/arm/pxa2xx-ac97-lib.c Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit fb1bf8cd13bfa7ed0364ab0d82f717fc020d35f6 Author: Eric Miao Date: Mon Jan 4 16:30:58 2010 +0800 [ARM] pxa: introduce processor specific pxa27x_assert_ac97reset() This is really pxa27x specific and should be kept in pxa27x.c. With this newly introduced function, the original set_resetgpio_mode() is deprecated. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit e1aed7ca555af7412ca1336241b918d78485232f Author: Eric Miao Date: Mon Jan 4 16:26:32 2010 +0800 [ARM] pxa: remove the unnecessary restoring of MFP registers MFP registers are saved and restored by the mfp sys_device before all other platform devices, and it is unnecessary here. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit bedbda97175bcc540512f67ce02364100fba5f28 Author: Eric Miao Date: Mon Jan 4 11:37:14 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms Signed-off-by: Eric Miao commit 07bae6c3215e060d5e3742b6f2932de0787f0782 Author: Eric Miao Date: Mon Jan 4 11:25:10 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms There are only limited possible LCD pin configurations for pxa25x platforms, simplify this by macro. Signed-off-by: Eric Miao commit 669cb51c6abf77e10cbeb6f483c96abc492206ac Author: Eric Miao Date: Fri Jan 1 15:29:22 2010 +0800 [ARM] pxa: use chip->ack() instead of accessing GEDR directly Signed-off-by: Eric Miao commit e9964c102312967a4bc1fd501cb628c4a3b19034 Author: Sage Weil Date: Mon Mar 1 15:16:56 2010 -0800 ceph: fix flush_dirty_caps race with caps migration The flush_dirty_caps() used to loop over the first entry of the cap_dirty dirty list on the assumption that after calling ceph_check_caps() it would be removed from the list. This isn't true for caps that are being migrated between MDSs, where we've received the EXPORT but not the IMPORT. Instead, do a safe list iteration, and pin the next inode on the list via the CEPH_I_NOFLUSH flag. Signed-off-by: Sage Weil commit 7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0 Author: Sage Weil Date: Mon Mar 1 15:17:34 2010 -0800 ceph: include migrating caps in issued set We should include caps that are mid-migration (we've received the EXPORT, but not the IMPORT) in the issued caps set. Signed-off-by: Sage Weil commit e53a8fd773065628b24605b289a9a40ee4a35d83 Author: Sage Weil Date: Mon Mar 1 14:50:05 2010 -0800 ceph: fix osdmap decoding when pools include (removed) snaps Add missing pointer dereference (p is a void **). Signed-off-by: Sage Weil commit 195d3ce2cc9a8ec69827f6369c41b269345b9988 Author: Sage Weil Date: Mon Mar 1 09:57:54 2010 -0800 ceph: return EBADF if waiting for caps on closed file Verify the file is actually open for the given caps when we are waiting for caps. This ensures we will wake up and return EBADF if another thread closes the file out from under us. Note that EBADF is also the correct return code from write(2) when called on a file handle opened for reading (although the vfs should catch that). Signed-off-by: Sage Weil commit 6f863e712d4114e8ae2f02de64ebeac0546ebaa0 Author: Sage Weil Date: Mon Mar 1 15:26:41 2010 -0800 ceph: set osd request message front length correctly We didn't set the front length correctly. When messages used the message pool we ended up with the conservative max (4 KB), and the rest of the time the slightly less conservative estimate. Even though the OSD ignores the extra data, set it to the right value to avoid sending extra data over the network. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 3ca02ef96e119d36bc1752baeae7dd0c59c2f325 Author: Sage Weil Date: Mon Mar 1 15:25:00 2010 -0800 ceph: reset front len on return to msgpool; BUG on mismatched front iov Reset msg front len when a message is returned to the pool: the caller may have changed it. BUG if we try to send a message with a hdr.front_len that doesn't match the front iov. Signed-off-by: Sage Weil commit 70edb55bdfa8922c8ad40bc5a67abb6d9fee8d47 Author: Sage Weil Date: Mon Mar 1 13:20:50 2010 -0800 ceph: fix snaptrace decoding on cap migration between mds This was simply broken. Apparently at some point we thought about putting the snaptrace in the middle section, but didn't. Signed-off-by: Sage Weil commit c16e786927b977cb880873214bbd815e8d5ec4ba Author: Sage Weil Date: Mon Mar 1 13:02:00 2010 -0800 ceph: use single osd op reply msg Use a single ceph_msg for the osd reply, even when we are getting multiple replies. Signed-off-by: Sage Weil commit 1679f876a641d209e7b22e43ebda0693c71003cf Author: Sage Weil Date: Fri Feb 26 13:55:51 2010 -0800 ceph: reset bits on connection close Clear LOSSYTX bit, so that if/when we reconnect, said reconnect will retry on failure. Clear _PENDING bits too, to avoid polluting subsequent connection state. Drop unused REGISTERED bit. Signed-off-by: Sage Weil commit a14a5ab58f9d783ec3a2a287320fab22e1764813 Author: Christoph Hellwig Date: Thu Feb 18 12:43:22 2010 +0000 xfs: remove xfs_ipin/xfs_iunpin Inodes are only pinned/unpinned via the inode item methods, and lots of code relies on that fact. So remove the separate xfs_ipin/xfs_iunpin helpers and merge them into their only callers. This also fixes up various duplicate and/or incorrect comments. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 60ec678371183f6e0d487e55fe8adbb33816518e Author: Christoph Hellwig Date: Wed Feb 17 19:43:56 2010 +0000 xfs: cleanup xfs_iunpin_wait/xfs_iunpin_nowait Remove the inode item pointer and ili_last_lsn checks in __xfs_iunpin_wait as any pinned inode is guaranteed to have them valid. After this the xfs_iunpin_nowait case is nothing more than a xfs_log_force_lsn, as we know that the caller has already checked the pincount. Make xfs_iunpin_nowait the new low-level routine just doing the log force and rewrite xfs_iunpin_wait around it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit d7658d487f4c62983015ba6c99f02dedb3ea97c7 Author: Christoph Hellwig Date: Wed Feb 17 19:36:13 2010 +0000 xfs: kill xfs_lrw.h Move the two declarations to better fitting headers now that xfs_lrw.c is gone. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit d7e84f413726876c0ec66bbf90770f69841f7663 Author: Christoph Hellwig Date: Mon Feb 15 23:35:09 2010 +0000 xfs: factor common xfs_trans_bjoin code Most of xfs_trans_bjoin is duplicated in xfs_trans_get_buf, xfs_trans_getsb and xfs_trans_read_buf. Add a new _xfs_trans_bjoin which can be called by all four functions. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 35a8a72f064105807b091a21e004893b219c9ed2 Author: Christoph Hellwig Date: Mon Feb 15 23:34:54 2010 +0000 xfs: stop passing opaque handles to xfs_log.c routines Currenly we pass opaque xfs_log_ticket_t handles instead of struct xlog_ticket pointers, and void pointers instead of struct xlog_in_core pointers to various log manager functions. Instead pass properly typed pointers after adding forward declarations for them to xfs_log.h, and adjust the touched function prototypes to the standard XFS style while at it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit c467c049e7e6e8b8fe9f38b13b20a4cf7e03f36b Author: Christoph Hellwig Date: Mon Feb 15 23:34:42 2010 +0000 xfs: split xfs_bmap_btalloc Split out the nullfb case into a separate function to reduce the stack footprint and make the code more readable. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit f7008d0aeba21396b3422df135b692ae701bd0c8 Author: Christoph Hellwig Date: Mon Feb 15 22:02:19 2010 +0000 xfs: fix xfs_fsblock_t tracing Using a static buffer in xfs_fmtfsblock means we can corrupt traces if multiple CPUs hit this code path at the same. Just remove xfs_fmtfsblock for now and print the block number purely numerical. If we want the NULLFSBLOCK and NULLSTARTBLOCK formatting back the best way would be a decoding plugin in the trace-cmd userspace command. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 024910cbac323ab2e5ad6d7fa7958799b04b9728 Author: Christoph Hellwig Date: Wed Feb 17 19:34:57 2010 +0000 xfs: fix inode pincount check in fsync We need to hold the ilock to check the inode pincount safely. While we're at it also remove the check for ip->i_itemp->ili_last_lsn, a pinned inode always has it set. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 77d7a0c2eeb285c9069e15396703d0cb9690ac50 Author: Dave Chinner Date: Wed Feb 17 05:36:29 2010 +0000 xfs: Non-blocking inode locking in IO completion The introduction of barriers to loop devices has created a new IO order completion dependency that XFS does not handle. The loop device implements barriers using fsync and so turns a log IO in the XFS filesystem on the loop device into a data IO in the backing filesystem. That is, the completion of log IOs in the loop filesystem are now dependent on completion of data IO in the backing filesystem. This can cause deadlocks when a flush daemon issues a log force with an inode locked because the IO completion of IO on the inode is blocked by the inode lock. This in turn prevents further data IO completion from occuring on all XFS filesystems on that CPU (due to the shared nature of the completion queues). This then prevents the log IO from completing because the log is waiting for data IO completion as well. The fix for this new completion order dependency issue is to make the IO completion inode locking non-blocking. If the inode lock can't be grabbed, simply requeue the IO completion back to the work queue so that it can be processed later. This prevents the completion queue from being blocked and allows data IO completion on other inodes to proceed, hence avoiding completion order dependent deadlocks. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 66d834ea603d61bd90fedad90300ca91c5bba0a3 Author: Christoph Hellwig Date: Mon Feb 15 09:44:49 2010 +0000 xfs: implement optimized fdatasync Allow us to track the difference between timestamp and size updates by using mark_inode_dirty from the I/O completion code, and checking the VFS inode flags in xfs_file_fsync. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit fd3200bef7d66ed3924f72c79a465fb7ff85478a Author: Christoph Hellwig Date: Mon Feb 15 09:44:48 2010 +0000 xfs: remove wrapper for the fsync file operation Currently the fsync file operation is divided into a low-level routine doing all the work and one that implements the Linux file operation and does minimal argument wrapping. This is a leftover from the days of the vnode operations layer and can be removed to simplify the code a bit, as well as preparing for the implementation of an optimized fdatasync which needs to look at the Linux inode state. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 00258e36b2d33b1b5cef7b489e06c5e0a9df58b5 Author: Christoph Hellwig Date: Mon Feb 15 09:44:47 2010 +0000 xfs: remove wrappers for read/write file operations Currently the aio_read, aio_write, splice_read and splice_write file operations are divided into a low-level routine doing all the work and one that implements the Linux file operations and does minimal argument wrapping. This is a leftover from the days of the vnode operations layer and can be removed to simplify the code a lot. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit dda35b8f84d209784041bbad47f9e195a08a7527 Author: Christoph Hellwig Date: Mon Feb 15 09:44:46 2010 +0000 xfs: merge xfs_lrw.c into xfs_file.c Currently the code to implement the file operations is split over two small files. Merge the content of xfs_lrw.c into xfs_file.c to have it in one place. Note that I haven't done various cleanups that are possible after this yet, they will follow in the next patch. Also the function xfs_dev_is_read_only which was in xfs_lrw.c before really doesn't fit in here at all and was moved to xfs_mount.c. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit b262e5dfd9ddd2f6d0ef3fa53eb88690f22134a5 Author: Christoph Hellwig Date: Sun Feb 14 22:01:45 2010 +0000 xfs: fix dquota trace format The be32_to_cpu in the TP_printk output breaks automatic parsing of the trace format by the trace-cmd tools, so we have to move it into the TP_assign block. While we're at it also fix the format for the quota limits to more regular and easier parseable. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit a9cc799eca0c798ab5dd8648564fc2025bdd9bd2 Author: Eric Sandeen Date: Wed Feb 3 17:50:13 2010 +0000 xfs: increase readdir buffer size While doing some testing of readdir perf a while back, I noticed that the buffer size we're using internally is smaller than what glibc gives us by default. Upping this size helped a bit, and seems safe. glibc's __alloc_dir() does: const size_t default_allocation = (4 * BUFSIZ < sizeof (struct dirent64) ? sizeof (struct dirent64) : 4 * BUFSIZ); const size_t small_allocation = (BUFSIZ < sizeof (struct dirent64) ? sizeof (struct dirent64) : BUFSIZ); size_t allocation = default_allocation; #ifdef _STATBUF_ST_BLKSIZE if (statp != NULL && default_allocation < statp->st_blksize) allocation = statp->st_blksize; #endif and #define _G_BUFSIZ 8192 #define _IO_BUFSIZ _G_BUFSIZ # define BUFSIZ _IO_BUFSIZ so the default buffer is 4 * 8192 = 32768 (except in the unlikely case of blocks > 32k....) Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit d702d12167a2c05a346f49aac7a311d597762495 Merge: 9418c65 ac0f6f9 Author: Tony Lindgren Date: Mon Mar 1 14:19:05 2010 -0800 Merge with mainline to remove plat-omap/Kconfig conflict Conflicts: arch/arm/plat-omap/Kconfig commit 881a6c25a8453388e3190de94a5e105439a9f806 Author: Thadeu Lima de Souza Cascardo Date: Mon Mar 1 16:15:58 2010 -0500 classmate-laptop: Added some keys present in other devices Some new devices have extra keys, which we add to our list. Currently, they all generate events that allow us to use a simple table/array, without need for the sparse keymap. Signed-off-by: Thadeu Lima de Souza Cascardo commit 13dda80e48439b446d0bc9bab34b91484bc8f533 Merge: 379e3a8 5f19daa Author: Linus Torvalds Date: Mon Mar 1 13:05:40 2010 -0800 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (40 commits) DaVinci DM365: Adding support for SPI EEPROM DaVinci DM365: Adding DM365 SPI support DaVinci DM355: Modifications to DM355 SPI support DaVinci: SPI: Adding header file for SPI support. davinci: dm646x: CDCE clocks: davinci_clk converted to clk_lookup davinci: clkdev cleanup: remove clk_lookup wrapper, use clkdev_add_table() DaVinci: DM365: Voice codec support for the DM365 SoC davinci: clock: let clk->set_rate function sleep Add SDA and SCL pin numbers to i2c platform data davinci: da8xx/omap-l1xx: Add EDMA platform data for da850/omap-l138 davinci: build list of unused EDMA events dynamically davinci: Fix edma_alloc_channel api for EDMA_CHANNEL_ANY case davinci: Keep count of channel controllers on a platform davinci: Correct return value of edma_alloc_channel api davinci: add CDCE949 support on DM6467 EVM davinci: add support for CDCE949 clock synthesizer davinci: da850/omap-l138 EVM: register for suspend support davinci: da850/omap-l138: add support for SoC suspend davinci: add power management support DaVinci: DM365: Changing default queue for DM365. ... commit 379e3a820da171cb1d97e8dccd736a69cebfb7c0 Merge: 8724fdb a55ab49 Author: Linus Torvalds Date: Mon Mar 1 13:04:58 2010 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (38 commits) sata_via: Delay on vt6420 when starting ATAPI DMA write ata: Detect Delkin Devices compact flash pata_efar: Enable parallel scanning pata_atiixp: enable parallel scan [libata] pata_atiixp: add locking for parallel scanning [libata] pata_efar: add locking for parallel scanning libata: Pass host flags into the pci helper [libata] pata_marvell: CONFIG_AHCI is really CONFIG_SATA_AHCI libata: Allow pata_legacy to be built on non-ISA but PCI systems pata_pdc202xx_old: fix UDMA mode for PDC2026x chipsets pata_pdc202xx_old: fix UDMA mode for Promise UDMA33 cards [libata] pata_at91: fix backslash-continued string pata_via: store UDMA masks in via_isa_bridges table pata_via: fix address setup timings underlocking pata_serverworks: fix error message pata_serverworks: fix PIO setup for the second channel pata_efar: fix secondary port support pata_cypress: fix PIO timings underclocking pata_cs5535: use correct values for PIO1 and PIO2 data timings pata_cmd64x: remove unused definitions ... commit 9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32 Author: Alex Deucher Date: Mon Mar 1 14:23:31 2010 -0500 drm/radeon: fix typo in Makefile Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a55ab496ea9c820b7192c15ef1fbf3291edfe638 Author: Bart Hartgers Date: Sun Feb 14 13:04:50 2010 +0100 sata_via: Delay on vt6420 when starting ATAPI DMA write When writing a disc on certain lite-on dvd-writers (also rebadged as optiarc/LG/...) connected to a vt6420, the ATAPI CDB ends up in the datastream and on the disc, causing silent corruption. Delaying between sending the CDB and starting DMA seems to prevent this. I do not know if there are burners that do not suffer from this, but the patch should be safe for those as well. There are many reports of this issue, but AFAICT no solution was found before. For example: http://lkml.indiana.edu/hypermail/linux/kernel/0802.3/0561.html Signed-off-by: Bart Hartgers Signed-off-by: Jeff Garzik commit 4b7d1c0509d0d07edc731f990791dc5518e51617 Author: Ben Gardner Date: Tue Feb 23 12:41:22 2010 -0600 ata: Detect Delkin Devices compact flash I have a Delkin Devices compact flash card that isn't being recognized using the SATA/PATA drivers. The card is recognized and works with the deprecated ATA drivers. The error I am seeing is: ata1.00: failed to IDENTIFY (device reports invalid type, err_mask=0x0) I tracked it down to ata_id_is_cfa() in include/linux/ata.h. The Delkin card has id[0] set to 0x844a and id[83] set to 0. This isn't what the kernel expects and is probably incorrect. The simplest work-around is to add a check for 0x844a to ata_id_is_cfa(). Signed-off-by: Ben Gardner Signed-off-by: Jeff Garzik commit 7e044a12c73f474e59f1ddecf08d6781c7830f0f Author: Alan Cox Date: Wed Feb 17 13:17:52 2010 +0000 pata_efar: Enable parallel scanning Again originally proposed by Bartlomiej but this does it by using the generic helper logic instead. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 1d3a8118b049252a84641b6643066bda0da0d316 Author: Alan Cox Date: Wed Feb 17 13:17:44 2010 +0000 pata_atiixp: enable parallel scan This was originally proposed by Bartlomiej but as a device specific expansion of the init_one function rather than making the helper more generic. Enable the parallel scan via the generic flags. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit e99846f18f03badd1bbd4fda79e6ec325e3b9058 Author: Bartlomiej Zolnierkiewicz Date: Wed Feb 17 13:17:31 2010 +0000 [libata] pata_atiixp: add locking for parallel scanning This is similar change as commit 60c3be3 for ata_piix host driver and while pata_atiixp doesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface. [Ported to current tree without other patch dependancies by Alan Cox] Original is Signed-off-by: Bartlomiej Zolnierkiewicz This one is Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 303f1a76ae792885af8a4a0e784e22e31e850e9a Author: Bartlomiej Zolnierkiewicz Date: Wed Feb 17 13:16:58 2010 +0000 [libata] pata_efar: add locking for parallel scanning Add clearing of UDMA enable bit also for PIO modes and then add extra locking for parallel scanning. This is similar change as commit 60c3be3 for ata_piix host driver and while pata_efar doesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface. [Ported to current kernel without other patch dependancies by Alan Cox] Original is Signed-off-by: Bartlomiej Zolnierkiewicz This one is Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 16ea0fc98d53c72cb4e1a9edcb685a87e3a81430 Author: Alan Cox Date: Tue Feb 23 02:26:06 2010 -0500 libata: Pass host flags into the pci helper This allows parallel scan and the like to be set without having to stop using the existing full helper functions. This patch merely adds the argument and fixes up the callers. It doesn't undo the special cases already in the tree or add any new parallel callers. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934 Author: Christoph Egger Date: Fri Feb 5 16:26:35 2010 +0100 [libata] pata_marvell: CONFIG_AHCI is really CONFIG_SATA_AHCI The marvell driver comtains a fallback to ahci for the sata ports which is incorrectly checked as CONFIG_AHCI while the only AHCI config item is actually called SATA_AHCI (which also sounds sensible considering it's a fallback for the sata ports). Signed-off-by: Christoph Egger Signed-off-by: Jeff Garzik commit 96780078f35648050fef808f49a0ffff0360bb57 Author: Alan Cox Date: Mon Feb 8 10:04:54 2010 +0000 libata: Allow pata_legacy to be built on non-ISA but PCI systems This is needed for some unsupported hardware setups on strange 64bit mainboards where crazy stuff has been done like putting flash ata adapters on the LPC bus, or where the real hardware is hidden/confused. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 750e519da7b3f470fe1b5b55c8d8f52d6d6371e4 Author: Bartlomiej Zolnierkiewicz Date: Sat Feb 13 17:43:17 2010 -0500 pata_pdc202xx_old: fix UDMA mode for PDC2026x chipsets PDC2026x chipsets need the same treatment as PDC20246 one. This is completely untested but will hopefully fix UDMA issues that people have been reporting against pata_pdc202xx_old for the last couple of years. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit a75032e8772d13dab5e3501413d7e14a148281b4 Author: Bartlomiej Zolnierkiewicz Date: Sat Feb 13 14:35:53 2010 +0100 pata_pdc202xx_old: fix UDMA mode for Promise UDMA33 cards On Monday 04 January 2010 02:30:24 pm Russell King wrote: > Found the problem - getting rid of the read of the alt status register > after the command has been written fixes the UDMA CRC errors on write: > > @@ -676,7 +676,8 @@ void ata_sff_exec_command(struct ata_port *ap, const struct > ata_taskfile *tf) > DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); > > iowrite8(tf->command, ap->ioaddr.command_addr); > - ata_sff_pause(ap); > + ndelay(400); > +// ata_sff_pause(ap); > } > EXPORT_SYMBOL_GPL(ata_sff_exec_command); > > > This rather makes sense. The PDC20247 handles the UDMA part of the > protocol. It has no way to tell the PDC20246 to wait while it suspends > UDMA, so that a normal register access can take place - the 246 ploughs > on with the register access without any regard to the state of the 247. > > If the drive immediately starts the UDMA protocol after a write to the > command register (as it probably will for the DMA WRITE command), then > we'll be accessing the taskfile in the middle of the UDMA setup, which > can't be good. It's certainly a violation of the ATA specs. Fix it by adding custom ->sff_exec_command method for UDMA33 chipsets. Debugged-by: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 429e3861f9d5682c5bc5f237345f8962daf51bbc Author: Jeff Garzik Date: Thu Feb 4 01:09:54 2010 -0500 [libata] pata_at91: fix backslash-continued string Noticed and rough patch by Joe Perches. Signed-off-by: Jeff Garzik commit 460f5318460a9a3b2562d8055b9fb1c60b768e1f Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:17:12 2010 +0100 pata_via: store UDMA masks in via_isa_bridges table * store UDMA masks in via_isa_bridges[] and while at it make "flags" field to be u8 instead of u16 * convert the driver to use UDMA masks from via_isa_bridges[] * remove no longer needed VIA_UDMA* defines Make some minor documentation and CodingStyle fixes while at it. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit f777582f4963413320ce5fe1d1d3651a32075c07 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:17:03 2010 +0100 pata_via: fix address setup timings underlocking Correct via_do_set_mode() documentation while at it. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit cfcf9ee26a5991f0786d24b4bd334b103d06268e Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:16:46 2010 +0100 pata_serverworks: fix error message Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 8490377acc0869d660185bd4a9e360363d110a21 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:16:38 2010 +0100 pata_serverworks: fix PIO setup for the second channel Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 73e2e3d0e9d4b5781c66eca8a901e6478c25ae7d Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:16:03 2010 +0100 pata_efar: fix secondary port support Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 3403c24529ddfb4a47f5cfe8496370997f1b0758 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:15:47 2010 +0100 pata_cypress: fix PIO timings underclocking Timing registers should be programmed with the desired number of clocks minus one clock. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 8ebf473860e8166e3d4f152a02e22b9cdddcd440 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:15:38 2010 +0100 pata_cs5535: use correct values for PIO1 and PIO2 data timings There shouldn't be any problems with it as IDE cs5535 host driver has been using those values for years and they match values given in the (publicly available) datasheet. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit c754d9b6e04371fb398cdd2f5e77be895126be20 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:15:18 2010 +0100 pata_cmd64x: remove unused definitions s/ARTIM2/ARTTIM23/ in cmd648_bmdma_stop() while at it Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 03a849e6ddb604ff6a220b78637ee8e122ffc796 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:15:11 2010 +0100 pata_cmd64x: cmd648_bmdma_stop() fix Clear the primary channel pending interrupt bit instead of the reserved one. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit d62f5576efc4886c0f3633c2652c3a924e043be9 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:15:04 2010 +0100 pata_cmd64x: fix handling of address setup timings Account for the requirements of the DMA mode currently used by the pair device. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit a2bd62207af4be8f5fe815ff90cc309056407829 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:14:55 2010 +0100 pata_cmd64x: fix PIO setup Fix incorrect handling of recovery clocks value == 16 resulting in overclocked recovery timings & potentially underclocked active timings. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit d8b3d8cfe6240178ac717e143438bf51364311e4 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:14:05 2010 +0100 pata_ali: documentation fixes Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 9e8808a99c6decdb4ab78081a26d3752339f424c Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 18:13:57 2010 +0100 libata: fix CFA handling in ide_timing_compute() Use standard cycle timing for CFA PIO5 and PIO6 modes. Based on commit 74638c8 for IDE subsystem. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 02d1d6160ffe13f4ebc6f85f72366a5da0b1fb9b Author: Bart Hartgers Date: Sun Jan 17 00:56:54 2010 +0100 sata_via: Correctly setup PIO/DMA for pata slave on vt6421. Before only the timings for master were set. Datasheet can be found here: ftp://ftp.vtbridge.org/Docs/Storage/DS_VT6421A_100_CCPL.PDF Surprisingly, a slave drive works without this patch. According to the datasheet, the controller by default derives the DMA mode from the Set Features command issued to a drive. Not sure about the PIO timings, though. The real problem is that the timings for the master effectively are the ones tuned for the slave. If these support different UDMA-settings, there is trouble, especially when the slave supports a higher UDMA than the master. Anyhow, using the same mechanism for both master and slave seems like a good idea. Signed-off-by: Bart Hartgers Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9ffc5da5e1e57592da9c22d83a98c63afc8d985c Author: Robert Hancock Date: Tue Jan 19 23:03:39 2010 -0600 libata: make functions/variables static Make some variables in ahci and a function in pata_pcmcia static, as found using sparse. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 27943620cbd960f710a385ff4a538e14ed3f1922 Author: Tejun Heo Date: Tue Jan 19 10:49:19 2010 +0900 libata: implement spurious irq handling for SFF and apply it to piix Traditional IDE interface sucks in that it doesn't have a reliable IRQ pending bit, so if the controller raises IRQ while the driver is expecting it not to, the IRQ won't be cleared and eventually the IRQ line will be killed by interrupt subsystem. Some controllers have non-standard mechanism to indicate IRQ pending so that this condition can be detected and worked around. This patch adds an optional operation ->sff_irq_check() which will be called for each port from the ata_sff_interrupt() if an unexpected interrupt is received. If the operation returns %true, ->sff_check_status() and ->sff_irq_clear() will be cleared for the port. Note that this doesn't mark the interrupt as handled so it won't prevent IRQ subsystem from killing the IRQ if this mechanism fails to clear the spurious IRQ. This patch also implements ->sff_irq_check() for ata_piix. Note that this adds slight overhead to shared IRQ operation as IRQs which are destined for other controllers will trigger extra register accesses to check whether IDE interrupt is pending but this solves rare screaming IRQ cases and for some curious reason also helps weird BIOS related glitch on Samsung n130 as reported in bko#14314. http://bugzilla.kernel.org/show_bug.cgi?id=14314 * piix_base_ops dropped as suggested by Sergei. * Spurious IRQ detection doesn't kick in anymore if polling qc is in progress. This provides less protection but some controllers have possible data corruption issues if the wrong register is accessed while a command is in progress. Signed-off-by: Tejun Heo Reported-by: Johannes Stezenbach Reported-by: Hans Werner Cc: Alan Cox Cc: Sergei Shtylyov Signed-off-by: Jeff Garzik commit d88ec2e5c13261cf317b46832a7de216f6d06537 Author: Tejun Heo Date: Tue Jan 19 10:46:32 2010 +0900 libata: cleanup ata_sff_interrupt() host->ports[i] is never NULL if i < host->n_ports and non-NULL return from ata_qc_from_tag() guarantees that the returned qc is active. Drop unnecessary tests. Superflous () dropped as suggested by Sergei. Signed-off-by: Tejun Heo Cc: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 88e8201e67aace3d86de9e75122ea525f0e7248e Author: Seth Heasley Date: Tue Jan 12 17:01:28 2010 -0800 ata_piix: IDE Mode SATA patch for Intel Cougar Point DeviceIDs Signed-off-by: Seth Heasley Signed-off-by: Jeff Garzik commit 5623cab83ea61e0420f2064216d83eab067a24c6 Author: Seth Heasley Date: Tue Jan 12 17:00:18 2010 -0800 ahci: AHCI and RAID mode SATA patch for Intel Cougar Point DeviceIDs Signed-off-by: Seth Heasley Signed-off-by: Jeff Garzik commit d6ef31539d715db7a0eb2d67a1a008c9d8ccf059 Author: Shane Huang Date: Wed Dec 9 17:23:04 2009 +0800 ahci: Implement SATA AHCI FIS-based switching support Tested on AMD internal reference board. Signed-off-by: Shane Huang Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit d817898c2fc73e6ea33b58498c87a43d7e9fcd7a Author: Sergei Shtylyov Date: Mon Dec 7 23:39:38 2009 +0400 pata_hpt366: remove irrelevant TODO HPT36x chips just don't have DPLL. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit fd5e62e22db29a067d3f26ba54caac308eb5e3a8 Author: Sergei Shtylyov Date: Mon Dec 7 23:38:11 2009 +0400 pata_hpt{37x|3x2n}: improve timing register documentation Describe UDMA timing bits 18-20 and 21 separately; add a note to bit 31 about it being meaningful for PIO only. Reformat the whole comment, while at it... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 859faa875ed6760fcdfaf6f1fec1155a7e43dc21 Author: Sergei Shtylyov Date: Mon Dec 7 23:36:15 2009 +0400 pata_hpt366: remove redundant code There's no need to clear the fast interrupt bit in hpt366_set_mode() since we're doing it in hpt366_init_chipset() already. While at it, rename 'addr1' local variable to 'addr' and exclude 'ap->port_no' from its calculation as HPT36x are single-channel-per-function chips. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 1a1b172b9672e88d37adb5925b509e9236625d7e Author: Sergei Shtylyov Date: Mon Dec 7 23:30:06 2009 +0400 pata_hpt{37x|3x2n}: unify mode programming As these drivers' set_piomode() and set_dmamode() methods are almost identical, factor out the common hpt{37x|3x2n}_set_mode() function to be called by both of them, the same as in 'pata_hpt366' driver. This results in ~5% decrease in the 'pata_hpt37x' driver binary size and in ~4% decrease in the 'pata_hpt3x2n' driver binary size (as measured on x86-32). Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 60661933995bc7a09686c901439e17c2a4ea7d5d Author: Sergei Shtylyov Date: Mon Dec 7 23:25:52 2009 +0400 pata_hpt3x2n: always stretch UltraDMA timing The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the driver only does this when PCI clock is 66 MHz, whereas it always programs DPLL clock (which is used as the ATA clock) to 66 MHz. Signed-off-by: Sergei Shtylyov Cc: Signed-off-by: Jeff Garzik commit 56f46f8c8741d02516d9150a46a5b05fe910ee11 Author: Sergei Shtylyov Date: Sat Dec 5 00:37:43 2009 +0400 pata_hpt37x: use ATA_DMA_* constants Use ATA_DMA_* constants instead of the bare numbers for the BMIDE registers. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 661cb9fbf2ce580000a792bf1d394fc341c9ba69 Author: Thadeu Lima de Souza Cascardo Date: Mon Mar 1 14:03:48 2010 -0500 MAINTAINERS: Add git tree to x86 Platform Drivers Add the x86 platform driver git tree to MAINTAINERS. Signed-off-by: Thadeu Lima de Souza Cascardo commit 8724fdb53d27d7b59b60c8a399cc67f9abfabb33 Merge: bc53515 35858ad Author: Linus Torvalds Date: Mon Mar 1 10:38:09 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (62 commits) Input: atkbd - release previously reserved keycodes 248 - 254 Input: add KEY_WPS_BUTTON definition Input: ads7846 - add regulator support Input: winbond-cir - fix suspend/resume Input: gamecon - use pr_err() and friends Input: gamecon - constify some of the setup structures Input: gamecon - simplify pad type handling Input: gamecon - simplify coordinate calculation for PSX Input: gamecon - fix some formatting issues Input: gamecon - add rumble support for N64 pads Input: wacom - add device type to device name string Input: s3c24xx_ts - report touch only when stylus is down Input: s3c24xx_ts - re-enable IRQ on resume Input: wacom - constify product features data Input: wacom - use per-device instance of wacom_features Input: sh_keysc - enable building on SH-Mobile ARM Input: wacom - get features from driver info Input: rotary-encoder - set gpio direction for each requested gpio Input: sh_keysc - update the driver with mode 6 Input: sh_keysc - switch to using bitmaps ... commit bc535154137601400ffe44c2a7be047ca041fe06 Merge: d03ab7f 439913f Author: Linus Torvalds Date: Mon Mar 1 10:36:22 2010 -0800 Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: replace acpi_integer by u64 ACPICA: Update version to 20100121. ACPICA: Remove unused uint32_struct type ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type ACPICA: Predefined name repair: fix NULL package elements ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls ACPICA: Update all ACPICA copyrights and signons to 2010 ACPICA: Update for new gcc-4 warning options commit 6268f50df8c36e15e43ae2a10951b2cffd0ecfc4 Author: Roel Kluin Date: Mon Mar 1 13:26:22 2010 -0500 asus-acpi: remove duplicate comparison of asus_model strings These tests already occur elsewhere Signed-off-by: Roel Kluin Cc: Corentin Chary Cc: Karol Kozimor Cc: Len Brown Signed-off-by: Andrew Morton commit d95cf4de6a1c9c1025ac375bc6d2da6af18fdf35 Author: Borislav Petkov Date: Wed Feb 24 14:49:47 2010 +0100 amd64_edac: Simplify ECC override handling No need for clearing ecc_enable_override and checking it in two places. Instead, simply check it during probing and act accordingly. Also, rename the flag bitfields according to the functionality they actually represent. What is more, make sure original BIOS ECC settings are restored when the module is unloaded. Signed-off-by: Borislav Petkov commit 5f19daa16ffca55db5b0253eba2bd0f71ee7f7f4 Author: Sandeep Paulraj Date: Mon Feb 1 09:51:45 2010 -0500 DaVinci DM365: Adding support for SPI EEPROM The DM365 Spectrum Digital EVM comes with an EEPROM connected to SPI0. This patch adds support for the SPI EEPROM. Signed-off-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit a3e13e89d6658042fdfd50a7bf7564e81e6ce689 Author: Sandeep Paulraj Date: Mon Feb 1 09:51:31 2010 -0500 DaVinci DM365: Adding DM365 SPI support This patch adds SPI init for DM365. It does the following 1) Initializes SPI0 2) Defines resources to be used by SPI0 3) Adds platform data for SPI0 Signed-off-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 15e865859a9e65a3f39e95bcb7ee72d0645b9a0e Author: Sandeep Paulraj Date: Mon Feb 1 09:51:15 2010 -0500 DaVinci DM355: Modifications to DM355 SPI support This patch does the following 1) Minor change to the SPI clocks making it similar to DM365. 2) Changing the interrupt used by SPI0 3) Adding EDMA resources that can be used by SPI0 4) Adding platform specific data. Signed-off-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 8e2a0013c2bafd623d27b35364cbf28d4a0dbe55 Author: Sandeep Paulraj Date: Mon Feb 1 09:51:02 2010 -0500 DaVinci: SPI: Adding header file for SPI support. This patch adds "spi.h" header file that will be used by board and architecture specific code. Signed-off-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit c564191b1c71d82977ba14ed7f975dae9f6d0001 Author: Kevin Hilman Date: Mon Jan 11 08:22:23 2010 -0800 davinci: dm646x: CDCE clocks: davinci_clk converted to clk_lookup Remove unneeded 'struct davinci_clk' wrapper around 'struct clk_lookup' and use clk_lookup directly. Signed-off-by: Kevin Hilman commit 37b99dd5372cff42f83210c280f314f10f99138e Author: Wu Fengguang Date: Mon Mar 1 21:55:51 2010 +0800 resource: Fix generic page_is_ram() for partial RAM pages The System RAM walk shall skip partial RAM pages and avoid calling func() on them. So that page_is_ram() return 0 for a partial RAM page. In particular, it shall not call func() with len=0. This fixes a boot time bug reported by Sachin and root caused by Thomas: > >>> WARNING: at arch/x86/mm/ioremap.c:111 __ioremap_caller+0x169/0x2f1() > >>> Hardware name: BladeCenter LS21 -[79716AA]- > >>> Modules linked in: > >>> Pid: 0, comm: swapper Not tainted 2.6.33-git6-autotest #1 > >>> Call Trace: > >>> [] ? __ioremap_caller+0x169/0x2f1 > >>> [] warn_slowpath_common+0x77/0xa4 > >>> [] warn_slowpath_null+0xf/0x11 > >>> [] __ioremap_caller+0x169/0x2f1 > >>> [] ? acpi_os_map_memory+0x12/0x1b > >>> [] ioremap_nocache+0x12/0x14 > >>> [] acpi_os_map_memory+0x12/0x1b > >>> [] acpi_tb_verify_table+0x29/0x5b > >>> [] acpi_load_tables+0x39/0x15a > >>> [] acpi_early_init+0x60/0xf5 > >>> [] start_kernel+0x397/0x3a7 > >>> [] x86_64_start_reservations+0xa5/0xa9 > >>> [] x86_64_start_kernel+0xe1/0xe8 > >>> ---[ end trace 4eaa2a86a8e2da22 ]--- > >>> ioremap reserve_memtype failed -22 The return code is -EINVAL, so it failed in the is_ram check, which is not too surprising > BIOS-provided physical RAM map: > BIOS-e820: 0000000000000000 - 000000000009c000 (usable) > BIOS-e820: 000000000009c000 - 00000000000a0000 (reserved) > BIOS-e820: 00000000000e0000 - 0000000000100000 (reserved) > BIOS-e820: 0000000000100000 - 00000000cffa3900 (usable) > BIOS-e820: 00000000cffa3900 - 00000000cffa7400 (ACPI data) The ACPI data is not starting on a page boundary and neither does the usable RAM area end on a page boundary. Very useful ! > ACPI: DSDT 00000000cffa3900 036CE (v01 IBM SERLEWIS 00001000 INTL 20060912) ACPI is trying to map DSDT at cffa3900, which results in a check vs. cffa3000 which is the relevant page boundary. The generic is_ram check correctly identifies that as RAM because it's in the usable resource area. The old e820 based is_ram check does not take overlapping resource areas into account. That's why it works. CC: Sachin Sant CC: Thomas Gleixner CC: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang LKML-Reference: <20100301135551.GA9998@localhost> Signed-off-by: H. Peter Anvin commit d03ab7ff335b7fbf48d0fd28ead5d7957798510b Merge: 8098a7e 4d86e1b Author: Linus Torvalds Date: Mon Mar 1 10:14:46 2010 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] wrong attribute of HUB chip written in uv_setup() [IA64] remove trailing space in messages [IA64] use asm-generic/scatterlist.h [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI [IA64] Remove COMPAT_IA32 support commit 8098a7ef8946169cf8ffeb6f4d8130fc3651192e Merge: 4805a1b d8fe989 Author: Linus Torvalds Date: Mon Mar 1 10:06:09 2010 -0800 Merge branch 'for-linus' of git://repo.or.cz/cris-mirror * 'for-linus' of git://repo.or.cz/cris-mirror: cris: Fixup last users of irq_chip->typename CRIS v32: Should index be positive? commit 4805a1b0e6d74feb6428c05116a2886a076ee341 Merge: ac0f6f9 3119815 Author: Linus Torvalds Date: Mon Mar 1 09:16:21 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: fix out of range array access commit ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 Merge: b1bf936 9f33be2 Author: Linus Torvalds Date: Mon Mar 1 09:15:15 2010 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits) ARM: Eliminate decompressor -Dstatic= PIC hack ARM: 5958/1: ARM: U300: fix inverted clk round rate ARM: 5956/1: misplaced parentheses ARM: 5955/1: ep93xx: move timer defines into core.c and document ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c ARM: 5953/1: ep93xx: fix broken build of clock.c ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig ARM: 5949/1: NUC900 add gpio virtual memory map ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk ARM: make_coherent(): fix problems with highpte, part 2 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself ARM: 5945/1: ep93xx: include correct irq.h in core.c ARM: 5933/1: amba-pl011: support hardware flow control ARM: 5930/1: Add PKMAP area description to memory.txt. ARM: 5929/1: Add checks to detect overlap of memory regions. ARM: 5928/1: Change type of VMALLOC_END to unsigned long. ARM: 5927/1: Make delimiters of DMA area globally visibly. ARM: 5926/1: Add "Virtual kernel memory..." printout. ARM: 5920/1: OMAP4: Enable L2 Cache ... Fix up trivial conflict in arch/arm/mach-mx25/clock.c commit b1bf9368407ae7e89d8a005bb40beb70a41df539 Merge: 524df55 4671a13 Author: Linus Torvalds Date: Mon Mar 1 09:00:29 2010 -0800 Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits) block: don't access jiffies when initialising io_context cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds block: fix for "Consolidate phys_segment and hw_segment limits" cfq-iosched: quantum check tweak blktrace: perform cleanup after setup error blkdev: fix merge_bvec_fn return value checks cfq-iosched: requests "in flight" vs "in driver" clarification cciss: Fix problem with scatter gather elements in the scsi half of the driver cciss: eliminate unnecessary pointer use in cciss scsi code cciss: do not use void pointer for scsi hba data cciss: factor out scatter gather chain block mapping code cciss: fix scatter gather chain block dma direction kludge cciss: simplify scatter gather code cciss: factor out scatter gather chain block allocation and freeing cciss: detect bad alignment of scsi commands at build time cciss: clarify command list padding calculation cfq-iosched: rethink seeky detection for SSDs cfq-iosched: rework seeky detection block: remove padding from io_context on 64bit builds block: Consolidate phys_segment and hw_segment limits ... commit 524df55725217b13d5a232fb5badb5846418ea0e Merge: 0f45339 6679ee1 Author: Linus Torvalds Date: Mon Mar 1 08:58:44 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (252 commits) ASoC: Check progress when reporting periods from i.MX FIQ handler ASoC: Remove a unused variables from i.MX FIQ runtime data ALSA: hda - Add/fix ALC269 FSC and Quanta models ALSA: hda - Add ALC670 codec support OMAP4: PMIC: Add support for twl6030 codec ALSA: hda - remove unnecessary msleep on power state transitions usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h ASoC: fsi: Modify over/under run error settlement ASoC: OMAP4: Add McPDM platform driver ASoC: OMAP4: Add support for McPDM ASoC: OMAP: data_type and sync_mode configurable in audio dma ALSA: hda - Add missing description in HD-Audio-Models.txt ALSA: add support for Macbook Air 2,1 internal speaker ALSA: usbaudio: consolidate header files ALSA: usbmixer: bail out early when parsing audio class v2 descriptors ALSA: usbaudio: implement basic set of class v2.0 parser ALSA: usbaudio: introduce new types for audio class v2 ALSA: usbaudio: parse USB descriptors with structs ALSA: hda - enable snoop for Intel Cougar Point ALSA: hda - Remove identical definitions for macmini3 model ... commit 0f4533979473a456a8adb3869365e12c7a99cf65 Merge: e56425b f409adf 599faa0 83cb167 Author: Linus Torvalds Date: Mon Mar 1 08:51:52 2010 -0800 Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Protect pid lookup in compat code with RCU * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix documentation of default chip disable() * 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: nvram: Drop the BKL from nvram_open() commit e56425b135a8892d1e71ad5bb605d12c10efeb32 Merge: 786f8ba 6622e67 Author: Linus Torvalds Date: Mon Mar 1 08:48:25 2010 -0800 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers.c: Don't export local functions clocksource: start CMT at clocksource resume clocksource: add suspend callback clocksource: add argument to resume callback ntp: Cleanup xtime references in ntp.c ntp: Make time_esterror and time_maxerror static commit 1d40ddd10dab332456e3863fed2a6e71aa6635ab Author: Russell King Date: Mon Mar 1 16:19:23 2010 +0000 MTD: fix pismo build error Signed-off-by: Russell King commit 786f8ba2e9449a7f01ec6bc35838d0a335921061 Author: Randy Dunlap Date: Sun Feb 28 17:32:45 2010 -0800 scsi.c: add missing kernel-doc notation for new VPD parameters Add missing kernel-doc notation for new function parameters: Warning(drivers/scsi/scsi.c:1031): No description found for parameter 'buf' Warning(drivers/scsi/scsi.c:1031): No description found for parameter 'buf_len' Signed-off-by: Randy Dunlap Cc: James Bottomley Signed-off-by: Linus Torvalds commit e584bc3cf6865e005bbb4dbabae0bf4b3df59500 Author: Clemens Ladisch Date: Mon Mar 1 16:20:37 2010 +0100 ALSA: ua101: add Edirol UA-1000 support Add support for the Edirol UA-1000 to the UA-101 driver. Both devices behave the same, so we just have to shuffle around some interface numbers and name strings. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 9a928660c9dcaff568c9d379655c5aa16fb981f8 Author: Yinghai Lu Date: Sun Feb 28 15:49:39 2010 -0800 pci: don't reassign to ROM res if it is not going to be enabled A ROM resource that doesn't fit should not cause us to try to re-assign all the bus resources. Nobody generally cares, and re-assigning is going to just cause way more troubles than it tries to solve. Signed-off-by: Yinghai Lu Signed-off-by: Linus Torvalds commit d2be1651b736002e0c76d7095d6c0ba77b4a897c Author: Jan Kiszka Date: Tue Feb 23 17:47:57 2010 +0100 KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP This marks the guest single-step API improvement of 94fe45da and 91586a3b with a capability flag to allow reliable detection by user space. Signed-off-by: Jan Kiszka Cc: stable@kernel.org (2.6.33) Signed-off-by: Avi Kivity commit c573cd22939e54fc1b8e672054a505048987a7cb Author: Jan Kiszka Date: Tue Feb 23 17:47:53 2010 +0100 KVM: VMX: Update instruction length on intercepted BP We intercept #BP while in guest debugging mode. As VM exits due to intercepted exceptions do not necessarily come with valid idt_vectoring, we have to update event_exit_inst_len explicitly in such cases. At least in the absence of migration, this ensures that re-injections of #BP will find and use the correct instruction length. Signed-off-by: Jan Kiszka Cc: stable@kernel.org (2.6.32, 2.6.33) Signed-off-by: Avi Kivity commit e54cfa97a9ca9a544a7257b89b530b505ae1b892 Author: Takuya Yoshikawa Date: Thu Feb 18 12:15:02 2010 +0200 KVM: Fix emulate_sys[call, enter, exit]()'s fault handling This patch fixes emulate_syscall(), emulate_sysenter() and emulate_sysexit() to handle injected faults properly. Even though original code injects faults in these functions, we cannot handle these unless we use the different return value from the UNHANDLEABLE case. So this patch use X86EMUL_* codes instead of -1 and 0 and makes x86_emulate_insn() to handle these propagated faults. Be sure that, in x86_emulate_insn(), goto cannot_emulate and goto done with rc equals X86EMUL_UNHANDLEABLE have same effect. Signed-off-by: Takuya Yoshikawa Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit c697518a861e6c43b92b848895f9926580ee63c3 Author: Gleb Natapov Date: Thu Feb 18 12:15:01 2010 +0200 KVM: Fix segment descriptor loading Add proper error and permission checking. This patch also change task switching code to load segment selectors before segment descriptors, like SDM requires, otherwise permission checking during segment descriptor loading will be incorrect. Cc: stable@kernel.org (2.6.33, 2.6.32) Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 6f550484a15ea1b468665cdf59f020bf08ccb292 Author: Takuya Yoshikawa Date: Thu Feb 18 12:15:00 2010 +0200 KVM: Fix load_guest_segment_descriptor() to inject page fault This patch injects page fault when reading descriptor in load_guest_segment_descriptor() fails with FAULT. Effects of this injection: This function is used by kvm_load_segment_descriptor() which is necessary for the following instructions: - mov seg,r/m16 - jmp far - pop ?s This patch makes it possible to emulate the page faults generated by these instructions. But be sure that unless we change the kvm_load_segment_descriptor()'s ret value propagation this patch has no effect. Signed-off-by: Takuya Yoshikawa Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 8b9f44140bc4afd2698413cd9960c3912168ee91 Author: Gleb Natapov Date: Thu Feb 18 12:14:59 2010 +0200 KVM: x86 emulator: Forbid modifying CS segment register by mov instruction Inject #UD if guest attempts to do so. This is in accordance to Intel SDM. Cc: stable@kernel.org (2.6.33, 2.6.32) Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 70e335e16882df5b5d6971022e63c3603a1e8c23 Author: Avi Kivity Date: Thu Feb 18 11:25:22 2010 +0200 KVM: Convert kvm->requests_lock to raw_spinlock_t The code relies on kvm->requests_lock inhibiting preemption. Noted by Jan Kiszka. Signed-off-by: Avi Kivity commit fa8273e9549b3cee2947d1aebe5242e7a25eb3de Author: Thomas Gleixner Date: Wed Feb 17 14:00:41 2010 +0000 KVM: Convert i8254/i8259 locks to raw_spinlocks The i8254/i8259 locks need to be real spinlocks on preempt-rt. Convert them to raw_spinlock. No change for !RT kernels. Signed-off-by: Thomas Gleixner Signed-off-by: Avi Kivity commit e424e1918345ab17d3beb068b8745ab1706d0e1b Author: Gleb Natapov Date: Thu Feb 11 12:41:10 2010 +0200 KVM: x86 emulator: disallow opcode 82 in 64-bit mode Instructions with opcode 82 are not valid in 64 bit mode. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 1d327eac3c9a8b170d68df44957d82bdbd263c53 Author: Wei Yongjun Date: Thu Feb 11 11:12:07 2010 +0800 KVM: x86 emulator: code style cleanup Just remove redundant semicolon. Signed-off-by: Wei Yongjun Signed-off-by: Avi Kivity commit db358796d95886f9715d1c91e9ae866c005511d7 Author: Avi Kivity Date: Tue Jan 26 16:30:06 2010 +0200 KVM: Plan obsolescence of kernel allocated slots, paravirt mmu These features are unused by modern userspace and can go away. Paravirt mmu needs to stay a little longer for live migration. Signed-off-by: Avi Kivity commit d380a5e4022a5c63a6c5ac631e48c752ba7f1e4f Author: Gleb Natapov Date: Wed Feb 10 14:21:36 2010 +0200 KVM: x86 emulator: Add LOCK prefix validity checking Instructions which are not allowed to have LOCK prefix should generate #UD if one is used. [avi: fold opcode 82 fix from another patch] Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit e92805ac1228626c59c865f2f4e9059b9fb8c97b Author: Gleb Natapov Date: Wed Feb 10 14:21:35 2010 +0200 KVM: x86 emulator: Check CPL level during privilege instruction emulation Add CPL checking in case emulator is tricked into emulating privilege instruction from userspace. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit d4c6a1549c056f1d817e8f6f2f97d8b44933472f Author: Gleb Natapov Date: Wed Feb 10 14:21:34 2010 +0200 KVM: x86 emulator: Fix popf emulation POPF behaves differently depending on current CPU mode. Emulate correct logic to prevent guest from changing flags that it can't change otherwise. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit f850e2e603bf5a05b0aee7901857cf85715aa694 Author: Gleb Natapov Date: Wed Feb 10 14:21:33 2010 +0200 KVM: x86 emulator: Check IOPL level during io instruction emulation Make emulator check that vcpu is allowed to execute IN, INS, OUT, OUTS, CLI, STI. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 1871c6020d7308afb99127bba51f04548e7ca84e Author: Gleb Natapov Date: Wed Feb 10 14:21:32 2010 +0200 KVM: x86 emulator: fix memory access during x86 emulation Currently when x86 emulator needs to access memory, page walk is done with broadest permission possible, so if emulated instruction was executed by userspace process it can still access kernel memory. Fix that by providing correct memory access to page walker during emulation. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit a0044755679f3e761b8b95995e5f2db2b7efd0f6 Author: Gleb Natapov Date: Wed Feb 10 14:21:31 2010 +0200 KVM: x86 emulator: Add Virtual-8086 mode of emulation For some instructions CPU behaves differently for real-mode and virtual 8086. Let emulator know which mode cpu is in, so it will not poke into vcpu state directly. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 60a29d4ea4e7b6b95d9391ebc8625b0426f3a363 Author: Gleb Natapov Date: Wed Feb 10 14:21:30 2010 +0200 KVM: x86 emulator: Add group9 instruction decoding Use groups mechanism to decode 0F C7 instructions. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 2db2c2eb6226e30f8059b82512a1364db98da8e3 Author: Gleb Natapov Date: Wed Feb 10 14:21:29 2010 +0200 KVM: x86 emulator: Add group8 instruction decoding Use groups mechanism to decode 0F BA instructions. Signed-off-by: Gleb Natapov Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 8b97fb0fcba0e119d539ef6126ddd1d7ba9c007f Author: Michael S. Tsirkin Date: Wed Jan 13 19:12:39 2010 +0200 KVM: do not store wqh in irqfd wqh is unused, so we do not need to store it in irqfd anymore Signed-off-by: Michael S. Tsirkin Signed-off-by: Avi Kivity commit daf5e27109c8c16c987e955cc6abbbc0af050edd Author: Liu Yu Date: Tue Feb 2 19:44:35 2010 +0800 KVM: ppc/booke: Set ESR and DEAR when inject interrupt to guest Old method prematurely sets ESR and DEAR. Move this part after we decide to inject interrupt, which is more like hardware behave. Signed-off-by: Liu Yu Acked-by: Hollis Blanchard Acked-by: Alexander Graf Signed-off-by: Avi Kivity commit 4b7bb9210047fe880bb71e6273c3a4526799dbd7 Author: Wei Yongjun Date: Tue Feb 9 10:41:56 2010 +0800 KVM: ia64: destroy ioapic device if fail to setup default irq routing If KVM_CREATE_IRQCHIP fail due to kvm_setup_default_irq_routing(), ioapic device is not destroyed and kvm->arch.vioapic is not set to NULL, this may cause KVM_GET_IRQCHIP and KVM_SET_IRQCHIP access to unexcepted memory. Signed-off-by: Wei Yongjun Signed-off-by: Avi Kivity commit 72bb2fcd23afe8db53b47e8f9edd736c517ba532 Author: Wei Yongjun Date: Tue Feb 9 10:33:03 2010 +0800 KVM: cleanup the failure path of KVM_CREATE_IRQCHIP ioctrl If we fail to init ioapic device or the fail to setup the default irq routing, the device register by kvm_create_pic() and kvm_ioapic_init() remain unregister. This patch fixed to do this. Signed-off-by: Wei Yongjun Signed-off-by: Avi Kivity commit 1ae77badc2504d157800f10a81a58cc9c941e7cb Author: Wei Yongjun Date: Tue Feb 9 10:31:09 2010 +0800 KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure kvm->arch.vioapic should be NULL in case of kvm_ioapic_init() failure due to cannot register io dev. Signed-off-by: Wei Yongjun Signed-off-by: Avi Kivity commit d225f53b76f4287365efd381b9e3a732e6bad27e Author: Wei Yongjun Date: Mon Feb 8 17:03:51 2010 +0800 KVM: PIT: unregister kvm irq notifier if fail to create pit If fail to create pit, we should unregister kvm irq notifier which register in kvm_create_pit(). Signed-off-by: Wei Yongjun Acked-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit a19a6d1131c77822ae55f84a1bd6d62327e99287 Author: Sheng Yang Date: Tue Feb 9 16:41:53 2010 +0800 KVM: VMX: Rename VMX_EPT_IGMT_BIT to VMX_EPT_IPAT_BIT Following the new SDM. Now the bit is named "Ignore PAT memory type". Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 90bb6fc556ab255abd798bcf4ff5769690ab2eea Author: Avi Kivity Date: Thu Dec 31 12:10:16 2009 +0200 KVM: MMU: Add tracepoint for guest page aging Signed-off-by: Avi Kivity commit 43db669730743fcc2a74b641ff4d77781eb15bfa Author: Jochen Maes Date: Mon Feb 8 11:29:33 2010 +0100 KVM: Fix Codestyle in virt/kvm/coalesced_mmio.c Fixed 2 codestyle issues in virt/kvm/coalesced_mmio.c Signed-off-by: Jochen Maes Signed-off-by: Avi Kivity commit 1976d2d2c91246a37fcb8246b811de735aa6e9a4 Author: Takuya Yoshikawa Date: Fri Feb 5 17:52:46 2010 +0900 KVM: Remove redundant reading of rax on OUT instructions kvm_emulate_pio() and complete_pio() both read out the RAX register value and copy it to a place into which the value read out from the port will be copied later. This patch removes this redundancy. /*** snippet from arch/x86/kvm/x86.c ***/ int complete_pio(struct kvm_vcpu *vcpu) { ... if (!io->string) { if (io->in) { val = kvm_register_read(vcpu, VCPU_REGS_RAX); memcpy(&val, vcpu->arch.pio_data, io->size); kvm_register_write(vcpu, VCPU_REGS_RAX, val); } ... Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit 6316e1c8c6af6ccb55ff8564231710660608f46c Author: Rik van Riel Date: Wed Feb 3 16:11:03 2010 -0500 KVM: VMX: emulate accessed bit for EPT Currently KVM pretends that pages with EPT mappings never got accessed. This has some side effects in the VM, like swapping out actively used guest pages and needlessly breaking up actively used hugepages. We can avoid those very costly side effects by emulating the accessed bit for EPT PTEs, which should only be slightly costly because pages pass through page_referenced infrequently. TLB flushing is taken care of by kvm_mmu_notifier_clear_flush_young(). This seems to help prevent KVM guests from being swapped out when they should not on my system. Signed-off-by: Rik van Riel Signed-off-by: Avi Kivity commit 8f0b1ab6fb045a1324d9435ba00c2940783b0041 Author: Joerg Roedel Date: Thu Jan 28 12:37:56 2010 +0100 KVM: Introduce kvm_host_page_size This patch introduces a generic function to find out the host page size for a given gfn. This function is needed by the kvm iommu code. This patch also simplifies the x86 host_mapping_level function. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit c45b4fd416f5497b6b38dd70acc0e5b01399e5c9 Author: Julia Lawall Date: Sat Feb 6 09:43:03 2010 +0100 KVM: VMX: Remove redundant test in vmx_set_efer() msr was tested above, so the second test is not needed. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // Signed-off-by: Julia Lawall Signed-off-by: Avi Kivity commit 16fbb5eecc4ab8d4eb4d2a683d7fd74ccacc890b Author: Joe Perches Date: Mon Feb 1 23:22:07 2010 -0800 KVM: ia64: Fix string literal continuation lines String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Avi Kivity commit ebcbab4c034db2ec25abe702d788936b29a49b24 Author: Avi Kivity Date: Sun Feb 7 11:56:52 2010 +0200 KVM: VMX: Wire up .fpu_activate() callback Signed-off-by: Avi Kivity commit 7edcface95c6e593faa40c70e0464500515db573 Author: Takuya Yoshikawa Date: Mon Feb 1 22:11:52 2010 +0900 KVM: fix kvm_fix_hypercall() to return X86EMUL_* This patch fixes kvm_fix_hypercall() to propagate X86EMUL_* info generated by emulator_write_emulated() to its callers: suggested by Marcelo. The effect of this is x86_emulate_insn() will begin to handle the page faults which occur in emulator_write_emulated(): this should be OK because emulator_write_emulated_onepage() always injects page fault when emulator_write_emulated() returns X86EMUL_PROPAGATE_FAULT. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit c125c607326928001983f51109c3d0c190f0a8bb Author: Takuya Yoshikawa Date: Mon Feb 1 22:11:04 2010 +0900 KVM: fix load_guest_segment_descriptor() to return X86EMUL_* This patch fixes load_guest_segment_descriptor() to return X86EMUL_PROPAGATE_FAULT when it tries to access the descriptor table beyond the limit of it: suggested by Marcelo. I have checked current callers of this helper function, - kvm_load_segment_descriptor() - kvm_task_switch() and confirmed that this patch will change nothing in the upper layers if we do not change the handling of this return value from load_guest_segment_descriptor(). Next step: Although fixing the kvm_task_switch() to handle the propagated faults properly seems difficult, and maybe not worth it because TSS is not used commonly these days, we can fix kvm_load_segment_descriptor(). By doing so, the injected #GP becomes possible to be handled by the guest. The only problem for this is how to differentiate this fault from the page faults generated by kvm_read_guest_virt(). We may have to split this function to achive this goal. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit ab9f4ecbb6d39a18e300a0d10a4968c37404aa76 Author: Zhai, Edwin Date: Fri Jan 29 14:38:44 2010 +0800 KVM: enable PCI multiple-segments for pass-through device Enable optional parameter (default 0) - PCI segment (or domain) besides BDF, when assigning PCI device to guest. Signed-off-by: Zhai Edwin Acked-by: Chris Wright Signed-off-by: Marcelo Tosatti commit 6d3e435e708fa32f99b780caf6c5508a606a513b Author: Gui Jianfeng Date: Fri Jan 29 15:36:59 2010 +0800 KVM: VMX: Remove redundant check in vm_need_virtualize_apic_accesses() flexpriority_enabled implies cpu_has_vmx_virtualize_apic_accesses() returning true, so we don't need this check here. Signed-off-by: Gui Jianfeng Signed-off-by: Marcelo Tosatti commit 59200273c4d07ddf99dd3c8d91b90bb170457fc3 Author: Avi Kivity Date: Mon Jan 25 19:47:02 2010 +0200 KVM: Trace failed msr reads and writes Record failed msrs reads and writes, and the fact that they failed as well. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 6e7d15296773f7a479072ec7f3248f51d01e1fad Author: Avi Kivity Date: Mon Jan 25 19:36:03 2010 +0200 KVM: Fix msr trace - data is 64 bits wide, not unsigned long - rw is confusingly named Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit e01c2426149d70dc6dd46ad0453195656b6eeaa4 Author: Gleb Natapov Date: Mon Jan 25 12:01:04 2010 +0200 KVM: mark segments accessed on HW task switch On HW task switch newly loaded segments should me marked as accessed. Reported-by: Lorenzo Martignoni Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 81231c698a71af6e1815df72c06685d295e1cc1d Author: Avi Kivity Date: Sun Jan 24 16:26:40 2010 +0200 KVM: VMX: Pass cr0.mp through to the guest when the fpu is active When cr0.mp is clear, the guest doesn't expect a #NM in response to a WAIT instruction. Because we always keep cr0.mp set, it will get a #NM, and potentially be confused. Fix by keeping cr0.mp set only when the fpu is inactive, and passing it through when inactive. Reported-by: Lorenzo Martignoni Analyzed-by: Gleb Natapov Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit da15bf436bc9586603b47b39244157431fa38b56 Author: Liu Yu Date: Fri Jan 22 19:36:53 2010 +0800 KVM: PPC E500: fix tlbcfg emulation commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't update tlbcfg correctly. Fix it. And since guest OS likes 'fixed' hardware, initialize tlbcfg everytime when guest access is useless. So move this part to init code. Signed-off-by: Liu Yu Acked-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit a9040f274285c3c962a08b177ac5764b4a93df07 Author: Liu Yu Date: Fri Jan 22 18:50:30 2010 +0800 KVM: PPC: Add PVR/PIR init for E500 commit 513579e3a391a3874c478a8493080822069976e8 change the way we emulate PVR/PIR, which left PVR/PIR uninitialized on E500, and make guest puzzled. Signed-off-by: Liu Yu Acked-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit d86be077a4d62e5615e97674dab8d894ce582b09 Author: Liu Yu Date: Fri Jan 22 18:50:29 2010 +0800 KVM: PPC E500: Add register l1csr0 emulation Latest kernel start to access l1csr0 to contron L1. We just tell guest no operation is on going. Signed-off-by: Liu Yu Acked-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit d7fa6ab217aeed26293e01d7b64f79a1ac57e823 Author: Wei Yongjun Date: Fri Jan 22 16:55:05 2010 +0800 KVM: MMU: Remove some useless code from alloc_mmu_pages() If we fail to alloc page for vcpu->arch.mmu.pae_root, call to free_mmu_pages() is unnecessary, which just do free the page malloc for vcpu->arch.mmu.pae_root. Signed-off-by: Wei Yongjun Signed-off-by: Marcelo Tosatti commit 0c04851c0c093ce98ab4ca69556480d779292418 Author: Avi Kivity Date: Thu Jan 21 15:31:52 2010 +0200 KVM: trace guest fpu loads and unloads Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 8ae099127668de80e4babba73bb492740ce3a1be Author: Avi Kivity Date: Thu Jan 21 15:31:51 2010 +0200 KVM: Optimize kvm_read_cr[04]_bits() 'mask' is always a constant, so we can check whether it includes a bit that might be owned by the guest very cheaply, and avoid the decache call. Saves a few hundred bytes of module text. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit f6801dff23bd1902473902194667f4ac1eb6ea26 Author: Avi Kivity Date: Thu Jan 21 15:31:50 2010 +0200 KVM: Rename vcpu->shadow_efer to efer None of the other registers have the shadow_ prefix. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 836a1b3c3456042704c86aaa3d837b976de9343b Author: Avi Kivity Date: Thu Jan 21 15:31:49 2010 +0200 KVM: Move cr0/cr4/efer related helpers to x86.h They have more general scope than the mmu. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 3eeb3288bcbf64da90afc26389b8844df7c34912 Author: Avi Kivity Date: Thu Jan 21 15:31:48 2010 +0200 KVM: Add a helper for checking if the guest is in protected mode Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 6b52d18605f580bdffaffd48c8da228c3e848deb Author: Avi Kivity Date: Thu Jan 21 15:31:47 2010 +0200 KVM: Activate fpu on clts Assume that if the guest executes clts, it knows what it's doing, and load the guest fpu to prevent an #NM exception. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit e5bb40251a920cdd9d12c569c6aab0bdd0279e4e Author: Avi Kivity Date: Thu Jan 21 15:31:46 2010 +0200 KVM: Drop kvm_{load,put}_guest_fpu() exports Not used anymore. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 2608d7a12fd4badfe2eac534150f0715a7fd3ff3 Author: Avi Kivity Date: Thu Jan 21 15:31:45 2010 +0200 KVM: Allow kvm_load_guest_fpu() even when !vcpu->fpu_active This allows accessing the guest fpu from the instruction emulator, as well as being symmetric with kvm_put_guest_fpu(). Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit ab344828ebe729e52949d64046adaa196f6b9dbe Author: Gleb Natapov Date: Thu Jan 21 15:28:46 2010 +0200 KVM: x86: fix checking of cr0 validity Move to/from Control Registers chapter of Intel SDM says. "Reserved bits in CR0 remain clear after any load of those registers; attempts to set them have no impact". Control Register chapter says "Bits 63:32 of CR0 are reserved and must be written with zeros. Writing a nonzero value to any of the upper 32 bits results in a general-protection exception, #GP(0)." This patch tries to implement this twisted logic. Signed-off-by: Gleb Natapov Reported-by: Lorenzo Martignoni Signed-off-by: Marcelo Tosatti commit f0f4b930900ffa8daddb5262522c3e5c67ee1835 Author: Sheng Yang Date: Thu Jan 21 16:20:04 2010 +0800 KVM: Fix kvm_coalesced_mmio_ring duplicate allocation The commit 0953ca73 "KVM: Simplify coalesced mmio initialization" allocate kvm_coalesced_mmio_ring in the kvm_coalesced_mmio_init(), but didn't discard the original allocation... Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti commit 727f5a23e2080b19da392f17fa3158a0941f81f5 Author: Jan Kiszka Date: Wed Jan 20 18:20:20 2010 +0100 KVM: SVM: Trap all debug register accesses To enable proper debug register emulation under all conditions, trap access to all DR0..7. This may be optimized later on. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit c76de350c8a3ba770becc17eaa744dc3c7642295 Author: Jan Kiszka Date: Wed Jan 20 18:20:20 2010 +0100 KVM: SVM: Clean up and enhance mov dr emulation Enhance mov dr instruction emulation used by SVM so that it properly handles dr4/5: alias to dr6/7 if cr4.de is cleared. Otherwise return EMULATE_FAIL which will let our only possible caller in that scenario, ud_interception, re-inject UD. We do not need to inject faults, SVM does this for us (exceptions take precedence over instruction interceptions). For the same reason, the value overflow checks can be removed. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit fd7373cce767a8803e79f51bd3fc5f531234657f Author: Jan Kiszka Date: Wed Jan 20 18:20:20 2010 +0100 KVM: VMX: Clean up DR6 emulation As we trap all debug register accesses, we do not need to switch real DR6 at all. Clean up update_exception_bitmap at this chance, too. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 138ac8d88f91e2a6a278aa5cee9120c714c4ce2d Author: Jan Kiszka Date: Wed Jan 20 18:20:20 2010 +0100 KVM: VMX: Fix emulation of DR4 and DR5 Make sure DR4 and DR5 are aliased to DR6 and DR7, respectively, if CR4.DE is not set. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit f2483415293b180945da707e7dbe74e5daa72651 Author: Jan Kiszka Date: Wed Jan 20 18:20:20 2010 +0100 KVM: VMX: Fix exceptions of mov to dr Injecting GP without an error code is a bad idea (causes unhandled guest exits). Moreover, we must not skip the instruction if we injected an exception. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit b60d513c32e2ddc8b3e9e1465b94913d44d19810 Author: Takuya Yoshikawa Date: Wed Jan 20 16:47:21 2010 +0900 KVM: x86: Use macros for x86_emulate_ops to avoid future mistakes The return values from x86_emulate_ops are defined in kvm_emulate.h as macros X86EMUL_*. But in emulate.c, we are comparing the return values from these ops with 0 to check if they're X86EMUL_CONTINUE or not: X86EMUL_CONTINUE is defined as 0 now. To avoid possible mistakes in the future, this patch substitutes "X86EMUL_CONTINUE" for "0" that are being compared with the return values from x86_emulate_ops. We think that there are more places we should use these macros, but the meanings of rc values in x86_emulate_insn() were not so clear at a glance. If we use proper macros in this function, we would be able to follow the flow of each emulation more easily and, maybe, more securely. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit 647492047763c3ee8fe51ecf9a04f39040aa495b Author: Marcelo Tosatti Date: Tue Jan 19 12:45:23 2010 -0200 KVM: fix cleanup_srcu_struct on vm destruction cleanup_srcu_struct on VM destruction remains broken: BUG: unable to handle kernel paging request at ffffffffffffffff IP: [] srcu_read_lock+0x16/0x21 RIP: 0010:[] [] srcu_read_lock+0x16/0x21 Call Trace: [] kvm_arch_vcpu_uninit+0x1b/0x48 [kvm] [] kvm_vcpu_uninit+0x9/0x15 [kvm] [] vmx_free_vcpu+0x7f/0x8f [kvm_intel] [] kvm_arch_destroy_vm+0x78/0x111 [kvm] [] kvm_put_kvm+0xd4/0xfe [kvm] Move it to kvm_arch_destroy_vm. Signed-off-by: Marcelo Tosatti Reported-by: Jan Kiszka commit ccd469362e826261ccc261c4c36fb0a346338222 Author: Gleb Natapov Date: Tue Jan 19 15:06:38 2010 +0200 KVM: fix Hyper-V hypercall warnings and wrong mask value Fix compilation warnings and wrong mask value. Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 7062dcaa369cae40c1a59949a5654985d0ae26ea Author: Sheng Yang Date: Tue Jan 19 17:43:21 2010 +0800 KVM: VMX: Remove emulation failure report As Avi noted: >There are two problems with the kernel failure report. First, it >doesn't report enough data - registers, surrounding instructions, etc. >that are needed to explain what is going on. Second, it can flood >dmesg, which is a pretty bad thing to do. So we remove the emulation failure report in handle_invalid_guest_state(), and would inspected the guest using userspace tool in the future. Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti commit 94718da12741ef44e1eb2bfe3ca37db92115a3d3 Author: Avi Kivity Date: Mon Jan 18 13:26:34 2010 +0200 KVM: export Needed by . Signed-off-by: Avi Kivity commit 8dae444529230301bc85fc86033aa06a734c1a29 Author: Takuya Yoshikawa Date: Mon Jan 18 18:45:10 2010 +0900 KVM: rename is_writeble_pte() to is_writable_pte() There are two spellings of "writable" in arch/x86/kvm/mmu.c and paging_tmpl.h . This patch renames is_writeble_pte() to is_writable_pte() and makes grepping easy. New name is consistent with the definition of itself: return pte & PT_WRITABLE_MASK; Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit c25bc1638a1211f57cccbabdd8b732813b852340 Author: Gleb Natapov Date: Sun Jan 17 15:51:24 2010 +0200 KVM: Implement NotifyLongSpinWait HYPER-V hypercall Windows issues this hypercall after guest was spinning on a spinlock for too many iterations. Signed-off-by: Gleb Natapov Signed-off-by: Vadim Rozenfeld Signed-off-by: Avi Kivity commit 10388a07164c1512b3a3d0273b9adc230f82790e Author: Gleb Natapov Date: Sun Jan 17 15:51:23 2010 +0200 KVM: Add HYPER-V apic access MSRs Implement HYPER-V apic MSRs. Spec defines three MSRs that speed-up access to EOI/TPR/ICR apic registers for PV guests. Signed-off-by: Gleb Natapov Signed-off-by: Vadim Rozenfeld Signed-off-by: Avi Kivity commit 55cd8e5a4edb8e235163ffe8264b9aaa8d7c050f Author: Gleb Natapov Date: Sun Jan 17 15:51:22 2010 +0200 KVM: Implement bare minimum of HYPER-V MSRs Minimum HYPER-V implementation should have GUEST_OS_ID, HYPERCALL and VP_INDEX MSRs. [avi: fix build on i386] Signed-off-by: Gleb Natapov Signed-off-by: Vadim Rozenfeld Signed-off-by: Avi Kivity commit 1d5103c11e32b5028262c073d56375691d51a886 Author: Gleb Natapov Date: Sun Jan 17 15:51:21 2010 +0200 KVM: Add HYPER-V header file Provide HYPER-V related defines that will be used by following patches. Signed-off-by: Gleb Natapov Signed-off-by: Vadim Rozenfeld Signed-off-by: Avi Kivity commit a76f8497fd475028869f4b45087d80df14d74a50 Author: Alexander Graf Date: Fri Jan 15 14:49:14 2010 +0100 KVM: PPC: Move Shadow MSR calculation to function We keep a copy of the MSR around that we use when we go into the guest context. That copy is basically the normal process MSR flags OR some allowed guest specified MSR flags. We also AND the external providers into this, so we get traps on FPU usage when we haven't activated it on the host yet. Currently this calculation is part of the set_msr function that we use whenever we set the guest MSR value. With the external providers, we also have the case that we don't modify the guest's MSR, but only want to update the shadow MSR. So let's move the shadow MSR parts to a separate function that we then use whenever we only need to update it. That way we don't accidently kvm_vcpu_block within a preempt notifier context. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit f7adbba1e5d464b0d449adac1eb2519be6be9728 Author: Alexander Graf Date: Fri Jan 15 14:49:13 2010 +0100 KVM: PPC: Keep SRR1 flags around in shadow_msr SRR1 stores more information that just the MSR value. It also stores valuable information about the type of interrupt we received, for example whether the storage interrupt we just got was because of a missing htab entry or not. We use that information to speed up the exit path. Now if we get preempted before we can interpret the shadow_msr values, we get into vcpu_put which then calls the MSR handler, which then sets all the SRR1 information bits in shadow_msr to 0. Great. So let's preserve the SRR1 specific bits in shadow_msr whenever we set the MSR. They don't hurt. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 1c0006d8d131585095c4a27dbfcfb3970807a35e Author: Alexander Graf Date: Fri Jan 15 14:49:12 2010 +0100 KVM: PPC: Fix initial GPR settings Commit 7d01b4c3ed2bb33ceaf2d270cb4831a67a76b51b introduced PACA backed vcpu values. With this patch, when a userspace app was setting GPRs before it was actually first loaded, the set values get discarded. This is because vcpu_load loads them from the vcpu backing store that we use whenever we're not owning the PACA. That behavior is not really a major problem, because we don't need it for qemu. Other users (like kvmctl) do have problems with it though, so let's better do it right. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 180a34d2d3fda0151154f9cead4aab9dddd3d0c1 Author: Alexander Graf Date: Fri Jan 15 14:49:11 2010 +0100 KVM: PPC: Add support for FPU/Altivec/VSX When our guest starts using either the FPU, Altivec or VSX we need to make sure Linux knows about it and sneak into its process switching code accordingly. This patch makes accesses to the above parts of the system work inside the VM. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit d5e528136cda31a32ff7d1eaa8d06220eb443781 Author: Alexander Graf Date: Fri Jan 15 14:49:10 2010 +0100 KVM: PPC: Add helper functions to call real mode loaders Linux contains quite some bits of code to load FPU, Altivec and VSX lazily for a task. It calls those bits in real mode, coming from an interrupt handler. For KVM we better reuse those, so let's wrap a bit of trampoline magic around them and then we can call them from normal module code. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit fbad5f1dfdd097ca282ee3a796986e11eb5a971f Author: Alexander Graf Date: Fri Jan 15 14:49:09 2010 +0100 KVM: PPC: Export __giveup_vsx We need to explicitly only giveup VSX in KVM, so let's export that specific function to module space. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 0f0412c1a734700fb8ccccb1c09371642e029e2e Author: Roel Kluin Date: Thu Jan 14 18:05:58 2010 +0100 KVM: ia64: remove redundant kvm_get_exit_data() NULL tests kvm_get_exit_data() cannot return a NULL pointer. Signed-off-by: Roel Kluin Signed-off-by: Avi Kivity commit 4610c83cdc8bff04f2f22883749f716b1ccc502f Author: Avi Kivity Date: Sun Jan 10 12:19:20 2010 +0200 KVM: SVM: Lazy fpu with npt Now that we can allow the guest to play with cr0 when the fpu is loaded, we can enable lazy fpu when npt is in use. Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit d225157bc6a442b1214882635fbf287d7d0e8133 Author: Avi Kivity Date: Wed Jan 6 10:55:27 2010 +0200 KVM: SVM: Selective cr0 intercept If two conditions apply: - no bits outside TS and EM differ between the host and guest cr0 - the fpu is active then we can activate the selective cr0 write intercept and drop the unconditional cr0 read and write intercept, and allow the guest to run with the host fpu state. This reduces cr0 exits due to guest fpu management while the guest fpu is loaded. Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit 888f9f3e0cfa32baf05b3840f0248f5502292a0f Author: Avi Kivity Date: Sun Jan 10 12:14:04 2010 +0200 KVM: SVM: Restore unconditional cr0 intercept under npt Currently we don't intercept cr0 at all when npt is enabled. This improves performance but requires us to activate the fpu at all times. Remove this behaviour in preparation for adding selective cr0 intercepts. Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit bff7827479ed004c0394e6e7b35ae601bb1a97ad Author: Avi Kivity Date: Thu Jan 7 13:16:08 2010 +0200 KVM: SVM: Initialize fpu_active in init_vmcb() init_vmcb() sets up the intercepts as if the fpu is active, so initialize it there. This avoids an INIT from setting up intercepts inconsistent with fpu_active. Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit dc77270f960a8b3cc39a6349a9fad58cc6053d53 Author: Avi Kivity Date: Wed Jan 6 13:13:01 2010 +0200 KVM: SVM: Fix SVM_CR0_SELECTIVE_MASK Instead of selecting TS and MP as the comments say, the macro included TS and PE. Luckily the macro is unused now, but fix in order to save a few hours of debugging from anyone who attempts to use it. Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit f9a48e6a18c210c4bf34769fa05ede250575c6a1 Author: Avi Kivity Date: Wed Jan 6 19:10:22 2010 +0200 KVM: Set cr0.et when the guest writes cr0 Follow the hardware. Signed-off-by: Avi Kivity commit edcafe3c5a06f46407c3f60145a36f269e56ff7f Author: Avi Kivity Date: Wed Dec 30 18:07:40 2009 +0200 KVM: VMX: Give the guest ownership of cr0.ts when the fpu is active If the guest fpu is loaded, there is nothing interesing about cr0.ts; let the guest play with it as it will. This makes context switches between fpu intensive guest processes faster, as we won't trap the clts and cr0 write instructions. [marcelo: fix cr0 read shadow update on fpu deactivation; kills F8 install] Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 02daab21d94dc4cf01b2fd09863d59a436900322 Author: Avi Kivity Date: Wed Dec 30 12:40:26 2009 +0200 KVM: Lazify fpu activation and deactivation Defer fpu deactivation as much as possible - if the guest fpu is loaded, keep it loaded until the next heavyweight exit (where we are forced to unload it). This reduces unnecessary exits. We also defer fpu activation on clts; while clts signals the intent to use the fpu, we can't be sure the guest will actually use it. Signed-off-by: Avi Kivity commit e8467fda83cdc9de53972fee0cd2e6916cf66f41 Author: Avi Kivity Date: Tue Dec 29 18:43:06 2009 +0200 KVM: VMX: Allow the guest to own some cr0 bits We will use this later to give the guest ownership of cr0.ts. Signed-off-by: Avi Kivity commit 4d4ec0874583b127caac1d0f84033c8971b2fd2a Author: Avi Kivity Date: Tue Dec 29 18:07:30 2009 +0200 KVM: Replace read accesses of vcpu->arch.cr0 by an accessor Since we'd like to allow the guest to own a few bits of cr0 at times, we need to know when we access those bits. Signed-off-by: Avi Kivity commit a1f83a74feaa9718a5c61587256ea6cc1b993d16 Author: Avi Kivity Date: Tue Dec 29 17:33:58 2009 +0200 KVM: VMX: trace clts and lmsw instructions as cr accesses clts writes cr0.ts; lmsw writes cr0[0:15] - record that in ftrace. Signed-off-by: Avi Kivity commit 4b5c9b7f9bdd76a3c860731db08bfc6758e96e29 Author: Alexander Graf Date: Sun Jan 10 03:27:47 2010 +0100 KVM: PPC: Make large pages work An SLB entry contains two pieces of information related to size: 1) PTE size 2) SLB size The L bit defines the PTE be "large" (usually means 16MB), SLB_VSID_B_1T defines that the SLB should span 1 GB instead of the default 256MB. Apparently I messed things up and just put those two in one box, shaked it heavily and came up with the current code which handles large pages incorrectly, because it also treats large page SLB entries as "1TB" segment entries. This patch splits those two features apart, making Linux guests boot even when they have > 256MB. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 5f2b105a1d6a137c8cfb2792b79128db965880a8 Author: Alexander Graf Date: Sun Jan 10 03:27:32 2010 +0100 KVM: PPC: Pass through program interrupts When we get a program interrupt in guest kernel mode, we try to emulate the instruction. If that doesn't fail, we report to the user and try again - at the exact same instruction pointer. So if the guest kernel really does trigger an invalid instruction, we loop forever. So let's better go and forward program exceptions to the guest when we don't know the instruction we're supposed to emulate. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit ff1ca3f983c4180018dbf5e02f2af06f86ef6d03 Author: Alexander Graf Date: Fri Jan 8 02:58:09 2010 +0100 KVM: PPC: Pass program interrupt flags to the guest When we need to reinject a program interrupt into the guest, we also need to reinject the corresponding flags into the guest. Signed-off-by: Alexander Graf Reported-by: Benjamin Herrenschmidt Signed-off-by: Avi Kivity commit d35feb26ef7e9fbef7643051be5f0773662b1f91 Author: Alexander Graf Date: Fri Jan 8 02:58:08 2010 +0100 KVM: PPC: Fix HID5 setting code The code to unset HID5.dcbz32 is broken. This patch makes it do the right rotate magic. Signed-off-by: Alexander Graf Reported-by: Benjamin Herrenschmidt Signed-off-by: Avi Kivity commit 25a8a02d26a71c28e26417a3520c653c2d40af6b Author: Alexander Graf Date: Fri Jan 8 02:58:07 2010 +0100 KVM: PPC: Emulate trap SRR1 flags properly Book3S needs some flags in SRR1 to get to know details about an interrupt. One such example is the trap instruction. It tells the guest kernel that a program interrupt is due to a trap using a bit in SRR1. This patch implements above behavior, making WARN_ON behave like WARN_ON. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 021ec9c69f8b7b20f46296cc76cc4cb341b25191 Author: Alexander Graf Date: Fri Jan 8 02:58:06 2010 +0100 KVM: PPC: Call SLB patching code in interrupt safe manner Currently we're racy when doing the transition from IR=1 to IR=0, from the module memory entry code to the real mode SLB switching code. To work around that I took a look at the RTAS entry code which is faced with a similar problem and did the same thing: A small helper in linear mapped memory that does mtmsr with IR=0 and then RFIs info the actual handler. Thanks to that trick we can safely take page faults in the entry code and only need to be really wary of what to do as of the SLB switching part. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit bc90923e27908ef65aa8aaad2f234e18b5273c78 Author: Alexander Graf Date: Fri Jan 8 02:58:05 2010 +0100 KVM: PPC: Get rid of unnecessary RFI Using an RFI in IR=1 is dangerous. We need to set two SRRs and then do an RFI without getting interrupted at all, because every interrupt could potentially overwrite the SRR values. Fortunately, we don't need to RFI in at least this particular case of the code, so we can just replace it with an mtmsr and b. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit b4433a7cceed59714b0778e1ace624befdd15ded Author: Alexander Graf Date: Fri Jan 8 02:58:04 2010 +0100 KVM: PPC: Implement 'skip instruction' mode To fetch the last instruction we were interrupted on, we enable DR in early exit code, where we are still in a very transitional phase between guest and host state. Most of the time this seemed to work, but another CPU can easily flush our TLB and HTAB which makes us go in the Linux page fault handler which totally breaks because we still use the guest's SLB entries. To work around that, let's introduce a second KVM guest mode that defines that whenever we get a trap, we don't call the Linux handler or go into the KVM exit code, but just jump over the faulting instruction. That way a potentially bad lwz doesn't trigger any faults and we can later on interpret the invalid instruction we fetched as "fetch didn't work". Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 7e57cba06074da84d7c24d8c3f44040d2d8c88ac Author: Alexander Graf Date: Fri Jan 8 02:58:03 2010 +0100 KVM: PPC: Use PACA backed shadow vcpu We're being horribly racy right now. All the entry and exit code hijacks random fields from the PACA that could easily be used by different code in case we get interrupted, for example by a #MC or even page fault. After discussing this with Ben, we figured it's best to reserve some more space in the PACA and just shove off some vcpu state to there. That way we can drastically improve the readability of the code, make it less racy and less complex. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 992b5b29b5ae254c416c62faf98d59a6cf970027 Author: Alexander Graf Date: Fri Jan 8 02:58:02 2010 +0100 KVM: PPC: Add helpers for CR, XER We now have helpers for the GPRs, so let's also add some for CR and XER. Having them in the PACA simplifies code a lot, as we don't need to care about where to store CC or not to overflow any integers. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 8e5b26b55a8b6aee2c789b1d20ec715f9e4bea5c Author: Alexander Graf Date: Fri Jan 8 02:58:01 2010 +0100 KVM: PPC: Use accessor functions for GPR access All code in PPC KVM currently accesses gprs in the vcpu struct directly. While there's nothing wrong with that wrt the current way gprs are stored and loaded, it doesn't suffice for the PACA acceleration that will follow in this patchset. So let's just create little wrapper inline functions that we call whenever a GPR needs to be read from or written to. The compiled code shouldn't really change at all for now. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 0d178975d0a5afe5e0fd3211bd1397905b225be5 Author: Takuya Yoshikawa Date: Wed Jan 6 17:55:23 2010 +0900 KVM: Fix the explanation of write_emulated The explanation of write_emulated is confused with that of read_emulated. This patch fix it. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit 878403b788bff1af9c7f1a61e104f0c77115af29 Author: Sheng Yang Date: Tue Jan 5 19:02:29 2010 +0800 KVM: VMX: Enable EPT 1GB page support Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti commit 17cc393596823f4bbab81e68a9e23e7beadbcfca Author: Sheng Yang Date: Tue Jan 5 19:02:27 2010 +0800 KVM: x86: Rename gb_page_enable() to get_lpage_level() in kvm_x86_ops Then the callback can provide the maximum supported large page level, which is more flexible. Also move the gb page support into x86_64 specific. Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti commit c9c5417455b0c2e3c164883354b5480e5aee3b36 Author: Sheng Yang Date: Tue Jan 5 19:02:26 2010 +0800 KVM: x86: Moving PT_*_LEVEL to mmu.h We can use them in x86.c and vmx.c now... Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti commit 97c4cfbe890a4ad82dde8660008d42b7b05dc488 Author: Alexander Graf Date: Mon Jan 4 22:19:25 2010 +0100 KVM: PPC: Enable lightweight exits again The PowerPC C ABI defines that registers r14-r31 need to be preserved across function calls. Since our exit handler is written in C, we can make use of that and don't need to reload r14-r31 on every entry/exit cycle. This technique is also used in the BookE code and is called "lightweight exits" there. To follow the tradition, it's called the same in Book3S. So far this optimization was disabled though, as the code didn't do what it was expected to do, but failed to work. This patch fixes and enables lightweight exits again. Signed-off-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit b480f780f071a068810ccd0e49c1daa210bfbeab Author: Alexander Graf Date: Mon Jan 4 22:19:22 2010 +0100 KVM: PPC: Fix typo in rebolting code When we're loading bolted entries into the SLB again, we're checking if an entry is in use and only slbmte it when it is. Unfortunately, the check always goes to the skip label of the first entry, resulting in an endless loop when it actually gets triggered. Signed-off-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit 46a929bc15fcd48e1e0e770a44040a6949cae133 Author: Avi Kivity Date: Mon Dec 28 14:08:30 2009 +0200 KVM: avoid taking ioapic mutex for non-ioapic EOIs When the guest acknowledges an interrupt, it sends an EOI message to the local apic, which broadcasts it to the ioapic. To handle the EOI, we need to take the ioapic mutex. On large guests, this causes a lot of contention on this mutex. Since large guests usually don't route interrupts via the ioapic (they use msi instead), this is completely unnecessary. Avoid taking the mutex by introducing a handled_vectors bitmap. Before taking the mutex, check if the ioapic was actually responsible for the acked vector. If not, we can return early. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit f4c9e87c83a9f5bc1800db27dbb39e5cd1254c0a Author: Avi Kivity Date: Mon Dec 28 16:06:35 2009 +0200 KVM: Fill out ftrace exit reason strings Some exit reasons missed their strings; fill out the table. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 0680fe52753381cb7154beeb01ef3e48f2cdeec6 Author: Avi Kivity Date: Sun Dec 27 17:00:46 2009 +0200 KVM: Bump maximum vcpu count to 64 With slots_lock converted to rcu, the entire kvm hotpath on modern processors (with npt or ept) now scales beautifully. Increase the maximum vcpu count to 64 to reflect this. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 79fac95ecfa3969aab8119d37ccd7226165f933a Author: Marcelo Tosatti Date: Wed Dec 23 14:35:26 2009 -0200 KVM: convert slots_lock to a mutex Signed-off-by: Marcelo Tosatti commit f656ce0185cabbbb0cf96877306879661297c7ad Author: Marcelo Tosatti Date: Wed Dec 23 14:35:25 2009 -0200 KVM: switch vcpu context to use SRCU Signed-off-by: Marcelo Tosatti commit e93f8a0f821e290ac5149830110a5f704db7a1fc Author: Marcelo Tosatti Date: Wed Dec 23 14:35:24 2009 -0200 KVM: convert io_bus to SRCU Signed-off-by: Marcelo Tosatti commit a983fb238728e1123177e8058d4f644b949a7d05 Author: Marcelo Tosatti Date: Wed Dec 23 14:35:23 2009 -0200 KVM: x86: switch kvm_set_memory_alias to SRCU update Using a similar two-step procedure as for memslots. Signed-off-by: Marcelo Tosatti commit b050b015abbef8225826eecb6f6b4d4a6dea7b79 Author: Marcelo Tosatti Date: Wed Dec 23 14:35:22 2009 -0200 KVM: use SRCU for dirty log Signed-off-by: Marcelo Tosatti commit bc6678a33d9b952981a8e44a4f876c3ad64ca4d8 Author: Marcelo Tosatti Date: Wed Dec 23 14:35:21 2009 -0200 KVM: introduce kvm->srcu and convert kvm_set_memory_region to SRCU update Use two steps for memslot deletion: mark the slot invalid (which stops instantiation of new shadow pages for that slot, but allows destruction), then instantiate the new empty slot. Also simplifies kvm_handle_hva locking. Signed-off-by: Marcelo Tosatti commit 3ad26d8139a82b0510b1e0435ee82ae461d33401 Author: Marcelo Tosatti Date: Wed Dec 23 14:35:20 2009 -0200 KVM: use gfn_to_pfn_memslot in kvm_iommu_map_pages So its possible to iommu map a memslot before making it visible to kvm. Signed-off-by: Marcelo Tosatti commit 506f0d6f9c40ae7d9634acf3c26358810f42c24a Author: Marcelo Tosatti Date: Wed Dec 23 14:35:19 2009 -0200 KVM: introduce gfn_to_pfn_memslot Which takes a memslot pointer instead of using kvm->memslots. To be used by SRCU convertion later. Signed-off-by: Marcelo Tosatti commit f7784b8ec9b6a041fa828cfbe9012fe51933f5ac Author: Marcelo Tosatti Date: Wed Dec 23 14:35:18 2009 -0200 KVM: split kvm_arch_set_memory_region into prepare and commit Required for SRCU convertion later. Signed-off-by: Marcelo Tosatti commit fef9cce0eb28a67e688a411cc30b73625e49002b Author: Marcelo Tosatti Date: Wed Dec 23 14:35:17 2009 -0200 KVM: modify alias layout in x86s struct kvm_arch Have a pointer to an allocated region inside x86's kvm_arch. Signed-off-by: Marcelo Tosatti commit 46a26bf55714c1e2f17e34683292a389acb8e601 Author: Marcelo Tosatti Date: Wed Dec 23 14:35:16 2009 -0200 KVM: modify memslots layout in struct kvm Have a pointer to an allocated region inside struct kvm. [alex: fix ppc book 3s] Signed-off-by: Alexander Graf Signed-off-by: Marcelo Tosatti commit 2044892d4a005a78796c92fd1aef4633be896698 Author: Wu Fengguang Date: Thu Dec 24 09:04:16 2009 +0800 KVM: trivial document fixes Signed-off-by: Wu Fengguang Signed-off-by: Marcelo Tosatti commit ddf0289db22c4ae2192a252706792837528605c6 Author: Alexander Graf Date: Sun Dec 20 22:24:07 2009 +0100 KVM: powerpc: Change maintainer Progress on KVM for Embedded PowerPC has stalled, but for Book3S there's quite a lot of work to do and going on. So in agreement with Hollis and Avi, we should switch maintainers for PowerPC. Signed-off-by: Alexander Graf Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 0bb1fb7178c55f3e295b2ffe0433c330f960458e Author: Alexander Graf Date: Mon Dec 21 20:21:25 2009 +0100 KVM: powerpc: Remove AGGRESSIVE_DEC Because we now emulate the DEC interrupt according to real life behavior, there's no need to keep the AGGRESSIVE_DEC hack around. Let's just remove it. Signed-off-by: Alexander Graf Acked-by: Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 7706664d39a8eb8555408a24b1f17bd2086189c6 Author: Alexander Graf Date: Mon Dec 21 20:21:24 2009 +0100 KVM: powerpc: Improve DEC handling We treated the DEC interrupt like an edge based one. This is not true for Book3s. The DEC keeps firing until mtdec is issued again and thus clears the interrupt line. So let's implement this logic in KVM too. This patch moves the line clearing from the firing of the interrupt to the mtdec emulation. This makes PPC64 guests work without AGGRESSIVE_DEC defined. Signed-off-by: Alexander Graf Acked-by: Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 583617b7866cfcc0b3830a4b7ab20f218d180f67 Author: Alexander Graf Date: Mon Dec 21 20:21:23 2009 +0100 KVM: powerpc: Move vector to irqprio resolving to separate function We're using a switch table to find the irqprio that belongs to a specific interrupt vector. This table is part of the interrupt inject logic. Since we'll add a new function to stop interrupts, let's move this table out of the injection logic into a separate function. Signed-off-by: Alexander Graf Acked-by: Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 980da6ce573b7c40886406674ff8f022a975e65e Author: Avi Kivity Date: Sun Dec 20 15:13:43 2009 +0200 KVM: Simplify coalesced mmio initialization - add destructor function - move related allocation into constructor - add stubs for !CONFIG_KVM_MMIO Signed-off-by: Avi Kivity commit 50eb2a3cd0f50d912b26d0b79b7f443344608390 Author: Avi Kivity Date: Sun Dec 20 15:00:10 2009 +0200 KVM: Add KVM_MMIO kconfig item s390 doesn't have mmio, this will simplify ifdefing it out. Signed-off-by: Avi Kivity commit 4c07b0a4b6df45fd8c6d07d838b4faf65eed2ba4 Author: Avi Kivity Date: Sun Dec 20 14:54:04 2009 +0200 KVM: Remove ifdefs from mmu notifier initialization Signed-off-by: Avi Kivity commit 3f0852e0aca9de2d2f8bc756630a82352cbfde68 Author: Avi Kivity Date: Sun Dec 20 14:42:19 2009 +0200 KVM: Add include guards for coalesced_mmio.h Signed-off-by: Avi Kivity commit 283d0c65e4c277cf81d71418341c74eee199d149 Author: Avi Kivity Date: Sun Dec 20 14:25:19 2009 +0200 KVM: Disentangle mmu notifiers and coalesced_mmio registration They aren't related. Signed-off-by: Avi Kivity commit 953899b659adce62cbe83d6a7527550ab8797c48 Author: Joerg Roedel Date: Mon Dec 14 12:22:20 2009 +0100 KVM: SVM: Adjust tsc_offset only if tsc_unstable The tsc_offset adjustment in svm_vcpu_load is executed unconditionally even if Linux considers the host tsc as stable. This causes a Linux guest detecting an unstable tsc in any case. This patch removes the tsc_offset adjustment if the host tsc is stable. The guest will now get the benefit of a stable tsc too. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 4e47c7a6d714cf352b719db92a924b6ec487acc5 Author: Sheng Yang Date: Fri Dec 18 16:48:47 2009 +0800 KVM: VMX: Add instruction rdtscp support for guest Before enabling, execution of "rdtscp" in guest would result in #UD. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 0e85188049afacdfce9c026144142264981bbabb Author: Sheng Yang Date: Fri Dec 18 16:48:46 2009 +0800 KVM: Add cpuid_update() callback to kvm_x86_ops Sometime, we need to adjust some state in order to reflect guest CPUID setting, e.g. if we don't expose rdtscp to guest, we won't want to enable it on hardware. cpuid_update() is introduced for this purpose. Also export kvm_find_cpuid_entry() for later use. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit be43f83dada2cf0e9e01c9a0ba42977c5bd70f9d Author: Sheng Yang Date: Fri Dec 18 16:48:45 2009 +0800 x86: Raise vsyscall priority on hotplug notifier chain KVM need vsyscall_init() to initialize MSR_TSC_AUX before it read the value. Per Avi's suggestion, this patch raised vsyscall priority on hotplug notifier chain, to 30. CC: Ingo Molnar CC: linux-kernel@vger.kernel.org Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 2bf78fa7b9b0d2917fd6587eadb3c0f6bbaf1718 Author: Sheng Yang Date: Fri Dec 18 16:48:44 2009 +0800 KVM: Extended shared_msr_global to per CPU shared_msr_global saved host value of relevant MSRs, but it have an assumption that all MSRs it tracked shared the value across the different CPUs. It's not true with some MSRs, e.g. MSR_TSC_AUX. Extend it to per CPU to provide the support of MSR_TSC_AUX, and more alike MSRs. Notice now the shared_msr_global still have one assumption: it can only deal with the MSRs that won't change in host after KVM module loaded. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 8a7e3f01e692cd202fb7c042cf2be9ff8c599a1e Author: Sheng Yang Date: Fri Dec 18 16:48:42 2009 +0800 KVM: VMX: Remove redundant variable It's no longer necessary. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit bc23008b610dda1b0e69cd473b31c1391d6873f2 Author: Avi Kivity Date: Tue Dec 8 12:14:42 2009 +0200 KVM: VMX: Fold ept_update_paging_mode_cr4() into its caller ept_update_paging_mode_cr4() accesses vcpu->arch.cr4 directly, which usually needs to be accessed via kvm_read_cr4(). In this case, we can't, since cr4 is in the process of being updated. Instead of adding inane comments, fold the function into its caller (vmx_set_cr4), so it can use the not-yet-committed cr4 directly. Signed-off-by: Avi Kivity commit ce03e4f21a33b97c5d20ce597f64c361bb247904 Author: Avi Kivity Date: Mon Dec 7 12:29:14 2009 +0200 KVM: VMX: When using ept, allow the guest to own cr4.pge We make no use of cr4.pge if ept is enabled, but the guest does (to flush global mappings, as with vmap()), so give the guest ownership of this bit. Signed-off-by: Avi Kivity commit 4c38609ac569483152f9cb7e5a66f17355e563b2 Author: Avi Kivity Date: Mon Dec 7 12:26:18 2009 +0200 KVM: VMX: Make guest cr4 mask more conservative Instead of specifying the bits which we want to trap on, specify the bits which we allow the guest to change transparently. This is safer wrt future changes to cr4. Signed-off-by: Avi Kivity commit fc78f51938e1ea866daa2045851b2e5681371668 Author: Avi Kivity Date: Mon Dec 7 12:16:48 2009 +0200 KVM: Add accessor for reading cr4 (or some bits of cr4) Some bits of cr4 can be owned by the guest on vmx, so when we read them, we copy them to the vcpu structure. In preparation for making the set of guest-owned bits dynamic, use helpers to access these bits so we don't need to know where the bit resides. No changes to svm since all bits are host-owned there. Signed-off-by: Avi Kivity commit cdc0e24456bf5678f63497569c3676c9019f82c1 Author: Avi Kivity Date: Sun Dec 6 17:21:14 2009 +0200 KVM: VMX: Move some cr[04] related constants to vmx.c They have no place in common code. Signed-off-by: Avi Kivity commit 59708670b639bff00f92e519df1ae14da240e919 Author: Sheng Yang Date: Tue Dec 15 13:29:54 2009 +0800 KVM: VMX: Trap and invalid MWAIT/MONITOR instruction We don't support these instructions, but guest can execute them even if the feature('monitor') haven't been exposed in CPUID. So we would trap and inject a #UD if guest try this way. Cc: stable@kernel.org Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 186a3e526ac1b4063a723f90ae4893beedb24fc6 Author: Avi Kivity Date: Wed Dec 2 15:17:00 2009 +0200 KVM: MMU: Report spte not found in rmap before BUG() In the past we've had errors of single-bit in the other two cases; the printk() may confirm it for the third case (many->many). Signed-off-by: Avi Kivity commit cb84b55f6cde26c7c17beaf87da08645ae6ccbf9 Author: Marcelo Tosatti Date: Wed Nov 11 17:29:49 2009 -0200 KVM: x86: raise TSS exception for NULL CS and SS segments Windows 2003 uses task switch to triple fault and reboot (the other exception being reserved pdptrs bits). Signed-off-by: Marcelo Tosatti commit 3fd28fce765632d0fe46b31f63c0e7a7ec6c6b79 Author: Eddie Dong Date: Thu Nov 19 17:54:07 2009 +0200 KVM: x86: make double/triple fault promotion generic to all exceptions Move Double-Fault generation logic out of page fault exception generating function to cover more generic case. Signed-off-by: Eddie Dong Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit db38a29111cb9232b1982e583fd417ea9c97357c Merge: b466301 b1a96e3 Author: Matthew Garrett Date: Mon Mar 1 09:57:40 2010 -0500 Merge git://git.iksaif.net/acpi4asus into x86-platform commit b466301b842f3a54e219b5cc587f22233ecb1345 Author: Frans Pop Date: Mon Mar 1 09:50:46 2010 -0500 toshiba-acpi: fix multimedia keys on some machines Some Toshibas only send ACPI events on key down, not key release. Ignore any release events and send key down and key up events on every ACPI key down event. Signed-off-by: Frans Pop commit 92e00e47b61f558009ff81be42b412a76fd89d84 Author: Matthew Garrett Date: Mon Mar 1 09:46:43 2010 -0500 dell-laptop: Fix errors on failure and exit paths Make sure that work is cancelled after removing the i8042 filter, and unregister the platform device rather than deleting it. Signed-off-by: Matthew Garrett Cc: Dmitry Torokhov commit 94d8f785dd1f021c1971df73e6437f000c0d9449 Author: Ingo Molnar Date: Mon Mar 1 09:43:52 2010 -0500 dell-laptop: Fix build error by making buffer_mutex static The following build bug (x86, allyesconfig): arch/x86/oprofile/built-in.o:(.data+0x250): multiple definition of `buffer_mutex' Was triggered in -tip testing, caused by this upstream commit: 116ee77: dell-laptop: Use buffer with 32-bit physical address There's multiple buffer_mutex's in the kernel. Make this new one static. Signed-off-by: Ingo Molnar commit 4818972efb105730f007e5efc05e203a065fc318 Author: Bob Peterson Date: Tue Feb 23 12:20:00 2010 -0500 GFS2: print glock numbers in hex This patch changes glock numbers from printing in decimal to hex. Since DLM prints corresponding resource IDs in hex, it makes debugging easier. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit e5884636da3a128617032747654284ae7badc7ff Author: Dave Chinner Date: Fri Feb 5 16:45:25 2010 +1100 GFS2: ordered writes are backwards When we queue data buffers for ordered write, the buffers are added to the head of the ordered write list. When the log needs to push these buffers to disk, it also walks the list from the head. The result is that the the ordered buffers are submitted to disk in reverse order. For large writes, this means that whenever the log flushes large streams of reverse sequential order buffers are pushed down into the block layers. The elevators don't handle this particularly well, so IO rates tend to be significantly lower than if the IO was issued in ascending block order. Queue new ordered buffers to the tail of the ordered buffer list to ensure that IO is dispatched in the order it was submitted. This should significantly improve large sequential write speeds. On a disk capable of 85MB/s, speeds increase from 50MB/s to 65MB/s for noop and from 38MB/s to 50MB/s for cfq. Signed-off-by: Dave Chinner Signed-off-by: Steven Whitehouse commit 1ccaba3056796ab1f933736d763ffcd1958866cd Author: Abhijith Das Date: Thu Dec 10 18:52:54 2009 -0500 GFS2: Remove old, unused linked list code from quota This is the kernel portion of the patch-set for upstream gfs2, to remove the quota-linked-list stuff and replace it with fiemap-based traversal of the quota file. The corresponding userland fixes have been pushed to STABLE3 and master branches of cluster.git and gfs2-utils.git respectively (Refer Red Hat bug #536902). Signed-off-by: Abhi Das Signed-off-by: Steven Whitehouse commit c1184f8ab7ea26681f3cab18284a870aad678b0f Author: Steven Whitehouse Date: Fri Jan 8 16:14:29 2010 +0000 GFS2: Remove loopy umount code As a consequence of the previous patch, we can now remove the loop which used to be required due to the circular dependency between the inodes and glocks. Instead we can just invalidate the inodes, and then clear up any glocks which are left. Also we no longer need the rwsem since there is no longer any danger of the inode invalidation calling back into the glock code (and from there back into the inode code). Signed-off-by: Steven Whitehouse commit 009d851837ab26cab18adda6169a813f70b0b21b Author: Steven Whitehouse Date: Tue Dec 8 12:12:13 2009 +0000 GFS2: Metadata address space clean up Since the start of GFS2, an "extra" inode has been used to store the metadata belonging to each inode. The only reason for using this inode was to have an extra address space, the other fields were unused. This means that the memory usage was rather inefficient. The reason for keeping each inode's metadata in a separate address space is that when glocks are requested on remote nodes, we need to be able to efficiently locate the data and metadata which relating to that glock (inode) in order to sync or sync and invalidate it (depending on the remotely requested lock mode). This patch adds a new type of glock, which has in addition to its normal fields, has an address space. This applies to all inode and rgrp glocks (but to no other glock types which remain as before). As a result, we no longer need to have the second inode. This results in three major improvements: 1. A saving of approx 25% of memory used in caching inodes 2. A removal of the circular dependency between inodes and glocks 3. No confusion between "normal" and "metadata" inodes in super.c Although the first of these is the more immediately apparent, the second is just as important as it now enables a number of clean ups at umount time. Those will be the subject of future patches. Signed-off-by: Steven Whitehouse commit bb1165d6882f423f90fc7007a88c6c993b7c2ac4 Author: Robert Richter Date: Mon Mar 1 14:21:23 2010 +0100 perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE For consistency reasons this patch renames ARCH_PERFMON_EVENTSEL0_ENABLE to ARCH_PERFMON_EVENTSEL_ENABLE. The following is performed: $ sed -i -e s/ARCH_PERFMON_EVENTSEL0_ENABLE/ARCH_PERFMON_EVENTSEL_ENABLE/g \ arch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event.c \ arch/x86/kernel/cpu/perf_event_p6.c \ arch/x86/kernel/cpu/perfctr-watchdog.c \ arch/x86/oprofile/op_model_amd.c arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter commit 3551a708f35fc712af43aeb7f541512c5cfc4936 Author: Joerg Roedel Date: Mon Mar 1 13:52:19 2010 +0100 x86/amd-iommu: Report errors in acpi parsing functions upstream Since acpi_table_parse ignores the return values of the parsing function this patch introduces a workaround and reports these errors upstream via a global variable. Signed-off-by: Joerg Roedel commit 04e856c072b84042bb56c487c2868638bb3f78db Author: Chris Wright Date: Wed Feb 17 08:51:20 2010 -0800 x86/amd-iommu: Pt mode fix for domain_destroy After a guest is shutdown, assigned devices are not properly returned to the pt domain. This can leave the device using stale cached IOMMU data, and result in a non-functional device after it's re-bound to the host driver. For example, I see this upon rebinding: AMD-Vi: Event logged [IO_PAGE_FAULT device=02:00.0 domain=0x0000 address=0x000000007e2a8000 flags=0x0050] AMD-Vi: Event logged [IO_PAGE_FAULT device=02:00.0 domain=0x0000 address=0x000000007e2a8040 flags=0x0050] AMD-Vi: Event logged [IO_PAGE_FAULT device=02:00.0 domain=0x0000 address=0x000000007e2a8080 flags=0x0050] AMD-Vi: Event logged [IO_PAGE_FAULT device=02:00.0 domain=0x0000 address=0x000000007e2a80c0 flags=0x0050] 0000:02:00.0: eth2: Detected Hardware Unit Hang: ... The amd_iommu_destroy_domain() function calls do_detach() which doesn't reattach the pt domain to the device. Use __detach_device() instead. Cc: stable@kernel.org Signed-off-by: Chris Wright Signed-off-by: Joerg Roedel commit 5d214fe6e808a8caa9cb6f610c0190d3f50ac570 Author: Joerg Roedel Date: Mon Feb 8 14:44:49 2010 +0100 x86/amd-iommu: Protect IOMMU-API map/unmap path This patch introduces a mutex to lock page table updates in the IOMMU-API path. We can't use the spin_lock here because this patch might sleep. Signed-off-by: Joerg Roedel commit 339d3261aa3eb0e12f68ef868e042c1ca03628f7 Author: Julia Lawall Date: Sat Feb 6 09:42:39 2010 +0100 x86/amd-iommu: Remove double NULL check in check_device dev was tested just above, so drop the second test. Signed-off-by: Julia Lawall Signed-off-by: Joerg Roedel commit 1189b7ff6485ebf1039440c34150360fab7cfb01 Author: Tomi Valkeinen Date: Mon Mar 1 13:52:10 2010 +0200 OMAP: DSS2: Taal: Fix ESD check Using taal_enable_te() when DSI bus was locked caused a deadlock. Signed-off-by: Tomi Valkeinen commit 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc Merge: a91a4aa a0b6232 Author: Takashi Iwai Date: Mon Mar 1 12:38:59 2010 +0100 Merge branch 'topic/asoc' into for-linus commit a91a4aa1ee994abeb2190a1bb2f703933609a703 Merge: 12c2a68 61c2d2b Author: Takashi Iwai Date: Mon Mar 1 12:38:54 2010 +0100 Merge branch 'topic/hda' into for-linus commit 12c2a682b55a40f2a986e36d6632110029bc63a5 Merge: a86ba28 aefbd3e Author: Takashi Iwai Date: Mon Mar 1 12:38:49 2010 +0100 Merge branch 'topic/misc' into for-linus commit a86ba28583987b85845ed61be5f12aafb5fc4971 Merge: 60b341b ad6cfc2 Author: Takashi Iwai Date: Mon Mar 1 12:38:39 2010 +0100 Merge branch 'fix/misc' into for-linus commit a4c1a148a0c4c690b95938e9577be9e461bc5e5a Author: Ville Syrjälä Date: Tue Feb 23 23:36:26 2010 +0100 OMAP: DSS2: OMAPFB: Constify some function parameters Signed-off-by: Ville Syrjälä Signed-off-by: Tomi Valkeinen commit d2e82add832f9c95376d004d565c5e164c99b9ec Author: Ville Syrjälä Date: Tue Feb 23 23:36:25 2010 +0100 OMAP: DSS2: OMAPFB: install omapfb.h omapfb has several custom ioctls so user space needs the header in order to utilize them. Signed-off-by: Ville Syrjälä Signed-off-by: Tomi Valkeinen commit 8edb381d6705811b278527907a5ae2a9c4db8074 Author: Dave Airlie Date: Mon Mar 1 21:50:01 2010 +1100 vga_switcheroo: fix build on platforms with no ACPI radeon was always including the atpx code unnecessarily, also core switcheroo was including acpi headers. Signed-off-by: Dave Airlie commit 55a5cb5d594c18b3147a2288b00ea359c1a38cf8 Author: Pauli Nieminen Date: Mon Mar 1 11:37:11 2010 +0200 drm/radeon: Fix printf type warning in 64bit system. Type of iterator was promoted to unsigned long in 64bit systems. *header is small structure so it is alwas safe to cast return value of sizeof operator to int. Signed-off-by: Pauli Nieminen commit a163b1099dc7016704043c7fc572ae42519f08f7 Author: Robert Richter Date: Thu Feb 25 19:43:07 2010 +0100 perf, x86: add some IBS macros to perf_event.h Signed-off-by: Robert Richter commit 1d6040f17d12a65b9f7ab4cb9fd6d721206b79ec Author: Robert Richter Date: Thu Feb 25 19:40:46 2010 +0100 perf, x86: make IBS macros available in perf_event.h This patch moves code from oprofile to perf_event.h to make it also available for usage by perf. Signed-off-by: Robert Richter commit 86d62b6fa2845725ad88b95387c8c52731fb2460 Merge: 3d08340 cfc9c0b Author: Robert Richter Date: Mon Mar 1 11:13:21 2010 +0100 Merge remote branch 'tip/oprofile' into tip/perf/core Signed-off-by: Robert Richter commit 4671a1322052425afa38fcb7980d2fd2bb0fc99b Author: Richard Kennedy Date: Mon Mar 1 10:57:22 2010 +0100 block: don't access jiffies when initialising io_context As the comment says the initial value of last_waited is never used, so there is no need to initialise it with the current jiffies. Jiffies is hot enough without accessing it for no reason. Signed-off-by: Richard Kennedy Signed-off-by: Jens Axboe commit 73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f Author: Richard Kennedy Date: Mon Mar 1 10:50:20 2010 +0100 cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds Reorder cfq_rb_root to remove 8 bytes of padding on 64 bit builds. Consequently removing 56 bytes from cfq_group and 64 bytes from cfq_data. Signed-off-by: Richard Kennedy Signed-off-by: Jens Axboe commit 91f63d0efa1b2ff3f8773aad61c2970f097232aa Author: Stephen Rothwell Date: Mon Mar 1 19:21:01 2010 +1100 block: fix for "Consolidate phys_segment and hw_segment limits" Signed-off-by: Stephen Rothwell Signed-off-by: Jens Axboe commit 90a6501f94aedd7fb40f5556334843194fb598be Author: Paul E. McKenney Date: Sun Feb 28 08:32:18 2010 -0800 sched, rcu: Fix rcu_dereference() for RCU-lockdep Make rcu_dereference() of runqueue data structures be rcu_dereference_sched(). Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <20100228163218.GD6846@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e2f4699ac15fe36de1288505bc6e6e5a8603ab1b Merge: 1883c79 30ff056 Author: Ingo Molnar Date: Mon Mar 1 09:28:53 2010 +0100 Merge branch 'linus' into core/rcu Merge reason: Backmerge latest upstream to queue up dependent fix in the scheduler. Signed-off-by: Ingo Molnar commit abc3c744d0d7f4ad710a948ae73852ffea5fbc3b Author: Shaohua Li Date: Mon Mar 1 09:20:54 2010 +0100 cfq-iosched: quantum check tweak Currently a queue can only dispatch up to 4 requests if there are other queues. This isn't optimal, device can handle more requests, for example, AHCI can handle 31 requests. I can understand the limit is for fairness, but we could do a tweak: if the queue still has a lot of slice left, sounds we could ignore the limit. Test shows this boost my workload (two thread randread of a SSD) from 78m/s to 100m/s. Thanks for suggestions from Corrado and Vivek for the patch. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 4b17764737bb4ee3364b8bfa2059f51ebc19ccd6 Author: David S. Miller Date: Mon Mar 1 00:02:23 2010 -0800 sparc: Support show_unhandled_signals. Just faults right now, will add other traps later. Signed-off-by: David S. Miller commit 35858adbfca13678af99fb31618ef4428d6dedb0 Merge: 197d4db 4b70858 Author: Dmitry Torokhov Date: Sun Feb 28 23:55:20 2010 -0800 Merge branch 'next' into for-linus commit 0de1a57bedce0899c98da4c0910d4f38c9b7c8f4 Author: Dave Airlie Date: Mon Mar 1 16:32:15 2010 +1000 drm/radeon/kms: bump the KMS version number for square tiling support. Signed-off-by: Dave Airlie commit 1c62233508ef7104f8a78e571fdf5c72d0dc0200 Merge: 6d9c135 6a9ee8a Author: Dave Airlie Date: Mon Mar 1 16:22:38 2010 +1000 Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage * 'gpu-switcher' of /ssd/git//linux-2.6: vga_switcheroo: initial implementation (v15) fb: for framebuffer handover don't exit the loop early. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/radeon/Makefile drivers/gpu/drm/radeon/radeon.h commit 6a9ee8af344e3bd7dbd61e67037096cdf7f83289 Author: Dave Airlie Date: Mon Feb 1 15:38:10 2010 +1000 vga_switcheroo: initial implementation (v15) Many new laptops now come with 2 gpus, one to be used for low power modes and one for gaming/on-ac applications. These GPUs are typically wired to the laptop panel and VGA ports via a multiplexer unit which is controlled via ACPI methods. 4 combinations of systems typically exist - with 2 ACPI methods. Intel/ATI - Lenovo W500/T500 - use ATPX ACPI method ATI/ATI - some ASUS - use ATPX ACPI Method Intel/Nvidia - - use _DSM ACPI method Nvidia/Nvidia - - use _DSM ACPI method. TODO: This patch adds support for the ATPX method and initial bits for the _DSM methods that need to written by someone with access to the hardware. Add a proper non-debugfs interface - need to get some proper testing first. v2: add power up/down support for both devices on W500 puts i915/radeon into D3 and cuts power to radeon. v3: redo probing methods, no DMI list, drm devices call to register with switcheroo, it tries to find an ATPX method on any device and once there is two devices + ATPX it inits the switcher. v4: ATPX msg handling using buffers - should work on more machines v5: rearchitect after more mjg59 discussion - move ATPX handling to radeon driver. v6: add file headers + initial nouveau bits (to be filled out). v7: merge delayed switcher code. v8: avoid suspend/resume of gpu that is off v9: rearchitect - mjg59 is always right. - move all ATPX code to radeon, should allow simpler DSM also proper ATRM handling v10: add ATRM support for radeon BIOS, add mutex to lock vgasr_priv v11: fix bug in resuming Intel for 2nd time. v12: start fixing up nvidia code blindly. v13: blindly guess at finishing nvidia code v14: remove radeon audio hacks - fix up intel resume more like upstream v15: clean up printks + remove unnecessary igd/dis pointers mount debugfs /sys/kernel/debug/vgaswitcheroo/switch - should exist if ATPX detected + 2 cards. DIS - immediate change to discrete IGD - immediate change to IGD DDIS - delayed change to discrete DIGD - delayed change to IGD ON - turn on not in use OFF - turn off not in use Tested on W500 (Intel/ATI) and T500 (Intel/ATI) Signed-off-by: Dave Airlie commit 6d9c13513661c1991bf5f4e6e1363c721292d819 Author: Rafał Miłecki Date: Fri Feb 26 08:46:32 2010 +0000 drm/radeon/kms: do not disable audio engine twice Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 3464f114967b2f98f1bfe0eaf0a413bb51b4df1d Author: Rafał Miłecki Date: Fri Feb 26 08:44:57 2010 +0000 Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" This commit "disabled" audio on RV710 and RV740 only, leaving RV770 and RV730. The order is: CHIP_RV770 < CHIP_RV730 < CHIP_RV710 < CHIP_RV740. It is not needed anway, as we do not even try to enable audio on RV770 and newer. We call initializing function in r600.c only, not in rv770.c. If there is something causing green tinges, it's HDMI mode setting for encoder and I will try to debug that. Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c Author: Rafał Miłecki Date: Fri Feb 26 08:46:33 2010 +0000 drm/radeon/kms: do not preset audio stuff and start timer when not using audio Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 68de7745822f0dc2eea940e3c1fc65896d7afc88 Merge: cf7934a 566d84d Author: Dave Airlie Date: Mon Mar 1 16:08:57 2010 +1000 Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage * 'drm-radeon-testing' of /ssd/git/drm-radeon-next: drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic commit 566d84d172161cb6c0c4dd834c34abbac6bf7b38 Author: Dave Airlie Date: Wed Feb 24 17:17:13 2010 +1000 drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond radeon's have a special ability to passthrough writes in their internal memory space directly to PCI, this ability means that if some of the internal surfaces like the depth buffer point at 0x0, any writes to these will go directly to RAM at 0x0 via PCI busmastering. Now mesa used to always emit clears after emitting state, since the radeon mesa driver was refactored a year or more ago, it was found it could generate a clear request without ever sending any setup state to the card. So the clear would attempt to clear the depth buffer at 0x0, which would overwrite main memory at this point. fs corruption ensues. Also once one app did this correctly, it would never get set back to 0 making this messy to reproduce. The kernel should block this from happening as mesa runs without privs, though it does require the user be connected to the current running X session. This patch implements a check to make sure the depth offset has been set before a depth clear occurs and if it finds one it prints a warning and ignores the depth clear request. There is also a mesa fix to avoid sending the badness going into mesa. This only affects r100/r200 GPUs in user modesetting mode. Signed-off-by: Dave Airlie commit a55e8d452ed2f6bbecda1a3039e82cd05244be3d Author: Randy Dunlap Date: Wed Feb 24 14:29:14 2010 -0800 drm/ttm: fix function prototype to match implementation Fix function prototype to match its actual usage and implementation. drivers/gpu/drm/ttm/ttm_bo_util.c:341:10: error: symbol 'ttm_io_prot' redeclared with different type (originally declared at include/drm/ttm/ttm_bo_driver.h:911) - incompatible argument 1 (different signedness) Signed-off-by: Randy Dunlap Cc: David Airlie Signed-off-by: Dave Airlie commit d964fc54ed06cea45dfd10832ed3d34f3ddb661b Author: Matt Turner Date: Thu Feb 25 04:23:31 2010 +0000 drm/radeon: use ALIGN instead of open coding it Cc: Jerome Glisse Cc: Alex Deucher Signed-off-by: Matt Turner Reviewed-by: Corbin Simpson Signed-off-by: Dave Airlie commit 32b3c2abaf8c61c80a8b02071c73f05252122ffe Author: Jerome Glisse Date: Fri Feb 26 19:14:12 2010 +0000 drm/radeon/kms: initialize set_surface_reg reg for rs600 asic rs600 asic was missing set_surface_reg callback leading to oops. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit cf7934a2a0ec55759fcf6861a868baadfd522300 Merge: aa71fa3 6070a4a Author: Dave Airlie Date: Mon Mar 1 15:41:26 2010 +1000 Merge remote branch 'anholt/drm-intel-next' into drm-next-stage * anholt/drm-intel-next: (103 commits) drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list drm/i915: extract fence stealing code drm/i915: fixup active list locking in object_unbind drm/i915: reuse i915_gem_object_put_fence_reg for fence stealing code drm/i915: Add dependency on the intel agp module drm/i915: More s/IS_IRONLAKE/HAS_PCH_SPLIT for Sandybridge. drm/i915: Correct the Sandybridge chipset info structs. drm/i915: Disable the hangcheck reset on Sandybridge until we add support. drm/i915: Add a new mobile Sandybridge PCI ID. agp/intel: Add a new Sandybridge HB/IG PCI ID combo. drm/i915, agp/intel: Fix stolen memory size on Sandybridge drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON. drm/i915: Disable the surface tile swizzling on Sandybridge. agp/intel: Use a non-reserved value for the cache field of the PTEs. drm/i915: Fix sandybridge status page setup. ... commit aa71fa3cd5b7b4f669cd74c5a16de57d2938cd85 Merge: 79fa9eb 3bfc7d2 Author: Dave Airlie Date: Mon Mar 1 15:41:15 2010 +1000 Merge remote branch 'nouveau/for-airlied' into drm-next-stage * nouveau/for-airlied: (25 commits) drm/nouveau: use ALIGN instead of open coding it drm/nouveau: report unknown connector state if lid closed drm/nouveau: support version 0x20 displayport tables drm/nouveau: Fix noaccel/nofbaccel option descriptions. drm/nv50: Implement ctxprog/state generation. drm/nouveau: use dcb connector types throughout the driver drm/nv50: enable hpd on any connector we know the gpio line for drm/nouveau: use dcb connector table for creating drm connectors drm/nouveau: construct a connector table for cards that lack a real one drm/nouveau: check for known dcb connector types drm/nouveau: parse dcb gpio/connector tables after encoders drm/nouveau: reorganise bios header, add dcb connector type enums drm/nouveau: merge nvbios and nouveau_bios_info drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table drm/nouveau: allow retrieval of vbios image from debugfs drm/nouveau: fix missing spin_unlock in failure path drm/nouveau: fix i2ctable bounds checking drm/nouveau: fix nouveau_i2c_find bounds checking drm/nouveau: fix pramdac_table range checking ... Conflicts: drivers/gpu/drm/nouveau/nouveau_gem.c commit 79fa9eb7396238233c327668185d28bb47fb0796 Merge: 60b341b 290e5505 Author: Dave Airlie Date: Mon Mar 1 15:40:12 2010 +1000 Merge remote branch 'korg/drm-core-next' into drm-next-stage * korg/drm-core-next: drm/ttm: handle OOM in ttm_tt_swapout drm/radeon/kms/atom: fix shr/shl ops drm/kms: fix spelling of "CLOCK" drm/kms: fix fb_changed = true else statement drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi() drm: switch all GEM/KMS ioctls to unlocked ioctl status. Use drm_gem_object_[handle_]unreference_unlocked where possible drm: introduce drm_gem_object_[handle_]unreference_unlocked commit f1acb878b6070941e844dfc4ca1b3b9e5a70426c Author: Roel Kluin Date: Sat Feb 13 15:54:03 2010 +0100 iop-adma: redundant/wrong tests in iop_*_count()? When we reach the loop, len is at least 1, we only stay in the loop when len is at least MAX_BYTE_COUNT + 1, MAX_BYTE_COUNT is subtracted in each iteration. So when we leave the loop, or didn't take it, len is at least 1. Testing whether len is non-zero appears redundant. Signed-off-by: Roel Kluin Signed-off-by: Dan Williams commit 67b9124f734b22b30d9adf18c39fe795e2901070 Author: Dan Williams Date: Sun Feb 28 22:20:18 2010 -0700 dmatest: fix handling of an even number of xor_sources Just like commit ac5d73fc, we need to be careful to use 'src_cnt' as it contains the fixed up number of xor sources (forced odd) to meet dmatest's data verification scheme. Signed-off-by: Dan Williams commit 94de648d72c8bc833590523f22386d4babbea988 Author: Anatolij Gustschin Date: Mon Feb 15 22:35:23 2010 +0100 dmatest: correct raid6 PQ test The number of PQ sources specified by module parameter "pq_sources" is always forced odd to fit into dmatest's destination verificaton scheme. But number of PQ sources and coefficients as passed to the driver's prep_dma_pq() is not adjusted accordingly. Fix it now to get correct PQ testing results in the case passed "pq_sources" parameter is even. Signed-off-by: Anatolij Gustschin Signed-off-by: Andrew Morton Cc: Maciej Sosnowski Signed-off-by: Dan Williams commit 76bd061f5c7b7550cdaed68ad6219ea7cee288fc Author: Steven J. Magnani Date: Sun Feb 28 22:18:16 2010 -0700 fsldma: Fix cookie issues fsl_dma_update_completed_cookie() appears to calculate the last completed cookie incorrectly in the corner case where DMA on cookie 1 is in progress just following a cookie wrap. Signed-off-by: Steven J. Magnani Acked-by: Ira W. Snyder [dan.j.williams@intel.com: fix an integer overflow warning with INT_MAX] Signed-off-by: Dan Williams commit 301e99ce4a2f42a317129230fd42e6cd874c64b0 Author: Neil Brown Date: Sun Feb 28 22:01:05 2010 -0500 nfsd: ensure sockets are closed on error One the changes in commit d7979ae4a "svc: Move close processing to a single place" is: err_delete: - svc_delete_socket(svsk); + set_bit(SK_CLOSE, &svsk->sk_flags); return -EAGAIN; This is insufficient. The recvfrom methods must always call svc_xprt_received on completion so that the socket gets re-queued if there is any more work to do. This particular path did not make that call because it actually destroyed the svsk, making requeue pointless. When the svc_delete_socket was change to just set a bit, we should have added a call to svc_xprt_received, This is the problem that b0401d7253 attempted to fix, incorrectly. Signed-off-by: J. Bruce Fields commit 6ca3a7a96e91b1aa8c704153c992b191d35b5747 Author: Steven J. Magnani Date: Thu Feb 25 13:39:30 2010 -0600 fsldma: Fix cookie issues fsl_dma_tx_submit() only sets the cookie on the first descriptor of a transaction. It should set the cookie on all. Signed-off-by: Steven J. Magnani Acked-by: Ira W. Snyder Signed-off-by: Dan Williams commit 47871889c601d8199c51a4086f77eebd77c29b0b Merge: c16cc0b 30ff056 Author: David S. Miller Date: Sun Feb 28 19:23:06 2010 -0800 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: drivers/firmware/iscsi_ibft.c commit 4b62c0f1e76fe3327b695c49195af8b58e4da057 Author: Robert P. J. Day Date: Sat Feb 27 18:35:08 2010 +0000 sh: No need to explicitly include . Since already includes , and the latter file will warn about not having included the former file anyway, there is no value in including rwlock.h explicitly. Signed-off-by: Robert P. J. Day Signed-off-by: Paul Mundt commit 55c1b0d27b2d381a1986520b5953d3a454d344b5 Author: Andrea Gelmini Date: Sat Feb 27 16:51:36 2010 +0000 arch/sh/boot/compressed/cache.c: Checkpatch cleanup arch/sh/boot/compressed/cache.c:8: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini Signed-off-by: Paul Mundt commit 5499b45190237ca90dd2ac86395cf464fe1f4cc7 Author: Andrea Gelmini Date: Sat Feb 27 16:51:23 2010 +0000 arch/sh/lib/libgcc.h: Checkpatch cleanup arch/sh/lib/libgcc.h:21: ERROR: open brace '{' following union go on the same line Signed-off-by: Andrea Gelmini Signed-off-by: Paul Mundt commit 105244ec95590f5f12a90d974650ab5c7bc8ec79 Author: Paul Mundt Date: Mon Mar 1 11:52:03 2010 +0900 sh: hw-breakpoints: Accept breakpoints on NULL addresses. This follows the x86 change 84d710926797a6e317e7e94654a3ccd771cfd8a3 ("hw-breakpoints: Accept breakpoints on NULL address") and restores the previous expected ptrace behaviour. Signed-off-by: Paul Mundt commit c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 Author: Vladislav Zolotarov Date: Sun Feb 28 00:12:02 2010 +0000 bnx2x: Tx barriers and locks [Resending with the proper subject. Sorry for the mess. ] This patch is based on the RFC of Stanislaw Gruszka. More specifically it fixes two possible races: - One, described by Stanislaw, may lead to permanent disabling of the Tx queue. This is fixed by adding the smp_wmb() to propagate the BD consumer change towards the memory. - Second may lead to bnx2x_start_xmit() returning NETDEV_TX_BUSY. This is fixed by taking a tx_lock() before rechecking the number of available Tx BDs. thanks, vlad Signed-off-by: Stanislaw Gruszka Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 76dadd76c265a0cdb5a76aa4eef03fcc9639b388 Author: Eric W. Biederman Date: Sun Feb 28 01:20:36 2010 +0000 scm: Only support SCM_RIGHTS on unix domain sockets. We use scm_send and scm_recv on both unix domain and netlink sockets, but only unix domain sockets support everything required for file descriptor passing, so error if someone attempts to pass file descriptors over netlink sockets. Cc: stable@kernel.org Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit b4ccebdd37ff70d349321a198f416ba737a5e833 Merge: 30ff056 ef57471 Author: James Morris Date: Mon Mar 1 09:36:31 2010 +1100 Merge branch 'next' into for-linus commit 1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Author: J. Bruce Fields Date: Sun Feb 28 16:33:31 2010 -0500 Revert "sunrpc: move the close processing after do recvfrom method" This reverts commit b0401d725334a94d57335790b8ac2404144748ee, which moved svc_delete_xprt() outside of XPT_BUSY, and allowed it to be called after svc_xpt_recived(), removing its last reference and destroying it after it had already been queued for future processing. Signed-off-by: J. Bruce Fields commit f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Author: J. Bruce Fields Date: Sun Feb 28 16:32:51 2010 -0500 Revert "sunrpc: fix peername failed on closed listener" This reverts commit b292cf9ce70d221c3f04ff62db5ab13d9a249ca8. The commit that it attempted to patch up, b0401d725334a94d57335790b8ac2404144748ee, was fundamentally wrong, and will also be reverted. Signed-off-by: J. Bruce Fields commit 1e259e0a9982078896f3404240096cbea01daca4 Author: Frederic Weisbecker Date: Sun Feb 28 20:51:15 2010 +0100 hw-breakpoints: Remove stub unthrottle callback We support event unthrottling in breakpoint events. It means that if we have more than sysctl_perf_event_sample_rate/HZ, perf will throttle, ignoring subsequent events until the next tick. So if ptrace exceeds this max rate, it will omit events, which breaks the ptrace determinism that is supposed to report every triggered breakpoints. This is likely to happen if we set sysctl_perf_event_sample_rate to 1. This patch removes support for unthrottling in breakpoint events to break throttling and restore ptrace determinism. Signed-off-by: Frederic Weisbecker Cc: 2.6.33.x Cc: Peter Zijlstra Cc: K.Prasad Cc: Paul Mackerras commit 30ff056c42c665b9ea535d8515890857ae382540 Merge: 6f5621c 99659a9 Author: Linus Torvalds Date: Sun Feb 28 11:00:55 2010 -0800 Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, uv: Remove recursion in uv_heartbeat_enable() x86, uv: uv_global_gru_mmr_address() macro fix x86, uv: Add serial number parameter to uv_bios_get_sn_info() commit 6f5621cb160fada5bc52c2961ddc86e69e478912 Merge: c7e1589 6dbbe14 Author: Linus Torvalds Date: Sun Feb 28 10:59:44 2010 -0800 Merge branch 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set x86, ptrace: Simplify xstateregs_get() ptrace: Fix ptrace_regset() comments and diagnose errors specifically parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET x86, ptrace: regset extensions to support xstate commit c7e15899d07c9813c1aa96b21699d2d9c8314c4b Merge: f6a0b5c 78c0617 Author: Linus Torvalds Date: Sun Feb 28 10:59:18 2010 -0800 Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Enable NMI on all cpus on UV vgaarb: Add user selectability of the number of GPUS in a system vgaarb: Fix VGA arbiter to accept PCI domains other than 0 x86, uv: Update UV arch to target Legacy VGA I/O correctly. pci: Update pci_set_vga_state() to call arch functions commit 9a8c28c8311e30ba97499447d5a11662f5aea094 Author: Dmitry Monakhov Date: Sat Feb 27 20:35:13 2010 +0300 blktrace: perform cleanup after setup error Currently even if BLKTRACESETUP ioctl has failed user must call BLKTRACETEARDOWN to be shure what all staff was cleaned, which is contr-intuitive. Let's setup ioctl make necessery cleanup by it self. Signed-off-by: Dmitry Monakhov Signed-off-by: Jens Axboe commit 9f7cdbc33f36d28e57eaba0093f68f0d14c38c5b Author: Dmitry Monakhov Date: Sat Feb 27 20:35:12 2010 +0300 blkdev: fix merge_bvec_fn return value checks merge_bvec_fn() returns bvec->bv_len on success. So we have to check against this value. But in case of fs_optimization merge we compare with wrong value. This patch must be included in b428cd6da7e6559aca69aa2e3a526037d3f20403 But accidentally i've forgot to add this in the initial patch. To make things straight let's replace all such checks. In fact this makes code easy to understand. Signed-off-by: Dmitry Monakhov Signed-off-by: Jens Axboe commit 53c583d2269851de9df1c2e992cb2f7f124a5f55 Author: Corrado Zoccolo Date: Sun Feb 28 19:45:05 2010 +0100 cfq-iosched: requests "in flight" vs "in driver" clarification Counters for requests "in flight" and "in driver" are used asymmetrically in cfq_may_dispatch, and have slightly different meaning. We split the rq_in_flight counter (was sync_flight) to count both sync and async requests, in order to use this one, which is more accurate in some corner cases. The rq_in_driver counter is coalesced, since individual sync/async counts are not used any more. Signed-off-by: Corrado Zoccolo Signed-off-by: Jens Axboe commit ae1f30384baef4056438d81b305a6a5199b0d16c Author: Frederic Weisbecker Date: Sun Feb 28 19:42:38 2010 +0100 tracing: Include irqflags headers from trace clock trace_clock.c includes spinlock.h, which ends up including asm/system.h, which in turn includes linux/irqflags.h in x86. So the definition of raw_local_irq_save is luckily covered there, but this is not the case in parisc: tip/kernel/trace/trace_clock.c:86: error: implicit declaration of function 'raw_local_irq_save' tip/kernel/trace/trace_clock.c:112: error: implicit declaration of function 'raw_local_irq_restore' We need to include linux/irqflags.h directly from trace_clock.c to avoid such build error. Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Robert Richter Cc: Peter Zijlstra Signed-off-by: Ingo Molnar commit f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 Merge: d6cd471 8e92dc7 Author: Linus Torvalds Date: Sun Feb 28 10:43:53 2010 -0800 Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, setup: Don't skip mode setting for the standard VGA modes x86-64, setup: Inhibit decompressor output if video info is invalid x86, setup: When restoring the screen, update boot_params.screen_info commit 87c3a922a7ee8cfb9ab837f4ae38c993e9b30711 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:53 2010 -0600 cciss: Fix problem with scatter gather elements in the scsi half of the driver cciss: Fix problem with scatter gather elements in the scsi half of the driver When support for more than 31 scatter gather elements was added to the block half of the driver, the SCSI half of the driver was not addressed, and the bump from 31 to 32 scatter gather elements in the command block itself (not chained) actually broke the SCSI half of the driver, so that any transfer requiring 32 scatter gather elements wouldn't work. This fix also increases the max transfer size and size of the scatter gather table to the limit supported by the controller Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit bf8873781831c7799255e0932848401070185dd0 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:47 2010 -0600 cciss: eliminate unnecessary pointer use in cciss scsi code cciss: eliminate unnecessary pointer use in cciss scsi code An extra level of indirection was being used in some places for no real reason. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit aad9fb6f2c5beafe76a724c90a4bd0d695ab8b42 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:42 2010 -0600 cciss: do not use void pointer for scsi hba data cciss: do not use void pointer for scsi hba data and get rid of related unnecessary type casting and delete some superfluous and misleading comments nearby. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit d45033ef56fa9b09b73a6eb2a0f280fa7c1bab09 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:37 2010 -0600 cciss: factor out scatter gather chain block mapping code cciss: factor out scatter gather chain block mapping code Rationale is I want to use this code from the scsi half of the driver. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 2ad6cdc20fbeea1e1744190c00cebb64e4b4c491 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:32 2010 -0600 cciss: fix scatter gather chain block dma direction kludge cciss: fix scatter gather chain block dma direction kludge The data direction for the chained block of scatter gather elements should always be PCI_DMA_TODEVICE, but was mistakenly set to the direction of the data transfer, then a kludge to fix it was added, in which pci_dma_sync_single_for_device or pci_dma_sync_single_for_cpu was called. If the correct direction is used in the first place, the kludge isn't needed. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit dccc9b563e455b91f7247b1ca6b0face40323538 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:27 2010 -0600 cciss: simplify scatter gather code cciss: simplify scatter gather code. Instead of allocating an array of pointers to a structure containing an SGDescriptor structure, and two other elements that aren't really used, just allocate SGDescriptor structs. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 49fc5601ea3bf9625d699dc777f80f72e8126c0b Author: Stephen M. Cameron Date: Fri Feb 26 16:01:22 2010 -0600 cciss: factor out scatter gather chain block allocation and freeing cciss: factor out scatter gather chain block allocation and freeing Rationale is that I want to use this code from the scsi half of the driver. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 1b7d0d28ad82cbd5650c26ec8e370176b112e407 Author: Stephen M. Cameron Date: Fri Feb 26 16:01:17 2010 -0600 cciss: detect bad alignment of scsi commands at build time cciss: detect bad alignment of scsi commands at build time Incidentally fix some nearby c++ style comments. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 58daa9ce96b847ed130453f5fdd63c579fb1f84f Author: Stephen M. Cameron Date: Fri Feb 26 16:01:12 2010 -0600 cciss: clarify command list padding calculation cciss: clarify command list padding calculation Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit d6cd4715e21508bebbb1928c91d628bd65f5de5f Merge: 1eca9ac 0d1622d Author: Linus Torvalds Date: Sun Feb 28 10:41:35 2010 -0800 Merge branch 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64, rwsem: Avoid store forwarding hazard in __downgrade_write x86-64, rwsem: 64-bit xadd rwsem implementation x86: Fix breakage of UML from the changes in the rwsem system x86-64: support native xadd rwsem implementation x86: clean up rwsem type system commit 41647e7a91338dba21773a16af7474ef95e0929e Author: Corrado Zoccolo Date: Sat Feb 27 19:45:40 2010 +0100 cfq-iosched: rethink seeky detection for SSDs CFQ currently applies the same logic of detecting seeky queues and grouping them together for rotational disks as well as SSDs. For SSDs, the time to complete a request doesn't depend on the request location, but only on the size. This patch therefore changes the criterion to group queues by request size in case of SSDs, in order to achieve better fairness. Signed-off-by: Corrado Zoccolo Signed-off-by: Jens Axboe commit 3dde36ddea3e07dd025c4c1ba47edec91606fec0 Author: Corrado Zoccolo Date: Sat Feb 27 19:45:39 2010 +0100 cfq-iosched: rework seeky detection Current seeky detection is based on average seek lenght. This is suboptimal, since the average will not distinguish between: * a process doing medium sized seeks * a process doing some sequential requests interleaved with larger seeks and even a medium seek can take lot of time, if the requested sector happens to be behind the disk head in the rotation (50% probability). Therefore, we change the seeky queue detection to work as follows: * each request can be classified as sequential if it is very close to the current head position, i.e. it is likely in the disk cache (disks usually read more data than requested, and put it in cache for subsequent reads). Otherwise, the request is classified as seeky. * an history window of the last 32 requests is kept, storing the classification result. * A queue is marked as seeky if more than 1/8 of the last 32 requests were seeky. This patch fixes a regression reported by Yanmin, on mmap 64k random reads. Reported-by: Yanmin Zhang Signed-off-by: Corrado Zoccolo Signed-off-by: Jens Axboe commit 6fc2de06ef1e691d032aa572478c905b7495a274 Merge: 58c24a6 8a78362 Author: Jens Axboe Date: Sun Feb 28 19:41:12 2010 +0100 Merge branch 'for-2.6.34-next' into for-2.6.34 commit 1eca9acbf9cda6437db7de1097c7a18014b1289d Merge: 0091945 ca2107c Author: Linus Torvalds Date: Sun Feb 28 10:39:36 2010 -0800 Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, numa: Remove configurable node size support for numa emulation x86, numa: Add fixed node size option for numa emulation x86, numa: Fix numa emulation calculation of big nodes x86, acpi: Map hotadded cpu to correct node. commit 0091945b4732469bb39bbb4556ce08a25d89d1c2 Merge: 46bbffa 40d6753 Author: Linus Torvalds Date: Sun Feb 28 10:39:16 2010 -0800 Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Convert set_atomicity_lock to raw_spinlock x86, mtrr: Kill over the top warn x86, mtrr: Constify struct mtrr_ops commit 3119815912a220bdac943dfbdfee640414c0c611 Author: Michael S. Tsirkin Date: Thu Feb 25 19:08:55 2010 +0200 virtio: fix out of range array access I have observed the following error on virtio-net module unload: ------------[ cut here ]------------ WARNING: at kernel/irq/manage.c:858 __free_irq+0xa0/0x14c() Hardware name: Bochs Trying to free already-free IRQ 0 Modules linked in: virtio_net(-) virtio_blk virtio_pci virtio_ring virtio af_packet e1000 shpchp aacraid uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan] Pid: 1957, comm: rmmod Not tainted 2.6.33-rc8-vhost #24 Call Trace: [] warn_slowpath_common+0x7c/0x94 [] warn_slowpath_fmt+0x41/0x43 [] ? __free_pages+0x5a/0x70 [] __free_irq+0xa0/0x14c [] free_irq+0x3f/0x65 [] vp_del_vqs+0x81/0xb1 [virtio_pci] [] virtnet_remove+0xda/0x10b [virtio_net] [] virtio_dev_remove+0x22/0x4a [virtio] [] __device_release_driver+0x66/0xac [] driver_detach+0x83/0xa9 [] bus_remove_driver+0x91/0xb4 [] driver_unregister+0x6c/0x74 [] unregister_virtio_driver+0xe/0x10 [virtio] [] fini+0x15/0x17 [virtio_net] [] sys_delete_module+0x1c3/0x230 [] ? old_ich_force_enable_hpet+0x117/0x164 [] ? do_page_fault+0x29c/0x2cc [] sysenter_dispatch+0x7/0x27 ---[ end trace 15e88e4c576cc62b ]--- The bug is in virtio-pci: we use msix_vector as array index to get irq entry, but some vqs do not have a dedicated vector so this causes an out of bounds access. By chance, we seem to often get 0 value, which results in this error. Fix by verifying that vector is legal before using it as index. Signed-off-by: Michael S. Tsirkin Acked-by: Anthony Liguori Acked-by: Shirley Ma Acked-by: Amit Shah commit 46bbffad54bd48bb809f2691c1970a79a588976b Merge: 85fe20b c1fd1b4 Author: Linus Torvalds Date: Sun Feb 28 10:38:45 2010 -0800 Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mm: Unify kernel_physical_mapping_init() API x86, mm: Allow highmem user page tables to be disabled at boot time x86: Do not reserve brk for DMI if it's not going to be used x86: Convert tlbstate_lock to raw_spinlock x86: Use the generic page_is_ram() x86: Remove BIOS data range from e820 Move page_is_ram() declaration to mm.h Generic page_is_ram: use __weak resources: introduce generic page_is_ram() commit 85fe20bfd415af0a2e93bd1166533d4a6eb591ea Merge: 58f02db 1c5b906 Author: Linus Torvalds Date: Sun Feb 28 10:37:40 2010 -0800 Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Merge io.h x86: Simplify flush_write_buffers() x86: Clean up mem*io functions. x86-64: Use BUILDIO in io_64.h x86-64: Reorganize io_64.h x86-32: Remove _local variants of in/out from io_32.h x86-32: Move XQUAD definitions to numaq.h commit 58f02db466900003b801bdfdeddc4d96ce42b7d5 Merge: 43a834d cb19060 Author: Linus Torvalds Date: Sun Feb 28 10:37:06 2010 -0800 Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, cacheinfo: Enable L3 CID only on AMD x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1 x86, cpu: Print AMD virtualization features in /proc/cpuinfo x86, cacheinfo: Calculate L3 indices x86, cacheinfo: Add cache index disable sysfs attrs only to L3 caches x86, cacheinfo: Fix disabling of L3 cache indices intel-agp: Switch to wbinvd_on_all_cpus x86, lib: Add wbinvd smp helpers commit 43a834d86c136b31ef6ad796725eb474a55a908d Merge: a7f16d1 3235dc3 Author: Linus Torvalds Date: Sun Feb 28 10:36:48 2010 -0800 Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Remove trailing spaces in messages x86, mtrr: Remove unused mtrr/state.c x86, trivial: Fix grammo in tsc comment about Geode TSC reliability commit b1a96e3606b6efc3a6e9c8559ec6660e515b01a7 Merge: 060cbce bc9d24a Author: Corentin Chary Date: Sun Feb 28 19:36:06 2010 +0100 Merge branch 'eeepc-laptop' into acpi4asus commit 060cbce6c4431465e83907102e1903ecea366db5 Author: Corentin Chary Date: Thu Jan 28 10:52:40 2010 +0100 asus-laptop: fix style problems reported by checkpath.pl Signed-off-by: Corentin Chary commit 2a1fd64cb70a42563d2313eb70c6495d2c88b36d Author: Corentin Chary Date: Tue Jan 26 21:02:23 2010 +0100 asus-laptop: use device_create_file() instead of platform_group There is two reason to do that: - we don't want a "gps" file if the model doesn't have a gps - we don't want to use global variables anymore Signed-off-by: Corentin Chary commit aee0afb8cb52178164accfec9cfc58bc27b597b3 Author: Corentin Chary Date: Tue Jan 26 21:01:34 2010 +0100 asus-laptop: clean led code Remove all "templates" and add a generic struct asus_led instead. Signed-off-by: Corentin Chary commit 18e1311ee71a67497a33521be61ddf6562fa22c0 Author: Corentin Chary Date: Mon Jan 25 23:29:24 2010 +0100 asus-laptop: add gps rfkill The rfkill subsystem will enable gps by default. Signed-off-by: Corentin Chary commit 47ee0e99524a7ee0185e3c38423cc17cc1318ddc Author: Corentin Chary Date: Sun Jan 24 11:17:15 2010 +0100 asus-laptop: set initial lcd state There is no way to find the initial lcd state. A quick workaround is to set it "on" by default. Anyway this feature is scheduled for removal. Signed-off-by: Corentin Chary commit 75747129a994463e36c2516e8071771427d8494b Author: Corentin Chary Date: Sun Jan 24 11:15:42 2010 +0100 asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init() These bug where introduced in "asus-laptop: code movement". Signed-off-by: Corentin Chary commit a539df5e1548751e352990c518e88af50e6111b8 Author: Corentin Chary Date: Mon Jan 25 22:53:21 2010 +0100 asus-laptop: add backlight changes notifications We don't want to send KEY_BRIGHTNESSDOWN or KEY_BRIGHTNESSUP because it would be a lie to tell userspace that we want to change the brightness while it's actually done by the firmware. Signed-off-by: Corentin Chary commit 7f607d71065b6b089f59b78b54144c3fb93ad629 Author: Corentin Chary Date: Sun Jan 17 17:37:19 2010 +0100 asus-laptop: add bluetooth keys found on M9V Reported by Andrey F. Ilchuk Signed-off-by: Corentin Chary commit 66a71dd1f7c4eee636867d381995b7e6ae489dc3 Author: Corentin Chary Date: Mon Jan 25 22:50:11 2010 +0100 asus-laptop: switch to sparse keymap library This patch is based on Dmitry Torokhov's patch with some modifications and cleanups. Signed-off-by: Corentin Chary commit d0930a2d42c5a28039d8cc2376a7dff4e59c5f7a Author: Corentin Chary Date: Sun Jan 17 17:21:13 2010 +0100 asus-laptop: rename wireless_status to wlan_status to avoid confusion Signed-off-by: Corentin Chary commit e5593bf18be79b4897c7ec8b392dc7f07cbc1b11 Author: Corentin Chary Date: Sun Jan 17 17:20:11 2010 +0100 asus-laptop: add error check for write_acpi_int calls Also add to helpers for bluetooth and wlan. Signed-off-by: Corentin Chary commit d99b577c729c4a29679fb1f605f9ccace154e0e5 Author: Corentin Chary Date: Fri Jan 22 21:20:57 2010 +0100 asus-laptop: stop using ASUS_HANDLE and use relative methods instead Stop using ASUS_HANDLE because most of the time it is not needed. This macro was introduced to display_get and lcd_switch which are not part of the interface provided by Asus, and are scheduled for removal. Signed-off-by: Corentin Chary commit 4d4415138060870670a18d0768fe1d597f505f98 Author: Corentin Chary Date: Wed Jan 13 22:26:24 2010 +0100 asus-laptop: rename function talking directly to acpi with asus_xxx scheme Signed-off-by: Corentin Chary commit 17e78f6260fbc8f55c279cca081c26c88d96ec00 Author: Corentin Chary Date: Wed Jan 13 22:21:33 2010 +0100 asus-laptop: removing read_status/store_status/write_status and asus->status Signed-off-by: Corentin Chary commit 3e68ae7c2a9076a694e46f49ec26323a7757eaad Author: Corentin Chary Date: Wed Jan 13 22:10:39 2010 +0100 asus-laptop: stop using read_status for lcd (anyway lcd code is scheduled for removal) Signed-off-by: Corentin Chary commit 6358bf2c4c309efc7c3cbc36466c32108c12c456 Author: Corentin Chary Date: Wed Jan 13 21:55:44 2010 +0100 asus-laptop: stop using read_status and store_status for GPS Signed-off-by: Corentin Chary commit aa9df930d6eabbd8f2439eca6b2f77f81ce425f2 Author: Corentin Chary Date: Wed Jan 13 21:49:10 2010 +0100 asus-laptop: stop using read_status for bluetooth and wlan Signed-off-by: Corentin Chary commit be4ee82d3e44c5940a7f77cae5ed3e942e80a723 Author: Corentin Chary Date: Sun Dec 6 16:27:09 2009 +0100 asus-laptop: code movement The asus-laptop driver implements a number of interfaces like the backlight class driver. This change makes it easier to examine the implementation of one interface at at a time, without having to search through the file to find init() and exit() functions etc. Signed-off-by: Corentin Chary commit 9129d14d297e78bc21caffa44d55a5920a74862c Author: Corentin Chary Date: Tue Dec 1 22:39:41 2009 +0100 asus-laptop: callbacks should use "driver data" parameter or field (Changelog stolen from Alan's patch for eeepc-laptop, but this patch does the same thing for asus-laptop) Callback methods should not refer to a variable like "asus" (formally "hotk"). Instead, they should extract the data they need either from a "driver data" parameter, or the "driver data" field of the object which they operate on. The "asus" variable can then be removed. In practice, drivers under "drivers/platform" can get away without using driver data, because it doesn't make sense to have more than one instance of them. However this makes it harder to review them for correctness. This is especially true for core ACPI developers who have not previously been exposed to this anti-pattern :-). This will serve as an example of best practice for new driver writers (whether they find it themselves, or have it pointed out during review :-). Signed-off-by: Corentin Chary commit 7c247645f305da2bb309fa439fd6cc0aa26f8722 Author: Corentin Chary Date: Mon Nov 30 22:13:54 2009 +0100 asus-laptop: move backlight and dsdt info inside asus_laptop struct Prepare the use of "driver data" for callbacks. Signed-off-by: Corentin Chary commit 50a90c4d953fe4bb5a87ee5207c4243d25278189 Author: Corentin Chary Date: Mon Nov 30 21:55:12 2009 +0100 asus-laptop: revise names asus-laptop now does a lot more than just hotkeys. Replace the "hotk" names used throughout the driver with some slightly more appropriate names. The actual strings used in kernel messages and sysfs are left unchanged. Signed-off-by: Corentin Chary commit 600ad5201d3b9b87159ede7359adccb98635fd48 Author: Corentin Chary Date: Mon Nov 30 21:42:42 2009 +0100 asus-laptop: change initialization order Clean asus-laptop initialization to match new eeepc-laptop code. Signed-off-by: Corentin Chary commit a7f16d10b510f9ee3500af7831f2e3094fab3dca Merge: f66ffde 17c0e71 Author: Linus Torvalds Date: Sun Feb 28 10:35:09 2010 -0800 Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Mark atomic irq ops raw for 32bit legacy x86: Merge show_regs() x86: Macroise x86 cache descriptors x86-32: clean up rwsem inline asm statements x86: Merge asm/atomic_{32,64}.h x86: Sync asm/atomic_32.h and asm/atomic_64.h x86: Split atomic64_t functions into seperate headers x86-64: Modify memcpy()/memset() alternatives mechanism x86-64: Modify copy_user_generic() alternatives mechanism x86: Lift restriction on the location of FIX_BTMAP_* x86, core: Optimize hweight32() commit 619d8b1187f2e13f6f848b1b2a4d83c2c9e2a140 Author: Corentin Chary Date: Sat Nov 28 10:35:37 2009 +0100 asus-laptop: remove unecessary hotk != NULL check Signed-off-by: Corentin Chary commit 91687cc89af4c447483ec65097809c38c8622639 Author: Corentin Chary Date: Sat Nov 28 10:32:34 2009 +0100 asus-laptop: use tabs to indent macros and remove unused ones Signed-off-by: Corentin Chary commit d8c6732382a24d2ef23665207263a17f04e3d75a Author: Corentin Chary Date: Sat Nov 28 10:27:51 2009 +0100 asus-laptop: simplify write_acpi_int We only need a buffer for "INIT". Adds write_acpi_init_ret for it. Signed-off-by: Corentin Chary commit e5b50f6a2b00de266f03c2c7219b798648124ea5 Author: Corentin Chary Date: Sat Nov 28 10:19:55 2009 +0100 asus-laptop: no need to check argument of set_brightness() We already tell the backlight class our maximum brightness value; it will validate the user requested values for us. Signed-off-by: Corentin Chary commit c45eecf8719e0b2090c8a71bdc31e39d00746c84 Author: Corentin Chary Date: Sun Jan 10 20:56:23 2010 +0100 asus-laptop: set the right paths in the documentation Signed-off-by: Corentin Chary commit 0e875f4905817c03ba49447b49af093552e66e95 Author: Corentin Chary Date: Sun Jan 10 20:49:26 2010 +0100 asus-laptop: add wireless and bluetooth status parameter These to parameter allow to set the status of wlan and bluetooth device when the module load. On some models, the device will always be down on boot, so the default behavior is to always enable these devices. Signed-off-by: Corentin Chary commit f66ffdedbf0fc059a92219bb08c1dbcac88f074b Merge: 2531216 dd5feea Author: Linus Torvalds Date: Sun Feb 28 10:31:01 2010 -0800 Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) sched: Fix SCHED_MC regression caused by change in sched cpu_power sched: Don't use possibly stale sched_class kthread, sched: Remove reference to kthread_create_on_cpu sched: cpuacct: Use bigger percpu counter batch values for stats counters percpu_counter: Make __percpu_counter_add an inline function on UP sched: Remove member rt_se from struct rt_rq sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu] sched: Remove unused update_shares_locked() sched: Use for_each_bit sched: Queue a deboosted task to the head of the RT prio queue sched: Implement head queueing for sched_rt sched: Extend enqueue_task to allow head queueing sched: Remove USER_SCHED sched: Fix the place where group powers are updated sched: Assume *balance is valid sched: Remove load_balance_newidle() sched: Unify load_balance{,_newidle}() sched: Add a lock break for PREEMPT=y sched: Remove from fwd decls sched: Remove rq_iterator from move_one_task ... Fix up trivial conflicts in kernel/sched.c commit bc9d24a3aeb1532fc3e234907a8b6d671f7ed68f Author: Alan Jenkins Date: Mon Feb 22 16:03:58 2010 +0000 eeepc-laptop: check wireless hotplug events Before we mark the wireless device as unplugged, check PCI config space to see whether the wireless device is really disabled (and vice versa). This works around newer models which don't want the hotplug code, where we end up disabling the wired network device. My old 701 still works correctly with this. I can also simulate an afflicted model by changing the hardcoded PCI bus/slot number in the driver, and it seems to work nicely (although it is a bit noisy). In future this type of hotplug support will be implemented by the PCI core. The existing blacklist and the new warning message will be removed at that point. Signed-off-by: Alan Jenkins Signed-off-by: Corentin Chary commit ced69c59811f05b2f8378467cbb82ac6ed3c6a5a Author: Alan Jenkins Date: Sat Feb 20 11:02:24 2010 +0000 eeepc-laptop: disable wireless hotplug for 1005PE The wireless hotplug code is not needed on this model, and it disables the wired ethernet card. (Like on the 1005HA and 1201N). References: Signed-off-by: Alan Jenkins Reported-by: Ansgar Burchardt CC: stable@kernel.org commit 409a415fa18f3bdb9bef616ac6abafd30a4f1415 Author: Corentin Chary Date: Sun Jan 10 20:57:15 2010 +0100 eeepc-laptop: set the right paths in the documentation Signed-off-by: Corentin Chary commit 2531216f236cb2a1f39ffa12a4a9339541e52191 Merge: 6556a67 0970d29 Author: Linus Torvalds Date: Sun Feb 28 10:23:41 2010 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix race between ttwu() and task_rq_lock() sched: Fix SMT scheduler regression in find_busiest_queue() sched: Fix sched_mv_power_savings for !SMT kernel/sched.c: Suppress unused var warning commit 6556a6743549defc32e5f90ee2cb1ecd833a44c3 Merge: e0d2724 1dd2980 Author: Linus Torvalds Date: Sun Feb 28 10:20:25 2010 -0800 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits) perf_event, amd: Fix spinlock initialization perf_event: Fix preempt warning in perf_clock() perf tools: Flush maps on COMM events perf_events, x86: Split PMU definitions into separate files perf annotate: Handle samples not at objdump output addr boundaries perf_events, x86: Remove superflous MSR writes perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in() perf_events, x86: AMD event scheduling perf_events: Add new start/stop PMU callbacks perf_events: Report the MMAP pgoff value in bytes perf annotate: Defer allocating sym_priv->hist array perf symbols: Improve debugging information about symtab origins perf top: Use a macro instead of a constant variable perf symbols: Check the right return variable perf/scripts: Tag syscall_name helper as not yet available perf/scripts: Add perf-trace-python Documentation perf/scripts: Remove unnecessary PyTuple resizes perf/scripts: Add syscall tracing scripts perf/scripts: Add Python scripting engine perf/scripts: Remove check-perf-trace from listed scripts ... Fix trivial conflict in tools/perf/util/probe-event.c commit e0d272429a34ff143bfa04ee8e29dd4eed2964c7 Merge: d25e8db 4809174 Author: Linus Torvalds Date: Sun Feb 28 10:17:55 2010 -0800 Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits) ftrace: Add function names to dangling } in function graph tracer tracing: Simplify memory recycle of trace_define_field tracing: Remove unnecessary variable in print_graph_return tracing: Fix typo of info text in trace_kprobe.c tracing: Fix typo in prof_sysexit_enable() tracing: Remove CONFIG_TRACE_POWER from kernel config tracing: Fix ftrace_event_call alignment for use with gcc 4.5 ftrace: Remove memory barriers from NMI code when not needed tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API s390: Add pt_regs register and stack access API tracing/kprobes: Make Kconfig dependencies generic tracing: Unify arch_syscall_addr() implementations tracing: Add notrace to TRACE_EVENT implementation functions ftrace: Allow to remove a single function from function graph filter tracing: Add correct/incorrect to sort keys for branch annotation output tracing: Simplify test for function_graph tracing start point tracing: Drop the tr check from the graph tracing path tracing: Add stack dump to trace_printk if stacktrace option is set tracing: Use appropriate perl constructs in recordmcount.pl tracing: optimize recordmcount.pl for offsets-handling ... commit d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c Merge: 642c4c7 cfc9c0b Author: Linus Torvalds Date: Sun Feb 28 10:15:31 2010 -0800 Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: oprofile/x86: fix msr access to reserved counters oprofile/x86: use kzalloc() instead of kmalloc() oprofile/x86: fix perfctr nmi reservation for mulitplexing oprofile/x86: add comment to counter-in-use warning oprofile/x86: warn user if a counter is already active oprofile/x86: implement randomization for IBS periodic op counter oprofile/x86: implement lsfr pseudo-random number generator for IBS oprofile/x86: implement IBS cpuid feature detection oprofile/x86: remove node check in AMD IBS initialization oprofile/x86: remove OPROFILE_IBS config option oprofile: remove EXPERIMENTAL from the config option description oprofile: remove tracing build dependency commit 642c4c75a765d7a3244ab39c8e6fb09be21eca5b Merge: f91b22c 71da813 Author: Linus Torvalds Date: Sun Feb 28 10:13:16 2010 -0800 Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits) rcu: Fix accelerated GPs for last non-dynticked CPU rcu: Make non-RCU_PROVE_LOCKING rcu_read_lock_sched_held() understand boot rcu: Fix accelerated grace periods for last non-dynticked CPU rcu: Export rcu_scheduler_active rcu: Make rcu_read_lock_sched_held() take boot time into account rcu: Make lockdep_rcu_dereference() message less alarmist sched, cgroups: Fix module export rcu: Add RCU_CPU_STALL_VERBOSE to dump detailed per-task information rcu: Fix rcutorture mod_timer argument to delay one jiffy rcu: Fix deadlock in TREE_PREEMPT_RCU CPU stall detection rcu: Convert to raw_spinlocks rcu: Stop overflowing signed integers rcu: Use canonical URL for Mathieu's dissertation rcu: Accelerate grace period if last non-dynticked CPU rcu: Fix citation of Mathieu's dissertation rcu: Documentation update for CONFIG_PROVE_RCU security: Apply lockdep-based checking to rcu_dereference() uses idr: Apply lockdep-based diagnostics to rcu_dereference() uses radix-tree: Disable RCU lockdep checking in radix tree vfs: Abstract rcu_dereference_check for files-fdtable use ... commit f91b22c35f6b0ae06ec5b67922eca1999c3b6e0a Merge: 847f9c6 e03bcb6 9ca94d7 8b833c5 f266d7f 016ddd9 477346f 2854e72 Author: Linus Torvalds Date: Sun Feb 28 10:04:02 2010 -0800 Merge branches 'core-ipi-for-linus', 'core-locking-for-linus', 'tracing-fixes-for-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: plist: Fix grammar mistake, and c-style mistake * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kprobes: Add mcount to the kprobes blacklist * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86_64: Print modules like i386 does * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Put 'nopat' in kernel-parameters * 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64: Allow fbdev primary video code * 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use helpers for rlimits commit 39286fa41a8b2c6a9c1f656a7b3c3efca95bc1b9 Author: Sridhar Samudrala Date: Sun Feb 28 19:39:16 2010 +0200 vhost-net: restart tx poll on sk_sndbuf full guest to remote communication with vhost net sometimes stops until guest driver is restarted. This happens when we get guest kick precisely when the backend send queue is full, as a result handle_tx() returns without polling backend. This patch fixes this by restarting tx poll on this condition. Signed-off-by: Sridhar Samudrala Signed-off-by: Michael S. Tsirkin Tested-by: Tom Lendacky commit d6db3f5c11dc7ed5712d5d5682aa34025ee5248e Author: Michael S. Tsirkin Date: Tue Feb 23 11:25:23 2010 +0200 vhost: fix get_user_pages_fast error handling get_user_pages_fast returns number of pages on success, negative value on failure, but never 0. Fix vhost code to match this logic. Reviewed-by: Juan Quintela Signed-off-by: Michael S. Tsirkin commit 73a99f083009d67d8e12603420e008d5c21b0b7d Author: Michael S. Tsirkin Date: Tue Feb 23 11:23:45 2010 +0200 vhost: initialize log eventfd context pointer vq log eventfd context pointer needs to be initialized, otherwise operation may fail or oops if log is enabled but log eventfd not set by userspace. When log_ctx for device is created, it is copied to the vq. This reset was missing. Reviewed-by: Juan Quintela Signed-off-by: Michael S. Tsirkin commit 86e9424d7252bae5ad1c17b4b8088193e6b27cbe Author: Michael S. Tsirkin Date: Wed Feb 17 19:11:33 2010 +0200 vhost: logging thinko fix vhost was dong some complex math to get offset to log at, and got it wrong by a couple of bytes, while in fact it's simple: get address where we write, subtract start of buffer, add log base. Do it this way. Reviewed-by: Juan Quintela Signed-off-by: Michael S. Tsirkin commit 50a76fd3c352ed2740eba01512efcfceee0703be Author: Boaz Harrosh Date: Thu Feb 11 13:01:39 2010 +0200 exofs: groups support * _calc_stripe_info() changes to accommodate for grouping calculations. Returns additional information * old _prepare_pages() becomes _prepare_one_group() which stores pages belonging to one device group. * New _prepare_for_striping iterates on all groups calling _prepare_one_group(). * Enable mounting of groups data_maps (group_width != 0) [QUESTION] what is faster A or B; A. x += stride; x = x % width + first_x; B x += stride if (x < last_x) x = first_x; Signed-off-by: Boaz Harrosh commit b367e78bd1c7af4c018ce98b1f6d3e001aba895a Author: Boaz Harrosh Date: Sun Feb 7 19:18:58 2010 +0200 exofs: Prepare for groups * Rename _offset_dev_unit_off() to _calc_stripe_info() and recieve a struct for the output params * In _prepare_for_striping we only need to call _calc_stripe_info() once. The other componets are easy to calculate from that. This code was inspired by what's done in truncate. * Some code shifts that make sense now but will make more sense when group support is added. Signed-off-by: Boaz Harrosh commit 96391e2bae0f8882b6f44809202a68be66e91dce Author: Boaz Harrosh Date: Tue Feb 9 11:43:21 2010 +0200 exofs: Error recovery if object is missing from storage If an object is referenced by a directory but does not exist on a target, it is a very serious corruption that means: 1. Either a power failure with very slim chance of it happening. Because the directory update is always submitted much after object creation, but if a directory is written to one device and the object creation to another it might theoretically happen. 2. It only ever happened to me while developing with BUGs causing file corruption. Crashes could also cause it but they are more like case 1. In any way the object does not exist, so data is surely lost. If there is a mix-up in the obj-id or data-map, then lost objects can be salvaged by off-line fsck. The only recoverable information is the directory name. By letting it appear as a regular empty file, with date==0 (1970 Jan 1st) ownership to root, we enable recovery of the only useful information. And also enable deletion or over-write. I can see how this can hurt. Signed-off-by: Boaz Harrosh commit 86093aaff5be5b214613eb60553e236bdb389c84 Author: Boaz Harrosh Date: Thu Jan 28 18:24:06 2010 +0200 exofs: convert io_state to use pages array instead of bio at input * inode.c operations are full-pages based, and not actually true scatter-gather * Lets us use more pages at once upto 512 (from 249) in 64 bit * Brings us much much closer to be able to use exofs's io_state engine from objlayout driver. (Once I decide where to put the common code) After RAID0 patch the outer (input) bio was never used as a bio, but was simply a page carrier into the raid engine. Even in the simple mirror/single-dev arrangement pages info was copied into a second bio. It is now easer to just pass a pages array into the io_state and prepare bio(s) once. Signed-off-by: Boaz Harrosh commit 5d952b8391692553c31e620a92d6e09262a9a307 Author: Boaz Harrosh Date: Mon Feb 1 13:35:51 2010 +0200 exofs: RAID0 support We now support striping over mirror devices. Including variable sized stripe_unit. Some limits: * stripe_unit must be a multiple of PAGE_SIZE * stripe_unit * stripe_count is maximum upto 32-bit (4Gb) Tested RAID0 over mirrors, RAID0 only, mirrors only. All check. Design notes: * I'm not using a vectored raid-engine mechanism yet. Following the pnfs-objects-layout data-map structure, "Mirror" is just a private case of "group_width" == 1, and RAID0 is a private case of "Mirrors" == 1. The performance lose of the general case over the particular special case optimization is totally negligible, also considering the extra code size. * In general I added a prepare_stripes() stage that divides the to-be-io pages to the participating devices, the previous exofs_ios_write/read, now becomes _write/read_mirrors and a new write/read upper layer loops on all devices calling _write/read_mirrors. Effectively the prepare_stripes stage is the all secret. Also truncate need fixing to accommodate for striping. * In a RAID0 arrangement, in a regular usage scenario, if all inode layouts will start at the same device, the small files fill up the first device and the later devices stay empty, the farther the device the emptier it is. To fix that, each inode will start at a different stripe_unit, according to it's obj_id modulus number-of-stripe-units. And will then span all stripe-units in the same incrementing order wrapping back to the beginning of the device table. We call it a stripe-units moving window. Special consideration was taken to keep all devices in a mirror arrangement identical. So a broken osd-device could just be cloned from one of the mirrors and no FS scrubbing is needed. (We do that by rotating stripe-unit at a time and not a single device at a time.) TODO: We no longer verify object_length == inode->i_size in exofs_iget. (since i_size is stripped on multiple objects now). I should introduce a multiple-device attribute reading, and use it in exofs_iget. Signed-off-by: Boaz Harrosh commit d9c740d2253e75db8cef8f87a3125c450f3ebd82 Author: Boaz Harrosh Date: Thu Jan 28 11:58:08 2010 +0200 exofs: Define on-disk per-inode optional layout attribute * Layouts describe the way a file is spread on multiple devices. The layout information is stored in the objects attribute introduced in this patch. * There can be multiple generating function for the layout. Currently defined: - No attribute present - use below moving-window on global device table, all devices. (This is the only one currently used in exofs) - an obj_id generated moving window - the obj_id is a randomizing factor in the otherwise global map layout. - An explicit layout stored, including a data_map and a device index list. - More might be defined in future ... * There are two attributes defined of the same structure: A-data-files-layout - This layout is used by data-files. If present at a directory, all files of that directory will be created with this layout. A-meta-data-layout - This layout is used by a directory and other meta-data information. Also inherited at creation of subdirectories. * At creation time inodes are created with the layout specified above. A usermode utility may change the creation layout on a give directory or file. Which in the case of directories, will also apply to newly created files/subdirectories, children of that directory. In the simple unaltered case of a newly created exofs, no layout attributes are present, and all layouts adhere to the layout specified at the device-table. * In case of a future file system loaded in an old exofs-driver. At iget(), the generating_function is inspected and if not supported will return an IO error to the application and the inode will not be loaded. So not to damage any data. Note: After this patch we do not yet support any type of layout only the RAID0 patch that enables striping at the super-block level will add support for RAID0 layouts above. This way we are past and future compatible and fully bisectable. * Access to the device table is done by an accessor since it will change according to above information. Signed-off-by: Boaz Harrosh commit 46f4d973f6874c06b7a41a3bf8f4c1717d90f97a Author: Boaz Harrosh Date: Mon Feb 1 11:37:30 2010 +0200 exofs: unindent exofs_sbi_read The original idea was that a mirror read can be sub-divided to multiple devices. But this has very little gain and only at very large IOes so it's not going to be implemented soon. Signed-off-by: Boaz Harrosh commit 45d3abcb1a7388b2b97582e13bf9dd21784dcaa5 Author: Boaz Harrosh Date: Thu Jan 28 11:46:16 2010 +0200 exofs: Move layout related members to a layout structure * Abstract away those members in exofs_sb_info that are related/needed by a layout into a new exofs_layout structure. Embed it in exofs_sb_info. * At exofs_io_state receive/keep a pointer to an exofs_layout. No need for an exofs_sb_info pointer, all we need is at exofs_layout. * Change any usage of above exofs_sb_info members to their new name. Signed-off-by: Boaz Harrosh commit 22ddc556380cf5645c52292b6d980766646eb864 Author: Boaz Harrosh Date: Tue Jan 19 19:24:45 2010 +0200 exofs: Recover in the case of read-passed-end-of-file In check_io, implement the case of reading passed end of file, by clearing the pages and recover with no error. In a raid arrangement this can become a legitimate situation in case of holes in the file. Signed-off-by: Boaz Harrosh commit 518f167a37b3c53f3cf44d27800455ca24e920f6 Author: Boaz Harrosh Date: Thu Jan 21 20:00:02 2010 +0200 exofs: Micro-optimize exofs_i_info optimize the exofs_i_info struct usage by moving the embedded vfs_inode to be first. A compiler might optimize away an "add" operation with constant zero. (Which it cannot with other constants) Signed-off-by: Boaz Harrosh commit 34ce4e7c23e3da578e459b05c6fb17edecb19e6b Author: Boaz Harrosh Date: Tue Dec 15 19:34:17 2009 +0200 exofs: debug print even less * Last debug trimming left in some stupid print, remove them. Fixup some other prints * Shift printing from inode.c to ios.c * Add couple of prints when memory allocation fails. Signed-off-by: Boaz Harrosh commit c7ec2b585525477f393942ecb18fff1f5e259118 Author: Akinobu Mita Date: Sun Feb 28 03:31:29 2010 -0800 sparc: use __ratelimit Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Signed-off-by: David S. Miller commit 655ffee284dfcf9a24ac0343f3e5ee6db85b85c5 Author: Jiri Pirko Date: Sat Feb 27 07:35:45 2010 +0000 wireless: convert to use netdev_for_each_mc_addr also added missed locking in rndis_wlan.c Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 9675478bbafed08848bf8d7e28400d5e46330b23 Author: Jeff Garzik Date: Fri Feb 26 21:43:38 2010 +0000 ethtool: do not set some flags, if others failed NETIF_F_NTUPLE flag setting introduced a bug: non-ntuple flags like LRO may be successfully set, before ioctl(2) returns failure to userspace. The set-flags operation should be all-or-none, rather than leaving things in an inconsistent state prior to reporting failure to userspace. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 6c74651c3bce418d3b29edfdeb72664f9441509a Author: Jiri Pirko Date: Sat Feb 27 12:07:33 2010 +0000 ipoib: returned back addrlen check for mc addresses Apparently bogus mc address can break IPOIB multicast processing. Therefore returning the check for addrlen back until this is resolved in bonding (I don't see any other point from where mc address with non-dev->addr_len length can came from). Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit fad539956c9e69749a03f7817d22d1bab87657bf Author: Eric W. Biederman Date: Sun Feb 28 01:06:34 2010 -0800 x86: Fix out of order of gsi Iranna D Ankad reported that IBM x3950 systems have boot problems after this commit: | | commit b9c61b70075c87a8612624736faf4a2de5b1ed30 | | x86/pci: update pirq_enable_irq() to setup io apic routing | The problem is that with the patch, the machine freezes when console=ttyS0,... kernel serial parameter is passed. It seem to freeze at DVD initialization and the whole problem seem to be DVD/pata related, but somehow exposed through the serial parameter. Such apic problems can expose really weird behavior: ACPI: IOAPIC (id[0x10] address[0xfecff000] gsi_base[0]) IOAPIC[0]: apic_id 16, version 0, address 0xfecff000, GSI 0-2 ACPI: IOAPIC (id[0x0f] address[0xfec00000] gsi_base[3]) IOAPIC[1]: apic_id 15, version 0, address 0xfec00000, GSI 3-38 ACPI: IOAPIC (id[0x0e] address[0xfec01000] gsi_base[39]) IOAPIC[2]: apic_id 14, version 0, address 0xfec01000, GSI 39-74 ACPI: INT_SRC_OVR (bus 0 bus_irq 1 global_irq 4 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 5 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 3 global_irq 6 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 4 global_irq 7 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 6 global_irq 9 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 7 global_irq 10 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 8 global_irq 11 low edge) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 12 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 12 global_irq 15 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 13 global_irq 16 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 14 global_irq 17 low edge) ACPI: INT_SRC_OVR (bus 0 bus_irq 15 global_irq 18 dfl dfl) It turns out that the system has three io apic controllers, but boot ioapic routing is in the second one, and that gsi_base is not 0 - it is using a bunch of INT_SRC_OVR... So these recent changes: 1. one set routing for first io apic controller 2. assume irq = gsi ... will break that system. So try to remap those gsis, need to seperate boot_ioapic_idx detection out of enable_IO_APIC() and call them early. So introduce boot_ioapic_idx, and remap_ioapic_gsi()... -v2: shift gsi with delta instead of gsi_base of boot_ioapic_idx -v3: double check with find_isa_irq_apic(0, mp_INT) to get right boot_ioapic_idx -v4: nr_legacy_irqs -v5: add print out for boot_ioapic_idx, and also make it could be applied for current kernel and previous kernel -v6: add bus_irq, in acpi_sci_ioapic_setup, so can get overwride for sci right mapping... -v7: looks like pnpacpi get irq instead of gsi, so need to revert them back... -v8: split into two patches -v9: according to Eric, use fixed 16 for shifting instead of remap -v10: still need to touch rsparser.c -v11: just revert back to way Eric suggest... anyway the ioapic in first ioapic is blocked by second... -v12: two patches, this one will add more loop but check apic_id and irq > 16 Reported-by: Iranna D Ankad Bisected-by: Iranna D Ankad Tested-by: Gary Hade Signed-off-by: Yinghai Lu Cc: Eric W. Biederman Cc: Thomas Renninger Cc: Eric W. Biederman Cc: Suresh Siddha Cc: len.brown@intel.com LKML-Reference: <4B8A321A.1000008@kernel.org> Signed-off-by: Ingo Molnar commit cf0aa4e07c32b0c211c24742aa015c0e7a135293 Author: Masatake YAMATO Date: Sat Feb 27 19:45:37 2010 +0000 netlink: Adding inode field to /proc/net/netlink The Inode field in /proc/net/{tcp,udp,packet,raw,...} is useful to know the types of file descriptors associated to a process. Actually lsof utility uses the field. Unfortunately, unlike /proc/net/{tcp,udp,packet,raw,...}, /proc/net/netlink doesn't have the field. This patch adds the field to /proc/net/netlink. Signed-off-by: Masatake YAMATO Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 60bbc725b5b3009bb1bf2628ce5033d9bc108881 Author: Ken Kawasaki Date: Sat Feb 27 13:34:20 2010 +0000 axnet_cs: add new id axnet_cs: add new id (corega PCC-TXM) Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit 46976c042ba1ff59253f2f7a513099175c24794e Merge: 024c378 f6e623a Author: David S. Miller Date: Sun Feb 28 00:57:28 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 commit 024c378f0b719d43b01b875caefa19f2612e103a Author: David S. Miller Date: Sun Feb 28 00:51:42 2010 -0800 bridge: Make IGMP snooping depend upon BRIDGE. Signed-off-by: David S. Miller commit d902eee43f1951b358d7347d9165c6af21cf7b1b Author: Herbert Xu Date: Sat Feb 27 19:41:52 2010 +0000 bridge: Add multicast count/interval sysfs entries This patch allows the user to the IGMP parameters related to the snooping function of the bridge. This includes various time values and retransmission limits. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b195167fcf089dbdc650bb874084555035f07f98 Author: Herbert Xu Date: Sat Feb 27 19:41:51 2010 +0000 bridge: Add hash elasticity/max sysfs entries This patch allows the user to control the hash elasticity/max parameters. The elasticity setting does not take effect until the next new multicast group is added. At which point it is checked and if after rehashing it still can't be satisfied then snooping will be disabled. The max setting on the other hand takes effect immediately. It must be a power of two and cannot be set to a value less than the current number of multicast group entries. This is the only way to shrink the multicast hash. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 561f1103a2b70de7e06e1e7fd072a5b142a4278c Author: Herbert Xu Date: Sat Feb 27 19:41:50 2010 +0000 bridge: Add multicast_snooping sysfs toggle This patch allows the user to disable IGMP snooping completely through a sysfs toggle. It also allows the user to reenable snooping when it has been automatically disabled due to hash collisions. If the collisions have not been resolved however the system will refuse to reenable snooping. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0909e11758bd28848aeb6646e021ec1e031a3f0f Author: Herbert Xu Date: Sat Feb 27 19:41:49 2010 +0000 bridge: Add multicast_router sysfs entries This patch allows the user to forcibly enable/disable ports as having multicast routers attached. A port with a multicast router will receive all multicast traffic. The value 0 disables it completely. The default is 1 which lets the system automatically detect the presence of routers (currently this is limited to picking up queries), and 2 means that the port will always receive all multicast traffic. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c4fcb78cf8ae55667809e54e54872a21025dd073 Author: Herbert Xu Date: Sat Feb 27 19:41:48 2010 +0000 bridge: Add multicast data-path hooks This patch finally hooks up the multicast snooping module to the data path. In particular, all multicast packets passing through the bridge are fed into the module and switched by it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3fe2d7c70b747d5d968f4e8fa210676d49d40059 Author: Herbert Xu Date: Sun Feb 28 00:49:38 2010 -0800 bridge: Add multicast start/stop hooks This patch hooks up the bridge start/stop and add/delete/disable port functions to the new multicast module. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5cb5e947d8f82011e3d7e7017e9d10db9a40ae9f Author: Herbert Xu Date: Sat Feb 27 19:41:46 2010 +0000 bridge: Add multicast forwarding functions This patch adds code to perform selective multicast forwarding. We forward multicast traffic to a set of ports plus all multicast router ports. In order to avoid duplications among these two sets of ports, we order all ports by the numeric value of their pointers. The two lists are then walked in lock-step to eliminate duplicates. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit eb1d16414339a6e113d89e2cca2556005d7ce919 Author: Herbert Xu Date: Sat Feb 27 19:41:45 2010 +0000 bridge: Add core IGMP snooping support This patch adds the core functionality of IGMP snooping support without actually hooking it up. So this patch should be a no-op as far as the bridge's external behaviour is concerned. All the new code and data is controlled by the Kconfig option BRIDGE_IGMP_SNOOPING. A run-time toggle is also available. The multicast switching is done using an hash table that is lockless on the read-side through RCU. On the write-side the new multicast_lock is used for all operations. The hash table supports dynamic growth/rehashing. The hash table will be rehashed if any chain length exceeds a preset limit. If rehashing does not reduce the maximum chain length then snooping will be disabled. These features may be added in future (in no particular order): * IGMPv3 source support * Non-querier router detection * IPv6 Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 025d89c27f54c69cd0e51666d88aada33666bb6c Author: Herbert Xu Date: Sat Feb 27 19:41:43 2010 +0000 bridge: Split may_deliver/deliver_clone out of br_flood This patch moves the main loop body in br_flood into the function may_deliver. The code that clones an skb and delivers it is moved into the deliver_clone function. This allows this to be reused by the future multicast forward function. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6088a539d8d1666dca6979b5759bf966ee9124ef Author: Herbert Xu Date: Sat Feb 27 19:41:42 2010 +0000 bridge: Use BR_INPUT_SKB_CB on xmit path this patch makes BR_INPUT_SKB_CB available on the xmit path so that we could avoid passing the br pointer around for the purpose of collecting device statistics. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b33084be192ee1e347d98bb5c9e38a53d98d35e2 Author: Herbert Xu Date: Sat Feb 27 19:41:41 2010 +0000 bridge: Avoid unnecessary clone on forward path When the packet is delivered to the local bridge device we may end up cloning it unnecessarily if no bridge port can receive the packet in br_flood. This patch avoids this by moving the skb_clone into br_flood. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 68b7c895be336b19f4c38d7cb500132fabba0afd Author: Herbert Xu Date: Sat Feb 27 19:41:40 2010 +0000 bridge: Allow tail-call on br_pass_frame_up This patch allows tail-call on the call to br_pass_frame_up in br_handle_frame_finish. This is now possible because of the previous patch to call br_pass_frame_up last. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 87557c18ac36241b596984589a0889c5c4bf916c Author: Herbert Xu Date: Sat Feb 27 19:41:39 2010 +0000 bridge: Do br_pass_frame_up after other ports At the moment we deliver to the local bridge port via the function br_pass_frame_up before all other ports. There is no requirement for this. For the purpose of IGMP snooping, it would be more convenient if we did the local port last. Therefore this patch rearranges the bridge input processing so that the local bridge port gets to see the packet last (if at all). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f6e623a65cb301088bd04794043e82bfc996c512 Author: Johann Felix Soden Date: Mon Feb 15 22:23:48 2010 +0100 Bluetooth: Fix out of scope variable access in hci_sock_cmsg() The pointer data can point to the variable ctv. Access to data happens when ctv is already out of scope. Signed-off-by: Johann Felix Soden Signed-off-by: Marcel Holtmann commit 4181b2c8bc29bb756ac1816678104b528377b656 Author: Matt Carlson Date: Fri Feb 26 14:04:45 2010 +0000 tg3: Remove now useless VPD code Now that the VPD searching code is abstracted away, the outer loop used to detect the read-only large resource data type section is useless. Signed-off-by: Matt Carlson Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit df25bc38b5531aa79a20e34549ea9fedf5f3ae36 Author: Matt Carlson Date: Fri Feb 26 14:04:44 2010 +0000 bnx2: Remove now useless VPD code Now that the VPD searching code is abstracted away, the outer loop used to detect the read-only large resource data type section is useless. Signed-off-by: Matt Carlson Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit 4067a8541d397e9d6b443dd2ce0ecb78bfd991db Author: Matt Carlson Date: Fri Feb 26 14:04:43 2010 +0000 pci: Add helper to search for VPD keywords This patch adds the pci_vpd_find_info_keyword() helper function to find information field keywords within read-only and read-write large resource data type sections. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit e1d5bdabb94da89bdb3c3f2ee105cf61fca88ec8 Author: Matt Carlson Date: Fri Feb 26 14:04:42 2010 +0000 pci: Add VPD information field helper functions This patch adds a preprocessor constant to describe the PCI VPD information field header size and an inline function to extract the size of the information field itself. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit b55ac1b22690d2e5b02a61cf6d69c2d66969c79d Author: Matt Carlson Date: Fri Feb 26 14:04:41 2010 +0000 pci: Add helper to find a VPD resource data type This patch adds the pci_vpd_find_tag() helper function to find VPD resource data types in a buffer. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit 7ad506fa1adc2da3d394c562f09b8e1b3026c402 Author: Matt Carlson Date: Fri Feb 26 14:04:40 2010 +0000 pci: Add large and small resource data type code This patch introduces more VPD preprocessor definitions to identify some small and large resource data type item names. The patch then continues to correct how the tg3 and bnx2 drivers search for the "read-only data" large resource data type. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit a2ce766238f72ff7337606c0bc96803c30c9e05c Author: Matt Carlson Date: Fri Feb 26 14:04:39 2010 +0000 pci: Add PCI LRDT tag size and section size This patch adds a preprocessor constant to describe the PCI VPD large resource data type tag size and an inline function to extract the large resource section size from the large resource data type tag. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Acked-by: Jesse Barnes Signed-off-by: David S. Miller commit 1883c79a57a5fe25309007590cccb1b2782c41b2 Author: Paul E. McKenney Date: Sat Feb 27 14:53:08 2010 -0800 rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use It is apparently legal to invoke task_subsys_state() without RCU protection during early boot time. After all, there are no concurrent tasks, so there can be no grace periods completing concurrently. But this does need an Acked-by from the cgroups folks. Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 622ea685f1fafdf84d612440535c84341f0860b8 Author: Paul E. McKenney Date: Sat Feb 27 14:53:07 2010 -0800 rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU Make the holdoff only happen when the full number of attempts have been made. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 5051f76883897ea3d3d034c92e7b84236da2ec57 Author: Wengang Wang Date: Fri Feb 26 18:18:25 2010 +0800 ocfs2: send SIGXFSZ if new filesize exceeds limit -v2 This patch makes ocfs2 send SIGXFSZ if new file size exceeds the rlimit. Processes may get SIGXFSZ on one node (in the cluster) while others will not on another if file size limits are different on the two nodes. Signed-off-by: Wengang Wang Signed-off-by: Joel Becker commit 6fcef3f04a1a0f8d7a086147d2f2e650c8cc2754 Author: Sunil Mushran Date: Fri Feb 26 19:42:45 2010 -0800 ocfs2/userdlm: Add tracing in userdlm Make use of the newly added BASTS masklog to trace ASTs and BASTs in userdlm. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 9b915181af0a99fe94ef0152e6a4ca9990c3b6d0 Author: Sunil Mushran Date: Fri Feb 26 19:42:44 2010 -0800 ocfs2: Use a separate masklog for AST and BASTs This patch adds a new masklog and uses it allow tracing ASTs and BASTs in the dlmglue layer. This has been found to be very useful in debugging cluster locking issues. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 847f9c606cad121cebf984639e3eeee1c4db82f8 Merge: 7981164 00ebfe5 Author: Linus Torvalds Date: Sat Feb 27 16:22:47 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits) m68k: Define sigcontext ABI of ColdFire m68knommu: NPTL support for uClinux m68k: Add NPTL support m68k: Eliminate unused variable in page_to_phys() m68k: Switch to generic siginfo layout macfb: fix 24-bit visual and stuff macfb: cleanup fbdev: add some missing mac modes mac68k: start CUDA early valkyriefb: various fixes fbdev: mac_var_to_mode() fix mac68k: move macsonic and macmace platform devices mac68k: move mac_esp platform device mac68k: replace mac68k SCC code with platform device pmac-zilog: add platform driver pmac-zilog: cleanup mac68k: rework SWIM platform device mac68k: cleanup ataflop: Killl warning about unused variable flags m68k: Use DIV_ROUND_CLOSEST ... commit 7981164791d18d5ed1dcdfa9598949ed158a5333 Merge: f1dd6ad a8d6356 Author: Linus Torvalds Date: Sat Feb 27 16:20:17 2010 -0800 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (35 commits) [S390] time: remove unused code [S390] zcore: Add prefix registers to dump header [S390] correct vdso version string [S390] add support for compressed kernels [S390] Define new s390 ELF note sections in elf.h [S390] codepage conversion of kernel parameter line [S390] seq_file: convert drivers/s390/ [S390] add z9-ec/z10 instruction to kernel disassembler [S390] dasd: correct offline processing [S390] dasd: fix refcounting. [S390] dasd: fix online/offline race [S390] use kprobes_built_in() in mm/fault code [S390] bug: use relative pointers in bug table entries [S390] Cleanup struct _lowcore usage and defines. [S390] free_initmem: reduce code duplication [S390] Replace ENOTSUPP usage with EOPNOTSUPP [S390] spinlock: check virtual cpu running status [S390] sysinfo: fix SYSIB 3,2,2 structure [S390] add MACHINE_IS_LPAR flag [S390] qdio: optimize cache line usage of struct qdio_irq ... commit f1dd6ad599732fc89f36fdd65a2c2cf3c63a8711 Merge: 8d37a37 e10b234 Author: Linus Torvalds Date: Sat Feb 27 16:19:22 2010 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits) MIPS: Alchemy: defconfig updates MIPS: Alchemy: Fix Au1100 ethernet build failure MIPS: Alchemy: Repair db1500/bosporus builds MIPS: ARC: Cleanup unused definitions from sgialib.h MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses MIPS: Alchemy: use 36bit addresses for PCMCIA resources. MIPS: Cobalt: Fix theoretical port aliasing issue MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1) MIPS: Crazy spinlock speed test. MIPS: Optimize spinlocks. MIPS: Alchemy: devboard PM needs to save CPLD registers. MIPS: PowerTV: Eliminate duplicate opcode definition macros MIPS: Lemote 2F: Move printks out of port_access_lock. MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks. MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c. MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks. MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock. MIPS: Loongson: Remove pointless sample_lock from oprofile code. MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock. MIPS: i8259: Convert IRQ controller lock to raw spinlock. ... commit 8d37a371b6869920e6c40c495c68eabba1ef3909 Merge: ef1a8de 7b4884c Author: Linus Torvalds Date: Sat Feb 27 16:18:30 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: validate late-added resources pcmcia: allow for extension of resource interval pcmcia: remove useless msleep in ds.c pcmcia: use read_cis_mem return value pcmcia: handle error in serial_cs config calls pcmcia: add locking to pcmcia_{read,write}_cis_mem pcmcia: avoid prod_id memleak pcmcia: avoid sysfs-related lockup for cardbus pcmcia: use state machine for extended requery pcmcia: delay re-scanning and re-querying of PCMCIA bus pcmcia: use pccardd to handle eject, insert, suspend and resume requests pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking pcmcia: use mutex for dynid lock pcmcia: assert locking to struct pcmcia_device pcmcia: add locking documentation pcmcia: simplify locking pcmcia: add locking to struct pcmcia_socket->pcmcia_state() pcmcia: protect s->device_count pcmcia: properly lock skt->irq, skt->irq_mask pcmcia: lock ops->set_socket ... commit dad52fc01161afcb8798c609e009aed4d104927f Author: Ian Campbell Date: Fri Feb 26 17:16:02 2010 +0000 x86, paravirt: Remove kmap_atomic_pte paravirt op. Now that both Xen and VMI disable allocations of PTE pages from high memory this paravirt op serves no further purpose. This effectively reverts ce6234b5 "add kmap_atomic_pte for mapping highpte pages". Signed-off-by: Ian Campbell LKML-Reference: <1267204562-11844-3-git-send-email-ian.campbell@citrix.com> Acked-by: Alok Kataria Cc: Jeremy Fitzhardinge Cc: Ingo Molnar Signed-off-by: H. Peter Anvin commit 3249b7e1df6380e9d7bb3238f64f445bf614f787 Author: Ian Campbell Date: Fri Feb 26 17:16:01 2010 +0000 x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y Preventing HIGHPTE allocations under VMI will allow us to remove the kmap_atomic_pte paravirt op. Signed-off-by: Ian Campbell LKML-Reference: <1267204562-11844-2-git-send-email-ian.campbell@citrix.com> Acked-by: Alok Kataria Cc: Ingo Molnar Cc: Jeremy Fitzhardinge Signed-off-by: H. Peter Anvin commit 817a824b75b1475f1b067c8cee318c7b4d66fcde Author: Ian Campbell Date: Fri Feb 26 17:16:00 2010 +0000 x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y There's a path in the pagefault code where the kernel deliberately breaks its own locking rules by kmapping a high pte page without holding the pagetable lock (in at least page_check_address). This breaks Xen's ability to track the pinned/unpinned state of the page. There does not appear to be a viable workaround for this behaviour so simply disable HIGHPTE for all Xen guests. Signed-off-by: Ian Campbell LKML-Reference: <1267204562-11844-1-git-send-email-ian.campbell@citrix.com> Cc: Jeremy Fitzhardinge Cc: Ingo Molnar Cc: Pasi Kärkkäinen Cc: # .32.x: 14315592: Allow highmem user page tables to be disabled at boot time Cc: # .32.x Cc: Signed-off-by: H. Peter Anvin commit 88cc83772a3c7756b9f2b4ba835545ad90a08409 Author: Henrique de Moraes Holschuh Date: Sat Feb 27 18:45:29 2010 -0300 thinkpad-acpi: fix ALSA callback return status Clemens Ladisch reports that thinkpad-acpi improperly implements the ALSA API, and always returns 0 for success for the "put" callbacks while the API requires it to return "1" when the control value has been changed in the hardware/firmware. Rework the volume subdriver to be able to properly implement the ALSA API. Based on a patch by Clemens Ladisch . This fix is also needed on 2.6.33. Reported-by: Clemens Ladisch Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit ef1a8de8ea004a689b2aa9f5cefcba2b1a0262f2 Merge: 1c32fd0 3d98ffb Author: Linus Torvalds Date: Sat Feb 27 13:26:18 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (88 commits) powerpc: Fix lwsync feature fixup vs. modules on 64-bit powerpc: Convert pmc_owner_lock to raw_spinlock powerpc: Convert die.lock to raw_spinlock powerpc: Convert tlbivax_lock to raw_spinlock powerpc: Convert mpic locks to raw_spinlock powerpc: Convert pmac_pic_lock to raw_spinlock powerpc: Convert big_irq_lock to raw_spinlock powerpc: Convert feature_lock to raw_spinlock powerpc: Convert i8259_lock to raw_spinlock powerpc: Convert beat_htab_lock to raw_spinlock powerpc: Convert confirm_error_lock to raw_spinlock powerpc: Convert ipic_lock to raw_spinlock powerpc: Convert native_tlbie_lock to raw_spinlock powerpc: Convert beatic_irq_mask_lock to raw_spinlock powerpc: Convert nv_lock to raw_spinlock powerpc: Convert context_lock to raw_spinlock powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards powerpc/86xx: Enable VME driver on the GE SBC610 powerpc/86xx: Enable VME driver on the GE PPC9A powerpc/86xx: Add MSI section to GE PPC9A DTS ... commit 00ebfe58b002f0ff387f60c7cd23bc2b274fce1a Author: Maxim Kuvyrkov Date: Wed Sep 23 01:22:43 2009 +0400 m68k: Define sigcontext ABI of ColdFire The following patch defines sigcontext ABI of ColdFire. Due to ISA restrictions ColdFire needs different rt_sigreturn trampoline. And due to ColdFire FP registers being 8-bytes instead of 12-bytes on m68k, sigcontext and fpregset structures should be updated. Regarding the sc_fpstate[16+6*8] field, it would've been enough 16 bytes to store ColdFire's FP state. To accomodate GLIBC's libSegFault it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered FP registers). I set it to 16+6*8 to provide some extra space for any future changes in the ColdFire FPU. Signed-off-by: Maxim Kuvyrkov Signed-off-by: Geert Uytterhoeven commit a58f75349063f60949614de39390df594ba1418d Author: Maxim Kuvyrkov Date: Sun Dec 6 10:08:14 2009 -0800 m68knommu: NPTL support for uClinux Port syscalls for NPTL support to m68knommu. Signed-off-by: Maxim Kuvyrkov Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 9674cdc74d63f346870943ef966a034f8c71ee57 Author: Maxim Kuvyrkov Date: Mon Dec 7 00:24:27 2009 -0800 m68k: Add NPTL support This patch adds several syscalls, that provide necessary functionality to support NPTL on m68k/ColdFire. The syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and atomic_barrier. The cmpxchg syscall is required for ColdFire as it doesn't support 'cas' instruction. Also a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to inspect the TLS storage. Signed-off-by: Maxim Kuvyrkov Signed-off-by: Geert Uytterhoeven commit f54bcdc2b81558a2b7e624cfeb4992422d9265f9 Author: Geert Uytterhoeven Date: Tue Jan 12 08:32:18 2010 +0100 m68k: Eliminate unused variable in page_to_phys() "pgdat" is unused, so we can eliminate it and turn page_to_phys() into a single-line macro. Signed-off-by: Geert Uytterhoeven commit 5da3a65d2d1ba333d61999640ef241f150c69c6b Author: Maxim Kuvyrkov Date: Wed Dec 23 11:28:42 2009 -0800 m68k: Switch to generic siginfo layout This patch switches m68k to generic siginfo layout. The custom layout of m68k's `struct siginfo' had several issues due to not considering aliasing of members in the union, e.g., _uid32 was at different offsets in ._kill, ._rt and ._sigchld. Signed-off-by: Maxim Kuvyrkov Signed-off-by: Geert Uytterhoeven commit 99e11ab20b26b3236490ae687ab309c2601d180b Author: Finn Thain Date: Wed Nov 4 00:51:18 2009 +1100 macfb: fix 24-bit visual and stuff Lots of changes. Remove volatile keywords. Take the advice in the comments and change video_slot to slot_addr. Factor out fifteen or so "channel >> 8" shifts into three shifts higher up the call graph. Make csc_setpalette() atomic, pass the correct color values. Check for ioremap() failure. Add missing break statement, thus fixing 24 bit console visual (blue background bug). Remove some uninformative printk() noise. Add a description for powerbook 140/170 graphics. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 34c41d0ab8c2a96bb3db89a209c1dd7e8c44fe13 Author: Finn Thain Date: Wed Nov 4 00:47:28 2009 +1100 macfb: cleanup Cleanup whitespace and code style. Remove unused #includes and prototypes. Remove obsolete, redundant or misleading comments. Remove dead code and redundant initialisers. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 1bb63845d122750124807e5aeb733d2276e5fb7d Author: Finn Thain Date: Wed Nov 4 00:47:02 2009 +1100 fbdev: add some missing mac modes Add the missing mac video modes for the Portrait and 12" RGB displays. The specs come from the Mac LC III developer note. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 18814ee846357509ceb13d4351eec71acd007480 Author: Finn Thain Date: Tue Nov 17 20:03:05 2009 +1100 mac68k: start CUDA early The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. So initialise the device earlier, and bring the m68k code closer to the powermac code. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 11e8faca2e501c25d2f98c1b9534776a9a9704c5 Author: Finn Thain Date: Wed Nov 4 00:43:52 2009 +1100 valkyriefb: various fixes Valkyriefb and macfb will adopt the same card if they get the chance, so remove valkyrie support from macfb. Also fix the "valkyriefb: can't do 832x624x8" problem reported by Raylynn Knight some time ago, by adding vmode 13 support for CONFIG_MAC. Also add vmode 11 since that works too. Make use of the monitor sense lines on 68k Macs too. Also some cleanups. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit d876c11a0fd40993136f5cc1e81371ccc6c21a63 Author: Finn Thain Date: Wed Nov 4 00:43:16 2009 +1100 fbdev: mac_var_to_mode() fix The valkyriefb driver assumes that this logic holds: mac_vmode_to_var(X, cmode, &var); mac_var_to_vmode(&var, &vmode, &cmode); assert(vmode == X); But it doesn't hold because mac_var_to_vmode() can return a mode with a slower pixel clock, even when a match is available. So we end up with this failure: using video mode 11 and color mode 0. valkyriefb: vmode 12 not valid. valkyriefb: can't set default video mode valkyriefb: vmode 12 not valid. Rather than have mac_var_to_mode() return the first reasonable mode it finds, have it return the mode that is closest to the requested one (or the mode with the closest longer pixel clock period if there is no exact match). Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit eeb9c182a6ad8bc130377adb0a4cd7b95dd15f49 Author: Finn Thain Date: Wed Nov 4 00:42:02 2009 +1100 mac68k: move macsonic and macmace platform devices Move platform device code from the drivers to the platform init function. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit cff75f1fb1f28eba3facb7dbe9b40a892912578a Author: Finn Thain Date: Wed Nov 4 00:41:35 2009 +1100 mac68k: move mac_esp platform device Move platform device code from the driver to the platform init function. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 80614e5ab1458ff3ccced4d6ba2fa386575c8d5c Author: Finn Thain Date: Tue Nov 17 20:06:48 2009 +1100 mac68k: replace mac68k SCC code with platform device Remove the old 68k Mac serial port code and a lot of related cruft. Add new SCC platform devices to mac 68k platform. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit ec9cbe09899e36b5f216c3232215520dcf0320ab Author: Finn Thain Date: Tue Nov 17 20:04:44 2009 +1100 pmac-zilog: add platform driver Add platform driver support to the pmac-zilog driver, for m68k macs. Place the powermac-specific code inside #ifdef CONFIG_PPC_PMAC. Signed-off-by: Finn Thain Acked-by: Benjamin Herrenschmidt Signed-off-by: Geert Uytterhoeven commit 1f7b5fff505232521a7a770a639b63cd17636549 Author: Finn Thain Date: Wed Nov 4 00:40:23 2009 +1100 pmac-zilog: cleanup Whitespace cleanups and comment typo fix. Signed-off-by: Finn Thain Acked-by: Benjamin Herrenschmidt Signed-off-by: Geert Uytterhoeven commit 2724daf439d9f4e9f25c9fb8de8602ba61758478 Author: Finn Thain Date: Wed Nov 4 00:39:56 2009 +1100 mac68k: rework SWIM platform device Adjust the platform device code to conform with the code style used in the rest of this patch series. No need to name resources nor to register devices which are not applicable. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 53aac0ad7cb32af5c25d432454f936b57bf8c11f Author: Finn Thain Date: Wed Nov 4 00:39:09 2009 +1100 mac68k: cleanup Cleanup whitespace and comments. Remove some dead code. Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven commit 41fb11ca90fe5a115b663340290311c7f5aab0f6 Author: Geert Uytterhoeven Date: Fri Dec 11 17:12:09 2009 +0100 ataflop: Killl warning about unused variable flags After commit e0c0978699a83f26f2341f7eedc1463b79e31aff ("ataflop: remove buggy/commented-out IRQ disable from do_fd_request()") the `flags' variable became unused: drivers/block/ataflop.c:1473: warning: unused variable 'flags' Hence remove it. Signed-off-by: Geert Uytterhoeven commit 1a0caf41c061868eff05a054ff2b0ffe26baf4e0 Author: Julia Lawall Date: Sun Aug 2 10:47:47 2009 +0200 m68k: Use DIV_ROUND_CLOSEST The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d but is perhaps more readable. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @haskernel@ @@ @depends on haskernel@ expression x,__divisor; @@ - (((x) + ((__divisor) / 2)) / (__divisor)) + DIV_ROUND_CLOSEST(x,__divisor) // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven commit eb054e3b3d531e311e9a34b902fe29247b00f724 Author: Peter Huewe Date: Thu Aug 20 22:42:31 2009 +0200 m68k: vme_scc - __init annotations Trivial patch which adds the __init macro to the module_init function and all of its helper functions of drivers/char/vme_scc.c Signed-off-by: Peter Huewe Signed-off-by: Geert Uytterhoeven commit f351d4bb3ce5a86f75cf297e38f87c4e437593d7 Author: Philippe De Muyter Date: Thu Oct 22 16:07:17 2009 +0200 m68k{,nommu}/h8300: Remove obsolete comment about map_chunk Remove the comments referring to a function map_chunk that no longer exists. Signed-off-by: Philippe De Muyter Signed-off-by: Geert Uytterhoeven commit 88cb773c5f8e45e48f3a89480610448974337cb0 Author: Philippe De Muyter Date: Sun Dec 6 20:28:41 2009 +0100 m68k: Allow ioremapping top of memory The test in __ioremap to reject memory ranges crossing the 0 boundary rejects also memory ranges ending at the end of the memory. Fix that. Signed-off-by: Philippe De Muyter Signed-off-by: Geert Uytterhoeven commit 145452649d035e4e5152f6c4e6798c41960cad3e Author: Maxim Kuvyrkov Date: Fri Oct 2 12:32:18 2009 +0400 m68k: Fix asm/swab.h for ColdFire Make asm/swab.h compatible with ColdFire ISA_B CPUs. Signed-off-by: Maxim Kuvyrkov Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 3d083407a16698de86b42aee0da2ffb280b5cb7e Author: Frederic Weisbecker Date: Sat Feb 27 17:24:15 2010 +0100 x86/hw-breakpoints: Remove the name field Remove the name field from the arch_hw_breakpoint. We never deal with target symbols in the arch level, neither do we need to ever store it. It's a legacy for the previous version of the x86 breakpoint backend. Let's remove it. Signed-off-by: Frederic Weisbecker Cc: K.Prasad Cc: Linus Torvalds commit dd8b1cf681eab40bc5afb67bdd06b2ca341f5669 Author: Frederic Weisbecker Date: Sat Feb 27 17:10:39 2010 +0100 perf: Remove pointless breakpoint union Remove pointless union in the breakpoint field of hw_perf_event. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras commit b67577dfb45580c498bfdb1bc76c00c3b2ad6310 Author: Frederic Weisbecker Date: Wed Feb 3 09:09:33 2010 +0100 perf lock: Drop the buffers multiplexing dependency We need to deal with time ordered events to build a correct state machine of lock events. This is why we multiplex the lock events buffers. But the ordering is done from the kernel, on the tracing fast path, leading to high contention between cpus. Without multiplexing, the events appears in a weak order. If we have four events, each split per cpu, perf record will read the events buffers in the following order: [ CPU0 ev0, CPU0 ev1, CPU0 ev3, CPU0 ev4, CPU1 ev0, CPU1 ev0....] To handle a post processing reordering, we could just read and sort the whole in memory, but it just doesn't scale with high amounts of events: lock events can fill huge amounts in few times. Basically we need to sort in memory and find a "grace period" point when we know that a given slice of previously sorted events can be committed for post-processing, so that we can unload the memory usage step by step and keep a scalable sorting list. There is no strong rules about how to define such "grace period". What does this patch is: We define a FLUSH_PERIOD value that defines a grace period in seconds. We want to have a slice of events covering 2 * FLUSH_PERIOD in our sorted list. If FLUSH_PERIOD is big enough, it ensures every events that occured in the first half of the timeslice have all been buffered and there are none remaining and there won't be further to put inside this first timeslice. Then once we reach the 2 * FLUSH_PERIOD timeslice, we flush the first half to be gentle with the memory (the second half can still get new events in the middle, so wait another period to flush it) FLUSH_PERIOD is defined to 5 seconds. Say the first event started on time t0. We can safely assume that at the time we are processing events of t0 + 10 seconds, ther won't be anymore events to read from perf.data that occured between t0 and t0 + 5 seconds. Hence we can safely flush the first half. To point out funky bugs, we have a guardian that checks a new event timestamp is not below the last event's timestamp flushed and that displays a warning in this case. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Li Zefan Cc: Lai Jiangshan Cc: Masami Hiramatsu Cc: Jens Axboe commit 84c6f88fc8265d7a712d7d6ed8fc1a878dfc84d1 Author: Hitoshi Mitake Date: Thu Feb 4 16:08:15 2010 +0900 perf lock: Fix and add misc documentally things I've forgot to add 'perf lock' line to command-list.txt, so users of perf could not find perf lock when they type 'perf'. Fixing command-list.txt requires document (tools/perf/Documentation/perf-lock.txt). But perf lock is too much "under construction" to write a stable document, so this is something like pseudo document for now. And I wrote description of perf lock at help section of CONFIG_LOCK_STAT, this will navigate users of lock trace events. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1265267295-8388-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit 44ee63587dce85593c22497140db16f4e5027860 Author: Tejun Heo Date: Wed Feb 17 10:50:50 2010 +0900 percpu: Add __percpu sparse annotations to hw_breakpoint Add __percpu sparse annotations to hw_breakpoint. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. In kernel/hw_breakpoint.c, per_cpu(nr_task_bp_pinned, cpu)'s will trigger spurious noderef related warnings from sparse. Changing it to &per_cpu(nr_task_bp_pinned[0], cpu) will work around the problem but deemed to ugly by the maintainer. Leave it alone until better solution can be found. Signed-off-by: Tejun Heo Cc: Stephen Rothwell Cc: K.Prasad LKML-Reference: <4B7B4B7A.9050902@kernel.org> Signed-off-by: Frederic Weisbecker commit 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 Merge: 1dd2980 60b341b Author: Frederic Weisbecker Date: Sat Feb 27 16:18:46 2010 +0100 Merge commit 'v2.6.33' into perf/core Merge reason: __percpu annotations need the corresponding sparse address space definition upstream. Conflicts: tools/perf/util/probe-event.c (trivial) commit afbc74fdc5b96552c384e57119b3cc13c840bf06 Author: Grazvydas Ignotas Date: Sat Feb 27 17:06:44 2010 +0200 power_supply: bq27x00: fix voltage and current units The chip returns voltage and current in mV and mA, but power supply class uses uV and uA, so add missing conversion. Signed-off-by: Grazvydas Ignotas Signed-off-by: Anton Vorontsov commit 4e924a814ac78e325653840190e9e4762e6f4b7c Author: Grazvydas Ignotas Date: Sat Feb 27 17:06:09 2010 +0200 power_supply: bq27x00: add status and time properties The BQ27x00 series of chips can report time-to-empty and time-to-full, so let's add corresponding properties. Also report charge status based on status flag register. Signed-off-by: Grazvydas Ignotas Signed-off-by: Anton Vorontsov commit 705e5711b61e9622b2d88850f38c219014aa0780 Author: Stephen Coe Date: Tue Feb 16 11:29:44 2010 -0500 Bluetooth: Add SCO fallback for unsupported feature error The Bluetooth SIG PTS test case: TC_AG_ACS_BV_10_I, rejects eSCO with "Unsupported Feature or Parameter Value" (0x11). This patch adds case for SCO fallback. 2007-09-20 12:20:37.787747 > HCI Event: Number of Completed Packets (0x13) plen 5 handle 38 packets 1 2007-09-20 12:20:37.842154 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17 handle 38 voice setting 0x0060 2007-09-20 12:20:37.847037 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 2007-09-20 12:20:37.855233 > HCI Event: Max Slots Change (0x1b) plen 3 handle 38 slots 1 2007-09-20 12:20:39.913354 > HCI Event: Synchronous Connect Complete (0x2c) plen 17 status 0x11 handle 38 bdaddr 00:16:93:01:01:7A type eSCO Error: Unsupported Feature or Parameter Value 2007-09-20 12:20:39.922629 > HCI Event: Max Slots Change (0x1b) plen 3 handle 38 slots 5 2007-09-20 12:20:58.126886 < ACL data: handle 38 flags 0x02 dlen 8 L2CAP(d): cid 0x0041 len 4 [psm 0] 0000: 0b 53 01 b8 .S.. 2007-09-20 12:20:58.130138 > HCI Event: Number of Completed Packets (0x13) plen 5 handle 38 packets 1 Signed-off-by: Stephen Coe Signed-off-by: Marcel Holtmann commit 943da25d95c7e8fd8c39dbf09e030f5da46f5d85 Author: Marcel Holtmann Date: Sat Feb 13 02:28:41 2010 +0100 Bluetooth: Add controller types for BR/EDR and 802.11 AMP With the Bluetooth 3.0 specification and the introduction of alternate MAC/PHY (AMP) support, it is required to differentiate between primary BR/EDR controllers and 802.11 AMP controllers. So introduce a special type inside HCI device for differentiation. For now all AMP controllers will be treated as raw devices until an AMP manager has been implemented. Signed-off-by: Marcel Holtmann commit b914a250e7b390c713b36a9405a39c4c11abad80 Author: Marcel Holtmann Date: Mon Feb 8 16:47:04 2010 +0100 Bluetooth: Convert Marvell driver to use per adapter debugfs The debugfs support of the Marvell driver is buggy. It is limited to one controller per system. Fix this by using the controller specific debugfs directory as parent. Signed-off-by: Marcel Holtmann commit ca325f698996c1a0770a67f41e7dc97a007d8bc2 Author: Marcel Holtmann Date: Mon Feb 8 16:22:31 2010 +0100 Bluetooth: Convert inquiry cache to use debugfs instead of sysfs The output of the inquiry cache is only useful for debugging purposes and so move it into debugfs. Signed-off-by: Marcel Holtmann commit c13854cef4751000b968d4e8ac95796562d5b96f Author: Marcel Holtmann Date: Mon Feb 8 15:27:07 2010 +0100 Bluetooth: Convert controller hdev->type to hdev->bus The hdev->type is misnamed and should be actually hdev->bus instead. So convert it now. Signed-off-by: Marcel Holtmann commit 10f7891f998e84acfa31ac9c5a0fea052c39ecb8 Author: Dan Carpenter Date: Mon Feb 8 08:43:17 2010 +0300 Bluetooth: Add missing kfree() on error path in Atheros driver Add a couple kfree() calls on an error path. Signed-off-by: Dan Carpenter Signed-off-by: Marcel Holtmann commit 8978111e2d148f75bd5e329a14600feadc567381 Author: Márton Németh Date: Sun Jan 10 13:39:15 2010 +0100 Bluetooth: Make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make bcm203x_table also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Marcel Holtmann commit 8e5b2308489dbca27c104fc6a557d4c9348552e5 Author: Peter Huewe Date: Tue Dec 22 09:34:20 2009 +0100 Bluetooth: Add __init/__exit macros to Marvell SDIO driver Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of btmrvl_sdio.c driver. Signed-off-by: Peter Huewe Signed-off-by: Marcel Holtmann commit e10b234b3c4e255d3300a486c4ac15b43253ac6d Author: Manuel Lauss Date: Fri Feb 26 17:32:45 2010 +0100 MIPS: Alchemy: defconfig updates Updated, leaner defconfig for the alchemy development boards. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1005/ Signed-off-by: Ralf Baechle commit acc4d245a70615755cab8bace7f0f87870fc99d9 Author: Manuel Lauss Date: Fri Feb 26 17:22:02 2010 +0100 MIPS: Alchemy: Fix Au1100 ethernet build failure Don't define platform info for second mac on au1100 (which only has a single mac). Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1004/ Signed-off-by: Ralf Baechle commit 570cb456efbd1f1e761869881ae72177595de356 Author: Manuel Lauss Date: Fri Feb 26 17:22:01 2010 +0100 MIPS: Alchemy: Repair db1500/bosporus builds A few hunks somehow ended up outside their #ifdef/endif blocks, leading to -Werror-induces build failures. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1003/ Signed-off-by: Ralf Baechle commit d891a5399242579857701c2b1185b64d7bf7936f Author: Yoichi Yuasa Date: Sat Feb 20 21:20:34 2010 +0900 MIPS: ARC: Cleanup unused definitions from sgialib.h Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/979/ Signed-off-by: Ralf Baechle commit 8190471087b59ff63a8db125953ae612b7a8b8b5 Author: Bjorn Helgaas Date: Wed Feb 24 13:53:27 2010 -0700 MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses The GT-64111 PCI host bridge has no address translation mechanism, so it can't generate legacy port accesses. This quirk fixes legacy device port resources to contain the bus addresses actually generated by the GT-64111. I think this is the approach Ben Herrenschmidt suggested long ago: http://marc.info/?l=linux-kernel&m=119733290624544&w=2 This allows us to remove the IORESOURCE_PCI_FIXED hack from pcibios_fixup_device_resources(), which converts bus addresses to CPU addresses. IORESOURCE_PCI_FIXED denotes resources that can't be moved; it has nothing to do with converting bus to CPU addresses. Signed-off-by: Bjorn Helgaas Cc: Yoichi Yuasa Cc: Thomas Bogendoerfer Cc: Benjamin Herrenschmidt Cc: linux-mips@linux-mips.org Tested-by: Yoichi Yuasa Patchwork: http://patchwork.linux-mips.org/patch/998/ Signed-off-by: Ralf Baechle commit 11b897cf84c37e6522db914793677e933ef311fb Author: Manuel Lauss Date: Wed Feb 24 17:40:21 2010 +0100 MIPS: Alchemy: use 36bit addresses for PCMCIA resources. On Alchemy the PCMCIA area lies at the end of the chips 36bit system bus area. Currently, addresses at the far end of the 32bit area are assumed to belong to the PCMCIA area and fixed up to the real 36bit address before being passed to ioremap(). A previous commit enabled 64 bit physical size for the resource datatype on Alchemy and this allows to use the correct 36bit addresses when registering the PCMCIA sockets. This patch removes the 32-to-36bit address fixup and registers the Alchemy demo board pcmcia socket with the correct 36bit physical addresses. Tested on DB1200, with a CF card (ide-cs driver) and a 3c589 PCMCIA ethernet card. Signed-off-by: Manuel Lauss To: Linux-MIPS Cc: Manuel Lauss Patchwork: http://patchwork.linux-mips.org/patch/994/ Signed-off-by: Ralf Baechle commit b9b37787d24cca9fbd63f767663e9439fa69aa22 Author: Ralf Baechle Date: Wed Feb 24 17:41:00 2010 +0100 MIPS: Cobalt: Fix theoretical port aliasing issue Because the VIA SuperIO chip only decodes 24 bits of address space but port address space currently being configured as 32MB there is the theoretical possibility of aliases within the I/O port address range. The complicated solution is to reserve all address range that potencially could cause such aliases. But with the PCI spec limiting port allocations for devices to a maximum of 256 bytes 16MB of port address space already is way more than one would ever expect to be used so we just reduce the port space to 16MB. Signed-off-by: Ralf Baechle To: Yoichi Yuasa Cc: Bjorn Helgaas Cc: linux-mips@linux-mips.org Cc: Benjamin Herrenschmidt Patchwork: http://patchwork.linux-mips.org/patch/995/ commit 2a5d66511a6adc0546a92d33734e3ebf7ab0d10c Author: Matt Turner Date: Wed Feb 24 23:30:14 2010 -0500 MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1) ALIGN(x, bytes) expands to __ALIGN_MASK(x, bytes - 1), so use the one that is most clear. Signed-off-by: Matt Turner To: linux-mips@linux-mips.org Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/999/ Signed-off-by: Ralf Baechle commit bba90760582d2563b28a4738fb785185a59e9e71 Author: David Daney Date: Tue Feb 16 15:26:35 2010 -0800 MIPS: Crazy spinlock speed test. This is just a test program for raw_spinlocks. The main reason I wrote it is to validate my spinlock changes that I sent in a previous patch. To use it enable CONFIG_DEBUG_FS and CONFIG_SPINLOCK_TEST then at run time do: # mount -t debugfs none /sys/kernel/debug/ # cat /sys/kernel/debug/mips/spin_single # cat /sys/kernel/debug/mips/spin_multi On my 600MHz octeon cn5860 (16 CPUs) I get spin_single spin_multi base 106885 247941 spinlock_patch 75194 219465 This shows that for uncontended locks the spinlock patch gives 41% improvement and for contended locks 12% improvement (1/time). Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/969/ Signed-off-by: Ralf Baechle commit 500c2e1fdbcc2b273bd4c695a9b8ac8196f61614 Author: David Daney Date: Thu Feb 4 11:31:49 2010 -0800 MIPS: Optimize spinlocks. The current locking mechanism uses a ll/sc sequence to release a spinlock. This is slower than a wmb() followed by a store to unlock. The branching forward to .subsection 2 on sc failure slows down the contended case. So we get rid of that part too. Since we are now working on naturally aligned u16 values, we can get rid of a masking operation as the LHU already does the right thing. The ANDI are reversed for better scheduling on multi-issue CPUs On a 12 CPU 750MHz Octeon cn5750 this patch improves ipv4 UDP packet forwarding rates from 3.58*10^6 PPS to 3.99*10^6 PPS, or about 11%. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/937/ Signed-off-by: Ralf Baechle commit e275ed5ee94b358964a0dae1c8b49f0bff260b60 Author: Manuel Lauss Date: Tue Feb 23 18:57:43 2010 +0100 MIPS: Alchemy: devboard PM needs to save CPLD registers. Save/restore CPLD registers when doing suspend-to-ram; this fixes issues with harddisk and ethernet not working correctly when resuming on DB1200. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/986/ Signed-off-by: Ralf Baechle commit 81fc0179541dd52763cf62a52f0c09a05bcc6439 Author: David VomLehn Date: Mon Feb 22 16:31:13 2010 -0800 MIPS: PowerTV: Eliminate duplicate opcode definition macros Change to different macros for assembler macros since the old names in powertv_setup.c were co-opted for use in asm/asm.h. This broken the build for the powertv platform. This patch introduces new macros based on the new macros in asm.h to take the place of the old macro values. Signed-off-by: David VomLehn Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/985/ Signed-off-by: Ralf Baechle commit 3b439470e360931ad65234f94aa92cd7362f635a Author: Ralf Baechle Date: Sat Feb 27 12:53:41 2010 +0100 MIPS: Lemote 2F: Move printks out of port_access_lock. No point in protecting them and printks are sloow. Signed-off-by: Ralf Baechle commit 7fe2d9c41de132b51e550212aa5709fc4e132c2c Author: Ralf Baechle Date: Sat Feb 27 12:53:41 2010 +0100 MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks. Signed-off-by: Ralf Baechle commit 541247f4d26f90ce0d277082d108feb121b6ae03 Author: David Daney Date: Thu Feb 18 11:48:20 2010 -0800 MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/973/ Signed-off-by: Ralf Baechle commit 399614226cfa45ffaba45b269e8af9ddc26de537 Author: David Daney Date: Thu Feb 18 11:47:40 2010 -0800 MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/972/ Signed-off-by: Ralf Baechle commit 4837a661a52dd9e02cd1cdb08a7ebdc5ed028ee4 Author: Ralf Baechle Date: Sat Feb 27 12:53:40 2010 +0100 MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock. Signed-off-by: Ralf Baechle commit f1d39e6ed7ad71048db3b2835dccf3a5a01fab69 Author: Ralf Baechle Date: Sat Feb 27 12:53:39 2010 +0100 MIPS: Loongson: Remove pointless sample_lock from oprofile code. Signed-off-by: Ralf Baechle commit 36946d7387ee6f3a331563a1d839240924b65798 Author: Ralf Baechle Date: Sat Feb 27 12:53:39 2010 +0100 MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock. Signed-off-by: Ralf Baechle commit 896508705561bea24656680cdaf3b4095c4d7473 Author: Ralf Baechle Date: Sat Feb 27 12:53:38 2010 +0100 MIPS: i8259: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit 598c5abad7f3e162a01c87a480f8d2cd57643acb Author: Ralf Baechle Date: Sat Feb 27 12:53:38 2010 +0100 MIPS: IP27: Convert nmi_lock lock to arch spinlock; Signed-off-by: Ralf Baechle commit 2ba53e37120fba00fa10bebc13b9723f25e1f845 Author: Ralf Baechle Date: Sat Feb 27 12:53:38 2010 +0100 MIPS: IP27: Remove code obfuscation by enter_panic_mode(). Signed-off-by: Ralf Baechle commit 34ee4148472996c5fd25fbb5697982914cfe955a Author: Ralf Baechle Date: Sat Feb 27 12:53:37 2010 +0100 MIPS: GT641xx: Convert timer lock to raw spinlock. Signed-off-by: Ralf Baechle commit da4afffc1d03c4f0334dabd28ce4c2325ee8f092 Author: Ralf Baechle Date: Sat Feb 27 12:53:37 2010 +0100 MIPS: Alchemy: Simplify DMA channel allocation code. Signed-off-by: Ralf Baechle Cc: Manuel Lauss commit 2bd0073656963f7683275dbda600bf5dfc05232a Author: Ralf Baechle Date: Sat Feb 27 12:53:37 2010 +0100 MIPS: Yosemite: Convert SMP startup lock to arch spinlock. Signed-off-by: Ralf Baechle commit 1a73f0478a289ee5bb2e4f44a6ecf1d6d6410eab Author: Ralf Baechle Date: Sat Feb 27 12:53:36 2010 +0100 MIPS: Alchemy: Remove time_lock. The sole user is au1xxx_calc_clock() which is only used in early bootup where the is no paralellism thus no race condition to protect against. Signed-off-by: Ralf Baechle Cc: Manuel Lauss commit 32baba2fb7149ac262be1dca39291b55d846a075 Author: Ralf Baechle Date: Sat Feb 27 12:53:36 2010 +0100 MIPS: DEC: Convert KN01 lock to raw spinlock. Signed-off-by: Ralf Baechle commit d8d607d59e78a865e0b55c60e84412519a83022c Author: Ralf Baechle Date: Sat Feb 27 12:53:35 2010 +0100 MIPS: BCM63xx: Convert timer locks to raw spinlocks. Signed-off-by: Ralf Baechle commit c45ef44f474a82fdec96704bece192e487dca373 Author: Ralf Baechle Date: Sat Feb 27 12:53:34 2010 +0100 MIPS: PowerTV: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle Cc: David VomLehn commit a963dc70a286898c91d021e53317ba3d485e0b93 Author: Ralf Baechle Date: Sat Feb 27 12:53:32 2010 +0100 MIPS: Malta: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit ed14bbb24e62830c2b4c59f4cea3696651d502f0 Author: Ralf Baechle Date: Sat Feb 27 12:53:32 2010 +0100 MIPS: SB1480: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit 5772f6deb6214a94248e5429869e99e8b7b9cf25 Author: Ralf Baechle Date: Sat Feb 27 12:53:32 2010 +0100 MIPS: SB1250: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit f2c194a00516f8ea4340975c25276fd0dfd47c31 Author: Ralf Baechle Date: Sat Feb 27 12:53:31 2010 +0100 MIPS: GT641xx: Convert IRQ controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit 4a41abe5960b6a4d496aab94264beee06bc0ab7e Author: Ralf Baechle Date: Sat Feb 27 12:53:31 2010 +0100 MIPS: Jazz: Convert irq controller lock to raw spinlock. Signed-off-by: Ralf Baechle commit 4a8a738de637dc7141de5228d2d722573a329b95 Author: Ralf Baechle Date: Sat Feb 27 12:53:30 2010 +0100 MIPS: Make various locks static. Signed-off-by: Ralf Baechle commit 559e25a5e3efe60a22b7f96ea4ad2eb09d996e97 Author: David Daney Date: Tue Feb 16 17:25:33 2010 -0800 Staging: Octeon: Remove /proc/octeon_ethernet_stats This file shouldn't be in /proc, so we remove it. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/970/ Signed-off-by: Ralf Baechle commit ec977c5b473e29dbfdac8f2c7477eccc2142e3bc Author: David Daney Date: Tue Feb 16 17:25:32 2010 -0800 Staging: Octeon: Reformat a bunch of comments. Many of the comments didn't follow kerneldoc guidlines. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/971/ Signed-off-by: Ralf Baechle commit 4898c560103fb8075c10a8e9d70e0ca26873075e Author: David Daney Date: Mon Feb 15 15:06:47 2010 -0800 Staging: Octeon: Free transmit SKBs in a timely manner If we wait for the once-per-second cleanup to free transmit SKBs, sockets with small transmit buffer sizes might spend most of their time blocked waiting for the cleanup. Normally we do a cleanup for each transmitted packet. We add a watchdog type timer so that we also schedule a timeout for 150uS after a packet is transmitted. The watchdog is reset for each transmitted packet, so for high packet rates, it never expires. At these high rates, the cleanups are done for each packet so the extra watchdog initiated cleanups are neither needed nor triggered. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Cc: Eric Dumazet Patchwork: http://patchwork.linux-mips.org/patch/968/ Signed-off-by: Ralf Baechle This version has spelling and comment changes based on feedback from Eric Dumazet. commit 86568dc41e8c7edcf6d014a64d143536d24b6a5d Author: David Daney Date: Mon Feb 15 12:13:18 2010 -0800 MIPS: Octeon: Do proper acknowledgment of CIU timer interrupts. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/967/ Signed-off-by: Ralf Baechle commit f8c2648666b5a1b5ba9bbb662ae569bafd3cc830 Author: David Daney Date: Mon Feb 15 12:13:17 2010 -0800 Staging: Octeon: Run phy bus accesses on a workqueue. When directly accessing a phy, we must acquire the mdio bus lock. To do that we cannot be in interrupt context, so we need to move these operations to a workqueue. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/965/ Signed-off-by: Ralf Baechle commit 1d08f00d576c62f1c7a96900a14648df33b3939a Author: David Daney Date: Mon Feb 15 12:13:16 2010 -0800 Staging: octeon: remove unneeded includes Signed-off-by: David Daney To: linux-mips@linux-mips.org To: netdev@vger.kernel.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/964/ Signed-off-by: Ralf Baechle commit d007f991a82ed159979b7662a4ca20e978221cdb Author: Yoichi Yuasa Date: Fri Feb 12 21:35:04 2010 +0900 MIPS: Use generic ucontext.h Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/959/ Signed-off-by: Ralf Baechle commit 7b012cee6173cef8598a4cf27fe80b4430e1ed7f Author: Yoichi Yuasa Date: Fri Feb 12 21:33:56 2010 +0900 MIPS: Use generic serial.h Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/960/ Signed-off-by: Ralf Baechle commit f51e5a07728d33b7ad59a84d1a7a0a34d4f58765 Author: Yoichi Yuasa Date: Fri Feb 12 21:29:14 2010 +0900 MIPS: Use generic parport.h Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/958/ Signed-off-by: Ralf Baechle commit 1a6e8963e07f126a7fa3e9b446f86205cd4e81fe Author: Yoichi Yuasa Date: Fri Feb 12 21:27:59 2010 +0900 MIPS: Use generic current.h Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/957/ Signed-off-by: Ralf Baechle commit 27a5bd6457c8ce38151250530152e15f76b697a8 Author: David Daney Date: Wed Feb 10 15:12:49 2010 -0800 MIPS: Enable Read Inhibit/eXecute Inhibit for Octeon+ CPUs Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/955/ Signed-off-by: Ralf Baechle commit 6f329468f3086e9d8f3832930fdb09ab3769176b Author: David Daney Date: Wed Feb 10 15:12:48 2010 -0800 MIPS: Give Octeon+ CPUs their own cputype. This allows us to treat them differently at runtime. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/951/ Patchwork: http://patchwork.linux-mips.org/patch/987/ Signed-off-by: Ralf Baechle commit 6dd9344cfc41bcc60a01cdc828cb278be7a10e01 Author: David Daney Date: Wed Feb 10 15:12:47 2010 -0800 MIPS: Implement Read Inhibit/eXecute Inhibit The SmartMIPS ASE specifies how Read Inhibit (RI) and eXecute Inhibit (XI) bits in the page tables work. The upper two bits of EntryLo{0,1} are RI and XI when the feature is enabled in the PageGrain register. SmartMIPS only covers 32-bit systems. Cavium Octeon+ extends this to 64-bit systems by continuing to place the RI and XI bits in the top of EntryLo even when EntryLo is 64-bits wide. Because we need to carry the RI and XI bits in the PTE, the layout of the PTE is changed. There is a two instruction overhead in the TLB refill hot path to get the EntryLo bits into the proper position. Also the TLB load exception has to probe the TLB to check if RI or XI caused the exception. Also of note is that the layout of the PTE bits is done at compile and runtime rather than statically. In the 32-bit case this allows for the same number of PFN bits as before the patch as the _PAGE_HUGE is not supported in 32-bit kernels (we have _PAGE_NO_EXEC and _PAGE_NO_READ instead of _PAGE_READ and _PAGE_HUGE). The patch is tested on Cavium Octeon+, but should also work on 32-bit systems with the Smart-MIPS ASE. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/952/ Patchwork: http://patchwork.linux-mips.org/patch/956/ Patchwork: http://patchwork.linux-mips.org/patch/962/ Signed-off-by: Ralf Baechle commit 32546f38fab839eee6f62b3f06c2774eade4188a Author: David Daney Date: Wed Feb 10 15:12:46 2010 -0800 MIPS: Add TLBR and ROTR to uasm. The soon to follow Read Inhibit/eXecute Inhibit patch needs TLBR and ROTR support in uasm. We also add a UASM_i_ROTR macro. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/953/ Signed-off-by: Ralf Baechle commit 9fe2e9d6f5390d7151a0b9d8c100f0da26eaa2b7 Author: David Daney Date: Wed Feb 10 15:12:45 2010 -0800 MIPS: Add accessor functions and bit definitions for c0_PageGrain Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/950/ Signed-off-by: Ralf Baechle commit 9b8c38917b8e083a6343bb5a0c6bbaea78ebff7a Author: David Daney Date: Wed Feb 10 15:12:44 2010 -0800 MIPS: Use 64-bit stores to c0_entrylo on 64-bit kernels. 64-bit CPUs have 64-bit c0_entrylo{0,1} registers. We should use the 64-bit dmtc0 instruction to set them. This becomes important if we want to set the RI and XI bits present in some processors. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/954/ Signed-off-by: Ralf Baechle commit 52d7ecd033316b0540a6ac4af70574fae4aba295 Author: Frans Pop Date: Sat Feb 6 18:47:13 2010 +0100 MIPS: Remove trailing space in messages Signed-off-by: Frans Pop To: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/946/ Signed-off-by: Ralf Baechle commit f86a69b15f60965a224e7e2516ad41070692cc19 Author: Wu Zhangjin Date: Sun Jan 31 20:39:40 2010 +0800 MIPS: Make the debugging of compressed kernel configurable This patch adds a new DEBUG_ZBOOT option to allow the users to enable it to debug the compressed kernel support for a new board and this optoin should be disabled to reduce the kernel image size and speed up the kernel booting procedure when the compressed kernel support is stable. Signed-off-by: Wu Zhangjin To: Ralf Baechle Cc: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/918/ Signed-off-by: Ralf Baechle commit b66bb6090d9aa36931911e34d3f069932934b6fe Author: David Daney Date: Tue Feb 2 17:19:38 2010 -0800 MIPS: Remove #if 0 r4k_update_mmu_cache_hwbug The function is #if 0ed out. There are no other occurrences of its name in the tree. It is safe to remove. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/936/ Signed-off-by: Ralf Baechle commit ab4ba291683d07038c7ddf1eec191d3d09e1f468 Author: Yoichi Yuasa Date: Tue Feb 2 18:40:04 2010 +0900 MIPS: TXx9: Remove forced serial console setting It is not always used, even if it is available. Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/933/ Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 7084338eb8eb0cc021ba86c340157bad397f3f0b Author: Alexander Clouter Date: Sun Jan 31 19:39:57 2010 +0000 MIPS: AR7: Make ar7_register_devices much more durable [Ralf: Fixed up the rejects and changed all the new printk(KERN_...); to pr_xxx() as suggested by Wu.] Signed-off-by: Alexander Clouter To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/920/ Signed-off-by: Ralf Baechle commit 632b629c0c4b0f8caaf7f2b448911d03859fda59 Author: Alexander Clouter Date: Sun Jan 31 19:38:52 2010 +0000 MIPS: AR7: Fix USB slave mem range typo Signed-off-by: Alexander Clouter To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/919/ Signed-off-by: Ralf Baechle commit 4d1da8c2961da46abd85a71d20f2b169bf80618e Author: Alexander Clouter Date: Sun Jan 31 19:38:19 2010 +0000 MIPS: AR7: Whitespace hacking [Ralf: Fixed up reject and Wu's complaints about comment style.] Signed-off-by: Alexander Clouter To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/921/ Signed-off-by: Ralf Baechle commit 10229f3761fdc1050f972bf3a4c4623bde20002f Author: Yoichi Yuasa Date: Mon Feb 1 22:06:56 2010 +0900 MIPS: Alchemy: Use strlcat() for the command line arguments Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/928/ Signed-off-by: Ralf Baechle commit ae7cbef5e5789e2ee6855222a3b83eb94591ef0b Author: Yoichi Yuasa Date: Mon Feb 1 22:05:57 2010 +0900 MIPS: Alchemy: Remove prom_getcmdline() Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/927/ Signed-off-by: Ralf Baechle commit c63d0cb5feedbc2cc456b6ea2105c15b563217cf Author: Yoichi Yuasa Date: Fri Jan 29 17:49:52 2010 +0900 MIPS: Alchemy: Remove forced command line setting It is not always used, even if it is available. Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/893/ Signed-off-by: Ralf Baechle commit 368bf8ef304f426be0a8a0be5b0e437747598c10 Author: David Daney Date: Thu Jan 28 16:52:13 2010 -0800 MIPS: Set __elf_platform for Octeon. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/892/ Signed-off-by: Ralf Baechle commit 874fd3b5acc20f2a464409045aef3b2288069787 Author: David Daney Date: Thu Jan 28 16:52:12 2010 -0800 MIPS: Allow the auxv's elf_platform entry to be set. The userspace runtime linker uses the elf_platform to find the libraries optimized for the current CPU archecture variant. First we need to allow it to be set to something other than NULL. Follow-on patches will set some values for specific CPUs. GLIBC already does the right thing. The kernel just needs to supply good data. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/891/ Signed-off-by: Ralf Baechle commit 3b839070f11295735ce8d9ef580c5eb23417aabf Author: Manuel Lauss Date: Wed Oct 14 09:38:06 2009 +0200 MMC: AU1xMMC: Allow platforms to disable host capabilities Although the hardware supports a 4/8bit SD interface and the driver unconditionally advertises all hardware caps to the MMC core, not all datalines may actually be wired up. This patch introduces another field to au1xmmc platform data allowing platforms to disable certain advanced host controller features. Signed-off-by: Manuel Lauss To: linux-mmc@vger.kernel.org CC: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/460/ Signed-off-by: Ralf Baechle commit 92bbe1b988d3d6fa6348e3e376ff6d27e0712147 Author: Florian Fainelli Date: Thu Jan 28 15:22:37 2010 +0100 MIPS: Deal with larger physical offsets AR7 has a larger physical offset than other MIPS based systems and therefore needs to setup its handlers beyond the usual KSEG0 range. When running the kernel in mapped mode this modification is also required. Remove function comment which is now incorrect. Signed-off-by: David Daney Signed-off-by: Eugene Konev Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org To: Thomas Bogendoerfer Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/889/ Patchwork: http://patchwork.linux-mips.org/patch/932/ Signed-off-by: Ralf Baechle commit 2d1b6e95515d63030b6e002125799f2aa52a9d27 Author: Florian Fainelli Date: Thu Jan 28 15:21:42 2010 +0100 MIPS: Annotate set_except_vector with __init All call sites of set_except_vector are already annotated with __init, so annotate that one too. Signed-off-by: Regards, Florian Fainelli To: linux-mips@linux-mips.org To: David Daney Patchwork: http://patchwork.linux-mips.org/patch/888/ Signed-off-by: Ralf Baechle commit 3482d713a91befb8c96722cb8d55aed36c212d9e Author: Florian Fainelli Date: Thu Jan 28 15:21:24 2010 +0100 MIPS: Move arch/mips/mm/uasm.h to arch/mips/include/asm/uasm.h Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org To: David Daney Patchwork: http://patchwork.linux-mips.org/patch/887/ Signed-off-by: Ralf Baechle commit fcf6735e9cf08343bef9ff43205d91ef102af52f Author: Yoichi Yuasa Date: Thu Jan 28 22:52:50 2010 +0900 MIPS: PNX8550: Remove unnecessary export prom_getcmdline() Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/886/ Signed-off-by: Ralf Baechle commit 5eb1df86c279b00ee476d0a2bc30059a527e6f4e Author: Yoichi Yuasa Date: Thu Jan 28 22:51:50 2010 +0900 MIPS: PNX833x: Remove unused prom_getcmdline() Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/885/ Signed-off-by: Ralf Baechle commit 60ec6571c5072cdea9e518d1dac8147b85ca93a2 Author: pascal@pabr.org Date: Sun Jan 3 13:39:12 2010 +0100 MIPS: Support 36-bit iomem on 32-bit Au1x00 I believe these changes are needed on Alchemy SoCs in order to use iomem above 4G with the usual platform_device machinery: - Set CONFIG_ARCH_PHYS_ADDR_T_64BIT to make resource_size_t 64-bit. - Increase IOMEM_RESOURCE_END so that platforms can register resources. To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/814/ Signed-off-by: Ralf Baechle commit fc48c41af81b953578a54f80ad07d2f1efa81378 Author: Wu Zhangjin Date: Wed Jan 27 22:39:46 2010 +0800 MIPS: Loongson: Cleanup the halt and poweroff action In the old source code, I have let halt and poweroff do the same action, but in reality, they have different meanings. As the manpage of shutdown shows: -r Reboot after shutdown. -H Halt action is to halt or drop into boot monitor on systems that support it. -P Halt action is to turn off the power. and in the real world, some machines(e.g. NAS) did not provide a power button and the shutdown works as reset, so, we need to provide a mechanism to let the users turn off the power safely without breaking the system, such a mechanism is "halt", which only put the system into a dead loop or a power-save mode and print some information to the screen to tell the users to turn off the power safely. $ shutdown -hH now /* loongson_halt, not turn off the power */ $ shutdown -hP now /* loongson_poweroff, work as poweroff */ Signed-off-by: Wu Zhangjin Tested-by: Liu Shiwei Cc: Liu Shiwei Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/883/ Signed-off-by: Ralf Baechle commit e52dd9fc6b9e0c17b220bd38371ff15032a1a155 Author: Wu Zhangjin Date: Tue Jan 26 23:02:34 2010 +0800 MIPS: Simplify the weak annotation with __weak Found by $ find arch/mips/ -name "*.c" | xargs -i grep -H weak {} | grep -v __weak [Ralf: Made this bulletproof by including ] Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/874/ Signed-off-by: Ralf Baechle commit aae7e8da806e1536fdee0632a40aaaeed97a2f1b Author: Manuel Lauss Date: Wed Jan 13 18:46:58 2010 +0100 MIPS: Alchemy: debug output for compressed kernels Hook up the compressed debug output for all Alchemy systems supported by current kernel codebase. Signed-off-by: Manuel Lauss To: Linux-MIPS Cc: Wu Zhangjin Patchwork: http://patchwork.linux-mips.org/patch/879/ Signed-off-by: Ralf Baechle commit 780019ddf02f214ad61e641b57b8ac30c837e2a7 Author: Florian Fainelli Date: Wed Jan 27 09:10:06 2010 +0100 MIPS: AR7: Implement clock API This patch makes the ar7 clock code implement the Linux clk API. Drivers using the various clocks available in the SoC are updated accordingly. Signed-off-by: Florian Fainelli Acked-by: Wim Van Sebroeck To: linux-mips@linux-mips.org Cc: Wim Van Sebroeck Cc: netdev@vger.kernel.org Cc: David Miller Patchwork: http://patchwork.linux-mips.org/patch/881/ Signed-off-by: Ralf Baechle commit 5f3c909881d5deebb9a3ddc836a15937e76daefc Author: Florian Fainelli Date: Sun Jan 3 21:16:51 2010 +0100 MIPS: AR7: Implement gpiolib This patch implements gpiolib for the AR7 SoC. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/816/ Signed-off-by: Ralf Baechle commit 69b427cd23b6f637763bf49e3e166c1236313f69 Author: Yoichi Yuasa Date: Tue Jan 26 18:02:58 2010 +0900 MIPS: msp71xx: remove unused prom_getcmdline() Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/868/ Signed-off-by: Ralf Baechle commit dac2965c434b22b5f8acd5634b842cf8a77a06b3 Author: Wu Zhangjin Date: Tue Jan 26 17:04:02 2010 +0800 MIPS: Cleanup the Makefile of compressed kernel support This patch removes a useless "\" (line break) and tunes the format of a long line. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/869/ Signed-off-by: Ralf Baechle commit 9fd4c4f40fecbe3923331eac045af06f369a86f2 Author: Yoichi Yuasa Date: Tue Jan 26 18:08:34 2010 +0900 MIPS: AR7: replace prom_getcmdline() to arcs_cmdline[] Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/872/ Signed-off-by: Ralf Baechle commit 9feb8367999265b8a300cb96e7a66f79b651c820 Author: Yoichi Yuasa Date: Tue Jan 26 18:07:02 2010 +0900 MIPS: AR7: use strlcat() for the command line arguments Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/871/ Signed-off-by: Ralf Baechle commit e0e53dee69e07e9446eb16ceabd55a1116611696 Author: Ralf Baechle Date: Sat Feb 27 12:53:14 2010 +0100 MIPS: Nuke trailing blank lines Recent git versions now warn about those and they've always been a bit of an annoyance. Signed-off-by: Ralf Baechle commit 2fe062608086f9b74a80f16272c5a59a3e05722f Author: Roel Kluin Date: Wed Jan 20 00:59:27 2010 +0100 MIPS: Cleanup switches with cases that can be merged Signed-off-by: Roel Kluin To: linux-mips@linux-mips.org To: Andrew Morton To: LKML Patchwork: http://patchwork.linux-mips.org/patch/860/ Signed-off-by: Ralf Baechle commit 1b362e3e350f72c6cb4b3346f6ba92a529082a09 Author: David Daney Date: Fri Jan 22 14:41:15 2010 -0800 MIPS: Decode c0_config4 for large TLBs. For processors that have more than 64 TLBs, we need to decode both config1 and config4 to determine the total number TLBs. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/866/ Signed-off-by: Ralf Baechle commit 2a880986d899f556f5a327bc77cc8760d5bb9c64 Author: David Daney Date: Fri Jan 22 14:41:14 2010 -0800 MIPS: Remove probe_tlb(). The function probe_tlb() only does anything for processors that are not PRID_COMP_LEGACY. This is precisely the set of processors for which decode_configs() is called to do identical tlbsize probing calculations. Therefore probe_tlb() is completely redundant and may be removed. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/865/ Signed-off-by: Ralf Baechle commit f868ba29723be46e0981226d7455090d515b08ef Author: Florian Fainelli Date: Wed Dec 16 11:29:06 2009 +0100 MIPS: add readl/write_be accessors MIPS currently lacks the readl_be and writel_be accessors which are required by BCM63xx for OHCI and EHCI support. Let's define them globally for MIPS. This also fixes the compilation of the bcm63xx defconfig against USB. Signed-off-by: Florian Fainelli Cc: Geert Uytterhoeven Cc: Thomas Bogendoerfer Cc: linux-mips@linux-mips.org Cc: Maxime Bizon Patchwork: http://patchwork.linux-mips.org/patch/793/ Signed-off-by: Ralf Baechle commit 9df7d1647fdd729c5bf3f087ae69d07fecf60bdd Author: Wu Zhangjin Date: Mon Jan 4 17:16:52 2010 +0800 MIPS: Loongson: Lemote-2F: update defconfig Changes: o Serial port related configuration Disable EARLY_PRINTK, CONFIG_SYS_SUPPORTS_ZBOOT_UART16550 Enable the serial port support as module. o PM related support Enable CPUFreq as module, use the external timer(MFGPT) instead of r4k timer. Enable Suspend support Enable Run Time PM support o Enable SM7XX Video Driver Disable the buggy 2d acceleration o Enable CONFIG_OPROFILE as module o Use GZIP instead of LZMA, which need less decompression time o Enable more USB devices support o Enable initrd support(needed by gNewsense) o Enable more crypto support Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/830/ Signed-off-by: Ralf Baechle commit f7a904dffe30a02636053d8022498ced7e44d31c Author: Wu Zhangjin Date: Mon Jan 4 17:16:51 2010 +0800 MIPS: Loongson: Change the Email address of Wu Zhangjin Currently wuzj@lemote.com is not usable; change it to wuzhangjin@gmail.com. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/829/ Signed-off-by: Ralf Baechle commit 50549bda2d47f419758dac9bc72e2b0eb9077d83 Author: Wu Zhangjin Date: Mon Jan 4 17:16:50 2010 +0800 MIPS: Loongson: Fixup mem.c indentation Replace whitespace by tabs. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/828/ Signed-off-by: Ralf Baechle commit 1ae86a67326741b35339c548838f16cceaa77222 Author: Wu Zhangjin Date: Mon Jan 4 17:16:49 2010 +0800 MIPS: Loongson: arch/mips/Makefile: Add missing whitespace This patch add missing whitespace after every "+=" in the loongson related part of arch/mips/Makefile. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/827/ Signed-off-by: Ralf Baechle commit eb11df472d8491fcb28534b59017e1b5465997fa Author: Wu Zhangjin Date: Mon Jan 4 17:16:48 2010 +0800 MIPS: Loongson: Cleanup of the environment variables Changes: o Move bus_clock into prom_init_env() o Initialize the cpu_clock_freq to the default values for the correspoding processor revisions if no such environment variable passed by BIOS/Bootloader. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/826/ Signed-off-by: Ralf Baechle commit 97e6a89634befaf5bd66d3044d36961c887cd98c Author: Wu Zhangjin Date: Mon Jan 4 17:16:47 2010 +0800 MIPS: Loongson: Move prom_argc and prom_argv into prom_init_cmdline() prom_argc and prom_argv are only used by prom_init_cmdline(), move them into the function. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/825/ Signed-off-by: Ralf Baechle commit c7e8c668b09a27879e8b45d2a613fb5acdf9f8a3 Author: Wu Zhangjin Date: Mon Jan 4 17:16:46 2010 +0800 MIPS: Loongson: Remove the serial port output of compressed kernel support The compressed kernel support on loongson family machines is stable now, so, remove the debug information via using SYS_SUPPORTS_ZBOOT instead of SYS_SUPPORTS_ZBOOT_UART16550. This may reduce the image size and speedup the booting. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/824/ Signed-off-by: Ralf Baechle commit 6f3209659833e3ed653840d19b2f624f6db07823 Author: Wu Zhangjin Date: Mon Jan 4 17:16:45 2010 +0800 MIPS: Loongson: Convert loongson_halt() to use unreachable() Use the new unreachable() macro instead of while(1); Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/823/ Signed-off-by: Ralf Baechle commit c70798f132818eaa79c48a08d0f19a7d61db8822 Author: Wu Zhangjin Date: Mon Jan 4 17:16:44 2010 +0800 MIPS: Loongson: Lemote-2F: USB: Not Emulate Non-Posted Writes Without this patch, when copying large amounts of data between the USB storage devices and the hard disk, the USB device will disconnect regularly. Signed-off-by: Hu Hongbing Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Patchwork: http://patchwork.linux-mips.org/patch/822/ Signed-off-by: Ralf Baechle commit 1b39a0bad50779177ebca818c6c3380463bfca7d Author: Wu Zhangjin Date: Mon Jan 4 17:16:43 2010 +0800 MIPS: Loongson: Lemote-2F: Get the machine type from PMON_VER Lemote have used the PMON_VER strings to indicate the loongson-2f machine series: PMON_VER=LM8089 Lemote 8.9'' netbook LM8101 Lemote 10.1'' netbook (The above two netbooks have the same kernel support) LM6XXX Lemote FuLoong(2F) box series LM9XXX Lemote LynLoong PC series Before the machtype is supported by the PMON, we can get the machine type from the PMON_VER for these machines, this will help the users a lot. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: yanh@lemote.com Cc: huhb@lemote.com Cc: zhangfx@lemote.com Cc: Wu Zhangjin Patchwork: http://patchwork.linux-mips.org/patch/821/ Patchwork: http://patchwork.linux-mips.org/patch/908/ Signed-off-by: Ralf Baechle commit 081f6749ae33f72b4fafea4c02976e163ef6ef37 Author: David Daney Date: Thu Jan 7 11:05:06 2010 -0800 Staging: Octeon Ethernet: Use constants from in.h Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/837/ Signed-off-by: Ralf Baechle commit 924cc2680fbe181066ec138d369691d28d913ea2 Author: David Daney Date: Thu Jan 7 11:05:05 2010 -0800 Staging: Octeon Ethernet: Enable scatter-gather. Octeon ethernet hardware can handle NETIF_F_SG, so we enable it. A gather list of up to six fragments will fit in the SKB's CB structure, so no extra memory is required. If a SKB has more than six fragments, we must linearize it. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/838/ Signed-off-by: Ralf Baechle commit 3368c784bcf77124aaf39372e627016c36bd4472 Author: David Daney Date: Thu Jan 7 11:05:04 2010 -0800 Staging: Octeon Ethernet: Convert to NAPI. Convert the driver to be a reasonably well behaved NAPI citizen. There is one NAPI instance per CPU shared between all input ports. As receive backlog increases, NAPI is scheduled on additional CPUs. Receive buffer refill code factored out so it can also be called from the periodic timer. This is needed to recover from temporary buffer starvation conditions. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/839/ Signed-off-by: Ralf Baechle commit 6888fc87768eaa218b6244f2e78c55416706981a Author: David Daney Date: Thu Jan 7 11:05:03 2010 -0800 Staging: Octeon Ethernet: Rewrite transmit code. Stop the queue if too many packets are queued. Restart it from a high resolution timer. Rearrange and simplify locking and SKB freeing code Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/843/ Signed-off-by: Ralf Baechle commit 166bdaa9aad9903bf4330ef68feb37f220c9eac8 Author: David Daney Date: Wed Jan 27 13:22:53 2010 -0800 Staging: Octeon Ethernet: Fix memory allocation. After aligning the blocks returned by kmalloc, we need to save the original pointer so they can be correctly freed. There are no guarantees about the alignment of SKB data, so we need to handle worst case alignment. Since right shifts over subtraction have no distributive property, we need to fix the back pointer calculation. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/884/ Signed-off-by: Ralf Baechle commit 6568a234363978e1aebb5b7c9840ed87eed20362 Author: David Daney Date: Thu Jan 7 11:05:01 2010 -0800 Staging: Octeon Ethernet: Remove unused code. Remove unused code, reindent, and join some spilt strings. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/842/ Signed-off-by: Ralf Baechle commit dbb103b243e09475c84df2b8ef17615975593761 Author: David Daney Date: Thu Jan 7 11:05:00 2010 -0800 MIPS: Octeon: Fix EOI handling. If an interrupt handler disables interrupts, the EOI function will just reenable them. This will put us in an endless loop when the upcoming Ethernet driver patches are applied. Only reenable the interrupt on EOI if it is not IRQ_DISABLED. This requires that the EOI function be separate from the ENABLE function. We also rename the ACK functions to correspond with their function. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/840/ Signed-off-by: Ralf Baechle commit 6b07d38aaa520cee922fadfeaf90c97faf217045 Author: David Daney Date: Fri Jan 8 17:17:44 2010 -0800 MIPS: Octeon: Use optimized memory barrier primitives. In order to achieve correct synchronization semantics, the Octeon port had defined CONFIG_WEAK_REORDERING_BEYOND_LLSC. This resulted in code that looks like: sync ll ... . . . sc ... . . sync The second SYNC was redundant, but harmless. Octeon has a SYNCW instruction that acts as a write-memory-barrier (due to an erratum in some parts two SYNCW are used). It is much faster than SYNC because it imposes ordering on the writes, but doesn't otherwise stall the execution pipeline. On Octeon, SYNC stalls execution until all preceeding writes are committed to the coherent memory system. Using: syncw;syncw ll . . . sc . . Has identical semantics to the first sequence, but is much faster. The SYNCW orders the writes, and the SC will not complete successfully until the write is committed to the coherent memory system. So at the end all preceeding writes have been committed. Since Octeon does not do speculative reads, this functions as a full barrier. The patch removes CONFIG_WEAK_REORDERING_BEYOND_LLSC, and substitutes SYNCW for SYNC in write-memory-barriers. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/850/ Signed-off-by: Ralf Baechle commit f252ffd50c97dae87b45f1dbad24f71358ccfbd6 Author: David Daney Date: Fri Jan 8 17:17:43 2010 -0800 MIPS: New macro smp_mb__before_llsc. Replace some instances of smp_llsc_mb() with a new macro smp_mb__before_llsc(). It is used before ll/sc sequences that are documented as needing write barrier semantics. The default implementation of smp_mb__before_llsc() is just smp_llsc_mb(), so there are no changes in semantics. Also simplify definition of smp_mb(), smp_rmb(), and smp_wmb() to be just barrier() in the non-SMP case. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/851/ Signed-off-by: Ralf Baechle commit ec5380c768864c7afd92aa886dd4bb6d38497a01 Author: David Daney Date: Thu Jan 7 14:33:30 2010 -0800 MIPS: Remove unused macros from barrier.h The smp_llsc_rmb() and smp_llsc_wmb() macros are not used in the tree, remove them. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/848/ Signed-off-by: Ralf Baechle commit d95770544604299402e481771a964b0f10d46978 Author: David Daney Date: Thu Jan 7 11:54:21 2010 -0800 MIPS: Octeon: Register some devices on the I2C bus. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: linux-i2c@vger.kernel.org To: ben-linux@fluff.org To: khali@linux-fr.org Cc: Rade Bozic Patchwork: http://patchwork.linux-mips.org/patch/845/ Signed-off-by: Ralf Baechle commit 85660f43a308cc601b243c1f4dc18a63545c5cfa Author: Rade Bozic Date: Thu Jan 28 12:47:07 2010 -0800 MIPS: I2C: Add driver for Cavium OCTEON I2C ports. Signed-off-by: Rade Bozic Signed-off-by: David Daney Cc: Michael Lawnick To: linux-mips@linux-mips.org To: linux-i2c@vger.kernel.org To: ben-linux@fluff.org To: khali@linux-fr.org Cc: rade.bozic.ext@nsn.com Cc: Michael Lawnick Patchwork: http://patchwork.linux-mips.org/patch/890/ Signed-off-by: Ralf Baechle commit f41c3c1b3ed53440b37445712f8e1048a39d7001 Author: David Daney Date: Thu Jan 7 13:23:41 2010 -0800 MIPS: Octeon: Add I2C platform device. Signed-off-by: David Daney To: linux-mips@linux-mips.org To: linux-i2c@vger.kernel.org To: ben-linux@fluff.org To: khali@linux-fr.org Cc: Rade Bozic Patchwork: http://patchwork.linux-mips.org/patch/847/ Signed-off-by: Ralf Baechle commit d38760ccdf879a8648be53488227bf7fe597792d Author: Robert P. J. Day Date: Thu Dec 31 15:39:00 2009 -0500 MIPS: Simplify param.h by using Signed-off-by: Robert P. J. Day To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/810/ Signed-off-by: Ralf Baechle commit 32fd6901a6d8d19f94e4de6be4e4b552ab078620 Author: Manuel Lauss Date: Tue Dec 8 19:18:13 2009 +0100 MIPS: Alchemy: get rid of common/reset.c Implement reset / poweroff in the board code instead. The peripheral reset code is gone too since YAMON which all in-tree boards use does the same work when it boots. Signed-off-by: Manuel Lauss Signed-off-by: Yoichi Yuasa Cc: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/783/ Patchwork: http://patchwork.linux-mips.org/patch/882/ Signed-off-by: Ralf Baechle commit 325f8a0a31df567dbafafc48f8e60f3c1f101a46 Author: David Daney Date: Fri Dec 4 13:52:36 2009 -0800 MIPS: Two-level pagetables for 64-bit kernels with 64KB pages. For 64-bit kernels with 64KB pages and two level page tables, there are 42 bits worth of virtual address space This is larger than the 40 bits of virtual address space obtained with the default 4KB Page size and three levels, so there are no draw backs for using two level tables with this configuration. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/761/ Signed-off-by: Ralf Baechle commit ef6c1fd662d18c0e2ed92825c8837e94b5ec3a1f Author: Manuel Lauss Date: Mon Nov 23 20:40:02 2009 +0100 MIPS: Alchemy: irq: use runtime CPU type detection Use runtime CPU detection instead of relying on preprocessor symbols. Signed-off-by: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/701/ Signed-off-by: Ralf Baechle commit 5d400f5c59df3ed2c3682a7409c8e81a7c4e650c Author: Manuel Lauss Date: Mon Nov 23 20:40:01 2009 +0100 MIPS: Alchemy: Only build AU1000 INTC code for compatible cpus Use the GPIO config symbol to only build Au1000 interrupt code on chips with compatible hw. Signed-off-by: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/670/ Signed-off-by: Ralf Baechle commit 70f82f2c59be86fad915a2ee62673fe1aad6c2bd Author: Manuel Lauss Date: Mon Nov 23 20:40:00 2009 +0100 MIPS: Alchemy: use runtime cpu detection in GPIO code. Remove the cpu subtype cpp macros in favor of runtime detection, to improve compile coverage of the alchemy common code. (Increases kernel size by 700 bytes). Signed-off-by: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/699/ Signed-off-by: Ralf Baechle commit bd2302c220566cffd0756e1ac5f65705f9e3d8e7 Author: Florian Fainelli Date: Tue Nov 10 01:13:38 2009 +0100 NET: au1000-eth: Convert to platform_driver model This patch converts the au1000-eth driver to become a full platform-driver as it ought to be. We now pass PHY-speficic configurations through platform_data but for compatibility the driver still assumes the default settings (search for PHY1 on MAC0) when no platform_data is passed. Tested on my MTX-1 board. Signed-off-by: Florian Fainelli Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org Acked-by: David S. Miller Patchwork: http://patchwork.linux-mips.org/patch/619/ Patchwork: http://patchwork.linux-mips.org/patch/963/ Signed-off-by: Ralf Baechle commit 66f75ccb856304c190fde9c26e651c2b754e3e72 Author: Florian Fainelli Date: Tue Nov 10 01:13:30 2009 +0100 MIPS: Alchemy: Add au1000-eth platform device This patch makes the board code register the au1000-eth platform device. The au1000-eth platform data can be overriden with the au1xxx_override_eth_cfg function like it has to be done for the Bosporus board which uses a different MAC/PHY setup. Signed-off-by: Florian Fainelli Cc: David Miller Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/618/ Signed-off-by: Ralf Baechle commit cf6e47e03239059bcf2942b1b3242e835231ab75 Author: Manuel Lauss Date: Mon Nov 2 21:21:45 2009 +0100 MIPS: Alchemy: DB1200 defconfig update Signed-off-by: Manuel Lauss Cc: Linux-MIPS Signed-off-by: Ralf Baechle commit 05ae3231801df8fdb4e1c0aa4aa6b8d7278eddde Author: Manuel Lauss Date: Mon Nov 2 21:21:44 2009 +0100 MIPS/SOUND: Alchemy: DB1200 AC97+I2S audio support. Machine driver for DB1200 AC97 and I2S audio systems, intended as a proper reference asoc machine for Alchemy-based systems. AC97/I2S can be selected at boot time by setting switch S6.7. Signed-off-by: Manuel Lauss Cc: Linux-MIPS Cc: alsa-devel@alsa-project.org Cc: Mark Brown Acked-by: Mark Brown Signed-off-by: Ralf Baechle commit 63323ec54a7e922a232c82070727e44eb1a5b43c Author: Manuel Lauss Date: Mon Nov 2 21:21:43 2009 +0100 MIPS: Alchemy: Extended DB1200 board support. Create own directory for DB1200 code and update it with new features. - SPI support: - tmp121 temperature sensor - SPI flash on DB1200 - I2C support - NE1619 sensor - AT24 eeprom - I2C/SPI can be selected at boot time via switch S6.8 - Carddetect IRQs for SD cards. - gen_nand based NAND support. - hexleds count sleep/wake transitions. Signed-off-by: Manuel Lauss Cc: Linux-MIPS Signed-off-by: Ralf Baechle commit 206aa6cdadad8bbedee5649f1346fe47e922a039 Author: Manuel Lauss Date: Mon Oct 19 12:53:37 2009 +0200 MIPS: Alchemy: physmap-flash for all devboards Replace the devboard NOR MTD mapping driver with physmap-flash support. Also honor the "swapboot" switch settings wrt. to the layout of the NOR partitions. Signed-off-by: Manuel Lauss Cc: Linux-MIPS Acked-By: David Woodhouse Signed-off-by: Ralf Baechle commit 8facefd0907ae16f96a35bef7ce654206d87c2fc Author: Ralf Baechle Date: Sat Feb 27 12:52:57 2010 +0100 MIPS: Don't include unnecessarily. Signed-off-by: Ralf Baechle commit b2b13cdfd05ec331e1be3bbdd593d66840c0b688 Author: Manuel Lauss Date: Wed Oct 28 21:37:28 2009 +0100 SERIAL 8250: Fixes for Alchemy UARTs. Limit the amount of address space claimed for Alchemy serial ports to 0x1000. On the Au1300, ports are only 0x1000 apart, and the registers only extend to 0x110 at most on all supported alchemy models. On the Au1300 the autodetect logic no longer works and this makes it necessary to specify the port type through platform data. Because of this the MSR quirk needs to be moved outside the autoconfig() function which will no longer be called when UPF_FIXED_TYPE is specified. Signed-off-by: Manuel Lauss Cc: Andrew Morton , Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Signed-off-by: Ralf Baechle commit 63ea336b7942214edce1ae79725f28593dc84eaa Author: Manuel Lauss Date: Wed Oct 28 21:49:46 2009 +0100 MIPS: Alchemy: UARTs are of type 16550A UART autodetection breaks on the Au1300 but the IP blocks are identical, at least according to the datasheets. Help the 8250 driver by passing on uart type information via platform data. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit c55736af449ad2b2cd1a9471dc6e5413d89a1ece Author: Florian Fainelli Date: Sun Oct 18 16:04:41 2009 +0200 MIPS: Alchemy: Turn on -Werror for devboards and xss1500 Warnings being suppressed, we can now turn on -Werror for boards which did not have it already (devboards and xss1500). Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 32fc0adeb89c7e1e592bf31b7158ddc154298207 Author: Florian Fainelli Date: Sun Oct 18 16:04:09 2009 +0200 MIPS: Alchemy: Fix warnings in DB1x00 / PB1000 / PB1550 board setup code This patch fixes warnings due to potentially unused variables in board setup code or mixed variables declaration and code (forbidden by ISO C90). Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 66a1d9baf4962defb3fc41439e3a22e752182f9f Author: Manuel Lauss Date: Thu Oct 15 19:32:01 2009 +0200 MIPS: Alchemy: remove unused SYS area structure Nothing in-tree uses it, so get rid of it. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit b6e6d120c8dd9c9cd888645b01299e2a55d873a4 Author: Manuel Lauss Date: Thu Oct 15 19:07:34 2009 +0200 MIPS: Alchemy: get rid of superfluous UART definitions Remove unused uart bit definitions and base macros. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 8402a1588a4f63465079e98481dd83d1d9cc9a98 Author: Manuel Lauss Date: Thu Oct 15 18:49:27 2009 +0200 MIPS: Alchemy: prom_putchar is board dependent This patch replaces the general alchemy prom_putchar() implementation in favor of board-specific versions: The UART where the output of prom_putchar is directed to really depends on the board, the current implementation hardcodes this on a per-SoC basis which is just wrong. So a generic uart tx function is provided in the alchemy headers, and the boards can provide their own prom_putchar with custom destination uart, and all in-kernel alchemy boards support early printk. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 963accbc82a0912b39de39d59e2fd6741db3aa4b Author: Manuel Lauss Date: Tue Oct 13 20:22:35 2009 +0200 MIPS: Alchemy: change dbdma to accept physical memory addresses DMA can only be done from physical addresses; move the "virt_to_phys" source/destination buffer address translation from the dbdma queueing functions (since the hardware can only DMA to/from physical addresses) to their respective users. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit ea071cc705e8bfba0c8bf84be8d4f9f4e9da6962 Author: Manuel Lauss Date: Tue Oct 13 20:22:34 2009 +0200 MIPS: Alchemy: remove dbdma compat macros Remove dbdma compat macros, move remaining users over to default queueing functions and -flags. (Queueing function signature has changed in order to give a build failure instead of silent functional changes due to the no longer implicitly specified DDMA_FLAGS_IE flag) Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit f1fc6645a4d2cb944320ce8ed1e40f88059779e1 Author: Manuel Lauss Date: Tue Oct 13 20:26:31 2009 +0200 MIPS: Alchemy: reduce size of irq dispatcher By replacing an extra do_IRQ with a goto, the assembly shrinks from 260 to 212 bytes (gcc-4.3.4). Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 788144656b8a862e724a1296e64ab6375eb541ed Author: Manuel Lauss Date: Wed Oct 7 20:15:15 2009 +0200 MIPS: Alchemy: Stop IRQ name sharing Eliminate the sharing of IRQ names among the differenct Alchemy variants. IRQ numbers need no longer be hidden behind a CONFIG_SOC_AU1XXX symbol: step 1 in my quest to make the Alchemy code less reliant on a hardcoded subtype. This patch also renames the GPIO irq number constants. It's really an interrupt line, NOT a GPIO number! Code which relied on certain irq numbers to have the same name across all supported cpu subtypes is changed to determine current cpu subtype at runtime; in some places this isn't possible so a "compat" symbol is used. Run-tested on DB1200. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 93e9cd8485b31e5a33f1040bff4d15e65c0b2d19 Author: Manuel Lauss Date: Wed Oct 7 20:15:14 2009 +0200 MIPS: Alchemy: Simple cpu subtype detector Extract the alchemy chip variant from c0_prid register. Signed-off-by: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/14/ Patchwork: http://patchwork.linux-mips.org/patch/707/ Signed-off-by: Ralf Baechle commit 0a0b1295ef26a5f8387771c148fb63dccf897869 Author: Manuel Lauss Date: Wed Oct 7 20:15:13 2009 +0200 MIPS: Alchemy: higher priority for system timer. Raise RTCMATCH2 interrupt priority in case it is used as the system timer tick. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 5047201b56ce8671cc19f426e2951de9f29b3485 Author: Manuel Lauss Date: Wed Oct 7 20:15:12 2009 +0200 MIPS: Alchemy: Remove USB_DEV_REQ_INT prioritization hack The Alchemy hardware provides a method to prioritize interrupts on a controller by assigning them to a differenct core request line. Assign usb device request interrupt to IC0 Request 0 (which has highest priority in the core and the dispatcher) and others to Request 1. The explicit check for usb device request occurrence should be obsolete now. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 0273b4efccd3bc2b2ef5ea9778e71d8efbbb7ac7 Author: Manuel Lauss Date: Sun Oct 4 14:55:29 2009 +0200 MIPS: Alchemy: XXS1500 PCMCIA driver rewrite Rewritten XXS1500 PCMCIA socket driver, standalone (doesn't depend on au1000_generic.c) and added carddetect IRQ support. Signed-off-by: Manuel Lauss Cc: Florian Fainelli Cc: Linux-PCMCIA Signed-off-by: Ralf Baechle commit 27dd65ac9afabc8e67ab73f7c2f575eddbb47167 Author: Manuel Lauss Date: Sun Oct 4 14:55:28 2009 +0200 MIPS: Alchemy: devboards: wire up new PCMCIA driver. Register the PCMCIA driver on all boards supported by it, get rid of now-unused pcmcia macros in the board headers (and subsequently empty pb1100/pb1500 ones). Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 66213b3ccfc770704025ce9465fa3aaedde21b55 Author: Manuel Lauss Date: Sun Oct 4 14:55:27 2009 +0200 MIPS: PCMCIA: new socket driver for Au1000 demoboards. New PCMCIA socket driver for all Db/Pb1xxx boards (except Pb1000), which replaces au1000_db1x00.c and (most of) au1000_pb1x00.c. Notable improvements: - supports Db1000, DB/PB1100/1500/1550/1200. - support for carddetect and statuschange IRQs. - pcmcia socket mem/io/attr areas and irqs passed through platform resource information. - doesn't freeze system during card insertion/ejection like the one it replaces. - boardtype is automatically detected using BCSR ID register. Run-tested on the DB1200. Cc: Linux-PCMCIA Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 7e50b2b741bb4f9dbddc9f56972ef82a7d4b33ed Author: Manuel Lauss Date: Sun Oct 4 14:55:26 2009 +0200 MIPS: Alchemy: remove board_init_irq() function. remove board_init_irq(): On all in-kernel boards it is sufficient to initialize board interrupts in an arch_initcall by using the default linux irq functions. Some small irqmap.c files have been folded into board_setup files. Run-tested on DB1200; compile-tested on all other affected boards. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 95a437966dba642870a93d16bf82af8926bb2082 Author: Manuel Lauss Date: Sun Oct 4 14:55:25 2009 +0200 MIPS: Alchemy: devboards: factor out PB1200 IRQ cascade code. Move the PB1200 IRQ cascade code out to the BCSR support code: upcoming DB1300 support can use it too. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 9bdcf336d0c061e77f4c45c7b2bc32e3ed6b57e3 Author: Manuel Lauss Date: Sun Oct 4 14:55:24 2009 +0200 MIPS: Alchemy: devboard register abstraction All Alchemy development boards have external CPLDs with a few registers in them. They all share an identical register layout with only a few minor differences (except the PB1000) in bit functions and base addresses. This patch - adds a primitive facility to initialize and use these external registers, - replaces all occurrences of bcsr->xxx accesses with calls to the new functions (the pb1200 cascade irq handling code is special). - collects BCSR register information scattered throughout the board headers in a central place. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit ebc89718a4b3fa0e440151fb4484541700828a5d Author: Ralf Baechle Date: Fri Feb 26 13:57:12 2010 +0100 MIPS: Fix build error for uncompressed non-plain vmlinux kernels Seen on rm200_defconfig for example: CC arch/mips/boot/compressed/decompress.o /home/ralf/src/linux/upstream-linus/arch/mips/boot/compressed/decompress.c: In function ‘decompress_kernel’: /home/ralf/src/linux/upstream-linus/arch/mips/boot/compressed/decompress.c:116: error: implicit declaration of function ‘decompress’ make[3]: *** [arch/mips/boot/compressed/decompress.o] Error 1 make[2]: *** [vmlinuz.ecoff] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 Signed-off-by: Ralf Baechle commit 21c2fd9970cc8e457058f84016450a2e9876125e Author: Ingo Molnar Date: Fri Feb 26 11:17:16 2010 +0100 x86: apic: Fix mismerge, add arch_probe_nr_irqs() again Merge commit aef55d4922 mis-merged io_apic.c so we lost the arch_probe_nr_irqs() method. This caused subtle boot breakages (udev confusion likely due to missing drivers) with certain configs. Cc: H. Peter Anvin Cc: Yinghai Lu LKML-Reference: <20100207210250.GB8256@jenkins.home.ifup.org> Signed-off-by: Ingo Molnar commit 78c06176466cbd1b3f0f67709d3023c40dbebcbd Author: Russ Anderson Date: Fri Feb 26 10:49:12 2010 -0600 x86: Enable NMI on all cpus on UV Enable NMI on all cpus in UV system and add an NMI handler to dump_stack on each cpu. By default on x86 all the cpus except the boot cpu have NMI masked off. This patch enables NMI on all cpus in UV system and adds an NMI handler to dump_stack on each cpu. This way if a system hangs we can NMI the machine and get a backtrace from all the cpus. Version 2: Use x86_platform driver mechanism for nmi init, per Ingo's suggestion. Version 3: Clean up Ingo's nits. Signed-off-by: Russ Anderson LKML-Reference: <20100226164912.GA24439@sgi.com> Signed-off-by: Ingo Molnar commit 2ea186ae533c7b4f4c56811b69d3e40a6209a9c0 Author: John Fastabend Date: Sat Feb 27 03:28:24 2010 -0800 ixgbe: move TC_PRIO_CONTROL check into ixgbe_select_queue() Move TC_PRIO_CONTROL check and queue remapping into ixgbe_select_queue(). Remapping queues after the qdisc can result in the wrong qdisc queue being stopped with netif_stop_subqueue(). Even if this is resolved and the correct queue is stopped it can result in a queue being blocked by TC_PRIO_CONTROL frames uneccesarily. Moving this into the select_queue routine maintains alignment between tx_rings and qdisc queues. Signed-off-by: John Fastabend Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit da3f5cf1f8ebb0fab5c5fd09adb189166594ad6c Author: Felix Fietkau Date: Tue Feb 23 11:45:51 2010 +0000 skbuff: align sk_buff::cb to 64 bit and close some potential holes The alignment requirement for 64-bit load/store instructions on ARM is implementation defined. Some CPUs (such as Marvell Feroceon) do not generate an exception, if such an instruction is executed with an address that is not 64 bit aligned. In such a case, the Feroceon corrupts adjacent memory, which showed up in my tests as a crash in the rx path of ath9k that only occured with CONFIG_XFRM set. This crash happened, because the first field of the mac80211 rx status info in the cb is an u64, and changing it corrupted the skb->sp field. This patch also closes some potential pre-existing holes in the sk_buff struct surrounding the cb[] area. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: David S. Miller commit 8d6184e4881b423522136aeb3ec1cbd9c35e8813 Author: Patrick McHardy Date: Sat Feb 27 02:52:05 2010 -0800 bonding: fix device leak on error in bond_create() When the register_netdevice() call fails, the newly allocated device is not freed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3729d5021257b283f7fce33d957893162ccb2c9d Author: Patrick McHardy Date: Fri Feb 26 06:34:54 2010 +0000 rtnetlink: support specifying device flags on device creation commit e8469ed959c373c2ff9e6f488aa5a14971aebe1f Author: Patrick McHardy Date: Tue Feb 23 20:41:30 2010 +0100 Support specifying the initial device flags when creating a device though rtnl_link. Devices allocated by rtnl_create_link() are marked as INITIALIZING in order to surpress netlink registration notifications. To complete setup, rtnl_configure_link() must be called, which performs the device flag changes and invokes the deferred notifiers if everything went well. Two examples: # add macvlan to eth0 # $ ip link add link eth0 up allmulticast on type macvlan [LINK]11: macvlan0@eth0: mtu 1500 qdisc noqueue state UNKNOWN link/ether 26:f8:84:02:f9:2a brd ff:ff:ff:ff:ff:ff [ROUTE]ff00::/8 dev macvlan0 table local metric 256 mtu 1500 advmss 1440 hoplimit 0 [ROUTE]fe80::/64 dev macvlan0 proto kernel metric 256 mtu 1500 advmss 1440 hoplimit 0 [LINK]11: macvlan0@eth0: mtu 1500 link/ether 26:f8:84:02:f9:2a [ADDR]11: macvlan0 inet6 fe80::24f8:84ff:fe02:f92a/64 scope link valid_lft forever preferred_lft forever [ROUTE]local fe80::24f8:84ff:fe02:f92a via :: dev lo table local proto none metric 0 mtu 16436 advmss 16376 hoplimit 0 [ROUTE]default via fe80::215:e9ff:fef0:10f8 dev macvlan0 proto kernel metric 1024 mtu 1500 advmss 1440 hoplimit 0 [NEIGH]fe80::215:e9ff:fef0:10f8 dev macvlan0 lladdr 00:15:e9:f0:10:f8 router STALE [ROUTE]2001:6f8:974::/64 dev macvlan0 proto kernel metric 256 expires 0sec mtu 1500 advmss 1440 hoplimit 0 [PREFIX]prefix 2001:6f8:974::/64 dev macvlan0 onlink autoconf valid 14400 preferred 131084 [ADDR]11: macvlan0 inet6 2001:6f8:974:0:24f8:84ff:fe02:f92a/64 scope global dynamic valid_lft 86399sec preferred_lft 14399sec # add VLAN to eth1, eth1 is down # $ ip link add link eth1 up type vlan id 1000 RTNETLINK answers: Network is down Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bd38081160bb3d036db98472e537b6a7dd4da51a Author: Patrick McHardy Date: Fri Feb 26 06:34:53 2010 +0000 dev: support deferring device flag change notifications Split dev_change_flags() into two functions: __dev_change_flags() to perform the actual changes and __dev_notify_flags() to invoke netdevice notifiers. This will be used by rtnl_link to defer netlink notifications until the device has been fully configured. This changes ordering of some operations, in particular: - netlink notifications are sent after all changes have been performed. As a side effect this surpresses one unnecessary netlink message when the IFF_UP and other flags are changed simultaneously. - The NETDEV_UP/NETDEV_DOWN and NETDEV_CHANGE notifiers are invoked after all changes have been performed. Their relative is unchanged. - net_dmaengine_put() is invoked before the NETDEV_DOWN notifier instead of afterwards. This should not make any difference since both RX and TX are already shut down at this point. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a2835763e130c343ace5320c20d33c281e7097b7 Author: Patrick McHardy Date: Fri Feb 26 06:34:51 2010 +0000 rtnetlink: handle rtnl_link netlink notifications manually In order to support specifying device flags during device creation, we must be able to roll back device registration in case setting the flags fails without sending any notifications related to the device to userspace. This patch changes rollback_registered_many() and register_netdevice() to manually send netlink notifications for devices not handled by rtnl_link and allows to defer notifications for devices handled by rtnl_link until setup is complete. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 10de05afe01c12cedc42eb9ce05b111eed6c8210 Author: Patrick McHardy Date: Fri Feb 26 06:34:50 2010 +0000 rtnetlink: ignore NETDEV_PRE_UP notifier in rtnetlink_event() Commit 3b8bcfd (net: introduce pre-up netdev notifier) added a new notifier which is run before a device is set UP for use by cfg80211. The patch missed to add the new notifier to the ignore list in rtnetlink_event(), so we currently get an unnecessary netlink notification before a device is set UP. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit cb395eaf439625f26c8527bb05bb905774a54c36 Author: Anatolij Gustschin Date: Fri Feb 26 12:00:49 2010 +0000 fs_enet: add FEC TX buffer alignment workaround for MPC5121 MPC5121 FEC requeries 4-byte alignmnent for TX data buffers. This patch is a work around that copies misaligned tx packets to an aligned skb before sending. Signed-off-by: John Rigby Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Anatolij Gustschin Acked-by: Grant Likely Signed-off-by: David S. Miller commit 60ab4361adc188fb47da1c4892cc7a2bb621efef Author: Anatolij Gustschin Date: Fri Feb 26 12:00:48 2010 +0000 fs_enet: Add support for MPC512x to fs_enet driver Extend the fs_enet driver to support MPC512x FEC. Enable it with CONFIG_FS_ENET_MPC5121_FEC option. Signed-off-by: John Rigby Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Anatolij Gustschin Acked-by: Grant Likely Signed-off-by: David S. Miller commit fcb6a1c83e48c30ff99624e9c46ce301707ede05 Author: Anatolij Gustschin Date: Fri Feb 26 12:00:47 2010 +0000 fs_enet: use dev_xxx instead of printk Signed-off-by: Anatolij Gustschin Acked-by: Grant Likely Signed-off-by: David S. Miller commit ce300c7ffa61165f9bfd16e511ee0cd4114977ab Merge: 8266d71 9e3bd91 Author: David S. Miller Date: Sat Feb 27 02:05:54 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 480917427b0b6ff39de55ffc81391055472e6c26 Merge: 6fb8302 f1c7f51 Author: Ingo Molnar Date: Sat Feb 27 10:41:16 2010 +0100 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core commit 6fb83029db161141d68cf019760a893d03d0682b Merge: 281b371 e01292b Author: Ingo Molnar Date: Sat Feb 27 10:06:10 2010 +0100 Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core commit 71da81324c83ef65bb196c7f874ac1c6996d8287 Author: Paul E. McKenney Date: Fri Feb 26 16:38:58 2010 -0800 rcu: Fix accelerated GPs for last non-dynticked CPU This patch disables irqs across the call to rcu_needs_cpu(). It also enforces a hold-off period so that the idle loop doesn't softirq itself to death when there are lots of RCU callbacks in flight on the last non-dynticked CPU. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267231138-27856-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 0b1c87278a8c7e394022ec184a0b44a3886b6fde Author: Paul E. McKenney Date: Fri Feb 26 16:38:57 2010 -0800 rcu: Make non-RCU_PROVE_LOCKING rcu_read_lock_sched_held() understand boot Before the scheduler starts, all tasks are non-preemptible by definition. So, during that time, rcu_read_lock_sched_held() needs to always return "true". This patch makes that be so for RCU_PROVE_LOCKING=n. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267231138-27856-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit a47cd880b50e14b0b6f5e9d426ae9a2676c9c474 Author: Paul E. McKenney Date: Fri Feb 26 16:38:56 2010 -0800 rcu: Fix accelerated grace periods for last non-dynticked CPU It is invalid to invoke __rcu_process_callbacks() with irqs disabled, so do it indirectly via raise_softirq(). This requires a state-machine implementation to cycle through the grace-period machinery the required number of times. Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267231138-27856-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 1c32fd0c5ac1ccbdc37a1a392a5d75cbe059b401 Author: Ilya Dryomov Date: Fri Feb 26 13:06:03 2010 -0800 kernel-doc: drop the -filelist option, it doesn't work I also found the -filelist option, but apparently the implementation is broken, and it was broken from the very first git commit. For the -filelist option I suggest the removal (I wasn't able to find any users of it, moreover it's not even listed in the usage() output, so presumably nobody knows about it). Signed-off-by: Ilya Dryomov Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a9e7314b7940cee00b80995b360dbc06f995cc6e Author: Ilya Dryomov Date: Fri Feb 26 13:05:47 2010 -0800 kernel-doc: track line numbers for each file separately The problem is that $. keeps track of the current record number (which is line number by default). But if you pass it multiple files, it does not wrap at the end of file, and therefore contains the *total* number of processed lines. I suppose we can fix line numbering by introducing a simple assignment $. = 1 before processing every new file. Signed-off-by: Ilya Dryomov Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 06a79b82b2a3e4bebb9a20638ca208c780e9e507 Merge: 4912002 a9c9b44 Author: Linus Torvalds Date: Fri Feb 26 17:22:53 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Fix preallocating of memory PM / Hibernate: Remove swsusp.c finally PM / Hibernate: Remove trailing space in message PM: Allow SCSI devices to suspend/resume asynchronously PM: Allow USB devices to suspend/resume asynchronously USB: implement non-tree resume ordering constraints for PCI host controllers PM: Allow PCI devices to suspend/resume asynchronously PM / Hibernate: Swap, remove useless check from swsusp_read() PM / Hibernate: Really deprecate deprecated user ioctls PM: Allow device drivers to use dpm_wait() PM: Start asynchronous resume threads upfront PM: Add facility for advanced testing of async suspend/resume PM: Add a switch for disabling/enabling asynchronous suspend/resume PM: Asynchronous suspend and resume of devices PM: Add parent information to timing messages PM: Document device power attributes in sysfs PM / Runtime: Add sysfs switch for disabling device run-time PM commit 4912002fffa377e66c5caefc2c311732a4ad5fb8 Author: Christian Kujau Date: Fri Feb 26 17:25:14 2010 +0000 Remove EXPERIMENTAL from NFS_FSCACHE There's currently an open Ubuntu bug[0], with the intent to compile NFS_FSCACHE (and possibly AFS_FSCACHE, 9P_FSCACHE) into the standard Ubuntu kernel. However, since *_FSCACHE still depends on EXPERIMENTAL, this won't happen. As Arjan van de Ven pointed out[1], the EXPERIMENTAL flag doesn't mean that much any more, I propose the following patch to fs/nfs/Kconfig. I'd do the same for fs/9p/Kconfig and fs/afs/Kconfig, but as I did not test 9p or AFS, I feel it would not be appropriate for me to remove the flag. [0] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/440522/comments/5 [1] http://lkml.org/lkml/2010/1/23/145 Signed-off-by: Christian Kujau Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 98723153dc32106e5be701da15551853c9f785a9 Merge: 4cbd551 6335e4d Author: Linus Torvalds Date: Fri Feb 26 17:20:18 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: toshiba_acpi: Add full hotkey support hp-wmi: Add support for tablet rotation key dell-laptop: Add another Dell laptop to the DMI whitelist classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases dell-laptop: Pay attention to which devices the hardware switch controls dell-laptop: Use buffer with 32-bit physical address dell-laptop: Blacklist machines not supporting dell-laptop dell-laptop: Block software state changes when rfkill hard blocked dell-laptop: Fix small memory leak dell-laptop: Fix platform device unregistration dell-laptop: Update rfkill state on kill switch compal-laptop: Replace sysfs support with rfkill support compal-laptop: Add support for known Compal made Dell laptops MAINTAINERS: update drivers/platform/x86 information commit 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 Merge: b305956 b6fa879 Author: Linus Torvalds Date: Fri Feb 26 17:19:30 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: use bastmode in debugfs output dlm: Send lockspace name with uevents dlm: send reply before bast dlm: fix ordering of bast and cast commit b305956abc3c50c52598bbf39b7a5f4850058ba8 Merge: 4163095 398007f Author: Linus Torvalds Date: Fri Feb 26 17:18:52 2010 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: (52 commits) fs/xfs: Correct NULL test xfs: optimize log flushing in xfs_fsync xfs: only clear the suid bit once in xfs_write xfs: kill xfs_bawrite xfs: log changed inodes instead of writing them synchronously xfs: remove invalid barrier optimization from xfs_fsync xfs: kill the unused XFS_QMOPT_* flush flags V2 xfs: Use delay write promotion for dquot flushing xfs: Sort delayed write buffers before dispatch xfs: Don't issue buffer IO direct from AIL push V2 xfs: Use delayed write for inodes rather than async V2 xfs: Make inode reclaim states explicit xfs: more reserved blocks fixups xfs: turn off sign warnings xfs: don't hold onto reserved blocks on remount,ro xfs: quota limit statvfs available blocks xfs: replace KM_LARGE with explicit vmalloc use xfs: cleanup up xfs_log_force calling conventions xfs: kill XLOG_VEC_SET_TYPE xfs: remove duplicate buffer flags ... commit 41630959ed5ce694ec2e8c0f3c69743e011394c8 Merge: 2b8c70b c4d1409 Author: Linus Torvalds Date: Fri Feb 26 17:18:11 2010 -0800 Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 * 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: ibft: Update MAINTAINERS file. drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 commit 2b8c70b2174402ca3dec13310ce56597233392d7 Merge: 29e1fa3 3621263 Author: Linus Torvalds Date: Fri Feb 26 17:16:20 2010 -0800 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits) V4L-DVB: cx88-dvb: remove extra attribution for core V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index V4L/DVB: Add support for SMT7020 to cx88 V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix V4L/DVB: gspca_stv06xx: Add support for camera button V4L/DVB: gspca_ov519: add support for the button on ov511 based cams V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams V4L/DVB: gspca_ov519: add support for the button on ov519 based cams V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set V4L/DVB: gspca_main: some input error handling fixes V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs V4L/DVB: gspca_pac7302: much improved exposure control V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls V4L/DVB: Documentation: gspca.txt: update known mr97310a cams V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480 V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl ... commit 29e1fa3565a7951cc415c634eb2b78dbdbee151d Author: Ang Way Chuang Date: Thu Feb 25 09:45:03 2010 +0800 dvb-core: Fix DoS bug in ULE decapsulation code that can be triggered by an invalid Payload Pointer ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation has a bug that causes endless loop when Payload Pointer of MPEG2-TS frame is 182 or 183. Anyone who sends malicious MPEG2-TS frame will cause the receiver of ULE SNDU to go into endless loop. This patch was generated and tested against linux-2.6.32.9 and should apply cleanly to linux-2.6.33 as well because there was only one typo fix to dvb_net.c since v2.6.32. This bug was brought to you by modern day Santa Claus who decided to shower the satellite dish at Keio University with heavy snow causing huge burst of errors. We, receiver end, received Santa Claus's gift in the form of kernel bug. Care has been taken not to introduce more bug by fixing this bug, but please scrutinize the code for I always produces buggy code. Signed-off-by: Ang Way Chuang Acked-by: Mauro Carvalho Chehab Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 2594a57a13f1a6c32d90d73d7ebe51d4b8d88421 Merge: f24407d 6adad2d Author: Linus Torvalds Date: Fri Feb 26 17:11:11 2010 -0800 Merge branch 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: kmemcheck: Test the full object in kmemcheck_is_obj_initialized() commit f24407d2bde27a4eb75ce5e52069bf4f1ba0e8a5 Merge: 6544517 73c77e2 Author: Linus Torvalds Date: Fri Feb 26 17:05:10 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt: xfs: fix xfs to work with Virtually Indexed architectures sh: add mm API for DMA to vmalloc/vmap areas arm: add mm API for DMA to vmalloc/vmap areas parisc: add mm API for DMA to vmalloc/vmap areas mm: add coherence API for DMA to vmalloc/vmap areas commit 654451748b779b28077d9058442d0f354251870d Merge: 64d497f 77c9cfc Author: Linus Torvalds Date: Fri Feb 26 16:55:27 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (158 commits) [SCSI] Fix printing of failed 32-byte commands [SCSI] Fix printing of variable length commands [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list [SCSI] scsi_dh_alua: add netapp to dev list [SCSI] qla2xxx: Update version number to 8.03.02-k1. [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset. [SCSI] qla2xxx: Add firmware ETS burst support. [SCSI] qla2xxx: Correct loop-resync issues during SNS scans. [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback. [SCSI] qla2xxx: Correct EH bus-reset handling. [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out. [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev [SCSI] fix refcounting bug in scsi_get_host_dev [SCSI] fix memory leak in scsi_report_lun_scan [SCSI] lpfc: correct PPC build failure [SCSI] raid_class: add raid1e [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes. [SCSI] zfcp: Introduce header file for qdio structs and inline functions ... commit 64d497f55379b1e320a08ec2426468d96f5642ec Merge: 37d4008 b5f5fe8 Author: Linus Torvalds Date: Fri Feb 26 16:54:27 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits) sh: remove dead LED code for migo-r and ms7724se sh: ecovec build fix for CONFIG_I2C=n sh: ecovec r-standby support sh: ms7724se r-standby support sh: SH-Mobile R-standby register save/restore clocksource: Fix up a registration/IRQ race in the sh drivers. sh: ms7724: modify scan_timing for KEYSC sh: ms7724: Add sh_sir support sh: mach-ecovec24: Add sh_sir support sh: wire up SET/GET_UNALIGN_CTL. sh: allow alignment fault mode to be configured at kernel boot. sh: sh7724: Update FSI/SPU2 clock sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec sh: add sh7724 kick callback to clk_div4_table sh: introduce struct clk_div4_table sh: clock-cpg div4 set_rate() shift fix sh: Turn on speculative return for SH7785 and SH7786 sh: Merge legacy and dynamic PMB modes. sh: Use uncached I/O helpers in PMB setup. sh: Provide uncached I/O helpers. ... commit 37d4008484977f60d5d37499a2670c79b214dd46 Merge: 68c6b85 8d0c123 Author: Linus Torvalds Date: Fri Feb 26 16:50:02 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits) crypto: aes_generic - Fix checkpatch errors crypto: fcrypt - Fix checkpatch errors crypto: ecb - Fix checkpatch errors crypto: des_generic - Fix checkpatch errors crypto: deflate - Fix checkpatch errors crypto: crypto_null - Fix checkpatch errors crypto: cipher - Fix checkpatch errors crypto: crc32 - Fix checkpatch errors crypto: compress - Fix checkpatch errors crypto: cast6 - Fix checkpatch errors crypto: cast5 - Fix checkpatch errors crypto: camellia - Fix checkpatch errors crypto: authenc - Fix checkpatch errors crypto: api - Fix checkpatch errors crypto: anubis - Fix checkpatch errors crypto: algapi - Fix checkpatch errors crypto: blowfish - Fix checkpatch errors crypto: aead - Fix checkpatch errors crypto: ablkcipher - Fix checkpatch errors crypto: pcrypt - call the complete function on error ... commit f1c7f517a5dc23bce07efa5ed55e2c074ed9d4ba Author: Steven Rostedt Date: Fri Feb 26 17:08:16 2010 -0500 ftrace: Add function names to dangling } in function graph tracer The function graph tracer is currently the most invasive tracer in the ftrace family. It can easily overflow the buffer even with 10megs per CPU. This means that events can often be lost. On start up, or after events are lost, if the function return is recorded but the function enter was lost, all we get to see is the exiting '}'. Here is how a typical trace output starts: [tracing] cat trace # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 0) + 91.897 us | } 0) ! 567.961 us | } 0) <========== | 0) ! 579.083 us | _raw_spin_lock_irqsave(); 0) 4.694 us | _raw_spin_unlock_irqrestore(); 0) ! 594.862 us | } 0) ! 603.361 us | } 0) ! 613.574 us | } 0) ! 623.554 us | } 0) 3.653 us | fget_light(); 0) | sock_poll() { There are a series of '}' with no matching "func() {". There's no information to what functions these ending brackets belong to. This patch adds a stack on the per cpu structure used in outputting the function graph tracer to keep track of what function was outputted. Then on a function exit event, it checks the depth to see if the function exit has a matching entry event. If it does, then it only prints the '}', otherwise it adds the function name after the '}'. This allows function exit events to show what function they belong to at trace output startup, when the entry was lost due to ring buffer overflow, or even after a new task is scheduled in. Here is what the above trace will look like after this patch: [tracing] cat trace # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 0) + 91.897 us | } (irq_exit) 0) ! 567.961 us | } (smp_apic_timer_interrupt) 0) <========== | 0) ! 579.083 us | _raw_spin_lock_irqsave(); 0) 4.694 us | _raw_spin_unlock_irqrestore(); 0) ! 594.862 us | } (add_wait_queue) 0) ! 603.361 us | } (__pollwait) 0) ! 613.574 us | } (tcp_poll) 0) ! 623.554 us | } (sock_poll) 0) 3.653 us | fget_light(); 0) | sock_poll() { Signed-off-by: Steven Rostedt commit bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88 Author: Srinivas Eeda Date: Fri Feb 26 12:53:51 2010 -0800 dlm: allow dlm do recovery during shutdown If a node down event happens while dlm shutdown in progress, dlm recovery should be done before dlm is shutdown. We can't migrate unrecovered locks, obviously. But dlm_reco_thread only does recovery if the dlm_state is in DLM_CTXT_JOINED. dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or DLM_CTXT_IN_SHUTDOWN. Signed-off-by: Srinivas Eeda Signed-off-by: Joel Becker commit cbaee472f274ea9a98aabe47025f6e5551acadcb Author: Tao Ma Date: Fri Feb 26 10:54:52 2010 +0800 ocfs2: Only bug out in direct io write for reflinked extent. In ocfs2_direct_IO_get_blocks, we only need to bug out in case of we are going to write a recounted extent rec. What a silly bug introduced by me! Signed-off-by: Tao Ma Signed-off-by: Joel Becker Cc: stable@kernel.org commit 66b116c9d8f70baadf5b2145dddb35af222df041 Author: Coly Li Date: Thu Feb 25 14:57:13 2010 +0800 ocfs2: fix warning in ocfs2_file_aio_write() This patch fixes a compiling warning in ocfs2_file_aio_write(). Signed-off-by: Coly Li Signed-off-by: Joel Becker commit cbe0e331fdbdb256943499358c75bc098a2134c1 Author: Joel Becker Date: Sat Jan 30 06:02:10 2010 -0800 ocfs2_dlmfs: Enable the use of user cluster stacks. Unlike ocfs2, dlmfs has no permanent storage. It can't store off a cluster stack it is supposed to be using. So it can't specify the stack name in ocfs2_cluster_connect(). Instead, we create ocfs2_cluster_connect_agnostic(), which simply uses the stack that is currently enabled. This is find for dlmfs, which will rely on the stack initialization. We add the "stackglue" capability to dlmfs's capability list. This lets userspace know dlmfs can be used with all cluster stacks. Signed-off-by: Joel Becker commit 0016eedc4185a3cd7e578b027a6e69001b85d6c4 Author: Joel Becker Date: Sat Jan 30 04:33:50 2010 -0800 ocfs2_dlmfs: Use the stackglue. Rather than directly using o2dlm, dlmfs can now use the stackglue. This allows it to use userspace cluster stacks and fs/dlm. This commit forces o2cb for now. A latter commit will bump the protocol version and allow non-o2cb stacks. This is one big sed, really. LKM_xxMODE becomes DLM_LOCK_xx. LKM_flag becomes DLM_LKF_flag. We also learn to check that the LVB is valid before reading it. Any DLM can lose the contents of the LVB during a complicated recovery. userdlm should be checking this. Now it does. dlmfs will return 0 from read(2) if the LVB was invalid. Signed-off-by: Joel Becker commit e8fce482f3702c1ad27c97b26db5022aa1fa64c7 Author: Joel Becker Date: Tue Feb 9 17:52:13 2010 -0800 ocfs2_dlmfs: Don't honor truncate. The size of a dlmfs file is LVB_LEN We want folks using dlmfs to be able to use the LVB in places other than just write(2)/read(2). By ignoring truncate requests, we allow 'echo "contents" > /dlm/space/lockname' to work. Signed-off-by: Joel Becker commit 553b5eb91abd5f8e679d23ae547b92c589726814 Author: Joel Becker Date: Fri Jan 29 17:19:06 2010 -0800 ocfs2: Pass the locking protocol into ocfs2_cluster_connect(). Inside the stackglue, the locking protocol structure is hanging off of the ocfs2_cluster_connection. This takes it one further; the locking protocol is passed into ocfs2_cluster_connect(). Now different cluster connections can have different locking protocols with distinct asts. Note that all locking protocols have to keep their maximum protocol version in lock-step. With the protocol structure set in ocfs2_cluster_connect(), there is no need for the stackglue to have a static pointer to a specific protocol structure. We can change initialization to only pass in the maximum protocol version. Signed-off-by: Joel Becker commit e603cfb074e150736814ef093a411df32c02ba9f Author: Joel Becker Date: Fri Jan 29 16:06:29 2010 -0800 ocfs2: Remove the ast pointers from ocfs2_stack_plugins With the full ocfs2_locking_protocol hanging off of the ocfs2_cluster_connection, ast wrappers can get the ast/bast pointers there. They don't need to get them from their plugin structure. The user plugin still needs the maximum locking protocol version, though. This changes the plugin structure so that it only holds the max version, not the entire ocfs2_locking_protocol pointer. Signed-off-by: Joel Becker commit 110946c8fb23c1e1e23312afed0977ad4aa37c95 Author: Joel Becker Date: Fri Jan 29 15:46:23 2010 -0800 ocfs2: Hang the locking proto on the cluster conn and use it in asts. With the ocfs2_cluster_connection hanging off of the ocfs2_dlm_lksb, we have access to it in the ast and bast wrapper functions. Attach the ocfs2_locking_protocol to the conn. Now, instead of refering to a static variable for ast/bast pointers, the wrappers can look at the connection. This means different connections can have different ast/bast pointers, and it reduces the need for the static pointer. Signed-off-by: Joel Becker commit c0e4133851ed94c73ee3d34a2f2a245fcd0a60a1 Author: Joel Becker Date: Fri Jan 29 14:46:44 2010 -0800 ocfs2: Attach the connection to the lksb We're going to want it in the ast functions, so we convert union ocfs2_dlm_lksb to struct ocfs2_dlm_lksb and let it carry the connection. Signed-off-by: Joel Becker commit a796d2862aed8117acc9f470f3429a5ee852912e Author: Joel Becker Date: Thu Jan 28 19:22:39 2010 -0800 ocfs2: Pass lksbs back from stackglue ast/bast functions. The stackglue ast and bast functions tried to maintain the fiction that their arguments were void pointers. In reality, stack_user.c had to know that the argument was an ocfs2_lock_res in order to get the status off of the lksb. That's ugly. This changes stackglue to always pass the lksb as the argument to ast and bast functions. The caller can always use container_of() to get the ocfs2_lock_res or user_dlm_lock_res. The net effect to the caller is zero. They still get back the lockres in their ast. stackglue gets cleaner, and now can use the lksb itself. Signed-off-by: Joel Becker commit 34a9dd7e29e9129fec40c645a03f1bbbe810e771 Author: Joel Becker Date: Thu Jan 28 15:00:49 2010 -0800 ocfs2_dlmfs: Move to its own directory We're going to remove the tie between ocfs2_dlmfs and o2dlm. ocfs2_dlmfs doesn't belong in the fs/ocfs2/dlm directory anymore. Here we move it to fs/ocfs2/dlmfs. Signed-off-by: Joel Becker commit 65b6f3403431cd43ef7b0dab679a50f770124a65 Author: Joel Becker Date: Tue Jan 26 22:14:20 2010 -0800 ocfs2_dlmfs: Use poll() to signify BASTs. o2dlm's userspace filesystem is an easy way to use the DLM from userspace. It is intentionally simple. For example, it does not allow for asynchronous behavior or lock conversion. This is intentional to keep the interface simple. Because there is no asynchronous notification, there is no way for a process holding a lock to know another node needs the lock. This is the number one complaint of ocfs2_dlmfs users. Turns out, we can solve this very easily. We add poll() support to ocfs2_dlmfs. When a BAST is received, the lock's file descriptor will receive POLLIN. This is trivial to implement. Userdlm already has an appropriate waitqueue, and the lock knows when it is blocked. We add the "bast" capability to tell userspace this is available. Signed-off-by: Joel Becker Acked-by: Mark Fasheh Signed-off-by: Joel Becker commit 14a437c2b67aeee2a989a5d9c7e19094355d2fed Author: Joel Becker Date: Thu Feb 4 15:37:27 2010 -0800 ocfs2_dlmfs: Add capabilities parameter. Over time, dlmfs has added some features that were not part of the initial ABI. Unfortunately, some of these features are not detectable via standard usage. For example, Linux's default poll always returns POLLIN, so there is no way for a caller of poll(2) to know when dlmfs added poll support. Instead, we provide this list of new capabilities. Capabilities is a read-only attribute. We do it as a module parameter so we can discover it whether dlmfs is built in, loaded, or even not loaded (via modinfo). The ABI features are local to this machine's dlmfs mount. This is distinct from the locking protocol, which is concerned with inter-node interaction. Signed-off-by: Joel Becker commit 399ff3a748cf4c8c853e96dd477153202636527b Author: Joel Becker Date: Tue Sep 1 18:38:27 2009 -0700 ocfs2: Handle errors while setting external xattr values. ocfs2 can store extended attribute values as large as a single file. It does this using a standard ocfs2 btree for the large value. However, the previous code did not handle all error cases cleanly. There are multiple problems to have. 1) We have trouble allocating space for a new xattr. This leaves us with an empty xattr. 2) We overwrote an existing local xattr with a value root, and now we have an error allocating the storage. This leaves us an empty xattr. where there used to be a value. The value is lost. 3) We have trouble truncating a reused value. This leaves us with the original entry pointing to the truncated original value. The value is lost. 4) We have trouble extending the storage on a reused value. This leaves us with the original value safely in place, but with more storage allocated when needed. This doesn't consider storing local xattrs (values that don't require a btree). Those only fail when the journal fails. Case (1) is easy. We just remove the xattr we added. We leak the storage because we can't safely remove it, but otherwise everything is happy. We'll print a warning about the leak. Case (4) is easy. We still have the original value in place. We can just leave the extra storage attached to this xattr. We return the error, but the old value is untouched. We print a warning about the storage. Case (2) and (3) are hard because we've lost the original values. In the old code, we ended up with values that could be partially read. That's not good. Instead, we just wipe the xattr entry and leak the storage. It stinks that the original value is lost, but now there isn't a partial value to be read. We'll print a big fat warning. Signed-off-by: Joel Becker commit 139ffacebf5fe2cd9e2ae40d325a9661a679ad4f Author: Joel Becker Date: Wed Aug 19 11:09:17 2009 -0700 ocfs2: Set inline xattr entries with ocfs2_xa_set() ocfs2_xattr_ibody_set() is the only remaining user of ocfs2_xattr_set_entry(). ocfs2_xattr_set_entry() actually does two things: it calls ocfs2_xa_set(), and it initializes the inline xattrs. Initializing the inline space really belongs in its own call. We lift the initialization to ocfs2_xattr_ibody_init(), called from ocfs2_xattr_ibody_set() only when necessary. Now ocfs2_xattr_ibody_set() can call ocfs2_xa_set() directly. ocfs2_xattr_set_entry() goes away. Another nice fact is that ocfs2_init_dinode_xa_loc() can trust i_xattr_inline_size. Signed-off-by: Joel Becker commit d3981544d7a4ed276966cdd58fe2f5d6e8a585d9 Author: Joel Becker Date: Wed Aug 19 02:13:50 2009 -0700 ocfs2: Set xattr block entries with ocfs2_xa_set() ocfs2_xattr_block_set() calls into ocfs2_xattr_set_entry() with just the HAS_XATTR flag. Most of the machinery of ocfs2_xattr_set_entry() is skipped. All that really happens other than the call to ocfs2_xa_set() is making sure the HAS_XATTR flag is set on the inode. But HAS_XATTR should be set when we also set di->i_xattr_loc. And that's done in ocfs2_create_xattr_block(). So let's move it there, and then ocfs2_xattr_block_set() can just call ocfs2_xa_set(). While we're there, ocfs2_create_xattr_block() can take the set_ctxt for a smaller argument list. It also learns to set HAS_XATTR_FL, because it knows for sure. ocfs2_create_empty_xatttr_block() in the reflink path fakes a set_ctxt to call ocfs2_create_xattr_block(). Signed-off-by: Joel Becker commit c5d95df5f78312c879f3058059c98a08821897a5 Author: Joel Becker Date: Tue Aug 18 21:03:24 2009 -0700 ocfs2: Let ocfs2_xa_prepare_entry() do space checks. ocfs2_xattr_set_in_bucket() doesn't need to do its own hacky space checking. Let's let ocfs2_xa_prepare_entry() (via ocfs2_xa_set()) do the more accurate work. Whenever it doesn't have space, ocfs2_xattr_set_in_bucket() can try to get more space. Signed-off-by: Joel Becker commit bca5e9bd1eb2a9422a2ff29e822a956310653754 Author: Joel Becker Date: Tue Aug 18 20:40:14 2009 -0700 ocfs2: Gell into ocfs2_xa_set() ocfs2_xa_set() wraps the ocfs2_xa_prepare_entry()/ocfs2_xa_store_value() logic. Both callers can now use the same routine. ocfs2_xa_remove() moves directly into ocfs2_xa_set(). Signed-off-by: Joel Becker commit 73857ee0b548017f9632a0d0e6fe2dabbdc11d31 Author: Joel Becker Date: Tue Aug 18 20:26:41 2009 -0700 ocfs2: Allocation in ocfs2_xa_prepare_entry(), values in ocfs2_xa_store_value() ocfs2_xa_prepare_entry() gets all the logic to add, remove, or modify external value trees. Now, when it exits, the entry is ready to receive a value of any size. ocfs2_xa_remove() is added to handle the complete removal of an entry. It truncates the external value tree before calling ocfs2_xa_remove_entry(). ocfs2_xa_store_inline_value() becomes ocfs2_xa_store_value(). It can store any value. ocfs2_xattr_set_entry() loses all the allocation logic and just uses these functions. ocfs2_xattr_set_value_outside() disappears. ocfs2_xattr_set_in_bucket() uses these functions and makes ocfs2_xattr_set_entry_in_bucket() obsolete. That goes away, as does ocfs2_xattr_bucket_set_value_outside() and ocfs2_xattr_bucket_value_truncate(). Signed-off-by: Joel Becker commit cf2bc809403ae48a4a2bb5cc551d2ec35f2e4a47 Author: Joel Becker Date: Tue Aug 18 13:52:38 2009 -0700 ocfs2: Teach ocfs2_xa_loc how to do its own journal work We're going to want to make sure our buffers get accessed and dirtied correctly. So have the xa_loc do the work. This includes storing the inode on ocfs2_xa_loc. Signed-off-by: Joel Becker commit 3fc12afa0cea5dc8845487b685165c89934ca1eb Author: Joel Becker Date: Tue Aug 18 13:20:27 2009 -0700 ocfs2: Provide ocfs2_xa_fill_value_buf() for external value processing We use the ocfs2_xattr_value_buf structure to manage external values. It lets the value tree code do its work regardless of the containing storage. ocfs2_xa_fill_value_buf() initializes a value buf from an ocfs2_xa_loc entry. Signed-off-by: Joel Becker commit 9dc474005d0e34cf21d4b510f347e3942f24b021 Author: Joel Becker Date: Mon Aug 17 19:56:01 2009 -0700 ocfs2: Handle value tree roots in ocfs2_xa_set_inline_value() Previously the xattr code would send in a fake value, containing a tree root, to the function that installed name+value pairs. Instead, we pass the real value to ocfs2_xa_set_inline_value(), and it notices that the value cannot fit. Thus, it installs a tree root. Signed-off-by: Joel Becker commit 69a3e539d083ac09aec92b8705b8ff2c2e5c810c Author: Joel Becker Date: Mon Aug 17 12:24:39 2009 -0700 ocfs2: Set the xattr name+value pair in one place We create two new functions on ocfs2_xa_loc, ocfs2_xa_prepare_entry() and ocfs2_xa_store_inline_value(). ocfs2_xa_prepare_entry() makes sure that the xl_entry field of ocfs2_xa_loc is ready to receive an xattr. The entry will point to an appropriately sized name+value region in storage. If an existing entry can be reused, it will be. If no entry already exists, it will be allocated. If there isn't space to allocate it, -ENOSPC will be returned. ocfs2_xa_store_inline_value() stores the data that goes into the 'value' part of the name+value pair. For values that don't fit directly, this stores the value tree root. A number of operations are added to ocfs2_xa_loc_operations to support these functions. This reflects the disparate behaviors of xattr blocks and buckets. With these functions, the overlapping ocfs2_xattr_set_entry_local() and ocfs2_xattr_set_entry_normal() can be replaced with a single call scheme. Signed-off-by: Joel Becker commit 199799a3609f6d5bb231a75c2e702afaac805431 Author: Joel Becker Date: Fri Aug 14 19:04:15 2009 -0700 ocfs2: Wrap calculation of name+value pair size. An ocfs2 xattr entry stores the text name and value as a pair in the storage area. Obviously names and values can be variable-sized. If a value is too large for the entry storage, a tree root is stored instead. The name+value pair is also padded. Because of this, there are a million places in the code that do: if (needs_external_tree(value_size) namevalue_size = pad(name_size) + tree_root_size; else namevalue_size = pad(name_size) + pad(value_size); Let's create some convenience functions to make the code more readable. There are three forms. The first takes the raw sizes. The second takes an ocfs2_xattr_info structure. The third takes an existing ocfs2_xattr_entry. Signed-off-by: Joel Becker commit 18853b95d1fb964b76c3393a12c4d861e7779460 Author: Joel Becker Date: Fri Aug 14 18:17:07 2009 -0700 ocfs2: Add a name_len field to ocfs2_xattr_info. Rather than calculating strlen all over the place, let's store the name length directly on ocfs2_xattr_info. Signed-off-by: Joel Becker commit 6b240ff63c9dda93366c61c969b81ca22fe676ac Author: Joel Becker Date: Fri Aug 14 18:02:52 2009 -0700 ocfs2: Prefix the member fields of struct ocfs2_xattr_info. struct ocfs2_xattr_info is a useful structure describing an xattr you'd like to set. Let's put prefixes on the member fields so it's easier to read and use. Signed-off-by: Joel Becker commit bde1e5400a1b21ef47932ab00446c7361ff3c139 Author: Joel Becker Date: Fri Aug 14 16:58:38 2009 -0700 ocfs2: Remove xattrs via ocfs2_xa_loc Add ocfs2_xa_remove_entry(), which will remove an xattr entry from its storage via the ocfs2_xa_loc descriptor. Signed-off-by: Joel Becker commit 11179f2c92cb025b1ff0b794f9714b3fb395855f Author: Joel Becker Date: Fri Aug 14 16:07:44 2009 -0700 ocfs2: Introduce ocfs2_xa_loc The ocfs2 extended attribute (xattr) code is very flexible. It can store xattrs in the inode itself, in an external block, or in a tree of data structures. This allows the number of xattrs to be bounded by the filesystem size. However, the code that manages each possible storage location is different. Maintaining the ocfs2 xattr code requires changing each hunk separately. This patch is the start of a series introducing the ocfs2_xa_loc structure. This structure wraps the on-disk details of an xattr entry. The goal is that the generic xattr routines can use ocfs2_xa_loc without knowing the underlying storage location. This first pass merely implements the basic structure, initializing it, and wiping the name+value pair of the entry. Signed-off-by: Joel Becker commit 8545e03d82b6739461bbd60db7aba144f7dbe80f Author: Sunil Mushran Date: Fri Feb 12 14:09:06 2010 -0800 ocfs2: Add current->comm in trace output Add current->comm to the standard mlog() output to help with debugging. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 96a1cc731adb28dc4feb71701091b80e67d486a7 Author: Wengang Wang Date: Tue Feb 9 14:57:45 2010 +0800 ocfs2: Clean up the checks for CoW and direct I/O. When ocfs2 has to do CoW for refcounted extents, we disable direct I/O and go through the buffered I/O path. This makes the combined check easier to read. Signed-off-by: Wengang Wang Signed-off-by: Joel Becker commit b89c54282db0c8634a2d2dc200f196d571750ce5 Author: Tiger Yang Date: Mon Jan 25 14:11:06 2010 +0800 ocfs2: add extent block stealing for ocfs2 v5 This patch add extent block (metadata) stealing mechanism for extent allocation. This mechanism is same as the inode stealing. if no room in slot specific extent_alloc, we will try to allocate extent block from the next slot. Signed-off-by: Tiger Yang Acked-by: Tao Ma Signed-off-by: Joel Becker commit 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 Author: Tony Lindgren Date: Fri Feb 26 15:31:12 2010 -0800 omap2: Initialize Menelaus and MMC for N8X0 Initialize MMC for N8X0 Based on an earlier patches from Nokia released kernel sources at: http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/ Signed-off-by: Tony Lindgren commit ab1b18f70a007ea6caeb007d269abb75b131a410 Author: Neil Brown Date: Sat Feb 27 09:33:40 2010 +1100 sunrpc: remove unnecessary svc_xprt_put The 'struct svc_deferred_req's on the xpt_deferred queue do not own a reference to the owning xprt. This is seen in svc_revisit which is where things are added to this queue. dr->xprt is set to NULL and the reference to the xprt it put. So when this list is cleaned up in svc_delete_xprt, we mustn't put the reference. Also, replace the 'for' with a 'while' which is arguably simpler and more likely to compile efficiently. Cc: Tom Tucker Signed-off-by: NeilBrown Cc: stable@kernel.org Signed-off-by: J. Bruce Fields commit 9e3bd9190800e8209b4a3e1d724c35f0738dcad2 Author: Linus Torvalds Date: Fri Feb 26 10:34:27 2010 -0800 b43: fall back gracefully to PIO mode after fatal DMA errors This makes the b43 driver just automatically fall back to PIO mode when DMA doesn't work. The driver already told the user to do it, so rather than have the user reload the module with a new flag, just make the driver do it automatically. We keep the message as an indication that something is wrong, but now just automatically fall back to the hopefully working PIO case. (Some post-2.6.33 merge fixups by Larry Finger and yours truly... -- JWL) Signed-off-by: Linus Torvalds Signed-off-by: John W. Linville commit 0e0a228398cc967c922759be36c69d32e4f62701 Author: Juuso Oikarinen Date: Fri Feb 26 08:13:41 2010 +0200 mac80211: fix direct probe loop on ieee80211_work_purge If authentication has already been performed when the WLAN interface is stopped, (sometimes) the ieee80211_work_purge would corrupt some ieee80211_work-structures. The outcome is this (cleaned up): [ 2252.398681] WARNING: at net/mac80211/work.c:995 ieee80211_work_purge [ 2252.466430] Backtrace: [ 2252.529266] (ieee80211_work_purge+0x0/0xcc [mac80211]) [ 2252.546875] (ieee80211_stop+0x0/0x4c0 [mac80211]) Additionally, one would get this, going on regarless of the WLAN interface state, going on forever: [ 2252.859985] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717525) [ 2253.055419] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717524) [ 2253.250610] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717523) [ 2253.446014] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717522) [ 2253.641357] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717521) Signed-off-by: Juuso Oikarinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit caf66e581172dc5032bb84841a91bc7b77ad9876 Author: John W. Linville Date: Thu Feb 25 12:02:45 2010 -0500 netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211 In "wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig" I inadvertantly missed a line in include/linux/netdevice.h. I thereby effectively reverted "net: Set LL_MAX_HEADER properly for wireless." by accident. :-( Now we should check there for CONFIG_WLAN instead. Signed-off-by: John W. Linville Reported-by: Christoph Egger Cc: stable@kernel.org commit b446918b77c717a34eaa853dfab55f579d330551 Author: Helmut Schaa Date: Wed Feb 24 14:19:37 2010 +0100 mac80211: use listen interval 5 as default Currently if a driver does not set hw.max_listen_interval a listen interval of 1 is negotiated with the AP. Thus, the AP could drop buffered frames for us after just one beacon interval which can easily happen with the current powersave and scan implementation. To avoid this issue increase the default interval to 5 which should be a reasonable safe default. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 7bfbae10dc10a5c94a780d117a57e875d77e8e5a Author: Felix Fietkau Date: Wed Feb 24 04:43:05 2010 +0100 ath9k: disable RIFS search for AR91xx based chips While ath9k does not support RIFS yet, the ability to receive RIFS frames is currently enabled for most chipsets in the initvals. This is causing baseband related issues on AR9160 and AR9130 based chipsets, which can lock up under certain conditions. This patch fixes these issues by overriding the initvals, effectively disabling RIFS for all affected chipsets. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a040d532b912b5dd7d88692b580cff9c88b987e3 Author: Lennert Buytenhek Date: Tue Feb 23 09:34:38 2010 +0100 MAINTAINERS: update mwl8k maintenance status I am no longer with Marvell. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 08b2cb0f0613a444368eadca0b67c906d91ab007 Merge: be41f5c ab9bdc3 Author: John W. Linville Date: Fri Feb 26 16:58:26 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit be41f5c7e3688a4555d7fbaa09578fd628bb4cdf Merge: 64463da 8961212 Author: John W. Linville Date: Fri Feb 26 16:58:18 2010 -0500 Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 64463da913bc8f791980ba28d93ac5e716ab9cc5 Merge: 4a6967b a120e91 Author: John W. Linville Date: Fri Feb 26 16:54:45 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h net/mac80211/rate.c commit a8d6356cdabf4495aaae7d3e89eb058b1909761c Author: Heiko Carstens Date: Fri Feb 26 22:37:56 2010 +0100 [S390] time: remove unused code Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 0cbde8ee60c883b246fb50dfed8bcd968239702b Author: Michael Holzheu Date: Fri Feb 26 22:37:55 2010 +0100 [S390] zcore: Add prefix registers to dump header With this patch the prefix registers of all online CPUs are stored in the the zcore dump header. This allows dump analysis tools to access the register information that is stored in the prefix pages without using the System.map. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 13c6680acb3df25722858566b42759215ea5d2e0 Author: Martin Schwidefsky Date: Fri Feb 26 22:37:54 2010 +0100 [S390] correct vdso version string The glibc vdso code for s390 uses the version string 2.6.29, the kernel uses the version string 2.6.26. No wonder the vdso code is never used. The first kernel version to contain the vdso code is 2.6.29 which makes this the correct version. Signed-off-by: Martin Schwidefsky commit 1844c9bc0b2fed3023551c1affe033ab38e90b9a Author: Martin Schwidefsky Date: Fri Feb 26 22:37:53 2010 +0100 [S390] add support for compressed kernels Add the "bzImage" compile target and the necessary code to generate compressed kernel images. The old style uncompressed "image" target is preserved, a simple make will build them both. Signed-off-by: Martin Schwidefsky commit 73bfa5f2f71efcdcaad8d18cbed96b9d7ed86948 Author: Michael Holzheu Date: Fri Feb 26 22:37:52 2010 +0100 [S390] Define new s390 ELF note sections in elf.h S390 ELF core dump currently only contains the PSW, the general purpose registers, the floating point registers and the access registers stored in PRSTATUS/PRFPREG note sections. For analyzing s390 kernel problems additional registers are important. In order to be able to include these registers to a kernel ELF core dump, this patch adds the following five new note sections to elf.h: * NT_S390_TIMER: S390 timer register * NT_S390_TODCMP: S390 TOD comparator register * NT_S390_TODPREG: S390 TOD programmable register * NT_S390_CTRS: S390 control registers * NT_S390_PREFIX: S390 prefix register The new note sections have been already defined and accepted in the upstream binutils package. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 61fd330dee1606a6bdb741f9c156bca386a4e438 Author: Martin Schwidefsky Date: Fri Feb 26 22:37:51 2010 +0100 [S390] codepage conversion of kernel parameter line Move the ebcdic to ascii conversion of the kernel parameter line from head.S to early.c and convert the assembler code to C. Signed-off-by: Martin Schwidefsky commit 34b9243a300736c08dc32eaeb2f359401fcf9c0a Author: Alexey Dobriyan Date: Fri Feb 26 22:37:50 2010 +0100 [S390] seq_file: convert drivers/s390/ Signed-off-by: Alexey Dobriyan Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 618708ff04f3a7b74f54210bd518aa1d827d8e65 Author: Martin Schwidefsky Date: Fri Feb 26 22:37:49 2010 +0100 [S390] add z9-ec/z10 instruction to kernel disassembler Add the instruction of the z9-ec and z10 machines to the kernel disassembler. Add the missing "ptff" instruction of z9-109 and the missing "sqd" of g5. Remove useless comments with instruction examples from format table. Signed-off-by: Martin Schwidefsky commit b695adfaa118fd7c50eca8990e348dd7372ee0aa Author: Stefan Haberland Date: Fri Feb 26 22:37:48 2010 +0100 [S390] dasd: correct offline processing Flushing the dasd ccw request queue may stop the processing of the block device request queue. Destroy partitions may wait for outstanding requests and thus hang. Swapping dasd_destroy_partitions and dasd_flush_request_queue so that the request queue is empty before dasd_destroy_partitions is called. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 589c74d5076dd1bde13a5a36d97ca79be8bd72b2 Author: Stefan Haberland Date: Fri Feb 26 22:37:47 2010 +0100 [S390] dasd: fix refcounting. The function dasd_device_from_cdev returns a reference to the dasd device and increases the refcount by one. If an exception occurs, the refcount was not decreased in all cases e.g. in dasd_discipline_show. Prevent the offline processing from hang by correcting two functions to decrease the refcount even if an error occured. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 9eb251225ab4dbea3119cfcf4c5194eed223a740 Author: Stefan Haberland Date: Fri Feb 26 22:37:46 2010 +0100 [S390] dasd: fix online/offline race Setting a DASD online and offline in quick succession may cause a kernel panic or let the chhccwdev command wait forever. The Online process is split into two parts. After the first part is finished the offline process may be called. This may result in a situation where the second online processing part tries to set the DASD offline as well. Use a mutex to protect online and offline against each other. Also correct some checking. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 22e0a0467292222214d1974d9bc2664a6c05980d Author: Heiko Carstens Date: Fri Feb 26 22:37:45 2010 +0100 [S390] use kprobes_built_in() in mm/fault code Use kprobes_built_in() to avoid ifdefs like most other architectures do. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 52499f40267e1178b3b2c887aee85c0c9fd01ec0 Author: Heiko Carstens Date: Fri Feb 26 22:37:44 2010 +0100 [S390] bug: use relative pointers in bug table entries Reduces the size of the bug table entries by 50% on 64bit kernels. Saves around 30kb on a defconfig kernel. s390 version of b93a531e "allow bug table entries to use relative pointers (and use it on x86-64)". Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit cbb870c8221147ae337612e04b2bb0211f31a74b Author: Heiko Carstens Date: Fri Feb 26 22:37:43 2010 +0100 [S390] Cleanup struct _lowcore usage and defines. Use asm offsets to make sure the offset defines to struct _lowcore and its layout don't get out of sync. Also add a BUILD_BUG_ON() which checks that the size of the structure is sane. And while being at it change those sites which use odd casts to access the current lowcore. These should use S390_lowcore instead. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d96221ab1e7d86dc0d4666466979117cd1915386 Author: Heiko Carstens Date: Fri Feb 26 22:37:42 2010 +0100 [S390] free_initmem: reduce code duplication free_initmem() and free_initrd_mem() are nearly identical. So make them call a common function. Also fixes a bug: if the initrd wouldn't start on a page boundary also memory after the initrd would be initialized with the poison value. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b8e660b83d505148c83ddc6d5ba69c29d0eab1e3 Author: Heiko Carstens Date: Fri Feb 26 22:37:41 2010 +0100 [S390] Replace ENOTSUPP usage with EOPNOTSUPP ENOTSUPP is not supposed to leak to userspace so lets just use EOPNOTSUPP everywhere. Doesn't fix a bug, but makes future reviews easier. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 59b697874529f5c3cbcaf5816b3d6c584af521e8 Author: Gerald Schaefer Date: Fri Feb 26 22:37:40 2010 +0100 [S390] spinlock: check virtual cpu running status This patch introduces a new function that checks the running status of a cpu in a hypervisor. This status is not virtualized, so the check is only correct if running in an LPAR. On acquiring a spinlock, if the cpu holding the lock is scheduled by the hypervisor, we do a busy wait on the lock. If it is not scheduled, we yield over to that cpu. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 8387c736fcbaec17890b8d075ee4f4623518b54a Author: Heiko Carstens Date: Fri Feb 26 22:37:39 2010 +0100 [S390] sysinfo: fix SYSIB 3,2,2 structure The size of the field that contains the description block count is only four bits instead of eight bits. The first four bits are reserved but this might change and break. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 27d71602b4a605fbb31088e69ac12187e69a9443 Author: Martin Schwidefsky Date: Fri Feb 26 22:37:38 2010 +0100 [S390] add MACHINE_IS_LPAR flag Introduce the MACHINE_IS_LPAR flag for code that should only be executed if Linux is running in an LPAR. Signed-off-by: Martin Schwidefsky commit 432ac5e04b931df8376e0858d4bf0fd41436a271 Author: Jan Glauber Date: Fri Feb 26 22:37:37 2010 +0100 [S390] qdio: optimize cache line usage of struct qdio_irq Remove a memset hack that relied on the internal layout of the qdio_irq struct and move the per device statistics data into an own cache line to avoid cache line bashing between the inbound and the outbound queue tasklets. Also reduce the number of allocated queues from 32 to 4 which is the current maximum. That saves a cache line in struct qdio_irq. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit d307297f73077b4dc8110eb998108ffc467e8e6c Author: Jan Glauber Date: Fri Feb 26 22:37:36 2010 +0100 [S390] qdio: account processed SBAL during queue scan Add counters for the number of processed SBALs. The numbers summarize how many SBALs were processed at each queue scan and indicate the utilization of the queue. Furthermore the number of unsuccessfull queue scans, SBAL errors and the total number of processed SBALs are accounted. Also regroup struct qdio_q to move read-mostly and write-mostly data into different cachelines. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit a93b8ec1df1f0ad75d036dbc0fdef2e0ccb7be02 Author: Heiko Carstens Date: Fri Feb 26 22:37:35 2010 +0100 [S390] smp: rework sigp code Rename signal_processor* functions to sigp*. Add raw variants of each version, so we can get rid of the hacks played in smp code which establish temporary cpu logical mappings so they could call the sigp functions. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 2c2df118a6440748e6fd71a510a66ee708c31494 Author: Heiko Carstens Date: Fri Feb 26 22:37:34 2010 +0100 [S390] smp: always reboot on cpu 0 Always reboot on logical cpu 0. This makes sure that the IPL cpu is always the same and usually avoids strange numbering schemes between physical and logical cpus. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit abd1ecf209b30a0ed43f0aae50f8b8ce1be2c3d1 Author: Heiko Carstens Date: Fri Feb 26 22:37:33 2010 +0100 [S390] smp: rename and add lowcore defines Rename __LC_RESTART_PSW to __LC_RST_NEW_PSW, add a define for the missing 32 bit variant and the missing old PSWs. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f64ca21714f114a78b6c19ceabc7745b29913efc Author: Heiko Carstens Date: Fri Feb 26 22:37:32 2010 +0100 [S390] zfcpdump: remove cross arch dump support Remove support to be able to dump 31 bit systems with a 64 bit dumper. This is mostly useless since no distro ships 31 bit kernels together with a 64 bit dumper. We also get rid of a bit of hacky code. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 987bcdacb18a3adc2a48d85c9b005069c2f4dd7b Author: Martin Schwidefsky Date: Fri Feb 26 22:37:31 2010 +0100 [S390] use inline assembly contraints available with gcc 3.3.3 Drop support to compile the kernel with gcc versions older than 3.3.3. This allows us to use the "Q" inline assembly contraint on some more inline assemblies without duplicating a lot of complex code (e.g. __xchg and __cmpxchg). The distinction for older gcc versions can be removed which saves a few lines and simplifies the code. Reviewed-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d1bf85902c28dd990c08f1703ea94109223549a7 Author: Heiko Carstens Date: Fri Feb 26 22:37:30 2010 +0100 [S390] cio: fix storage key handling Some parts of cio do not shift PAGE_DEFAULT_KEY correctly and end up with an incorrect key in their data structures. Since the default key is zero this doesn't really matter. However if somebody would use key-controlled protection for debugging purposes it would be quite helpful if all of this would work as expected. Also remove a stale declaration. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 0d01bb89220490763d89571d27e7ee3f13f9b372 Author: Sebastian Ott Date: Fri Feb 26 22:37:29 2010 +0100 [S390] cio: trigger subchannel event at resume time ccw_device_pm_restore: trigger subchannel event to better handle changes to the subchannel device. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 76e6fb4b86446e4605379b99ad3dd3f96bb1696f Author: Sebastian Ott Date: Fri Feb 26 22:37:28 2010 +0100 [S390] ccw_device_notify: improve return codes Callers of ccw_device_notify could not distinguish between a driver who has no notifier registered and a driver who doesn't want to keep a device after a certain event. Change this by adding proper return codes. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit b4c707214c987da021d4d5c4ed54612cf73d80d6 Author: Sebastian Ott Date: Fri Feb 26 22:37:27 2010 +0100 [S390] cio: make wait_events interruptible Make the potentially long blocking wait_event's used by the cio settle mechanism interruptible. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit b4563e891a043fe521e62f6f621b928641474ff3 Author: Sebastian Ott Date: Fri Feb 26 22:37:26 2010 +0100 [S390] cio: wait for channel report To fetch a pending channel report word (crw) we use a kernel thread which triggers stcrw and sleeps on a semaphore. The s390 machine check handler uses crw_handle_channel_report to handle one crw if needed. This patch replaces the semaphore with a waitqueue (to block the kernel thread) and an atomic_t (to count the number of pending requests). By this we achieve the ability to force this thread to check for a pending crw (independent on when it is triggered by the machine check handler) and wait for this action to finish. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 879acca58a904c25487c89ab11e23eb556fb13d3 Author: Sebastian Ott Date: Fri Feb 26 22:37:25 2010 +0100 [S390] cio: introduce cio_settle This patch introduces a proc file cio_settle. A write request to this file is blocked until all queued cio actions are handled. This will allow userspace to wait for pending work affecting device availability after changing cio_ignore or the hardware configuration. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit be5d3823f29c09676abd2eeea4f9767bc4a1a531 Author: Sebastian Ott Date: Fri Feb 26 22:37:24 2010 +0100 [S390] cio: consolidate workqueues We used to maintain 2 singlethreaded workqueues for synchronization and to trigger work from interrupt context. Since our latest cio changes we only use one of these workqueues. So get rid of the unused workqueue, rename the remaining one to "cio_work_q" and move its ownership to the channel subsystem driver. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 6f5d09a0e9731a39a4d52a5902daec72c1e43692 Author: Ursula Braun Date: Fri Feb 26 22:37:23 2010 +0100 [S390] adapt text to cu3088-removal cu3088 layer for lcs and ctcm has been removed. Thus the reference to cu3088 in this text is to be removed as well. Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit 1dcec254afe5bc700a4cacf810b71a28bd994ea9 Author: Heiko Carstens Date: Fri Feb 26 22:37:22 2010 +0100 [S390] uaccess: implement strict user copy checks Same as on x86 and sparc, besides the fact that enabling the option will just emit compile time warnings instead of errors. Keeps allyesconfig kernels compiling. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6070a4a928f8c92b9fae7d6717ebbb05f425d6b2 Author: Zhao Yakui Date: Mon Feb 8 21:35:12 2010 +0800 drm/i915: Use a dmi quirk to skip a broken SDVO TV output. This IBM system has a multi-function SDVO card that reports both VGA and TV, but the system has no TV connector. The TV connector always reported as connected, which would lead to poor modesetting choices. https://bugs.freedesktop.org/show_bug.cgi?id=25787 Signed-off-by: Zhao Yakui Tested-by: Vance Cc: stable@kernel.org Signed-off-by: Eric Anholt commit 469d129664c5b83f37ca74913700d416d584833b Author: Jesse Barnes Date: Thu Feb 11 12:41:05 2010 -0800 drm/i915: enable/disable LVDS port at DPMS time It would be good to disable the LVDS port when we shut down the panel to save power. We haven't done so until now because we had trouble getting the right LVDS parameters from the BIOS. I think we're past that now, so enabling and disabling the port should be safe, though it would probably be made cleaner with some additional changes to the display code, where we also bang on the LVDS reg to set the pairing correctly etc. Seems to save a bit of power (up to 300mW in my basic wattsup meter testing). Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit 16edd55029fcedaa0d03f24ee607c3a882871a10 Author: Daniel Vetter Date: Fri Feb 19 11:52:02 2010 +0100 drm/i915: check for multiple write domains in pin_and_relocate The assumption that an object has only ever one write domain is deeply threaded into gem (it's even encoded the the singular of the variable name). Don't let userspace screw us over. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit 922a2efc1b6ef48e2783f7efeb3a94e952c7ed14 Author: Daniel Vetter Date: Fri Feb 19 11:52:01 2010 +0100 drm/i915: clean-up i915_gem_flush_gpu_write_domain Now that we have an exact gpu write domain tracking, we don't need to move objects to the active list ourself. i915_add_request will take care of that under all circumstances. Idea stolen from a patch by Chris Wilson . Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 4df2faf4512c2e2ffa6793e055c73a4e7b8b5e36 Author: Daniel Vetter Date: Fri Feb 19 11:52:00 2010 +0100 drm/i915: reuse i915_gpu_idle helper We have it, so use it. This required moving the function to avoid a forward declaration. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit 63560396536e9eb8858826fcbfc14d4015a41a95 Author: Daniel Vetter Date: Fri Feb 19 11:51:59 2010 +0100 drm/i915: ensure lru ordering of fence_list The fence_list should be lru ordered for otherwise we might try to steal a fence reg from an active object even though there are fences from inactive objects available. lru ordering was obeyed for gpu access everywhere save when moving dirty objects from flushing_list to active_list. Fixing this cause the code to indent way to much, so I've extracted the flushing_list processing logic into its on function. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson Signed-off-by: Eric Anholt commit ae3db24aab398fb5f985696c12362eb12ef65812 Author: Daniel Vetter Date: Fri Feb 19 11:51:58 2010 +0100 drm/i915: extract fence stealing code The spaghetti logic in there tripped up my brain's code parser for a few secs. Prevent this from happening again by extracting the fence stealing code into a seperate functions. IMHO this slightly clears up the code flow. v2: Beautified according to ickle's comments. v3: ickle forgot to flush his comment queue ... Now there's also a we-are-paranoid BUG_ON in there. v4: I've forgotten to switch on my brain when doing v3. Now the BUG_ON actually checks something useful. v5: Clean up a stale comment as noted by Eric Anholt. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson Signed-off-by: Eric Anholt commit 4a87b8ca2185199c5d1b37b570efffd2e46fe813 Author: Daniel Vetter Date: Fri Feb 19 11:51:57 2010 +0100 drm/i915: fixup active list locking in object_unbind All other accesses take this spinlock, so do this here, too. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit 798750e30d3de7932b0ac420f8fae2a970f2ac34 Author: Daniel Vetter Date: Fri Feb 19 11:51:56 2010 +0100 drm/i915: reuse i915_gem_object_put_fence_reg for fence stealing code This has a few functional changes against the old code: * a few more unnecessary loads and stores to the drm_i915_fence_reg objects. Also an unnecessary store to the hw fence register. * zaps any userspace mappings before doing other flushes. Only changes anything when userspace does racy stuff against itself. * also flush GTT domain. This is a noop, but still try to keep the bookkeeping correct. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit 1f7a6e372e9cb4d749f34c0738d832e6cadb4071 Author: Zhenyu Wang Date: Tue Feb 23 14:05:24 2010 +0800 drm/i915: Add dependency on the intel agp module See http://bugzilla.kernel.org/show_bug.cgi?id=15021 Make sure that the appropriate AGP module is loaded and probed before trying to set up the DRM. The DRM already depends on the AGP core, but in this case we know the specific AGP driver we need too, and can help users avoid the trap of loading the AGP driver after the DRM driver. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit c619eed4b2ee1b2bde3e02464eb81632a08bb976 Author: Eric Anholt Date: Thu Jan 28 16:45:52 2010 -0800 drm/i915: More s/IS_IRONLAKE/HAS_PCH_SPLIT for Sandybridge. I think this is pretty much correct. Not really tested. Signed-off-by: Eric Anholt commit faa7bde6cb1227d13d011042f17bda0869c3bd1e Author: Eric Anholt Date: Thu Jan 28 16:13:29 2010 -0800 drm/i915: Correct the Sandybridge chipset info structs. Disables CXSR until it's done, and sets the mobile bit on mobile. Signed-off-by: Eric Anholt commit b9201c14d9c22fb3b3f313f69ee4f967353ca960 Author: Eric Anholt Date: Fri Jan 8 14:25:16 2010 -0800 drm/i915: Disable the hangcheck reset on Sandybridge until we add support. Signed-off-by: Eric Anholt commit a13e4093cbd3db91cc65ac8b8c2baadffa603ee9 Author: Eric Anholt Date: Thu Jan 7 15:08:18 2010 -0800 drm/i915: Add a new mobile Sandybridge PCI ID. Signed-off-by: Eric Anholt commit 954bce507acdcb76520b2f30535400fc036e7c20 Author: Eric Anholt Date: Thu Jan 7 16:21:46 2010 -0800 agp/intel: Add a new Sandybridge HB/IG PCI ID combo. Signed-off-by: Eric Anholt commit 14bc490bbdf1b194ad1f5f3d2a0a27edfdf78986 Author: Zhenyu Wang Date: Wed Nov 11 01:25:25 2009 +0800 drm/i915, agp/intel: Fix stolen memory size on Sandybridge New memory control config reg at 0x50 should be used for stolen memory size detection on Sandybridge. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 21099537dbacc5c8999d833e6bfd1b72edd89189 Author: Eric Anholt Date: Mon Nov 9 14:57:34 2009 -0800 drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON. Signed-off-by: Eric Anholt commit c2416fc6bb16fa87bcc4b9d90a7632f3531bdee6 Author: Eric Anholt Date: Thu Nov 5 15:30:35 2009 -0800 drm/i915: Disable the surface tile swizzling on Sandybridge. I can't explain this, except that it makes my display correct. Signed-off-by: Eric Anholt commit e3deb204c69c485c88c990f07b71be10a464e508 Author: Eric Anholt Date: Mon Nov 2 15:33:05 2009 -0800 agp/intel: Use a non-reserved value for the cache field of the PTEs. I don't know if this is what we'll want to be using long term, we'll see. Signed-off-by: Eric Anholt commit f6e450a6417460db6a74241de8aaab5116cac140 Author: Eric Anholt Date: Mon Nov 2 12:08:22 2009 -0800 drm/i915: Fix sandybridge status page setup. The register's moved to the same location as the one for the BCS, it seems. Signed-off-by: Eric Anholt commit 4e901fdc263d32d4cb4c59ec16ff0874129ec8c9 Author: Eric Anholt Date: Mon Oct 26 16:44:17 2009 -0700 drm/i915: Set up fence registers on sandybridge. Signed-off-by: Eric Anholt commit bad720ff3e8e47a04bd88d9bbc8317e7d7e049d3 Author: Eric Anholt Date: Thu Oct 22 16:11:14 2009 -0700 drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge. Signed-off-by: Eric Anholt commit 1089e3009572e07a1fe12c3408828f27c96453be Author: Eric Anholt Date: Thu Oct 22 16:10:52 2009 -0700 agp/intel: Add support for Sandybridge. Signed-off-by: Eric Anholt commit c4d1409bbed8cf2a11b48ce3a075e142f686a588 Author: Konrad Rzeszutek Wilk Date: Fri Feb 26 03:53:00 2010 +0000 ibft: Update MAINTAINERS file. Provide the right e-mail and names for me and Peter. Signed-off-by: Konrad Rzeszutek Wilk commit 00e7825b943f486e80ff1305cd0594d8791870f8 Author: Joe Perches Date: Thu Jan 14 11:34:19 2010 -0500 drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 Convert netmask to __be32 and format it with %pI4 Signed-off-by: Joe Perches Signed-off-by: Konrad Rzeszutek Reviewed-by: Mike Christie Cc: Peter Jones Cc: James Bottomley Signed-off-by: Andrew Morton commit 8266d7127c1b0bdf924066c19c71be4d351e9583 Author: Jeff Garzik Date: Fri Feb 26 12:49:20 2010 -0800 net: Delete isa-skeleton net driver The ISA skeleton net driver has been obsolete and unmaintained for many years. Any hardware remotely like ISA will use the platform API and look much more like a PCI driver, and make much better use of netdev APIs such as NAPI. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 398007f863a4af2b4a5a07219c5a617f1a098115 Merge: d67b1b0 60b341b Author: Alex Elder Date: Fri Feb 26 14:34:02 2010 -0600 Merge branch 'linux-2.6.33' commit 4d86e1b18d6de8446aa424b615b34e436d42c241 Merge: 65c9bb6 b6dcefd Author: Tony Luck Date: Fri Feb 26 12:04:32 2010 -0800 Pull misc2634 into release branch commit 65c9bb6cca78a3677c66c6b279d5d77aa863bb32 Merge: 8d6339b e72aca3 Author: Tony Luck Date: Fri Feb 26 12:04:22 2010 -0800 Pull alex into release branch commit 8d6339b8a532ec4eeb31db321cf1e6068965deda Merge: 60b341b 32974ad Author: Tony Luck Date: Fri Feb 26 12:04:13 2010 -0800 Pull rmia32 into release branch commit a9c9b4429df437982d2fbfab1f4b46b01329e9ed Author: Rafael J. Wysocki Date: Thu Feb 25 22:32:37 2010 +0100 PM / Hibernate: Fix preallocating of memory The hibernate memory preallocation code allocates memory to push some user space data out of physical RAM, so that the hibernation image is not too large. It allocates more memory than necessary for creating the image, so it has to release some pages to make room for allocations made while suspending devices and disabling nonboot CPUs, or the system will hang due to the lack of free pages to allocate from. Unfortunately, the function used for freeing these pages, free_unnecessary_pages(), contains a bug that prevents it from doing the job on all systems without highmem. Fix this problem, which is a regression from the 2.6.30 kernel, by using the right condition for the termination of the loop in free_unnecessary_pages(). Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Alan Jenkins Cc: stable@kernel.org commit f8bb0db8188c7ef9ef08515883dae9f9eb980984 Author: Jiri Slaby Date: Sun Feb 21 22:14:44 2010 +0100 PM / Hibernate: Remove swsusp.c finally Its contents and entry in Makefile were already removed in 8e60c6a1348e17e68ad73589a52a03876e7059be (Shift remaining code from swsusp.c to hibernate.c) but somehow it remained in-place (rjw: which most likely was my mistake). Signed-off-by: Jiri Slaby Acked-by: Nigel Cunningham Signed-off-by: Rafael J. Wysocki commit 07c3bb5797d0a9a48524cca17ceb95711b48890b Author: Frans Pop Date: Thu Feb 11 23:09:08 2010 +0100 PM / Hibernate: Remove trailing space in message Remove a trailing space from a message in swsusp_save(). Signed-off-by: Frans Pop Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit 4cb077d93a57fb8bb64c277ec4ce637823cd76f4 Author: Rafael J. Wysocki Date: Mon Feb 8 19:18:26 2010 +0100 PM: Allow SCSI devices to suspend/resume asynchronously Set power.async_suspend for all SCSI devices, targets and hosts, so that they can be suspended and resumed in parallel with the main suspend/resume thread and possibly with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). The power.async_suspend flag is also set for devices that don't have suspend or resume callbacks, because otherwise they would make the main suspend/resume thread wait for their "asynchronous" children (during suspend) or parents (during resume), effectively negating the possible gains from executing these devices' suspend and resume callbacks asynchronously. Signed-off-by: Rafael J. Wysocki commit 927bc9165d3cd01054b472f9b25d91a8707209c8 Author: Rafael J. Wysocki Date: Mon Feb 8 19:18:16 2010 +0100 PM: Allow USB devices to suspend/resume asynchronously Set power.async_suspend for USB devices, endpoints and interfaces, allowing them to be suspended and resumed asynchronously during system sleep transitions. The power.async_suspend flag is also set for devices that don't have suspend or resume callbacks, because otherwise they would make the main suspend/resume thread wait for their "asynchronous" children (during suspend) or parents (during resume), effectively negating the possible gains from executing these devices' suspend and resume callbacks asynchronously. Signed-off-by: Rafael J. Wysocki commit 6d19c009cc780c63de25a046509ebc9473809fd6 Author: Alan Stern Date: Fri Feb 12 12:21:11 2010 +0100 USB: implement non-tree resume ordering constraints for PCI host controllers This patch (as1331) adds non-tree ordering constraints needed for proper resume of PCI USB host controllers from hibernation. The main issue is that non-high-speed devices must not be resumed before the high-speed root hub, because it is the ehci_bus_resume() routine which takes care of handing the device connection over to the companion controller. If the device resume is attempted before the handover then the device won't be found and it will be treated as though it had disconnected. The patch adds a new field to the usb_bus structure; for each full/low-speed bus this field will contain a pointer to the companion high-speed bus (if one exists). It is used during normal device resume; if the hs_companion pointer isn't NULL then we wait for the root-hub device on the hs_companion bus. A secondary issue is that an EHCI controlller shouldn't be resumed before any of its companions. On some machines I have observed handovers failing if the companion controller is reinitialized after the handover. Thus, the EHCI resume routine must wait for the companion controllers to be resumed. The patch also fixes a small bug in usb_hcd_pci_probe(); an error path jumps to the wrong label, causing a memory leak. [rjw: Fixed compilation for CONFIG_PM_SLEEP unset.] Signed-off-by: Alan Stern Acked-by: Greg Kroah-Hartman Signed-off-by: Rafael J. Wysocki commit a1e4d72cd3024999bfb6703092ea271438805c89 Author: Rafael J. Wysocki Date: Mon Feb 8 19:16:33 2010 +0100 PM: Allow PCI devices to suspend/resume asynchronously Set power.async_suspend for all PCI devices and PCIe port services, so that they can be suspended and resumed in parallel with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). This only affects the "regular" suspend and resume stages, which means in particular that the restoration of the PCI devices' standard configuration registers during resume will still be carried out synchronously (at the "early" resume stage). Signed-off-by: Rafael J. Wysocki commit 09c09bc618a4ceec387c57542031b4fc35826e16 Author: Jiri Slaby Date: Wed Jan 27 23:47:56 2010 +0100 PM / Hibernate: Swap, remove useless check from swsusp_read() It will never reach here if the sws_resume_bdev is erratic. swsusp_read() is called only from software_resume(), but after swsusp_check() which would catch the error state. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki commit b694e52ebdd439e4591d4a6651658026196174f6 Author: Jiri Slaby Date: Wed Jan 27 23:47:50 2010 +0100 PM / Hibernate: Really deprecate deprecated user ioctls They were deprecated and removed from exported headers more than 2 years ago. Inform users about their removal in the future now. (Switch cases needed to be reorderded for an easy fall through.) And add an entry to feature-removal-schedule. Signed-off-by: Jiri Slaby Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit f8824cee405c62ba465b85365201166d9cf86a14 Author: Rafael J. Wysocki Date: Wed Jan 27 23:47:38 2010 +0100 PM: Allow device drivers to use dpm_wait() There are some dependencies between devices (in particular, between EHCI USB controllers and their OHCI/UHCI siblings) which are not reflected by the structure of the device tree. With synchronous suspend and resume these dependencies are taken into accout automatically, because the devices in question are always registered in the right order, but to meet these constraints with asynchronous suspend and resume the drivers of these devices will need to use dpm_wait() in their suspend/resume routines, so introduce a helper function allowing them to do that. Signed-off-by: Rafael J. Wysocki commit 97df8c12995c5bac73e3bfeea4c5be155c1f4401 Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:31 2010 +0100 PM: Start asynchronous resume threads upfront It has been shown by testing that total device resume time can be reduced significantly (by as much as 50% or more) if the async threads executing some devices' resume routines are all started before the main resume thread starts to handle the "synchronous" devices. This is a consequence of the fact that the slowest devices tend to be located at the end of dpm_list, so their resume routines are started very late. Consequently, they have to wait for all the preceding "synchronous" devices before their resume routines can be started by the main resume thread, even if they are "asynchronous". By starting their async threads upfront we effectively move those devices towards the beginning of dpm_list, without breaking their ordering with respect to their parents and children. As a result, their resume routines are started much earlier and we are able to save much more device resume time this way. Signed-off-by: Rafael J. Wysocki commit 5a2eb8585f3b38e01e30aacaa8b985a1520a993d Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:23 2010 +0100 PM: Add facility for advanced testing of async suspend/resume Add configuration switch CONFIG_PM_ADVANCED_DEBUG for compiling in extra PM debugging/testing code allowing one to access some PM-related attributes of devices from the user space via sysfs. If CONFIG_PM_ADVANCED_DEBUG is set, add sysfs attribute power/async for every device allowing the user space to access the device's power.async_suspend flag and modify it, if desired. Signed-off-by: Rafael J. Wysocki commit 0e06b4a891c6a108412fe24b4500f499da2cf8a1 Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:15 2010 +0100 PM: Add a switch for disabling/enabling asynchronous suspend/resume Add sysfs attribute /sys/power/pm_async allowing the user space to disable/enable asynchronous suspend/resume of devices. Signed-off-by: Rafael J. Wysocki commit 5af84b82701a96be4b033aaa51d86c72e2ded061 Author: Rafael J. Wysocki Date: Sat Jan 23 22:23:32 2010 +0100 PM: Asynchronous suspend and resume of devices Theoretically, the total time of system sleep transitions (suspend to RAM, hibernation) can be reduced by running suspend and resume callbacks of device drivers in parallel with each other. However, there are dependencies between devices such that we're not allowed to suspend the parent of a device before suspending the device itself. Analogously, we're not allowed to resume a device before resuming its parent. The most straightforward way to take these dependencies into accout is to start the async threads used for suspending and resuming devices at the core level, so that async_schedule() is called for each suspend and resume callback supposed to be executed asynchronously. For this purpose, introduce a new device flag, power.async_suspend, used to mark the devices whose suspend and resume callbacks are to be executed asynchronously (ie. in parallel with the main suspend/resume thread and possibly in parallel with each other) and helper function device_enable_async_suspend() allowing one to set power.async_suspend for given device (power.async_suspend is unset by default for all devices). For each device with the power.async_suspend flag set the PM core will use async_schedule() to execute its suspend and resume callbacks. The async threads started for different devices as a result of calling async_schedule() are synchronized with each other and with the main suspend/resume thread with the help of completions, in the following way: (1) There is a completion, power.completion, for each device object. (2) Each device's completion is reset before calling async_schedule() for the device or, in the case of devices with the power.async_suspend flags unset, before executing the device's suspend and resume callbacks. (3) During suspend, right before running the bus type, device type and device class suspend callbacks for the device, the PM core waits for the completions of all the device's children to be completed. (4) During resume, right before running the bus type, device type and device class resume callbacks for the device, the PM core waits for the completion of the device's parent to be completed. (5) The PM core completes power.completion for each device right after the bus type, device type and device class suspend (or resume) callbacks executed for the device have returned. Signed-off-by: Rafael J. Wysocki commit 8cc6b39ff36b4bbce2d7471da088df122b0e9033 Author: Rafael J. Wysocki Date: Sat Jan 23 22:03:29 2010 +0100 PM: Add parent information to timing messages Add parent information to the messages printed by the suspend/resume core when initcall_debug is set. Signed-off-by: Rafael J. Wysocki commit 971cb7fba0c84dd74c39020f4596b08398f58199 Author: Rafael J. Wysocki Date: Sat Jan 23 22:03:22 2010 +0100 PM: Document device power attributes in sysfs There are sysfs attributes in /sys/devices/.../power/ that haven't been documented yet in Documentation/ABI/. Document them as appropriate. Signed-off-by: Rafael J. Wysocki commit 53823639173cc9e9a261f68f4abefe62364b86c6 Author: Rafael J. Wysocki Date: Sat Jan 23 22:02:51 2010 +0100 PM / Runtime: Add sysfs switch for disabling device run-time PM Add new device sysfs attribute, power/control, allowing the user space to block the run-time power management of the devices. If this attribute is set to "on", the driver of the device won't be able to power manage it at run time (without breaking the rules) and the device will always be in the full power state (except when the entire system goes into a sleep state). Signed-off-by: Rafael J. Wysocki Acked-by: Alan Stern commit b6dcefdef49000fc871a851cba4b48454343cde5 Author: Roel Kluin Date: Tue Feb 2 14:42:01 2010 -0800 [IA64] wrong attribute of HUB chip written in uv_setup() n_val should be assigned to n_val attribute of HUB chip. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 04157e4c0612fb820bbef221f6222c402e17af3b Author: Frans Pop Date: Sat Feb 6 18:47:10 2010 +0100 [IA64] remove trailing space in messages ia64 parts of system wide cleanup to drop trailing whitespace from lines in message strings. Signed-off-by: Frans Pop Signed-off-by: Tony Luck commit 3a095a97e17897e8a8d7c3c995cb206f801c2477 Author: FUJITA Tomonori Date: Fri Feb 26 09:43:51 2010 +0900 [IA64] use asm-generic/scatterlist.h IA64's scatterlist structure is identical to the generic one. Signed-off-by: FUJITA Tomonori Signed-off-by: Tony Luck commit 3621263a4d9679726b7bc1e2546c1c03941a59b4 Author: Mauro Carvalho Chehab Date: Fri Feb 26 15:58:11 2010 -0300 V4L-DVB: cx88-dvb: remove extra attribution for core This is not needed, since the function already do it. Also, it causes a warning at the compilation, since a new var is declared in the middle of the code. Signed-off-by: Mauro Carvalho Chehab commit 68c6b859846bd078b37c6ca5f3882032f129e72d Merge: a4a47bc bb8d413 Author: Linus Torvalds Date: Fri Feb 26 10:35:27 2010 -0800 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (48 commits) x86/PCI: Prevent mmconfig memory corruption ACPI: Use GPE reference counting to support shared GPEs x86/PCI: use host bridge _CRS info by default on 2008 and newer machines PCI: augment bus resource table with a list PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs PCI: read bridge windows before filling in subtractive decode resources PCI: split up pci_read_bridge_bases() PCIe PME: use pci_pcie_cap() PCI PM: Run-time callbacks for PCI bus type PCIe PME: use pci_is_pcie() PCI / ACPI / PM: Platform support for PCI PME wake-up ACPI / ACPICA: Multiple system notify handlers per device ACPI / PM: Add more run-time wake-up fields ACPI: Use GPE reference counting to support shared GPEs PCI PM: Make it possible to force using INTx for PCIe PME signaling PCI PM: PCIe PME root port service driver PCI PM: Add function for checking PME status of devices PCI: mark is_pcie obsolete PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges PCI: pciehp: second try to get big range for pcie devices ... commit b6fa8796b2da0390e9f4115e8789a01004fc1c9b Author: David Teigland Date: Thu Feb 25 12:20:57 2010 -0600 dlm: use bastmode in debugfs output The bast mode that appears in the debugfs output should be useful on both master and process nodes. lkb_highbast is currently printed, and is only useful on the master node. lkb_bastmode is only useful on the process node. This patch sets lkb_bastmode on the master node as well, and uses that value in the debugfs print. Signed-off-by: David Teigland commit b4a5d4bc377e49239374f266f0a0e2772c29749c Author: Steven Whitehouse Date: Wed Feb 17 09:41:34 2010 +0000 dlm: Send lockspace name with uevents Although it is possible to get this information from the path, its much easier to provide the lockspace as a seperate env variable. Signed-off-by: Steven Whitehouse Signed-off-by: David Teigland commit 84f3751d6a6f766780dee509433bf7b3dfcdf465 Author: Baruch Siach Date: Fri Feb 19 14:09:25 2010 -0300 V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index When code <= V4L2_MBUS_FMT_FIXED soc_mbus_get_fmtdesc returns a pointer to mbus_fmt[x], where x < 0. Fix this. Signed-off-by: Baruch Siach Signed-off-by: Guennadi Liakhovetski CC: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 4f3ca2f152844c5f6ea853077f56d0db877d1f7a Author: Dirk Herrendoerfer Date: Thu Feb 11 18:06:34 2010 -0300 V4L/DVB: Add support for SMT7020 to cx88 This patch adds support for the built-in dvb device of a Samsung SMT7020s (x86 based STB) to the cx88 family. Signed-off-by: Dirk Herrendoerfer Signed-off-by: Helmut Auer Signed-off-by: Mauro Carvalho Chehab commit 144dcdceb6ca320d7b3dffa6eea6c0a57cbfbb18 Author: Tobias Lorenz Date: Thu Feb 18 16:33:46 2010 -0300 V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment This cosmetic patch corrects a wrong unicode "micro" character in a comment. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit d2fa21876147005ba942cef1d9e5a5039b4326bd Author: Joe Perches Date: Tue Feb 23 14:08:20 2010 -0300 V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix linux-next commit 2ff8223957d901999bf76aaf2c6183e33a6ad14e exposes an infinite loop defect in scripts/get_maintainer.pl Fix the incorrect format of the MAINTAINERS "M:" entries. Signed-off-by: Joe Perches Acked-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 0158e98fa15f6980568d7c3f67f035d3783319cd Author: Hans de Goede Date: Sat Feb 20 11:26:07 2010 -0300 V4L/DVB: gspca_stv06xx: Add support for camera button Only tested with an stv6422 based cam, as that is the only stv06xx cam I have with a button. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 88e8d20a8c7c84533e1aa89dd45354cb5edded37 Author: Hans de Goede Date: Sat Feb 20 04:45:49 2010 -0300 V4L/DVB: gspca_ov519: add support for the button on ov511 based cams Due to hardware limitations this only works while the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 92e232acd61f610e09449dad3f6ff6d3c78887e9 Author: Hans de Goede Date: Sat Feb 20 04:30:45 2010 -0300 V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams Due to hardware limitations this only works while the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 417a4d26591e3f2b7784791246048ed315f3fdce Author: Hans de Goede Date: Fri Feb 19 07:37:08 2010 -0300 V4L/DVB: gspca_ov519: add support for the button on ov519 based cams Note due to hardware limitiations (no interrupt endpoint), this only works when the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit e7637521ac92ce99045b8f8a9c1419bb7814ff9a Author: Hans de Goede Date: Fri Feb 19 05:11:09 2010 -0300 V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set gspca_main: Fix a compile error when CONFIG_INPUT is not set. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 10ee2402004d03b31555aad7badf7e499fa686d3 Author: Hans de Goede Date: Fri Feb 19 04:41:40 2010 -0300 V4L/DVB: gspca_main: some input error handling fixes 2 small changes to input device error handling: 1) Make it fatal when we fail to create an input device (it is either this or add checks for gspca_dev->input_dev being NULL in a lot of places) 2) Since we allow gspca_input_create_urb() to fail everywhere we call it, and thus never check its return value, make it void. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ac82f59f9cc6aae3300430fcc3422e59f83d89ae Author: Hans de Goede Date: Fri Feb 19 04:28:39 2010 -0300 V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs Allow use of the gspca core input device creation code by subdrivers which have non interrupt driven camera buttons. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 5fb2dde28122e74bbab9dae3cc04bcbc8c08b332 Author: Hans de Goede Date: Wed Feb 17 11:59:19 2010 -0300 V4L/DVB: gspca_pac7302: much improved exposure control My experience with fixing up the controls for the PAS sensors in sonixb, has lead me to re-investigate the exposure control for the pac7302. I've now found a regular exposure register in register bank 3 (which seems to be the sensor registers bank), and with this added a proper fine grained exposure control. This patch also updates the do_autogain function to work properly with this new finer grained control. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 0e4b91c30605ae030d4ff63c5160e54c1bc2682c Author: Hans de Goede Date: Wed Feb 10 20:29:43 2010 -0300 V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras Make the sonixb driver handle pas106 and pas202 cameras, when both it and the sn9c102 driver are enabled in the kernel configuration. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 421763e7764e424dcb14ef17ef72ae1eb4ec79fe Author: Hans de Goede Date: Wed Feb 10 18:57:40 2010 -0300 V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls Fixup brightness ctrl and add gain and exposure ctrls for PAS106B sensors, this allows enabling autogain (done), and makes the cam usable in low light conditions. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 606f8428ca1c2fbc665f726b4f810b8d50b87954 Author: Hans de Goede Date: Wed Feb 10 06:49:23 2010 -0300 V4L/DVB: Documentation: gspca.txt: update known mr97310a cams Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9d3103d061224e939272d05d54192038f66ffd54 Author: Theodore Kilgore Date: Tue Feb 9 18:05:25 2010 -0300 V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix This camera has a sensor type we did not support sofar, this patch adds support for the new sensor type found in the Sakar 1638x CyberPix. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 10bb7530108cc11fedd0d615467a54f341079778 Author: Hans de Goede Date: Thu Feb 4 06:10:55 2010 -0300 V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480 In 640x480, if the reg11 has less than 4, the image is unstable (the bridge goes into a higher compression mode which we have not reverse engineered yet). Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 82e839c9c5f79c4e55dc1b6ecb2cf1c055f753c5 Author: Hans de Goede Date: Wed Feb 3 14:37:30 2010 -0300 V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls Fixup brightness ctrl and add gain and exposure ctrls for PAS202BCB sensors, this allows enabling autogain (done), and makes the cam usable in low light conditions. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 26984b09952d01afabaa38e747fbee083dde0374 Author: Hans de Goede Date: Mon Feb 1 13:18:37 2010 -0300 V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl Some sensors only allow controlling the exposure by changing the clockdiv, which means that exposure takes pretty large jumps (for example when going from a div of 1 to 2, the exposure doubles). Use 2 different entries in the controls array for these 2 different types of exposure (always disabling one), and; Add a new autogain algorithm for the coarse exposure case, which normally changes the gain setting, only touching the exposure setting if the desired luminance cannot be reached with gain, and after an exposure change once more first tries gain, etc. Thus avoiding exposure changes, and the resulting oscilation because of the huge steps these exposure controls take. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 4efcfa0af11d75fa6311ef62180eefcd654be3c1 Author: Hans de Goede Date: Mon Feb 1 07:48:17 2010 -0300 V4L/DVB: gspca_sonixb: leave bridge gain at 1.0 when we have a sensor gain Leave bridge gain at 1.0 when we have a sensor gain, while at it also change the bridge gain setting code to write both registers in one go saving us a usb transaction. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9712a8be6b842ba9ffbd1b74a8d9b04c785b8ac1 Author: Hans de Goede Date: Sun Jan 31 12:54:29 2010 -0300 V4L/DVB: gspca_sonixj: Add camera button support gspca_sonixj: Add camera button support Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit f65e93d60050ae4cf281b55b59864e7e7a08eb58 Author: Hans de Goede Date: Sun Jan 31 10:35:15 2010 -0300 V4L/DVB: gspca_sonixb: Add support for camera button gspca_sonixb: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 1a3510265b45e2d7f55879c7ff576b947e0b1bd7 Author: Hans de Goede Date: Fri Jan 29 11:05:25 2010 -0300 V4L/DVB: gscpa_zc3xx: Add support for camera button gscpa_zc3xx: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 32ea3e44b9d9125960e23f56ce86c39700447717 Author: Hans de Goede Date: Fri Jan 29 11:04:19 2010 -0300 V4L/DVB: gscpa_pac7311: Add support for camera button gscpa_pac7311: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 937a6f54e31f3899c93cbe975d2ea7599dadd666 Author: Hans de Goede Date: Fri Jan 29 11:02:10 2010 -0300 V4L/DVB: gscpa_pac207: Add support for camera button gscpa_pac207: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 4f3a89e48a9975ab3f777ea15ac161267e4b8794 Author: Hans de Goede Date: Sun Jan 17 10:45:13 2010 -0300 V4L/DVB: gscpa Documentation: add cpia1 cameras gscpa Documentation: add cpia1 cameras Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit eb900690519e2a8f18076bc821baccc6f6236c74 Author: Hans de Goede Date: Sun Jan 17 10:42:55 2010 -0300 V4L/DVB: gspca_sq905c: Add an additional USB-ID gspca_sq905c: Add an additional USB-ID Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c260fe936de6a52010a3247f9c3e8da47d9726e8 Author: Theodore Kilgore Date: Fri Jan 15 05:54:36 2010 -0300 V4L/DVB: gspca_mr97310a: Simplify sensor detection Simplify sensor detection a bit (share more of the code between cif and vga cameras). Also remove an unnecessary write from zero_the_pointer(). Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c1ea5b7424e4d1d3f56de1504a257ec2419259e8 Author: Andy Walls Date: Sat Feb 20 21:28:39 2010 -0300 V4L/DVB: ivtv: Tweak Sony GigaPocket Kikyou card entry based on experiments Based on experiments by Eric Wescott, edit the Sony GigaPocket (Kikyou) card entry video and audio mux settings. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7c12167bae57994e30cc5258e8aaa6fb06258f46 Author: Eric Anderson Date: Wed Feb 10 22:14:54 2010 -0300 V4L/DVB: ivtv: Add initial entry for Sony VAIO Giga Pocket (Kikyou) cards This is a slightly modified version of Eric Anderson's original patch for the Sony Giga Pocket board. It has been updated to apply to the latest ivtv driver version by Hans Verkuil and Andy Walls . Also Andy Walls modified the patch to use a new Sony BTF-Pnx01Z tuner entry based on Eric Anderson's experimental findings for the bandswitch. >From Eric Anderson's original email: 1. The tuner on the card doesn't seem to match any standard ones. I modified an existing tuner entry. Ideally a new tuner entry should be created. (The only difference from the one I modified is that the low-to-mid range frequency cut-off is slightly different, as are the bit config settings.) 2. It wasn't obvious how to choose a second audio input other than using "radio" as an option. Basically there's two GPIO audio inputs. Using radio allowed me to avoid major restructuring to the code. (perhaps other cards don't have this often...) 3. It's not clear that there's a mute setting that works. Not sure why. 4. I haven't had a chance to test the two Svideo inputs. I set them to COMPOSITE1 and SVIDEO2, but I'm not sure those are the correct settings. The standard composite video inputs seem to work. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit dbb9de9bc137e08dc47db960d5730e3251932e2b Author: Andy Walls Date: Wed Feb 10 19:02:58 2010 -0300 V4L/DVB: tuner-types: Add Sony BTF-Pxn01Z tuner type used on GigaPocket cards Sony makes custome tuners for its GigaPocket line of ivtv based capture cards. This adds an entry to the tuner-types list for such tuners. Parameters are based on experiments by Eric Anderson . Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 587808d5f59e842f9258a15e88ad530fcf6e6763 Author: Andy Walls Date: Wed Feb 10 15:34:46 2010 -0300 V4L/DVB: ivtv: Fix ivtv_api_get_data() to avoid unneeded IO during IRQ handling ivtv_api_get_data() was performing more PCI MMIO than needed, resulting often in it accounting for more than half the total time spent in ivtv_irq_handler(). Now it only reads at most 7 of the 16 mailbox data words over the PCI bus, and in some instances only 2 or 3 data words as needed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 00cb9f6920aaeb34bcef146085ae57e363641a85 Author: Murali Karicheri Date: Sun Feb 21 15:52:45 2010 -0300 V4L/DVB: V4L - vpfe capture - build environment for isif driver Adding Makefile and Kconfig for ISIF driver Reviewed-by: Hans Verkuil Reviewed-by: Sergei Shtylyov Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit 85b848caf77a0cc6a9df0a0f40d876211b394682 Author: Murali Karicheri Date: Sun Feb 21 15:51:14 2010 -0300 V4L/DVB: V4L - vpfe capture - vpss driver enhancements for DM365 Enhancements to support DM365 ISP5 and VPSS module configuration. Also cleaned up the driver by removing redundant variables. Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit 63e3ab142fa3f46c290891655681c6a6304bd2b3 Author: Murali Karicheri Date: Sun Feb 21 15:48:27 2010 -0300 V4L/DVB: V4L - vpfe capture - source for ISIF driver on DM365 This is the source file for ISIF driver on DM365. ISIF driver is equivalent to CCDC driver on DM355 and DM644x. This driver is tested for YUV capture from TVP514x driver. This patch contains the header files required for this driver. Reviewed-by: Nori, Sekhar Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit e8417683eb15f05941f4c2aad7d358472eaf8a32 Author: Murali Karicheri Date: Sun Feb 21 15:46:01 2010 -0300 V4L/DVB: V4L - vpfe capture - header files for ISIF driver This is the header file for ISIF driver on DM365. ISIF driver is equivalent to CCDC driver on DM355 and DM644x. This driver is tested for YUV capture from TVP514x driver. This patch contains the header files required for this driver. Reviewed-by: Nori, Sekhar Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit a30d6744cf3bfc62d5cdcc9756e7e8e97fe39f17 Author: Murali Karicheri Date: Mon Feb 1 19:36:19 2010 -0300 V4L/DVB: DaVinci - Adding platform & board changes for vpfe capture on DM365 This patch adds following changes:- 1) add sub device configuration data for TVP5146 used by vpfe capture 2) registers platform devices for vpfe_capture, isif and vpss 3) defines hardware resources for the devices listed under 2) 4) defines clock aliase for isif driver 5) adding setup_pinmux() for isif Reviewed-by: Kevin Hilman Signed-off-by: Murali Karicheri Signed-off-by: Kevin Hilman Signed-off-by: Mauro Carvalho Chehab commit fb640224ad9e4e33726b8762bcfed2a266243b4e Author: Mike Isely Date: Sat Feb 6 02:17:17 2010 -0300 V4L/DVB: pvrusb2: Adjust 300msec digitizer wait to be more selective We know that the 300msec settling time after starting the digitizer is only really needed when the digitizer is a SAA7115. So if we're not using a SAA7115, skip the delay. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 91b5b489c5ea0fb206922f1bfbd0bd843b6f326f Author: Mike Isely Date: Sat Feb 6 02:12:33 2010 -0300 V4L/DVB: pvrusb2: Reduce encoder quiet period After implementing a 300msec wait between digitizer start and encoder start, it has been determined that we don't need to wait quite as long before configuring the encoder. This reduces the wait period from 100msec back to 50msec. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 6e9313755aacdb9fd4eec58cbd9653212e2e2cdc Author: Mike Isely Date: Sat Feb 6 02:10:38 2010 -0300 V4L/DVB: pvrusb2: Enforce a 300msec stabilization interval during stream strart Martin Dauskardt has determined that the encoder has a much better chance of starting cleanly if we deliberately hold off starting it util the video digitizer has had a chance to run for at least 300msec first. These changes implement an enforced 300msec wait in the state machine that orchestrates streaming start / stop. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7cae112ebe10e186c3bdae1f20865941717e37a2 Author: Mauro Carvalho Chehab Date: Mon Feb 22 18:55:00 2010 -0300 V4L/DVB: V4L2 docs: replace spaces by tabs CC: Jonathan Corbet CC: Reviewed-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 4b586a38b048b0d78874721e5b26cb6476fafb60 Author: Jonathan Corbet Date: Mon Feb 22 17:47:46 2010 -0300 V4L/DVB: V4L2: Add a document describing the videobuf layer Videobuf is a moderately complex API which most V4L2 drivers should use, but its documentation is...sparse. This document attempts to improve the situation. Signed-off-by: Jonathan Corbet Reviewed-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 995f5fefb0c6abba3688b3aadf40e422b64b814a Author: Hans Verkuil Date: Sat Feb 20 09:41:03 2010 -0300 V4L/DVB: media-spec: Fix documentation mistakes regarding I/O streaming The media spec contains several errors in the description of the I/O streaming ioctls, in particular with respect to the userptr I/O method. The most important change is that you really need to set count and index in v4l2_requestbuffer and v4l2_buffer when dealing with user pointer streaming. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 340dde817a4f68af79453ed295ca0e8de7232669 Author: Hans Verkuil Date: Sat Feb 20 08:07:51 2010 -0300 V4L/DVB: saa7115: fix saa7111a support When the saa7111 driver was merged into saa7115 several bugs were introduced, in particular with the saa7111a support as is used in the mxb.c driver. This patch fixes the saa7111a support. This was tested with the mxb driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163 Author: Hans Verkuil Date: Sat Feb 20 07:56:25 2010 -0300 V4L/DVB: saa7146_vv: fix regression where v4l2_device was registered too late v4l2_device_register needs to be called before the i2c subdevs are loaded. However, it was called afterwards in the saa7146 driver. This caused an oops when loading the mxb and hexium drivers. The vv_init function is now split into two: one registers the v4l2_device, the other does the rest of the initialization. The three drivers that depend on this have been updated to call the new vv_devinit function. Thanks to Michael Hunold for reporting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8d55662512127c84ac90873fb68ba44842e2c426 Author: Laurent Pinchart Date: Thu Feb 4 21:43:37 2010 -0300 V4L/DVB: uvcvideo: Check uvc_ctrl_begin return value in VIDIOC_S_CTRL The function return value wasn't checked due to a missing variable assignment. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 9405e3cbd5dd6767875c573574672cb85c4d7374 Author: Laurent Pinchart Date: Wed Feb 3 06:49:35 2010 -0300 V4L/DVB: uvcvideo: Blacklist gain control for Asus EeePC T91 integrated webcam The Asus EeePC T91 integrated webcam exposes a gain control in the processing unit but stalls when the control is queried. Blacklist the gain control for that camera. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit e54532e591cd5b9ce77dbc8d9786ae9f600f101a Author: Laurent Pinchart Date: Sat Jan 23 07:07:53 2010 -0300 V4L/DVB: uvcvideo: Clamp control values to the minimum and maximum values When setting a control, the V4L2 specification requires drivers to either clamp the control value to the [minimum, maximum] range or return the -ERANGE error. Fix the driver to clamp control values to the valid range in uvc_ctrl_set() and make sure the value differs from the minimum by an integer multiple of step. Signed-off-by: Laurent Pinchart Tested-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 59529081e092506edb81a42d914e2d0522f65ca7 Author: Laurent Pinchart Date: Sat Jan 23 06:30:20 2010 -0300 V4L/DVB: uvcvideo: Cache control min, max, res and def query results Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 8a4e76c14cbe0609fdb5c558f867fe7c556bb1c7 Author: Laurent Pinchart Date: Thu Jan 21 16:53:11 2010 -0300 V4L/DVB: uvcvideo: Return -ERANGE when setting a control to an out-of-range menu index The V4L2 specification states that out of bounds control values must either be clamped to the valid range or result in a -ERANGE error code. Fix the driver to return -ERANGE instead of -EINVAL when setting a menu control to an invalid value. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 36bd883ef98ac6003ab6ec7b91f66d3fb2159318 Author: Laurent Pinchart Date: Tue Jan 19 09:06:22 2010 -0300 V4L/DVB: uvcvideo: Use %pUl printk format specifier to print GUIDs Replace the UVC_GUID_FORMAT and UVC_GUID_ARGS macros with the new %pUl printk format specifier. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 56d15cd313d0d0d7a16c1a2e2cc519f18ab4725a Author: Laurent Pinchart Date: Tue Jan 19 08:59:21 2010 -0300 V4L/DVB: uvcvideo: Increase the streaming control timeout to 5 seconds This fixes timeout issues with some Logitech webcams. The timeout value seems to match the one used in the Logitech Windows driver, so no further increase should be necessary. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit e070bf9ef85e293d9dc586fbfabc008795564c0e Author: Jean-François Moine Date: Thu Feb 18 15:02:51 2010 -0300 V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set Reported-by: Randy Dunlap Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 1e5eb1133aac7982dd941b473e23cd396acb2706 Author: Jean-François Moine Date: Thu Feb 18 14:56:33 2010 -0300 V4L/DVB: gspca - sonixj: Set the vertical flip at capture start for all sensors Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f6b22e5e8e93d03046d3878664a9ba375ccded96 Author: Jean-François Moine Date: Thu Feb 18 04:12:06 2010 -0300 V4L/DVB: gspca - sonixj: Add vertical flip control for sensor hv7131r Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit bee527f97963ece5e3f6e6587402197af889865b Author: Pawel Osciak Date: Mon Feb 22 13:10:06 2010 -0300 V4L/DVB: videobuf: add missing checks for kzalloc returning NULL Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit cca80b973244cf7cf721b05b33178ba4826dbc5e Author: Clemens Ladisch Date: Mon Feb 22 06:45:07 2010 -0300 V4L/DVB: cx88-alsa: prevent out-of-range volume setting Ensure that volume values are always in the allowed range. Otherwise, it would be possible to set other bits in the AUD_VOL_CTL register or to get a wrong sign in the AUD_BAL_CTL register. Signed-off-by: Clemens Ladisch Signed-off-by: Mauro Carvalho Chehab commit 071193ff4182c8f785e770c54e35f3ea2bb98b84 Author: Richard Röjfors Date: Fri Feb 19 19:41:54 2010 -0300 V4L/DVB: mfd: Add timb-radio to the timberdale MFD This patch addes timb-radio to all configurations of the timberdale MFD. Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data. Signed-off-by: Richard Röjfors Cc: sameo@linux.intel.com Signed-off-by: Mauro Carvalho Chehab commit 1f39b5834a3c6c9f107b869d38dca0622e913a3d Author: Roel Kluin Date: Mon Feb 15 19:30:38 2010 -0300 V4L/DVB: dvb-usb/opera1: misplaced parenthesis The parenthesis was misplaced, tmp is set to 0 or break occurs, while debugging opera1_usb_i2c_msgxfer() retval was not shown. Signed-off-by: Roel Kluin CC: Marco Gittler Signed-off-by: Mauro Carvalho Chehab commit 7d3502844609df0985932365197f905e4ea95d22 Author: Mauro Carvalho Chehab Date: Fri Feb 19 20:08:06 2010 -0200 V4L/DVB: tuner-xc2028: Fix demod breakage for XC3028L A small mistake on the last patch broke demod s-code setup for XC3028L (firmware 3.2 and upper). Fix it. Thanks-to: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7f2199c03b4946f1b79514b3411e3dbf130a6bba Author: Mauro Carvalho Chehab Date: Fri Feb 19 02:45:00 2010 -0200 V4L/DVB: tuner-xc2028: fix tuning logic to solve a regression in Australia There's one reported regression in Australia (DTV7) and some reported troubles with newer firmwares found on xc3028l chips. Rework the logic to improve tuner on those cases. Thanks-to: Robert Lowery Thanks-to: Stefan Ringel Tested-by: Robert Lowery CC: stable.kernel.org Signed-off-by: Mauro Carvalho Chehab commit d90a4ae4ae5a5e535782ab090507898e042db81a Author: Jean Delvare Date: Tue Feb 16 14:22:37 2010 -0300 V4L/DVB: bttv: Let the user disable IR support Add a new module parameter "disable_ir" to disable IR support. Several other drivers do that already, and this can be very handy for debugging purposes. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 656380118d1a1c0176e58e4e3e46d736d0dd2000 Author: Catimimi Date: Thu Feb 18 18:06:32 2010 -0300 V4L/DVB: em28xx : Terratec Cinergy Hybrid T USB XS FR is working I succeeded in running Cinergy Hybrid T USB XS FR in both modes. Signed-off-by: Mauro Carvalho Chehab commit 7ccf1eea972177064b4df9d5ba68958604781db6 Author: Randy Dunlap Date: Sun Feb 14 23:39:32 2010 -0300 V4L/DVB: dvb: fix sparse warnings Fix sparse warnings in media/dvb/frontends: drivers/media/dvb/frontends/dibx000_common.c:177:13: warning: non-ANSI function declaration of function 'systime' drivers/media/dvb/frontends/tda665x.c:136:55: warning: right shift by bigger than source value [mchehab@redhat.com: removed the change at dib0090 since it got fixed by a previous patch] Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 18718c96e3e10e6b821d32c50adde9fa5cc6565a Author: Jiri Slaby Date: Sun Feb 14 17:36:25 2010 -0300 V4L/DVB: V4L: dvb-usb, add extra sync to down-up input events Userspace is allowed to coalesce events between SYNCs. And since the code emits UP right after DOWN for the same key, it may be missed (up+down=nothing). Add an extra sync in between UP and DOWN events to disable the coalesce. Signed-off-by: Jiri Slaby Cc: Patrick Boettcher Acked-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab commit fdd70c3399fc448a87487b287f4f0dcfb2e9c52c Author: Lars Hanisch Date: Sun Feb 14 08:57:39 2010 -0300 V4L/DVB: add missing 'p' at card name 'Hauppauge HD PVR' I don't know if there are applications which rely on this name, but after all it's a spelling mistake. Signed-off-by: Lars Hanisch CC: Janne Granau Signed-off-by: Mauro Carvalho Chehab commit 9a0a75a5abb2806969a599e10b0fb287befcb3a7 Author: Franklin Meng Date: Sat Feb 13 02:37:15 2010 -0300 V4L/DVB: Add an entry for Kworld 315U remote Signed-off-by: Franklin Meng Signed-off-by: Mauro Carvalho Chehab commit 536004403d35b707bbac43d629586ee9c944084f Author: Randy Dunlap Date: Fri Feb 12 18:02:35 2010 -0300 V4L/DVB: radio_timberdale: depends on I2c RADIO_TIMBERDALE selects RADIO_SAA7706H, but RADIO_SAA7706H depends on I2C, so make RADIO_TIMBERDALE depend on I2C also; otherwise there are build errors: drivers/media/radio/saa7706h.c:139: error: implicit declaration of function 'i2c_master_send' drivers/media/radio/saa7706h.c:148: error: implicit declaration of function 'i2c_transfer' drivers/media/radio/saa7706h.c:372: error: implicit declaration of function 'i2c_check_functionality' drivers/media/radio/saa7706h.c:375: error: implicit declaration of function 'i2c_adapter_id' drivers/media/radio/saa7706h.c:438: error: implicit declaration of function 'i2c_add_driver' drivers/media/radio/saa7706h.c:443: error: implicit declaration of function 'i2c_del_driver' Signed-off-by: Randy Dunlap Cc: Mocean Laboratories Signed-off-by: Mauro Carvalho Chehab commit 08cf8a57c51da7db9633c2827b3dbabfb7df51fd Author: Randy Dunlap Date: Fri Feb 12 18:02:29 2010 -0300 V4L/DVB: media/video/tlg2300: fix build when CONFIG_PM=n When CONFIG_PM is not enabled, tlg2300 has build errors, so handle that case, mostly via stubs. drivers/media/video/tlg2300/pd-alsa.c:237: error: 'struct poseidon' has no member named 'msg' drivers/media/video/tlg2300/pd-main.c:412: error: implicit declaration of function 'find_old_poseidon' drivers/media/video/tlg2300/pd-main.c:418: error: implicit declaration of function 'set_map_flags' drivers/media/video/tlg2300/pd-main.c:462: error: implicit declaration of function 'get_pd' Cc: linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org Signed-off-by: Randy Dunlap Cc: Huang Shijie Cc: Kang Yong Cc: Zhang Xiaobing Signed-off-by: Mauro Carvalho Chehab commit 546e29b66a1aeec3b6a710aceeb2149871570416 Author: Randy Dunlap Date: Fri Feb 12 12:30:55 2010 -0300 V4L/DVB: timberdale: fix mfd build Fix mfd/timberdale build error -- add depends GPIOLIB. include/linux/spi/max7301.h:14: error: field 'chip' has incomplete type build-r7353.out:make[3]: *** [drivers/mfd/timberdale.o] Error 1 Repairs commit ff7a26e08a16bb31158d830dbf60db2ff47019ab Author: Richard Rjfors AuthorDate: Thu Feb 4 08:18:52 2010 -0300 Commit: Mauro Carvalho Chehab CommitDate: Fri Feb 5 12:25:37 2010 -0200 V4L/DVB: mfd: Add support for the timberdale FPGA Signed-off-by: Randy Dunlap Cc: Richard Rojfors Cc: Samuel Ortiz Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 1952c9bd5d75e65453bfb823098bd63e11723b05 Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:57 2009 -0300 V4L/DVB: Kbuild addition for TVP7002 driver This patch provides menu configuration options for the TVP7002 decoder driver in DM365. Includes only TVP7002. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dfbd5d4d324e630aedc40b7519351a9c0fe94dc9 Author: Hans Verkuil Date: Thu Feb 25 17:34:09 2010 -0300 V4L/DVB: tvp7002: fix compilation breakage when advanced debug is enabled > On Mon, 22 Feb 2010 08:21:44 -0800 Randy Dunlap wrote: > drivers/media/video/tvp7002.c:896: error: 'struct tvp7002' has no member named 'registers' > > so where are these registers?? Hmm, that code is a remnant from older revisions of this driver. Unfortunately, when I compiled this driver before creating my pull request I forgot to turn on the CONFIG_VIDEO_ADV_DEBUG option and so I never saw it. Also fixed the g_register function: it never returned a register value in the original code. Signed-off-by: Hans Verkuil Acked-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 0b67553657330b5ad5c78a974ce84273a515fe4e Author: Santiago Nunez-Corrales Date: Mon Dec 21 16:14:04 2009 -0300 V4L/DVB: TVP7002 driver for DM365 This patch provides the implementation of the TVP7002 decoder driver for DM365. Implemented using the V4L2 DV presets API. Removed shadow register values. Testing shows that the device needs not to be powered down and up for correct behaviour. Improved readability. Uses helper function for preset information. [mchehab@redhat.com: Fix bad Whitespacing] Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d2da2611cc7641a194a868f41fbe4a83cb46964c Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:39 2009 -0300 V4L/DVB: Definitions for TVP7002 in DM365 This patch provides the required definitions for the TVP7002 driver in DM365. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ff9118a516cd4d58f984dded2e39937395867a4b Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:29 2009 -0300 V4L/DVB: Support for TVP7002 in v4l2 definitions This patch provides required chip identification definitions within v4l2. Included only definitions for TVP7002. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4105ed5df1e16afbbea4c96f8d513bda21248308 Author: Manu Abraham Date: Sun Feb 14 17:07:28 2010 -0300 V4L/DVB: AZ6027: Fix build warnings drivers/media/dvb/dvb-usb/az6027.c:390: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:390: warning: (near initialization for ‘az6027_rc_keys[0]’) drivers/media/dvb/dvb-usb/az6027.c:391: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:391: warning: (near initialization for ‘az6027_rc_keys[1]’) drivers/media/dvb/dvb-usb/az6027.c:759: warning: ‘az6027_read_mac_addr’ defined but not used Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 32f8aca4affc9cc5699a8e45b3ce08e76d7b847b Author: Mauro Carvalho Chehab Date: Wed Feb 17 23:54:07 2010 -0200 Revert "V4L/DVB: az6027: az6027_read_mac_addr is currently unused" This reverts commit 1e08370814e8902074d59cc57f2b4c1a62f00ee8. Patch were wrongly applied. Signed-off-by: Mauro Carvalho Chehab commit b00380fcb760070d5bfdc69ed7273084a629db4d Author: Mauro Carvalho Chehab Date: Wed Feb 17 23:53:04 2010 -0200 Revert "V4L/DVB: az6027: IR RC keys are using the old struct with 3 parameters, instead of 2" This reverts commit 234497b022c464532976b8a12614819bcf67f41b. Patch were wrongly applied. Signed-off-by: Mauro Carvalho Chehab commit d07602a07acfb9f6d1dbc24fd0416fed5d194bbc Author: Guennadi Liakhovetski Date: Tue Feb 9 18:00:38 2010 +0100 sh_mobile_ceu_camera: pass .set_parm and .get_parm down to subdevices Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c9f6ef69865ede81265c808227fc4fe9c925319a Author: Guennadi Liakhovetski Date: Tue Feb 9 18:00:30 2010 +0100 soc-camera: add support for VIDIOC_S_PARM and VIDIOC_G_PARM ioctls Just pass VIDIOC_S_PARM and VIDIOC_G_PARM down to host drivers. So far no special handling in soc-camera core. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d74f841c32f0b00a513d87bba646d019ef7d1f67 Author: Magnus Damm Date: Tue Feb 9 17:40:40 2010 +0900 soc-camera: return -ENODEV if sensor is missing Update the soc-camera i2c code to return -ENODEV if a camera sensor is missing instead of -ENOMEM. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 6b727c68ea7083acd008da7c9734a19a4cdd52dc Author: Antonio Ospite Date: Tue Nov 17 23:04:23 2009 +0100 pxa_camera: remove init() callback pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or even to request GPIOs to be used by the camera *sensor*. These initializations can be performed statically in machine init functions. The current semantics for this init() callback is ambiguous anyways, it is invoked in pxa_camera_activate(), hence at device node open, but its users use it like a generic initialization to be done at module init time (configure MFP, request GPIOs for *sensor* control). Signed-off-by: Antonio Ospite Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 81355e40826acea76274c2ef5ff7d156ff28d183 Author: Guennadi Liakhovetski Date: Thu Dec 24 14:12:15 2009 +0100 soc-camera: adjust coding style to match V4L preferences Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 3675c750cf2effc6a2d9582cd1b9d3043aded3b6 Author: Kuninori Morimoto Date: Wed Jan 6 18:42:16 2010 +0900 soc-camera: ov772x: Modify buswidth control This patch removes "buswidth" struct member, and sets the default buswidth to the natively supported 10 bit. You can select 8 bit buswidth by new flag. This patch also modify ap325rxa/migor setup.c Signed-off-by: Kuninori Morimoto Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 906b101886b1b3d9e4d374aa84a67b7dbd349f16 Author: Guennadi Liakhovetski Date: Thu Feb 4 11:24:00 2010 +0100 tw9910: use TABs for indentation Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 4a9ce75516982b0a349df55f326bc0cee572ffc1 Author: Guennadi Liakhovetski Date: Thu Feb 4 11:17:48 2010 +0100 soc-camera: update mt9v022 to take into account board signal routing Use soc_camera_apply_sensor_flags() in mt9v022 to account for any inverters in video signal paths. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 917c50090ea3daa4c048b824a2dcb4730b3d7656 Author: Mauro Carvalho Chehab Date: Wed Feb 17 21:13:19 2010 -0200 V4L/DVB: az6027: az6027_read_mac_addr is currently unused drivers/media/dvb/dvb-usb/az6027.c:759: warning: ‘az6027_read_mac_addr’ defined but not used While there's some code that uses it, it is currently commented. So, comment also the function itself. CC: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2ed3f0c625faaace7a4dcfbb4e11baa17d993c5f Author: Mauro Carvalho Chehab Date: Wed Feb 17 21:11:06 2010 -0200 V4L/DVB: az6027: IR RC keys are using the old struct with 3 parameters, instead of 2 drivers/media/dvb/dvb-usb/az6027.c:390: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:390: warning: (near initialization for ‘az6027_rc_keys[0]’) drivers/media/dvb/dvb-usb/az6027.c:391: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:391: warning: (near initialization for ‘az6027_rc_keys[1]’) CC: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5f0e1cff5d19935bef1a6a2cdbd7f39b92031726 Author: Manu Abraham Date: Sun Feb 14 16:58:10 2010 -0300 V4L/DVB: AZ6027: Fix checkpatch violations Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3c3233ec76118634cfd74d35c45d984e74acfc37 Author: Manu Abraham Date: Sun Feb 14 15:10:54 2010 -0300 V4L/DVB: AZ6027: Add driver supported ID's Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit bafa50ffb11eca44496332f3ee742144f097f29b Author: Manu Abraham Date: Sun Feb 14 15:03:39 2010 -0300 V4L/DVB: AZ6027: Update Build Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 91d8f7ae6eb8cc1c0f701e6afd0f7095c8091b2a Author: Manu Abraham Date: Sun Feb 14 14:59:39 2010 -0300 V4L/DVB: AZ6027: Add driver supported ID's Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 76f9a820c8672ada12ffa0903652c9e6f2429462 Author: Adams Xu Date: Sun Feb 14 14:34:07 2010 -0300 V4L/DVB: AZ6027: Initial import of the driver Signed-off-by: Manu Abaraham Signed-off-by: Mauro Carvalho Chehab commit 007ad830364e795316d2825f1ab68b3a53a3d56c Author: Huang Shijie Date: Thu Feb 11 03:53:51 2010 -0300 V4L/DVB: tlg2300: remove the country code for analog tv and radio video : use the V4L2_STD macros to select the proper audio setting. radio : add preemphasis ctr. test it by the command: v4l2-ctl -d /dev/radio0 --set-ctrl=pre_emphasis_settings=1 [mchehab@redhat.com: folded documentation patch] Signed-off-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 5b3f03f044ad6dffc8cd8c9c50bc5d7769cbd89f Author: Huang Shijie Date: Tue Feb 2 04:07:47 2010 -0300 V4L/DVB: Add driver for Telegent tlg2300 pd-common.h contains the common data structures, while vendorcmds.h contains the vendor commands for firmware. [mchehab@redhat.com: Folded the 10 patches with the driver] Signed-off-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 433763faec55e5f0e3aeb084da504c566134a934 Author: Franklin Meng Date: Thu Feb 11 02:50:56 2010 -0300 V4L/DVB: Kworld 315U remote support Adds remote support for the Kworld 315U device I have added the change for the IR_TYPE_NEC that Mauro suggested. Note: I believe I got most of the mappings correct. Though the source and shutdown button probably could be mapped to something better. [mchehab@redhat.com: Fix CodingStyle] Signed-off-by: Franklin Meng Signed-off-by: Mauro Carvalho Chehab commit 96dd6de3d058a454a5bc4ce2f561a053dd90bfae Author: Darren Jenkins Date: Thu Feb 11 08:07:53 2010 -0300 V4L/DVB: drivers/media/radio/si470x/radio-si470x-usb.c fix use after free In si470x_usb_driver_disconnect() radio->disconnect_lock is accessed after it is freed. This fixes the problem. Coverity CID: 2530 Signed-off-by: Darren Jenkins Signed-off-by: Mauro Carvalho Chehab commit 8ef4c21130832cb51d5a5940ad3d4b7140720218 Author: Antti Palosaari Date: Wed Feb 10 21:33:12 2010 -0300 V4L/DVB: af901x: inform NXP TDA18218 tuner as know but not supported There is no driver for new NXP TDA18218 tuner which is used by few recent af9015 designs. af9015 uses number 179 as ID for that tuner. Inform this tuner is not supported when device using that tuner is meet. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 58c811df63a7c494639b4fe49d7af8fd0b32019b Author: Antti Palosaari Date: Wed Feb 10 20:44:12 2010 -0300 V4L/DVB: af9015: MYGICTV U718 remote autodetection Autodetect MYGICTV U718 from eeprom hash and select remote automatically. Remove old iManufacturer string compare based remote selection logic. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit db02d9dc544be25330fe491eddd2766d1fb7e325 Author: Antti Palosaari Date: Wed Feb 10 20:20:41 2010 -0300 V4L/DVB: af9015: A-Link DTU(m) remote autodetection Autodetect A-Link DTU(m) based eeprom hash and select correct remote. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 809c1e8ae8310a863b147c8571adfb6addeddd43 Author: Antti Palosaari Date: Wed Feb 10 20:07:30 2010 -0300 V4L/DVB: af9015: support for Leadtek WinFast DTV2000DS Add USB ID 0413:6a04 for Leadtek WinFast DTV2000DS. Thanks to Gavin Ramm for reporting this. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit fa1df55c3f99d32eccf3eeb3c9dad4456ebcf1f4 Author: Antti Palosaari Date: Wed Feb 10 20:05:48 2010 -0300 V4L/DVB: af9015: support for DigitalNow TinyTwin v2 Add USB ID 1b80:e402 for DigitalNow TinyTwin version 2. Thanks to Trevor Phillips for reporting this. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit fd9be0dc9b0b2baf203cfef8c8109859d05d0e01 Author: Jiri Slaby Date: Wed Feb 10 20:32:42 2010 -0300 V4L/DVB: DVB: ngene, fix memset parameters Switch second and third memset parameter to stamp the length buffer bytes by 0xff's, not 255 bytes by low 8 bits of Length. Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Matthias Benesch , Ralph Metzler , Oliver Endriss Signed-off-by: Jiri Slaby Cc: Matthias Benesch Cc: Ralph Metzler Cc: Oliver Endriss Cc: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit 7ca7ef6011e92b52a365ddc78f6668e01793c572 Author: Andrea.Amorosi76@gmail.com Date: Tue Feb 9 17:53:38 2010 -0300 V4L/DVB: em28xx: add Dikom DK300 hybrid USB tuner Adds digital and analogue tv support for Dikom DK300 hybrid usb card. Not working: remote controller To be done: it seems that with the proposed patch the digital demodulator remains activated if the tuner is switched from digital to analogue mode. Workaround is to unplug and replug the device when switching from digital to analogue. If someone can explain how to verify the gpio settings using the usbsnoop, the above issue perhaps can be resolved. Signed-off-by: Andrea Amorosi Signed-off-by: Mauro Carvalho Chehab commit 62bdbb735c0415c2ffdddc2269a860a76f7f716a Author: Julia Lawall Date: Sat Feb 6 05:43:58 2010 -0300 V4L/DVB: drivers/media: Correct NULL test In each case, the NULL test has been performed already. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit f0289efa1938eac27a98883bf33af946b13e1110 Author: Klaas de Waal Date: Sun Feb 7 14:09:16 2010 -0300 V4L/DVB: dst: fixes for DVB-C Twinhan VP2031 Remove check "state->dst_type == DST_DTYPE_IS_CABLE" in function dst_get_tuna (around line 1352) to select the correct checksum computation Fill in the .caps field in struct dst_dvbc_ops (around line 1824) with all the supported QAM modulation methods to match the capabilities of the card as implemented in function dst_set_modulation (around line 502). Note that beginning with linux kernel version 2.6.32 the modulation method is checked (by function dvb_frontend_check_parameters in file drivers/media/dvb/dvb-core/dvb_frontend.c) and thus tuning fails if you use a modulation method that is not present in the .caps field. This patch has been tested on a Twinhan VP2031A DVB-C card with the 2.6.32.2 kernel. Signed-off-by: Klaas de Waal Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit dd6ed861d64f86493e7a6bf92c6fcd99d5e3391c Author: Sean Young Date: Sat Feb 6 10:58:41 2010 -0300 V4L/DVB: saa7134 can capture 720x480 when capturing NTSC When capturing NTSC, the saa7134 can capture 720x480. While doing Laserdisc captures using this card, I noticed that right side was truncated/cropped. The highest geometry the driver allows is 704x480, even though in Windows XP it is 720x480. This results in no cropping and the same results as in Windows. Tested on an AverMedia GO 007 FM Plus. Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab commit fad93fdb14f13e7b869a878c0fba3b6e0f91e0b6 Author: Abylay Ospan Date: Sat Feb 6 05:55:47 2010 -0300 V4L/DVB: STV0900 Cut 3.0 AGC2 fix for NetUP Dual DVB-S2-CI card if the AGC2 > 1400 then no signal on this frequency for STV0900 Cut 3.0. For Cut 2.0 this value is 700. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 0a71102f105870a4a245edd1b291fa723a8f3a48 Author: Douglas Schilling Landgraf Date: Fri Feb 5 14:33:38 2010 -0200 V4L/DVB: Fix logic for Leadtek winfast tv usbii deluxe As pointed by Magnus Alm , commit 99dbd128bb applied a hunk at the wrong place. This patch moves the code to the right place. Signed-off-by: Mauro Carvalho Chehab commit 87147ff03a8aa27b9cc94872b195e6f8bb922feb Author: Oliver Endriss Date: Fri Feb 5 07:57:58 2010 -0300 V4L/DVB: get_dvb_firmware: Fix typo, sort list of components Commiter: Oliver Endriss Fix typo. Sort list of components for better readability. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit e7e41d3b59877475e4c19ddd0d33cb3ef5298f87 Author: Oliver Endriss Date: Fri Feb 5 07:52:44 2010 -0300 V4L/DVB: get_dvb_firmware: Add function to retrieve nGene firmwares Commiter: Oliver Endriss Use 'get_dvb_firmware ngene' to download 'ngene_15.fw' and 'ngene_17.fw'. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6fd2d0f924e352e50a35ac9d9534ccc91b5c9bb9 Author: Stephen Rothwell Date: Fri Feb 5 02:46:47 2010 -0300 V4L/DVB: using vmalloc requires include linux/vmalloc.h After merging the scsi-post-merge tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_release_buffers': drivers/media/dvb/ngene/ngene-core.c:1443: error: implicit declaration of function 'vfree' drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_get_buffers': drivers/media/dvb/ngene/ngene-core.c:1454: error: implicit declaration of function 'vmalloc' drivers/media/dvb/ngene/ngene-core.c:1454: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c:1461: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c:1467: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_probe': drivers/media/dvb/ngene/ngene-core.c:1836: warning: assignment makes pointer from integer without a cast Caused by commit b54c755d6263efe376f3dfc8c72c8e7b4fb4f4c1 ("V4L/DVB: ngene: Initial check-in"). Signed-off-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab commit 8edbede9ebf5959ec9951175a239925225440f5f Author: Richard Röjfors Date: Thu Feb 4 08:18:52 2010 -0300 V4L/DVB: mfd: Add support for the timberdale FPGA The timberdale FPGA is found on the Intel in-Vehicle Infotainment reference board russelville. The driver is a PCI driver which chunks up the I/O memory and distributes interrupts to a number of platform devices for each IP inside the FPGA. Signed-off-by: Richard Röjfors Signed-off-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit d44d1f3bfaef71ce27b4fd2284ec528b52617977 Author: Richard Röjfors Date: Wed Feb 3 12:59:39 2010 -0300 V4L/DVB: radio: Add radio-timb This patch add supports for the radio system on the Intel Russellville board. It's a In-Vehicle Infotainment board with a radio tuner and DSP. This umbrella driver has the DSP and tuner as V4L2 subdevs and calls them when needed. Signed-off-by: Richard Röjfors Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6525e67c01d303153272c26cb8118a3c314f4a1f Author: Oliver Endriss Date: Wed Feb 3 22:06:15 2010 -0300 V4L/DVB: ngene: Fix I2C initialisation Use I2C_CLASS_TV_DIGITAL, not I2C_ADAP_CLASS_TV_DIGITAL. Remove initialisation of bus_lock mutex. Thanks to Mauro for pointing out. Signed-off-by: Oliver Endriss Thanks-to: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit 684688d87d697724c46be77858641ee2e8885b02 Author: Oliver Endriss Date: Wed Feb 3 18:59:20 2010 -0300 V4L/DVB: ngene: Make checkpatch.pl happy Make checkpatch.pl happy. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit e890e7c0426ab99b032d5b387b1ca9fad6928895 Author: Oliver Endriss Date: Wed Feb 3 13:57:58 2010 -0300 V4L/DVB: ngene: Use correct name for cineS2 cards Cards 18c3:abc3/18c3:abc4 should be displayed as 'Linux4Media cineS2'. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit ace30f74ac1b3f20ab8f98995510a5e0d643c42c Author: Oliver Endriss Date: Wed Jan 20 19:03:22 2010 -0300 V4L/DVB: ngene: Take care of late interrupts Request might already have been processed when the interrupt arrives. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit b1ec9532341fafacfce8b1951c5f388eae014e16 Author: Oliver Endriss Date: Wed Jan 20 18:06:51 2010 -0300 V4L/DVB: ngene: Workaround for command timeout Implement workaround for comamnd timeout. Use FW15 and avoid switching DMA on and off. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 589816c61b74d8f16218a5ffdb95b1bf1897f65c Author: Oliver Endriss Date: Wed Jan 20 17:53:06 2010 -0300 V4L/DVB: ngene: Set ADC ranges to 1Vpp Set ADC1 and ADC2 range of the stv0900 to 1Vpp. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83e74554d4b1c6f4906c8a4fff270fcd42978987 Author: Oliver Endriss Date: Mon Feb 1 22:01:31 2010 -0300 V4L/DVB: ngene: Adapt to current frontend drivers Adapt to current stv090x + stv6110 drivers. [mchehab@redhat.com: removed compilation hack added by me on a prev patch] Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit edad22a7b0e5899ee503794543ce4c77cfb34d58 Author: Matthias Benesch Date: Fri Jan 8 17:38:03 2010 -0300 V4L/DVB: ngene: Mystique SaTiX-S2 Dual Identify card 18c3:db01 as 'Mystique SaTiX-S2 Dual'. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c58b5ecd46bf1b4a54b769d4a17afd97af23188d Author: Manu Abraham Date: Sat Dec 26 16:56:26 2009 -0300 V4L/DVB: [nGene] Trivial I2C related fixes/cleanups Trivial I2C related fixes/cleanups - Remove Unused I2C ID - point the I2C device to the physical device Signed-off-by: Manu Abraham Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 9fdd797659de7a989025c64c336542ac9c15d4d1 Author: Oliver Endriss Date: Wed Dec 23 16:26:17 2009 -0300 V4L/DVB: ngene: Code cleanup Remove/comment-out unused code, make some functions/declarations static. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit cf1b12f2b355a29c44dad426f545db8fa26bd81c Author: Matthias Benesch Date: Wed Dec 23 05:55:02 2009 -0300 V4L/DVB: ngene: Added module parameter "one_adapter" If parameter "one_adapter" is set, only one adapter per device will be attached. Otherwise an adapter for every frontend will be attached. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 126cd4bc5fa9cdbedb89bbe7e568140c94900ca7 Author: Oliver Endriss Date: Tue Dec 22 04:37:53 2009 -0300 V4L/DVB: DVB: Export dvb_ringbuffer_flush() again Add EXPORT_SYMBOL(dvb_ringbuffer_flush) again, replace my_dvb_ringbuffer_flush() in ngene driver. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 948a119547cf5043b40c2151d6f6913fbcf65e38 Author: Oliver Endriss Date: Tue Dec 22 03:34:29 2009 -0300 V4L/DVB: ngene: Remove kernel version check for dvb_[un]register_adapter Remove kernel version check for dvb_[un]register_adapter. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 44cdd064aa698c033e0a345ed187db7c24134d93 Author: Oliver Endriss Date: Sun Dec 20 02:30:52 2009 -0300 V4L/DVB: ngene: Change severity of some diagnostic messages Changed severity of some diagnostic messages. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 236fa316baf6bb89b2f361230d570093a2a79794 Author: Oliver Endriss Date: Sat Dec 19 22:55:59 2009 -0300 V4L/DVB: ngene: Speed-up tuning Remove stray mleep() which prevented fast tuning. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dc35c9ae193564af2003117857848d69af24d534 Author: Roland Praml Date: Sat Dec 19 22:48:14 2009 -0300 V4L/DVB: ngene: Fix unloading of module Fixed unloading of module ngene. Signed-off-by: Roland Praml Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit adc1d21eec74afbd38a9099f4aff4bcd5b9eaea2 Author: Matthias Benesch Date: Sat Dec 19 12:57:16 2009 -0300 V4L/DVB: ngene: Remove firmware debugging Remove firmware debugging, because setting ngene_fw_debug and requesting firmware from file causes a kernel error. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 8bba2607f1927cf3166a64dfd4e4c38a2e3af990 Author: Matthias Benesch Date: Sat Dec 19 12:48:22 2009 -0300 V4L/DVB: ngene: Added Media-Pointer MP-S2/CineS2 DVB-S2 Twin Tuner Added support for nGene based Media-Pointer DVB-S2 twin tuner cards. [mchehab@redhat.com: Fix compilation error: unknown field ‘ref_clk’] Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6ed36e6670635b162cc59e40cdb0fbcc51d59d1e Author: Matthias Benesch Date: Sat Dec 19 22:18:53 2009 -0300 V4L/DVB: ngene: Additional clean-up Remove and disable unnecessary code. Disable define ONE_ADAPTER. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 0027ebb73eff5bf0709f016edcad2be0605a3e4f Author: Oliver Endriss Date: Sat Dec 19 06:38:05 2009 -0300 V4L/DVB: ngene: Always use firmware loader Always use firmware loader. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83f3c7157e087ace8fc67fd759bc3d7b3b64531e Author: Oliver Endriss Date: Sat Dec 19 04:54:44 2009 -0300 V4L/DVB: ngene: Driver compiles now Remove LNBH21 routines, disable code which broke compilation. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dae52d009fc950b5c209260d50fcc000f5becd3c Author: Matthias Benesch Date: Fri Dec 18 22:13:26 2009 -0300 V4L/DVB: ngene: Initial check-in Add Micronas nGene PCIe bridge driver. The source code was provided by Micronas / Ralph Metzler, and has been reformatted to comply with Linux Codingstyle. Signed-off-by: Matthias Benesch Signed-off-by: Ralph Metzler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c22425ffa10792e2e8aba321dded98a5867d2a86 Author: Janne Grunau Date: Wed Feb 3 15:51:23 2010 +0100 V4L/DVB: hdpvr: add new USB product id Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 85d682b9ee1a89a82c2a75182558e392749d81fc Author: Márton Németh Date: Sat Jan 23 14:44:34 2010 +0100 V4L/DVB: hdpvr-video: cleanup signedness The fifth parameter of usb_bulk_msg() is a pointer to signed (see ) so also call this function with pointer to signed. This will remove the following sparse warning (see "make C=1"): * warning: incorrect type in argument 5 (different signedness) expected int *actual_length got unsigned int * Signed-off-by: Márton Németh Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit e3a0cc62c80a997512295d8f714ee09fafbb4c99 Author: Jiri Slaby Date: Fri Jan 22 12:10:55 2010 -0300 V4L/DVB: media: dvb/af9015, add hashes support So as a final patch, add support for hash and one hash entry for MSI digi vox mini II: iManufacturer 1 Afatech iProduct 2 DVB-T 2 iSerial 3 010101010600001 It is now handled with proper IR and key map tables. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 26c3b8b060b3a06f912e5c50bc8ef6ed96195458 Author: Jiri Slaby Date: Fri Jan 22 12:10:54 2010 -0300 V4L/DVB: media: dvb/af9015, refactor remote setting Add af9015_setup structure to hold (right now only remote) setup of distinct receivers. Add af9015_setup_match for matching ids against tables. This is for easier matching different kind of ids against tables to obtain setups. Currently module parameters and usb vendor ids are switched into and matched against tables. Hashes will follow. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 634d2d757a435037576bac465a84a02a72c747b6 Author: Jiri Slaby Date: Fri Jan 22 12:10:53 2010 -0300 V4L/DVB: media: dvb/af9015, factor out remote setting This is just a code shuffle without functional changes. For easier review of later changes, i.e. preparation. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 6c614044ff00bf3e7403ac6c4ed4e53db8c349f3 Author: Jiri Slaby Date: Fri Jan 22 12:10:52 2010 -0300 V4L/DVB: media: dvb/af9015, implement eeprom hashing This will be useful for matching of IR tables later. We read the eeprom anyway for dumping. Switch the dumping to print_hex_dump_bytes and compute hash above that by hash = 0; for (u32 VAL) in (eeprom): hash *= GOLDEN_RATIO_PRIME_32 hash += VAL; // while preserving endinaness The computation is moved earlier to the flow, namely from af9015_af9013_frontend_attach to af9015_read_config, so that we can access the sum in af9015_read_config already. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 0b32d65cd7938d31eebd9c62aab6a59a3c4cf0f8 Author: Kusanagi Kouichi Date: Fri Jan 22 04:55:28 2010 -0300 V4L/DVB: cx23885: Add support for LEADTEK WinFast PxTV1200 I tested only tv and composite. Video works fine but no audio. Signed-off-by: Kusanagi Kouichi Signed-off-by: Mauro Carvalho Chehab commit b38aa09df33d931defe4958582e826db59a9731c Author: Márton Németh Date: Fri Jan 29 17:30:53 2010 -0300 V4L/DVB: hdpvr-core: make module parameters local The default_video_input and default_audio_input module parameters are only used inside the hdpvr-core.c file so make them static. This will remove the following sparse warnings (see "make C=1"): * warning: symbol 'default_video_input' was not declared. Should it be static? * warning: symbol 'default_audio_input' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit ee4b9dbb83c73c5408d7f479a501551a63ec57d3 Author: Richard Röjfors Date: Tue Feb 2 19:40:49 2010 -0300 V4L/DVB: radio: add support for SAA7706H Car Radio DSP Initial support for the SAA7706H Car Radio DSP. It is a I2C device and currently the mute control is supported. When the device is unmuted it is brought out of reset and initiated using the proposed intialisation sequence. When muted the DSP is brought into reset state. [akpm@linux-foundation.org: include delay.h] Signed-off-by: Richard Röjfors Cc: Douglas Schilling Landgraf Cc: Hans Verkuil Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 08c45cd58560f10e08e0ec4686845625b7030e8c Author: Andrew Morton Date: Tue Feb 2 19:40:51 2010 -0300 V4L/DVB: drivers/media/dvb/frontends/stv090x.c: fix use-uninitlalised Mad guess. Signed-off-by: Andrew Morton Reviewed-by: Manu Abraham Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 690c79ae7a0d928459ee6a09be781a2503c27e3e Author: Andrew Morton Date: Tue Feb 2 19:40:50 2010 -0300 V4L/DVB: drivers/media/dvb/frontends/stv090x.c: fix use-uninitialised drivers/media/dvb/frontends/stv090x.c: In function 'stv090x_blind_search': drivers/media/dvb/frontends/stv090x.c:1967: warning: 'coarse_fail' may be used uninitialized in this function Cc: Manu Abraham Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Reviewed-by: Manu Abraham Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c2312f60d741df833abf48fee4a30aa523e55a58 Author: Andrew Morton Date: Tue Feb 2 19:40:49 2010 -0300 V4L/DVB: drivers/media/video/cx18/cx18-alsa-pcm.c: fix printk warning drivers/media/video/cx18/cx18-alsa-pcm.c: In function 'cx18_alsa_announce_pcm_data': drivers/media/video/cx18/cx18-alsa-pcm.c:82: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Cc: Andy Walls Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 407df29363f10642d87dbe49854c97eb57c84c94 Author: Roel Kluin Date: Tue Feb 2 11:29:46 2010 -0300 V4L/DVB: dvb: return -ENOMEM if kzalloc failed in dvb_usb_device_init() If in a cold state and the download succeeded ret is zero, but we should return -ENOMEM. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit ca39d84d438b609af127f2eb161cd9029afbc9a7 Author: Magnus Alm Date: Fri Nov 13 05:48:24 2009 -0300 V4L/DVB: em28xx: fix for "Leadtek winfast tv usbii deluxe" fix Video/Sound support "Leadtek winfast tv usbii deluxe". Now, it is working Stereo, IR, Radio, TV, Svideo and Composite. Signed-off-by: Mauro Carvalho Chehab commit 5d26b6443292027314a2e2c9178140e60acd3587 Author: Márton Németh Date: Fri Jan 29 17:42:17 2010 -0300 V4L/DVB: smsir: make local variables static Make the file local parameters static. This will remove the following sparse warnings (see "make C=1"): * warning: symbol 'ir_pos' was not declared. Should it be static? * warning: symbol 'ir_word' was not declared. Should it be static? * warning: symbol 'ir_toggle' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 3d36f5c652d9d1b4406b0f8f32d9452eaad8e33a Author: Massimo Del Fedele Date: Sat Oct 24 13:12:37 2009 -0300 V4L/DVB: m920x: Add support for Pinnacle PCTV310e card Adds support to Pinnacle PCTV310e hybrid tuner card, for DVB-T and remote control, still no analog video. [mchehab@redhat.com: fix CodingStyle issues] Signed-off-by: Mauro Carvalho Chehab commit 0faf6f6b892aeb25934c9adc7fe328350d2d25cc Author: Alexander Strakh Date: Fri Sep 11 15:13:21 2009 -0300 V4L/DVB: cafe_ccic: Fix lock imbalances Fix lock imbalances in function device_authorization. Signed-off-by: Alexander Strakh Signed-off-by: Mauro Carvalho Chehab commit fb3ab105a5ef43b03d2788e9b124c7c69112682f Author: Roel Kluin Date: Sat Aug 29 15:31:49 2009 -0300 V4L/DVB: stv0900: dereference of state->internal in fe_stv0900_error stv0900_init_internal() state->internal allocation may fail as well as the allocation of stv0900_first_inode or new_node->next_inode in append_internal(). Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 6adb21c8719feef3b1629f5a9b5535e914f897ed Author: Andy Walls Date: Sat Jan 30 16:20:27 2010 -0300 V4L/DVB: cx18: Add missing serialization locks to cx18-dvb Operations that manipulates the state of the encoder or global instance flags and variables should be serialized. This adds some serialization locks that have been missing from cx18-dvb. Since the DVB part of the CX23418 doesn't affect the encoder, no one would likely have ever noticed a race in changing card instance variables. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b3b6dc620626eda13d7c1330cf3733862fe29420 Author: Andy Walls Date: Sat Jan 30 15:57:32 2010 -0300 V4L/DVB: cx18: Increment driver version for the addition of cx18-alsa and fixes Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 831f476cee704c37e7f96510135a90dfec6d00e9 Author: Andy Walls Date: Sat Jan 30 15:50:51 2010 -0300 V4L/DVB: cx18: Fix memory leak in cx18-alsa starting of PCM captures The cx18_open_id is normally dynamically allocated and stored in the filp->private_data for v4l2 file operations. The cx18-alsa routines should not dynamically allocate a cx18_open_id because they never store it anywhere and never free it. This change fixes that and plugs a memory leak. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b4729dcbba5431bf636d3d6615709383ad5e0d34 Author: Andy Walls Date: Sat Jan 30 15:28:22 2010 -0300 V4L/DVB: cx18: Add missing serialization locking to cx18-alsa File operations that manipulate the state of the encoder, or video or audio subdevices or some of the stream flags need to be serialized. Add the serilization locks to cx18-alsa in a manner consistent with the locking for the v4l2 file operations. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 83695009a439b86c520f9001c80cc5a042c2d940 Author: Andy Walls Date: Sat Jan 30 14:27:29 2010 -0300 V4L/DVB: cx18: Rename snd_cx18_mixer_lock to snd_cx18_lock and increase visibility Rename snd_cx18_mixer_lock() to snd_cx18_lock() in anticpation of using it in the cx18-alsa-pcm.c file routines. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 10e43d90da572f088f15cadfb5cc83cd762041c3 Author: Kusanagi Kouichi Date: Fri Jan 22 04:54:46 2010 -0300 V4L/DVB: cx25840: Fix composite detection If CX25840_VIN1_CH1 and the like is used, input is not detected as composite. Their value is 0x800000XX and CX25840_COMPONENT_ON is 0x80000200. So 739 else if ((vid_input & CX25840_COMPONENT_ON) == 0) this condition never be true. Signed-off-by: Kusanagi Kouichi Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 55461f4c584e812bb8e19c3fb1924edd512ea74c Author: Jean-François Moine Date: Sat Jan 30 16:03:02 2010 -0300 V4L/DVB: gspca - main: Change version to 2.9.0. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 00e8006db5bc0956ac1522be149936228ccb847e Author: Nicolau Werneck Date: Sat Jan 30 16:00:15 2010 -0300 V4L/DVB: gspca - t613: Support for LT168G sensor. Signed-off-by: Nicolau Werneck Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit cc2f82c22f3f954f0858642bd782f48e8ccbf058 Author: Jean-Francois Moine Date: Thu Jan 28 16:35:40 2010 -0300 V4L/DVB: gspca - pac7302: Change latin1 text to utf-8. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit aed6f1b5fe4e95cf8a9fc149e25041aa8cc7c78a Author: Márton Németh Date: Thu Jan 28 16:33:38 2010 -0300 V4L/DVB: gspca - pac7302: Add support for camera button. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0274d42e052ecd9bc6b5f69fbfc8792ce2cc0fb6 Author: Márton Németh Date: Thu Jan 28 06:39:49 2010 -0300 V4L/DVB: gspca - main: Add input support for interrupt endpoints. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 2abf6dd8e8754db6b18a4d55d3e4425c0a22d280 Author: Jean Delvare Date: Tue Jan 26 16:46:58 2010 -0300 V4L/DVB: dvb/bt8xx: Clean-up init and exit functions The init and exit functions are needlessly complex. Remove the bloat: * Drop irrelevant/outdated comments. * Remove useless bt878_pci_driver_registered global variable. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho chehab Signed-off-by: Mauro Carvalho Chehab commit 22c859faf5e10e7f7b04a2c643a98eeee69c1815 Author: Arnaud Patard Date: Mon Jan 25 12:02:31 2010 -0300 V4L/DVB: Fix VIDIOC_QBUF compat ioctl32 When using VIDIOC_QBUF with memory type set to V4L2_MEMORY_MMAP, the v4l2_buffer buffer gets unmodified on drivers like uvc (well, only bytesused field is modified). Then some apps like gstreamer are reusing the same buffer later to call munmap (eg passing the buffer "length" field as 2nd parameter of munmap). It's working fine on full 32bits but on 32bits systems with 64bit kernel, the get_v4l2_buffer32() doesn't copy length/m.offset values and then copy garbage to userspace in put_v4l2_buffer32(). This has for consequence things like that in the libv4l2 logs: libv4l2: v4l2 unknown munmap 0x2e2b0000, -2145144908 libv4l2: v4l2 unknown munmap 0x2e530000, -2145144908 The buffer are not unmap'ed and then if the application close and open again the device, it won't work and logs will show something like: libv4l2: error setting pixformat: Device or resource busy The easy solution is to read length and m.offset in get_v4l2_buffer32(). Signed-off-by: Arnaud Patard Signed-off-by: Mauro Carvalho Chehab commit 6aba72cf76d21527dc73403e4147397375c8c232 Author: Márton Németh Date: Sat Jan 23 10:44:14 2010 -0300 V4L/DVB: zoran: remove variable shadowing The loop counter j is declared twice in function error_handler(). Remove the redundant declaration. This will remove the following sparse warning (see "make C=1"): * symbol 'j' shadows an earlier one Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit db1b72650d22b8ac3ce56aa90c4fe1314f1876cb Author: Márton Németh Date: Sat Jan 23 03:58:20 2010 -0300 V4L/DVB: zoran: match parameter signedness of g_input_status The second parameter of g_input_status operation in is unsigned so also call it with unsigned paramter. This will remove the following sparse warning (see "make C=1"): * incorrect type in argument 2 (different signedness) expected unsigned int [usertype] *status got int * Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 26ee91efd941ea7fd40f6ee004f2f4d72f334564 Author: Roel Kluin Date: Tue Jan 19 21:47:30 2010 -0300 V4L/DVB: cx23885: Wrong command printed in cmd_to_str() The wrong command was printed for case CX2341X_ENC_SET_DNR_FILTER_MODE, and a typo in case CX2341X_ENC_SET_PCR_ID. Signed-off-by: Roel Kluin Acked-By: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 1e4348c85a2643441174cfb7073f8cb1a313366f Author: Stefan Richter Date: Wed Nov 18 16:03:31 2009 -0300 V4L/DVB: firedtv: reduce memset()s Before each FCP transdaction, the entire 512 bytes of the FCP frame were cleared, then values filled in. Clear only the bytes between filled-in bytes and end of the - request frame, or - response frame if data from a larger response will be needed, or - whole frame if data from a variable length response will be taken. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 6385c5bf98a9922917a563af3fdbd514888fa4ac Author: Stefan Richter Date: Wed Nov 18 16:03:03 2009 -0300 V4L/DVB: firedtv: remove check for interrupting signal FCP transactions as well as CMP transactions were serialized with mutex_lock_interruptible. It is extremely unlikly though that a signal will arrive while a concurrent process holds the mutex. And even if one does, the duration of a transaction is reasonably short (1.2 seconds if all retries time out, usually much shorter). Hence simplify the code to plain mutex_lock. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 3fb80ef3bc0f2b1008e14f695dcb32415cbacc90 Author: Stefan Richter Date: Wed Nov 18 16:02:01 2009 -0300 V4L/DVB: firedtv: do not DMA-map stack addresses This is a portability fix and reduces stack usage. The DMA mapping API cannot map on-stack addresses, as explained in Documentation/DMA-mapping.txt. Convert the two cases of on-stack packet payload buffers in firedtv (payload of write requests in avc_write and of lock requests in cmp_lock) to slab-allocated memory. We use the 512 bytes sized FCP frame buffer in struct firedtv for this purpose. Previously it held only incoming FCP responses, now it holds pending FCP requests and is then overwriten by an FCP response from the tuner subunit. Ditto for CMP lock requests and responses. Accesses to the payload buffer are serialized by fdtv->avc_mutex. As a welcome side effect, stack usage of the AV/C transaction functions is reduced by 512 bytes. Alas, avc_register_remote_control() is a special case: It previously did not wait for a response. To fit better in with the other FCP transactions, let it wait for an interim response. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 9420048c6e3ce43b428cb5965ba0d568bc145978 Author: Mauro Carvalho Chehab Date: Thu Jan 28 00:28:58 2010 -0200 Fix the __init/__exit annotations WARNING: drivers/media/video/cx18/cx18-alsa.o(.text+0x4de): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/video/cx18/built-in.o(.text+0x1c022): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/video/built-in.o(.text+0x28cc56): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/built-in.o(.text+0x2d2432): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. Signed-off-by: Mauro Carvalho Chehab commit 583d338ddda291e3244c7f3a785973c51dcce84e Author: Mauro Carvalho Chehab Date: Thu Jan 28 00:19:00 2010 -0200 cx18: Fix compilation when CONFIG_MODULE is disabled drivers/media/video/cx18/cx18-driver.c:252: warning: ‘request_modules’ used but never defined Signed-off-by: Mauro Carvalho Chehab commit 914e8713f22fc01da14670c1647603edcb7c7b0a Author: Jean-Francois Moine Date: Sun Jan 17 03:58:51 2010 -0300 V4L/DVB: gspca - sq905c: Fix a compilation warning Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 11edebc264f14d3f9e05525f238b91da7f5fa81f Author: Antonio Ospite Date: Sun Jan 17 03:42:14 2010 -0300 V4L/DVB: gspca - ov534: Fix end of frame handling Fix a regression, introduced in the driver split, which made the ov534 driver unusable. Plus, the debug message should reflect that we discard also packets beyond the expected frame size. Signed-off-by: Antonio Ospite Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 29b87f045552910f964972b7a45e9be054401a0b Author: Antonio Ospite Date: Sun Jan 17 03:27:04 2010 -0300 V4L/DVB: gspca - ov534: Allow enumerating supported framerates Signed-off-by: Antonio Ospite Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4b27d074748553916ebbdeed9630a6959c85e7de Author: Jean-Francois Moine Date: Wed Jan 13 15:40:36 2010 -0300 V4L/DVB: gspca - ov534_9: Propagate USB errors to higher level Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ab6c8cf21e180bcee1a6669f59ef62c0cceaf5d6 Author: Jean-Francois Moine Date: Wed Jan 13 15:34:27 2010 -0300 V4L/DVB: gspca - main: Clear any previous USB error when starting the transfer Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 14799f6cf35f843806019f548e80ffa669d16102 Author: Jean-Francois Moine Date: Wed Jan 13 15:28:22 2010 -0300 V4L/DVB: gspca - pac7311: Use usb_err to propagate USB errors Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit be927befd091481f88c5806aa0585f25ab2ee3a1 Author: Jean-Francois Moine Date: Wed Jan 13 15:09:14 2010 -0300 V4L/DVB: gspca - pac7302: Use usb_err to propagate USB errors Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 23a5de202bc385b69eb91a5db36699e9579ec03e Author: Jean-Francois Moine Date: Wed Jan 13 08:30:30 2010 -0300 V4L/DVB: gspca - pac7302/pac7311: Remove the unused page loading There is only one page to load (page 3 for pac7302 and page 4 for pac7311). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9919fe891da1bd61fad78a0e1e3c0f21cd127eca Author: Hans de Goede Date: Wed Jan 13 07:12:28 2010 -0300 V4L/DVB: gspca - zc3xx: Change the resolutions of some sensors The sensors adcm2700, mc501cb and ov7620 cannot have the full height permitted by the zc3xx bridges. This change removes 8 pixels at the bottom of the images. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6aeb0905620f2ba3adecfaabc7000ae0481a263b Author: Stephen Rothwell Date: Wed Jan 27 03:53:39 2010 -0300 V4L/DVB: using vmalloc requires include of linux/vmalloc.h Signed-off-by: Stephen Rothwell Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2c1fee024d86b718b3198f664747c9028776c751 Author: Huang Weiyi Date: Tue Jan 19 19:43:44 2010 -0300 V4L/DVB: [Mantis] remove duplicated #include Remove duplicated #include('s) in drivers/media/dvb/mantis/mantis_hif.c drivers/media/dvb/mantis/mantis_pci.c Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit 43e3e6d9df13da0c82b99e1144de053043545894 Author: Márton Németh Date: Sat Jan 16 14:35:03 2010 -0300 V4L/DVB: dib0090: cleanup dib0090_dcc_freq() 'extern' is not needed at function definition. This will remove the following sparse warning (see "make C=1"): * function 'dib0090_dcc_freq' with external linkage has definition Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit b9fb9b791a05e52b6daba953637705fa30610ab3 Author: Márton Németh Date: Sat Jan 16 14:08:39 2010 -0300 V4L/DVB: bt819: cleanup v4l2_subdev_notify() parameters The 3rd parameter v4l2_subdev_notify() is passed to the notify() callback which is a pointer, see and . This will remove the following sparse warning (see "make C=1"): * Using plain integer as NULL pointer Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 936c05e7f677640a9bc4d77354899f199d7d958f Author: Márton Németh Date: Sat Jan 16 13:41:43 2010 -0300 V4L/DVB: stv0900: make more local functions static Some functions are only used locally so mark them static. This will remove the following sparse warnings (see "make C=1"): * symbol 'extract_mask_pos' was not declared. Should it be static? * symbol 'stv0900_initialize' was not declared. Should it be static? * symbol 'stv0900_get_mclk_freq' was not declared. Should it be static? * symbol 'stv0900_set_mclk' was not declared. Should it be static? * symbol 'stv0900_get_err_count' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 521e86eb4354080dc2d178e3d8a7ebd8f0e8b4e5 Author: Márton Németh Date: Sat Jan 16 13:35:36 2010 -0300 V4L/DVB: stv0900: make local functions static The functions stv0900_sw_algo() and stv0900_set_dvbs1_track_car_loop() are only used locally so mark them static. This will remove the following sparse warnings (see "make C=1"): * symbol 'stv0900_sw_algo' was not declared. Should it be static? * symbol 'stv0900_set_dvbs1_track_car_loop' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit d5abcc784ff337fbe9c6bc03235baecfd25191e5 Author: Márton Németh Date: Sat Jan 16 13:21:59 2010 -0300 V4L/DVB: cx231xx: cleanup dvb_attach() return value handling Remove the following sparse error (see "make C=1"): * error: incompatible types for operation (<) left side has type struct dvb_frontend * right side has type int Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 6e3924aa8dad3ac7d5cbfb4e27b6cdd2dc7b7e68 Author: Thiago Farina Date: Sat Jan 16 10:25:38 2010 -0300 V4L/DVB: dvb-core: remove unnecessary casting of kmalloc drivers/media/dvb/dvb-core/dvb_frontend.c | 6 ++---- Signed-off-by: Thiago Farina Signed-off-by: Mauro Carvalho Chehab commit cebedf15d2776e1629a86260b5aa7bcfff8401b2 Author: Márton Németh Date: Sat Jan 16 05:11:07 2010 -0300 V4L/DVB: zoran: cleanup pointer condition Remove the following sparse warning (see "make C=1"): * warning: Using plain integer as NULL pointer Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 0633255ca28715fd452972d460f5bfbe2c793d72 Author: Ben Hutchings Date: Wed Jan 13 20:43:58 2010 -0300 V4L/DVB: dabusb: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit 77c8b5fb0ee6e367332167eaa26470d843596270 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:08 2010 -0300 V4L/DVB: vpfe-capture: converting ccdc drivers to platform-drivers This adds platform code for ccdc driver on DM355 and DM6446. 1) new ccdc platform devices added 2) added clock aliases master and slave for CCDC clocks 3) added dm355_ccdc_setup_pinmux() pin-mux setup hook in dm355 ccdc driver platform data Reviewed-by: Vaibhav Hiremath Reviewed-by: Kevin Hilman Reviewed-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 8d1b5946bf53b2593e633caba2330863838b7bf7 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:07 2010 -0300 V4L/DVB: vpfe-capture: converting dm644x ccdc driver to a platform driver 1) clocks are configured using generic clock names 2) converting the driver to a platform driver 3) cleanup - consolidate all static variables inside a structure, ccdc_cfg The ccdc driver now uses generic names for clocks - master and slave. On individual platforms these clocks will inherit from the platform specific clock. This will allow re-use of the driver for the same IP across different SoCs. Reviewed-by: Kevin Hilman Reviewed-by: Vaibhav Hiremath Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit c70fc2d2ccff1ce4cf0441ed060045022e6cc5c8 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:06 2010 -0300 V4L/DVB: vpfe-capture - converting dm355 ccdc driver to a platform driver 1) clocks are configured using generic clock names; 2) converts the driver to a platform driver; 3) cleanup - consolidate all static variables inside a structure, ccdc_cfg; The ccdc now uses a generic name for clocks. "master" and "slave". On individual platforms these clocks will inherit from the platform specific clock. This will allow re-use of the driver for the same IP across different SoCs. Updated based on Kevin's comments on clock configuration and error code (v3, v4). Reviewed-by: Kevin Hilman Reviewed-by: Vaibhav Hiremath Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 51444ea3d4f5baa0338297aba7065fd695528a36 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:05 2010 -0300 V4L/DVB: vpfe_capture: remove clock and platform code 1) removed the platform code and clk configuration. They are now part of ccdc driver (part of the ccdc patches and platform patches 2-4); 2) Added proper error codes for ccdc register function. Reviewed-by: Vaibhav Hiremath Reviewed-by: Kevin Hilman Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 986ce4510b37ba684aaebd3eb0e6ee0c03906ed8 Author: Pete Eberlein Date: Wed Jan 13 19:15:48 2010 -0300 V4L/DVB: s2250: Fix write_reg i2c address The kernel i2c model uses right-aligned 7-bit i2c addresses, but the 2250 firmware uses an 8-bit address in the usb vendor request. A previous patch by Jean Delvare shifted the i2c addresses 1 bit to the right, and this patch fixes the write_reg function to shift it back before sending the vendor request. To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: Pete Eberlein Signed-off-by: Mauro Carvalho Chehab commit 94b12d9ea555851632deee1c2b06c4f281a45e12 Author: Devin Heitmueller Date: Thu Jan 7 00:56:14 2010 -0300 V4L/DVB: cx18-alsa: Fix the rates definition and move some buffer freeing code. Clarify the rates available for the device, and move the freeing of the buffer to the free routine instead of the close (per Takashi's suggestion). Thanks to Takashi Iwai for reviewing and providing feedback. This work was sponsored by ONELAN Limited. Cc: Takashi Iwai Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit c71fd169a13d34f26997b27183b510e0b7fc2623 Author: Devin Heitmueller Date: Thu Jan 7 00:52:39 2010 -0300 V4L/DVB: cx18: address possible passing of NULL to snd_card_free Eliminate the possibility of passing NULL to snd_card_free(). Thanks to Takashi Iwai for reviewing and pointing this out. This work was sponsored by ONELAN Limited. Cc: Takashi Iwai Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 60433e2ab8391d1884ddef2269bd19ecdaaa2d72 Author: Devin Heitmueller Date: Sun Dec 20 23:53:46 2009 -0300 V4L/DVB: cx18-alsa: codingstyle cleanup Move the cx18_alsa_announce_pcm_data() function further up in the file, since apparently "make checkpatch" has never heard of a forward declaration. Note that despite the hg diff showing everything else as having been deleted/added, in reality it was only that one function that got moved (and the forward declaration was removed from the top of the file). This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 71036ef26b0026742c8ab79a54937aac1439350d Author: Devin Heitmueller Date: Sun Dec 20 23:50:02 2009 -0300 V4L/DVB: cx18-alsa: codingstyle cleanup Remove some dead code and make a PCM specific module debug parameter to avoid an extern reference. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit f8bd9d26c59d0df0335bf43191feb732f2c8b6ad Author: Devin Heitmueller Date: Sun Dec 20 23:29:02 2009 -0300 V4L/DVB: cx18: codingstyle fixes Codingstyle fixes, some introduced as a result of the ALSA work, some pre-existing. This patch is a whitespace change only. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 780edb7ad60e5c657770f510747cc609c84b5b61 Author: Devin Heitmueller Date: Sun Dec 20 23:15:58 2009 -0300 V4L/DVB: cx18-alsa: codingstyle fixes Fix codingstyle issues, and make the minimum version for cx18-alsa required to be 2.6.17, so that we don't need all the #ifdefs related to the changes to ALSA structures. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4dae2f0f84374d4e7cd6c8d41385a7c250f0726d Author: Devin Heitmueller Date: Sun Dec 20 23:01:46 2009 -0300 V4L/DVB: cx18-alsa: fix codingstyle issue Address coding style issue with cx18-alsa-main.c This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1a8e0e33881c9dd8cf3514bfd0b5a7ef148da929 Author: Devin Heitmueller Date: Sat Dec 12 17:38:53 2009 -0300 V4L/DVB: cx18-alsa: fix memory leak in error condition If the stream is already in use, make sure we free up the memory allocated earlier. Thanks to Andy Wall for reviewing and pointing this out. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 485e319adef5d33a1dca4320cb26fb387b4a9381 Author: Devin Heitmueller Date: Sun Nov 22 23:42:33 2009 -0300 V4L/DVB: cx18-alsa: remove a couple of warnings Remove a couple of warnings from dead code during driver development. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d Author: Devin Heitmueller Date: Fri Nov 20 02:15:20 2009 -0300 V4L/DVB: cx18-alsa: name alsa device after the actual card Use the cx18 board name in the ALSA description, to make it easier for users who run "arecord -l" to see which device they should be looking for. Also, use strlcpy() instead of strcpy(). Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1ec1c9bc6fc63b08467c12ce585862ae4e97859c Author: Devin Heitmueller Date: Fri Nov 20 01:24:57 2009 -0300 V4L/DVB: cx18: cleanup cx18-alsa debug logging Fix the debug macro so that it is dependent on the modprobe parameter. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit d68b687b1e322e7325b1458d799e8234997e4ccd Author: Devin Heitmueller Date: Fri Nov 20 01:15:54 2009 -0300 V4L/DVB: cx18: rework cx18-alsa module loading to support automatic loading Restructure the way the module gets loaded so that it gets loaded automatically when cx18 is loaded, and make it work properly if there are multiple cards present (since the old code would only take one opportunity to connect to cx18 instances when the module first loaded). This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4a8cfe6a5c158133f57c2e8476f259366d4bdc4d Author: Devin Heitmueller Date: Thu Nov 19 23:35:36 2009 -0300 V4L/DVB: cx18-alsa: remove unneeded debug line Remove an unneeded debug line, which was preventing the cx18-alsa module from loading. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 0f4cf676728e186b53ba1bb60c442c0f503ffdbc Author: Devin Heitmueller Date: Thu Nov 19 23:23:57 2009 -0300 V4L/DVB: cx18: export more symbols required by cx18-alsa Export a couple of more symbols required by the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 700b8aecc99f3bef09bc20c745d20bb2868047cc Author: Devin Heitmueller Date: Thu Nov 19 23:17:40 2009 -0300 V4L/DVB: cx18: add cx18-alsa module to Makefile Add cx18-alsa to the Makefile and Kconfig This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 9972de904216828c9f9f9d638df52206aa2bacd1 Author: Devin Heitmueller Date: Mon Jan 18 21:29:51 2010 -0300 V4L/DVB: cx18: overhaul ALSA PCM device handling so it works Add code so that the PCM ALSA device actually works, and update the cx18-streams mechanism so that it passes the data off to the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 8ef22f794ea5577505bc71e468183585f429afde Author: Devin Heitmueller Date: Thu Nov 19 22:52:30 2009 -0300 V4L/DVB: cx18: export a couple of symbols so they can be shared with cx18-alsa Expose a couple of symbols in the cx18 module so that locking of the PCM stream can be shared with the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4cb565cc2700e6fcd57243cacc4c2826956bc088 Author: Devin Heitmueller Date: Thu Nov 19 22:46:10 2009 -0300 V4L/DVB: cx18: make it so cx18-alsa-main.c compiles Fix some basic compilation issues with Andy's original code. In particular, temporarily #ifdef out the mixer code, add some additional exception handling, fix a couple of typos, and add a copyright line. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 0d8e1d0637a4636b0c19c94ba633812421544d91 Author: Devin Heitmueller Date: Thu Nov 19 22:40:41 2009 -0300 V4L/DVB: cx18: rename cx18-alsa.c Rename cx18-alsa.c to cx18-alsa-main.c so that we can call the final .ko file cx18-alsa.ko Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit f9b071c77ad3b97fce3d598d2d417c097369ccaf Author: Andy Walls Date: Wed Jun 24 07:26:45 2009 -0300 V4L/DVB: cx18-alsa: Add non-working cx18-alsa-pcm.[ch] files to avoid data loss Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 9722c8f95a5bd51a3d392cb2f125c8240b745c48 Author: Andy Walls Date: Mon May 25 21:40:25 2009 -0300 V4L/DVB: cx18-alsa: Initial non-working cx18-alsa files Initial cx18-alsa module files check-in to avoid losing work. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5eb3291fe84b30a8e2fda31fd5fa44c40575f283 Author: Igor M. Liplianin Date: Sun Jan 17 12:23:04 2010 -0300 V4L/DVB: dm1105: use macro for read/write registers This is for better readability and smaller size of code lines. Also it is for future improvements like GPIO handling. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 34d2f9bf189c36ef8642cf6b64e80dfb756d888f Author: Igor M. Liplianin Date: Sun Jan 17 12:11:00 2010 -0300 V4L/DVB: dm1105: use dm1105_dev & dev instead of dm1105dvb This is for better readability and smaller size of code. Also it is similar to other drivers. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit ed7c847aef137a5e1f5de0eac0ad2c03e183839d Author: Igor M. Liplianin Date: Sun Jan 17 11:15:06 2010 -0300 V4L/DVB: dm1105: connect splitted else-if statements Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 8f50a3ee726b682f7481d29883d768bbd027788a Author: JD Louw Date: Sun Jan 17 09:57:46 2010 -0300 V4L/DVB: Compro S350 GPIO change This patch enables LNB power on newer revision d1 Compro S350 and S300 DVB-S cards. Signed-off-by: JD Louw Signed-off-by: Mauro Carvalho Chehab commit b4a0e816fbe2af815674c514588b6cb444ec5fd9 Author: Igor M. Liplianin Date: Sun Jan 17 10:32:26 2010 -0300 V4L/DVB: Add Support for DVBWorld DVB-S2 PCI 2004D card The PCI card contains dm1105 PCI bridge and ds3000 demod. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 95480f2773588eabb35ac9354d068b068ef11e70 Author: Andy Walls Date: Sun Jan 17 21:12:24 2010 -0300 V4L/DVB: ivtv: Adjust msleep() delays used to prevent tinny audio and PCI bus hang Martin Dauskardt has done extensive testing on what values can be used and and concluded that only 300 ms total is required to avoid bad video effects such as occasional black screen and short sync disturbances. Furthermore he determined how this 300 ms was split between the two msleep()s did matter very much, so he suggested 150ms/150ms as one acceptable alternative that is implemented here. Many thanks go to Martin. Tested-by: Martin Dauskardt Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 3ccc646b56a3f03029a259c6a8affd9cecc6020e Author: Andy Walls Date: Thu Dec 24 13:06:08 2009 -0300 V4L/DVB: cx25840, v4l2-subdev, ivtv, pvrusb2: Fix ivtv/cx25840 tinny audio This change attempts to fix the ivtv tinny audio problem by keeping digitizer to encoder audio clocks running, while disabling the video clocks as needed to avoid unpredictable PCI bus hangs. To accomplish this, for the cx25840 module enabling of audio streaming had to be separated from enabling video streaming, requiring an additional v4l2_subdev_audio_op and calls to this new op in the pvrusb2 and ivtv drivers. The cx231xx and cx23885 driver use the cx25840 module for affecting only video on s_stream calls, so those drivers needed no change. The CX23418 hardware does not exhibit either the tinny audio problem nor the PCI bus hang, so the cx18 driver did not need corresponding changes. CX2341[56] based cards that are not using the CX2584x family of chips do not seem to be affected by the tinny audio problem, and this change should not affect how they are configured. It will delay their first capture by starting by another 300 msec though. Many thanks go to Argus and Martin Dauskardt whose persistent testing and investigation of this problem will hopefully fix this problem once and for all for many ivtv users. Reported-by: Martin Dauskardt Reported-by: Argus Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b6e436b263b35476da4be06e0719cb1d5c8f8eed Author: Ian Armstrong Date: Mon Dec 21 22:59:26 2009 -0300 V4L/DVB: ivtv: Fix race condition for queued udma transfers There are several DMA related interrupts which wake up the dma_waitq. The udma routines use this queue while they wait for their transfer to complete. When woken, the udma routine will check the IVTV_F_I_UDMA_PENDING & IVTV_F_I_UDMA flags to see if the transfer is still queued or has finished. However, a small window exists between the IVTV_F_I_UDMA_PENDING flag being cleared and the IVTV_F_I_UDMA flag being set. Given that the completion of an unrelated DMA transfer may wake up the udma routine, it's possible for this check to fail and the udma routine will start unmapping pages when the transfer has only just started. The result of this is unpredictable. This fix simply delays the clearing of the IVTV_F_I_UDMA_PENDING flag until after IVTV_F_I_UDMA has been set. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0726681a7080cef6a9fd414894690fac16418772 Author: Abylay Ospan Date: Fri Jan 22 16:01:44 2010 -0300 V4L/DVB: 22-kHz set_tone fix for NetUP Dual DVB-S2-CI card. 22kHz logic controlled by demod 22-kHz tone can be driven in two ways: 1. LNBH24 can produce 22kHz continuous tone when TEN=1 ( 22 KHz tone output is always activated ). 2. LNBH24 can reproduce 22kHz tone timings from DSQIN or EXTM pin's when TEN=0. From LNBH24 datasheet: "In order to improve design flexibility an external tone input pin is available (EXTM). The EXTM is a Logic input pin which activates the 22 kHz tone output, on the VoTX pin, by using the LNBH24 integrated tone generator (similar to the DSQIN pin function). In fact, the output tone waveform characteristics will always be internally controlled by the LNBH24 tone generator and the EXTM signal will be used as a timing control for DiSEqC tone data encoding on the VoTX output." In NetUP Dual DVB-S2-CI card 22kHz tone timings on EXTM pin produced by STV0900 demod: .set_tone = stv0900_set_tone redefine to "set_tone = lnbp21_set_tone" is not correct for "NetUP Dual DVB-S2-CI card". Signed-off-by: Abylay Ospan Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6b54ee082543294a04ea1d758abdc6013cbb4e2e Author: Hans de Goede Date: Thu Jan 14 10:00:31 2010 -0300 V4L/DVB (14005): media/video Kconfig: Mark gspca superceeded drivers as deprecated We have some duplicate functionality between the zc0301 and gspca-zc3xx, the sn9c102 and gspca-sonixb + gspca-sonix, and et61x251 and gscpa-etoms drivers. The non gspca versions of these drivers not only show a lot of code duplicty (amongsth each other), as they all copy the same generic usb webcam code instead of using some sort of framework. They also have not seen any updates for more then 2 years, where as the gspca drivers are actively maintained. So it is time for the non gspca versions of these drivers to go away, marking them as deprecated is the first step in this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 81b1061f96cf6f1ec3c91b80c6c183cb90a1f4e1 Author: Hans de Goede Date: Thu Jan 14 09:40:37 2010 -0300 V4L/DVB (14004): drivers/media/video/Kconfig: Turn deprecated drivers off by default drivers/media/video/Kconfig: Turn deprecated drivers off by default Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 54e8bc5d64a651e2fb8b2366637e6a7d920a4c70 Author: Hans de Goede Date: Thu Jan 14 09:37:18 2010 -0300 V4L/DVB (14003): gspca_cpai1: New gspca subdriver for CPIA CPiA version 1 cams This new driver supports USB PIA CPiA version 1 cams, replacing the old v4l1 driver. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ed9885aa8145d0cd531ac53d1456a6b3d238150c Author: Theodore Kilgore Date: Thu Jan 14 12:07:18 2010 -0300 V4L/DVB (14006): gscpa_sq905c: Better detection of CIF resolution cameras gscpa_sq905c: Better detection of CIF resolution cameras Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 127f548dbcdb561a7bf94578804abca0eccf7e4b Author: Hans de Goede Date: Sun Jan 10 19:34:57 2010 -0300 V4L/DVB (14002): gspca_sonixb / sn9c102: Make gspca handle 0c45:6007 When both the gspca_sonixb and the sn9c102 driver are enabled, make the gspca_sonixb driver handle cams with usb-id of 0c45:6007. The sn9c102 driver is being phased out and gspca driver has been successfully tested with an 0c45:6007 camara. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit b10af3f70bfaf98b6405dcd0561283b7ec485630 Author: Hans de Goede Date: Sun Jan 10 19:31:34 2010 -0300 V4L/DVB (14001): gscpa_sonixb: Differentiate between tas5110c and tas5110d and fix d hstart Our hstart value was wrong for tas5110d sensor using sonixb cams, this patch fixes this. Many thanks to Paulus (laudaka) for donating me a camera with such a sensor IC. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 8d0082fa3f3ac978075439e73b4a36ca0715e747 Author: Hans de Goede Date: Sat Jan 9 19:45:44 2010 -0300 V4L/DVB (14000): gspca_ov519: ov764x remove setting of AEC limits ov764x remove setting of AEC limits, as the custom values cause AEC oscilation in 320x240. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit d02134ddb6fc351ab25028bfb45a53d08a2bcfbf Author: Hans de Goede Date: Sat Jan 9 19:22:34 2010 -0300 V4L/DVB (13999): gspca_ov519: remove non functioning contrast control for ov764x sensor gspca_ov519: remove non functioning contrast control for ov764x sensor Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 035d3a3d3fb0104bb94dfb78ef70c7ec6f3f4ae4 Author: Hans de Goede Date: Sat Jan 9 08:14:43 2010 -0300 V4L/DVB (13998): gscpa_ov519: Fix 320x240 on ov519 + ov7648 Differentiate between ov7640 and ov7648 and handle the ov7648 320x240 on the ov519 bridge specially to fix r and b being swapped. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 859cc4700eebebe346572eb30898dd786a54e7a9 Author: Hans de Goede Date: Thu Jan 7 15:42:35 2010 -0300 V4L/DVB (13997): gspca_ov519: differentiate ov7620 and ov7620ae and fix 640x480 on the 7620 Michael Deegan , has reported issues with using 640x480 mode on his ov518+ webcam. The fix for this breaks things on my ov518+ cam (Trust 320 Sp@cecam), this patch thus adds differentiation in the driver between the OV7620 sensor his cam has and the OV7620AE sensor my cam has, and then only changes the init sequence for the ov518+ + OV7620 combo which was not working for Michael. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 388a6d54168923d0243d4c752586e87231a75291 Author: Hans de Goede Date: Thu Jan 7 15:31:48 2010 -0300 V4L/DVB (13996): gspca_stv0680: Fix streaming on vga cameras Streaming of VGA stv0680 based cams (instead of CIF ones) failed, because we were using the wrong control pipe for certain commands, this patch fixes this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 98184f78fcc1aea4f81e9101459c803a90e71f4f Author: Hans de Goede Date: Thu Jan 7 12:06:00 2010 -0300 V4L/DVB (13995): gspca_ov519: mark led on eyetoy II as inverted Mark led on eyetoy II as inverted, I have the feeling the led needs to be inverted for all 519 based cams (iow we got the set led code wrong), but lets just deal with this one cam at a time to avoid breaking currently working cams. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ab269d300ef9fe7e2f60613d0ac160e12b84658e Author: Hans de Goede Date: Thu Jan 7 12:04:04 2010 -0300 V4L/DVB (13994): gscpa_stv0680: Fix camera initialization on hotplug stv0680 cameras currently only work when already plugged in when the system boots (or when manually re-loading the driver after boot). This patch fixes this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9336960d075839b41bef89a0c68899c4025e8289 Author: Theodore Kilgore Date: Fri Dec 25 05:19:24 2009 -0300 V4L/DVB (13993): gspca.txt: add cams supported by mr97310a, sq905(c) and sn9c2028 drivers gspca.txt: add cams supported by mr97310a, sq905(c) and sn9c2028 drivers Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 5bdd00b93e368acc793748340c15cd2811fdd02b Author: Theodore Kilgore Date: Fri Dec 25 05:16:32 2009 -0300 V4L/DVB (13992): gspca_sn9c2028: New gspca subdriver New gspca subdriver adding support for SN9C2028 dual-mode cameras. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 70136081fc67ea77d849f86fa323e5773c8e40ea Author: Theodore Kilgore Date: Fri Dec 25 05:15:10 2009 -0300 V4L/DVB (13991): gspca_mr973010a: Fix cif type 1 cameras not streaming on UHCI controllers If you read the mail to Oliver Neukum on the linux-usb list, then you know that I found a cure for the mysterious problem that the MR97310a CIF "type 1" cameras have been freezing up and refusing to stream if hooked up to a machine with a UHCI controller. Namely, the cure is that if the camera is an mr97310a CIF type 1 camera, you have to send it 0xa0, 0x00. Somehow, this is a timing reset command, or such. It un-blocks whatever was previously stopping the CIF type 1 cameras from working on the UHCI-based machines. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 225ee0ca190b2e5d1d20c6278b6369b987aaaddf Author: Arvo Järve Date: Sun Jan 10 17:15:57 2010 -0300 V4L/DVB (13989): [TDA8261] Fix TDA8261 I2C read bug The TDA8261 driver would crash when reading more than a byte as described. ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff [ 8.430350] KNC1-2: MAC addr = 00:09:d6:65:2d:91 [ 8.610008] saa7146 (1) saa7146_i2c_writeout [irq]: timed out waiting for end of xfer [ 8.734457] stb0899_attach: Attaching STB0899 [ 8.768481] tda8261_attach: Attaching TDA8261 8PSK/QPSK tuner [ 8.768485] DVB: registering adapter 2 frontend 0 (STB0899 Multistandard)... Once I launch scan-s2: scan-s2 -vvvv -a 2 -s 1 -l UNIVERSAL /usr/share/dvb/dvb-s/Hotbird-13.0E I see the following via dmesg: [ 435.040017] saa7146 (1) saa7146_i2c_writeout [irq]: timed out waiting for end of xfer [ 435.778648] tda8261_get_bandwidth: Bandwidth=40000000 [ 435.781781] tda8261_get_bandwidth: Bandwidth=40000000 [ 435.783311] tda8261_set_state: Step size=1, Divider=1000, PG=0x793 (1939) [ 435.783512] tda8261_set_state: Waiting to Phase LOCK [ 435.810134] tda8261_get_status: Tuner Phase Locked [ 435.810137] tda8261_set_state: Tuner Phase locked: status=1 [ 435.810139] tda8261_set_frequency: Frequency=1939000 [ 435.810141] tda8261_get_frequency: Frequency=7574 [ 435.830008] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.402814] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.405946] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.407458] general protection fault: 0000 [#1] SMP [ 436.407527] last sysfs file: /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor [ 436.407560] CPU 0 [ 436.407601] Modules linked in: tda8261 stb0899 dvb_pll mt352 lnbp21 budget_av saa7146_vv snd_hda_codec_realtek videodev stv0299 v4l1_compat coretemp snd_hda_intel v4l2_compat_ioctl32 i915 videobuf_dma_sg b2c2_flexcop_pci snd_hda_codec budget_ci videobuf_core b2c2_flexcop ir_common w83627ehf drm snd_hwdep cx24123 budget_core hwmon_vid snd_pcm cx24113 dvb_core iptable_filter snd_timer i2c_algo_bit ip_tables saa7146 s5h1420 snd ttpci_eeprom soundcore intel_agp video serio_raw pcspkr lp snd_page_alloc x_tables output parport pata_it8213 e1000e [ 436.408757] Pid: 1410, comm: kdvb-ad-2-fe-0 Not tainted 2.6.31-14-server #48-Ubuntu C2SBC-Q [ 436.408818] RIP: 0010:[] [] tda8261_set_state+0x51/0x250 [tda8261] [ 436.408903] RSP: 0018:ffff88013649bc70 EFLAGS: 00010283 [ 436.408945] RAX: 00000000000f1748 RBX: ffff880138870680 RCX: 0000000000000018 [ 436.408990] RDX: ffff88013649bcd0 RSI: 0000000000000001 RDI: ffff880135273010 [ 436.409035] RBP: ffff88013649bcc0 R08: 0000000000000001 R09: 0000000000000002 [ 436.409081] R10: ffff88013649bc40 R11: 0000000055555556 R12: 00000000001d9638 [ 436.409126] R13: 38ffffffa0261568 R14: 0000000000000000 R15: ffff880135273010 [ 436.409172] FS: 0000000000000000(0000) GS:ffff880028022000(0000) knlGS:0000000000000000 [ 436.409232] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b [ 436.409274] CR2: 00007fff925e4cd8 CR3: 000000013642a000 CR4: 00000000000406f0 [ 436.409320] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 436.409365] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 436.409411] Process kdvb-ad-2-fe-0 (pid: 1410, threadinfo ffff88013649a000, task ffff88013658ad60) [ 436.409473] Stack: [ 436.409508] ffff880136ee2af1 00000000bcd5d166 ffff000200000068 0000000035273000 [ 436.409608] <0> 0000000000000001 ffff880135273000 ffffffffa0265260 00003473bc000000 [ 436.409758] <0> 0000000000000000 ffff88013a4e05e0 ffff88013649bd00 ffffffffa025f133 [ 436.409938] Call Trace: [ 436.409978] [] tda8261_set_frequency+0x23/0x70 [budget_av] [ 436.410027] [] ? stb0899_i2c_gate_ctrl+0x49/0xf0 [stb0899] [ 436.410074] [] ? stb0899_write_reg+0x19/0x20 [stb0899] [ 436.410121] [] stb0899_dvbs_algo+0x3a2/0x13c8 [stb0899] [ 436.410170] [] ? i2c_transfer+0xbd/0x100 [ 436.410215] [] ? stb0899_write_regs+0xac/0x1b0 [stb0899] [ 436.410262] [] stb0899_search+0x489/0x750 [stb0899] [ 436.410308] [] ? down_interruptible+0x33/0x60 [ 436.410360] [] dvb_frontend_thread+0x57c/0x720 [dvb_core] [ 436.410407] [] ? autoremove_wake_function+0x0/0x40 [ 436.410457] [] ? dvb_frontend_thread+0x0/0x720 [dvb_core] [ 436.410504] [] kthread+0xa6/0xb0 [ 436.410547] [] child_rip+0xa/0x20 [ 436.410589] [] ? kthread+0x0/0xb0 [ 436.410631] [] ? child_rip+0x0/0x20 [ 436.410672] Code: 00 03 00 00 4c 8b 6b 10 c7 45 cc 00 00 00 00 0f 84 e8 01 00 00 44 8b 22 41 8d 84 24 10 81 f1 ff 3d 80 4f 12 00 0f 87 af 01 00 00 <41> 8b 75 04 31 d2 48 c7 c7 d8 46 02 a0 89 f0 8b 0c 85 f0 45 02 [ 436.411950] RIP [] tda8261_set_state+0x51/0x250 [tda8261] [ 436.412015] RSP [ 436.412064] ---[ end trace c1d7ae4d9e05c51b ]--- Signed-off-by: Arvo Järve Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit d8b5a8e449a08a1a87170144a42d0a0b167bcad6 Author: Oliver Endriss Date: Sun Jan 10 15:40:28 2010 -0300 V4L/DVB (13988): [STV090x] Configuration parameters adc1_range, adc2_range, tuner_bbgain Add parameters adc1_range, adc2_range and tuner_bbgain to the config struct. Defaults: adc1_range = adc2_range = 2Vpp, tuner_bbgain = 10db Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 41894b97009adcabc51c6a4943045fd944c46236 Author: Oliver Endriss Date: Sun Jan 10 15:39:45 2010 -0300 V4L/DVB (13987): [STV090x] Quit processing if the tuner did not lock Exit stv090x_algo() if the tuner did not lock. This might happen due to missing signal or invalid/incomplete tuning parameters. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2c1f750ba3fbd4a54544a68b57087bb89f3ba92c Author: Oliver Endriss Date: Sun Jan 10 15:38:38 2010 -0300 V4L/DVB (13986): [STV090x] Disable I2C gate on error The I2C gate must also be disabled, if a tuner command failed. Otherwise the tuner mutex would be locked forever. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 76b9ef97953c120172dfc07d48e6d219164c6f6a Author: Andreas Regel Date: Tue Jan 5 19:24:56 2010 -0300 V4L/DVB (13985): [STV090x] reset mclk and dev_ver of internal structure after allocating When mclk is not 0 then it will never be set to the correct value and the Demodulator will not work. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 93e32cdafbe70d66bd8c133dd1b663198723654f Author: Andreas Regel Date: Tue Jan 5 19:24:32 2010 -0300 V4L/DVB (13984): [BUDGET] Use a tuner clock output divider of 2 for TT S2-1600. This gives the STV090x and improved clock signal (rectangle instead of sine). Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ca108b39a75d9c6e8a18c8723ccb9c98fb8d6265 Author: Andreas Regel Date: Tue Jan 5 19:24:10 2010 -0300 V4L/DVB (13983): [STV6110x] add clk_div member to stv6110x_config structure Using clk_div member of stv6110x_config structure the tuner's clock output divider can be configured. It is set in stv6110x_attach. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9045e729447192ab0ca27191ccab324c6b97fceb Author: Andreas Regel Date: Tue Jan 5 19:23:41 2010 -0300 V4L/DVB (13982): [STV090x] setup master clock in stv090x_init instead of stv090x_setup. This is needed when clock input is driven from tuner and an output divider different from 1 is used. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ec2d3a62eff54b9dc556e9d9c9125b9bdc640171 Author: Andreas Regel Date: Tue Jan 5 19:23:13 2010 -0300 V4L/DVB (13981): [STV6110x] Add a local register map for each instance of the driver. Before there was used a static register map that could lead to issues when there are are multiple adapters with the STV6110(A). Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 0c3f9fd807d9ef842fcc7e47e447ed2c68d63e49 Author: Andreas Regel Date: Tue Jan 5 19:22:45 2010 -0300 V4L/DVB (13980): [STV6110x] Added function stv6110x_write_regs The function stv6110x_write_regs is used to write several registers at once. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit f91e59cb5e6add13d4e45c5cc8d45a614e1dc8e4 Author: Andreas Regel Date: Tue Jan 5 19:22:07 2010 -0300 V4L/DVB (13979): [STV090x] Added possibility to set a fixed TS output clock. This could be useful for p.e. Common Interface applications where data rate is limited. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c369b7c2820dcad91b1354362097f6d8f9cf9307 Author: Andreas Regel Date: Tue Jan 5 19:21:30 2010 -0300 V4L/DVB (13978): [STV090x] set FE_HAS_SIGNAL flag in stv090x_read_status when locked. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 729cbafaca5e24b4fa0b42e7b0f79cb53f2ebad5 Author: Andreas Regel Date: Tue Jan 5 19:21:02 2010 -0300 V4L/DVB (13977): [STV090x] Test for valid frequency before starting to tune Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 96506a5086d0e9fd7332d6da74f115fa37bb58c6 Author: Andreas Regel Date: Tue Jan 5 19:20:21 2010 -0300 V4L/DVB (13976): [STV090x] Added mutex protection around tuner I2C access. With this change it is possible to have the same I2C address for both tuners. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 97f7a2ae1a8a1e44a481456375efced75210e5eb Author: Andreas Regel Date: Tue Jan 5 19:19:43 2010 -0300 V4L/DVB (13975): [STV090x] Added internal structure with shared settings and data. As the STV0900 features two demodulation paths in one chip there is some information used by both instances of the driver when used in dual mode. This information is now shared in an internal structure referenced by I2C adapter and address. Do initialisation of the demodulator only once when used in dual mode. Moved global mutex demod_lock to internal structure. Moved dev_ver and mclk to internal structure. Removed unused tuner_refclk from stv090x_state. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit b79c6df705e02b5dcb0e9360a15b28373813fec1 Author: Andreas Regel Date: Tue Jan 5 19:18:52 2010 -0300 V4L/DVB (13974): [STV090x] Fix locking reliabilty issues in automatic mode. In automatic S/S2 detection mode, locking of a DVB-S transponder could fail when coming from a DVB-S2 transponder. This change fixes the issue by first disabling DVB-S and DVB-S2 mode before enabling it again. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ceb59cf068d54761c653c42dd45c14e1ecf0f7d3 Author: Abylay Ospan Date: Wed Jan 13 05:01:56 2010 -0300 V4L/DVB (13936): 22-kHz set_tone fix for NetUP Dual DVB-S2-CI card 22-kHz tone can be driven in two ways: 1. LNBH24 can produce 22kHz continuous tone when TEN=1 ( 22 KHz tone output is always activated ). 2. LNBH24 can reproduce 22kHz tone timings from DSQIN or EXTM pin's when TEN=0. From LNBH24 datasheet: "In order to improve design flexibility an external tone input pin is available (EXTM). The EXTM is a Logic input pin which activates the 22 kHz tone output, on the VoTX pin, by using the LNBH24 integrated tone generator (similar to the DSQIN pin function). In fact, the output tone waveform characteristics will always be internally controlled by the LNBH24 tone generator and the EXTM signal will be used as a timing control for DiSEqC tone data encoding on the VoTX output." In NetUP Dual DVB-S2-CI card 22kHz tone timings on EXTM pin produced by STV0900 demod: .set_tone = stv0900_set_tone redefine to "set_tone = lnbp21_set_tone" is not correct for "NetUP Dual DVB-S2-CI card". Signed-off-by: Mauro Carvalho Chehab commit c52af79916028f9d15638519b54a80ed1c10bce5 Author: Jean-Francois Moine Date: Thu Jan 7 05:18:16 2010 -0300 V4L/DVB (13916): gspca - ov534/ov534_9: Split the ov534 subdriver. The two sensors ov772x and ov965x have too much differences. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit de2d1549c2083e45ed84c779b64acf438ba5bf7f Author: Jean-Francois Moine Date: Sat Dec 19 07:03:43 2009 -0300 V4L/DVB (13869): gspca - sn9c20x: Cleanup code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 310b26286e5a88387feba0412a75aa2a943ec844 Author: Peter Huewe Date: Tue Dec 22 05:38:14 2009 -0300 V4L/DVB (13947): add __init/__exit macros to drivers/media/dvb/bt8xx/bt878.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/media/dvb/bt8xx/bt878.c Please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree. Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009 but also present in linus tree. Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 42a39e05928c6262347fba4ec9f649124bfc7a6f Author: Joe Perches Date: Wed Jan 13 03:59:15 2010 -0300 V4L/DVB (13969): frontends/si21xx.c: Remove #define TRUE/FALSE, use bool And a little code refactoring/neatening around the removals Reduces object size a little bit: new: $ size drivers/media/dvb/frontends/si21xx.o text data bss dec hex filename 8984 56 1816 10856 2a68 drivers/media/dvb/frontends/si21xx.o old: $ size drivers/media/dvb/frontends/si21xx.o text data bss dec hex filename 9084 56 1792 10932 2ab4 drivers/media/dvb/frontends/si21xx.o Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit e34d375aa6dade342a266d40c6142d7f36e18683 Author: Jiri Slaby Date: Sun Jan 10 05:56:46 2010 -0300 V4L/DVB (13968): cx18, fix potential null dereference Stanse found a potential null dereference in cx18_dvb_start_feed and cx18_dvb_stop_feed. There is a check for stream being NULL, but it is dereferenced earlier. Move the dereference after the check. Signed-off-by: Jiri Slaby Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8231152f74dd9bd6f76036cfd7fbbf94ad0073d8 Author: Alexander Beregalov Date: Sat Jan 9 13:51:14 2010 -0300 V4L/DVB: ir: fix memory leak Free ir_dev before exit. Found by cppcheck. Signed-off-by: Alexander Beregalov Signed-off-by: Mauro Carvalho Chehab commit 78b06e0201fb32716211959bce133740a13873c4 Author: Jiri Slaby Date: Wed Jan 6 19:04:07 2010 -0300 V4L/DVB (13965): zl10039, jump to error on error Stanse found an unreachable statement in zl10039_attach. There is a `break' followed by `goto error'. Remove that break, so that it can handle the error. Cc: Igor M. Liplianin Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit a570fb6eec804e99c7fd3ac1db192842e9269bbb Author: Jiri Slaby Date: Wed Jan 6 13:45:28 2010 -0300 V4L/DVB (13964): tuner-core, fix memory leak Stanse found a memory leak in tuner_probe. It is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit b46d37e61f886e901ba0b504125b135f450a19b5 Author: Jiri Slaby Date: Wed Jan 6 13:45:27 2010 -0300 V4L/DVB (13963): siano, fix memory leak Stanse found a memory leak in smscore_gpio_configure. buffer is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit ad695510bf27a4e73e0d04d48d80c0b8389f17d2 Author: Roel Kluin Date: Sun Jan 3 14:04:42 2010 -0300 V4L/DVB (12930): Wrong variable tested The return of saa7164_i2caddr_to_reglen() was not tested. Cc: Steven Toth Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 19f48cb105b7fa18d0dcab435919a3a29b7a7c4c Author: Francesco Lavra Date: Thu Dec 31 08:47:11 2009 -0300 V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini() this patch fixes a memory leak which occurs when an em28xx card with DVB extension is unplugged or its DVB extension driver is unloaded. In dvb_fini(), dev->dvb must be freed before being set to NULL, as is done in dvb_init() in case of error. Note that this bug is also present in the latest stable kernel release. Signed-off-by: Francesco Lavra Signed-off-by: Mauro Carvalho Chehab commit be39515758f382e8b1d0d0012cd59008e9970dec Author: hartleys Date: Wed Dec 30 16:08:57 2009 -0300 V4L/DVB (13959): cx23885/cx23885-dvb.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Mauro Carvalho Chehab commit 2714b3b9be54076877fbb50c0811f9015b2906a5 Author: hartleys Date: Wed Dec 30 16:13:10 2009 -0300 V4L/DVB (13958): tveeprom.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Mauro Carvalho Chehab commit 9714d587f138c1034b8fbeb14573e5f0320a2367 Author: Francesco Lavra Date: Tue Dec 29 15:48:04 2009 -0300 V4L/DVB (13957): IR: Fix sysfs attributes declaration This patch fixes the declaration of the sysfs attributes for IR's, which must be a NULL-terminated array of struct attribute *. Without this patch, my machine crashes when inserting a DVB card. Signed-off-by: Francesco Lavra Signed-off-by: Mauro Carvalho Chehab commit 211635654cb6785a5c102af6488f6b1d83b9a3c6 Author: Dan Carpenter Date: Mon Dec 28 14:48:49 2009 -0300 V4L/DVB (13956): fix weird array index in zl10036.c I was initially concerned about the weird array index (the 2 bumps into the next row of the array). Matthias Schwarzott look at the datasheet and it turns out it should be zl10036_init_tab[1][0] |= 0x01; Signed-off-by: Dan Carpenter Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit 3557aa4f7ddaec2903532595d2caccac32a5bbeb Author: Julia Lawall Date: Mon Dec 28 11:09:55 2009 -0300 V4L/DVB (13954): Correct NULL test Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier f; @@ f(...) { <+... return NULL; ...+> } @@ expression *x; expression y; identifier r.f; statement S; @@ x = f(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit b2ad41f9ef72d7b3309a2578bf4432a262ff2b47 Author: Stefan Richter Date: Fri Dec 25 21:47:12 2009 -0300 V4L/DVB (13953): firedtv: add missing NULL pointer check If there is ever going to be a FireDTV or FloppyDTV firmware which does not provide a minimal ASCII textual descriptor for Model_Id --- or if the descriptor is provided indirectly in a descriptor directory --- the ieee1394 variant of the device probe of firedtv would dereference a NULL pointer. The firewire variant of firedtv's device probe is not affected. The fix makes sure that such an unexpected firmware is safely recognized by fdtv_alloc as an unknown firmware. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit f0ecba96e76295792a0b1ee2e03b505562e7b9f3 Author: Tobias Klauser Date: Wed Dec 23 09:53:14 2009 -0300 V4L/DVB (13952): gspca: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Cc: Jean-Francois Moine Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 9d68e8de9f8ab14077dd8d3c6ed9087ea61544a6 Author: Tobias Klauser Date: Wed Dec 23 09:53:12 2009 -0300 V4L/DVB (13951): rj54n1cb0: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Cc: Guennadi Liakhovetski Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 7b2d3983f2b54b002fd045f2801514405530d224 Author: Tobias Klauser Date: Wed Dec 23 09:53:13 2009 -0300 V4L/DVB (13950): usb-friio: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 21ead03bdde189106e0625baac170385a6c360af Author: Julia Lawall Date: Tue Dec 22 18:00:07 2009 -0300 V4L/DVB (13949): Move a dereference below a NULL test If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit ed0ee8e1fbab49b494ef2994be92e7832dd6673c Author: Julia Lawall Date: Tue Dec 22 17:31:23 2009 -0300 V4L/DVB (13948): radio: Correct use after free It is not clear how to share the unlock in the case where the structure containing the lock has to be freed. So the unlock is now duplicated, with one copy moved before the free. The unlock label furthermore is no longer useful and is thus deleted. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x->f // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit e0572325d23b8c89930a08e0b8b3850a6fe75d7d Author: Alexey Dobriyan Date: Mon Dec 21 21:21:47 2009 -0300 V4L/DVB (13946): proc_fops: convert av7110 Drop S_IRUGO, proc entry doesn't contain read hooks. Drop S_IFREG, simply unnecessary. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 9c6f97a02358c78ed1db69cde702db263bc62cf6 Author: Dmitri Belimov Date: Mon Dec 21 02:00:38 2009 -0300 V4L/DVB (13945): Add lost config and PCI ID for card of Beholder Add lost configuration for our TV card. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 7de0b8739f9b7856d2c3aa96e50e851283eeb24a Author: Roel Kluin Date: Wed Dec 16 13:06:33 2009 -0300 V4L/DVB (13944): vivi: Fix test of unsigned in vivi_create_instance() video_nr is unsigned so the test did not work. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit f2e6c6ad0207f22b55bb45a6b0958cecde3db8f1 Author: Roel Kluin Date: Wed Dec 16 11:35:45 2009 -0300 V4L/DVB: use correct size in put_v4l2_window32() Although these sizes may be the same it is better to calculate the size of the source, than the destiny. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 66d9cbad5330d6df30c82f10ee18b62b096b84ef Author: Devin Heitmueller Date: Tue Nov 24 23:17:25 2009 -0300 V4L/DVB (13932): em28xx: add PAL support for VBI Make the VBI support work for PAL standards in addition to NTSC. This work was sponsored by EyeMagnet Limited. Thanks go out to Andy Walls for providing a CD containing test PAL/VBI captures and to Steven Toth for providing a PVR-350 to do signal generation with. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 6a2071006b72bf887e38c025c60f98d2998ceacb Author: Devin Heitmueller Date: Mon Jan 4 02:43:19 2010 -0300 V4L/DVB (13930): dib0700: rework IR logic for firmware 1.20 When firmware 1.20 was introduced, the dib0700 switched from a polling model using a USB control message, to the messages being delivered on a USB bulk pipe. The code I originally added would do a blocking read on the pipe with a 50ms timeout. Because the dvb-usb-remote code makes use of the global workqueue, this resulted in the global workqueue being blocked 50% of the time. Also, the synchronous urb_bulk_msg() call would burn excess CPU time (reflected as an abnormal increase in the system's load average when devices were connected). Rework the logic so that we now setup an asynchronous callback on the bulk pipe, so that we now only handle RC data when it arrives on the pipe. Note that we provide a stub function for the RC polling callback so that we can continue to leverage the shared code in dvb-usb-rc for the setting up of the input device. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit eac8f5fa5f5dcaf228694fe23e19b02b98e68879 Author: Jean-Francois Moine Date: Tue Jan 12 07:12:43 2010 -0300 V4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams. The bug was introduced when adding the sensor adcm1700. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit cdf955cd8e45d8279c53b47a2c0e0c5decaaca86 Author: Jean-Francois Moine Date: Mon Jan 11 15:06:12 2010 -0300 V4L/DVB (13926): gspca - pac7302: Fix a random USB error. When loading the register 0x49 of the page 3, the usb_control_msg() sometimes fails with error -71 or -62. This change skips loading the register 0x48. Tested-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit b7a597d11073c4c3db79743d38cc942d324b2233 Author: Jean-Francois Moine Date: Sun Jan 10 16:36:53 2010 -0300 V4L/DVB (13925): gspca - main: Change the check of the USB video interface. Some webcams have many interfaces with the same interface class, so the previous interface check did not work. The new code checks if the interface number is zero or the only one. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6f081264f835467a3b69edc71753dac9d3ff770a Author: Jean-Francois Moine Date: Sun Jan 10 14:39:24 2010 -0300 V4L/DVB (13924): gspca - sunplus: Optimize and remove unused sequences. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 509245171ae76e08f657fe825b739d99f5701f09 Author: Jean-Francois Moine Date: Fri Jan 8 08:08:12 2010 -0300 V4L/DVB (13923): gspca - zc3xx: Simplify code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 77880ba3335e60acd0d6a818a7cdddaf0a5d601f Author: Jean-Francois Moine Date: Fri Jan 8 08:04:21 2010 -0300 V4L/DVB (13922): gspca - zc3xx: Switch off the LED on resume. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a20622f0f50be4afc217fba31b968f35fd5fea7b Author: Jean-Francois Moine Date: Fri Jan 8 08:03:23 2010 -0300 V4L/DVB (13921): gspca - zc3xx: Remove unuseful register write. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 56af5efca524cd4551ed4654a086742743cf18be Author: Jean-Francois Moine Date: Fri Jan 8 08:02:42 2010 -0300 V4L/DVB (13920): gspca - zc3xx: Let default sharpness for sensor pas202b. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1eed40aeb456957cdcf09407ead113c755f5c744 Author: Jean-Francois Moine Date: Fri Jan 8 08:01:43 2010 -0300 V4L/DVB (13919): gspca - zc3xx: Fix hdcs2020 probe. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1cb6d7b15641e584243c186ba7e6e59d03065c98 Author: Jean-Francois Moine Date: Fri Jan 8 07:06:06 2010 -0300 V4L/DVB (13918): gspca - zc3xx: Rename the USB sequences. The new names tell the image resolution: 'Scale' is the smaller image. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 47c833923746decdef557d22e720ba14c81f375c Author: Jean-Francois Moine Date: Thu Jan 7 15:59:12 2010 -0300 V4L/DVB (13917): gspca - zc3xx: Cleanup code. - update copyright and module author - change __u8/16 to u8/16 - set unsigned the sd sensor - initialize the controls by macros Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5599678c703e369fd50105aa60d112bcfd8f186f Author: Mauro Carvalho Chehab Date: Mon Jan 11 10:47:33 2010 -0300 V4L/DVB (13915): em28xx: fix a typo on RC6 modes Thanks to: Devin Heitmueller for double checking it. Signed-off-by: Mauro Carvalho Chehab commit f05b7f5ee19de6de972020ea18e6c30b672d401b Author: Andy Walls Date: Sun Jan 3 23:28:18 2010 -0300 V4L/DVB (13913): saa7127: Add support for generating SECAM output for the SAA712[89] chips This change fixes up saa7127_s_std() generate SECAM out, if the user has requested a 50 Hz video standard set that only contains a request for SECAM standards and not PAL. Only the SAA712[89] chips can generate SECAM, the SAA712[67] chips cannot. I was unclear on the burst start and end values - I couldn't figure out the units - so I left them the same as for the PAL systems. A the video decoders on both a PVR-350 (SAA7115) and an HVR-1600 (CX23418) identify the SECAM signal generated by a SAA7129 with this patch as SECAM. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit a8073119d69d0b4aa8f445ed4d7d56b89b602708 Author: Sergey Bolshakov Date: Sat Jan 2 21:56:42 2010 -0300 V4L/DVB (13912): cx18: Fix tuner reset pin in card entry for the Leadtek PVR2100 Fix the "xceive_pin" setting from "15" to "1" for the PVR2100 -- the same as the PVR3100H. This properly resets the XC2028 tuner on the PVR2100. Sergey's original email report: Hi. Seems cx18 module has incorrect .xceive_pin value for card, as i see lots of i2c errors in dmesg from xc2028. i'm using 2.6.32.2, my hardware is: 00:09.0 Multimedia video controller [0400]: Conexant Systems, Inc. CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder [14f1:5b7a] Subsystem: LeadTek Research Inc. Device [107d:6f27] Flags: bus master, medium devsel, latency 64, IRQ 17 Memory at f0000000 (32-bit, non-prefetchable) [size=64M] Capabilities: [44] Vital Product Data Capabilities: [4c] Power Management version 2 Kernel driver in use: cx18 Kernel modules: cx18 Following fixes this problem for me, the rest seems working: Reported-by: Sergey Bolshakov Tested-by: Sergey Bolshakov Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5ada57732a17521689d7d8eecf7c9b93b7484386 Author: Andy Walls Date: Fri Jan 1 13:25:41 2010 -0300 V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index entries The CX18_CPU_SET_INDEXTABLE command was being called with the wrong number of arguments causing the index table frame type selection mask to be set wrong. Now the IDX stream properly sends entries for I, P, and B frames. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 9bff2d61716bffe5e1d58de9eb940c62bb020fcf Author: Andy Walls Date: Thu Dec 31 22:27:28 2009 -0300 V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 82acdc84cc4acc11389bdc648b23b15426d2038c Author: Andy Walls Date: Thu Dec 31 22:09:51 2009 -0300 V4L/DVB (13908): cx18: Add initial working VIDIOC_G_ENC_INDEX ioctl() support VIDIOC_G_ENC_INDEX support see the light of day. Some notes: 1. With default capture parameters, the CX23418 seems to transfer 192 index entries (4.5 kB worth) at 10 second intervals. 2. Index streams don't seem to be supported for MPEG 2 TS streams 3. The index entries seem to claim every frame is a B-Frame. Possible firmware bug. 4. The cx18 driver does not try to capture an index stream when inserting sliced VBI into the MPEg stream as the offsets would need fixup. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit ef99179710d6ec04d6783afdf8387523c7087920 Author: Andy Walls Date: Thu Dec 31 18:27:13 2009 -0300 V4L/DVB (13907): cx18: Perform automatic rotation of very old, unread IDX buffers According to the v4l2 spec, very old MPEG index entries needs to be discarded in favor of newer index entries. This change ensures the firmware always has buffers for index entries at the expense of the oldest unread buffers. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 79f3e96018dc55ff7819a6a1ac3740a1d7103589 Author: Andy Walls Date: Thu Dec 31 17:19:25 2009 -0300 V4L/DVB (13906): cx18: Start IDX streams automatically as an internal associated stream This change starts the IDX stream along with the MPG stream as an internal use (only) stream much like the VBI stream can be started as an internal use stream for inserting sliced VBI packets. The IDX stream is not started automatically with an MPEG strem if the IDX stream is disabled (no buffers allocated) or if sliced VBI insertion is being performed by the cx18 driver. The cx18 driver doing sliced VBI insertion makes the offsets in the IDX stream inaccurate for the final MPEG stream presented to user space. Since fixing the IDX offsets ourselves is not easy and we cannot easily do what ivtv does to fix the offsets, we'll make sliced VBI insertion and MPEG Index capture mutually exclusive for now. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit e46c54a87e4a6364b0e86b03cb3d00d09ef2f627 Author: Andy Walls Date: Thu Dec 31 02:14:51 2009 -0300 V4L/DVB (13905): cx18: Allow MPEG index streams to be started and stopped internally This change allows the IDX stream to be started and stopped as any other stream even though it has no associated device node. This is needed for cx18 driver internal use. Also always tell the CX23418 to generate index entries when an analog capture starts and the IDX stream has had buffers allocated (i.e. is enabled). Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7b1dde03314912cfa9a5fa34ea9423df0db13860 Author: Andy Walls Date: Thu Dec 31 01:35:08 2009 -0300 V4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on module unload Fix a long standing memory leak of stream buffers for streams that did not have a struct video_device allocated: namely the TS and IDX streams. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 540bab93b769c757e92f1bd5e980a2ef647d4e86 Author: Andy Walls Date: Thu Dec 31 00:26:49 2009 -0300 V4L/DVB (13903): cx18: Encapsulate check for a stream being enabled into an inline function Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit efc0b127b2e0135053680cd0118856b051450009 Author: Andy Walls Date: Wed Dec 30 22:54:53 2009 -0300 V4L/DVB (13902): cx18: Update MPEG Index stream buffers module option processing Update the module options related to INDEX stream buffer allocation. A single CX2341[5678] index entry is only 24 bytes. Large buffers for the IDX stream will prevent the CX23418 from transferring index data over at all. Buffers of around 1.5 kB or 64 index entries seem to be just fine. We'll default to 63 buffers/MDLs as that is the firmware limit per stream and IDX stream buffers are not high rate. There is no reason on earth to allocate the previous 1 MB default of buffer space for the IDX stream. This is in anticipation of implementing the G_ENC_INDEX ioctl() in the cx18 driver. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7e64dc4c4d6f5c8935fac25c7fc7aa83f9880ed7 Author: Marton Nemeth Date: Wed Dec 30 09:12:41 2009 -0300 V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. The ctrls field of struct sd_desc is declared as const in gspca.h. It is worth to initialize the content also with constant values. Signed-off-by: Marton Nemeth Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit aabcdfb65be31d7f9486d1400fa217c8827dddd3 Author: Márton Németh Date: Tue Jan 5 12:39:02 2010 -0300 V4L/DVB (13898): gspca - some subdrivers: Make sd_desc const. The function callbacks in sd_desc are defined at compile time and they do not change at runtime. Make the sd_desc initializations const. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 52a9d3ef0034f29cef1c5616faa72aa394b01b65 Author: Jean-Francois Moine Date: Tue Jan 5 04:44:00 2010 -0300 V4L/DVB (13897): gspca - main: Check the interface class at probe time. The USB video interface was checked as having the number zero, but some webcams have other values. The test is now done on the interface class which may be either 255 (vendor spec) or 0 (class per interface). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 38719d45f937178718d49516d1f72208d5d72d22 Author: Jean-Francois Moine Date: Mon Jan 4 16:09:47 2010 -0300 V4L/DVB (13896): gspca - zc3xx: Adjust the pas202b exchanges. - adapt the start sequences from the info file of the ms-win driver of the webcams 046d:08a2/046d:08aa (lvWIMv.inf) - disable the brightness for this sensor Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit fd18046fffc24b06c9820d9b540c518fc0e1b627 Author: Jean-Francois Moine Date: Mon Jan 4 15:54:59 2010 -0300 V4L/DVB (13895): gspca - zc3xx: Fix the contrast control. The previous calculation gave bad gamma tables. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 878b35aedb930a31a72298b717a22990b6773a03 Author: Jean-Francois Moine Date: Wed Dec 30 04:53:07 2009 -0300 V4L/DVB (13894): gspca - sonixj: Add more controls. - sharpness - brightness for adcm1700 - adjust brightness/exposure for adcm1700 - add some comments Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 83c94a186382307508cbe800588219607fb38148 Author: Jean-Francois Moine Date: Sat Dec 26 16:07:24 2009 -0300 V4L/DVB (13893): gspca - vc032x: Change the sensor of 046d:0892 and 046d:0896. - new sensor POxxxx (unknown ID) - no probe - new controls - table for the disabled controls Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 219f3027a8078148ddc2a75125afbb071a4d70c7 Author: Jean-Francois Moine Date: Sat Dec 26 15:21:57 2009 -0300 V4L/DVB (13892): gspca - vc032x: Add the H and V flip controls for sensor mi1320. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ff1cf4081244be0c84e90ab55a299c00d5a4d854 Author: Jean-Francois Moine Date: Sat Dec 26 15:18:02 2009 -0300 V4L/DVB (13891): gspca - vc032x: Fix bad probe of the sensor mi1320. - have 2 tables for sensor probe - with the same ID, the sensor mi1320 is found with the bridge vc0321, the sensor mi1320_soc with the bridge vc0323 - add some comments Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 08135ba238ba7fe4e7af8cf11d026a7ed6b51f21 Author: Antoine Jacquet Date: Sun Dec 27 18:22:05 2009 -0300 V4L/DVB (13885): zr364xx: fix support for Aiptek DV T300 Added a new initialization method for Aiptek DV T300. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13708 Tested-by: Hámorszky Balázs Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 969cc9264bf2bd94d51748bacdafa90352ab71fa Author: Erik Andrén Date: Sun Dec 27 05:53:28 2009 -0300 V4L/DVB (13883): gspca - m5602: Be less verbose during sensor probe Currently all probed sensor types are emitted in the kernel log, generating unnecessary noise. Be less verbose and only report what sensor is found (if any) Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 6a1b262fac3b013b0b8afaf1fb23e6020e58fe02 Author: Erik Andrén Date: Sat Dec 26 18:00:02 2009 -0300 V4L/DVB (13881): gspca - stv06xx: Clean up the dump bridge function Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit fb8253baa0852bb628b6f4fed1ed0b8ae20e4e3c Author: Mauro Carvalho Chehab Date: Thu Dec 31 18:14:54 2009 -0300 V4L/DVB (13879): dvb_frontend: report what ioctl were called on debug mode When printing that an iocl were called, report the ioctl number. Signed-off-by: Mauro Carvalho Chehab commit 639544d78c430fef875f3bb31083a60f3e2e0344 Author: Mauro Carvalho Chehab Date: Thu Dec 31 17:49:32 2009 -0300 V4L/DVB (13878): dvb_frontend: Print dump on get after filling the data Signed-off-by: Mauro Carvalho Chehab commit 64677573a28c354828343741bc177e5543f5077e Author: Jean-Francois Moine Date: Sun Dec 20 12:31:28 2009 -0300 V4L/DVB (13872): gspca - sonixj: Add sensor adcm1700 and webcam 0c45:614a. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0a71d9cec238dd953e1e31df6ad28f69dee16fcc Author: Jean-Francois Moine Date: Sun Dec 20 09:09:22 2009 -0300 V4L/DVB (13871): gspca - benq: New subdriver for camera 04a5:3035. Tested-by: Francesco Lavra Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d754a6ca9af4ef3eedf9768446689731af09664a Author: Jean-Francois Moine Date: Sun Dec 20 05:07:10 2009 -0300 V4L/DVB (13870): gspca - zc3xx: Bad detection of sensor HV7131R(c). The webcam 0ac8:303b may have the sensors HV7131B or HV7131R(c). This changeset checks the HV7131 type. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 658604ec9caa9c8a998e296f689bd85ca1f95d6a Author: Luis Maia Date: Tue Dec 15 13:40:44 2009 -0300 V4L/DVB (13867): gspca - zc3xx: Add one more chipset ID of tas5130K. This ID was found in a webcam 0ac8:301b. Signed-off-by: Luis Maia Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 47aaca961ffbe6196dd09d6b447d90d9d4598255 Author: Jean-Francois Moine Date: Tue Dec 15 05:23:04 2009 -0300 V4L/DVB (13866): gspca - main: Add the cam flag 'no_urb_create'. This flag permits subdrivers to create specific transfer URBs. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit db870875c0e29ba051e58c848e1877df8e85b49f Author: Jean-Francois Moine Date: Tue Dec 15 05:16:04 2009 -0300 V4L/DVB (13865): gspca - main: Optimize code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 3205e4fe0d831c0457e9139794437e9999559150 Author: Mauro Carvalho Chehab Date: Tue Dec 29 08:25:13 2009 -0300 V4L/DVB (13856): ir-keytable: simplify and avoid a warning /home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c: In function 'ir_setkeycode': /home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c:190: warning: 'newkeymap' may be used uninitialized in this function Signed-off-by: Mauro Carvalho Chehab commit b4622c14a1450fa40dd89dc134ec008fd1c2d38c Author: Mauro Carvalho Chehab Date: Fri Dec 25 18:04:17 2009 -0300 V4L/DVB (13848): smsdvb: Add the proper status for IsRfLocked Now, if RF is locked but demod is not locked, it will report: >>> tuning status == 0x03 This happens, for example, if the device is on DVB-T, and the video standard is ISDB-T. Signed-off-by: Mauro Carvalho Chehab commit 25f9461a03f5f5a577a626df3ae5bcf09542d96a Author: Mauro Carvalho Chehab Date: Fri Dec 25 11:47:33 2009 -0300 V4L/DVB (13847): smsdvb: Remove a wrong debug message Signed-off-by: Mauro Carvalho Chehab commit 5eb23975b441cb8814eab82f5768e09106d50578 Author: Mauro Carvalho Chehab Date: Fri Dec 25 11:29:42 2009 -0300 V4L/DVB (13846): smsdvb: Properly implement stats for both DVB and ISDB-T After taking a look at the driver's history and doing some tests with DVB and ISDB-T, it was noticed that the stats were incomplete, for ISDB-T, and weren't working for DVB. Fixed the code and added a debug code to print the complete stats at dmesg. This debug is useful to improve the stats of this driver. Signed-off-by: Mauro Carvalho Chehab commit 643e15a0f44156fa05d163f202a9dffb264d2078 Author: Mauro Carvalho Chehab Date: Fri Dec 25 07:29:06 2009 -0300 V4L/DVB (13845): smsdvb: Fix the frequency switch that broke with v5 API conversion Bandwidth is in Hz, not in kHz. Signed-off-by: Mauro Carvalho Chehab commit e85c97a050f07bc5d2fe1382b994f063614af75b Author: Mauro Carvalho Chehab Date: Fri Dec 25 07:17:03 2009 -0300 V4L/DVB (13844): smsdvb: Properly report the Delivery System Signed-off-by: Mauro Carvalho Chehab commit 910ef763c1c3a6761aaa75bc5d086b45d4022e64 Author: Mauro Carvalho Chehab Date: Fri Dec 25 06:59:21 2009 -0300 V4L/DVB (13843): dib8000: Properly report Delivery System as SYS_ISDBT Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit cf4fab720c66b15a6cf3abeb5a38acb841efedf4 Author: Mauro Carvalho Chehab Date: Wed Dec 23 11:28:46 2009 -0300 V4L/DVB (13842): smsdvb: Convert it to use DVB API v5 (S2API) Based on a patch originally written by Michael Krufky for a preliminar S2API spec. The patch were ported to the S2API and had the ISDB-T API additions to honor the auto mode, while keep allowing manual tuning. Tested with both the original dvb-apps and the new dvb-apps-isdbt scan, that uses a different channel.conf and uses S2API with ISDB-T extensions. Thanks-to: Michael Krufky for his first version Signed-off-by: Mauro Carvalho Chehab commit 67ae1d26bd9291280874b49b9f388722682fe58f Author: Mauro Carvalho Chehab Date: Wed Dec 23 10:07:16 2009 -0300 V4L/DVB (13841): smsdvb: Make stats to work Siano series of patches seemed to cause a regression on reporting DTV statistics. Due to that, signal indication weren't received, preventing applications like scan to work. Tested with ISDB-T signals and got the same scan result as with a dib0700/dib8000 device. Signed-off-by: Mauro Carvalho Chehab commit dcb0c53331c0cfcac52d0921d3e3d06fdb2c417a Author: Michael Krufky Date: Tue Dec 22 21:09:52 2009 -0300 V4L/DVB (13840): smsusb: Add ISDB-T firmware for Hauppauge WinTV-Nova-T-MiniStick Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6b26fcea513095cd8a86cb376ad5a9df2fa8fe14 Author: Michael Krufky Date: Tue Dec 22 21:08:49 2009 -0300 V4L/DVB (13839): smsdvb: add ISDB-T as DVB-T tuning support hack Activate ISDB-T mode using module option default_mode=6. hack: use 4 lower bits in frequency for segment number [mchehab@redhat.com: fix merge conflicts and CodingStyle] Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c245c75c41b9693bcbd6c95e25af324188b4dce1 Author: David Wong Date: Sat Nov 28 08:36:31 2009 -0300 V4L/DVB (13838): atbm8830: use AGC setting from config Improves ATBM8830 reception by using per card AGC configuration rather than register default. Signed-off-by: David T. L. Wong Signed-off-by: Mauro Carvalho Chehab commit 8719cfdb4aa5bc7402bef873f607ed406960019f Author: Mauro Carvalho Chehab Date: Thu Dec 17 09:24:37 2009 -0300 V4L/DVB (13833): ir-core: some functions can be static Signed-off-by: Mauro Carvalho Chehab commit 68f194e027ecfbbc8d5515bc40787e542eed59e9 Author: Daniel Ritz Date: Sat Dec 12 14:57:17 2009 -0300 V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras For some unknown reason, on a MacBookPro5,3 the iSight sometimes report a different video format GUID. This patch add the other (wrong) GUID to the format table, making the iSight work always w/o other problems. What it should report: 32595559-0000-0010-8000-00aa00389b71 What it often reports: 32595559-0000-0010-8000-000000389b71 Signed-off-by: Daniel Ritz Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 73de3592c0da2313b25bac7789e9ea02c4b9f082 Author: Laurent Pinchart Date: Thu Dec 10 10:00:39 2009 -0300 V4L/DVB (13828): uvcvideo: Make the quirks module parameter override the built-in quirks The quirks module parameter is or'ed with the built-in quirks for the device being probed. This make it impossible to disable a built-in quirk without recompiling the driver. Replace the built-in quirks with the quirks module parameter instead of or'ing the values. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 310fe52461e6244b01a04b011c2e886d6b69de16 Author: Laurent Pinchart Date: Wed Dec 9 22:57:48 2009 -0300 V4L/DVB (13827): uvcvideo: Switch to a monotonic clock for V4L2 buffers timestamps The realtime clock provided by do_gettimeofday() is affected by time jumps caused by NTP or DST. Furthermore, preliminary investigation showed that SMP systems the realtime clock is based on the CPU TSC, and those could get slightly out of sync, resulting in jitter in the timestamps depending on which processor handles the USB interrupts. Instead of the realtime clock, use a monotonic high resolution clock to timestamp the buffer. As this could in theory introduce a regression with some userspace applications expecting a realtime clock timestamp, add a module parameter to switch back to the realtime clock. Thanks to Paulo Assis for pointing out and investigating the issue. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 0f7ff39532f1d2328e54b65ce5022c71f06e44d6 Author: Mauro Carvalho Chehab Date: Wed Dec 16 23:46:48 2009 -0300 V4L/DVB (13825): ir-core: Don't OOPS if IR device props is not defined As currently most drivers don't define ir_dev->props, we shouldn't assume that this field is defined. Signed-off-by: Mauro Carvalho Chehab commit cd79d33e168dba0d7de32c5bf010e20cff184b2a Author: Igor M. Liplianin Date: Mon Dec 14 20:24:56 2009 -0300 V4L/DVB (13818): Add Prof 7500 DVB-S2 USB card The card based on stv0903 demod, stb6100 tuner. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit d41592a2a2b9a27425ade3fc2c8526e9e997acd6 Author: Jean-Francois Moine Date: Sun Dec 13 14:11:07 2009 -0300 V4L/DVB (13815): gspca - sunplus: Add webcam 052b:1507. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 971e8298dee4835fc2dfbd207a9786702aa01666 Author: Mauro Carvalho Chehab Date: Mon Dec 14 13:53:37 2009 -0300 V4L/DVB (13680): ir: use unsigned long instead of enum When preparing the linux-next patches, I got those errors: include/media/ir-core.h:29: warning: left shift count >= width of type In file included from include/media/ir-common.h:29, from drivers/media/video/ir-kbd-i2c.c:50: drivers/media/video/ir-kbd-i2c.c: In function ‘ir_probe’: drivers/media/video/ir-kbd-i2c.c:324: warning: left shift count >= width of type Unfortunately, enum is 32 bits on i386. As we define IR_TYPE_OTHER as 1<<63, it won't work on non 64 bits arch. Signed-off-by: Mauro Carvalho Chehab commit 3f831107ed8efc32960e0cd172799bb82f6c81c9 Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:59:19 2009 -0300 V4L/DVB (13641): Properly update the driver representation for the protocol Signed-off-by: Mauro Carvalho Chehab commit eecee32ac2c4b00b76cc8d99fd8d2b9fd54a283d Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:56:15 2009 -0300 V4L/DVB (13639): ir-sysfs: Properly protect rc_tab changes with a lock Signed-off-by: Mauro Carvalho Chehab commit d4b778d36889b4d51d79a99f8a96e110def8541c Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:55:03 2009 -0300 V4L/DVB (13638): ir-core: documment missed functions While here, change ir_core_dev_number to be static Signed-off-by: Mauro Carvalho Chehab commit 950b0f5a0bf764663a6aa4397d105ad571c64a83 Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:54:22 2009 -0300 V4L/DVB (13637): em28xx: allow changing keycode table protocol Experimental patch to allow changing the IR protocol. Currently, it support changing between RC-5 and NEC protocols. Signed-off-by: Mauro Carvalho Chehab commit 09b01b90eb08769a64159ff4f81efe4badf6a49b Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:46:42 2009 -0300 V4L/DVB (13636): ir-core: add method to change IR protocol Signed-off-by: Mauro Carvalho Chehab commit 53f870228db0855f2031270ba5774dab0f33facd Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:16:36 2009 -0300 V4L/DVB (13635): ir-core: Implement protocol table type reading Signed-off-by: Mauro Carvalho Chehab commit e93854da880d6dc357c00625d8371b6a926fd19b Author: Mauro Carvalho Chehab Date: Mon Dec 14 00:16:55 2009 -0300 V4L/DVB (13634): ir-core: allow passing IR device parameters to ir-core Adds an structure to ir_input_register to contain IR device characteristics, like supported protocols and a callback to handle protocol event changes. Signed-off-by: Mauro Carvalho Chehab commit 4714eda87748f226833c32400ab60dd6a3b80766 Author: Mauro Carvalho Chehab Date: Sun Dec 13 16:00:08 2009 -0300 V4L/DVB (13633): ir-core: create a new class for remote controllers Add sysfs skeleton to export remote controller information via /sys/class/irrcv. For now, the code doesn't do much. It just exports an attribute that is meant to report and control the IR protocol used by the keytable. However, the callbacks for this new attribute weren't set yet. Also, it lacks symlinks to the used event interface. Signed-off-by: Mauro Carvalho Chehab commit a4a47bc03fe520e95e0c4212bf97c86545fb14f9 Author: Linus Torvalds Date: Fri Feb 26 10:03:22 2010 -0800 Lower USB storage settling delay to something more reasonable The five-second delay can be rather annoying, and makes the system appear much less responsive when you connect a USB drive. It's also not entirely clear that it is needed - the settling delay has at least historically been an issue on some Apple iPods, for example, and some devices have been reported to need even more than the old 5s delay. But before we penalize them all, let's see how bad it really is. Some of the reasons for long delays seem to be actual historical kernel bugs that should probably never have been papered over with a delay in the first place (there's a Ubuntu bug report for 2.6.20 about a NULL pointer dereference unless 'delay_use' is 8 or more, for example). It also looks like some distros have already shipped with delay_use=0, so the five second default may well be totally historical. In other words: "Let's see if anybody screams". Signed-off-by: Linus Torvalds commit 080af17e9c6360c5a835528e8de3141a46273ed2 Author: Sage Weil Date: Thu Feb 25 16:40:07 2010 -0800 ceph: remove bogus mds forward warning The must_resend flag is always true, not false. In any case, we can just ignore it anyway. Signed-off-by: Sage Weil commit cf6620acc0f6fac57968aafef79ab372bdcf6157 Author: David Teigland Date: Wed Feb 24 11:59:23 2010 -0600 dlm: send reply before bast When the lock master processes a successful operation (request, convert, cancel, or unlock), it will process the effects of the change before sending the reply for the operation. The "effects" of the operation are: - blocking callbacks (basts) for any newly granted locks - waiting or converting locks that can now be granted The cast is queued on the local node when the reply from the lock master is received. This means that a lock holder can receive a bast for a lock mode that is doesn't yet know has been granted. Signed-off-by: David Teigland commit c99eb1c7263a44e63161a041a778b345b5cf0b6a Author: Sage Weil Date: Fri Feb 26 09:37:33 2010 -0800 ceph: remove fragile __map_osds optimization We used to try to avoid freeing and then reallocating the osd struct. This is a bit fragile due to potential interactions with other references (beyond o_requests), and may be the cause of this crash: [120633.442358] BUG: unable to handle kernel NULL pointer dereference at (null) [120633.443292] IP: [] rb_erase+0x11d/0x277 [120633.443292] PGD f7ff3067 PUD f7f53067 PMD 0 [120633.443292] Oops: 0000 [#1] PREEMPT SMP [120633.443292] last sysfs file: /sys/kernel/uevent_seqnum [120633.443292] CPU 1 [120633.443292] Modules linked in: ceph fan ac battery psmouse ehci_hcd ide_pci_generic ohci_hcd thermal processor button [120633.443292] Pid: 3023, comm: ceph-msgr/1 Not tainted 2.6.32-rc2 #12 H8SSL [120633.443292] RIP: 0010:[] [] rb_erase+0x11d/0x277 [120633.443292] RSP: 0018:ffff8800f7b13a50 EFLAGS: 00010246 [120633.443292] RAX: ffff880022907819 RBX: ffff880022907818 RCX: 0000000000000000 [120633.443292] RDX: ffff8800f7b13a80 RSI: ffff8800f587eb48 RDI: 0000000000000000 [120633.443292] RBP: ffff8800f7b13a60 R08: 0000000000000000 R09: 0000000000000004 [120633.443292] R10: 0000000000000000 R11: ffff8800c4441000 R12: ffff8800f587eb48 [120633.443292] R13: ffff8800f58eaa00 R14: ffff8800f413c000 R15: 0000000000000001 [120633.443292] FS: 00007fbef6e226e0(0000) GS:ffff880009200000(0000) knlGS:0000000000000000 [120633.443292] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b [120633.443292] CR2: 0000000000000000 CR3: 00000000f7c53000 CR4: 00000000000006e0 [120633.443292] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [120633.443292] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [120633.443292] Process ceph-msgr/1 (pid: 3023, threadinfo ffff8800f7b12000, task ffff8800f5858b40) [120633.443292] Stack: [120633.443292] ffff8800f413c000 ffff8800f587e9c0 ffff8800f7b13a80 ffffffffa0098a86 [120633.443292] <0> 00000000000006f1 0000000000000000 ffff8800f7b13af0 ffffffffa009959b [120633.443292] <0> ffff8800f413c000 ffff880022a68400 ffff880022a68400 ffff8800f587e9c0 [120633.443292] Call Trace: [120633.443292] [] __remove_osd+0x4d/0xbc [ceph] [120633.443292] [] __map_osds+0x199/0x4fa [ceph] [120633.443292] [] ? __send_request+0xf8/0x186 [ceph] [120633.443292] [] kick_requests+0x169/0x3cb [ceph] [120633.443292] [] ceph_osdc_handle_map+0x370/0x522 [ceph] Since we're probably screwed anyway if a small kmalloc is failing, don't bother with trying to be clever here. Signed-off-by: Sage Weil commit 38bdbd8efc8a661dedb52264359531b3a1c11716 Merge: 773c3e7 6b4ff2d Author: David S. Miller Date: Fri Feb 26 09:31:09 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 6adad2d5430ee6b15b5f97475d50750f4d19577c Merge: 60b341b 81fc039 Author: Pekka Enberg Date: Fri Feb 26 19:25:30 2010 +0200 Merge branch 'kmemcheck/fixes' into kmemcheck-for-linus commit 4c13dd3b48fcb6fbe44f241eb11a057ecd1cba75 Author: Dmitry Monakhov Date: Fri Feb 26 09:36:12 2010 +0300 failslab: add ability to filter slab caches This patch allow to inject faults only for specific slabs. In order to preserve default behavior cache filter is off by default (all caches are faulty). One may define specific set of slabs like this: # mark skbuff_head_cache as faulty echo 1 > /sys/kernel/slab/skbuff_head_cache/failslab # Turn on cache filter (off by default) echo 1 > /sys/kernel/debug/failslab/cache-filter # Turn on fault injection echo 1 > /sys/kernel/debug/failslab/times echo 1 > /sys/kernel/debug/failslab/probability Acked-by: David Rientjes Acked-by: Akinobu Mita Acked-by: Christoph Lameter Signed-off-by: Dmitry Monakhov Signed-off-by: Pekka Enberg commit 6b4ff2d7675511a31980fa5379808660e1261f90 Author: Jan Engelhardt Date: Fri Feb 26 17:53:31 2010 +0100 netfilter: xtables: restore indentation Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit a49c65037146bfb2fe300b8277b10b4479fea5fc Author: Alexey Dobriyan Date: Fri Feb 26 17:48:40 2010 +0100 netfilter: nfnetlink_log: fix silly refcount leak Quick fix for memory/module refcount leak. Reference count of listener instance never reaches 0. Start/stop of ulogd2 is enough to trigger this bug! Now, refcounting there looks very fishy in particular this code: if (!try_module_get(THIS_MODULE)) { ... and creation of listener instance with refcount 2, so it may very well be ripped and redone. :-) Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 51f0bc78680edccb6574ef56bd32f9e2939c8a5a Author: Simon Horman Date: Fri Feb 26 17:45:14 2010 +0100 IPVS: ip_vs_lblcr: use list headA Use list_head rather than a custom list implementation. Signed-off-by: Simon Horman Signed-off-by: Patrick McHardy commit 1dd2980d990068e20045b90c424518cc7f3657ff Author: Peter Zijlstra Date: Fri Feb 26 17:07:35 2010 +0100 perf_event, amd: Fix spinlock initialization Avoid kernels from exploding on AMD machines when they have any lock debugging bits enabled. Signed-off-by: Ingo Molnar commit 24691ea964cc0123e386b661e03a86a481c6ee79 Author: Peter Zijlstra Date: Fri Feb 26 16:36:23 2010 +0100 perf_event: Fix preempt warning in perf_clock() A recent commit introduced a preemption warning for perf_clock(), use raw_smp_processor_id() to avoid this, it really doesn't matter which cpu we use here. Signed-off-by: Peter Zijlstra LKML-Reference: <1267198583.22519.684.camel@laptop> Cc: Signed-off-by: Ingo Molnar commit 5d68e0326b146f28fbb8fe6375dd7d15ca929be7 Author: Tomi Valkeinen Date: Fri Feb 26 11:32:56 2010 +0200 OMAP: DSS2: DSI: add error prints Add error printing for dsi_vc_dcs_write() and dsi_vc_dcs_read(). Signed-off-by: Tomi Valkeinen commit 4385d580f2278abab6d336e52522e9a6f5452a11 Author: David S. Miller Date: Fri Feb 26 12:08:34 2010 -0300 perf tools: Flush maps on COMM events Even though we don't register the counters until the child is right about to exec(), we're still going to get at least a few events while the fork()'d child is still executing 'perf' and in particular we're going to get the MMAP events. We can't distinguish the ones in the newly executed process because the PID will be the same. One way to solve this would be to have a PERF_RECORD_EXEC event, and when this is seen 'perf' can flush it's map cache. We can't use PERF_RECORD_COMM since that's generated by other things, not just exec(). Actually, thinking about it some more, using PERF_RECORD_COMM might be a good enough approximation. Signed-off-by: David S. Miller Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267196914-16238-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit dd5feea14a7de4edbd9f36db1a2db785de91b88d Author: Suresh Siddha Date: Tue Feb 23 16:13:52 2010 -0800 sched: Fix SCHED_MC regression caused by change in sched cpu_power On platforms like dual socket quad-core platform, the scheduler load balancer is not detecting the load imbalances in certain scenarios. This is leading to scenarios like where one socket is completely busy (with all the 4 cores running with 4 tasks) and leaving another socket completely idle. This causes performance issues as those 4 tasks share the memory controller, last-level cache bandwidth etc. Also we won't be taking advantage of turbo-mode as much as we would like, etc. Some of the comparisons in the scheduler load balancing code are comparing the "weighted cpu load that is scaled wrt sched_group's cpu_power" with the "weighted average load per task that is not scaled wrt sched_group's cpu_power". While this has probably been broken for a longer time (for multi socket numa nodes etc), the problem got aggrevated via this recent change: | | commit f93e65c186ab3c05ce2068733ca10e34fd00125e | Author: Peter Zijlstra | Date: Tue Sep 1 10:34:32 2009 +0200 | | sched: Restore __cpu_power to a straight sum of power | Also with this change, the sched group cpu power alone no longer reflects the group capacity that is needed to implement MC, MT performance (default) and power-savings (user-selectable) policies. We need to use the computed group capacity (sgs.group_capacity, that is computed using the SD_PREFER_SIBLING logic in update_sd_lb_stats()) to find out if the group with the max load is above its capacity and how much load to move etc. Reported-by: Ma Ling Initial-Analysis-by: Zhang, Yanmin Signed-off-by: Suresh Siddha [ -v2: build fix ] Signed-off-by: Peter Zijlstra Cc: # [2.6.32.x, 2.6.33.x] LKML-Reference: <1266970432.11588.22.camel@sbs-t61.sc.intel.com> Signed-off-by: Ingo Molnar commit f22f54f4491acd987a6c5a92de52b60ca8b58b61 Author: Peter Zijlstra Date: Fri Feb 26 12:05:05 2010 +0100 perf_events, x86: Split PMU definitions into separate files Split amd,p6,intel into separate files so that we can easily deal with CONFIG_CPU_SUP_* things, needed to make things build now that perf_event.c relies on symbols from amd.c Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 48fb4fdd6b667ebeccbc6cde0a8a5a148d5c6b68 Author: Arnaldo Carvalho de Melo Date: Fri Feb 26 11:23:14 2010 -0300 perf annotate: Handle samples not at objdump output addr boundaries Without this patch we get this for need_resched: [root@mica ~]# perf annotate need_resched ------------------------------------------------ Percent | Source code & Disassembly of vmlinux ------------------------------------------------ : : : Disassembly of section .text: : : ffffffff810095ed : : return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); : } : : static inline int need_resched(void) : { 0.00 : ffffffff810095ed: 55 push %rbp : return unlikely(test_thread_flag(TIF_NEED_RESCHED)); 0.00 : ffffffff810095ee: be 03 00 00 00 mov $0x3,%esi : : static inline struct thread_info *current_thread_info(void) : { : struct thread_info *ti; : ti = (void *)(percpu_read_stable(kernel_stack) + 0.00 : ffffffff810095f3: 65 48 8b 3c 25 48 b5 mov %gs:0xb548,%rdi 0.00 : ffffffff810095fa: 00 00 : return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); : } : : static inline int need_resched(void) : { 0.00 : ffffffff810095fc: 48 89 e5 mov %rsp,%rbp : return unlikely(test_thread_flag(TIF_NEED_RESCHED)); 0.00 : ffffffff810095ff: 48 81 ef d8 1f 00 00 sub $0x1fd8,%rdi 0.00 : ffffffff81009606: e8 9d ff ff ff callq ffffffff810095a8 : } 0.00 : ffffffff8100960b: c9 leaveq 0.00 : ffffffff8100960c: 85 c0 test %eax,%eax 0.00 : ffffffff8100960e: 0f 95 c0 setne %al 0.00 : ffffffff81009611: 0f b6 c0 movzbl %al,%eax : Disassembly of section .vsyscall_0: : Disassembly of section .vsyscall_fn: : Disassembly of section .vsyscall_1: : Disassembly of section .vsyscall_2: : Disassembly of section .init.text: : Disassembly of section .altinstr_replacement: : Disassembly of section .exit.text: [root@mica ~]# But from the 'perf report' result we know that there are hits for need_resched on a 4 way machine mostly doing nothing, so after adding code to show what is in each hist offset and collapsing IP hits for what happens between objdump lines we get, for the same perf.data file: [root@mica ~]# perf annotate -v need_resched ------------------------------------------------ Percent | Source code & Disassembly of vmlinux ------------------------------------------------ : : : Disassembly of section .text: : : ffffffff810095ed : : return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); : } : : static inline int need_resched(void) : { 0.00 : ffffffff810095ed: 55 push %rbp : return unlikely(test_thread_flag(TIF_NEED_RESCHED)); 52.78 : ffffffff810095ee: be 03 00 00 00 mov $0x3,%esi : : static inline struct thread_info *current_thread_info(void) : { : struct thread_info *ti; : ti = (void *)(percpu_read_stable(kernel_stack) + 0.00 : ffffffff810095f3: 65 48 8b 3c 25 48 b5 mov %gs:0xb548,%rdi 0.00 : ffffffff810095fa: 00 00 : return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); : } : : static inline int need_resched(void) : { 0.00 : ffffffff810095fc: 48 89 e5 mov %rsp,%rbp : return unlikely(test_thread_flag(TIF_NEED_RESCHED)); 9.72 : ffffffff810095ff: 48 81 ef d8 1f 00 00 sub $0x1fd8,%rdi 0.00 : ffffffff81009606: e8 9d ff ff ff callq ffffffff810095a8 : } 0.00 : ffffffff8100960b: c9 leaveq 0.00 : ffffffff8100960c: 85 c0 test %eax,%eax 37.50 : ffffffff8100960e: 0f 95 c0 setne %al 0.00 : ffffffff81009611: 0f b6 c0 movzbl %al,%eax : Disassembly of section .vsyscall_0: : Disassembly of section .vsyscall_fn: : Disassembly of section .vsyscall_1: : Disassembly of section .vsyscall_2: : Disassembly of section .init.text: : Disassembly of section .altinstr_replacement: : Disassembly of section .exit.text: [root@mica ~]# And now 'perf annotate -v', verbose mode, will show the hits per precise IP, so that one can make sense of the attribution to each objdumop line: [root@mica ~]# perf annotate -v need_resched Looking at the vmlinux_path (5 entries long) Using /lib/modules/2.6.33-rc8-tip-00784-g3471df5-dirty/build/vmlinux for symbols annotate_sym: filename=/lib/modules/2.6.33-rc8-tip-00784-g3471df5-dirty/build/vmlinux, sym=need_resched, start=0xffffffff810095ed, end=0xffffffff81009614 ------------------------------------------------ Percent | Source code & Disassembly of vmlinux ------------------------------------------------ ffffffff810095f1: 152 ffffffff81009603: 28 ffffffff8100960f: 55 ffffffff81009610: 53 h->sum: 288 Signed-off-by: Arnaldo Carvalho de Melo Cc: David Miller Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267194194-15670-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cfc9c0b450176a077205ef39092f0dc1a04e020a Author: Robert Richter Date: Fri Feb 26 13:45:24 2010 +0100 oprofile/x86: fix msr access to reserved counters During switching virtual counters there is access to perfctr msrs. If the counter is not available this fails due to an invalid address. This patch fixes this. Cc: stable@kernel.org Signed-off-by: Robert Richter commit c17c8fbf349482e89b57d1b800e83e9f4cf40c47 Author: Robert Richter Date: Thu Feb 25 20:20:25 2010 +0100 oprofile/x86: use kzalloc() instead of kmalloc() Cc: stable@kernel.org Signed-off-by: Robert Richter commit 68dc819ce829f7e7977a56524e710473bdb55115 Author: Robert Richter Date: Thu Feb 25 19:16:46 2010 +0100 oprofile/x86: fix perfctr nmi reservation for mulitplexing Multiple virtual counters share one physical counter. The reservation of virtual counters fails due to duplicate allocation of the same counter. The counters are already reserved. Thus, virtual counter reservation may removed at all. This also makes the code easier. Cc: stable@kernel.org Signed-off-by: Robert Richter commit 8588d1067147e14d1dd521fbadd1d2564f8cc794 Author: Naga Chumbalkar Date: Tue Feb 23 18:14:58 2010 +0100 oprofile/x86: add comment to counter-in-use warning Currently, oprofile fails silently on platforms where a non-OS entity such as the system firmware "enables" and uses a performance counter. There is a warning in the code for this case. The warning indicates an already running counter. If oprofile doesn't collect data, then try using a different performance counter on your platform to monitor the desired event. Delete the counter from the desired event by editing the /usr/share/oprofile///events file. If the event cannot be monitored by any other counter, contact your hardware or BIOS vendor. Cc: Shashi Belur Cc: Tony Jones Signed-off-by: Naga Chumbalkar Signed-off-by: Robert Richter commit 98a2e73a0690b3610f049a64154d8145e5771713 Author: Robert Richter Date: Tue Feb 23 18:14:58 2010 +0100 oprofile/x86: warn user if a counter is already active This patch generates a warning if a counter is already active. Implemented for AMD and P6 models. P4 is not supported. Cc: Naga Chumbalkar Cc: Shashi Belur Cc: Tony Jones Signed-off-by: Robert Richter commit ba52078e1917c5116c0802298d88ad0e54a6728b Author: Robert Richter Date: Tue Feb 23 15:46:49 2010 +0100 oprofile/x86: implement randomization for IBS periodic op counter IBS selects an op (execution operation) for sampling by counting either cycles or dispatched ops. Better statistical samples can be produced by adding a software generated random offset to the periodic op counter value with each sample. This patch adds software randomization to the IBS periodic op counter. The lower 12 bits of the 20 bit counter are randomized. IbsOpCurCnt is initialized with a 12 bit random value. There is a work around if the hw can not write to IbsOpCurCnt. Then the lower 8 bits of the 16 bit IbsOpMaxCnt [15:0] value are randomized in the range of -128 to +127 by adding/subtracting an offset to the maximum count (IbsOpMaxCnt). The linear feedback shift register (LFSR) algorithm is used for pseudo-random number generation to have low impact to the memory system. Signed-off-by: Robert Richter commit f125be1469303f7b9324447f251d74a0da24952f Author: Suravee Suthikulpanit Date: Mon Jan 18 11:25:45 2010 -0600 oprofile/x86: implement lsfr pseudo-random number generator for IBS This patch implements a linear feedback shift register (LFSR) for pseudo-random number generation for IBS. For IBS measurements it would be good to minimize memory traffic in the interrupt handler since every access pollutes the data caches. Computing a maximal period LFSR just needs shifts and ORs. The LFSR method is good enough to randomize the ops at low overhead. 16 pseudo-random bits are enough for the implementation and it doesn't matter that the pattern repeats with a fairly short cycle. It only needs to break up (hard) periodic sampling behavior. The logic was designed by Paul Drongowski. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Robert Richter commit 64683da6643e8c6c93f1f99548399b08c029fd13 Author: Robert Richter Date: Thu Feb 4 10:57:23 2010 +0100 oprofile/x86: implement IBS cpuid feature detection This patch adds IBS feature detection using cpuid flags. An IBS capability mask is introduced to test for certain IBS features. The bit mask is the same as for IBS cpuid feature flags (Fn8000_001B_EAX), but bit 0 is used to indicate the existence of IBS. The patch also changes the handling of the IbsOpCntCtl bit (periodic op counter count control). The oprofilefs file for this feature (ibs_op/dispatched_ops) will be only exposed if the feature is available, also the default for the bit is set to count clock cycles. In general, the userland can detect the availability of a feature by checking for the corresponding file in oprofilefs. If it exists, the feature also exists. This may lead to a dynamic file layout depending on the cpu type with that the userland has to deal with. Current opcontrol is compatible. Signed-off-by: Robert Richter commit 89baaaa98a10cad5cc8516c7208b02d9fc711890 Author: Robert Richter Date: Thu Jan 28 16:50:45 2010 +0100 oprofile/x86: remove node check in AMD IBS initialization Standard AMD systems have the same number of nodes as there are northbridge devices. However, there may kernel configurations (especially for 32 bit) or system setups exist, where the node number is different or it can not be detected properly. Thus the check is not reliable and may fail though IBS setup was fine. For this reason it is better to remove the check. Cc: stable Signed-off-by: Robert Richter commit 013cfc50672bbb638796545231683231647edb07 Author: Robert Richter Date: Thu Jan 28 18:05:26 2010 +0100 oprofile/x86: remove OPROFILE_IBS config option OProfile support for IBS is now for several versions in the kernel. The feature is stable now and the code can be activated permanently. As a side effect IBS now works also on nosmp configs. Signed-off-by: Robert Richter commit b309a294e5b24692d0f7ea1defa168074cea619e Author: Robert Richter Date: Fri Feb 26 15:01:23 2010 +0100 oprofile: remove EXPERIMENTAL from the config option description OProfile is already used for a long time and no longer experimental. Signed-off-by: Robert Richter commit 18b4a4d59e97e7ff13ee84b5bec79f3fc70a9f0a Author: Robert Richter Date: Wed Feb 10 10:03:34 2010 +0100 oprofile: remove tracing build dependency The commit 1155de4 ring-buffer: Make it generally available already made ring-buffer available without the TRACING option enabled. This patch removes the TRACING dependency from oprofile. Fixes also oprofile configuration on ia64. The patch also applies to the 2.6.32-stable kernel. Reported-by: Tony Jones Cc: stable@kernel.org Signed-off-by: Robert Richter commit 773c3e75d1fc7ea5058bfeab5d82bac5b85f8cd8 Author: Sriramakrishnan Date: Fri Feb 26 05:22:03 2010 -0800 can: ti hecc module : add platform specific initialization callback. CAN module on AM3517 requires programming of IO expander as part of init sequence - to enable CAN PHY. Added platform specific callback to handle phy control(switch on /off). Signed-off-by: Sriramakrishnan Signed-off-by: David S. Miller commit 738b0343e73604750feb107e063c28b3ca36cb84 Author: David S. Miller Date: Fri Feb 26 05:12:02 2010 -0800 Revert "ethtool: Add n-tuple string length to drvinfo and return it" This reverts commit c79c5ffdce14abb4de3878c5aa8c3c6e5093c69b. As Jeff points out we can't break the user visible interface like this, we need to add this into the reserved[] thing. Signed-off-by: David S. Miller commit 58c24a61614f5da290068e47fc5ec65370eb61dd Author: Richard Kennedy Date: Fri Feb 26 14:00:43 2010 +0100 block: remove padding from io_context on 64bit builds On 64 bit builds when CONFIG_BLK_CGROUP=n (the default) this removes 8 bytes of padding from structure io_context and drops its size from 72 to 64 bytes, so needing one fewer cachelines and allowing more objects per slab in it's kmem_cache. Signed-off-by: Richard Kennedy ---- patch against 2.6.33 compiled & test on x86_64 AMDX2 regards Richard Signed-off-by: Jens Axboe commit 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b Author: Martin K. Petersen Date: Fri Feb 26 00:20:39 2010 -0500 block: Consolidate phys_segment and hw_segment limits Except for SCSI no device drivers distinguish between physical and hardware segment limits. Consolidate the two into a single segment limit. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 086fa5ff0854c676ec333760f4c0154b3b242616 Author: Martin K. Petersen Date: Fri Feb 26 00:20:38 2010 -0500 block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors The block layer calling convention is blk_queue_. blk_queue_max_sectors predates this practice, leading to some confusion. Rename the function to appropriately reflect that its intended use is to set max_hw_sectors. Also introduce a temporary wrapper for backwards compability. This can be removed after the merge window is closed. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit eb28d31bc97e6374d81f404da309401ffaed467b Author: Martin K. Petersen Date: Fri Feb 26 00:20:37 2010 -0500 block: Add BLK_ prefix to definitions Add a BLK_ prefix to block layer constants. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit e751e76a5f7adeee7438e68b0965559ad2864d0d Author: Martin K. Petersen Date: Fri Feb 26 00:20:36 2010 -0500 block: Remove unused accessor function blk_queue_max_hw_sectors is no longer called by any subsystem and can be removed. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 2800aac1114548a9b47b6e0d398117cc01b89685 Author: Martin K. Petersen Date: Fri Feb 26 00:20:35 2010 -0500 block: Update blk_queue_max_sectors and documentation Clarify blk_queue_max_sectors and update documentation. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 275143e9b237dd7e0b6d01660fd9b8acd9922fa7 Author: Ben Hutchings Date: Fri Feb 26 04:37:09 2010 -0800 sunxvr500: Additional PCI id for sunxvr500 driver Intergraph bought 3D Labs and some XVR-500 chips have Intergraph's vendor id. Reported-by: Jurij Smakov Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit 14f3ad6f4a12495b32b0dd743bc7179f36658208 Author: Ulrich Weber Date: Fri Feb 26 04:34:49 2010 -0800 ipv6: Use 1280 as min MTU for ipv6 forwarding Clients will set their MTU to 1280 if they receive a ICMPV6_PKT_TOOBIG message with an MTU less than 1280. To allow encapsulating of packets over a 1280 link we should always accept packets with a size of 1280 for forwarding even if the path has a lower MTU and fragment the encapsulated packets afterwards. In case a forwarded packet is not going to be encapsulated a ICMPV6_PKT_TOOBIG msg will still be send by ip6_fragment() with the correct MTU. Signed-off-by: Ulrich Weber Signed-off-by: David S. Miller commit a6d468d05356655cdc11bb2cfec4e64bcef6ad0a Author: FUJITA Tomonori Date: Fri Feb 26 04:33:27 2010 -0800 sparc: use asm-generic/scatterlist.h sparc's scatterlist structure is identical to the generic one. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit fbf219f1c89b15e90ec2db5a3e9636376dc623db Author: Jiri Pirko Date: Wed Feb 24 05:11:08 2010 +0000 infiniband: convert to use netdev_for_each_mc_addr Due to the loop complexicity in nes_nic.c, I'm using char* to copy mc addresses to it. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6e17d45ae310758ab30623a42ad070858c9a48de Author: Jiri Pirko Date: Wed Feb 24 22:49:15 2010 +0000 net: add addr len check to dev_mc_add Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit c79c5ffdce14abb4de3878c5aa8c3c6e5093c69b Author: Peter Waskiewicz Date: Fri Feb 26 01:54:20 2010 +0000 ethtool: Add n-tuple string length to drvinfo and return it The drvinfo struct should include the number of strings that get_rx_ntuple will return. It will be variable if an underlying driver implements its own get_rx_ntuple routine, so userspace needs to know how much data is coming. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c43491d73ea04277c92a4aa1a7e63ccab4577756 Author: Simon Horman Date: Thu Feb 25 13:50:19 2010 +0000 greth: fall through to common return statement on error There doesn't seem to be any reason to explicitly return NETDEV_TX_OK as err is set to NETDEV_TX_OK in all cases that reach this point. Signed-off-by: Simon Horman Signed-off-by: David S. Miller commit e5e26d75f490d7d41f25a4b39ed6db1713beb417 Author: stephen hemminger Date: Wed Feb 24 14:01:38 2010 +0000 netdev: use list_first_entry macro Use list_first_entry macro; no longer any need to use 'next' directly in list to find first entry. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4edb246626be6e031950205c885bdf29fb2ff1eb Author: Williams, Mitch A Date: Wed Feb 24 21:59:56 2010 +0000 rtnetlink: clean up SR-IOV config interface This patch consists of a few minor cleanups to the SR-IOV configurion code in rtnetlink. - Remove unneccesary lock - Remove unneccesary casts - Return correct error code for no driver support These changes are based on comments from Patrick McHardy Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 914c8ad2d18b62ad1420f518c0cab0b0b90ab308 Author: Jiri Pirko Date: Wed Feb 24 23:57:04 2010 +0000 af_packet: do not accept mc address smaller then dev->addr_len in packet_mc_add() There is no point of accepting an address of smaller length than dev->addr_len here. Therefore change this for stonger check. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 2a3f279034b46204b50408aa2c25ee0882120147 Author: Brice Goglin Date: Wed Feb 24 12:11:19 2010 +0000 myri10ge: optimize 4k-boundary check when stocking rx pages Small optimization to the code which checks to see if we'd cross a 4K boundary when stocking RX ring. Signed-off-by: Brice Goglin Signed-off-by: Andrew Gallatin Signed-off-by: Guillaume Morin Signed-off-by: David S. Miller commit 45bb00609022ecf1d97e083666c68c74d237b799 Author: Ulrich Weber Date: Thu Feb 25 23:28:58 2010 +0000 ipv6: Remove IPV6_ADDR_RESERVED RFC 4291 section 2.4 states that all uncategorized addresses should be considered as Global Unicast. This will remove IPV6_ADDR_RESERVED completely and return IPV6_ADDR_UNICAST in ipv6_addr_type() instead. Signed-off-by: Ulrich Weber Signed-off-by: David S. Miller commit 1d9cfc4e354cd619d92bb938657dec3c533e6929 Author: Michael Chan Date: Wed Feb 24 14:42:09 2010 +0000 cnic: Update version to 2.1.1. And update copyright to 2010. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a4dde3abbf87a495154a876576e1ab34b17b5ef1 Author: Michael Chan Date: Wed Feb 24 14:42:08 2010 +0000 cnic: Use union for the status blocks of different devices. We only need to assign the status block address once and it also saves space in the structure. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: Eddie Wai Signed-off-by: David S. Miller commit c76284af9ec8a010c502a70249cb74b3bb69ec6f Author: Michael Chan Date: Wed Feb 24 14:42:07 2010 +0000 cnic: Simplify route checking during iSCSI connection. With a separate IP address for iSCSI, connections should proceed whether or not we can get a route to the target from the network stack. It is possible that the network IP address may not reach the iSCSI target. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: Eddie Wai Signed-off-by: David S. Miller commit d02a5e6c2fba8b114c44cf05085fca07180f37f1 Author: Michael Chan Date: Wed Feb 24 14:42:06 2010 +0000 cnic: Fix panic in cnic_iscsi_nl_msg_recv() when device is down. Some data structures are freed when the device is down and it will crash if an ISCSI netlink message is received. Add RCU protection to prevent this. In the shutdown path, ulp_ops[CNIC_ULP_L4] is assigned NULL and rcu_synchronized before freeing the data structures. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 66883e90eaa0dd55d395c0f9a0c6da5d50809804 Author: Eddie Wai Date: Wed Feb 24 14:42:05 2010 +0000 cnic: Finetune iSCSI connection reset. For bnx2 devices, always send notification to bnx2i to let it initiate the cleanup when RST is received. For bnx2x devices, add unsolicited RST_COMP handling to start the cleanup. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit a9736c086cc6221659e498f0855152c32dbc1396 Author: Eddie Wai Date: Wed Feb 24 14:42:04 2010 +0000 cnic: Finetune iSCSI connection set up. Initialize IP ID and handle some additional connection errors. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit c85a26189660e1cfd1f50989468313c544487950 Author: John Fastabend Date: Thu Feb 25 23:15:21 2010 +0000 ixgbe: Do not allocate too many netdev txqueues Instead of allocating 128 struct netdev_queue per device, use the minimum value between 128 and the number of possible txq's, to reduce ram usage and "tc -s -d class shod dev .." output. This patch fixes Eric Dumazet's patch to set the TX queues to the correct minimum. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a922afb64d2e71115f122e04346163cb8c8453e3 Author: John Fastabend Date: Thu Feb 25 23:14:58 2010 +0000 ixgbe: do not stop tx queues in ixgbe_set_tso Disabling TSO can cause the dev_watchdog timer to be triggered because when TSO is disabled netif_tx_stop_all_queues is called. If the watchdog timer fires while the queues are stopped and traffic has not recently been sent on a paticular queue this is falsly identified as a hang and ndo_tx_timeout() is called. This is ocossionally seen during testing. This removes the netif_tx_stop_all_queues() it is not needed. The scheduler submits skb's with dev_hard_start_xmit(), this checks if netif_needs_gso and if so it calls dev_gso_segment. Disabling TSO will cause dev_hard_start_xmit() to do the gso processing. However ixgbe does not use the features flags to determine if it needs to use tso or not instead it uses skb->gso_size so ixgbe will process these frames correctly regardless of the netdev features flag. Signed-off-by: John Fastabend Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 43634e820e393ba48bb2efc3d330dee4203e80d8 Author: Mallikarjuna R Chilakala Date: Thu Feb 25 23:14:37 2010 +0000 ixgbe: Fix DMA mapping/unmapping issues when HWRSC is enabled on IOMMU enabled kernels Work around 82599 HW issue when HWRSC is enabled on IOMMU enabled kernels. 82599 HW is updating the header information after setting the descriptor to done, resulting DMA mapping/unmapping issues on IOMMU enabled systems. To work around the issue delay unmapping of first packet that carries the header information until end of packet is reached. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 41a655ba5654e47847505c164f77f8190ca9ed27 Author: kirjanov@gmail.com Date: Wed Feb 24 10:25:33 2010 +0000 greth: convert to netdev_tx_t Convert to netdev_tx_t Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit e382c3018ad19744d3c5d281daf4b0e9f052af66 Author: kirjanov@gmail.com Date: Wed Feb 24 08:41:18 2010 +0000 sis190: handle DMA mapping errors Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit dee7399c2d9a1d3b0af5d68d7e0dd922e104a2a8 Author: Atsushi Nemoto Date: Wed Feb 24 06:00:34 2010 +0000 tc35815: Fix double locking on NAPI Isolate spinlock for tx and rx to resolve double-locking. This is potential bug while this controller does not exist on any SMP platforms, but lockdep or rt-preempt reveals this bug. Reported-by: Ralf Roesch Signed-off-by: Atsushi Nemoto Signed-off-by: David S. Miller commit 9c5f9c2861909753140ad6a41cdc77cdf20c1dc9 Author: Atsushi Nemoto Date: Wed Feb 24 06:00:17 2010 +0000 isa-skelton: Remove a wrong netif_wake_queue() call The netif_wake_queue() is called correctly (i.e. only on !txfull condition) from net_tx(). So Unconditional call to the netif_wake_queue() here is wrong. This might cause calling of start_xmit routine on txfull state and trigger tx-ring overflow. This fix is ported from commit 662a96bd6f020782dfbdc0d0bd177c7dbb556687 ("tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON"). Signed-off-by: Atsushi Nemoto Signed-off-by: David S. Miller commit fbc450b137e59205b98a172326415cd981c9caa6 Author: Jiri Pirko Date: Tue Feb 23 09:54:58 2010 +0000 octeon: convert to use netdev_for_each_mc_addr Hmm so actually my original patch including this bit was correct, "list = list->next;" confused me :) - will send patch correcting that in a few. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 567ec874d15b478c8eda7e9a5d2dcb05f13f1fb5 Author: Jiri Pirko Date: Tue Feb 23 23:17:07 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part6 Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit f9dcbcc9e338d08c0f7de7eba4eaafbbb7f81249 Author: Jiri Pirko Date: Tue Feb 23 09:19:49 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part5 V2 removed some needless checks and also corrected bug in lp486e (dmi was passed instead of dmi->dmi_addr) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6667661df4bc76083edf1e08831c20f64429709d Author: Peter Zijlstra Date: Wed Feb 10 16:10:48 2010 +0100 perf_events, x86: Remove superflous MSR writes We re-program the event control register every time we reset the count, this appears to be superflous, hence remove it. Signed-off-by: Peter Zijlstra Cc: Arjan van de Ven LKML-Reference: Signed-off-by: Ingo Molnar commit 6e37738a2fac964583debe91099bc3248554f6e5 Author: Peter Zijlstra Date: Thu Feb 11 13:21:58 2010 +0100 perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in() Since the cpu argument to hw_perf_group_sched_in() is always smp_processor_id(), simplify the code a little by removing this argument and using the current cpu where needed. Signed-off-by: Peter Zijlstra Cc: David Miller Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Frederic Weisbecker LKML-Reference: <1265890918.5396.3.camel@laptop> Signed-off-by: Ingo Molnar commit 38331f62c20456454eed9ebea2525f072c6f1d2e Author: Stephane Eranian Date: Mon Feb 8 17:17:01 2010 +0200 perf_events, x86: AMD event scheduling This patch adds correct AMD NorthBridge event scheduling. NB events are events measuring L3 cache, Hypertransport traffic. They are identified by an event code >= 0xe0. They measure events on the Northbride which is shared by all cores on a package. NB events are counted on a shared set of counters. When a NB event is programmed in a counter, the data actually comes from a shared counter. Thus, access to those counters needs to be synchronized. We implement the synchronization such that no two cores can be measuring NB events using the same counters. Thus, we maintain a per-NB allocation table. The available slot is propagated using the event_constraint structure. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4b703957.0702d00a.6bf2.7b7d@mx.google.com> Signed-off-by: Ingo Molnar commit d76a0812ac4139ceb54daab3cc70e1bd8bd9d43a Author: Stephane Eranian Date: Mon Feb 8 17:06:01 2010 +0200 perf_events: Add new start/stop PMU callbacks In certain situations, the kernel may need to stop and start the same event rapidly. The current PMU callbacks do not distinguish between stop and release (i.e., stop + free the resource). Thus, a counter may be released, then it will be immediately re-acquired. Event scheduling will again take place with no guarantee to assign the same counter. On some processors, this may event yield to failure to assign the event back due to competion between cores. This patch is adding a new pair of callback to stop and restart a counter without actually release the underlying counter resource. On stop, the counter is stopped, its values saved and that's it. On start, the value is reloaded and counter is restarted (on x86, actual restart is delayed until perf_enable()). Signed-off-by: Stephane Eranian [ added fallback to ->enable/->disable for all other PMUs fixed x86_pmu_start() to call x86_pmu.enable() merged __x86_pmu_disable into x86_pmu_stop() ] Signed-off-by: Peter Zijlstra LKML-Reference: <4b703875.0a04d00a.7896.ffffb824@mx.google.com> Signed-off-by: Ingo Molnar commit 3a0304e90aa5a2c0c308a05d28f7d109a48d8539 Author: Peter Zijlstra Date: Fri Feb 26 10:33:41 2010 +0100 perf_events: Report the MMAP pgoff value in bytes DaveM reported that currently perf interprets the pgoff value reported by the MMAP events as a byte range, but the kernel reports it as a page offset. Since its broken (and unusable) anyway, change the kernel behaviour (ABI) to report bytes indeed, avoiding the need for userspace to deal with PAGE_SIZE things. Reported-by: David Miller Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 52c793f24054f5dc30d228e37e0e19cc8313f086 Author: Wolfgang Grandegger Date: Mon Feb 22 22:21:17 2010 +0000 can: netlink support for bus-error reporting and counters This patch makes the bus-error reporting configurable and allows to retrieve the CAN TX and RX bus error counters via netlink interface. I have added support for the SJA1000. The TX and RX bus error counters are also copied to the data fields 6..7 of error messages when state changes are reported. Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 78ca90ea995cb86c72cde9308276d2a701bd3c40 Author: Joe Perches Date: Mon Feb 22 16:56:58 2010 +0000 drivers/net/myri10ge: Use pr_ and netdev_ Add #define pr_fmt(fmt) Convert logging messages to pr_ and netdev_ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c1f51212eb809849bdc68a856ae5f424dcf20d9b Author: Joe Perches Date: Mon Feb 22 16:56:57 2010 +0000 drivers/net/chelsio: Use pr_, netif_msg_ Convert CH_ and CH_DBG uses to pr_ and netif equivalents Remove CH_ and CH_DBG macro definitions Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 606847540079bd3e710f132724145c5785396dcb Author: Tomi Valkeinen Date: Tue Feb 9 14:14:07 2010 +0200 OMAP: DSS2: TPO-TD03MTEA1: fix function names Copy/paste had resulted in wrong function names in TPO TD043MTEA1 panel driver. Signed-off-by: Tomi Valkeinen commit 003bdb279bb6b212f25ea4e60e0164b6109d3704 Author: Andy Shevchenko Date: Mon Feb 22 13:10:22 2010 +0000 isdn: remove ishexdigit() in regard to isxdigit() Samll cleanup in drivers/isdn/gigaset/capi.c where own implementation of isxdigit() has been changed to kernel native one. Signed-off-by: Andy Shevchenko Acked-by: Tilman Schmidt Signed-off-by: David S. Miller commit 1528b18f7ec2b907711f37667c68e10d9296c882 Author: Tilman Schmidt Date: Mon Feb 22 13:09:52 2010 +0000 gigaset: reduce syslog clutter Improve readability of the Gigaset driver's kernel messages by removing a few unnecessary messages and limiting the emission of some debug messages more narrowly. Impact: logging Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 63e055d1c6e3a5f6d370cc841d621d5fa4d5d834 Author: Tilman Schmidt Date: Mon Feb 22 13:09:22 2010 +0000 bas_gigaset: collapse CR/LF at end of AT response Copy the mechanism from ser_/usb_gigaset to avoid producing spurious empty responses for CR/LF sequences from the device. Add a comment in all drivers documenting that behaviour. Correct an off by one error that might result in a one byte buffer overflow when receiving an unexpectedly long reply. Impact: minor bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 2ac2ed5f2dfc97ae9ed9f446ad6e064fa821ef6d Author: Tilman Schmidt Date: Mon Feb 22 13:08:51 2010 +0000 gigaset: small documentation improvement Clarify the non-support by isdnlog, and propose a better standard debug mask. Impact: Documentation Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 9abd5438641425c2f8a3a399c921747a4fb55adc Author: Yegor Yefremov Date: Mon Feb 22 05:47:58 2010 +0000 KS8695: Don't call netif_carrier_off() from ndo_stop() netif_carrier_on() and netif_carrier_off() should be called from link status interrupt handler Signed-off-by: Yegor Yefremov Signed-off-by: David S. Miller commit 4b70858ba8d4537daf782defebe5f2ff80ccef2b Author: Dmitry Torokhov Date: Fri Feb 26 00:22:04 2010 -0800 Input: atkbd - release previously reserved keycodes 248 - 254 Keycodes in 248 - 254 range were reserved for special needs (scrolling) of atkbd driver. Now that the driver has been switched to use unsigned short keycodes instead of unsigned char we can release this range back into pull. We keep code 255 (ATKBD_KEY_NULL) reserved since users may have been using it to silence keys they do not care about since atkbd silently drops scancodes mapped to this keycode. Signed-off-by: Dmitry Torokhov commit 492d4f25416528ffb900e6edf0fd70eafd098cfc Author: Dmitry Torokhov Date: Fri Feb 26 00:16:05 2010 -0800 Input: add KEY_WPS_BUTTON definition The new key definition is supposed to be used for buttons that initiate WiFi Protected setup sequence: http://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup Signed-off-by: Dmitry Torokhov commit 281b3714e91162b66add1cfac404cf7b81e3e2f2 Merge: 64b9fb5 7b60997 Author: Ingo Molnar Date: Fri Feb 26 09:20:17 2010 +0100 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core commit 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 Merge: 83f0d53 60b341b Author: Ingo Molnar Date: Fri Feb 26 09:18:32 2010 +0100 Merge commit 'v2.6.33' into tracing/core Conflicts: scripts/recordmcount.pl Merge reason: Merge up to v2.6.33. Signed-off-by: Ingo Molnar commit 024f9066165ffe9c8284431c78adcbcddd309831 Author: Gui Jianfeng Date: Fri Feb 26 08:56:15 2010 +0100 cfq: Remove useless css reference get There's no need to take css reference here, for the caller has already called rcu_read_lock() to prevent cgroup from being removed. Signed-off-by: Gui Jianfeng Reviewed-by: Li Zefan Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 Author: Benjamin Herrenschmidt Date: Fri Feb 26 18:29:17 2010 +1100 powerpc: Fix lwsync feature fixup vs. modules on 64-bit Anton's commit enabling the use of the lwsync fixup mechanism on 64-bit breaks modules. The lwsync fixup section uses .long instead of the FTR_ENTRY_OFFSET macro used by other fixups sections, and thus will generate 32-bit relocations that our module loader cannot resolve. This changes it to use the same type as other feature sections. Note however that we might want to consider using 32-bit for all the feature fixup offsets and add support for R_PPC_REL32 to module_64.c instead as that would reduce the size of the kernel image. I'll leave that as an exercise for the reader for now... Signed-off-by: Benjamin Herrenschmidt commit 19bc291c99f018bd4f2c38bbf69144086dca903f Merge: 0448873 4a6967b Author: David S. Miller Date: Thu Feb 25 23:26:21 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/rt2x00/rt2800pci.c commit fb90ef93df654f2678933efbbf864adac0ae490e Author: Yinghai Lu Date: Wed Feb 24 18:36:53 2010 -0800 early_res: Add free_early_partial() To free partial areas in pcpu_setup... Reported-by: Peter Zijlstra Signed-off-by: Yinghai Lu Cc: Tejun Heo Cc: Christoph Lameter Cc: Stephen Rothwell Cc: Linus Torvalds Cc: Jesse Barnes Cc: Pekka Enberg LKML-Reference: <4B85E245.5030001@kernel.org> Signed-off-by: Ingo Molnar commit 04488734806948624dabc4514f96f14cd75b9a50 Merge: 54831a8 c4d4979 Author: David S. Miller Date: Thu Feb 25 23:22:42 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit f5f654096487c6d526c47bb66308f9de81f091cf Author: Paul E. McKenney Date: Thu Feb 25 19:02:30 2010 -0800 rcu: Export rcu_scheduler_active Kernel modules using rcu_read_lock_sched_held() must now have access to rcu_scheduler_active, so it must be exported. This should fix the fix for the boot-time RCU-lockdep splat. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <20100226030230.GA7743@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit d9f1bb6ad7fc53c406706f47858dd5ff030b14a3 Author: Paul E. McKenney Date: Thu Feb 25 14:06:47 2010 -0800 rcu: Make rcu_read_lock_sched_held() take boot time into account Before the scheduler starts, all tasks are non-preemptible by definition. So, during that time, rcu_read_lock_sched_held() needs to always return "true". This patch makes that be so. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267135607-7056-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 056ba4a9bea5f32781a36b797c562fb731e5eaa6 Author: Paul E. McKenney Date: Thu Feb 25 14:06:46 2010 -0800 rcu: Make lockdep_rcu_dereference() message less alarmist Change from "unsafe" to "suspicious", given that there will be false alarms. Suggested-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267135607-7056-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit b5f5fe80fa98a60daa0fa94512d1599b1e26674c Author: Magnus Damm Date: Thu Feb 25 11:14:28 2010 +0000 sh: remove dead LED code for migo-r and ms7724se CONFIG_PM is always set on SH-Mobile these days so get rid of the unused LED setup code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6b3b55750b0de4a4ff2742efd34ff74665fa4e2f Author: Magnus Damm Date: Thu Feb 25 11:10:54 2010 +0000 sh: ecovec build fix for CONFIG_I2C=n Allow building the ecovec board support code even though I2C support is disabled. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2839bd61f671d3debf9ef0893a0470fd97b2e2ce Author: Magnus Damm Date: Thu Feb 25 11:07:52 2010 +0000 sh: ecovec r-standby support This patch adds board specific r-standby resume code for ecovec. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b67cf2848af1cf4a4c9c277429092ae59adf859b Author: Magnus Damm Date: Thu Feb 25 11:06:02 2010 +0000 sh: ms7724se r-standby support This patch adds board specific r-standby resume code for ms7724se. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 41bfb7d7a6ce3d8dd83112e65f5d97feefde818a Author: Magnus Damm Date: Thu Feb 25 11:03:24 2010 +0000 sh: SH-Mobile R-standby register save/restore Add code to save/restore registers during R-standby sleep on SH-Mobile processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eb6b6d7cdd5548fa03a919d14615195600013be2 Merge: 30d6c72 383be5d Author: Dave Airlie Date: Thu Feb 25 13:44:04 2010 +1000 Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage * korg/drm-radeon-testing: (62 commits) drm/radeon/kms: update new pll algo drm/radeon/kms: add support for square microtiles on r3xx-r5xx drm/radeon/kms: force pinning buffer into visible VRAM drm/radeon/kms/evergreen: fix typo in cursor code drm/radeon/kms: implement reading active PCIE lanes on R600+ drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state drm/radeon/kms: simplify storing current and requested PM mode drm/radeon: fixes for r6xx/r7xx gfx init drm/radeon/rv740: fix backend setup drm/radeon/kms: fix R3XX/R4XX memory controller initialization [rfc] drm/radeon/kms: pm debugging check for vbl. drm/radeon: Fix memory allocation failures in the preKMS command stream checking. drm: Add generic multipart buffer. drm/radeon/kms: simplify memory controller setup V2 drm/radeon: Add asic hook for dma copy to r200 cards. drm/radeon/kms: Create asic structure for r300 pcie cards. drm/radeon/kms: remove unused r600_gart_clear_page drm/radeon/kms: remove HDP flushes from fence emit (v2) drm/radeon/kms: add LVDS pll quirk for Dell Studio 15 drm/radeon/kms: simplify picking power state ... Conflicts: drivers/gpu/drm/radeon/atom.c drivers/gpu/drm/radeon/atombios.h drivers/gpu/drm/radeon/atombios_dp.c drivers/gpu/drm/radeon/r600.c drivers/gpu/drm/radeon/r600_audio.c drivers/gpu/drm/radeon/r600_cp.c drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_connectors.c drivers/gpu/drm/radeon/radeon_ring.c drivers/gpu/drm/radeon/rv770.c commit ef57471a73b67a7b65fd8708fd55c77cb7c619af Author: David Howells Date: Fri Feb 26 01:56:16 2010 +0000 SELinux: Make selinux_kernel_create_files_as() shouldn't just always return 0 Make selinux_kernel_create_files_as() return an error when it gets one, rather than unconditionally returning 0. Without this, cachefiles doesn't return an error if the SELinux policy doesn't let it create files with the label of the directory at the base of the cache. Signed-off-by: David Howells Signed-off-by: James Morris commit 874f2f997dbe041a6c6e509dae8656ed9022d65d Merge: 071c06c 6ebdc66 Author: Benjamin Herrenschmidt Date: Fri Feb 26 14:41:00 2010 +1100 Merge commit 'origin/master' into next Manual merge of: drivers/char/hvc_console.c drivers/char/hvc_console.h commit d5d0e88c1e5b069aadb050ff6ec95df312de876a Author: Thomas Gleixner Date: Mon Feb 22 05:42:04 2010 -0800 x86, olpc: Use pci subarch init for OLPC Replace the #ifdef'ed OLPC-specific init functions by a conditional x86_init function. If the function returns 0 we leave pci_arch_init, otherwise we continue. Signed-off-by: Thomas Gleixner Cc: Jesse Barnes Cc: Andres Salomon LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318CE89@orsmsx508.amr.corp.intel.com> Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit 4fb6088a5cb3a77123fea1279bf2d5b16cf27648 Author: Thomas Gleixner Date: Mon Feb 22 05:38:38 2010 -0800 x86, pci: Add arch_init to x86_init abstraction Added an abstraction function for arch specific init calls. Signed-off-by: Jacob Pan Cc: Jesse Barnes LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318CE84@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit b525c06cdbd8a3963f0173ccd23f9147d4c384b5 Author: Henrique de Moraes Holschuh Date: Thu Feb 25 22:22:22 2010 -0300 thinkpad-acpi: lock down video output state access Given the right combination of ThinkPad and X.org, just reading the video output control state is enough to hard-crash X.org. Until the day I somehow find out a model or BIOS cut date to not provide this feature to ThinkPads that can do video switching through X RandR, change permissions so that only processes with CAP_SYS_ADMIN can access any sort of video output control state. This bug could be considered a local DoS I suppose, as it allows any non-privledged local user to cause some versions of X.org to hard-crash some ThinkPads. Reported-by: Jidanni Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit 08fedfc903c78e380b0baa7b57c52d367794d0a5 Author: Henrique de Moraes Holschuh Date: Thu Feb 25 22:22:07 2010 -0300 thinkpad-acpi: fix bluetooth/wwan resume Studying the DSDTs of various thinkpads, it looks like bit 3 of the argument to SBDC and SWAN is not "set radio to last state on resume". Rather, it seems to be "if this bit is set, enable radio on resume, otherwise disable it on resume". So, the proper way to prepare the radios for S3 suspend is: disable radio and clear bit 3 on the SBDC/SWAN call to to resume with radio disabled, and enable radio and set bit 3 on the SBDC/SWAN call to resume with the radio enabled. Also, for persistent devices, the rfkill core does not restore state, so we really need to get the firmware to do the right thing. We don't sync the radio state on suspend, instead we trust the BIOS to not do anything weird if we never touched the radio state since boot. Time will tell if that's a wise way of doing things... Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit 7f0cf712a74fcc3ad21f0bde95bd32c2f2cc3888 Author: Henrique de Moraes Holschuh Date: Thu Feb 25 21:29:00 2010 -0300 thinkpad-acpi: make driver events work in NVRAM poll mode Thadeu Lima de Souza Cascardo reports this: Brightness notification does not work until the user writes to hotkey_mask attribute. That's because the polling thread will only run if hotkey_user_mask is set and someone is reading the input device or if hotkey_driver_mask is set. In this second case, this condition is not tested after the mask is changed, because the brightness and volume drivers are started after the hotkey drivers. Fix tpacpi_hotkey_driver_mask_set() to call hotkey_poll_setup(), so that the poller kthread will be started when needed. Reported-by: Thadeu Lima de Souza Cascardo Tested-by: Thadeu Lima de Souza Cascardo Signed-off-by: Henrique de Moraes Holschuh Cc: Andrew Morton Cc: stable@kernel.org commit b589ea4c44170d3f7a845684e2d1b3b9571663af Author: Henrique de Moraes Holschuh Date: Thu Feb 25 21:28:58 2010 -0300 thinkpad-acpi: fix poll thread auto-start The driver was not starting the NVRAM polling thread if the input device was bound immediately after registration. This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=15118 Reported-by: Florian Zumbiehl Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit 7d1894d8d1c411d2dad95abfe0f65bacf68c4afa Author: Henrique de Moraes Holschuh Date: Thu Feb 25 21:28:56 2010 -0300 thinkpad-acpi: R52 brightness_mode has been confirmed We can stop pestering users for confirmation of the brightness_mode default for firmware TP-76. While at it, add a few missing comments in that quirk table. Reported-by: Whoopie Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit bf8b29c8f7f8269e99eca8b19048ed5b34b51810 Author: Henrique de Moraes Holschuh Date: Thu Feb 25 21:28:56 2010 -0300 thinkpad-acpi: document HKEY event 3006 Event 0x3006 is used to help power management of the ODD in the UltraBay. The EC generates this event when the ODD eject button is pressed (even if the bay is powered down). Normally, Linux doesn't need this as we keep the SATA link powered up (which wastes power). The EC powers up the bay by itself when the ODD eject button is pressed, and the SATA PHY reports the hotplug. However, we could also power that SATA link down (and for that matter, also power down the Ultrabay) if the ODD is left idle for a while with no disk inside, and use event 0x3006 to know when we need that SATA link powered back up. For now, just stop asking for more information when event 0x3006 is seen, there is no point in pestering users about it anymore. Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org commit 4b2f3f7d0fe97ad312fb572c8f8d88836ae8fb1e Author: Jacob Pan Date: Thu Feb 25 10:02:14 2010 -0800 x86, mrst: Add Kconfig dependencies for Moorestown The Moorestown platform requires IOAPIC for all interrupts from the south complex, since there is no legacy PIC. Furthermore, Moorestown I/O requires PCI. Moorestown PCI depends on PCI MMCONFIG and DIRECT method to perform device enumeration, as there is no PCI BIOS. [ hpa: rewrote commit message ] Signed-off-by: Jacob Pan LKML-Reference: <1267120934-9505-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin commit 98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d Author: Russell King Date: Thu Feb 25 23:56:38 2010 +0000 ARM: Fix decompressor's kernel size estimation for ROM=y Commit 2552fc2 changed the way the decompressor decides if it is safe to decompress the kernel directly to its final location. Unfortunately, it took the top of the compressed data as being the stack pointer, which it is for ROM=n cases. However, for ROM=y, the stack pointer is not relevant, and results in the wrong answer. Fix this by explicitly storing the end of the biggybacked data in the decompressor, and use that to calculate the compressed image size. CC: Signed-off-by: Russell King commit 6ebdc661b608671e9ca572af8bb42d58108cc008 Merge: d7930c9 df0edeb Author: Linus Torvalds Date: Thu Feb 25 15:38:37 2010 -0800 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits) of: remove undefined request_OF_resource & release_OF_resource of/sparc: Remove sparc-local declaration of allnodes and devtree_lock of: move definition of of_chosen into common code. of: remove unused extern reference to devtree_lock of: put default string compare and #a/s-cell values into common header of/flattree: Don't assume HAVE_LMB of: protect linux/of.h with CONFIG_OF proc_devtree: fix THIS_MODULE without module.h of: Remove old and misplaced function declarations of/flattree: Make the kernel accept ePAPR style phandle information of/flattree: endian-convert members of boot_param_header of: assume big-endian properties, adding conversions where necessary of: use __be32 for cell value accessors of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing of/flattree: use callback to setup initrd from /chosen proc_devtree: include linux/of.h of: make set_node_proc_entry private to proc_devtree.c of: include linux/proc_fs.h of/flattree: merge early_init_dt_scan_memory() common code of: add 'of_' prefix to machine_is_compatible() ... commit d7930c9ef9cc67044f5ddaac54d06ca22645a012 Merge: b6d9702 4f4517c Author: Linus Torvalds Date: Thu Feb 25 15:38:03 2010 -0800 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (31 commits) spi: Correct SPI clock frequency setting in spi_mpc8xxx spi/spi_s3c64xx.c: Fix continuation line formats spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK spi/dw_spi: Allow dw_spi.c to be a module spi/dw_spi: mmio code style fixups Memory-mapped dw_spi driver spi/dw_spi: fix missing export of dw_spi_remove_host spi/dw_spi: conditional transfer mode changes spi/dw_spi: remove conditional from 'poll_transfer'. spi/dw_spi: fixed a spelling typo in a warning message. spi/dw_spi: add return value to empty mrst_spi_debugfs_init() spi/dw_spi: enable platform specific chipselect. spi/dw_spi: add a FIFO depth detection spi/dw_spi: fix __init/__devinit section mismatch spi: xilinx_spi: Fix up I/O routine wrapping bogosity. spi/spi_imx: add device information by switching pr_debug() to dev_dbg() spi: update MSIOF includes spi/dw_spi: refine the IRQ mode working flow spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence spi/dw_spi: bug fix in wait_till_not_busy() ... commit e72aca30837d9c0ee287d18a092fc76a38a3b81d Author: Alex Chiang Date: Thu Feb 25 14:09:57 2010 -0700 [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI Simplify the makefile slightly by always building acpi-ext.o when CONFIG_ACPI is turned on. Yes, this adds a little bloat to the other configs, but not much: text data bss dec hex filename 839 41 0 880 370 arch/ia64/kernel/acpi-ext.o Before: text data bss dec hex filename 10952753 1299212 1334241 13586206 cf4f1e vmlinux After: text data bss dec hex filename 10953739 1299084 1334241 13587064 cf5278 vmlinux (gdb) p 13587064 - 13586206 $2 = 858 Seems like a small price to pay for the benefit of not having to think so hard about the multitude of ia64 configs when reading code/Makefiles. Signed-off-by: Alex Chiang Signed-off-by: Tony Luck commit c1fd1b43831fa20c91cdd461342af8edf2e87c2f Author: Pekka Enberg Date: Wed Feb 24 17:04:47 2010 +0200 x86, mm: Unify kernel_physical_mapping_init() API This patch changes the 32-bit version of kernel_physical_mapping_init() to return the last mapped address like the 64-bit one so that we can unify the call-site in init_memory_mapping(). Cc: Yinghai Lu Cc: KAMEZAWA Hiroyuki Signed-off-by: Pekka Enberg LKML-Reference: Signed-off-by: H. Peter Anvin commit d868080d2a1c95526cb01e3d0c14096721cbb87a Author: Alex Chiang Date: Thu Feb 25 14:09:52 2010 -0700 [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI The following commit broke the ia64 sim_defconfig build: 3b2b84c0b81108a9a869a88bf2beeb5a95d81dd1 ACPI: processor: driver doesn't need to evaluate _PDC This is because it added: +#include To arch/ia64/kernel/acpi.c. Unfortunately, the ia64_simdefconfig does not turn on CONFIG_ACPI, and we get build errors. The fix described in $subject seems to be the most sensible way to untangle the mess. The other issue is that acpi_get_sysname() is required for all configs, most of which define CONFIG_ACPI, but are not CONFIG_IA64_GENERIC. Turn it into an inline to cover the "non generic" ia64 configs; to prevent a duplicate definition build error, we need to wrap the definition in acpi.o inside an #ifdef. Finally, move the pm_idle and pm_power_off exports into process.c (which is always built), similar to other architectures, and allow the sim defconfig to link. Signed-off-by: Alex Chiang Signed-off-by: Tony Luck commit 7b97f3edf35fdb41e507e5711ac1d6221cf7abf2 Author: Sriram Date: Thu Feb 25 10:45:49 2010 +0000 AM3517 EVM: correct typo - tca6416 mispelt as tca6516 Correct instances where tca6416 is misspelt as tca6516 in the board-am3517evm file. Signed-off-by: Sriramakrishnan Signed-off-by: Tony Lindgren commit 6d20ca78b64d5ccd867295a33aa2c38bddf38533 Author: Sriram Date: Thu Feb 25 10:45:48 2010 +0000 AM3517 EVM: Enable I2C support There are multiple devices connected to I2C bus on AM3517EVM (for instance audio codec, IO expander etc). Enable I2C support in the default kernel configuration for AM3517 EVM. Signed-off-by: Sriramakrishnan Signed-off-by: Tony Lindgren commit 13fc638289b2cf62f5b05e3b90f476619b17ab6b Author: Ajay Kumar Gupta Date: Mon Feb 22 10:21:13 2010 +0000 AM35x: Enable OMAP_MUX in defconfig Enabling OMAP_MUX in defconfig as it is required for EHCI to work. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Tony Lindgren commit fec3eebdce2c8fe10004d161aa51ce22c668115b Author: Ajay Kumar Gupta Date: Mon Feb 22 10:21:12 2010 +0000 AM35x: Add missing GPIO mux config for EHCI port Adding GPIO mux config used for PHY reset of EHCI port on base board. We get below failure message without this patch, "hub 1-0:1.0: unable to enumerate USB device on port 1" Signed-off-by: Ajay Kumar Gupta Signed-off-by: Tony Lindgren commit 93bfc85b2361dec0d2b8b93311ce482957e34f5b Author: manjugk manjugk Date: Fri Feb 19 12:09:16 2010 +0000 Zoom3: Defconfig update Some of the features are not enabled by default in zoom3 defconfig. This patch enables: - MMC Resume - TWL4030 RTC driver - Debug File system Build and boot tested on Zoom3 board. Signed-off-by: Manjunatha GK Signed-off-by: Tony Lindgren commit 9833eff3d7db76d2d04f28567ed8704d69e225ae Author: Jarkko Nikula Date: Mon Feb 22 20:29:36 2010 +0000 omap: i2c: Fix muxing for command line enabled bus The commit b63128e81214cc2db2995d690438055c26d213a5 broke the pin muxing for I2C busses that are enabled from the kernel command line. Fix this by defining the board registration function omap_register_i2c_bus in common platform code as it was before but keep the muxing in architecture dependent files. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit b6d97026561a6ed6eed58428633a6bb4e1b78c57 Merge: 1954ee5 3cebbb8 Author: Linus Torvalds Date: Thu Feb 25 14:44:33 2010 -0800 Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig: kconfig: Simplify LSMOD= handling kconfig: Add LSMOD=file to override the lsmod for localmodconfig kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl kconfig: Check for if conditions in Kconfig for localmodconfig kconfig: Create include/generated for localmodconfig commit 1954ee55605a75c91924b63c2584f4d53f11afc7 Merge: a85821f 7b76bfc Author: Linus Torvalds Date: Thu Feb 25 14:43:57 2010 -0800 Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig: kconfig: simplification of scripts/extract-ikconfig commit a85821fce2c100a6680511f9693b76f9717fbdee Merge: 10df38c 14ef2b0 Author: Linus Torvalds Date: Thu Feb 25 14:42:39 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (41 commits) HID: usbhid: initialize interface pointers early enough HID: extend mask for BUTTON usage page HID: hid-ntrig: Single touch mode tap HID: hid-ntrig: multitouch cleanup and fix HID: n-trig: remove unnecessary tool switching HID: hid-ntrig add multi input quirk and clean up HID: usbhid: introduce timeout for stuck ctrl/out URBs HID: magicmouse: coding style and probe failure fixes HID: remove MODULE_VERSION from new drivers HID: fix up Kconfig entry for MagicMouse HID: add a device driver for the Apple Magic Mouse. HID: Export hid_register_report HID: Support for MosArt multitouch panel HID: add pressure support for the Stantum multitouch panel HID: fixed bug in single-touch emulation on the stantum panel HID: fix typo in error message HID: add mapping for "AL Network Chat" usage HID: use multi input quirk for TouchPack touchscreen HID: make full-fledged hid-bus drivers properly selectable HID: make Wacom modesetting failures non-fatal ... commit 722a639fd2cec44501c04ae32af57fd822c5a2d5 Author: Yinghai Lu Date: Wed Feb 24 12:39:37 2010 -0800 x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n If we don't have any Moorestown CPU support compiled in, we don't need the Moorestown PCI support either. Signed-off-by: Yinghai Lu LKML-Reference: <4B858E89.7040807@kernel.org> Signed-off-by: H. Peter Anvin commit 1fcdc7c527010b144d3951f9ce25faedf264933c Author: Tetsuo Handa Date: Thu Feb 25 17:19:25 2010 +0900 TOMOYO: Protect find_task_by_vpid() with RCU. Holding tasklist_lock is no longer sufficient for find_task_by_vpid(). Explicit rcu_read_lock() is required. Signed-off-by: Tetsuo Handa -- security/tomoyo/common.c | 4 ++++ 1 file changed, 4 insertions(+) Signed-off-by: James Morris commit 9f33be2c3a80bdc2cc08342dd77fac87652e0548 Merge: 2741ecb eed18b5 Author: Russell King Date: Thu Feb 25 22:10:38 2010 +0000 Merge branches 'clks' and 'pnx' into devel commit 2741ecb4ce5c2d430b5c44b0a169038338c21df5 Merge: bc85e58 5de813b Author: Russell King Date: Thu Feb 25 22:09:41 2010 +0000 Merge branch 'misc2' into devel commit bc85e585c6d0fab4bde12d60964b2f25802c3163 Merge: 186f93e 796d129 Author: Russell King Date: Thu Feb 25 22:09:22 2010 +0000 Merge branch 'perf' into devel Conflicts: arch/arm/Kconfig commit 7b4884ca8853a638df0eb5d251d80d67777b8b1a Author: Dominik Brodowski Date: Wed Feb 17 16:25:53 2010 +0100 pcmcia: validate late-added resources Currently, only those mem resources are validated which are already registered at the time the first PCMCIA card is inserted. As we can only validate resources immediately after card insert, store "registered" mem resources in mem_db, and only upon validation move them to mem_db_valid. When allocationg mem resources, mem_db_valid is then preferred to mem_db. Signed-off-by: Dominik Brodowski commit 186f93ea1f274f4cde4a356401c1786c818ff881 Merge: 3560adf 4e6d488 Author: Russell King Date: Thu Feb 25 22:07:25 2010 +0000 Merge branch 'tmpreg' into devel Conflicts: arch/arm/Kconfig arch/arm/mach-ux500/include/mach/debug-macro.S commit 3560adf62075829393743667ff338dd8fd26a5c2 Merge: c9a8fdd 2ef7f3d 2725898 1587a37 e00d9d4 6d636c6 2ffe2da cd71f8f ae14020 Author: Russell King Date: Thu Feb 25 22:06:43 2010 +0000 Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel commit 2a2d10f386c1bacabe1a530c06dc8488eac419e5 Merge: 2f68ffd c499546 Author: Russell King Date: Thu Feb 25 20:41:34 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable commit e80a52d14f868059e8ec790c9fae88cdb8a1df98 Author: Sage Weil Date: Thu Feb 25 12:40:45 2010 -0800 ceph: fix connection fault STANDBY check Move any out_sent messages to out_queue _before_ checking if out_queue is empty and going to STANDBY, or else we may drop something that was never acked. And clean up the code a bit (less goto). Signed-off-by: Sage Weil commit 161fd65ac934608345aed35226fc889ea3b0b500 Author: Sage Weil Date: Thu Feb 25 12:38:57 2010 -0800 ceph: invalidate_authorizer without con->mutex held This fixes lock ABBA inversion, as the ->invalidate_authorizer() op may need to take a lock (or even call back into the messenger). Signed-off-by: Sage Weil commit 6335e4d56681f6f08f24f4b812a72d402793d393 Author: Matthew Garrett Date: Thu Feb 25 15:20:54 2010 -0500 toshiba_acpi: Add full hotkey support Calling the ENAB method on Toshiba laptops results in notifications being sent when laptop hotkeys are pressed. This patch simply calls that method and sets up an input device if it's successful. Signed-off-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5de813b6cd06460b337f9da9afe316823cf3ef45 Author: Russell King Date: Thu Feb 25 12:14:40 2010 +0000 ARM: Eliminate decompressor -Dstatic= PIC hack We used to build decompressors with -Dstatic= to avoid any local data being generated. The problem is that local data generates GOTOFF relocations, which means we can't relocate the data relative to the text segment. Global data, on the other hand, goes through the GOT, and can be relocated anywhere. Unfortunately, with the new decompressors, this presents a problem since they declare static data within functions, and this leads to stack overflow. Fix this by separating out the decompressor code into a separate file, and removing 'static' from BSS data in misc.c. Also, discard the .data section - this means that should we end up with read/write initialized data, the decompressor will fail to link and the problem will be obvious. Acked-by: Nicolas Pitre Signed-off-by: Russell King commit a0b62329bb290c10d7278809af910ed115768991 Merge: d62abe5 b4e82b5 Author: Takashi Iwai Date: Thu Feb 25 19:44:00 2010 +0100 Merge branch 'for-2.6.34' of git://opensource.wolfsonmicro.com/linux-2.6-asoc into topic/asoc commit 09124e1913cf2140941f60ab4fdf8576e1e8fd8d Author: Chien Tung Date: Tue Feb 23 17:52:10 2010 +0000 RDMA/nes: Add support for KR device id 0x0110 Add support for KR device id 0x0110. While at it, cleanup nes_init_phy() by splitting it into nes_init_1g_phy() and nes_init_2025_phy(). Remove support for NES_PHY_TYPE_IRIS, which was used on an XFP board that was only manufactured in small quantities and given out for evals in even smaller quantities. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit a92d152ef9dd89c578ca2ec7118e9de8fb74a75f Author: Pan, Jacob jun Date: Wed Feb 24 16:59:55 2010 -0800 x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI The NUMAQ initialization sets x86_init.pci.init to pci_numaq_init, which obviously isn't defined if CONFIG_PCI isn't defined. This dependency was implicit in the past, because pci_numaq_init was invoked from arch/x86/pci/legacy.c, which itself was conditioned on CONFIG_PCI. I suspect that no NUMA-Q machines without PCI were ever built, so instead of complicating the code by adding #ifdefs or stub functions, just disable this bit of the configuration space. [ hpa: rewrote the checkin comment ] Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A321EE1F@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit caeacf59af3d114a3121bb04f8057109bbf289ea Author: Matthew Garrett Date: Wed Feb 17 10:29:39 2010 -0500 hp-wmi: Add support for tablet rotation key The HP touchsmart tablet has a key for rotating the UI from landscape to portrait. Add support for it. Signed-off-by: Matthew Garrett commit cb6a7937f4328a267e0806680ade500ed2c3c01a Author: Erik Andren Date: Sun Feb 14 11:53:23 2010 -0500 dell-laptop: Add another Dell laptop to the DMI whitelist The Latitude C640 has another variation of dell in its DMI vendor entry. Add it to the whitelist in order to enjoy the sweet fruits of software backlight toggling. Signed-off-by: Erik Andren commit 02e77a55f7b7e36888e39c62439fedb90ae4e808 Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 9 17:37:27 2010 -0500 classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases Instead of a MODULE_DEVICE_TABLE for every acpi_driver ids table, we create a table containing all ids to export to get a module alias for each one. This will fix automatic loading of the driver when one of the ACPI devices is not present (like the accelerometer, which is not present in some models). Signed-off-by: Thadeu Lima de Souza Cascardo commit c6760ac4268b6dbe03d74e5faef35bc862a82542 Author: Matthew Garrett Date: Wed Feb 10 14:44:03 2010 -0500 dell-laptop: Pay attention to which devices the hardware switch controls Right now, we assume that the hardware rfkill switch on Dells toggles all radio devices. In fact, this can be configured in the BIOS and so right now we may mark a device as hardware killed even when it isn't. Add code to query the devices controlled by the switch, and use this when determining the hardware kill state of a radio. Signed-off-by: Matthew Garrett commit 116ee77b2858d9c89c0327f3a47c8ba864bf4a96 Author: Stuart Hayes Date: Wed Feb 10 14:12:13 2010 -0500 dell-laptop: Use buffer with 32-bit physical address Calls to communicate with system firmware via a SMI (using dcdbas) need to use a buffer that has a physical address of 4GB or less. Currently the dell-laptop driver does not guarantee this, and when the buffer address is higher than 4GB, the address is truncated to 32 bits and the SMI handler writes to the wrong memory address. Signed-off-by: Stuart Hayes Acked-by: Matthew Garrett commit e5fefd0c8c4e6bd11742625230d1c5026e2afb35 Author: Mario Limonciello Date: Tue Feb 9 17:41:03 2010 -0500 dell-laptop: Blacklist machines not supporting dell-laptop The Mini family doesn't support smbios 17,11 although it reports it does. Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner commit ec1722a21491e4c354bc3bbc704fef9a8fa811fb Author: Mario Limonciello Date: Tue Feb 9 14:11:05 2010 -0500 dell-laptop: Block software state changes when rfkill hard blocked The "hardware" switch is tied directly to a BIOS interface that will connect and disconnect the hardware from the bus. If you use the software interface to request the BIOS to make these changes, the HW switch will be in an inconsistent state and LEDs may not reflect the state of the HW. Signed-off-by: Mario Limonciello commit e551260b233e8dcbdc9d5f238ad4aa1200dc2ea7 Author: Matthew Garrett Date: Tue Feb 9 14:05:01 2010 -0500 dell-laptop: Fix small memory leak da_tokens was not being freed by dell-laptop on unload. Fix that. Signed-off-by: Matthew Garrett commit facd61d7b70d9c061f08e0b76976f7f833888a70 Author: Matthew Garrett Date: Tue Feb 9 14:03:04 2010 -0500 dell-laptop: Fix platform device unregistration dell-laptop currently fails to clean up its platform device correctly. Make sure that it's unregistered. Signed-off-by: Matthew Garrett commit 814cb8adbe2fb49302ac65bc31fa749143823860 Author: Matthew Garrett Date: Wed Dec 9 18:23:36 2009 +0000 dell-laptop: Update rfkill state on kill switch The rfkill interface on Dells only sends a notification that the switch has been changed via the keyboard controller. Add a filter so we can pick these notifications up and update the rfkill state appropriately. Signed-off-by: Matthew Garrett commit 493e91433e966a50964e221db92756eeb90dd54e Author: Mario Limonciello Date: Tue Aug 25 10:30:13 2009 -0500 compal-laptop: Replace sysfs support with rfkill support This drops the support for manually groking the files in sysfs to turn on and off the WLAN and BT for Compal laptops in favor of platform rfkill support. It has been combined into a single patch to not introduce regressions in the process of simply adding rfkill support Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner Signed-off-by: Matthew Garrett Cc: Cezary Jackiewicz commit 34325b9d2a7d36e2ba74a6652f2e3e8d57dfb145 Author: Mario Limonciello Date: Mon Aug 24 16:00:47 2009 -0500 compal-laptop: Add support for known Compal made Dell laptops The following Dell laptops are known to have been manufacturer by Compal and are supported by the compal-laptop platform driver - Mini 9 - Mini 10 - Mini 12 - Mini 10v - Inspiron 11z Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner Signed-off-by: Matthew Garrett Cc: Cezary Jackiewicz commit d094485323a1f2abc7e4665700d6036de36fdaef Author: Matthew Garrett Date: Thu Feb 11 10:40:13 2010 -0500 MAINTAINERS: update drivers/platform/x86 information Many of the drivers/platform/x86 drivers have nothing to do with ACPI, so it's kind of inappropriate for them to be stuck under the ACPI mailing list. Add a new mailing list (platform-driver-x86@vger.kernel.org) and, with Len's blessing, add myself as subsystem maintainer. Signed-off-by: Matthew Garrett Cc: Anisse Astier Cc: Carlos Corbacho Cc: Cezary Jackiewicz Cc: Corentin Chary Cc: Daniel Oliveira Nascimento Cc: Harald Welte Cc: Henrique de Moraes Holschuh Cc: Herton Ronaldo Krzesinski Cc: Jonathan Woithe Cc: Karol Kozimor Cc: Len Brown Cc: Lennart Poettering Cc: Mattia Dongili Cc: Peter Feuerer Cc: Sujith Thomas Cc: Thadeu Lima de Souza Cascardo commit 2a9c8c36092de41c13fdd81fe59556915b080c3e Author: Masami Hiramatsu Date: Thu Feb 25 08:36:12 2010 -0500 perf probe: Add lazy line matching support Add lazy line matching support for specifying new probes. This also changes the syntax of perf probe a bit. Now perf probe accepts one of below probe event definitions. 1) Define event based on function name [EVENT=]FUNC[@SRC][:RLN|+OFF|%return|;PTN] [ARG ...] 2) Define event based on source file with line number [EVENT=]SRC:ALN [ARG ...] 3) Define event based on source file with lazy pattern [EVENT=]SRC;PTN [ARG ...] - New lazy matching pattern(PTN) follows ';' (semicolon). And it must be put the end of the definition. - So, @SRC is no longer the part which must be put at the end of the definition. Note that ';' (semicolon) can be interpreted as the end of a command by the shell. This means that you need to quote it. (anyway you will need to quote the lazy pattern itself too, because it may contains other sensitive characters, like '[',']' etc.). Lazy matching ------------- The lazy line matching is similar to glob matching except ignoring spaces in both of pattern and target. e.g. 'a=*' can matches 'a=b', 'a = b', 'a == b' and so on. This provides some sort of flexibility and robustness to probe point definitions against minor code changes. (for example, actual 10th line of schedule() can be changed easily by modifying schedule(), but the same line matching 'rq=cpu_rq*' may still exist.) Changes in v3: - Cast Dwarf_Addr to uintmax_t for printf-formats. Changes in v2: - Cast Dwarf_Addr to unsigned long long for printf-formats. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133611.6725.45078.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 5c8d1cbbbed39dcab2ecf429d6e56ea548c0fda4 Author: Masami Hiramatsu Date: Thu Feb 25 08:36:04 2010 -0500 perf probe: Show more lines after last line Show 2 more lines after the last probe-able line. This will clearly show the last closed-brace of inline functions. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133604.6725.76820.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 161a26b0c231b5d2e60e9c132fa360cd9dac4720 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:57 2010 -0500 perf probe: Check function address range strictly in line finder Check (inlined) function address range strictly for improving output of probe-able lines of inline functions. Without this change, perf probe --line sometimes showed other inline function bodies too, because it didn't filter out inlined functions. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Ulrich Drepper Cc: Roland McGrath Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133557.6725.20697.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit e92b85e1ffaa0bd8e5d92e7c378a3909e7f23122 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:50 2010 -0500 perf probe: Use libdw callback routines Use libdw callback functions aggressively, and remove local tree-search API. This change simplifies the code. Changes in v3: - Cast Dwarf_Addr to uintmax_t for printf-formats. Changes in v2: - Cast Dwarf_Addr to unsigned long long for printf-formats. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Ulrich Drepper Cc: Roland McGrath Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133549.6725.81499.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 804b36068eccd8163ccea420c662fb5d1a21b141 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:42 2010 -0500 perf probe: Use elfutils-libdw for analyzing debuginfo Newer gcc introduces newer & richer debuginfo, and only libdw in elfutils project can support it. So perf probe moves onto elfutils-libdw from libdwarf. Changes in v3: - Cast Dwarf_Addr/Dwarf_Word to uintmax_t for printf-formats. - Recover a sign-prefix which was removed in v2 by mistake. Changes in v2: - Fix a type-casting bug in Makefile. - Cast Dwarf_Addr/Dwarf_Word to unsigned long long for printf-formats. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Ulrich Drepper Cc: Roland McGrath Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133542.6725.34724.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 81cb8aa327b5923b38eccc795c8b7170be20b9ff Author: Masami Hiramatsu Date: Thu Feb 25 08:35:34 2010 -0500 perf probe: Rename probe finder functions Rename *_probepoint to *_probe_point, for nothing but a cosmetic reason. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133534.6725.52615.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 3cb8bc6ac95ff86147d11ee1d36d18e1ddf3637c Author: Masami Hiramatsu Date: Thu Feb 25 08:35:27 2010 -0500 perf probe: Fix bugs in line range finder Fix find_line_range_by_line() to init line_list and remove misconseptional found marking which should be done when real lines are found (if there is no lines probe-able, find_line_range() should return 0). Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133527.6725.52418.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit ee391de876ae4272926b8632be04ed4a460321e3 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:19 2010 -0500 perf probe: Update perf probe document Update perf-probe.txt to suit to current perf-probe command and add some examples. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133519.6725.58816.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit f3ab481ca6ffe5e272c8501317bea726f9a83959 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:12 2010 -0500 perf probe: Do not show --line option without dwarf support Do not show --line option in help message when perf doesn't support dwarf. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133512.6725.88423.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit b26486bf75148ab7b776c6a532a9bad33f987a38 Author: Masami Hiramatsu Date: Thu Feb 25 08:35:04 2010 -0500 kprobes: Add documents of jump optimization Add documentations about kprobe jump optimization to Documentation/kprobes.txt. Changes in v10: - Editorial fixups by Jim Keniston. Changes in v8: - Update documentation and benchmark results. Signed-off-by: Masami Hiramatsu Signed-off-by: Jim Keniston Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133504.6725.79395.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit c0f7ac3a9edde786bc129d37627953a8b8abefdf Author: Masami Hiramatsu Date: Thu Feb 25 08:34:46 2010 -0500 kprobes/x86: Support kprobes jump optimization on x86 Introduce x86 arch-specific optimization code, which supports both of x86-32 and x86-64. This code also supports safety checking, which decodes whole of a function in which probe is inserted, and checks following conditions before optimization: - The optimized instructions which will be replaced by a jump instruction don't straddle the function boundary. - There is no indirect jump instruction, because it will jumps into the address range which is replaced by jump operand. - There is no jump/loop instruction which jumps into the address range which is replaced by jump operand. - Don't optimize kprobes if it is in functions into which fixup code will jumps. This uses text_poke_multibyte() which doesn't support modifying code on NMI/MCE handler. However, since kprobes itself doesn't support NMI/MCE code probing, it's not a problem. Changes in v9: - Use *_text_reserved() for checking the probe can be optimized. - Verify jump address range is in 2G range when preparing slot. - Backup original code when switching optimized buffer, instead of preparing buffer, because there can be int3 of other probes in preparing phase. - Check kprobe is disabled in arch_check_optimized_kprobe(). - Strictly check indirect jump opcodes (ff /4, ff /5). Changes in v6: - Split stop_machine-based jump patching code. - Update comments and coding style. Changes in v5: - Introduce stop_machine-based jump replacing. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133446.6725.78994.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 3d55cc8a058ee96291d6d45b1e35121b9920eca3 Author: Masami Hiramatsu Date: Thu Feb 25 08:34:38 2010 -0500 x86: Add text_poke_smp for SMP cross modifying code Add generic text_poke_smp for SMP which uses stop_machine() to synchronize modifying code. This stop_machine() method is officially described at "7.1.3 Handling Self- and Cross-Modifying Code" on the intel's software developer's manual 3A. Since stop_machine() can't protect code against NMI/MCE, this function can not modify those handlers. And also, this function is basically for modifying multibyte-single-instruction. For modifying multibyte-multi-instructions, we need another special trap & detour code. This code originaly comes from immediate values with stop_machine() version. Thanks Jason and Mathieu! Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Mathieu Desnoyers Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133438.6725.80273.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit f007ea2685692bafb386820144cf73a14016fc7c Author: Masami Hiramatsu Date: Thu Feb 25 08:34:30 2010 -0500 kprobes/x86: Cleanup save/restore registers Introduce SAVE/RESOTRE_REGS_STRING for cleanup kretprobe-trampoline asm code. These macros will be used for emulating interruption. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133430.6725.83342.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 0f94eb634ef7af736dee5639aac1c2fe9635d089 Author: Masami Hiramatsu Date: Thu Feb 25 08:34:23 2010 -0500 kprobes/x86: Boost probes when reentering Integrate prepare_singlestep() into setup_singlestep() to boost up reenter probes, if possible. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133423.6725.12071.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit b2be84df99ebc93599c69e931a3c4a5105abfabc Author: Masami Hiramatsu Date: Thu Feb 25 08:34:15 2010 -0500 kprobes: Jump optimization sysctl interface Add /proc/sys/debug/kprobes-optimization sysctl which enables and disables kprobes jump optimization on the fly for debugging. Changes in v7: - Remove ctl_name = CTL_UNNUMBERED for upstream compatibility. Changes in v6: - Update comments and coding style. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133415.6725.8274.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit afd66255b9a48f5851326ddae50e2203fbf71dc9 Author: Masami Hiramatsu Date: Thu Feb 25 08:34:07 2010 -0500 kprobes: Introduce kprobes jump optimization Introduce kprobes jump optimization arch-independent parts. Kprobes uses breakpoint instruction for interrupting execution flow, on some architectures, it can be replaced by a jump instruction and interruption emulation code. This gains kprobs' performance drastically. To enable this feature, set CONFIG_OPTPROBES=y (default y if the arch supports OPTPROBE). Changes in v9: - Fix a bug to optimize probe when enabling. - Check nearby probes can be optimize/unoptimize when disarming/arming kprobes, instead of registering/unregistering. This will help kprobe-tracer because most of probes on it are usually disabled. Changes in v6: - Cleanup coding style for readability. - Add comments around get/put_online_cpus(). Changes in v5: - Use get_online_cpus()/put_online_cpus() for avoiding text_mutex deadlock. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133407.6725.81992.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 4610ee1d3638fa05ba8e87ccfa971db8e4033ae7 Author: Masami Hiramatsu Date: Thu Feb 25 08:33:59 2010 -0500 kprobes: Introduce generic insn_slot framework Make insn_slot framework support various size slots. Current insn_slot just supports one-size instruction buffer slot. However, kprobes jump optimization needs larger size buffers. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133358.6725.82430.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers commit d498f763950703c724c650db1d34a1c8679f9ca8 Author: Masami Hiramatsu Date: Thu Feb 25 08:33:49 2010 -0500 kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE Change RELATIVEJUMP_INSTRUCTION macro to RELATIVEJUMP_OPCODE since it represents just the opcode byte. Signed-off-by: Masami Hiramatsu Acked-by: Mathieu Desnoyers Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Srikar Dronamraju Cc: Christoph Hellwig Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Anders Kaseorg Cc: Tim Abbott Cc: Andi Kleen Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli LKML-Reference: <20100225133349.6725.99302.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 14ef2b0c026558d37662e5e095d59c64597d5769 Merge: 57ab12e 71b38bd Author: Jiri Kosina Date: Thu Feb 25 17:39:16 2010 +0100 Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus Conflicts: drivers/hid/Kconfig commit 628ada0cb03666dd463f7c25947eaccdf440c309 Author: Arnaldo Carvalho de Melo Date: Thu Feb 25 12:57:40 2010 -0300 perf annotate: Defer allocating sym_priv->hist array Because symbol->end is not fixed up at symbol_filter time, only after all symbols for a DSO are loaded, and that, for asm symbols, may be bogus, causing segfaults when hits happen in these symbols. Reported-by: David Miller Reported-by: Anton Blanchard Acked-by: David Miller Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: # for .33.x. Does not apply cleanly, needs backport. LKML-Reference: <20100225155740.GB8553@ghostprotocols.net> Signed-off-by: Ingo Molnar commit bb8d41330ce27edb91adb6922d3f8e1a8923f727 Author: Thomas Gleixner Date: Thu Feb 25 16:42:11 2010 +0100 x86/PCI: Prevent mmconfig memory corruption commit ff097ddd4 (x86/PCI: MMCONFIG: manage pci_mmcfg_region as a list, not a table) introduced a nasty memory corruption when pci_mmcfg_list is empty. pci_mmcfg_check_end_bus_number() dereferences pci_mmcfg_list.prev even when the list is empty. The following write hits some variable near to pci_mmcfg_list. Further down a similar problem exists, where cfg->list.next is dereferenced unconditionally and a comparison with some variable near to pci_mmcfg_list happens. Add a check for the last element into the for_each_entry() loop and remove all the other crappy logic which is just a leftover of the old array based code which was replaced by the list conversion. Reported-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Bjorn Helgaas Cc: Yinghai Lu Cc: stable@kernel.org Signed-off-by: Jesse Barnes commit 53055aae2048214cbec1f5f7f8846f9dff12b2bc Author: Tomi Valkeinen Date: Thu Feb 25 11:38:13 2010 +0200 OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper Add dsi_vc_dcs_read_2() helper function to read two bytes from the DSI peripheral. Signed-off-by: Tomi Valkeinen commit 7b60997f73865b019e595720185c85285ca3df9a Author: Wenji Huang Date: Wed Feb 24 15:40:26 2010 +0800 tracing: Simplify memory recycle of trace_define_field Discard freeing field->type since it is not necessary. Reviewed-by: Li Zefan Signed-off-by: Wenji Huang LKML-Reference: <1266997226-6833-5-git-send-email-wenji.huang@oracle.com> Signed-off-by: Steven Rostedt commit c85f3a91f84d5a85f179c2504bb7a39370c82b41 Author: Wenji Huang Date: Wed Feb 24 15:40:24 2010 +0800 tracing: Remove unnecessary variable in print_graph_return The "cpu" variable is declared at the start of the function and also within a branch, with the exact same initialization. Remove the local variable of the same name in the branch. Signed-off-by: Wenji Huang LKML-Reference: <1266997226-6833-3-git-send-email-wenji.huang@oracle.com> Signed-off-by: Steven Rostedt commit a5efd925115cbc1f90195dca9a25f7b8daa10c37 Author: Wenji Huang Date: Wed Feb 24 15:40:23 2010 +0800 tracing: Fix typo of info text in trace_kprobe.c Signed-off-by: Wenji Huang LKML-Reference: <1266997226-6833-2-git-send-email-wenji.huang@oracle.com> Signed-off-by: Steven Rostedt commit 6574658b3bc7c408581629de5efb809f125cce8c Author: Wenji Huang Date: Wed Feb 24 15:40:22 2010 +0800 tracing: Fix typo in prof_sysexit_enable() Signed-off-by: Wenji Huang LKML-Reference: <1266997226-6833-1-git-send-email-wenji.huang@oracle.com> Signed-off-by: Steven Rostedt commit 1ab83a89411556c4d5914dcf0d5da190178ae7db Author: Li Zefan Date: Wed Feb 24 15:28:14 2010 +0800 tracing: Remove CONFIG_TRACE_POWER from kernel config The power tracer has been converted to power trace events. Acked-by: Frederic Weisbecker Signed-off-by: Li Zefan LKML-Reference: <4B84D50E.4070806@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit b4e82b5b785670b68136765059d1afc65c0ae023 Author: Mark Brown Date: Thu Feb 25 12:52:10 2010 +0000 ASoC: Check progress when reporting periods from i.MX FIQ handler Currently the i.MX FIQ handler is reporting periods as elapsed based purely on a timer running in the CPU. This means that any clock mismatch between the CPU and the audio subsystem can result in the status reported to applications drifting away from the actual status of the hardware. This is particularly likely at present since the SSI driver is only capable of operating in slave mode so it's very likely that the interface will be clocked from a different source. Instead check the offset reported by the FIQ and only notify when we have transferred at least one period, re-firing the timer if we didn't do so. Also factor out the calculation of the timer expiry time for make it a bit easier to experiment with. Note that this only improves the situation, problems can still be triggered. Signed-off-by: Mark Brown Acked-by: Sascha Hauer Acked-by: Liam Girdwood commit 9e4a10d27e89f780539e08abd2b051cb83635dfa Author: Mark Brown Date: Thu Feb 25 12:52:09 2010 +0000 ASoC: Remove a unused variables from i.MX FIQ runtime data Signed-off-by: Mark Brown Acked-by: Sascha Hauer Acked-by: Liam Girdwood commit 10df38cafc87ef38870154d1b9b1ea2435e69287 Merge: dbd0042 c610028 Author: Linus Torvalds Date: Thu Feb 25 07:22:59 2010 -0800 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: (44 commits) Add MAINTAINERS entry for virtio_console virtio: console: Fill ports' entire in_vq with buffers virtio: console: Error out if we can't allocate buffers for control queue virtio: console: Add ability to remove module virtio: console: Ensure no memleaks in case of unused buffers virtio: console: show error message if hvc_alloc fails for console ports virtio: console: Add debugfs files for each port to expose debug info virtio: console: Add ability to hot-unplug ports virtio: console: Handle port hot-plug virtio: console: Remove cached data on port close virtio: console: Register with sysfs and create a 'name' attribute for ports virtio: console: Ensure only one process can have a port open at a time virtio: console: Add file operations to ports for open/read/write/poll virtio: console: Associate each port with a char device virtio: console: Prepare for writing to userspace buffers virtio: console: Add a new MULTIPORT feature, support for generic ports virtio: console: Introduce a send_buf function for a common path for sending data to host virtio: console: Introduce function to hand off data from host to readers virtio: console: Separate out find_vqs operation into a different function virtio: console: Separate out console init into a new function ... commit dbd004291ed31db280a3f2d7a1113a04e5e85af4 Merge: 7491612 c36f74e Author: Linus Torvalds Date: Thu Feb 25 07:09:54 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: netlabel: fix export of SELinux categories > 127 commit 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5 Author: Jeff Mahoney Date: Wed Feb 24 13:59:23 2010 -0500 tracing: Fix ftrace_event_call alignment for use with gcc 4.5 GCC 4.5 introduces behavior that forces the alignment of structures to use the largest possible value. The default value is 32 bytes, so if some structures are defined with a 4-byte alignment and others aren't declared with an alignment constraint at all - it will align at 32-bytes. For things like the ftrace events, this results in a non-standard array. When initializing the ftrace subsystem, we traverse the _ftrace_events section and call the initialization callback for each event. When the structures are misaligned, we could be treating another part of the structure (or the zeroed out space between them) as a function pointer. This patch forces the alignment for all the ftrace_event_call structures to 4 bytes. Without this patch, the kernel fails to boot very early when built with gcc 4.5. It's trivial to check the alignment of the members of the array, so it might be worthwhile to add something to the build system to do that automatically. Unfortunately, that only covers this case. I've asked one of the gcc developers about adding a warning when this condition is seen. Cc: stable@kernel.org Signed-off-by: Jeff Mahoney LKML-Reference: <4B85770B.6010901@suse.com> Signed-off-by: Steven Rostedt commit 0c54dd341fb701928b8e5dca91ced1870c55b05b Author: Steven Rostedt Date: Thu Feb 25 08:42:06 2010 -0500 ftrace: Remove memory barriers from NMI code when not needed The code in stop_machine that modifies the kernel text has a bit of logic to handle the case of NMIs. stop_machine does not prevent NMIs from executing, and if an NMI were to trigger on another CPU as the modifying CPU is changing the NMI text, a GPF could result. To prevent the GPF, the NMI calls ftrace_nmi_enter() which may modify the code first, then any other NMIs will just change the text to the same content which will do no harm. The code that stop_machine called must wait for NMIs to finish while it changes each location in the kernel. That code may also change the text to what the NMI changed it to. The key is that the text will never change content while another CPU is executing it. To make the above work, the call to ftrace_nmi_enter() must also do a smp_mb() as well as atomic_inc(). But for applications like perf that require a high number of NMIs for profiling, this can have a dramatic effect on the system. Not only is it doing a full memory barrier on both nmi_enter() as well as nmi_exit() it is also modifying a global variable with an atomic operation. This kills performance on large SMP machines. Since the memory barriers are only needed when ftrace is in the process of modifying the text (which is seldom), this patch adds a "modifying_code" variable that gets set before stop machine is executed and cleared afterwards. The NMIs will check this variable and store it in a per CPU "save_modifying_code" variable that it will use to check if it needs to do the memory barriers and atomic dec on NMI exit. Acked-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 Author: Dan Carpenter Date: Tue Feb 23 15:04:23 2010 +0300 uwb: remove duplicate cpu_to_le16() These parameters should be passed as cpu endian because we change it to little endian inside usb_control_msg(). On x86 cpu_to_le16() doesn't do anything so either way works but I think the original code would break on big endian systems. I removed the masks as well because that usb_control_msg() parameters are __u16 so we already only use the lower bits. Signed-off-by: Dan Carpenter Signed-off-by: David Vrabel commit 03806fa20f6a081493a731a4b18ea66317f9f947 Merge: 35fb2a8 baac35c Author: David Vrabel Date: Thu Feb 25 13:35:22 2010 +0000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream commit 9b1489e989695c4d502865f8bec616c0f17e99ab Merge: bac3fcf 08268b7 Author: Uwe Kleine-König Date: Thu Feb 25 14:01:49 2010 +0100 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd8902717b66f940357257d8ad76114d9f2. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32 and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad565c9bbceeed8b607f140c29df97355, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König commit 3846df2e0a99a2bf10023de0e9c1496592012d4c Author: Arnaldo Carvalho de Melo Date: Mon Feb 22 16:15:39 2010 -0300 perf symbols: Improve debugging information about symtab origins Be more clear about DSO long names and tell from which file kernel symbols were obtained, all in --verbose mode: [root@mica ~]# perf report -v > /dev/null Looking at the vmlinux_path (5 entries long) Using /lib/modules/2.6.33-rc8-tip-00777-g0918527-dirty/build/vmlinux for symbols [root@mica ~]# mv /lib/modules/2.6.33-rc8-tip-00777-g0918527-dirty/build/vmlinux /tmp/dd [root@mica ~]# perf report -v > /dev/null Looking at the vmlinux_path (5 entries long) Using /proc/kallsyms for symbols [root@mica ~]# Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1266866139-6361-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit c7ad21af2c8b7accb893a576b100296c61c5d610 Author: Arnaldo Carvalho de Melo Date: Mon Feb 22 16:14:22 2010 -0300 perf top: Use a macro instead of a constant variable To overcome a silly gcc warning: cc1: warnings being treated as errors builtin-top.c: In function ‘lookup_sym_source’: builtin-top.c:291: warning: not protecting local variables: variable length buffer make: *** [builtin-top.o] Error 1 make: *** Waiting for unfinished jobs.... That is emitted for this: const size_t pattern_len = BITS_PER_LONG / 4 + 2; char pattern[pattern_len + 1]; Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1266866062-6287-1-git-send-email-acme@infradead.org> [ -v2: macroify the naming style ] Signed-off-by: Ingo Molnar commit 37fe5fcb7a5b5235c8b71bf5469ce4c7246e3fab Author: Zhang, Yanmin Date: Thu Feb 25 11:00:51 2010 +0800 perf symbols: Check the right return variable In function dso__split_kallsyms(), curr_map saves the return value of map__new2. So check it instead of var map after the call returns. Signed-off-by: Zhang Yanmin Acked-by: David S. Miller Cc: # for .33.x Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1267066851.1726.9.camel@localhost> Signed-off-by: Ingo Molnar commit c50cc75271759373bd89a036eec4d4269b291616 Author: Ingo Molnar Date: Thu Feb 25 12:02:13 2010 +0100 sched, cgroups: Fix module export I have exported it in d11c563 - but cgroups.c did not have module.h included ... Cc: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-6-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3e58974027b04e84f68b964ef368a6cd758e2f84 Author: Nikanth Karthikesan Date: Thu Feb 25 14:44:56 2010 +0530 doc: fix typo in comment explaining rb_tree usage Fix typo in comment explaining rb_tree usage. s/int/in Signed-off-by: Nikanth Karthikesan Signed-off-by: Jiri Kosina commit 91143379b01b2020d8878d627ebe9dfb9d6eb4c8 Author: Grazvydas Ignotas Date: Thu Feb 25 02:04:56 2010 -0800 Input: ads7846 - add regulator support The ADS7846/TSC2046 touchscreen controllers can (and usually are) connected to various regulators for power, so add regulator support. Valid regulator will now be required, so boards without complete regulator setup should either disable regulator framework or enable CONFIG_REGULATOR_DUMMY. Signed-off-by: Grazvydas Ignotas Acked-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 1ed509a225008c9e8c0644fbd22168e09a7383a0 Author: Paul E. McKenney Date: Mon Feb 22 17:05:05 2010 -0800 rcu: Add RCU_CPU_STALL_VERBOSE to dump detailed per-task information When RCU detects a grace-period stall, it currently just prints out the PID of any tasks doing the stalling. This patch adds RCU_CPU_STALL_VERBOSE, which enables the more-verbose reporting from sched_show_task(). Suggested-by: Thomas Gleixner Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-21-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 6155fec92e85f07d99e9746234496215443ffb0d Author: Paul E. McKenney Date: Mon Feb 22 17:05:04 2010 -0800 rcu: Fix rcutorture mod_timer argument to delay one jiffy The current "mod_timer(&t, 1)" potentially makes the timer fire immediately, change this to wait one jiffy. Signed-off-by: Dan Carpenter Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-20-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3acd9eb31c5f7eb97cb2009fa41472710fb4a10f Author: Paul E. McKenney Date: Mon Feb 22 17:05:03 2010 -0800 rcu: Fix deadlock in TREE_PREEMPT_RCU CPU stall detection Under TREE_PREEMPT_RCU, print_other_cpu_stall() invokes rcu_print_task_stall() with the root rcu_node structure's ->lock held, and rcu_print_task_stall() acquires that same lock for self-deadlock. Fix this by removing the lock acquisition from rcu_print_task_stall(), and making all callers acquire the lock instead. Tested-by: John Kacur Tested-by: Thomas Gleixner Located-by: Thomas Gleixner Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-19-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 1304afb225288a2e250d6a7495462c28e5509cbb Author: Paul E. McKenney Date: Mon Feb 22 17:05:02 2010 -0800 rcu: Convert to raw_spinlocks The spinlocks in rcutree need to be real spinlocks in preempt-rt. Convert them to raw_spinlocks. Signed-off-by: Thomas Gleixner Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-18-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 20133cfce7d0bbdcc0c398301030c091f5675c88 Author: Paul E. McKenney Date: Mon Feb 22 17:05:01 2010 -0800 rcu: Stop overflowing signed integers The C standard does not specify the result of an operation that overflows a signed integer, so such operations need to be avoided. This patch changes the type of several fields from "long" to "unsigned long" and adjusts operations as needed. ULONG_CMP_GE() and ULONG_CMP_LT() macros are introduced to do the modular comparisons that are appropriate given that overflow is an expected event. Acked-by: Mathieu Desnoyers Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-17-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 1bd22e374b20c2f0ba1d2723c1f585acab2251c5 Author: Paul E. McKenney Date: Mon Feb 22 17:05:00 2010 -0800 rcu: Use canonical URL for Mathieu's dissertation The version numbers change too quickly, so use a canonical URL that represents the most recent version. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-16-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 8bd93a2c5d4cab2ae17d06350daa7dbf546a4634 Author: Paul E. McKenney Date: Mon Feb 22 17:04:59 2010 -0800 rcu: Accelerate grace period if last non-dynticked CPU Currently, rcu_needs_cpu() simply checks whether the current CPU has an outstanding RCU callback, which means that the last CPU to go into dyntick-idle mode might wait a few ticks for the relevant grace periods to complete. However, if all the other CPUs are in dyntick-idle mode, and if this CPU is in a quiescent state (which it is for RCU-bh and RCU-sched any time that we are considering going into dyntick-idle mode), then the grace period is instantly complete. This patch therefore repeatedly invokes the RCU grace-period machinery in order to force any needed grace periods to complete quickly. It does so a limited number of times in order to prevent starvation by an RCU callback function that might pass itself to call_rcu(). However, if any CPU other than the current one is not in dyntick-idle mode, fall back to simply checking (with fix to bug noted by Lai Jiangshan). Also, take advantage of last grace-period forcing, the opportunity to do so noted by Steve Rostedt. And apply simplified #ifdef condition suggested by Frederic Weisbecker. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-15-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 998f2ac3fea93bfa8b55c279fff68f7c5b9ab93d Author: Paul E. McKenney Date: Mon Feb 22 17:04:58 2010 -0800 rcu: Fix citation of Mathieu's dissertation Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-14-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit c598a070bc581aea8a518b460dae8c0cf8e74344 Author: Paul E. McKenney Date: Mon Feb 22 17:04:57 2010 -0800 rcu: Documentation update for CONFIG_PROVE_RCU Adds a lockdep.txt file and updates checklist.txt and whatisRCU.txt to reflect the new lockdep-enabled capabilities of RCU. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-13-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e7b0a61b7929632d36cf052d9e2820ef0a9c1bfe Author: Paul E. McKenney Date: Mon Feb 22 17:04:56 2010 -0800 security: Apply lockdep-based checking to rcu_dereference() uses Apply lockdep-ified RCU primitives to key_gc_keyring() and keyring_destroy(). Cc: David Howells Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-12-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 96be753af91fc9d582450a84722f6a6721d218ad Author: Paul E. McKenney Date: Mon Feb 22 17:04:55 2010 -0800 idr: Apply lockdep-based diagnostics to rcu_dereference() uses Because idr can be used with any of a number of locks or with any flavor of RCU, just disable the lockdep-based diagnostics. If idr needs diagnostics, the check expression will need to be passed into the relevant idr primitives as an additional argument. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-11-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 2676a58c980b7ef076cc9bbff3fd8c9d2d5417ea Author: Paul E. McKenney Date: Mon Feb 22 17:04:54 2010 -0800 radix-tree: Disable RCU lockdep checking in radix tree Because the radix tree is used with many different locking designs, we cannot do any effective checking without changing the radix-tree APIs. It might make sense to do this later, but only if the RCU lockdep checking proves itself sufficiently valuable. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-10-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit af61b96b4f68f7ab25ebf34fed275fabf64f2edc Author: Paul E. McKenney Date: Mon Feb 22 17:04:53 2010 -0800 vfs: Abstract rcu_dereference_check for files-fdtable use Create an rcu_dereference_check_fdtable() that encapsulates the rcu_dereference_check() condition for fcheck_files() use. This has the beneficial side-effect of getting rid of a very long line. Suggested-by: Peter Zijlstra Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-9-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 7dc52157982ab771f40e3c0b7dc55b954c3c2d19 Author: Paul E. McKenney Date: Mon Feb 22 17:04:52 2010 -0800 vfs: Apply lockdep-based checking to rcu_dereference() uses Add lockdep-ified RCU primitives to alloc_fd(), files_fdtable() and fcheck_files(). Cc: Alexander Viro Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Alexander Viro LKML-Reference: <1266887105-1528-8-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 497f0ab39cd25bed317b29482c147c967f7ecd1f Author: Paul E. McKenney Date: Mon Feb 22 17:04:51 2010 -0800 sched: Better name for for_each_domain_rd As suggested by Peter Ziljstra, make better choice of name for for_each_domain_rd(), containing "rcu_dereference", given that it is but a wrapper for rcu_dereference_check(). The name rcu_dereference_check_sched_domain() does that and provides a separate per-subsystem name space. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-7-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit d11c563dd20ff35da5652c3e1c989d9e10e1d6d0 Author: Paul E. McKenney Date: Mon Feb 22 17:04:50 2010 -0800 sched: Use lockdep-based checking on rcu_dereference() Update the rcu_dereference() usages to take advantage of the new lockdep-based checking. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-6-git-send-email-paulmck@linux.vnet.ibm.com> [ -v2: fix allmodconfig missing symbol export build failure on x86 ] Signed-off-by: Ingo Molnar commit 14315592009c17035cac81f4954d5a1f4d71e489 Author: Ian Campbell Date: Wed Feb 17 10:38:10 2010 +0000 x86, mm: Allow highmem user page tables to be disabled at boot time Distros generally (I looked at Debian, RHEL5 and SLES11) seem to enable CONFIG_HIGHPTE for any x86 configuration which has highmem enabled. This means that the overhead applies even to machines which have a fairly modest amount of high memory and which therefore do not really benefit from allocating PTEs in high memory but still pay the price of the additional mapping operations. Running kernbench on a 4G box I found that with CONFIG_HIGHPTE=y but no actual highptes being allocated there was a reduction in system time used from 59.737s to 55.9s. With CONFIG_HIGHPTE=y and highmem PTEs being allocated: Average Optimal load -j 4 Run (std deviation): Elapsed Time 175.396 (0.238914) User Time 515.983 (5.85019) System Time 59.737 (1.26727) Percent CPU 263.8 (71.6796) Context Switches 39989.7 (4672.64) Sleeps 42617.7 (246.307) With CONFIG_HIGHPTE=y but with no highmem PTEs being allocated: Average Optimal load -j 4 Run (std deviation): Elapsed Time 174.278 (0.831968) User Time 515.659 (6.07012) System Time 55.9 (1.07799) Percent CPU 263.8 (71.266) Context Switches 39929.6 (4485.13) Sleeps 42583.7 (373.039) This patch allows the user to control the allocation of PTEs in highmem from the command line ("userpte=nohigh") but retains the status-quo as the default. It is possible that some simple heuristic could be developed which allows auto-tuning of this option however I don't have a sufficiently large machine available to me to perform any particularly meaningful experiments. We could probably handwave up an argument for a threshold at 16G of total RAM. Assuming 768M of lowmem we have 196608 potential lowmem PTE pages. Each page can map 2M of RAM in a PAE-enabled configuration, meaning a maximum of 384G of RAM could potentially be mapped using lowmem PTEs. Even allowing generous factor of 10 to account for other required lowmem allocations, generous slop to account for page sharing (which reduces the total amount of RAM mappable by a given number of PT pages) and other innacuracies in the estimations it would seem that even a 32G machine would not have a particularly pressing need for highmem PTEs. I think 32G could be considered to be at the upper bound of what might be sensible on a 32 bit machine (although I think in practice 64G is still supported). It's seems questionable if HIGHPTE is even a win for any amount of RAM you would sensibly run a 32 bit kernel on rather than going 64 bit. Signed-off-by: Ian Campbell LKML-Reference: <1266403090-20162-1-git-send-email-ian.campbell@citrix.com> Signed-off-by: H. Peter Anvin commit e808bae2407a087bfd40200a27587898e5a9909d Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 9 21:38:45 2010 -0200 x86: Do not reserve brk for DMI if it's not going to be used This will save 64K bytes from memory when loading linux if DMI is disabled, which is good for embedded systems. Signed-off-by: Thadeu Lima de Souza Cascardo LKML-Reference: <1265758732-19320-1-git-send-email-cascardo@holoscopio.com> Signed-off-by: H. Peter Anvin commit a898def29e4119bc01ebe7ca97423181f4c0ea2d Author: Paul E. McKenney Date: Mon Feb 22 17:04:49 2010 -0800 net: Add checking to rcu_dereference() primitives Update rcu_dereference() primitives to use new lockdep-based checking. The rcu_dereference() in __in6_dev_get() may be protected either by rcu_read_lock() or RTNL, per Eric Dumazet. The rcu_dereference() in __sk_free() is protected by the fact that it is never reached if an update could change it. Check for this by using rcu_dereference_check() to verify that the struct sock's ->sk_wmem_alloc counter is zero. Acked-by: Eric Dumazet Acked-by: David S. Miller Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-5-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3120438ad68601f341e61e7cb1323b0e1a6ca367 Author: Paul E. McKenney Date: Mon Feb 22 17:04:48 2010 -0800 rcu: Disable lockdep checking in RCU list-traversal primitives The theory is that use of bare rcu_dereference() is more prone to error than use of the RCU list-traversal primitives. Therefore, disable lockdep RCU read-side critical-section checking in these primitives for the time being. Once all of the rcu_dereference() uses have been dealt with, it may be time to re-enable lockdep checking for the RCU list-traversal primitives. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-4-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 0632eb3d7563d6a76d49a3860b6352d800c92854 Author: Paul E. McKenney Date: Mon Feb 22 17:04:47 2010 -0800 rcu: Integrate rcu_dereference_check() message into lockdep Make rcu_dereference_check() print the list of held locks in addition to the stack dump to ease debugging. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit c26d34a5858f96a564c45048bf5f09319d2abad1 Author: Paul E. McKenney Date: Mon Feb 22 17:04:46 2010 -0800 rcu: Add lockdep-enabled variants of rcu_dereference() Make rcu_dereference() check for being in an RCU read-side critical section, and create rcu_dereference_bh(), rcu_dereference_sched(), and srcu_dereference() to check for the other flavors of RCU. Also create rcu_dereference_raw() to avoid checking, and make rcu_dereference_check() use rcu_dereference_raw(). Acked-by: Eric Dumazet Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 632ee200130899252508c478ad0e808222573fbc Author: Paul E. McKenney Date: Mon Feb 22 17:04:45 2010 -0800 rcu: Introduce lockdep-based checking to RCU read-side primitives Inspection is proving insufficient to catch all RCU misuses, which is understandable given that rcu_dereference() might be protected by any of four different flavors of RCU (RCU, RCU-bh, RCU-sched, and SRCU), and might also/instead be protected by any of a number of locking primitives. It is therefore time to enlist the aid of lockdep. This set of patches is inspired by earlier work by Peter Zijlstra and Thomas Gleixner, and takes the following approach: o Set up separate lockdep classes for RCU, RCU-bh, and RCU-sched. o Set up separate lockdep classes for each instance of SRCU. o Create primitives that check for being in an RCU read-side critical section. These return exact answers if lockdep is fully enabled, but if unsure, report being in an RCU read-side critical section. (We want to avoid false positives!) The primitives are: For RCU: rcu_read_lock_held(void) For RCU-bh: rcu_read_lock_bh_held(void) For RCU-sched: rcu_read_lock_sched_held(void) For SRCU: srcu_read_lock_held(struct srcu_struct *sp) o Add rcu_dereference_check(), which takes a second argument in which one places a boolean expression based on the above primitives and/or lockdep_is_held(). o A new kernel configuration parameter, CONFIG_PROVE_RCU, enables rcu_dereference_check(). This depends on CONFIG_PROVE_LOCKING, and should be quite helpful during the transition period while CONFIG_PROVE_RCU-unaware patches are in flight. The existing rcu_dereference() primitive does no checking, but upcoming patches will change that. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1266887105-1528-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 996de8c6fe95c5a9fc524241cc8f142ef0605d3d Merge: 017c426 60b341b Author: Ingo Molnar Date: Thu Feb 25 09:40:22 2010 +0100 Merge commit 'v2.6.33' into core/rcu Merge reason: Update from -rc4 to -final. Signed-off-by: Ingo Molnar commit 17ccb834d517c66c09123c24ba8553c5b14e0f78 Author: Kuninori Morimoto Date: Tue Feb 23 07:07:01 2010 +0000 ARM: mach-shmobile: ap4evb: Add KEYSC support Because AP4 board has capacitor for KEYSC, we need much time for waiting. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 61c2d2b5e7241d4410ab8227ef4f76c1aba8210b Author: Kailang Yang Date: Thu Feb 25 08:49:06 2010 +0100 ALSA: hda - Add/fix ALC269 FSC and Quanta models Specify proper quirk models for FSC and Quanta machines with ALC269 codec. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 6227cdced0328b0c4322c3170a727af5249393ce Author: Kailang Yang Date: Thu Feb 25 08:36:52 2010 +0100 ALSA: hda - Add ALC670 codec support - Fixed alc_subsystem_id( ) typo and add new function. - !(ass & 0x100000)) ==> Delete this check. It is unnecessary check. - Add porti - ALC670 support Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 7f03292ee16e68be96aa88904afc6152f8d37736 Merge: c5ecc48 baac35c Author: Jens Axboe Date: Thu Feb 25 08:48:05 2010 +0100 Merge branch 'master' into for-2.6.34 Conflicts: include/linux/blkdev.h Signed-off-by: Jens Axboe commit da64c2a8dee66ca03f4f3e15d84be7bedf73db3d Author: Paul Mundt Date: Thu Feb 25 16:37:46 2010 +0900 clocksource: Fix up a registration/IRQ race in the sh drivers. All of the SH clocksource drivers follow the scheme that the IRQ is setup prior to registering the clockevent. The interrupt handler in the clockevent cases looks to the event handler function pointer being filled in by the registration code, permitting us to get in to situations where asserted IRQs step in to the handler before registration has had a chance to complete and hitting a NULL pointer deref. In practice this is not an issue for most platforms, but some of them with fairly special loaders (or that are chain-loading from another kernel) may enter in to this situation. This fixes up the oops reported by Rafael on hp6xx. Reported-and-tested-by: Rafael Ignacio Zurita Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 29463c28a553e1959ec45cc8ad9d2eb434663cdf Author: Kuninori Morimoto Date: Wed Feb 24 00:16:47 2010 +0000 sh: ms7724: modify scan_timing for KEYSC KEYSC::SCN register of SH7724 is 3bit. Thus, scan_timing should be 0 - 7 here. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit bbb892aac4724b7cc6e1626665310eddfd747235 Author: Kuninori Morimoto Date: Tue Feb 23 08:19:14 2010 +0000 sh: ms7724: Add sh_sir support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 263657168549075b57ecfbf730738105d1af8b65 Author: Kuninori Morimoto Date: Wed Feb 24 00:32:28 2010 +0000 sh: mach-ecovec24: Add sh_sir support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit c36f74e67fa12202dbcb4ad92c5ac844f9d36b98 Author: Joshua Roys Date: Wed Feb 24 18:52:44 2010 -0500 netlabel: fix export of SELinux categories > 127 This fixes corrupted CIPSO packets when SELinux categories greater than 127 are used. The bug occured on the second (and later) loops through the while; the inner for loop through the ebitmap->maps array used the same index as the NetLabel catmap->bitmap array, even though the NetLabel bitmap is twice as long as the SELinux bitmap. Signed-off-by: Joshua Roys Acked-by: Paul Moore Signed-off-by: James Morris commit d7b619cf56218704ffce9d510aa497f0a0bcda0b Author: Steve French Date: Thu Feb 25 05:36:46 2010 +0000 [CIFS] pSesInfo->sesSem is used as mutex. Rename it to session_mutex and convert it to a real mutex. Signed-off-by: Thomas Gleixner Acked-by: Jeff Layton Signed-off-by: Steve French commit 7491612c7d2cf560bb96dc02bb53d555b41adbb8 Merge: baac35c 453d313 Author: Linus Torvalds Date: Wed Feb 24 21:12:11 2010 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI commit 3bfc7d22d0400e85a93e835d4398dcbe0af68b0b Author: Matt Turner Date: Wed Feb 24 23:27:10 2010 -0500 drm/nouveau: use ALIGN instead of open coding it CC: Ben Skeggs Signed-off-by: Matt Turner Signed-off-by: Ben Skeggs commit b30083bdb990bcc2829fce83d871a86059ff4fc1 Author: Ben Skeggs Date: Thu Feb 25 12:12:09 2010 +1000 drm/nouveau: report unknown connector state if lid closed This is in preference to disconnected. If there's no other outputs connected this will cause LVDS to be programmed even with the lid closed rather than having X fail to start because of no available outputs. Signed-off-by: Ben Skeggs commit c52e53fd38b195169c67a8cc9ed1af0125d2655c Author: Ben Skeggs Date: Thu Feb 25 11:53:00 2010 +1000 drm/nouveau: support version 0x20 displayport tables Not entirely identical to 0x21, the per-encoder table header lacks the third init table pointer. However, our current parsing of the table should work just fine. Signed-off-by: Ben Skeggs commit 81e2d42200cd8fa37ec4ebdc66373d0db0e05678 Author: Marcin Kościelnicki Date: Thu Feb 25 00:54:04 2010 +0000 drm/nouveau: Fix noaccel/nofbaccel option descriptions. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit d5f3c90d4f3ad6b054f9855b7b69137b97bda131 Author: Marcin Kościelnicki Date: Thu Feb 25 00:54:02 2010 +0000 drm/nv50: Implement ctxprog/state generation. This removes dependence on external firmware for NV50 generation cards. If the generated ctxprogs don't work for you for some reason, please report it. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit be079e97b5a6a569ceff73731aa9433b6113cb87 Author: Ben Skeggs Date: Wed Feb 24 14:01:40 2010 +1000 drm/nouveau: use dcb connector types throughout the driver Signed-off-by: Ben Skeggs commit 1157563931dd773df2420b98eef61598205d39ec Author: Ben Skeggs Date: Wed Feb 24 13:45:57 2010 +1000 drm/nv50: enable hpd on any connector we know the gpio line for Signed-off-by: Ben Skeggs commit 7f612d87f8b4b1ddbcee04264a93e5af7b9f21c7 Author: Ben Skeggs Date: Wed Feb 24 12:07:31 2010 +1000 drm/nouveau: use dcb connector table for creating drm connectors This makes this code common to both the nv04 and nv50 paths. For the moment, we keep the previous behaviour with HDMI/eDP connectors and report them as DVI-D/DP instead. This will be fixed once the rest of the code has been fixed to deal with those types. Signed-off-by: Ben Skeggs commit dc5bc4ed3815dfec2f3ecfbf6f7983440040fe22 Author: Ben Skeggs Date: Wed Feb 24 11:53:59 2010 +1000 drm/nouveau: construct a connector table for cards that lack a real one Signed-off-by: Ben Skeggs commit f66fa771d5046fd8c3e3c6f09407e9168e261b8d Author: Ben Skeggs Date: Wed Feb 24 11:09:20 2010 +1000 drm/nouveau: check for known dcb connector types Signed-off-by: Ben Skeggs commit 54abb5ddae28f6e676f659902cfc8c3ce63b3e16 Author: Ben Skeggs Date: Wed Feb 24 10:48:16 2010 +1000 drm/nouveau: parse dcb gpio/connector tables after encoders Signed-off-by: Ben Skeggs commit e7cc51c5652a8195bc638ce52987fb265ace2a9a Author: Ben Skeggs Date: Wed Feb 24 10:31:39 2010 +1000 drm/nouveau: reorganise bios header, add dcb connector type enums Signed-off-by: Ben Skeggs commit 04a39c577f4114a3f098ee8ef0e20f7778b5ddad Author: Ben Skeggs Date: Wed Feb 24 10:03:05 2010 +1000 drm/nouveau: merge nvbios and nouveau_bios_info Signed-off-by: Ben Skeggs commit 7f245b20e30515264b94f6373ef7d721155990a4 Author: Ben Skeggs Date: Wed Feb 24 09:56:18 2010 +1000 drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table Signed-off-by: Ben Skeggs commit a6678b2ace023912000119a14eeb39a56050bc7c Author: Ben Skeggs Date: Wed Feb 24 09:46:27 2010 +1000 drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table Signed-off-by: Ben Skeggs commit b42861f40f5ea3261d9fa1d5533496bf1fc812cf Author: Ben Skeggs Date: Tue Feb 23 11:39:02 2010 +1000 drm/nouveau: allow retrieval of vbios image from debugfs It's very useful to be able to access this without additional tools for debugging purposes. Signed-off-by: Ben Skeggs commit e32b2c883bfe9b57c660b5db31a62cea96c0c046 Author: Luca Barbieri Date: Sat Feb 20 11:08:56 2010 +0100 drm/nouveau: fix missing spin_unlock in failure path Found by sparse. Signed-off-by: Luca Barbieri Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 761c5a69751967f4fe7430eb65b3a0ea92f3b673 Author: Marcin Slusarz Date: Mon Feb 15 23:24:49 2010 +0100 drm/nouveau: fix i2ctable bounds checking i2c_entries seems to be the number of i2c entries, so with index equal to this number, we could read invalid data from i2ctable. Fix it. Signed-off-by: Marcin Slusarz Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit b762b8ce53da7c7a7a4d660878887681c86be61b Author: Marcin Slusarz Date: Wed Feb 17 19:04:01 2010 +0100 drm/nouveau: fix nouveau_i2c_find bounds checking Reported-by: Dan Carpenter Signed-off-by: Marcin Slusarz Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit df31ef4dbd48eca2772d8d88b12ee5eb5117c86e Author: Marcin Slusarz Date: Wed Feb 17 19:04:00 2010 +0100 drm/nouveau: fix pramdac_table range checking get_tmds_index_reg reads some value from stack when mlv happens to be equal to size of pramdac_table array. Fix it. Reported-by: Dan Carpenter Signed-off-by: Marcin Slusarz Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit a1606a9596e54da90ad6209071b357a4c1b0fa82 Author: Ben Skeggs Date: Fri Feb 12 10:27:35 2010 +1000 drm/nouveau: new gem pushbuf interface, bump to 0.0.16 This commit breaks the userspace interface, and requires a new libdrm for nouveau to operate again. The multiple GEM_PUSHBUF ioctls that were present in 0.0.15 for compatibility purposes are now gone, and replaced with the new ioctl which allows for multiple push buffers to be submitted (necessary for hw index buffers in the nv50 3d driver) and relocations to be applied on any buffer. A number of other ioctls (CARD_INIT, GEM_PIN, GEM_UNPIN) that were needed for userspace modesetting have also been removed. Signed-off-by: Ben Skeggs Signed-off-by: Francisco Jerez commit d87897d4c853a5c136f60efa858d0d4cb3740f57 Author: Ben Skeggs Date: Fri Feb 12 11:11:54 2010 +1000 drm/nv50: make pushbuf dma object cover entire vm This allows us to submit push buffers from any memtype to the hardware. We'll need this ability for VRAM index buffers at some point. Signed-off-by: Ben Skeggs commit 2ccb04ecc704618d9cd2e26aad067dbb2a057366 Author: Ben Skeggs Date: Fri Feb 12 09:05:42 2010 +1000 drm/nouveau: remove PUSHBUF_CAL macro Signed-off-by: Ben Skeggs commit 9a391ad8a2cdd7e5be9b6aabb56f4a46683ba377 Author: Ben Skeggs Date: Thu Feb 11 16:37:26 2010 +1000 drm/nv50: switch to indirect push buffer controls PFIFO on G80 and up has a new mode where the main ring buffer is simply a ring of pointers to indirect buffers containing the actual command/data packets. In order to be able to implement index buffers in the 3D driver we need to be able to submit data-only push buffers right after the cmd packet header, which is only possible using the new command submission method. This commit doesn't make it possible to implement index buffers yet, some userspace interface changes will be required, but it does allow for testing/debugging of the hardware-side support in the meantime. Signed-off-by: Ben Skeggs commit ff9e5279b14dc024599cc705ee199dadb94e90a3 Author: Maarten Maathuis Date: Mon Feb 1 20:58:27 2010 +0100 drm/nouveau: protect channel create/destroy and irq handler with a spinlock The nv50 pgraph handler (for example) could reenable pgraph fifo access and that would be bad when pgraph context is being unloaded (we need the guarantee a ctxprog isn't running). Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit b610ec502376d915b76a62e22576c5d0462cc9c9 Merge: 0fdc54b ad001f1 Author: Tony Lindgren Date: Wed Feb 24 20:53:03 2010 -0800 Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus commit 9fd1de52945e06ed88a440c99ca92dab74b9b33c Author: Dave Airlie Date: Thu Feb 25 14:05:09 2010 +1000 fb: for framebuffer handover don't exit the loop early. An offb machine has been seen in the fields which adds two offb nodes, so continue scanning the list after removing one. Signed-off-by: Dave Airlie commit 453d3131ec7aab82eaaa8401a50522a337092aa8 Author: Robert Hancock Date: Tue Jan 26 22:33:23 2010 -0600 ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI Mike Cui reported that his system with an NVIDIA MCP79 (aka MCP7A) chipset stopped working with 2.6.32. The problem appears to be that 2.6.32 now enables the FPDMA auto-activate optimization in the ahci driver. The drive works fine with this enabled on an Intel AHCI so this appears to be a chipset bug. Since MCP79 is a fairly recent NVIDIA chipset and we don't have any info on whether any other NVIDIA chipsets have this issue, disable FPDMA AA optimization on all NVIDIA AHCI controllers for now. Should address http://bugzilla.kernel.org/show_bug.cgi?id=14922 Signed-off-by: Robert Hancock While-we-investigate-issue-this-patch-looks-good-to-me-by: Prajakta Gudadhe Signed-off-by: Jeff Garzik Cc: stable@kernel.org commit 30d6c72c4a760cfc9069ee100786e4d6cf6de59d Merge: de19322 9df3079 Author: Dave Airlie Date: Thu Feb 25 13:39:36 2010 +1000 Merge remote branch 'anholt/drm-intel-next' into drm-next-stage * anholt/drm-intel-next: drm/i915: Record batch buffer following GPU error drm/i915: give up on 8xx lid status drm/i915: reduce some of the duplication of tiling checking drm/i915: blow away userspace mappings before fence change drm/i915: move a gtt flush to the correct place agp/intel: official names for Pineview and Ironlake drm/i915: overlay: drop superflous gpu flushes drm/i915: overlay: nuke readback to flush wc caches drm/i915: provide self-refresh status in debugfs drm/i915: provide FBC status in debugfs drm/i915: fix drps disable so unload & re-load works drm/i915: Fix OGLC performance regression on 945 drm/i915: Deobfuscate the render p-state obfuscation drm/i915: add dynamic performance control support for Ironlake drm/i915: enable memory self refresh on 9xx drm/i915: Don't reserve compatibility fence regs in KMS mode. drm/i915: Keep MCHBAR always enabled drm/i915: Replace open-coded eviction in i915_gem_idle() commit de19322d554fd0f449d17610823c38494c06db9e Merge: 60b341b 290e5505 Author: Dave Airlie Date: Thu Feb 25 13:39:29 2010 +1000 Merge remote branch 'korg/drm-core-next' into drm-next-stage * korg/drm-core-next: drm/ttm: handle OOM in ttm_tt_swapout drm/radeon/kms/atom: fix shr/shl ops drm/kms: fix spelling of "CLOCK" drm/kms: fix fb_changed = true else statement drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi() drm: switch all GEM/KMS ioctls to unlocked ioctl status. Use drm_gem_object_[handle_]unreference_unlocked where possible drm: introduce drm_gem_object_[handle_]unreference_unlocked commit 290e55056ec3d25c72088628245d8cae037b30db Author: Maarten Maathuis Date: Sat Feb 20 03:22:21 2010 +0100 drm/ttm: handle OOM in ttm_tt_swapout - Without this change I get a general protection fault. - Also use PTR_ERR where applicable. Signed-off-by: Maarten Maathuis Reviewed-by: Dave Airlie Acked-by: Thomas Hellstrom Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca Author: Alex Deucher Date: Tue Feb 23 21:56:12 2010 -0500 drm/radeon/kms/atom: fix shr/shl ops The whole attribute table is valid for shr/shl ops. Fixes fdo bug 26668 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit c2fbaa4b489b738cd9e7666edfeceaaa38e71c9f Author: Frederic Weisbecker Date: Thu Feb 25 03:03:52 2010 +0100 perf/scripts: Tag syscall_name helper as not yet available syscall_name() helper, which resolves a syscall arch number to its name, is not yet available as we first need to implement event injection for it to work. Remove it from the documentation or tag its references as unavailable yet. Once it's implemented, we can just revert the current patch. Signed-off-by: Frederic Weisbecker Cc: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo commit cff68e582237cae3cf456f01153202175961dfbe Author: Tom Zanussi Date: Wed Jan 27 02:28:03 2010 -0600 perf/scripts: Add perf-trace-python Documentation Also small update to perf-trace-perl and perf-trace docs. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-13-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 44ad9cd8f0893b9ae0ac729a7dc2a1ebcd170ac6 Author: Tom Zanussi Date: Mon Feb 22 01:12:59 2010 -0600 perf/scripts: Remove unnecessary PyTuple resizes If we know the size of a tuple in advance, there's no need to resize it - start out with the known size in the first place. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1266822779.6426.4.camel@tropicana> Signed-off-by: Frederic Weisbecker commit 4d161f0360d00d46a89827b3fd6da395f00c5d90 Author: Tom Zanussi Date: Wed Jan 27 02:27:58 2010 -0600 perf/scripts: Add syscall tracing scripts Adds a set of scripts that aggregate system call totals and system call errors. Most are Python scripts that also test basic functionality of the new Python engine, but there's also one Perl script added for comparison and for reference in some new Documentation contained in a later patch. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-8-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 7e4b21b84c43bb8a80b916e40718ca4ed1fc52e6 Author: Tom Zanussi Date: Wed Jan 27 02:27:57 2010 -0600 perf/scripts: Add Python scripting engine Add base support for Python scripting to perf trace. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-6-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 54831a83bfe656c4c54e287c734c6b0ccaa3719b Merge: fb977e2 0f23421 Author: David S. Miller Date: Wed Feb 24 18:23:37 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 58255a4e3ce506b43bb14d5579006731a981490d Author: Chuck Lever Date: Wed Feb 24 13:48:06 2010 -0800 NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN The server's callback client should stop trying to connect to the client's callback server as soon as it gets ECONNREFUSED. The NFS server's callback client does not call rpc_ping(), but appears to have it's own "ping" procedure, so it wasn't covered by commit caabea8a. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 383be5d1789d9a7a2e77dca1cb0aca89507d069e Author: Alex Deucher Date: Tue Feb 23 03:24:38 2010 -0500 drm/radeon/kms: update new pll algo - add support for pre-avivo chips - add support for fixed post/ref dividers - add support for non-fractional fb dividers By default avivo chips use the new algo and pre-avivo chips use the old algo. Use the "new_pll" module option to toggle between them. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 939461d59d6ac4e5142f767d24810c9b4b5caa38 Author: Marek Olšák Date: Sun Feb 14 07:10:10 2010 +0100 drm/radeon/kms: add support for square microtiles on r3xx-r5xx Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit 51e5fcd353a55364984bda3dd1391742e4dec53c Author: Jerome Glisse Date: Fri Feb 19 14:33:54 2010 +0000 drm/radeon/kms: force pinning buffer into visible VRAM This patch properly set visible VRAM and enforce any pinned buffer to be into visible VRAM. We might later add a flag to release this constraint for some newer hw more clever than previous. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 22e6dd7e700111c1aa49581d27f2b349cbc798dd Author: Alex Deucher Date: Tue Feb 23 13:12:43 2010 -0500 drm/radeon/kms/evergreen: fix typo in cursor code cursor x/y are surface relative. fixes fdo bug 26551 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a265e5587f078618c1f17c3a83da65046f18746f Author: Roland Dreier Date: Wed Feb 24 16:51:20 2010 -0800 IB/uverbs: Use anon_inodes instead of private infinibandeventfs The anon_inodes interface has been split to allow creating a bare (non-installed) file pointer and also extended to allow specifying O_RDONLY in the flags. This makes it a suitable replacement for the private "infinibandeventfs" pseudo-filesystem used by uverbs, and this replacement saves a small chunk of boilerplate code. Signed-off-by: Roland Dreier commit ad001f145dcf457251e78fe2ae2ed40df1bda4ed Author: Santosh Shilimkar Date: Mon Feb 22 22:09:41 2010 -0700 OMAP4: clock: Remove clock hacks from timer-gp.c Now the omap4 clock framework is in mainline and clk_get_rate() is functional. Hence reomve the hardcoded clock hacks. This patch also fixes Division by zero in kernel. Backtrace: [] (dump_backtrace+0x0/0x110) from [] (dump_stack+0x18/0x1c) r7:60000093 r6:c0641050 r5:c0223e78 r4:c02126b4 [] (dump_stack+0x0/0x1c) from [] (__div0+0x18/0x20) [] (__div0+0x0/0x20) from [] (Ldiv0+0x8/0x10) [] (omap_dm_timer_stop+0x0/0xb0) from [] (omap2_gp_timer_set_mode+0x1c/0x68) r5:c0223e78 r4:00000000 [] (omap2_gp_timer_set_mode+0x0/0x68) from [] (clockevents_set_mode+0x30/0x64) r5:c020cae0 r4:00000000 [] (clockevents_set_mode+0x0/0x64) from [] (clockevents_exchange_device+0x30/0x9c) r5:c020cae0 r4:c02146e0 [] (clockevents_exchange_device+0x0/0x9c) from [] (tick_notify+0x17c/0x404) r7:00000000 r6:c0641050 r5:00000000 r4:c020cae0 [] (tick_notify+0x0/0x404) from [] (notifier_call_chain+0x34/0x78) [] (notifier_call_chain+0x0/0x78) from [] (__raw_notifier_call_chain+0x1c/0x24) [] (__raw_notifier_call_chain+0x0/0x24) from [] (raw_notifier_call_chain+0x20/0x28) [] (raw_notifier_call_chain+0x0/0x28) from [] (clockevents_do_notify+0x1c/0x24) [] (clockevents_do_notify+0x0/0x24) from [] (clockevents_register_device+0x98/0xd0) [] (clockevents_register_device+0x0/0xd0) from [] (percpu_timer_setup+0x80/0x9c) r7:00000000 r6:00000002 r5:00000002 r4:00000003 [] (percpu_timer_setup+0x0/0x9c) from [] (smp_prepare_cpus+0xb0/0xe8) [] (smp_prepare_cpus+0x0/0xe8) from [] (kernel_init+0x5c/0x1fc) r7:00000000 r6:00000000 r5:00000000 r4:c001b8a4 [] (kernel_init+0x0/0x1fc) from [] (do_exit+0x0/0x604) r7:00000000 r6:00000000 r5:00000000 r4:00000000 Signed-off-by: Santosh Shilimkar Signed-off-by: Paul Walmsley commit 7c43d5472878db90d0244551370f6f0dc1b97747 Author: Santosh Shilimkar Date: Mon Feb 22 22:09:40 2010 -0700 OMAP4: clock: Add dummy clock nodes for interface clocks On OMAP4 platform the iclk control is completly under hardware control and no software control is available. This difference w.r.t previous OMAP's needs all the common driver accross OMAP's , cpu_is_xxxx() checks. To avoid poulluting the drivers dummy clock nodes are created (The autogeneration script has been updated accordingly). Signed-off-by: Santosh Shilimkar Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson [paul@pwsan.com: made OMAP1 dummy_ck common and edited patch to reuse that] Signed-off-by: Paul Walmsley commit 547760502665eacc1f9fd9f3782b8b7f27c56bd4 Author: Rajendra Nayak Date: Mon Feb 22 22:09:39 2010 -0700 OMAP4: clock: Rename leaf clock nodes to end with a _ick or _fck All leaf clock nodes are renamed for OMAP4 to have a clk name which end with a _ick or a _fck. This is done so that the naming convention is same as that followed on older OMAPs. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 30962d9d0c74f6b00a7dece200fa08392b62817d Author: Paul Walmsley Date: Mon Feb 22 22:09:38 2010 -0700 OMAP2+ clock: revise omap2_clk_{disable,enable}() Simplify the code in the omap2_clk_disable() and omap2_clk_enable() functions, reducing levels of indentation. This makes the code easier to read. Add some additional debugging pr_debug()s here also to help others understand what is going on. Revise the omap2_clk_disable() logic so that it now attempts to disable the clock's clockdomain before recursing up the clock tree. Simultaneously, ensure that omap2_clk_enable() is called on parent clocks first, before enabling the clockdomain. This ensures that a parent clock's clockdomain is enabled before the child clock's clockdomain. These sequences should be the inverse of each other. Revise the omap2_clk_enable() logic so that it now cleans up after itself upon encountering an error. Previously, an error enabling a parent clock could have resulted in inconsistent usecounts on the enclosing clockdomain. Remove the trivial _omap2_clk_disable() and _omap2_clk_enable() static functions, and replace it with the clkops calls that they were executing. For all this to work, the clockdomain omap2_clkdm_clk_enable() and omap2_clkdm_clk_disable() code must not return an error on clockdomains without CLKSTCTRL registers; so modify those functions to simply return 0 in that case. While here, add some basic kerneldoc documentation on both functions, and get rid of some old non-CodingStyle-compliant comments that have existed since the dawn of time (at least, the OMAP clock framework's time). Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Rajendra Nayak commit 4d30e82c26b7212021b9a5ab57760d9b8a3075fe Author: Paul Walmsley Date: Mon Feb 22 22:09:36 2010 -0700 OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code The OMAP2 and OMAP3 boot-time MPU rate change code is almost identical. Merge them into mach-omap2/clock.c, and add kerneldoc documentation. Signed-off-by: Paul Walmsley commit ad9561609c41f704fd82facd37127e957bcaea94 Author: Paul Walmsley Date: Mon Feb 22 22:09:35 2010 -0700 OMAP clockdomain: if no autodeps exist, don't try to add or remove them _clkdm_add_autodeps() and _clkdm_del_autodeps() will attempt to dereference a NULL pointer if no autodeps were supplied to clkdm_init(). Based on a patch from Roel Kluin - thanks Roel. Signed-off-by: Paul Walmsley Cc: Roel Kluin commit 43b40992ce21def8d5957f32d7ddb728af89bfce Author: Paul Walmsley Date: Mon Feb 22 22:09:34 2010 -0700 OMAP hwmod: add hwmod class support Add support for categorizing and iterating over hardware IP blocks by the "class" of the IP block. The class is the type of the IP block: e.g., "timer", "timer1ms", etc. Move the OCP_SYSCONFIG/SYSSTATUS data from the struct omap_hwmod into the struct omap_hwmod_class, since it's expected to stay consistent for each class. While here, fix some comments. The hwmod_class structures in this patch were designed and proposed by Benoît Cousson and were refined in a discussion between Thara Gopinath , Kevin Hilman , and myself. This patch uses WARN() lines that are longer than 80 characters, as Kevin noted a broader lkml consensus to increase greppability by keeping the messages all on one line. Signed-off-by: Paul Walmsley Signed-off-by: Benoît Cousson Cc: Thara Gopinath Cc: Kevin Hilman commit d608c738bb8fb37e5fbfcdef9c566764f2fea086 Author: Mark Brown Date: Wed Feb 24 16:45:54 2010 +0000 ARM: S3C64XX: Add initial support for board specific IRQs Follow the scheme used for IRQs. By default 16 GPIOs are allocated for board use. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 920d706c892e8f8cfff95f46aeb95fc6344f0bd5 Author: Eli Cohen Date: Mon Feb 8 11:40:37 2010 +0000 IB/core: Fix and clean up ib_ud_header_init() ib_ud_header_init() first clears header and then fills up the various fields. Later on, it tests header->immediate_present, which it has already cleared, so the condition is always false. Fix this by adding an immediate_present parameter and setting header->immediate_present as is done with grh_present. Also remove unused calculation of header_len. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit e6502522c2850968a086284d0f28de4fb880eb78 Author: Kukjin Kim Date: Wed Feb 24 16:41:01 2010 +0900 ARM: S5PV210: Add S5PC110 configuration file This patch adds S5PC110 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit af60ca4f291713111e397031e2abffa66c6c857f Author: Kukjin Kim Date: Wed Feb 24 16:40:57 2010 +0900 ARM: S5PV210: Add S5PV210 configuration file This patch adds S5PV210 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d515ec339bf7970c8f6e368c8c7bb330417dcda9 Author: Kukjin Kim Date: Wed Feb 24 16:40:53 2010 +0900 ARM: S5PV210: Add SMDKC110 board support file This patch adds SMDKC110 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 981744165e31410bd7bc973fd259f24b836d0346 Author: Kukjin Kim Date: Wed Feb 24 16:40:49 2010 +0900 ARM: S5PV210: Add SMDKV210 board support file This patch adds SMDKV210 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 170f4e425808b801f81bb6be24b2c1eb80313d8e Author: Kukjin Kim Date: Wed Feb 24 16:40:44 2010 +0900 ARM: S5PV210: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5PV210 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5PV210. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 2c798557b9e0961e545e526197654d9437a6330e Author: Kukjin Kim Date: Wed Feb 24 16:40:40 2010 +0900 ARM: S5PV210: Add IRQ support This patch adds IRQ support for S5PV210. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 and VIC3 in plat-s5p common irq code. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 0c1945d336116e82454b5461238618ef81696669 Author: Kukjin Kim Date: Wed Feb 24 16:40:36 2010 +0900 ARM: S5PV210: Add clock support for S5PV210 This patch adds clock support for S5PV210. This patch adds the clock register definitions and the various system clocks in S5PV210. Clocks that are common to other S5P SoC'c are added in the common S5P clock support. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 939d28aae17a0cb591a2ec54993496a5d31f2ec6 Author: Kukjin Kim Date: Wed Feb 24 16:40:29 2010 +0900 ARM: S5PV210: Add Samsung S5PV210 CPU support This patch adds support for Samsung S5PV210 CPU. This patch also adds an entry for S5PV210 cpu in plat-s5p cpu table. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit cbbc0de700e61d0cdc854d435dbc2ef148de0e00 Author: Rafael J. Wysocki Date: Wed Feb 24 00:52:08 2010 +0100 ACPI: Use GPE reference counting to support shared GPEs To fix a bug and address the reviewers' comments regarding the ACPI GPE refcounting patch, do the following additional changes: o Remove the second argument of acpi_ev_enable_gpe(), 'write_to_hardware', because it is not necessary any more. o Add the "bad parameter" test against 'type' in acpi_enable_gpe() and acpi_disable_gpe(). o Make acpi_enable_gpe() only check 'status' for runtime GPEs if acpi_ev_enable_gpe() was actually called. o Make acpi_disable_gpe() return 'status' returned by acpi_ev_disable_gpe() and fix a bug where ACPI_GPE_TYPE_WAKE and ACPI_GPE_TYPE_RUNTIME were exchanged by mistake. o Add comments explaining why acpi_set_gpe() is used by the ACPI EC driver. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 122ca0076e5f84fa12943f22f6586ff285670783 Author: Steve French Date: Wed Feb 24 21:56:48 2010 +0000 [CIFS] Use unsigned ea length for clarity Jeff correctly noted that using unsigned ea length is more intuitive. CC: Jeff Lyaton Signed-off-by: Steve French commit cd71f8f48eda141404db78f7b01902ba3f9ab477 Author: Linus Walleij Date: Wed Feb 24 21:49:53 2010 +0100 ARM: 5958/1: ARM: U300: fix inverted clk round rate The clk_round_rate() functions in the U300 clocking will always select the lowest clocking frequency due to inverted rounding comparisons. Fix this. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit fcfadcaa57be0711ca80e3898243388f4d19928f Author: Roel Kluin Date: Tue Feb 23 23:37:22 2010 +0100 ARM: 5956/1: misplaced parentheses The parentheses appear misplaced. Signed-off-by: Roel Kluin Acked-by: Linus Walleij Signed-off-by: Russell King commit 1587a373f06ab700004758d6970abb530decef76 Author: Hartley Sweeten Date: Tue Feb 23 21:45:22 2010 +0100 ARM: 5955/1: ep93xx: move timer defines into core.c and document The timer defines are only used in core.c. Move them so they will not be globaly exposed. While here, add additional defines to document the magic numbers used in the registers. Also, add some comments for clarification. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit d056ab78558c03e6d31c031f7b83f0cb10bee7d4 Author: Hartley Sweeten Date: Tue Feb 23 21:41:17 2010 +0100 ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c The GPIO support in core.c handles the interrupt support for GPIO ports A, B, and F. The gpiolib implementation in gpio.c needs to access the function ep93xx_gpio_int_mask when a gpio pin is made an output and ep93xx_gpio_update_int_params in order to update the registers. Moving this support from core.c to gpio.c allows making the two functions static. It also keeps all the GPIO handling together in one file. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit ba7c6a3bccd25abd3c19d3655ecb1cc4d258271b Author: Hartley Sweeten Date: Tue Feb 23 21:20:31 2010 +0100 ARM: 5953/1: ep93xx: fix broken build of clock.c Patch 5879/1: ep93xx: define magic numbers for pll1 and pll2 broke the ep93xx build due to one missing rename of EP93XX_SYSCON_CLOCK_SET2. The correct name should be EP93XX_SYSCON_CLKSET2. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit d6d502fa4be1acd01971476fc732c95a4da16d90 Author: Kukjin Kim Date: Mon Feb 22 00:02:59 2010 +0100 ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig Add ARM_L1_CACHE_SHIFT_6 to arch/arm/Kconfig to allow CPUs with L1 cache lines which are 64bytes to indicate this without having to alter the arch/arm/mm/Kconfig entry each time. Update the mm Kconfig so that ARM_L1_CACHE_SHIFT default value uses this and change OMAP3 and S5PC1XX to select ARM_L1_CACHE_SHIFT_6. Acked-by: Ben Dooks Acked-by: Tony Lindgren Signed-off-by: Kukjin Kim Signed-off-by: Russell King commit baac35c4155a8aa826c70acee6553368ca5243a2 Author: Xiaotian Feng Date: Wed Feb 24 18:39:02 2010 +0800 security: fix error return path in ima_inode_alloc If radix_tree_preload is failed in ima_inode_alloc, we don't need radix_tree_preload_end because kernel is alread preempt enabled Signed-off-by: Xiaotian Feng Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 6fdb2ee243404c7cbf530387bf904ad1841ebf5b Author: Stefan Richter Date: Sun Feb 21 17:59:14 2010 +0100 firewire: ohci: extend initialization log message by the number of available isochronous DMA contexts and active quirks which is occasionally useful information. Signed-off-by: Stefan Richter commit 4802f16d512d6e3b36177709d50c05df0ef52a6c Author: Stefan Richter Date: Sun Feb 21 17:58:52 2010 +0100 firewire: ohci: fix IR/IT context mask mixup This bug was present in firewire-ohci since day one: The number of available isochronous receive DMA contexts was mixed up with that of available isochronous transmit DMA contexts. This is harmless on a few chips which offer the same number of contexts in both directions, but most chips nowadays implement only the standard minimum of 4 IR contexts, but 8 IT contexts. If a user attempted to run a lot of IR contexts at once, results with more than four were therefore unpredictable. I suppose the controller would simply refuse to start DMA of any unimplemented context. Signed-off-by: Stefan Richter commit 3e9cc2f3b7ddabbbfc9abd043887030c669380aa Author: Stefan Richter Date: Sun Feb 21 17:58:29 2010 +0100 firewire: ohci: add module parameter to activate quirk fixes This way, we can advise users of precompiled kernel packages to test existing quirk fixes on chips which have not been listed yet, without them having to build a kernel from source. Note, to use this feature on a machine with more than one controller, steps like these are necessary: # lspci | grep 1394 # ls /sys/bus/pci/drivers/firewire_ohci/ # echo -n "0000:03:02.0" > /sys/bus/pci/drivers/firewire_ohci/unbind # echo 2 > /sys/module/firewire_ohci/parameters/quirks # echo -n "0000:03:02.0" > /sys/bus/pci/drivers/firewire_ohci/bind # echo 0 > /sys/module/firewire_ohci/parameters/quirks The parameter can also be used to switch off quirk flags that were hardwired into firewire-ohci's quirks table. Simply specify a non-zero quirks value but without any known flags, e.g. 0x100. Signed-off-by: Stefan Richter commit 4a635593f447443459fb92a482b5cc6d1dd15199 Author: Stefan Richter Date: Sun Feb 21 17:58:01 2010 +0100 firewire: ohci: use an ID table for quirks detection We don't have a lot of quirks to take into account (especially since dual-buffer IR is out of the picture), but still, a table-based approach is more organized than a series of if () clauses. Signed-off-by: Stefan Richter commit ecb1cf9c446ad7e8248160fe6797cd9bed817f24 Author: Stefan Richter Date: Sun Feb 21 17:57:32 2010 +0100 firewire: ohci: reorder struct fw_ohci for better cache efficiency The config_rom struct members are only accessed during relatively infrequent self-ID-complete interrupts and only if the local config ROM was changed, while the ar_, at_, ir_, it_ members are used very frequently during I/O. Hence move the config_rom members further down. More importantly, make the huge self_id_buffer member the last one; this is only accessed in self-ID-complete interrupts. Signed-off-by: Stefan Richter commit 6498ba04aee69540f8f586438f90d58e5b8e6936 Author: Stefan Richter Date: Sun Feb 21 17:57:05 2010 +0100 firewire: ohci: remove unused dualbuffer IR code This code was no longer used since 2.6.33, "firewire: ohci: always use packet-per-buffer mode for isochronous reception" commit 090699c0. If anybody needs this code in the future for special purposes, it can be brought back in. But it must not be re-enabled by default; drivers (kernelspace or userspace drivers) should only get this mode if they explicitly request it. Signed-off-by: Stefan Richter commit 64582298b9c29535188380f488873e7d2196a2eb Author: Stefan Richter Date: Sun Feb 21 17:56:42 2010 +0100 firewire: core: combine a bit of repeated code Signed-off-by: Stefan Richter commit 6e95dea728f4af36c033fcf2318529bd46dae540 Author: Stefan Richter Date: Sun Feb 21 17:56:21 2010 +0100 firewire: core: change type of a data buffer from array of char to union of structs. I already used a union to size the buffer which holds ioctl arguments; more consequent is to define it as an instance of this union in the first place. Also rename several local variables from "request" to "a"(rgument) since the term request can be mistaken to mean a transaction subaction, e.g. an instance of struct fw_request. Signed-off-by: Stefan Richter commit e94b6d7736107c07b1b089797651d02994d268c7 Author: Stefan Richter Date: Sun Feb 21 12:48:57 2010 +0100 firewire: cdev: increment ABI version number so that clients can detect whether the FW_CDEV_IOC_GET_CYCLE_TIMER ioctl is reliable (on all tested controllers, especially the widely used VIA controllers, also NEC controllers, see commits b677532b and 1c1517ef). Also add a comment on the 2.6.32 iso xmit enhancement and on dual-buffer IR having been disabled in 2.6.33. Signed-off-by: Stefan Richter commit abfe5a01ef1e463cbafdae461b693db34e308c02 Author: Stefan Richter Date: Sat Feb 20 12:13:49 2010 +0100 firewire: cdev: add more flexible cycle timer ioctl The system time from CLOCK_REALTIME is not monotonic, hence problematic for the main user of the FW_CDEV_IOC_GET_CYCLE_TIMER ioctl. This issue exists in its successor ABI, i.e. raw1394, too. http://subversion.ffado.org/ticket/242 We now offer an alternative ioctl which lets the caller choose between CLOCK_REALTIME, CLOCK_MONOTONIC, and CLOCK_MONOTONIC_RAW as source of the local time, very similar to the clock_gettime libc function. The format of the local time return value matches that of clock_gettime (seconds and nanoseconds, instead of a single microseconds value from the existing ioctl). Signed-off-by: Stefan Richter commit fd6e0c518121d22b50060d26c8aec2b701c6aab7 Author: Stefan Richter Date: Fri Feb 19 21:00:31 2010 +0100 firewire: core: rename an internal function according to what it really does. Signed-off-by: Stefan Richter commit 137d9ebfdbaa45c01f9f0f6d5121ae6f1eb942bd Author: Stefan Richter Date: Fri Feb 19 21:00:02 2010 +0100 firewire: core: fix an information leak If a device exposes a sparsely populated configuration ROM, firewire-core's sysfs interface and character device file interface showed random data in the gaps between config ROM blocks. Fix this by zero-initialization of the config ROM reader's scratch buffer. Signed-off-by: Stefan Richter commit 58aaa5427663b680030aa58aaaf1e2738564b8dc Author: Stefan Richter Date: Thu Feb 18 01:54:00 2010 +0100 firewire: core: increase stack size of config ROM reader The stack size of 16 was artificially chosen and may be too small in extreme cases. A device won't be accessible then. Since it doesn't really matter to the slab allocator whether we ask for 1088 bytes or 2048 bytes of scratch memory, just allocate 2048 bytes for the sum of temporary config ROM image and stack, and we will never ever overflow the stack (because there simply can't be more stack items than ROM entries). Signed-off-by: Stefan Richter commit 2799d5c5f9d2064c6d1f50ec82e28e3eac5f6954 Author: Stefan Richter Date: Thu Feb 18 01:52:45 2010 +0100 firewire: core: don't fail device creation in case of too large config ROM blocks It never happened yet, but better safe than sorry: If a device's config ROM contains a block which overlaps the boundary at 0xfffff00007ff, just ignore that one block instead of refusing to add the device representation. That way, upper layers (kernelspace or userspace drivers) might still be able to use the device to some degree. That's better than total inaccessibility of the device. Worse, the core would have logged only a generic "giving up on config rom" message which could only be debugged by feeding a firewire-ohci debug logging session through a config ROM interpreter, IOW would likely remain undiagnosed. Signed-off-by: Stefan Richter commit d54423c62c2f687919d4e5bdd4bb064234ff2d44 Author: Stefan Richter Date: Thu Feb 18 01:50:31 2010 +0100 firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500 The Panasonic AG-DV2500 tape deck contains an invalid entry in its configuration ROM root directory: A leaf pointer with the undefined key ID 0 and an offset that points way out of the standard config ROM area. This caused firewire-core to dismiss the device with the generic log message "giving up on config rom for node id...", after which it was of course impossible to access the tape deck with dvgrab or any other program. https://bugzilla.redhat.com/show_bug.cgi?id=449252#c29 The fix is to simply ignore this invalid ROM entry and proceed to read the valid rest of the ROM. There is a catch though: When the kernel later iterates over the ROM, it would be nasty having to check again for such too large ROM offsets. Therefore we manipulate the defective or unsupported ROM entry to become a harmless immediate entry that won't have any side effects later (an entry with the value 0x00000000). Reported-by: George Chriss Signed-off-by: Stefan Richter commit 109d28152b6e9d5de64cd23e3bc08885ccb3d1ef Merge: 168cf9a 60b341b Author: Stefan Richter Date: Wed Feb 24 20:31:04 2010 +0100 Merge tag 'v2.6.33' for its firewire changes since last branch point Signed-off-by: Stefan Richter commit 7359154e94623f6a5a68a77b9fcfbef40633c93f Author: Paul Walmsley Date: Mon Feb 22 22:09:32 2010 -0700 OMAP hwmod: convert header files with static allocations into C files Code should be able to #include any header file without the fear that the header file will go allocating memory. This is a coding style issue, similar to commit 82e9bd588563c4e22ebb55b684ebec7e310cc715. Move the existing hwmod data from .h files to .c files. While here, convert "omap34xx" to "omap3xxx" in the hwmod files, since most of these structures should be reusable across all OMAP3 chips. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Kevin Hilman commit 50ebdac2ec9fb2de9c271cb2e0e13aae3b454166 Author: Paul Walmsley Date: Mon Feb 22 22:09:31 2010 -0700 OMAP hwmod: convert hwmod to use hardware clock names rather than clkdev dev+con The OMAP hwmod core code is intended to use SoC IP block description structures that are autogenerated from TI's OMAP hardware database. Currently the hwmod code uses clkdev device + connection addressing to identify clocks. This causes problems in the hwmod autogeneration process, since the TI hardware database doesn't use platform_device or clkdev addressing; it uses a single clock signal name string, which tends to bear some resemblance to what is used in the OMAP TRMs. This patch converts the hwmod code and existing data to use omap_clk_get_by_name(), introduced in the previous patch. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman commit 74be8427431b4bbff4a6506f64fb30bb61e781a7 Author: Paul Walmsley Date: Mon Feb 22 22:09:29 2010 -0700 OMAP clock: add omap_clk_get_by_name() for use by OMAP hwmod core code The OMAP hwmod core code is intended to use SoC IP block description structures that are autogenerated from TI's OMAP hardware database. Currently the hwmod code uses clkdev device + connection addressing to identify clocks. This causes problems in the hwmod autogeneration process, since the TI hardware database doesn't use platform_device or clkdev addressing; it uses a single clock signal name string, which tends to bear some resemblance to what is used in the OMAP TRMs. This patch adds a non-exported function to the OMAP clock code, omap_clk_get_by_name(). A subsequent patch will convert the hwmod code to use this function. This function is for use only by core code, and practically, no other code outside the hwmod code should need it. Device driver code in the kernel must not use this function, which is why it is not exported. Drivers should use the appropriate clock alias provided by the clkdev data structures, so driver code can be completely SoC-independent. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman commit e8d373779e17b3d108b49019fc83102fdd1523e1 Author: Vimarsh Zutshi Date: Mon Feb 22 22:09:28 2010 -0700 OMAP3: clock: add capability to change rate of dpll4_m5_ck_3630 Add necessary clk_sel definitions to clock framework to allow changing dpll4_m5_ck_3630 rate. This is used by the ISP driver. Signed-off-by: Vimarsh Zutshi [paul@pwsan.com: updated to apply] Signed-off-by: Paul Walmsley commit 53c92d8f20759c488ea0457bccc83a3a797e03fe Author: Paul Walmsley Date: Mon Feb 22 22:09:27 2010 -0700 OMAP4 clock: drop the ALWAYS_ENABLED clock flag Get rid of the ALWAYS_ENABLED clock flag - it doesn't actually do anything. (The OMAP4 clock autogeneration scripts have been updated accordingly.) Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Benoît Cousson commit 51c19541624f5588bccb9d4fb3ae518c68c8082e Author: Paul Walmsley Date: Mon Feb 22 22:09:26 2010 -0700 OMAP clock: drop RATE_FIXED clock flag The RATE_FIXED clock flag is pointless. In the OMAP1 clock code, it simply causes the omap1_clk_round_rate() function to return the current rate of the clock. omap1_clk_round_rate(), however, should never be called for a fixed-rate clock, since none of these clocks have a .round_rate function pointer set in their struct clk records. Similarly, in the OMAP2+ clock code, the RATE_FIXED flag just causes the clock code to emit a warning if the OMAP clock maintainer was foolish enough to add a .round_rate function pointer to a fixed-rate clock. "Doctor, it hurts when I pretend that a fixed-rate clock is rate-changeable." "Then don't pretend that a fixed-rate clock is rate-changeable." It has no functional value. This patch drops the RATE_FIXED clock flag, removing it from all clocks that are so marked. Signed-off-by: Paul Walmsley Cc: Richard Woodruff commit 8c34974ab0ecbbcdabd343f8cd0013cd2d2b0fa8 Author: Paul Walmsley Date: Mon Feb 22 22:09:24 2010 -0700 OMAP2 clock: drop DELAYED_APP clock flag All of the clocks that are marked with DELAYED_APP are changed as part of the virt_prcm_set OPP virtual clock. On 24xx, these clocks all need to be changed as part of a group to keep the clock tree functional - hence the need for the VALID_CONFIG bit, which is not present on later OMAPs. These clocks should not be rate-changed independently. So prevent these clocks from being changed independently by dropping their .round_rate and .set_rate function pointers. It then turns out that the DELAYED_APP clock flag is no longer useful, so drop it and the associated code and renumber the clock flags. Signed-off-by: Paul Walmsley Cc: Richard Woodruff commit 5173804fbbbff82a2fd40bc1c46655b272167af5 Author: Paul Walmsley Date: Mon Feb 22 22:09:23 2010 -0700 OMAP2430 clock: make func_96m_ck parent-selectable func_96m_ck was incorrectly marked as being rate-selectable, when in fact it is only parent-selectable. Remove the .set_rate and .round_rate function pointers for this clk. Signed-off-by: Paul Walmsley commit 81b34fbecbfbf24ed95c2d80d5cb14149652408f Author: Paul Walmsley Date: Mon Feb 22 22:09:22 2010 -0700 OMAP2 clock: split OMAP2420, OMAP2430 clock data into their own files In preparation for multi-OMAP2 kernels, split mach-omap2/clock2xxx_data.c into mach-omap2/clock2420_data.c and mach-omap2/clock2430_data.c. 2430 uses a different device space physical memory layout than past or future OMAPs, and we use a different virtual memory layout as well, which causes trouble for architecture-level code/data that tries to support both. We tried using offsets from the virtual base last year, but those patches never made it upstream; so after some discussion with Tony about the best all-around approach, we'll just grit our teeth and duplicate the structures. The maintenance advantages of a single kernel config that can compile and boot on OMAP2, 3, and 4 platforms are simply too compelling. This approach does have some nice benefits beyond multi-OMAP 2 kernel support. The runtime size of OMAP2420-specific and OMAP2430-specific kernels is smaller, since unused clocks for the other OMAP2 chip will no longer be compiled in. (At some point we will mark the clock data __initdata and allocate it during registration, which will eliminate the runtime memory advantage.) It also makes the clock trees slightly easier to read, since 2420-specific and 2430-specific clocks are no longer mixed together. This patch also splits 2430-specific clock code into its own file, mach-omap2/clock2430.c, which is only compiled in for 2430 builds - mostly for organizational clarity. While here, fix a bug in the OMAP2430 clock tree: "emul_ck" was incorrectly marked as being 2420-only, when actually it is present on both OMAP2420 and OMAP2430. Thanks to Tony for some good discussions about how to approach this problem. Signed-off-by: Paul Walmsley Cc: Tony Lindgren Cc: Richard Woodruff commit 657ebfadc19c5a14f709dee1645082828330d5d4 Author: Paul Walmsley Date: Mon Feb 22 22:09:20 2010 -0700 OMAP3/4 clock: split into per-chip family files clock34xx_data.c now contains data for the OMAP34xx family, the OMAP36xx family, and the OMAP3517 family, so rename it to clock3xxx_data.c. Rename clock34xx.c to clock3xxx.c, and move the chip family-specific clock functions to clock34xx.c, clock36xx.c, or clock3517.c, as appropriate. So now "clock3xxx.*" refers to the OMAP3 superset. The main goal here is to prepare to compile chip family-specific clock functions only for kernel builds that target that chip family. To get to that point, we also need to add CONFIG_SOC_* options for those other chip families; that will be done in future patches, planned for 2.6.35. OMAP4 is also affected by this. It duplicated the OMAP3 non-CORE DPLL clkops structure. The OMAP4 variant of this clkops structure has been removed, and since there was nothing else currently in clock44xx.c, it too has been removed -- it can always be added back later when there is some content for it. (The OMAP4 clock autogeneration scripts have been updated accordingly.) Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Ranjith Lohithakshan Cc: Tony Lindgren commit b92c170d019db7554db95380d2e1dfb3a368e350 Author: Paul Walmsley Date: Mon Feb 22 22:09:19 2010 -0700 OMAP clock: drop .id field; ensure each clock has a unique name After the clkdev conversion, the struct clk.id field became superfluous, so, drop it. Bring the clock names closer to the TRMs and ensure they are unique for debugfs. Signed-off-by: Paul Walmsley commit f71eddb1582f5c53ed4bfc365a2acce94aca88cc Author: Paul Walmsley Date: Mon Feb 22 22:09:18 2010 -0700 OMAP clock: compress clock flags down to a u8 There are now only eight OMAP clock flags, so renumber the flags to fit in a u8 and shrink the size of struct clk.flags from a u32 to a u8. The intention is to save memory. Signed-off-by: Paul Walmsley commit 1a3377176b3d41e3f30483a624cdafadeeb4064f Author: Paul Walmsley Date: Mon Feb 22 22:09:16 2010 -0700 OMAP2 clock: drop CONFIG_PARTICIPANT clock flag It turns out that the only purpose of the CONFIG_PARTICIPANT clock flag is to prevent omap2_clk_set_rate() and omap2_clk_set_parent() from being executed on clocks with that flag set. The rate-changing component can be more directly accomplished by dropping the .set_rate and .round_rate function pointers from those CONFIG_PARTICIPANT struct clks. As far as the parent-changing component is concerned, it turns out that none of the CONFIG_PARTICIPANT clocks have multiple parent choices, so all that is necessary is for omap2_clk_set_parent() to bail out early if the new parent is equal to the old parent. Implement this change and get rid of the flag, which has always had a confusing name (it appears to be a Kconfig option, falsely). Signed-off-by: Paul Walmsley Cc: Richard Woodruff commit 17d092733d9ffd7fcf6da36169a60caf8400fc4c Author: Paul Walmsley Date: Mon Feb 22 22:09:15 2010 -0700 OMAP2xxx clock: drop DELAYED_APP flag from non-clksel clocks The DELAYED_APP flag is effective only with clksel clocks, so drop it from clocks that are not rate-changeable or that use non-clksel rate changing code (e.g., virt_prcm_set). Signed-off-by: Paul Walmsley Cc: Richard Woodruff commit 94297784eec057ca5425d9cd21a845b109fcaebf Author: Paul Walmsley Date: Mon Feb 22 22:09:14 2010 -0700 OMAP2xxx clock: GFX functional clock rates are not independently changeable According to the OMAP242x TRM Rev X Figure 5-15 "Clock Output Control - Functional Clocks 2", the GFX functional clocks should be marked both DELAYED_APP and CONFIG_PARTICIPANT, meaning that their rates must be reprogrammed as part of a larger OPP set change. Signed-off-by: Paul Walmsley Cc: Richard Woodruff commit c78a05e8e4a81d01135f4a03544d788b3e203d65 Author: Paul Walmsley Date: Mon Feb 22 22:09:13 2010 -0700 OMAP4 clock: drop the CLOCK_IN_OMAP4430 clock flag The CLOCK_IN_OMAP4430 clock flag is not currently needed in the OMAP4 ES1 clock tree, and platform discrimination via clock flags is deprecated in favor of the clkdev mechanism, so, drop it. (The OMAP4 clock tree autogeneration script has been updated accordingly.) Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak commit 93340a22943f3169de7d359ea14cd618114da6f6 Author: Paul Walmsley Date: Mon Feb 22 22:09:12 2010 -0700 OMAP2/3/4 clock: fix DPLL multiplier value errors; also copyrights, includes, documentation The maximum DPLL multiplier (M) values for OMAP2xxx and OMAP3xxx are one increment higher than they should be. See for example the OMAP242x TRM Rev X Section 5.10.6 "Clock Generator Registers" and the OMAP36xx TRM Rev C Table 3-202 "CM_CLKSEL1_PLL". Programming a 0 into the DPLL's M register bitfield is valid for OMAP2/3 and indicates that the DPLL should enter MN-bypass mode. Also, increase the minimum multiplier (M) value for the DPLL rate rounding code from 1 to 2, to ensure that it does not inadvertently put the DPLL into bypass. Note that the register documentation in the OMAP2xxx and OMAP3xxx TRMs does not make clear that the actual DPLL divider value (the "N") is the content of the appropriate register bitfield for the N value, _plus one_. (In other words, an N register bitfield of 0 indicates a DPLL divider value of 1.) This is only clearly documented in the OMAP4430 TRM, in, for example, OMAP4430 TRM Rev A Table 3-1167 "CM_CLKSEL_DPLL_USB". While here, update copyrights, add kerneldoc for struct dpll_data, drop the unused struct dpll_data.max_tolerance field, remove some unnecessary #includes in DPLL-related code, and replace the #include of with , which is what was really needed. The OMAP4 clock autogenerator script has been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak commit 7356f0b26b3176610b4de439e8c7bfe10c797347 Author: Vishwanath BS Date: Mon Feb 22 22:09:10 2010 -0700 OMAP3 clock: add support for 192Mhz DPLL4M2 output In 3630, DPLL4M2 output can be 96MHz or 192MHz (for SGX to run at 192). This patch has changes to support this feature. 96MHz clock is generated by dividing 192Mhz clock by 2 using CM_CLKSEL_CORE register. SGX can select Core Clock, 192MHz clock or CM_96M_FCLK as it's functional clock. In summary changes done are: 1. Added a feature called omap3_has_192mhz_clk and enabled for 3630 2. Added a new clock node called omap_192m_alwon_ck 3. Made omap_96m_alwon_fck to derive its clock from omap_192m_alwon_ck Signed-off-by: Vishwanath BS [paul@pwsan.com: fixed whitespace] Signed-off-by: Paul Walmsley commit 678bc9a2eabb7f444ef8ad1cfc5ef394e2bd8bf2 Author: Vishwanath BS Date: Mon Feb 22 22:09:09 2010 -0700 OMAP3 clock: Introduce 3630 DPLL4 HSDivider changes Divider (M2, M3, M4, M5 and M6) field width has been increased by 1 bit in 3630. This patch has changes to accommodate this in CM dynamically based on chip version. Basically new clock nodes have been added for 3630 DPLL4 M2,M3,M4,M5 and M6 and value of these nodes are used if cpu type is 3630. Signed-off-by: Vishwanath BS [paul@pwsan.com: updated to apply on 2.6.34 queue; comments added] Signed-off-by: Paul Walmsley commit 358965d7bab9c70c11b64931da02667b161cb03a Author: Richard Woodruff Date: Mon Feb 22 22:09:08 2010 -0700 OMAP3 clock: introduce DPLL4 Jtype DPLL4 for 3630 introduces a changed block called j type dpll, requiring special divisor bits and additional reg fields. To allow for silicons to use this, this is introduced as a flag and is enabled for 3630 silicon. OMAP4 also has j type dpll for usb. Tested with 3630 ZOOM3 and OMAP3430 ZOOM2 Signed-off-by: Richard Woodruff Signed-off-by: Nishanth Menon Signed-off-by: Vishwanath BS [paul@pwsan.com: added some comments; updated copyrights and credits; fixed some style issues] Signed-off-by: Paul Walmsley commit 91808a81fe7cc8a786b575ebc2d102c59d83c1a7 Author: Abhijit Pagare Date: Mon Feb 22 22:09:07 2010 -0700 ARM: OMAP4 clock domain: Add check for avoiding dependency related update. A check is added for avoiding the sleep/wakeup dependency updates for OMAP4 as the structures for the dependencies are currently absent. Signed-off-by: Abhijit Pagare [paul@pwsan.com: added warnings, explanatory comment, copyright update] Signed-off-by: Paul Walmsley commit a7e069fc5a560c096a2597d7be27f45fb4a01df7 Author: Mike Turquette Date: Wed Feb 24 12:06:00 2010 -0700 OMAP3630: Clock: Workaround for DPLL HS divider limitation This patch implements a workaround for the DPLL HS divider limitation in OMAP3630 as given by Errata ID: i556. Errata: When PWRDN bit is set, it resets the internal HSDIVIDER divide-by value (Mx). The reset value gets loaded instead of the previous value. The following HSDIVIDERs exhibit above behavior: . DPLL4 : M6 / M5 / M4 / M3 / M2 (CM_CLKEN_PLL[31:26] register bits) . DPLL3 : M3 (CM_CLKEN_PLL[12] register bit). Work Around: It is mandatory to apply the following sequence to ensure the write value will be loaded in DPLL HSDIVIDER FSM: The global sequence when using PWRDN bit is the following: . Disable Mx HSDIVIDER clock output related functional clock enable bits (in CM_FCLKEN_xxx / CM_ICLKEN_xxx) . Enable PWRDN bit of HSDIVIDER . Disable PWRDN bit of HSDIVIDER . Read current HSDIVIDER register value . Write different value in HSDIVIDER register . Write expected value in HSDIVIDER register . Enable Mx HSDIVIDER clock output related functional clocks (CM_FCLKEN_xxx / CM_ICLKEN_xxx) Signed-off-by: Mike Turquette Signed-off-by: Vishwanath BS Signed-off-by: Vijaykumar GN [paul@pwsan.com: updated patch to apply; made workaround function static; marked as being 36xx-specific] Signed-off-by: Paul Walmsley commit c23a97d377077c67e01f7526de3a411b316ee4f6 Author: Thara Gopinath Date: Wed Feb 24 12:05:58 2010 -0700 OMAP: HWMOD: Add support for early device register into omap device layer This patch adds support in omap device layer to register devices as early platform devices. Certain devices needed during system boot up like timers, gpio etc can be registered as early devices. This will allow for them to be probed very early on during system boot up. This patch adds a parameter is_early_device in omap_device_build. Depending on this parameter a call to early_platform_add_devices or platform_register_device is made. Signed-off-by: Thara Gopinath Signed-off-by: Paul Walmsley commit 358f0e630d5409ab3837b86db3595560eae773b6 Author: Thara Gopinath Date: Wed Feb 24 12:05:58 2010 -0700 OMAP3: hwmod: support to specify the offset position of various SYSCONFIG register bits. In OMAP3 Some modules like Smartreflex do not have the regular sysconfig register.Instead clockactivity bits are part of another register at a different bit position than the usual bit positions 8 and 9. In OMAP4, a new scheme is available due to the new protocol between the PRCM and the IPs. Depending of the scheme, the SYSCONFIG bitfields position will be different. The IP_REVISION register should be at offset 0x00. It should contain a SCHEME field. From this we can determine whether the IP follows legacy scheme or the new scheme. 31:30 SCHEME Used to distinguish between old scheme and current. Read 0x0: Legacy protocol. Read 0x1: New PRCM protocol defined for new OMAP4 IPs For legacy IP 13:12 MIDLEMODE 11:8 CLOCKACTIVITY 6 EMUSOFT 5 EMUFREE 4:3 SIDLEMODE 2 ENAWAKEUP 1 SOFTRESET 0 AUTOIDLE For new OMAP4 IP's, the bit position in SYSCONFIG is (for simple target): 5:4 STANDBYMODE (Ex MIDLEMODE) 3:2 IDLEMODE (Ex SIDLEMODE) 1 FREEEMU (Ex EMUFREE) 0 SOFTRESET Unfortunately In OMAP4 also some IPs will not follow any of these two schemes. This is the case at least for McASP, SmartReflex and some security IPs. This patch introduces a new field sysc_fields in omap_hwmod_sysconfig which can be used by the hwmod structures to specify the offsets for the sysconfig register of the IP.Also two static structures omap_hwmod_sysc_type1 and omap_hwmod_sysc_type2 are defined which can be used directly to populate the sysc_fields if the IP follows legacy or new OMAP4 scheme. If the IP follows none of these two schemes a new omap_hwmod_sysc_fields structure has to be defined and passed as part of omap_hwmod_sysconfig. Signed-off-by: Thara Gopinath Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 5eb75f557843132da08938609def2774ee467d95 Author: Vishwanath BS Date: Wed Feb 24 12:05:57 2010 -0700 OMAP3 clock: Remove FreqSel for 3630 DPLL_FREQSEL field in CLKEN_PLL register is no longer valid for OMAP3630. So remove references to that. Signed-off-by: Vishwanath BS Cc: Sergei Shtylyov [paul@pwsan.com: added comment fix from Sergei Shtylyov] Signed-off-by: Paul Walmsley commit 0cc9314eaf82ecf9914ad2c845574ed5e63c0374 Author: Kevin Hilman Date: Wed Feb 24 12:05:56 2010 -0700 OMAP2/3: PRCM: fix misc. compiler warnings - missing return in omap_prcm_get_reset_sources() - potential use of uninitialized variable in omap_prcm_arch_reset() Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit a51ba284076437ce36efc8dd9b15983546c043f7 Author: Sanjeev Premi Date: Wed Feb 24 12:05:56 2010 -0700 OMAP3 clock: Check return values for clk_get() This patch checks if clk_get() returned success for the clocks used in function omap2_clk_arch_init(). This version incorporates review comments from Kevin Hilman and Paul Walmsley. Signed-off-by: Sanjeev Premi Signed-off-by: Paul Walmsley commit 3cc4a2fc2ed7727828f410ab092111cb56cefd61 Author: Ranjith Lohithakshan Date: Wed Feb 24 12:05:55 2010 -0700 AM35xx: Add clock support for new modules on AM35xx This patch adds clock support for the following AM35xx modules - Ethernet MAC - CAN Controller (HECC) - New MUSB OTG Controller with integrated Phy - Video Processing Front End (VPFE) - Additional UART (UART4) Signed-off-by: Ranjith Lohithakshan Signed-off-by: Paul Walmsley commit 419cc97d3678f0fca5e60b3853dd9c1371f67805 Author: Ranjith Lohithakshan Date: Wed Feb 24 12:05:54 2010 -0700 OMAP2/3 clock: Extend find_idlest() to pass back idle state value Current implementation defines clock idle state indicators based on the cpu information (cpu_is_omap24xx() or cpu_is_omap34xx()) in a system wide manner. This patch extends the find_idlest() function in clkops to pass back the idle state indicator for that clock, thus allowing idle state indicators to be defined on a per clock basis if required. This is specifically needed on AM35xx devices as the new IPSS clocks indicates the idle status (0 is idle, 1 is ready) in a way just opposite to how its handled in OMAP3 (0 is ready, 1 is idle). Signed-off-by: Ranjith Lohithakshan [paul@pwsan.com: updated to apply after commit 98c45457 et seq.] Signed-off-by: Paul Walmsley commit cde08f81b1d7952ae00c4be2165da629ef985522 Author: Thara Gopinath Date: Wed Feb 24 12:05:50 2010 -0700 OMAP3 PM: Adding counters for power domain logic off and mem off during retention. This patch adds counters to keep track of whether the powerdomain logic or software controllable memory banks are turned off when the power domain enters retention. During power domain retention if logic gets turned off, the scenario is known as Open Switch Retention. Also during retention s/w controllable memory banks of a power domain can be chosen to be kept in retention or off. This patch adds one counter per powerdomain to track the power domain logic state during retention. Number of memory bank state counters added depends on the number of software controllable memory banks of the powerdomain. To view these counters do cat ../debug/pm_debug/count Signed-off-by: Thara Gopinath [paul@pwsan.com: conditional expressions simplified; counter increment code moved to its own function] Signed-off-by: Paul Walmsley commit 4133a44e28cb65c380903ca69806eec039401f46 Author: Thara Gopinath Date: Wed Feb 24 12:05:50 2010 -0700 OMAP3 PM: Defining .pwrsts_logic_ret field for core power domain structure This patch adds the flag .pwrsts_logic_ret info for the core power domain in the associated powerdomain structure. This flag specifies the states core domain logic can hit in event of the domain entering retention. Signed-off-by: Thara Gopinath Signed-off-by: Paul Walmsley commit 1e3d0d2ba9ce1f975ca59d9a1048175f1e9c01ac Author: Thara Gopinath Date: Wed Feb 24 12:05:49 2010 -0700 OMAP2/3 PM: Adding powerdomain APIs for reading the next logic and mem state This patch adds APIs pwrdm_read_logic_retst and pwrdm_read_mem_retst for reading the next programmed logic and memory state a powerdomain is to hit in event of the next power domain state being retention. These are needed for OSWR support. Signed-off-by: Thara Gopinath Signed-off-by: Paul Walmsley commit b024b542c3697dceb7b625773358310ee34382a6 Author: Tero Kristo Date: Wed Feb 24 12:05:48 2010 -0700 OMAP3: Clock: Added IDLEST definitions for SGX Added definitions for OMAP3430ES2_ST_SGX_SHIFT and OMAP3430ES2_ST_SGX_MASK as these were missing. Signed-off-by: Tero Kristo Signed-off-by: Paul Walmsley commit dfa6d6f892bef0afa2a39d27e4bd1763b972d206 Author: Kevin Hilman Date: Wed Feb 24 12:05:48 2010 -0700 OMAP3: clock: use std _MASK suffix for CM_FCLKEN_IVA2 defines Add _MASK suffix to CM_FCLKEN_IVA2 bitfieds to conform with the rest of the usage in cm-regbits-34xx.h of using _SHIFT and _MASK suffixes. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 24d82e3421a48a0db68026275dca64537291cf8f Author: Kevin Hilman Date: Wed Feb 24 12:05:45 2010 -0700 OMAP: omap_device: when 'called from invalid state', print state The omap_device_[enable|idle|shutdown] functions print a warning when called from an invalid state. Print the invalid state in the warning messages. This also uses __func__ to get the function name. Also, move the entire print string onto a single line to facilitate grepping or error messages. Recent discussions on LKML show strong preference for grep-able code vs. strict 80 column limit. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 0007122ad85cc36b1c18c0b59344093ca210d206 Author: Kevin Hilman Date: Wed Feb 24 12:05:45 2010 -0700 OMAP: omap_device: add omap_device_is_valid() The omap_device struct contains a 'struct platform_device'. Normally, converting a platform_device pointer to an omap_device pointer consists of simply doing a container_of(), as is done currently by the to_omap_device() macro. However, if this is attempted when using platform_device that has not been created as part of the omap_device creation, the container_of() will point to a memory location before the platform_device pointer which will contain random data. Therefore, we need a way to detect valid omap_device pointers. This patch solves this by using the simple magic number approach. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit c54113823c777f035fa7444f8841fbccda4a5cc0 Author: Jacob Pan Date: Wed Feb 24 09:42:50 2010 -0800 x86, pci: Add sanity check for PCI fixed bar probing While probing for the PCI fixed BAR capability in the extended PCI configuration space we need to make sure raw_pci_ext_ops is actually initialized. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A321E8F7@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 9eeeb09edba1e3544526611663472743ca584d36 Author: Yinghai Lu Date: Tue Feb 23 18:49:04 2010 -0800 x86, legacy_irq: Remove duplicate vector assigment Remove duplicated cfg[i].vector assignment. Signed-off-by: Yinghai Lu LKML-Reference: <4B8493A0.6080501@kernel.org> Signed-off-by: H. Peter Anvin commit 28c6a0ba30457380b140d9d7a61530eda8969180 Author: Yinghai Lu Date: Tue Feb 23 20:27:48 2010 -0800 x86, legacy_irq: Remove left over nr_legacy_irqs nr_legacy_irqs and its ilk have moved to legacy_pic. -v2: there is one in ioapic_.c Singed-off-by: Yinghai Lu LKML-Reference: <4B84AAC4.2020204@kernel.org> Signed-off-by: H. Peter Anvin commit 3746c6b6e26b8ad605f11b43e54acb3481d40980 Author: Jacob Pan Date: Fri Feb 12 05:01:12 2010 -0800 x86, mrst: Platform clock setup code Add Moorestown platform clock setup code to the x86_init abstraction. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318D2D4@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit bb24c4716185f6e116c440462c65c1f56649183b Author: Jacob Pan Date: Wed Sep 2 07:37:17 2009 -0700 x86, apbt: Moorestown APB system timer driver Moorestown platform does not have PIT or HPET platform timers. Instead it has a bank of eight APB timers. The number of available timers to the os is exposed via SFI mtmr tables. All APB timer interrupts are routed via ioapic rtes and delivered as MSI. Currently, we use timer 0 and 1 for per cpu clockevent devices, timer 2 for clocksource. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318D2D2@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 68baf495d8e559a82787f595fecc30a43bb89bb7 Author: Steve Wise Date: Mon Feb 22 22:07:22 2010 +0000 RDMA/cxgb3: Mark RDMA device with CXIO_ERROR_FATAL when removing If cxgb3 calls the iw_cxgb3 t3cclient remove function due to a device removal event, then the iwch device must be marked with CXIO_ERROR_FATAL since the device below us is going away. Otherwise, we can get stuck in a deadlock as RDMA ULPs try and deallocate objects (like MRs, QPs, etc). So always mark the device with CXIO_ERROR_FATAL when removing. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 5279d3ac2d9ca578d04c6f0c760485b0621eb393 Author: Steve Wise Date: Wed Jan 27 20:22:34 2010 +0000 RDMA/cxgb3: Don't allocate the SW queue for user mode CQs Only kernel mode CQs need the SW queue memory allocated. The SW queue for user mode CQs is allocated in userspace by libcxgb3. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 9918b28d2bf733816c5d1612fe17ca380b601b10 Author: Steve Wise Date: Fri Jan 29 00:55:49 2010 +0000 RDMA/cxgb3: Increase the max CQ depth Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit e998f245c4b2d36ae2c35446e54ccbf1fb29d9de Author: Steve Wise Date: Wed Jan 27 17:03:34 2010 +0000 RDMA/cxgb3: Doorbell overflow avoidance and recovery T3 hardware doorbell FIFO overflows can cause application stalls due to lost doorbell ring events. This has been seen when running large NP IMB alltoall MPI jobs. The T3 hardware supports an xon/xoff-type flow control mechanism to help avoid overflowing the HW doorbell FIFO. This patch uses these interrupts to disable RDMA QP doorbell rings when we near an overflow condition, and then turn them back on (and ring all the active QP doorbells) when when the doorbell FIFO empties out. In addition if an doorbell ring is dropped by the hardware, the code will now recover. Design: cxgb3: - enable these DB interrupts - in the interrupt handler, schedule work tasks to call the ULPs event handlers with the new events. - ring all the qset txqs when an overflow is detected. iw_cxgb3: - disable db ringing on all active qps when we get the DB_FULL event - enable db ringing on all active qps and ring all active dbs when we get the DB_EMPTY event - On DB_DROP event: - disable db rings in the event handler - delay-schedule a work task which rings and enables the dbs on all active qps. - in post_send and post_recv logic, don't ring the db if it's disabled. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 17a55f79fd8051a6a8a6e84176c83af71877a98b Author: Alexander Chiang Date: Tue Feb 2 19:09:16 2010 +0000 IB/core: Pack struct ib_device a little tighter A small change to reduce the size of ib_device to 1112 bytes (from 1128). Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit cdb8e43889a5d21ce706f5a93d3e1c9940cde1dc Author: Alexander Chiang Date: Tue Feb 2 19:09:11 2010 +0000 IB/ucm: Clean whitespace errors As shown when 'let c_space_errors=1' is set in vim. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit daa913580e1a927aaf54f02ecfdf59c7b6bc2f6e Author: Alexander Chiang Date: Tue Feb 2 19:09:06 2010 +0000 IB/ucm: Increase maximum devices supported Some large systems may support more than IB_UCM_MAX_DEVICES (currently 32). This change allows us to support more devices in a backwards-compatible manner. the first IB_UCM_MAX_DEVICES keep the same major/minor device numbers they've always had. If there are more than IB_UCM_MAX_DEVICES, then we dynamically request a new major device number (new minors start at 0). Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 31d14b6e10657113f72d496121d52ca779156b2e Author: Alexander Chiang Date: Tue Feb 2 19:09:00 2010 +0000 IB/ucm: Use stack variable 'base' in ib_ucm_add_one This change is not useful by itself, but sets us up for a future change that allows us to support more than IB_UCM_MAX_DEVICES. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit dd08f702dd773004b81aeddcd120b052a42710c3 Author: Alexander Chiang Date: Tue Feb 2 19:08:55 2010 +0000 IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one This change is not useful by itself, but sets us up for a future change that allows us to dynamically allocate device numbers in case we have more than IB_UCM_MAX_DEVICES in the system. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit d3f2c67f2d10675f45b0d9257269420e9f59aa1a Author: Alexander Chiang Date: Tue Feb 2 19:08:50 2010 +0000 IB/umad: Clean whitespace Clean errors as shown when 'let c_space_errors=1' is set in vim. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 8698d3feccda66fcb52748e7c7690bd1003f7849 Author: Alexander Chiang Date: Tue Feb 2 19:08:45 2010 +0000 IB/umad: Increase maximum devices supported Some large systems may support more than IB_UMAD_MAX_PORTS (currently 64). This change allows us to support more ports in a backwards-compatible manner. The first IB_UMAD_MAX_PORTS keep the same major/minor device numbers they've always had. If there are more than IB_UMAD_MAX_PORTS, we then dynamically request a new major device number (new minors start at 0). Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit dc2ed5e3c963490a4fe934b482537d1274961ecb Author: Alexander Chiang Date: Tue Feb 2 19:08:40 2010 +0000 IB/umad: Use stack variable 'base' in ib_umad_init_port This change is not useful by itself, but sets us up for a future change that allows us to support more than IB_UMAD_MAX_PORTS in a system. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit d451b8df9f7e572ea77f976745f424dd1dae8aeb Author: Alexander Chiang Date: Tue Feb 2 19:08:35 2010 +0000 IB/umad: Use stack variable 'devnum' in ib_umad_init_port This change is not useful by itself, but sets us up for a future change that allows us to dynamically allocate device numbers in case we have more than IB_UMAD_MAX_PORTS in the system. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 6aa2a86ec430fb1ae739bd065d7ea6596997a2cf Author: Alexander Chiang Date: Tue Feb 2 19:08:30 2010 +0000 IB/umad: Remove port_table[] We no longer need this data structure, as it was used to associate an inode back to a struct ib_umad_port during ->open(). But now that we're embedding a struct cdev in struct ib_umad_port, we can use the container_of() macro to go from the inode back to the device instead. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 2b937afcab34e4f739e2f7cd6062870fbe6b2ccf Author: Alexander Chiang Date: Tue Feb 2 19:08:25 2010 +0000 IB/umad: Convert *cdev to cdev in struct ib_umad_port Instead of storing pointers to cdev and sm_cdev, embed the full structures instead. This change allows us to use the container_of() macro in ib_umad_open() and ib_umad_sm_open() in a future patch. This change increases the size of struct ib_umad_port to 320 bytes from 128. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 9afed76d59749f1b95e5e1d7d5bc4c3041852aa9 Author: Alexander Chiang Date: Tue Feb 2 19:08:19 2010 +0000 IB/uverbs: Whitespace cleanup Clean up the errors as shown when 'let c_space_errors=1' is set in vim. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 830a38713816fb1f0d05efc339bf41e91ac74379 Author: Alexander Chiang Date: Tue Feb 2 19:08:14 2010 +0000 IB/uverbs: Pack struct ib_uverbs_event_file tighter Eliminate some padding in the structure by rearranging the members. sizeof(struct ib_uverbs_event_file) is now 72 bytes (from 80) and more members now fit in the first cacheline. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 6d6a0e71eec5886f2511632a38f28f1ed7794d70 Author: Alexander Chiang Date: Tue Feb 2 19:08:09 2010 +0000 IB/uverbs: Increase maximum devices supported Some large systems may support more than IB_UVERBS_MAX_DEVICES (currently 32). This change allows us to support more devices in a backwards-compatible manner. The first IB_UVERBS_MAX_DEVICES keep the same major/minor device numbers that they've always had. If there are more than IB_UVERBS_MAX_DEVICES, we then dynamically request a new major device number (new minors start at 0). This change increases the maximum number of HCAs to 64 (from 32). Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit ddbd6883013dcc9f9ca5c0b26f79d9334a95926c Author: Alexander Chiang Date: Tue Feb 2 19:08:04 2010 +0000 IB/uverbs: use stack variable 'base' in ib_uverbs_add_one This change is not useful by itself, but sets us up for a future change that allows us to support more than IB_UVERBS_MAX_DEVICES in a system. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 38707980c42c58e2d00b34ecaa40cf5207bdd9d1 Author: Alexander Chiang Date: Tue Feb 2 19:07:59 2010 +0000 IB/uverbs: Use stack variable 'devnum' in ib_uverbs_add_one This change is not useful by itself, but it sets us up for a future change that allows us to dynamically allocate device numbers in case we have more than IB_UVERBS_MAX_DEVICES in the system. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 2a72f212263701b927559f6850446421d5906c41 Author: Alexander Chiang Date: Tue Feb 2 19:07:54 2010 +0000 IB/uverbs: Remove dev_table dev_table's raison d'etre was to associate an inode back to a struct ib_uverbs_device. However, now that we've converted ib_uverbs_device to contain an embedded cdev (instead of a *cdev), we can use the container_of() macro and cast back to the containing device. There's no longer any need for dev_table, so get rid of it. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 055422ddbb0a7610c5f57a056743d7336a39e90f Author: Alexander Chiang Date: Tue Feb 2 19:07:49 2010 +0000 IB/uverbs: Convert *cdev to cdev in struct ib_uverbs_device Instead of storing a pointer to a cdev, embed the entire struct cdev. This change allows us to use the container_of() macro in ib_uverbs_open() in a future patch. This change increases the size of struct ib_uverbs_device to 168 bytes across 3 cachelines from 80 bytes in 2 cachelines. However, we rearrange the members so that everything fits into the first cacheline except for the struct cdev. Finally, we don't touch the cdev in any fastpaths, so this change shouldn't negatively affect performance. Signed-off-by: Alex Chiang Signed-off-by: Roland Dreier commit 7fe2b3190b8b299409f13cf3a6f85c2bd371f8bb Author: David Teigland Date: Wed Feb 24 11:08:18 2010 -0600 dlm: fix ordering of bast and cast When both blocking and completion callbacks are queued for lock, the dlm would always deliver the completion callback (cast) first. In some cases the blocking callback (bast) is queued before the cast, though, and should be delivered first. This patch keeps track of the order in which they were queued and delivers them in that order. This patch also keeps track of the granted mode in the last cast and eliminates the following bast if the bast mode is compatible with the preceding cast mode. This happens when a remotely mastered lock is demoted, e.g. EX->NL, in which case the local node queues a cast immediately after sending the demote message. In this way a cast can be queued for a mode, e.g. NL, that makes an in-transit bast extraneous. Signed-off-by: David Teigland commit 88ec415772144f4fc4a50b123bb6200de686898d Author: Or Gerlitz Date: Mon Feb 8 13:23:11 2010 +0000 IB/iser: Remove redundant locking from iser scsi command response flow Currently the iSER receive completion flow takes the session lock twice. Optimize it to avoid the first one by letting iser_task_rdma_finalize() be called only from the cleanup_task callback invoked by iscsi_free_task, thus reducing the contention on the session lock between the scsi command submission to the scsi command completion flows. Signed-off-by: Or Gerlitz Reviewed-by: Mike Christie Signed-off-by: Roland Dreier commit 962b4b528ba87c8d837bb04794a1918c7de631cd Author: Or Gerlitz Date: Mon Feb 8 13:22:34 2010 +0000 IB/iser: Use libiscsi passthrough mode libiscsi passthrough mode invokes the transport xmit calls directly without first going through an internal queue, unlike the other mode, which uses a queue and a xmitworker thread. Now that the "cant_sleep" prerequisite of iscsi_host_alloc is met, move to use it. Handling xmit errors is now done by the passthrough flow of libiscsi. Since the queue/worker aren't used in this mode, the code that schedules the xmitworker is removed. Signed-off-by: Or Gerlitz Reviewed-by: Mike Christie Signed-off-by: Roland Dreier commit aae3c995ff74a183d15207436d383942485b2edd Author: Or Gerlitz Date: Mon Feb 8 13:21:18 2010 +0000 IB/iser: Remove unnecessary connection checks Remove unnecessary checks for the IB connection state and for QP overflow, as conn state changes are reported by iSER to libiscsi and handled there. QP overflow is theoretically possible only when unsolicited data-outs are used; anyway it's being checked and handled by HW drivers. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 528f4e8c8341706a354ff96daf615e678e9b296f Author: Or Gerlitz Date: Mon Feb 8 13:20:43 2010 +0000 IB/iser: Use atomic allocations Two minor flows in iSER's data path still use allocations; move them to be atomic as a preperation step towards moving to use libiscsi passthrough mode. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit f19624aa92003969ba822cd3c552800965aa530b Author: Or Gerlitz Date: Mon Feb 8 13:19:56 2010 +0000 IB/iser: Simplify send flow/descriptors Simplify and shrink the logic/code used for the send descriptors. Changes include removing struct iser_dto (an unnecessary abstraction), using struct iser_regd_buf only for handling SCSI commands, using dma_sync instead of dma_map/unmap, etc. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 78ad0a34dc138047529058c5f2265664cb70a052 Author: Or Gerlitz Date: Mon Feb 8 13:19:21 2010 +0000 IB/iser: Use different CQ for send completions Use a different CQ for send completions, where send completions are polled by the interrupt-driven receive completion handler. Therefore, interrupts aren't used for the send CQ. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 704315f082d473b34047817f0a6a01924f38501e Author: Or Gerlitz Date: Mon Feb 8 13:18:39 2010 +0000 IB/iser: Remove atomic counter for posted receive buffers Now that both the posting and reaping of receive buffers is done in the completion path, the counter of outstanding buffers not be atomic. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit bcc60c381d857ced653e912cbe6121294773e147 Author: Or Gerlitz Date: Mon Feb 8 13:17:42 2010 +0000 IB/iser: New receive buffer posting logic Currently, the recv buffer posting logic is based on the transactional nature of iSER which allows for posting a buffer before sending a PDU. Change this to post only when the number of outstanding recv buffers is below a water mark and in a batched manner, thus simplifying and optimizing the data path. Use a pre-allocated ring of recv buffers instead of allocating from kmem cache. A special treatment is given to the login response buffer whose size must be 8K unlike the size of buffers used for any other purpose which is 128 bytes. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 1cef4659850eeb862c248c7670e404d7a1711ed1 Author: Or Gerlitz Date: Mon Feb 8 13:17:11 2010 +0000 IB/iser: Revert commit bba7ebb "avoid recv buffer exhaustion" We will make a major change in the recv buffer posting logic, after which the problem commit bba7ebb "avoid recv buffer exhaustion caused by unexpected PDUs" comes to solve doesn't exist any more, so revert it. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 0f234214d15fa914436d304ecf5c3e43449e79f9 Author: Jan Engelhardt Date: Wed Feb 24 18:36:04 2010 +0100 netfilter: xtables: reduce arguments to translate_table Just pass in the entire repl struct. In case of a new table (e.g. ip6t_register_table), the repldata has been previously filled with table->name and table->size already (in ip6t_alloc_initial_table). Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 6bdb331bc6910d1ccb74dc9852fc858c5916c927 Author: Jan Engelhardt Date: Wed Feb 24 18:35:37 2010 +0100 netfilter: xtables: optimize call flow around xt_ematch_foreach Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit dcea992aca82cb08b4674c4c783e325835408d1e Author: Jan Engelhardt Date: Wed Feb 24 18:34:48 2010 +0100 netfilter: xtables: replace XT_MATCH_ITERATE macro The macro is replaced by a list.h-like foreach loop. This makes the code more inspectable. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 0559518b5b99c591226460c0bbf8e6a570c518a8 Author: Jan Engelhardt Date: Wed Feb 24 18:33:43 2010 +0100 netfilter: xtables: optimize call flow around xt_entry_foreach Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 72b2b1dd77e8feb0b7c0b26dee58f2a1e2c9828c Author: Jan Engelhardt Date: Wed Feb 24 18:32:59 2010 +0100 netfilter: xtables: replace XT_ENTRY_ITERATE macro The macro is replaced by a list.h-like foreach loop. This makes the code much more inspectable. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 23e2af3518facab6838d7aac1f46fbd7a5a290ce Author: dingdinghua Date: Wed Feb 24 12:11:20 2010 -0500 jbd2: clean up an assertion in jbd2_journal_commit_transaction() commit_transaction has the same value as journal->j_running_transaction, so we can simplify the assert statement. Signed-off-by: dingdinghua Signed-off-by: "Theodore Ts'o" commit 56c50f11f4d11cb14d78fe52330efb69d219c62f Author: Dmitry Monakhov Date: Mon Mar 1 23:28:41 2010 -0500 ext4: trivial quota cleanup The patch is aimed to reorganize and simplify quota code a bit. Quota code is itself complex enough, but we can make it more readable in some places: - Move quota option parsing to separate functions. - Simplify old-quota and journaled-quota mix check. Signed-off-by: Dmitry Monakhov Acked-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 482a74258fd08d30bf2ab0f5549afab5a5c9daba Author: Dmitry Monakhov Date: Wed Feb 24 11:35:32 2010 -0500 ext4: mount flags manipulation cleanup Replace intermediate EXT4_MOUNT_XXX flags manipulation to corresponding macro. Signed-off-by: Dmitry Monakhov Acked-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit c8d46e41bc744c8fa0092112af3942fcd46c8b18 Author: Jiaying Zhang Date: Wed Feb 24 09:52:53 2010 -0500 ext4: Add flag to files with blocks intentionally past EOF fallocate() may potentially instantiate blocks past EOF, depending on the flags used when it is called. e2fsck currently has a test for blocks past i_size, and it sometimes trips up - noticeably on xfstests 013 which runs fsstress. This patch from Jiayang does fix it up - it (along with e2fsprogs updates and other patches recently from Aneesh) has survived many fsstress runs in a row. Signed-off-by: Eric Sandeen Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit d62abe563fa4718e7f85f3e871655434db92366d Author: Misael Lopez Cruz Date: Tue Feb 23 18:10:19 2010 -0600 OMAP4: PMIC: Add support for twl6030 codec In order to have TWL6030 CODEC driver as a platform driver, codec data should be passed through twl_platform_data structure. For twl6030 audio codec, the following data may be passed: - audpwron_gpio: gpio line used to power-up/down the codec. A low-to-high transition powers codec up. Setting audpwron_gpio to a negative value means that codec will use manual power sequence instead of automatic sequence - naudint_irq: irq line for audio interrupt. twl6030 drives NAUDINT line to low when an interrupt (codec ready, plug insertion/removal, etc) is detected However, codec driver can operate if any or none of them are passed. Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Cabrera Signed-off-by: Jorge Eduardo Candelaria Acked-by: Samuel Ortiz Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7c821a179f91c3ad52588400ce52a7fb48b9868c Author: Jiri Kosina Date: Wed Feb 24 13:55:31 2010 +0100 Remove fs/ntfs/ChangeLog Remove fs/ntfs/ChangeLog. No need for such files since we have git. Acked-by: Anton Altaparmakov Signed-off-by: Jiri Kosina commit a8ab0102d7f031e477dbe31450d5b69d40bea324 Author: Thadeu Lima de Souza Cascardo Date: Mon Feb 1 15:57:15 2010 -0200 doc: fix console doc typo Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit ddbfeb396eb085e17f5aa830a151d546f16cb868 Author: Tomi Valkeinen Date: Wed Feb 17 15:01:50 2010 +0200 OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE Remove the option for forcing auto-update. Auto-update for manual update displays is no more a DSS feature, so if a particular display devices does have auto-update mode, it should be in display's custom settings. Signed-off-by: Tomi Valkeinen commit 942a91a6e04e996c32252bc6c2177f74089d7a1d Author: Tomi Valkeinen Date: Wed Feb 10 17:27:39 2010 +0200 OMAP: DSS2: DSI: remove external TE support With the reworked model, DSI driver doesn't need to know anything about external TE lines. Thus we can remove ext_te support, and only leave the DSI TE trigger support. Signed-off-by: Tomi Valkeinen commit 69b2048f44ead2d278e25d12adf0494b469ffb1c Author: Tomi Valkeinen Date: Wed Jan 20 12:11:25 2010 +0200 OMAP: DSS2: move timing functions Move check/set/get_timings() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 3651131268d7eae63efdffe6fa4a361abd44d747 Author: Tomi Valkeinen Date: Tue Jan 19 15:53:16 2010 +0200 OMAP: DSS2: move set/get_wss() Move set/get_wss() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 37ac60e414052f1d9301368437db8f0cb9e323fe Author: Tomi Valkeinen Date: Tue Jan 12 15:12:07 2010 +0200 OMAP: DSS2: move enable/disable/suspend/resume Move enable/disable/suspend/resume from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 18946f62c6cc8cf051bafca8b7fa72309e8a1067 Author: Tomi Valkeinen Date: Tue Jan 12 14:16:41 2010 +0200 OMAP: DSS2: move update() and sync() Move update() and sync() from omap_dss_device to omap_dss_driver. Also, update was hardcoded to use virtual channel 0. This patch adds a parameter that specifies the VC. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 446f7bff703f5f82560afde90fb22b7a1d366bbc Author: Tomi Valkeinen Date: Mon Jan 11 16:12:31 2010 +0200 OMAP: DSS2: move set/get_update_mode() Move set/get_update_mode() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 225b650d41e7cdbf5cd322a461b04493caabed09 Author: Tomi Valkeinen Date: Mon Jan 11 15:11:01 2010 +0200 OMAP: DSS2: move enable/get_te() Move enable/get_te() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit a269950405ab17ce3a604ddcd939709a4a7a747c Author: Tomi Valkeinen Date: Mon Jan 11 14:33:40 2010 +0200 OMAP: DSS2: move get_recommended_bpp() Move get_recommended_bpp() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 96adceceedefff9b849d25ff582bc6f516903994 Author: Tomi Valkeinen Date: Mon Jan 11 13:54:33 2010 +0200 OMAP: DSS2: move get_resolution() Move get_resolution() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit a2faee84f6d8e35150d60514c6638d223509fa13 Author: Tomi Valkeinen Date: Fri Jan 8 17:14:53 2010 +0200 OMAP: DSS2: move enable/disable_channel to overlay manager Move enable/disable_channel() from omap_dss_device to overlay manager. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 3f71cbe736e7e9909559fcc4463f43e4b4b348a8 Author: Tomi Valkeinen Date: Fri Jan 8 17:06:04 2010 +0200 OMAP: DSS2: move wait_vsync() Move wait_vsync() from omap_dss_device to overlay manager. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 87424e1bffeaea7bf9e2b8afc16fe584a8641e5e Author: Tomi Valkeinen Date: Fri Jan 8 16:52:48 2010 +0200 OMAP: DSS2: move get/set_rotate() Move get/set_rotate() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 8d8aa61dcf8721021cd5c0c86a14ef944535fa54 Author: Tomi Valkeinen Date: Fri Jan 8 16:30:33 2010 +0200 OMAP: DSS2: move set/get_mirror() Move set/get_mirror() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit c75d9464c1fa315796e78468bfaf32f2ce676fed Author: Tomi Valkeinen Date: Fri Jan 8 16:56:44 2010 +0200 OMAP: DSS2: move memory_read() Move memory_read() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 1a75ef422d0d1319bc0fab66b0bf339069519d8c Author: Tomi Valkeinen Date: Fri Jan 8 16:21:28 2010 +0200 OMAP: DSS2: move run_test() Move run_test() from omap_dss_device to omap_dss_driver. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit 1bbb275e261eb204795d4a48b3e485f2ad3d627c Author: Tomi Valkeinen Date: Mon Jan 11 16:41:10 2010 +0200 OMAP: DSS2: DSI: remove auto-update perf measurement Remove performance measurement for auto-update. Auto-update and thus performance measurement cannot be supported after the driver change where the control is moved to display drivers. This is part of a larger patch-set, which moves the control from omapdss driver to the display driver. Signed-off-by: Tomi Valkeinen commit b9eb5d7d0b9bf7c6430374333e4b9dae73bbba20 Author: Tomi Valkeinen Date: Mon Jan 11 16:33:56 2010 +0200 OMAP: DSS2: DSI: change DSI bus_lock to semaphore Physical DSI bus is protected by a mutex. This patch changed the mutex to a semaphore, so that we can lock and unlock the bus_lock from different threads. This is needed as the update process is started by user space program, and thus the lock is acquired in that context, but the lock can be released in different context, a work thread via irq. Signed-off-by: Tomi Valkeinen commit 197d4db752e67160d79fed09968c2140376a80a3 Author: David Härdeman Date: Wed Feb 24 02:08:29 2010 -0800 Input: winbond-cir - fix suspend/resume This fixes suspend/resume problem with the driver caused by the fact that ACPI _DIS method would completely power off the SP3 module leaving the output lines (including IRQ lines) in an undefined state. This could cause spurious interrupts and requires reinitializing hardware from scratch during resume. This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=15257 Signed-off-by: David Härdeman Signed-off-by: Dmitry Torokhov commit e21a05cb408bb9f244f11a0813d4b355dad0822e Author: GeunSik Lim Date: Wed Feb 24 11:06:39 2010 +0100 doc: cpuset: Update the cpuset flag file This patch is for modifying with correct cuset flag file. We need to update current manual for cpuset. For example, before) cpus, cpu_exclusive, mems after ) cpuset.cpus, cpuset.cpu_exclusive, cpuset.mems Signed-off-by: Geunsik Lim Acked-by: Paul Menage Signed-off-by: Jiri Kosina commit 08268b78d6f0c659dc1d86453c57b336f6f4f9ae Author: Baruch Siach Date: Wed Feb 24 11:31:31 2010 +0200 mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level ARCH_MXC_IOMUX_V3 is not specific to the i.MX25 PDK platform. Thus, ARCH_MXC_IOMUX_V3 should be selected by ARCH_MX25. Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 82d52a1948254aa3f35ca1a24c23284bd9f9a9c2 Author: Fabio Estevam Date: Wed Feb 17 12:02:56 2010 -0800 mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function This patch is to be applied into Sascha's mxc-master branch. Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage. Signed-off-by: Fabio Estevam Acked-by: Amit Kucheria Signed-off-by: Sascha Hauer commit cd6eb9808ce54caeea779e785e19a9b9bea97e43 Author: Mark Brown Date: Tue Feb 23 11:05:11 2010 +0000 mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support SSI5 on the CPU is connected to the PMIC module to provide audio support so unconditionally configure the relevant pins on the CPU to route out the signals. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit bac3fcfad565c9bbceeed8b607f140c29df97355 Author: Uwe Kleine-König Date: Mon Feb 15 09:47:55 2010 +0100 arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode mxc_gpio_mode checks for invalid pins and so it returns zero for success, -EINVAL for invalid pins. While at it, remove definitions of GPIO_PORT_MAX removed as they are unused now. Signed-off-by: Uwe Kleine-König commit e835d88e71f54c048a8cc907cc34084f1dd5846b Author: Uwe Kleine-König Date: Tue Feb 16 11:07:49 2010 +0100 arm/imx: let platform files include the SoC-specific iomux header Signed-off-by: Uwe Kleine-König commit 111588f8304b7e13f107bd4c590e8d3939ad907d Author: Uwe Kleine-König Date: Mon Feb 15 21:52:34 2010 +0100 arm/imx/iomux-v1: rename header file Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3 platform files should include their platform iomux header from now on. For now iomux.h simply includes all iomux-v1 platform headers and so provides compatibility until all files are converted. Signed-off-by: Uwe Kleine-König commit 261f6f681ced65de82a619f6802ebe82fd9af080 Author: Uwe Kleine-König Date: Mon Feb 15 21:18:43 2010 +0100 arm/mx25: don't include iomux.h which is for iomux-v1 machines Signed-off-by: Uwe Kleine-König commit 2f6c97c48e727d1bbd3131527380da19161f6f5f Author: Uwe Kleine-König Date: Mon Feb 15 21:10:39 2010 +0100 arm/imx/iomux-mx3.h: unify style and comments - use __MACH_IOMUX_MX3_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 8902cbd9dbd290ce273c372eec08dfdb14757a47 Author: Uwe Kleine-König Date: Mon Feb 15 21:04:17 2010 +0100 arm/imx/iomux-mx2x: unify style - use __MACH_IOMUX_MX2x_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6056154145bd6c6ec4eeeaee65f6b12c5b88b1d7 Author: Uwe Kleine-König Date: Mon Feb 15 20:56:03 2010 +0100 arm/imx/iomux-mx27: unify style and comments - use __MACH_IOMUX_MX27_H__ as header protector analogous to - use tabs for indention - fix sorting Signed-off-by: Uwe Kleine-König commit e76feb87422c0bb7517cd97be342f55fab743d3a Author: Uwe Kleine-König Date: Mon Feb 15 20:50:57 2010 +0100 arm/imx/iomux-mx25: unify style and comment cleanup - use __MACH_IOMUX_MX25_H__ as header protector analogous to - remove doxygen comments - remove #error about mach/iomux.h which is unused on mx25 - remove #ifndef __ASSEMBLY__ which is unneeded here Signed-off-by: Uwe Kleine-König commit 6985a719f96e1d83258b47eb170bf44969860ca3 Author: Uwe Kleine-König Date: Mon Feb 15 20:46:47 2010 +0100 arm/imx/iomux-mx21: unify style - use __MACH_IOMUX_MX21_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6863f1981060832536f2d06c20c0219b2e74c477 Author: Uwe Kleine-König Date: Mon Feb 15 20:39:59 2010 +0100 arm/imx/iomux-mx1: unify style and comment cleanup - use __MACH_IOMUX_MX1_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit f021b5a1ef1b229ddc8c5cf3f2c5da308d974a5a Author: Uwe Kleine-König Date: Mon Feb 15 16:57:09 2010 +0100 arm/imx/iomux-v1: make base address a runtime choice While at it move register modification to static inlines and so make the relevant code more readable. Signed-off-by: Uwe Kleine-König commit 5e2e95f520538e095d10456acd28d9107317aa32 Author: Uwe Kleine-König Date: Mon Feb 15 09:42:59 2010 +0100 arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff Signed-off-by: Uwe Kleine-König commit 8735fde2d0c42ae914d3e68d967612ff417f463c Author: Uwe Kleine-König Date: Wed Feb 17 22:17:43 2010 +0100 arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König commit e9f49d4183759e4d8469ac86189ef8bc4374cccc Author: Uwe Kleine-König Date: Wed Feb 17 19:37:05 2010 +0100 arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0 Signed-off-by: Uwe Kleine-König commit 8e3a6e7fa739d021324d813cd6fdd1c5c7998774 Author: Uwe Kleine-König Date: Wed Feb 17 21:05:27 2010 +0100 arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3 Signed-off-by: Uwe Kleine-König commit abf61632884ae6bfd1e7b967d5254fa7b5191e7b Author: Uwe Kleine-König Date: Wed Feb 17 21:08:00 2010 +0100 arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König commit 220f7f307015e876a11bf906bf9d7fe669a097a1 Author: Uwe Kleine-König Date: Mon Feb 15 17:11:17 2010 +0100 arm/imx: don't depend on ARCH_MXC twice MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow. Signed-off-by: Uwe Kleine-König commit a8e33260ce184aea367fa11ae8bd3ab941e75b49 Author: Uwe Kleine-König Date: Fri Feb 19 15:29:26 2010 +0100 arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block COMMON_CLKDEV is used on all imx platforms, so this isn't used. Signed-off-by: Uwe Kleine-König commit 44fb5d1945fe87f3299de5e2e0581f092e8dd455 Author: Uwe Kleine-König Date: Fri Feb 19 17:08:42 2010 +0100 arm/imx: remove MTD_XIP support This is broken since at least one year when ec996ba (mxc timer: make compile time independent) removed the symbol MXC_TCN. Signed-off-by: Uwe Kleine-König commit 9f69fdb36da31672b0e40712fed494182530c887 Author: Uwe Kleine-König Date: Fri Feb 19 16:16:09 2010 +0100 arm/imx: don't explicitly select GENERIC_GPIO ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO Signed-off-by: Uwe Kleine-König commit 03e09cd8902717b66f940357257d8ad76114d9f2 Author: Uwe Kleine-König Date: Mon Feb 15 17:10:42 2010 +0100 arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily Signed-off-by: Uwe Kleine-König commit 401d87dd66693605147f955ac2a4f1c0ac155027 Author: Uwe Kleine-König Date: Mon Feb 15 09:54:46 2010 +0100 arm/imx: remove "NO_PAD_CTRL" from Copyright statements I assume this was introduced by something like sed -i -e 's/)/, NO_PAD_CTRL)' Signed-off-by: Uwe Kleine-König commit 8e9980588c734c29f4322922e35ea509168e9fb5 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v2: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 51918075d74978d6ca6ec14c81f55938f24108a2 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v1: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 6574305b0ed32f286dcebd653a2f3ba4e421f06c Author: Uwe Kleine-König Date: Mon Feb 8 21:07:16 2010 +0100 arm/imx/gpio: remove a BUG_ON in hot path Now if the problem occurs that triggered the BUG_ON before, the machine runs in a NULL pointer dereference. So it wouldn't be much harder now to debug the situation if it occured. Signed-off-by: Uwe Kleine-König commit 3621f188b945a9f9bc1387115834041b7a4619e0 Author: Uwe Kleine-König Date: Mon Feb 8 21:02:30 2010 +0100 arm/imx/gpio: use fls to find set bits in the irq status register As in most cases only few irqs are pending using fls is more effective than looping over all bits. Signed-off-by: Uwe Kleine-König commit 3244c3e7797d235250cd01d4a1d3f60b3b2f6261 Author: Uwe Kleine-König Date: Mon Feb 8 20:34:27 2010 +0100 arm/imx: use generic_handle_irq instead of open-coding it Signed-off-by: Uwe Kleine-König commit 3d40f7fef45c0173e98dcdad6a9d642127331c66 Author: Uwe Kleine-König Date: Fri Feb 5 22:14:37 2010 +0100 arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constant GPIO_INT_LOW_LEV is defined as (cpu_is_mx1_mx2() ? 0x3 : 0x0) so depending on compiler optimisation and enabled SoCs this doesn't qualify as a constant expression as needed by a switch statement. Ditto for GPIO_INT_HIGH_LEV. Signed-off-by: Uwe Kleine-König commit 4a50d00cb90dd5dd79e40281a8719a1fc673c2a5 Author: Uwe Kleine-König Date: Fri Feb 5 22:00:11 2010 +0100 arm/mx2: split generic.c into mm-imx2[17].c This removes some #ifdefs and prepares moving the files in a directory with more than imx21 and imx27 support. Signed-off-by: Uwe Kleine-König commit 621b0e53b5059bf5641c3294c31ac2949c966c93 Author: Uwe Kleine-König Date: Fri Feb 5 17:44:33 2010 +0100 arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any more The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it doesn't rely on deprecated symbols any more. Signed-off-by: Uwe Kleine-König commit 897359d596ca406aaa9f9687b439b4498b579d7f Author: Uwe Kleine-König Date: Fri Feb 5 17:40:28 2010 +0100 arm/mx2: define seperate gpio port descriptions for imx21 and imx27 As the gpio ports have different addresses on imx21 and imx27 there are two different port descriptions needed if not relying on the overloaded cpp macro IO_ADDRESS. So some cpp magic is added to minimize code duplication. Signed-off-by: Uwe Kleine-König commit 3636a145321573f2f735e3ae69f87e0fb166abec Author: Uwe Kleine-König Date: Thu Feb 11 16:31:49 2010 +0100 arm/mx2: use per-SOC nand device The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König commit dd2b4a7abf82d88261f8f98e1361388a7db2ffe4 Author: Zhang, Rui Date: Wed Feb 24 09:38:49 2010 +0800 ALSA: hda - remove unnecessary msleep on power state transitions This will save ~15ms boot time. The first 10ms sleep was introduced in commit d2595d86e5 for (buggy) Cxt codecs, so better to limit the sleep to the problem hardware. For the second 10ms sleep, the HDA spec says: Power State[1:0]: 00: Node Power state (D0) is fully on. 01: Node Power state (D1) allows for (does not require) the lowest possible power consuming state from which it can return to the "fully on" state (D0) within 10 ms, excepting analog pass through circuits (e.g., CD analog playback) which must remain fully on. 10: Node Power state (D2) allows for (does not require) the lowest possible power consuming state from which it can return to the "fully on" state (D0) within 10 ms. For modems, this is the "wake on ring" power state. 11: Node Power state (D3) allows for (does not require) lowest possible power consuming state under software control. Note that any low power state set by software must retain sufficient operational capability to properly respond to subsequent software Power State command. So 10ms is actually the max wait time. It should be safe to remove/reduce it and rely on the loop of 1ms-sleeps. CC: Marc Boucher CC: Arjan van de Ven Signed-off-by: Zhang Rui Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit c5ecc484c528ff50bdbb16fbfbac758ee368b329 Author: Akinobu Mita Date: Wed Feb 24 08:30:08 2010 +0100 pktcdvd: use BIO list management functions Now that the bio list management stuff is generic, convert pktcdvd to use bio lists instead of its own private bio list implementation. Signed-off-by: Akinobu Mita Acked-by: Peter Osterlund Cc: Christoph Hellwig Signed-off-by: Jens Axboe commit cf089455966e21aeb8e4cd2669e0c1885667b04e Author: Feng Tang Date: Fri Feb 12 03:37:38 2010 -0800 x86, mrst: Add vrtc platform data setup code vRTC information is obtained from SFI tables on Moorestown, this patch parses these tables and assign the information. Signed-off-by: Feng Tang LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D0D@orsmsx508.amr.corp.intel.com> Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit 16ab5395856d8953ae3d81e81bd6a8c269a1bfd6 Author: Jacob Pan Date: Fri Feb 12 03:08:30 2010 -0800 x86, mrst: Add platform timer info parsing code Moorestown platform timer information is obtained from SFI FW tables. This patch parses SFI table then assign the irq information to mp_irqs. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D0B@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit af2730f6eefce24c4ef1dc3f8267d33626db81bc Author: Jacob Pan Date: Fri Feb 12 10:31:47 2010 -0800 x86, mrst: Fill in PCI functions in x86_init layer This patch added Moorestown platform specific PCI init functions. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D0A@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 5b78b6724a405d4b649db53f7aac28c930c89640 Author: Jacob Pan Date: Fri Feb 12 02:29:11 2010 -0800 x86, mrst: Add dummy legacy pic to platform setup Moorestown has no legacy PIC; point it to the null legacy PIC. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D09@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit a712ffbc199849364c46e9112b93b66de08e2c26 Author: Jesse Barnes Date: Thu Feb 4 10:59:27 2010 -0800 x86/PCI: Moorestown PCI support The Moorestown platform only has a few devices that actually support PCI config cycles. The rest of the devices use an in-RAM MCFG space for the purposes of device enumeration and initialization. There are a few uglies in the fake support, like BAR sizes that aren't a power of two, sizing detection, and writes to the real devices, but other than that it's pretty straightforward. Another way to think of this is not really as PCI at all, but just a table in RAM describing which devices are present, their capabilities and their offsets in MMIO space. This could have been done with a special new firmware table on this platform, but given that we do have some real PCI devices too, simply describing things in an MCFG type space was pretty simple. Signed-off-by: Jesse Barnes LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D08@orsmsx508.amr.corp.intel.com> Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit 4966e1affb45c5fc402969e10e979407b972a7df Author: Jacob Pan Date: Tue Feb 23 10:43:58 2010 -0800 x86, ioapic: Add dummy ioapic functions Some ioapic extern functions are used when CONFIG_X86_IO_APIC is not defined. We need the dummy functions to avoid a compile time error. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318DA07@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 05ddafb17ad1a73c8bc333cb328bad46513e85e7 Author: Jacob Pan Date: Wed Sep 23 07:20:23 2009 -0700 x86, ioapic: Early enable ioapic for timer irq Moorestown platform needs apic ready early for the system timer irq which is delievered via ioapic. Should not impact other platforms. In the longer term, once ioapic setup is moved before late time init, we will not need this patch to do early apic enabling. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D07@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 28a3c93d11212655ce0a9be977c405c703844164 Author: Jacob Pan Date: Tue Feb 23 02:03:31 2010 -0800 x86, pic: Fix section mismatch in legacy pic Move legacy_pic chip dummy functions out of init section as they might be referenced at run time. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318D3AA@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit c610028611479e6b9d8b2f1a6628e9417ef4114f Author: Amit Shah Date: Fri Feb 12 10:32:19 2010 +0530 Add MAINTAINERS entry for virtio_console I'm taking ownership of the virtio_console module; but I'll continue feeding patches via Rusty. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d6933561924d8022f5d986ce7c511a2646eeadce Author: Amit Shah Date: Fri Feb 12 10:32:18 2010 +0530 virtio: console: Fill ports' entire in_vq with buffers Instead of allocating just one buffer for a port's in_vq, fill the entire in_vq with buffers so the host need not stall while an application consumes the data and makes the buffer available again for the host. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 22a29eacd2a17f22c8260a8106a4e36bae7fb6ea Author: Amit Shah Date: Fri Feb 12 10:32:17 2010 +0530 virtio: console: Error out if we can't allocate buffers for control queue With MULTIPORT support, the control queue is an integral part of the functioning of the device. If we can't get any buffers allocated, the host won't be able to relay important information and the device may not function as intended. Ensure 'probe' doesn't succeed until the control queue has at least one buffer allocated for its ivq. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 7177876fea8306a6f49400d11f5913bf9b3b5e5f Author: Amit Shah Date: Fri Feb 12 10:32:16 2010 +0530 virtio: console: Add ability to remove module Add the ability to remove the virtio_console module. This aids debugging. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a9cdd4855738906043b8131cfe8055d6cde88ffe Author: Amit Shah Date: Fri Feb 12 10:32:15 2010 +0530 virtio: console: Ensure no memleaks in case of unused buffers If unused data exists in in_vq, ensure we flush that first and then detach unused buffers, which will ensure all buffers from the in_vq are removed. Also ensure we free the buffers after detaching them. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 298add723aecd7af461319fe815d935ef2c40d78 Author: Amit Shah Date: Mon Jan 18 16:35:23 2010 +0530 virtio: console: show error message if hvc_alloc fails for console ports Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d99393effd76571cf2c4a07cbb6e86d41855a8fa Author: Amit Shah Date: Mon Dec 21 22:36:21 2009 +0530 virtio: console: Add debugfs files for each port to expose debug info This is helpful in examining ports' state. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1f7aa42d166cd104b0700d61efe2064178a3f6da Author: Amit Shah Date: Mon Dec 21 22:27:31 2009 +0530 virtio: console: Add ability to hot-unplug ports Remove port data; deregister from the hvc core if it's a console port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 7f5d810dac70214d00b2440787535b6c7a73b6b7 Author: Amit Shah Date: Mon Dec 21 22:22:08 2009 +0530 virtio: console: Handle port hot-plug If the 'nr_ports' variable in the config space is updated to a higher value, that means new ports have been hotplugged. Introduce a new workqueue to handle such updates and create new ports. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 88f251ac58b2460ed16ff619a020ad3ef365e607 Author: Amit Shah Date: Mon Dec 21 22:15:30 2009 +0530 virtio: console: Remove cached data on port close Remove any data that we might have in a port's inbuf when closing a port or when any data is received when a port is closed. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 431edb8a8bca71008fefceadf53b9315ef7196ec Author: Amit Shah Date: Mon Dec 21 21:57:40 2009 +0530 virtio: console: Register with sysfs and create a 'name' attribute for ports The host can set a name for ports so that they're easily discoverable instead of going by the /dev/vportNpn naming. This attribute will be placed in /sys/class/virtio-ports/vportNpn/name. udev scripts can then create symlinks to the port using the name. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 3c7969ccb569968a79fab3729075751bc8fc2f78 Author: Amit Shah Date: Thu Nov 26 11:25:38 2009 +0530 virtio: console: Ensure only one process can have a port open at a time Add a guest_connected field that ensures only one process can have a port open at a time. This also ensures we don't have a race when we later add support for dropping buffers when closing the char dev and buffer caching is turned off for the particular port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 2030fa496d74b49220308eaccf656e2338019cfd Author: Amit Shah Date: Mon Dec 21 21:49:30 2009 +0530 virtio: console: Add file operations to ports for open/read/write/poll Allow guest userspace applications to open, read from, write to, poll the ports via the char dev interface. When a port gets opened, a notification is sent to the host via a control message indicating a connection has been established. Similarly, on closing of the port, a notification is sent indicating disconnection. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit fb08bd274df61967f40d49c4625fe6ed75a69ab5 Author: Amit Shah Date: Mon Dec 21 21:36:04 2009 +0530 virtio: console: Associate each port with a char device The char device will be used as an interface by applications on the guest to communicate with apps on the host. The devices created are placed in /dev/vportNpn where N is the virtio-console device number and n is the port number for that device. One dynamic major device number is allocated for each device and minor numbers are allocated for the ports contained within that device. The file operation for the char devs will be added in the following commits. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit b766ceed5bbf04ae153389f5a15f53b9b6106a35 Author: Amit Shah Date: Mon Dec 21 21:26:45 2009 +0530 virtio: console: Prepare for writing to userspace buffers When ports get advertised as char devices, the buffers will come from userspace. Equip the fill_readbuf function with the ability to write to userspace buffers. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 17634ba25544d60af1968982929150efad755032 Author: Amit Shah Date: Mon Dec 21 21:03:25 2009 +0530 virtio: console: Add a new MULTIPORT feature, support for generic ports This commit adds a new feature, MULTIPORT. If the host supports this feature as well, the config space has the number of ports defined for that device. New ports are spawned according to this information. The config space also has the maximum number of ports that can be spawned for a particular device. This is useful in initializing the appropriate number of virtqueues in advance, as ports might be hot-plugged in later. Using this feature, generic ports can be created which are not tied to hvc consoles. We also open up a private channel between the host and the guest via which some "control" messages are exchanged for the ports, like whether the port being spawned is a console port, resizing the console window, etc. Next commits will add support for hotplugging and presenting char devices in /dev/ for bi-directional guest-host communication. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit f997f00bf8c3ddf748d757105afa1a7dd5297208 Author: Amit Shah Date: Mon Dec 21 17:28:51 2009 +0530 virtio: console: Introduce a send_buf function for a common path for sending data to host Adding support for generic ports that will write to userspace will need some code changes. Consolidate the write routine into send_buf() and put_chars() now just calls into the new function. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 203baab8ba3195dd929473ba95b91c2b838833e6 Author: Amit Shah Date: Mon Jan 18 19:15:12 2010 +0530 virtio: console: Introduce function to hand off data from host to readers In preparation for serving data to userspace (generic ports) as well as in-kernel users (hvc consoles), separate out the functionality common to both in a 'fill_readbuf()' function. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 2658a79acf014deb0eaff2063f8f7a2b59f41285 Author: Amit Shah Date: Mon Jan 18 19:15:11 2010 +0530 virtio: console: Separate out find_vqs operation into a different function With support for multiple ports, each port will have its own input and output vqs. Prepare the probe function for this change. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit cfa6d3792550c9eac51887181358954e6515da6b Author: Amit Shah Date: Mon Jan 18 19:15:10 2010 +0530 virtio: console: Separate out console init into a new function Console ports could be hot-added. Also, with the new multiport support, a port is identified as a console port only if the host sends a control message. Move the console port init into a separate function so it can be invoked from other places. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 4f23c573c0dbebfd193cfb90b003d67929c58b31 Author: Amit Shah Date: Mon Jan 18 19:15:09 2010 +0530 virtio: console: Separate out console-specific data into a separate struct Move out console-specific stuff into a separate struct from 'struct port' as we need to maintain two lists: one for all the ports (which includes consoles) and one only for consoles since the hvc callbacks only give us the vtermno. This makes console handling cleaner. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit cb06e3676b22013e9b759627e41656ddb07dee6d Author: Amit Shah Date: Mon Jan 18 19:15:08 2010 +0530 virtio: console: ensure console size is updated on hvc open When multiple console support is added, ensure each port's size gets updated when a new one is opened via hvc. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1c85bf35449196e74deb487961d2f90c98f7b7ff Author: Amit Shah Date: Mon Jan 18 19:15:07 2010 +0530 virtio: console: struct ports for multiple ports per device. Rather than assume a single port, add a 'struct ports_device' which stores data related to all the ports for that device. Currently, there's only one port and is hooked up with hvc, but that will change. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d8a02bd58ab6da4495a2d1af74d980c217e9abcf Author: Rusty Russell Date: Mon Jan 18 19:15:06 2010 +0530 virtio: console: remove global var Now we can use an allocation function to remove our global console variable. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 38edf58d73c28b082ec808aecdeb0ef2b92af049 Author: Amit Shah Date: Mon Jan 18 19:15:05 2010 +0530 virtio: console: don't assume a single console port. Keep a list of all ports being used as a console, and provide a lock and a lookup function. The hvc callbacks only give us a vterm number, so we need to map this. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 73954488b1cc74cf46d6b94b8d3175f45496bd32 Author: Rusty Russell Date: Mon Jan 18 19:15:04 2010 +0530 virtio: console: use vdev->priv to avoid accessing global var. Part of removing our "one console" assumptions, use vdev->priv to point to the port (currently == the global console). Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a3cde44908429e52b2ec052ad5a70ef60e1f2d56 Author: Amit Shah Date: Mon Jan 18 19:15:03 2010 +0530 virtio: console: introduce a get_inbuf helper to fetch bufs from in_vq This makes taking locks around the get_buf vq operation easier, as well as complements the add_inbuf() operation. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit e27b519807e04d950802cb89f7b22933d8d2f837 Author: Amit Shah Date: Mon Jan 18 19:15:02 2010 +0530 virtio: console: ensure add_inbuf can work for multiple ports as well add_inbuf() assumed one port and one inbuf per port. Remove that assumption. Also move the function so that put_chars and get_chars are together. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit fdb9a054554e1e435e927c9a47a999f026abd408 Author: Amit Shah Date: Mon Jan 18 19:15:01 2010 +0530 virtio: console: encapsulate buffer information in a struct Collect port buffer, used_len, offset fields into a single structure. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 21206ede8826fd9d2eb72e05b429f3ccb1bdaff5 Author: Rusty Russell Date: Mon Jan 18 19:15:00 2010 +0530 virtio: console: port encapsulation We are heading towards a multiple-"port" system, so as part of weaning off globals we encapsulate the information into 'struct port'. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit f550804ab92e37a08d2622522a0f11252a2158ea Author: Amit Shah Date: Mon Jan 18 19:14:59 2010 +0530 virtio: console: We support only one device at a time We support only one virtio_console device at a time. If multiple are found, error out if one is already initialized. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1dff399616a79b8ef5d61ad68f2ef1e1f590b465 Author: Rusty Russell Date: Sat Nov 28 12:20:26 2009 +0530 hvc_console: make the ops pointer const. This is nicer for modern R/O protection. And noone needs it non-const, so constify the callers as well. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah To: Christian Borntraeger Cc: linuxppc-dev@ozlabs.org commit 971f3390003619ea4ac0b20ee93dfd3209025790 Author: Rusty Russell Date: Mon Jan 18 19:14:56 2010 +0530 virtio: console: statically initialize virtio_cons That way, we can make it const as is good kernel style. We use a separate indirection for the early console, rather than mugging ops.put_chars. We rename it hv_ops, too. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a23ea92474e558b071d3e43d961ec767c31faebd Author: Rusty Russell Date: Mon Jan 18 19:14:55 2010 +0530 virtio: console: comment cleanup Remove old lguest-style comments. [Amit: - wingify comments acc. to kernel style - indent comments ] Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 3b8706240ee6084ccb46e53cd3a554356b7eeec8 Author: Amit Shah Date: Fri Feb 12 10:32:14 2010 +0530 virtio: Initialize vq->data entries to NULL vq operations depend on vq->data[i] being NULL to figure out if the vq entry is in use (since the previous patch). We have to initialize them to NULL to ensure we don't work with junk data and trigger false BUG_ONs. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell Cc: Shirley Ma commit c021eac4148c16bf53baa0dd14e8ebee6f39dab5 Author: Shirley Ma Date: Mon Jan 18 19:15:23 2010 +0530 virtio: Add ability to detach unused buffers from vrings There's currently no way for a virtio driver to ask for unused buffers, so it has to keep a list itself to reclaim them at shutdown. This is redundant, since virtio_ring stores that information. So add a new hook to do this. Signed-off-by: Shirley Ma Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 69740c8ba878f58bc3c71f74618fc2cd1da990da Author: Christoph Hellwig Date: Wed Feb 24 14:22:25 2010 -0600 virtio_blk: add block topology support Allow reading various alignment values from the config page. This allows the guest to much better align I/O requests depending on the storage topology. Note that the formats for the config values appear a bit messed up, but we follow the formats used by ATA and SCSI so they are expected in the storage world. Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell commit d57ed95da483418e8b0433da693c9168dd0a2df6 Author: Michael S. Tsirkin Date: Thu Jan 28 00:42:23 2010 +0200 virtio: use smp_XX barriers on SMP virtio is communicating with a virtual "device" that actually runs on another host processor. Thus SMP barriers can be used to control memory access ordering. Where possible, we should use SMP barriers which are more lightweight than mandatory barriers, because mandatory barriers also control MMIO effects on accesses through relaxed memory I/O windows (which virtio does not use) (compare specifically smp_rmb and rmb on x86_64). We can't just use smp_mb and friends though, because we must force memory ordering even if guest is UP since host could be running on another CPU, but SMP barriers are defined to barrier() in that configuration. So, for UP fall back to mandatory barriers instead. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell commit 97a545ab6ce922a0f868d192718a48a0091ebc5e Author: Rusty Russell Date: Wed Feb 24 14:22:22 2010 -0600 virtio: remove bogus barriers from DEBUG version of virtio_ring.c With DEBUG defined, we add an ->in_use flag to detect if the caller invokes two virtio methods in parallel. The barriers attempt to ensure timely update of the ->in_use flag. But they're voodoo: if we need these barriers it implies that the calling code doesn't have sufficient synchronization to ensure the code paths aren't invoked at the same time anyway, and we want to detect it. Also, adding barriers changes timing, so turning on debug has more chance of hiding real problems. Thanks to MST for drawing my attention to this code... CC: Michael S. Tsirkin Signed-off-by: Rusty Russell commit 28ff4ef71795fe6f6c0cc06a04911c9ca09c2c11 Author: Rusty Russell Date: Wed Feb 24 14:22:18 2010 -0600 lguest: remove unneeded zlib.h include in example launcher Two years ago 5bbf89fc2608 removed the horrible bzImage unpacking code. Now it's time to remove the unneeded zlib.h include, too. Signed-off-by: Rusty Russell commit 169c246a30808588436794e96a97c61a01af9bed Author: Rusty Russell Date: Wed Feb 24 14:22:14 2010 -0600 virtio: fix balloon without VIRTIO_BALLOON_F_STATS_VQ When running under qemu-kvm-0.11.0: BUG: unable to handle kernel paging request at 56e58955 ... Process vballoon (pid: 1297, ti=c7976000 task=c70a6ca0 task.ti=c7 ... Call Trace: [] ? balloon+0x1b3/0x440 [virtio_balloon] [] ? schedule+0x327/0x9d0 [] ? balloon+0x0/0x440 [virtio_balloon] [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x30 need_stats_update should be zero-initialized. Signed-off-by: Rusty Russell Acked-by: Adam Litke commit 1f34c71afe5115e77a49c4e67720a66e27053e54 Author: Adam Litke Date: Thu Dec 10 16:35:15 2009 -0600 virtio: Fix scheduling while atomic in virtio_balloon stats This is a fix for my earlier patch: "virtio: Add memory statistics reporting to the balloon driver (V4)". I discovered that all_vm_events() can sleep and therefore stats collection cannot be done in interrupt context. One solution is to handle the interrupt by noting that stats need to be collected and waking the existing vballoon kthread which will complete the work via stats_handle_request(). Rusty, is this a saner way of doing business? There is one issue that I would like a broader opinion on. In stats_request, I update vb->need_stats_update and then wake up the kthread. The kthread uses vb->need_stats_update as a condition variable. Do I need a memory barrier between the update and wake_up to ensure that my kthread sees the correct value? My testing suggests that it is not needed but I would like some confirmation from the experts. Signed-off-by: Adam Litke To: Rusty Russell Cc: Anthony Liguori Cc: linux-kernel@vger.kernel.org Signed-off-by: Rusty Russell commit 9564e138b1f6eb137f7149772438d3f3fb3277dd Author: Adam Litke Date: Mon Nov 30 10:14:15 2009 -0600 virtio: Add memory statistics reporting to the balloon driver (V4) Changes since V3: - Do not do endian conversions as they will be done in the host - Report stats that reference a quantity of memory in bytes - Minor coding style updates Changes since V2: - Increase stat field size to 64 bits - Report all sizes in kb (not pages) - Drop anon_pages stat and fix endianness conversion Changes since V1: - Use a virtqueue instead of the device config space When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests. The current method employs a daemon running in each guest that communicates memory statistics to a host daemon at a specified time interval. The host daemon aggregates this information and inflates and/or deflates balloons according to the level of host memory pressure. This approach is effective but overly complex since a daemon must be installed inside each guest and coordinated to communicate with the host. A simpler approach is to collect memory statistics in the virtio balloon driver and communicate them directly to the hypervisor. This patch enables the guest-side support by adding stats collection and reporting to the virtio balloon driver. Signed-off-by: Adam Litke Cc: Anthony Liguori Cc: virtualization@lists.linux-foundation.org Signed-off-by: Rusty Russell (minor fixes) commit 1f08b833ddbdb1c8e81c4b1053c2ebb7b89cb437 Author: Jamie Lokier Date: Fri Jan 8 22:01:43 2010 +0000 Add __devexit_p around reference to virtio_pci_remove This is needed to compile with CONFIG_VIRTIO_PCI=y, because virtio_pci_remove is marked __devexit. Signed-off-by: Jamie Lokier Signed-off-by: Rusty Russell commit 0fdc54b2019700a4b50179914e810367c14044a3 Merge: 8250a5c 79dcfdd Author: Tony Lindgren Date: Tue Feb 23 19:22:48 2010 -0800 Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 2e5070bc1152e8afbf76734e8e3fbfbe60a573ef Author: Jassi Brar Date: Wed Feb 17 19:03:19 2010 +0000 ARM: S3C64XX: Declare IISv4 PCLK for S3C6410 [Updated the device ID to -1 since there's only one IISv4 device but the S3C clock API tries to match based on the ID of the requesting device (and not the name) -- broonie.] Signed-Off-by: Jassi Brar [ben-linux@fluff.org: Fixed Jassi's lastname] Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit de6985be185167d14a79695f345025c531a685d0 Author: Jassi Brar Date: Fri Feb 12 10:38:51 2010 +0000 ARM: S3C64XX: Add AC97 platform resources This patch defines the platform device and the resources: IRQ, DMA and MEM, needed by the AC97 controller driver. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1f1008684a392f92c174252243d72a3297d6fa46 Author: Mark Brown Date: Wed Feb 17 19:03:20 2010 +0000 ARM: SMDK6410: Register IISv4 device The IISv4 controller is connected to the WM8580 on the board. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit a7a81d0bbd7820b279b14dbe00041a603c3cbf84 Author: Mark Brown Date: Wed Feb 17 18:19:31 2010 +0000 ARM: SMDK6410: Add support for PMIC LED on WM1192-EV1 PMIC module The PMIC LED on the SMDK6410 CPU board is driven by GPIO4 of the WM8312 PMIC. Provide software control of this LED. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 60f9101a8881797fecd89450b8a8d17a440e6281 Author: Mark Brown Date: Wed Feb 17 18:19:29 2010 +0000 ARM: SMDK6410: Add initial support for WM1192-EV1 PMIC board The Wolfson Microelectronics 1192-EV1 is a plug in module for the SMDK6410 providing power using a WM8312 PMIC. This patch provides initial hookup sufficient to initialise the board, though not all features are fully described yet. As part of this supplies for the system that are provided as a single supply by one of the currently merged PMIC boards are factored out so they can be reused between different regulators. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit bc449e53121681d16fbefb9c14d28b0638ae33db Author: Jassi Brar Date: Fri Feb 12 10:38:52 2010 +0000 ARM: S3C2443: GPIO: Correct AC97 pin defines GPIO_E-[5,9] pin functionality was defined incorrectly. The patch corrects and adds missing pins. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit c2b2c645dbeecb3433021ea71c6bbed70a1e9db6 Author: Jassi Brar Date: Fri Feb 12 10:38:50 2010 +0000 ARM: SMDK2443: Enable AC97 device Add AC97 controller to platform devices and initialize the AC97 gpios. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1088f336ccc73feaaff2f95eec6fb5b6e7e94337 Author: Ben Dooks Date: Wed Feb 24 01:46:10 2010 +0000 ARM: SAMSUNG: Fix UART number for S5P6442 The recent changes in the UART code mean that we need to ensure that the 4 UART case is only selected if S5PV210 is being compiled. Signed-off-by: Ben Dooks commit 03843a1294073c19783b43f60f3a455dd0672685 Author: Kukjin Kim Date: Fri Jan 29 10:23:40 2010 +0900 ARM: S5P6442: Add serial port support This patch adds UART serial port support for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7f7035f21c10d83994e045a98c0906781dba02d3 Author: Kukjin Kim Date: Fri Jan 29 10:22:47 2010 +0900 ARM: S5P6442: Add S5P6442 configuration file This patch adds S5P6442 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 461859db1f367200602d81c9352e2477a6187814 Author: Kukjin Kim Date: Fri Jan 29 10:21:16 2010 +0900 ARM: S5P6442: Add SMDK6442 board support file This patch adds SMDK6442 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 550db7f155c9e51288fbe114fbb33d7a044d8a75 Author: Kukjin Kim Date: Fri Jan 29 10:19:26 2010 +0900 ARM: S5P6442: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5P6442 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d13de2ab8a7afe2d915be4c4758fe25825204226 Author: Ben Dooks Date: Wed Feb 24 01:43:27 2010 +0000 ARM: S5P6442: Add files missing from original commit The removal of plat-s3c has left these missing from the initial commit, so add copies from elsewhere. Signed-off-by: Ben Dooks commit d9f18a981bd0a724c87d04db1d61d91261a2feb4 Author: Kukjin Kim Date: Fri Jan 29 10:17:20 2010 +0900 ARM: S5P6442: Add IRQ support This patch adds IRQ support for S5P6442. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 in plat-s5p common irq code. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b6f837575edc5213e00903afea240f0119ee5ec9 Author: Kukjin Kim Date: Thu Feb 4 09:42:13 2010 +0900 ARM: S5P6442: Add clock support for S5P6442 This patch adds clock support for S5P6442. This patch adds the clock register definitions and the various system clocks in S5P6442. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f Author: Kukjin Kim Date: Fri Jan 29 10:12:14 2010 +0900 ARM: S5P6442: Add Samsung S5P6442 CPU support This patch adds support for Samsung S5P6442 CPU. This patch also adds an entry for S5P6442 cpu in plat-s5p cpu table. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a0af8b3c701d254b55fc291150d5320317c0a338 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:29 2010 +0200 ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume IRQ should be disabled on suspend and re-enabled on resume. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 0fe1309b4db2a994d0b8347cea034cf58cb4b312 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:27 2010 +0200 ARM: SAMSUNG: Add resources description for s3c24xx ts driver Without resources description driver fails during initialization. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e Author: Ben Dooks Date: Tue Feb 23 00:18:36 2010 +0000 ARM: SAMSUNG: Eliminate plat-s3c The plat-s3c directory is now clear, so remove the files in it and expunge it from the build process. Signed-off-by: Ben Dooks commit f94327f2cebf3711defd25375df0c380562127ba Author: Ben Dooks Date: Fri Jan 29 09:02:20 2010 +0000 ARM: SAMSUNG: Move include/mach files out of plat-s3c Move the include/mach files out of plat-s3c and into the relevant machine files. This does mean copying the files, but there is nowhere else to put them. Signed-off-by: Ben Dooks commit ae5fa355ec571525fab60f66dd9d6a2b12c7575e Author: Ben Dooks Date: Fri Jan 29 09:02:19 2010 +0000 ARM: SAMSUNG: Select NO_IOPORT for plat-samsung All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig Signed-off-by: Ben Dooks commit 46ba2a7284fbd61fcba1e16bdd723c79ec5c268f Author: Ben Dooks Date: Fri Jan 29 09:02:18 2010 +0000 ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx Continue the clearout of plat-s3c by moving audio-simtec.h to plat-s3c24xx as there are no current implementations outside of this platform. Signed-off-by: Ben Dooks commit 89f1fa080b5dca259c9779bcf81b95a409fdbf5b Author: Ben Dooks Date: Fri Jan 29 09:02:17 2010 +0000 ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx as necessary. The S3C_BOOT entries and the DMA configuration can go to plat-samsung. The low-level UART configurations are currently S3C2XX specific and can go to plat-s3c24xx. Eliminating plat-s3c from the build process will be submitted seperately. Signed-off-by: Ben Dooks commit 8250a5c381cc6714a061a39cfd29d7453e8ad64b Author: Rob Clark Date: Mon Jan 4 19:22:03 2010 +0530 omap2/3/4: mailbox: use dedicated work queue for handling mailbox rx interrupt keventd_wq is a shared work-queue, and should not be used when we need fast deterministic response. Instead mailbox driver should use it's own private work-queue, with it's own thread, to ensure that handling of RX interrupts are not delayed by other drivers. The tasklet is still used for transmission of mbox messages. Signed-off-by: Rob Clark Signed-off-by: C A Subramaniam Signed-off-by: Suman Anna Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 4499ce42935db68debba0a2d2ab8280627e4b692 Author: Suman Anna Date: Fri Feb 5 17:20:26 2010 -0600 omap: mailbox: correct OMAP4 SIDLEMODE logic OMAP4 mailbox has a different MAILBOX_SYSCONFIG register. There is now no AutoIdle. The SIDLEMODE bits have been right-shifted by 1 bit and now occupy bits 2 & 3. Signed-off-by: Suman Anna Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit a6a6022871b83ff31c34495709f53e3faef80976 Author: Suman Anna Date: Tue Jan 26 16:55:29 2010 -0600 omap: mailbox: correct OMAP4 reset logic OMAP4 mailbox has a different register set. There is no MAILBOX_SYSSTATUS register. The reset is indicated with the SOFTRESET bit of the MAILBOX_SYSCONFIG register itself. This bit should read 0 for a successful Reset. Also, the SOFTRESET bit occupies bit0 and not bit1 as with previous generations. Signed-off-by: Suman Anna Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 5772ca7d7897722e7ed4c476bafee0b07bd9193e Author: Santosh Shilimkar Date: Thu Feb 18 03:14:12 2010 +0530 omap4: Use irq line defines from irq-44xx.h This patch removes all the omap4 specific irq line defines from plat/irqs.h and includes auto-generated irqs-44xx.h All the legacy naming style defines are replaced with the one from irqs-44xx.h Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley [tony@atomide.com: updated to compile with usb-musb.c] Signed-off-by: Tony Lindgren commit 835a36ca4a4cd9da557318c0e213346644a4b2c8 Author: Jeff Layton Date: Wed Feb 10 16:21:33 2010 -0500 cifs: set server_eof in cifs_fattr_to_inode Signed-off-by: Jeff Layton Signed-off-by: Steve French commit fb977e2ca607a7e74946a1de798f474d1b80b9d6 Author: Jamal Hadi Salim Date: Tue Feb 23 15:09:53 2010 -0800 xfrm: clone mark when cloning policy When we clone the SP, we should also clone the mark. Useful for socket based SPs. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 89612124d6d62230043ebd827a2b54ea5ea5280c Author: Abhijeet Kolekar Date: Fri Feb 19 11:49:49 2010 -0800 iwlwifi: increase command buffer size Increase the buffer size for commands with "huge" bit set. This has been recently observed for 6050 cards where for even with huge bit set few commands were not properly allocated memory with the command overwriting the buffer allocated for it.. Also add a check to see if command size exceeds the maximum allowable size. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit 88d892a37fc231ab2aa3b1c40ca9d67224616594 Author: Yehuda Sadeh Date: Tue Feb 23 18:16:23 2010 +0000 ceph: don't clobber write return value when using O_SYNC Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit a1ea787c7b6ec036d169d84e08cca7b6e399ba70 Author: Sage Weil Date: Tue Feb 23 14:02:44 2010 -0800 ceph: fix client_request_forward decoding The tid is in the message header, not body. Broken since 6df058c0. No need to look at next mds session; just mark the request and be done. (The old error path was broken too, but now it's gone.) Signed-off-by: Sage Weil commit 2600d2dd5085ab6fb09540226138a60055abf335 Author: Sage Weil Date: Mon Feb 22 15:12:16 2010 -0800 ceph: drop messages on unregistered mds sessions; cleanup Verify the mds session is currently registered before handling incoming messages. Clean up message handlers to pull mds out of session->s_mds instead of less trustworthy src field. Clean up con_{get,put} debug output. Signed-off-by: Sage Weil commit a6369741c48815fedfce7072b7a9cd98b5bafd56 Author: Sage Weil Date: Mon Feb 22 13:59:00 2010 -0800 ceph: fix comments, locking in destroy_inode The destroy_inode path needs no inode locks since there are no inode references. Update __ceph_remove_cap comment to reflect that it is called without cap->session->s_mutex in this case. Signed-off-by: Sage Weil commit 4ce1e9adabbad8f2c45ceeeb6de56cc368484297 Author: Alexander Beregalov Date: Mon Feb 22 17:17:44 2010 +0300 ceph: move dereference after NULL test Signed-off-by: Alexander Beregalov Signed-off-by: Sage Weil commit 5b3a4db3e4009aff918abb1353eb3f4925393a7b Author: Sage Weil Date: Fri Feb 19 21:43:23 2010 -0800 ceph: fix up unexpected message handling Fix skipping of unexpected message types from osd, mon. Clean up pr_info and debug output. Signed-off-by: Sage Weil commit c499546f43f2c31b681271ef7db922839fcde5fe Author: Sebastien Requiem Date: Tue Feb 23 14:51:24 2010 +0100 [ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo) * Modification of Kconfig to add the Option * 1 new file : buffalo-wxl-setup.c This file is inspired from the db-78xx0-setup.c already present. The following is done: - Configure MPP Lines for the plateform (see my patch for MPP) This is taken from the stock kernel provided by buffalotech (the vendor) - GigaBit Ethernet - Sata - Uart are initiallized in a different way than on the dev board as we have one core only. - USB The kernel has been running for some days now on my plateform. Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit a99db248afd4682a6a9e2aea465cb4c2eb6e26be Author: Santosh Shilimkar Date: Thu Feb 18 08:59:13 2010 +0000 omap4: Use dma line defines from dma-44xx.h This patch removes all the omap4 specific dma request lines defines from plat/dma.h and includes dma-44xx.h The defines are aligned so no driver should be impacted because of this change. Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit ab9bdc34d68dafc6fea0ba733231f1c9696ce9c4 Author: Reinette Chatre Date: Tue Feb 23 14:02:52 2010 -0800 Revert "iwlwifi: Monitor and recover the aggregation TX flow failure" This reverts commit 1db5950f1d0b82e07371b211a48317b8972da063. The goal of "iwlwifi: Monitor and recover the aggregation TX flow failure" is to first detect when data transmission stalls and then to recover from this situation with a reset of the radio or the firmware, depending on how bad the transmission failures are. Unfortunately we have found that this change causes excessive resets with its current detection algorithm. It also performs its recovery action when none is really needed, like when we are not associated. Revert this change until the issues have been addressed. Signed-off-by: Reinette Chatre commit e927f8d04ec8aff249beab2f7e1832c67623d0f5 Author: Santosh Shilimkar Date: Thu Feb 18 15:42:34 2010 +0530 omap4: Add auto-generated irq and dma headers These files are generated along with the HWMOD and will eventually be in the existing header files as soon as all drivers will be migrate to omap_hwmod / omap_device. The dma-44xx.h and irqs-44xx.h file should be in 'arch/arm/mach-omap2/include/mach/', but omap1 and omap2plus common devices still share these defines and hence currently placed in plat-omap/include/plat/ directory. Signed-off-by: Benoit Cousson Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 6dbbe14f21368a45aedba7eab0221857b8ad8d16 Author: Suresh Siddha Date: Mon Feb 22 14:51:34 2010 -0800 x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set init_fpu() already ensures that the used_math() is set for the stopped child. Remove the redundant set_stopped_child_used_math() in [x]fpregs_set() Reported-by: Oleg Nesterov Signed-off-by: Suresh Siddha LKML-Reference: <20100222225240.642169080@sbs-t61.sc.intel.com> Acked-by: Rolan McGrath Signed-off-by: H. Peter Anvin commit ff7fbc72e0c3ef7e94a27a3a918fd09ec9a30204 Author: Suresh Siddha Date: Mon Feb 22 14:51:33 2010 -0800 x86, ptrace: Simplify xstateregs_get() 48 bytes (bytes 464..511) of the xstateregs payload come from the kernel defined structure (xstate_fx_sw_bytes). Rest comes from the xstate regs structure in the thread struct. Instead of having multiple user_regset_copyout()'s, simplify the xstateregs_get() by first copying the SW bytes into the xstate regs structure in the thread structure and then using one user_regset_copyout() to copyout the xstateregs. Requested-by: Roland McGrath Signed-off-by: Suresh Siddha LKML-Reference: <20100222225240.494688491@sbs-t61.sc.intel.com> Acked-by: Roland McGrath Signed-off-by: H. Peter Anvin Cc: Oleg Nesterov commit c6a0dd7ec6fb2d4927979ed4dc562fc5c122d826 Author: Suresh Siddha Date: Mon Feb 22 14:51:32 2010 -0800 ptrace: Fix ptrace_regset() comments and diagnose errors specifically Return -EINVAL for the bad size and for unrecognized NT_* type in ptrace_regset() instead of -EIO. Also update the comments for this ptrace interface with more clarifications. Requested-by: Roland McGrath Requested-by: Oleg Nesterov Signed-off-by: Suresh Siddha LKML-Reference: <20100222225240.397523600@sbs-t61.sc.intel.com> Acked-by: Roland McGrath Signed-off-by: H. Peter Anvin commit ee40ceab234d34abdfeb9922d0f1a18bfa7efdaf Author: Sebastien Requiem Date: Tue Feb 23 14:38:14 2010 +0100 [ARM] MV78XX0: MPP routines and definitions This patch is composed of two new files : - mpp.c which is mainly inspired by the same file as in mach-kirkwood - mpp.h that is written from the documentation provided by Marvell http://www.marvell.com/products/processors/embedded/discovery_innovation/HW_MV78100_OpenSource.pdf Moreover, due to some implementation problem, I have defined some MPPX_UNUSED that offer developers the possibility to SET MPP to some unused value (such as for Buffalo WXL). Note: This patch doesn't support MV78200 yet (only 78100 MPP lines have been written) Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit d5b5746bed1023e4a55f96405422d3e51968fa43 Author: John Holland Date: Fri Feb 19 23:11:04 2010 +0100 [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP Accept SD CD and SD WP in accordance to http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf on MPP 47 and 44 respectively on the eSATA SheevaPlug Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d7b222d708e6eff0cf47928f439c8bcf49f10bb6 Author: John Holland Date: Fri Feb 19 23:11:01 2010 +0100 [ARM] eSATA SheevaPlug: configure SoC SATA interface Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d8ecb3490050b33bf46ce77c7f239e0fc51a6835 Author: John Holland Date: Fri Feb 19 23:10:58 2010 +0100 [ARM] eSATA SheevaPlug basic board support Allow basic eSATA SheevaPlug board configuration and build. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit 189b3b1c89761054fee3438f063d7f257306e2d8 Author: wzt.wzt@gmail.com Date: Tue Feb 23 23:15:28 2010 +0800 Security: add static to security_ops and default_security_ops variable Enhance the security framework to support resetting the active security module. This eliminates the need for direct use of the security_ops and default_security_ops variables outside of security.c, so make security_ops and default_security_ops static. Also remove the secondary_ops variable as a cleanup since there is no use for that. secondary_ops was originally used by SELinux to call the "secondary" security module (capability or dummy), but that was replaced by direct calls to capability and the only remaining use is to save and restore the original security ops pointer value if SELinux is disabled by early userspace based on /etc/selinux/config. Further, if we support this directly in the security framework, then we can just use &default_security_ops for this purpose since that is now available. Signed-off-by: Zhitong Wang Acked-by: Stephen Smalley Signed-off-by: James Morris commit 96c03bccc7defb1f0d486165af5c0b8590f56c11 Author: Steve French Date: Tue Feb 23 20:51:43 2010 +0000 [CIFS] Minor cleanup to EA patch CC: Jeff Layton Signed-off-by: Steve French commit 31c0519f7af99ae60fd39f7f1c1f7ae1efb56760 Author: Jeff Layton Date: Wed Feb 10 16:18:26 2010 -0500 cifs: merge CIFSSMBQueryEA with CIFSSMBQAllEAs Add an "ea_name" parameter to CIFSSMBQAllEAs. When it's set make it behave like CIFSSMBQueryEA does now. The current callers of CIFSSMBQueryEA are converted to use CIFSSMBQAllEAs, and the old CIFSSMBQueryEA function is removed. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 0cd126b504cede8a74acf7583a44eba32f9a1da1 Author: Jeff Layton Date: Wed Feb 10 16:18:26 2010 -0500 cifs: verify lengths of QueryAllEAs reply Make sure the lengths in a QUERY_ALL_EAS reply don't make the parser walk off the end of the SMB. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit e529614ad0c2bf1f3a6fcf1402aa77430ecfaa2c Author: Jeff Layton Date: Wed Feb 10 16:18:26 2010 -0500 cifs: increase maximum buffer size in CIFSSMBQAllEAs It's 4000 now, but there's no reason to limit it to that. We should be able to handle a response up to CIFSMaxBufSize. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 6e462b9f2c37101312109aaa46e196bdca6c846d Author: Jeff Layton Date: Wed Feb 10 16:18:26 2010 -0500 cifs: rename name_len to list_len in CIFSSMBQAllEAs ...for clarity and so we can reuse the name for the real name_len. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit f0d3868b78752024dd7550d0d18fb9e0601cfb69 Author: Jeff Layton Date: Wed Feb 10 16:18:26 2010 -0500 cifs: clean up indentation in CIFSSMBQAllEAs Add a label that we can goto on error, and reduce some of the if/then/else indentation in this function. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 370b41911c0f1074e654a28466411b5c879e4dfd Author: Jeff Layton Date: Wed Feb 10 16:18:25 2010 -0500 cifs: add parens around smb_var in BCC macros ...to remove ambiguity about how these values are interpreted when passing in more complex values as arguments. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 266fe2f217d1dc9f8041e395c0ab4569a5bad91a Author: Tom Zanussi Date: Wed Jan 27 02:27:56 2010 -0600 perf/scripts: Remove check-perf-trace from listed scripts The check-perf-trace script only checks Perl functionality, and doesn't really need to be listed as as user script anyway. This only removes the '-report' shell script, so although it doesn't appear in the listing, the '-record' shell script and the check perf trace perl script itself is still available and can still be run manually as such: $ libexec/perf-core/scripts/perl/bin/check-perf-trace-record $ perf trace -s libexec/perf-core/scripts/perl/check-perf-trace.pl Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-6-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 82d156cd5e817055c63ec50247a425c195f4cb14 Author: Tom Zanussi Date: Wed Jan 27 02:27:55 2010 -0600 perf/scripts: Move Perl scripting files to scripting-engines dir Create a scripting-engines directory to contain scripting engine implementation code, in anticipation of the addition of new scripting support. Also removes trace-event-perl.h. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-5-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 7397d80ddde8eef3b1dce6c29e0c53bd322ef824 Author: Tom Zanussi Date: Wed Jan 27 02:27:54 2010 -0600 perf/scripts: Move common code out of Perl-specific files This stuff is needed by all scripting engines; move it from the Perl engine source to a more common place. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-4-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit e26207a3819684e9b4450a2d30bdd065fa92d9c7 Author: Tom Zanussi Date: Wed Jan 27 02:27:53 2010 -0600 perf/scripts: Fix bug in Util.pm Fix bogus calculation. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit f526d68b6ce9ba7a2bd94e663e240a022524c58a Author: Tom Zanussi Date: Wed Jan 27 02:27:52 2010 -0600 perf/scripts: Fix supported language listing option 'perf trace -s list' prints a list of the supported scripting languages. One problem with it is that it falls through and prints the trace as well. The use of 'list' for this also makes it easy to confuse with 'perf trace -l', used for listing available scripts. So change 'perf trace -s list' to 'perf trace -s lang' and fixes the fall-through problem. Signed-off-by: Tom Zanussi Cc: Ingo Molnar Cc: Steven Rostedt Cc: Keiichi KII Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1264580883-15324-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Frederic Weisbecker commit 79dcfdd407208cba06bd446e93b0809df1cf10d1 Author: Tero Kristo Date: Thu Nov 12 12:07:22 2009 +0200 OMAP3: PM: Added support for L2 aux ctrl register save and restore This patch adds a save and restore mechanism for ARM L2 auxiliary control register. The feature is enabled by default for GP devices, but for HS/EMU devices the user must enable the service and define the PPA service ID to be used for setting L2 aux ctrl, as this is not currently supported by the bootloader. If nobody alters the contents of L2 aux ctrl from its reset value, this feature is not needed. Kconfig option to enable HS/EMU L2 aux save and restore: - OMAP3_L2_AUX_SECURE_SAVE_RESTORE Kconfig option to select HS/EMU PPA service for setting L2 aux ctrl: - OMAP3_L2_AUX_SECURE_SERVICE_SET_ID Signed-off-by: Tero Kristo Signed-off-by: Kevin Hilman commit a89b6f006201469a74dfc0cc4e953648b6a1c69d Author: Rajendra Nayak Date: Thu May 28 18:13:06 2009 +0530 OMAP3: PM: add scratchpad locking function This patch implements locking using the semaphore in scratchpad memory preventing any concurrent access to scratchpad from OMAP and Baseband/Modem processor. Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman commit 5a1b1d3a9efad6bd53d01ff02e86626d1a51d697 Author: Kalle Jokiniemi Date: Thu Oct 29 10:30:20 2009 +0200 OMAP3: RX-51: Pass cpu idle parameters Pass cpuidle parameters for RX-51. Numbers based on measurements made in October 2009 for PM optimized kernel with CPU freq enabled. Assumes OPP2 (main idle OPP, and worst case latencies). Signed-off-by: Kalle Jokiniemi Signed-off-by: Kevin Hilman commit a4b41d8ed805e90bd855ac572eaeb13901d4af32 Author: Kevin Hilman Date: Fri Oct 2 08:17:56 2009 -0700 OMAP3: RX-51: support sleep indicator LEDs The sleep indicator LEDs can be enabled/disabled by toggling GPIO162. Use the LED GPIO class to export this LED functionality to userspace. To enable: # echo 1 > /sys/class/leds/sleep_ind/brightness To disable: # echo 0 > /sys/class/leds/sleep_ind/brightness Signed-off-by: Kevin Hilman commit 709731bb369b562586ee4c60f3f0393eb94dd9d6 Author: Kalle Jokiniemi Date: Thu Oct 29 10:30:19 2009 +0200 OMAP3: cpuidle: Add valid field into C-state parameter passing Different boards benefit differently from the available seven C-states for cpu idle. In most cases, only few, properly spaced (in terms of consumption and latency) C-states are required to make the power management optimal. Hence we need a possibility to pass which C-states are actually used for each board. So added the valid field to cpuidle_params and added support to 3430sdp, which uses the paramenter passing. Signed-off-by: Kalle Jokiniemi Signed-off-by: Kevin Hilman commit bb4de3df69e2993d642e38e17a3eccfe37845acc Author: Kevin Hilman Date: Tue Dec 15 16:37:18 2009 -0800 OMAP3: cpuidle: configure latencies/thresholds from board file The CPUidle C state latencies and thresholds are dependent on various board specific details. This patch makes it possible to configure these values from the respective board files. omap3_pm_init_cpuidle() can now be optionally called from board files to pass board specific cpuidle parameters. If the board files do not use this function to pass the params default values are used which might cause higher consumption dur to wrong state selection by the governor. This patch only updates the 3430sdp board files to use omap3_pm_init_cpuidle(). From Kalle, in addition to original patch from Rajendra: Building without CONFIG_CPU_IDLE or CONFIG_PM causes build to fail if cpu idle parameters are tried to pass using omap3_pm_init_cpuidle function. Signed-off-by: Rajendra Nayak Signed-off-by: Kalle Jokiniemi Signed-off-by: Kevin Hilman commit 6af83b38613da58a221e56af676097575ce2c763 Author: Sanjeev Premi Date: Thu Jan 28 23:16:43 2010 +0530 OMAP3: cpuidle: Update statistics for correct state When 'enable_off_mode' is 0, the target power state for MPU and CORE was locally changed to PWRDM_POWER_RET but, the statistics are updated for idle state originally selected by the governor. This patch 'invalidates' the idle states that lead either of MPU or Core to PWRDM_POWER_OFF state when 'enable_off_mode' is '0'. The states are valid once 'enable_off_mode' is set to '1'. Added function next_valid_state() to check if current state is valid; else get the next valid state. It is called from omap3_enter_idle_bm(). Signed-off-by: Sanjeev Premi Signed-off-by: Kevin Hilman commit 8ca458221800416f16f95878e932f5f0e2a1618f Author: Santosh Shilimkar Date: Thu Feb 18 08:59:11 2010 +0000 omap3/4: Remove overlapping mapping of L4_WKUP io space This patch removes the L4 wakeup io mapping section for omap3 and omap4. L4 wakeup space is part of 4MB L4 space which is already mapped and hence remove the overlapped mapping. Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 737daa036081ad3030268f658d8dff785b3e73cd Author: Santosh Shilimkar Date: Thu Feb 18 08:59:10 2010 +0000 omap4: Fix omap_type() for omap4 This patch fixes the omap_type function to detect whether the device is GP or HS Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 35c0dc389d42c3d8c20ecdf0829fe9e935084b10 Author: Santosh Shilimkar Date: Thu Feb 18 08:59:09 2010 +0000 omap: sdma: Limit the secure reserve channel fix for omap3 The commit 'ba50ea7e' reserves DMA channels 0 and 1 on high security devices, in order to avoid collision between kernel dma transfers and ROM code dma transfers. This fix is applicable only for OMAP3 so add an appropriate check. Signed-off-by: Santosh Shilimkar CC: Kalle Jokiniemi CC: Kevin Hilman Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 1ce0f9d4a9a2adebf0754a694a9bd1d5ab870449 Author: Santosh Shilimkar Date: Thu Feb 18 08:59:08 2010 +0000 omap4: sdma: Enable the idle modes on omap4 This patch enables smart-idle idlemodes and autoidle for sDMA on OMAP4 Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit b7ebb10b0a9793effa4a74a3c29049b44c6b8176 Author: Santosh Shilimkar Date: Mon Feb 15 18:03:37 2010 +0530 omap2/3/4: ioremap omap_globals module This is a clean-up patch towards dynamic allocation of IO space instead of using harcoded macros to calculate virtual addresses. Also update the sdrc, prcm and control module to allocate iospace dynamically Signed-off-by: Santosh Shilimkar Reviewed-by: Kevin Hilman Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit e03d37d85909fd9b09e78087c57b45972a7664ad Author: Santosh Shilimkar Date: Thu Feb 18 08:59:06 2010 +0000 omap3/4: uart: fix full-fifo write abort This patch is addition to the already merged commit on non-empty uart fifo read abort. "ce13d4716a276f4331d78ba28a5093a63822ab95" OMAP3630 and OMAP4430 UART IP blocks have a restriction on TX FIFO too. If you try to write to the tx fifo when it is full, the system aborts. More details on this thread are here: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg19447.html This can be easily reproducible by not suppressing interconnect errors or long duration testing where continuous prints over console from multiple threads. This patch is addressing the issue by ensuring that write is not issued while fifo is full. A timeout is added to avoid any hang on fifo-full for 10 mS which is unlikely case. Patch is validated on OMAP3630 and OMAP4 SDP. V2 version removed the additional 1 uS on every TX as per Tony's suggestion Signed-off-by: Woodruff Richard Signed-off-by: Santosh Shilimkar CC: Ghorai Sukumar Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit ae46ec77311b550be992339c1e01fc20bc65296e Author: Santosh Shilimkar Date: Tue Feb 16 19:29:20 2010 +0530 omap4: multi-omap: Allow build to work The musb support is enabled in omap3 platforms. For omap4 only board support is available and the driver still isn't supported. Because of this build with omap3_defconfig used for multi-omap doesn't work on omap4430 sdp. This patch avoids usb_musb_init() by adding a cpu check in the board file. Thanks to Anand Gadiyar and Mankad Maulik for the suggestion of patching board file instead of musb driver. Signed-off-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 83905c134571642d7e8a1e51ae9f26bd3a3ad82a Author: Ilkka Koskinen Date: Mon Feb 22 12:21:12 2010 +0000 ASoC: OMAP-McBSP: ASoC interface for McBSP sidetone Add ASoC interface for OMAP McBSP2 and McBSP3 sidetones. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Liam Girdwood Acked-by: Mark Brown Tested-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit d912fa9255845ffd8029482d408b6139344891c8 Author: Eero Nurkkala Date: Mon Feb 22 12:21:11 2010 +0000 McBSP: OMAP3: Add sidetone feature Add sidetone feature to McBSP instances 2 and 3 on OMAP3 based devices. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Liam Girdwood Acked-by: Mark Brown Tested-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit bce066836644f12b239b86bbfdd475d7b24b9a49 Author: Maulik Mankad Date: Wed Feb 17 14:09:32 2010 -0800 omap: musb: Add USB support to 4430 SDP board file This patch adds support for Mentor USB to 4430 SDP board file. It also defines the base address for HS USB OTG controller in OMAP4. Also updates platform specfic structure with base address and IRQ details. Signed-off-by: Maulik Mankad Cc: Tony Lindgren Cc: Felipe Balbi Cc: David Brownell Cc: Greg Kroah-Hartman Cc: Sergei Shtylyov Cc: Olof Johansson Signed-off-by: Tony Lindgren commit 5e6dbc260704ce4d22fc9664f517f0bb6748feaa Author: Roland McGrath Date: Mon Feb 22 10:37:07 2010 -0800 parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK > FYI, this commit broke tip:master on PARISC (other architectures are fine): > > kernel/built-in.o: In function `ptrace_request': > (.text.ptrace_request+0x2cc): undefined reference to `task_user_regset_view' This means that parisc failed to meet the documented requirements for setting CONFIG_HAVE_ARCH_TRACEHOOK, but set it anyway. If arch folks don't follow the specs, it defeats the whole purpose of having clear statements of requirements for arch code. Until parisc finishes up its requirements, disable CONFIG_HAVE_ARCH_TRACEHOOK. Signed-off-by: H. Peter Anvin LKML-Reference: <20100222183707.8749D64C@magilla.sf.frob.com> Cc: Cc: Kyle McMartin Cc: Helge Deller Cc: James E.J. Bottomley commit 7bc5e3f2be32ae6fb0c74cd0f707f986b3a01a26 Author: Bjorn Helgaas Date: Tue Feb 23 10:24:41 2010 -0700 x86/PCI: use host bridge _CRS info by default on 2008 and newer machines The main benefit of using ACPI host bridge window information is that we can do better resource allocation in systems with multiple host bridges, e.g., http://bugzilla.kernel.org/show_bug.cgi?id=14183 Sometimes we need _CRS information even if we only have one host bridge, e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/341681 Most of these systems are relatively new, so this patch turns on "pci=use_crs" only on machines with a BIOS date of 2008 or newer. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2fe2abf896c1e7a0ee65faaf3ef0ce654848abbd Author: Bjorn Helgaas Date: Tue Feb 23 10:24:36 2010 -0700 PCI: augment bus resource table with a list Previously we used a table of size PCI_BUS_NUM_RESOURCES (16) for resources forwarded to a bus by its upstream bridge. We've increased this size several times when the table overflowed. But there's no good limit on the number of resources because host bridges and subtractive decode bridges can forward any number of ranges to their secondary buses. This patch reduces the table to only PCI_BRIDGE_RESOURCE_NUM (4) entries, which corresponds to the number of windows a PCI-to-PCI (3) or CardBus (4) bridge can positively decode. Any additional resources, e.g., PCI host bridge windows or subtractively-decoded regions, are kept in a list. I'd prefer a single list rather than this split table/list approach, but that requires simultaneous changes to every architecture. This approach only requires immediate changes where we set up (a) host bridges with more than four windows and (b) subtractive-decode P2P bridges, and we can incrementally change other architectures to use the list. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 89a74ecccd1f78e51faf6287e5c0e93a92ac096e Author: Bjorn Helgaas Date: Tue Feb 23 10:24:31 2010 -0700 PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs No functional change; this converts loops that iterate from 0 to PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the pci_bus_for_each_resource() iterator instead. This doesn't change the way resources are stored; it merely removes dependencies on the fact that they're in a table. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2adf75160b10bf3f09ed7d3d04e937f923fc557e Author: Bjorn Helgaas Date: Tue Feb 23 10:24:26 2010 -0700 PCI: read bridge windows before filling in subtractive decode resources No functional change; this fills in the bus subtractive decode resources after reading the bridge window information rather than before. Also, print out the subtractive decode resources as we already do for the positive decode windows. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit fa27b2d108fa49685129867a8c5b968344d6e197 Author: Bjorn Helgaas Date: Tue Feb 23 10:24:21 2010 -0700 PCI: split up pci_read_bridge_bases() No functional change; this breaks up pci_read_bridge_bases() into separate pieces for the I/O, memory, and prefetchable memory windows, similar to how Yinghai recently split up pci_setup_bridge() in 68e84ff3bdc. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 63cf28ac3e3166a02a4e0db6168cf403ed66e3a5 Author: Tomi Valkeinen Date: Tue Feb 23 17:40:00 2010 +0200 OMAP: DSS2: fix get_dsi/dispc_clk_source() usage After changing the selection of DSI and DISPC clock source the users of get_dsi/dispc_clk_source() functions were left unchanged. Signed-off-by: Tomi Valkeinen commit 8ccb92ad41cb311e52ad1b1fe77992c7f47a3b63 Author: Tim Gardner Date: Tue Feb 23 14:59:12 2010 +0100 netfilter: xt_recent: fix false match A rule with a zero hit_count will always match. Signed-off-by: Tim Gardner Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit 2c08522e5d2f0af2d6f05be558946dcbf8173683 Author: Tim Gardner Date: Tue Feb 23 14:55:21 2010 +0100 netfilter: xt_recent: fix buffer overflow e->index overflows e->stamps[] every ip_pkt_list_tot packets. Consider the case when ip_pkt_list_tot==1; the first packet received is stored in e->stamps[0] and e->index is initialized to 1. The next received packet timestamp is then stored at e->stamps[1] in recent_entry_update(), a buffer overflow because the maximum e->stamps[] index is 0. Signed-off-by: Tim Gardner Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit aefbd3e823d4fe219bb6420b0cac505847270507 Author: Daniel Mack Date: Tue Feb 23 10:30:00 2010 +0100 usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h Some structs in linux/usb/audio.h have got new names to mark them as part of version 1.0 of the USB audio standard. Follow these changes in the gadget drivers. Note that this header and the ALSA USB driver will undergo some refactoring soon, so there might be another update to the gadgets as well. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 47fc9a0a808f23b7b305f6c018e4882118b88d92 Author: Kuninori Morimoto Date: Mon Feb 22 16:41:57 2010 +0900 ASoC: fsi: Modify over/under run error settlement In current FSI driver, playback function cares only overrun, and capture function cares only underrun. But playback function should had cared about underrun, and capture function should had cared about overrun too. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit db72c2f89790f919d65d0adbee390958005c40fc Author: Misael Lopez Cruz Date: Mon Feb 22 15:09:22 2010 -0600 ASoC: OMAP4: Add McPDM platform driver McPDM platform driver is configured to use sDMA in order to transfer to/from memory. Support for interfacing with ABE will be added later. McPDM dai currently supports up to 4 downlink channels and 2 uplink channels simultaneously, as well as 88.2 and 96 KHz, and a sample size of 32 bits. Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Signed-off-by: Jorge Eduardo Candelaria Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b3b0b4580bcb771d1d53b3d5acf689cba9907392 Author: Candelaria Villareal, Jorge Date: Mon Feb 22 17:17:21 2010 -0600 ASoC: OMAP4: Add support for McPDM McPDM is the interface between Phoenix audio codec and the OMAP4430 processor. It enables data to be transfered to/from Phoenix at sample rates of 88.4 or 96 KHz. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e17dd32f342d0e876f729b348614320b297cf6f3 Author: Misael Lopez Cruz Date: Mon Feb 22 15:09:19 2010 -0600 ASoC: OMAP: data_type and sync_mode configurable in audio dma Allow client drivers to set the data_type (16, 32) and the sync_mode (element, packet, etc) of the audio dma transferences. McBSP dai driver configures it for a data type of 16 bits and element sync mode. Signed-off-by: Misael Lopez Cruz Signed-off-by: Jorge Eduardo Candelaria Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0d7d8bf3b896dd8752284e2a7639a03936085e5f Author: Takashi Iwai Date: Tue Feb 23 10:55:46 2010 +0100 ALSA: hda - Add missing description in HD-Audio-Models.txt Signed-off-by: Takashi Iwai commit 76e6f5a9efc919f9179163c66403451a789d47ab Author: Reimundo Heluani Date: Tue Feb 23 01:19:51 2010 -0800 ALSA: add support for Macbook Air 2,1 internal speaker Add support for Macbook Air 2,1 (late 2008) internal speaker and headphones. Create a "mba21" model for snd-hda-intel. Signed-off-by: Reimundo Heluani Signed-off-by: Takashi Iwai commit 10886af54a2478f97f2d5f89bbe270b99206f8ab Author: Jiri Pirko Date: Tue Feb 23 01:19:22 2010 -0800 e1000: correct wrong coding style for "else" Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit bddd87c7e622ea681c665049027ed84cdcafcb09 Author: Akinobu Mita Date: Tue Feb 23 08:55:42 2010 +0100 blk-core: use BIO list management functions Now that the bio list management stuff is generic, convert generic_make_request to use bio lists instead of its own private bio list implementation. Signed-off-by: Akinobu Mita Cc: Christoph Hellwig Signed-off-by: Jens Axboe commit de48c7bc6f93c6c8e0be8612c9d72a2dc92eaa01 Author: Daniel Mack Date: Mon Feb 22 23:49:13 2010 +0100 ALSA: usbaudio: consolidate header files Use the definitions from linux/usb/audio.h all over the ALSA USB audio driver and add some missing definitions there as well. Use the endpoint attribute macros from linux/usb/ch9 and remove the own things from sound/usb/usbaudio.h. Now things are also nicely prefixed which makes understanding the code easier. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 7b8a043f2686af9f41e313a78ed5e98233e5fded Author: Daniel Mack Date: Mon Feb 22 23:49:12 2010 +0100 ALSA: usbmixer: bail out early when parsing audio class v2 descriptors This is just a quick hack that needs to be removed once the new units defined by the audio class v2.0 standard are supported. However, it allows using these devices for now, without mixer support. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 53ee98fe8ac77d00bacc1c814d450d83cbd193d4 Author: Daniel Mack Date: Mon Feb 22 23:49:11 2010 +0100 ALSA: usbaudio: implement basic set of class v2.0 parser This adds a number of parsers for audio class v2.0. In particular, the following internals are different and now handled by the code: * the number of streaming interfaces is now reported by an interface association descriptor. The old approach using a proprietary descriptor is deprecated. * The number of channels per interface is now stored in the AS_GENERAL descriptor (used to be part of the FORMAT_TYPE descriptor). * The list of supported sample rates is no longer stored in a variable length appendix of the format_type descriptor but is retrieved from the device using a class specific GET_RANGE command. * Supported sample formats are now reported as 32bit bitmap rather than a fixed value. For now, this is worked around by choosing just one of them. * A devices needs to have at least one CLOCK_SOURCE descriptor which denotes a clockID that is needed im the class request command. * Many descriptors (format_type, ...) have changed their layout. Handle this by casting the descriptors to the appropriate structs. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 8fee4aff8c89c229593b76a6ab172a9cad24b412 Author: Daniel Mack Date: Mon Feb 22 23:49:10 2010 +0100 ALSA: usbaudio: introduce new types for audio class v2 This patch adds some definitions for audio class v2. Unfortunately, the UNIT types PROCESSING_UNIT and EXTENSION_UNIT have different numerical representations in both standards, so there is need for a _V1 add-on now. usbmixer.c is changed accordingly. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 28e1b773083d349d5223f586a39fa30f5d0f1c36 Author: Daniel Mack Date: Mon Feb 22 23:49:09 2010 +0100 ALSA: usbaudio: parse USB descriptors with structs In preparation of support for v2.0 audio class, use the structs from linux/usb/audio.h and add some new ones to describe the fields that are actually parsed by the descriptor decoders. Also, factor out code from usb_create_streams(). This makes it easier to adopt the new iteration logic needed for v2.0. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit d02f0cff1da4a1bd609e8d3eae3a2e85459cd8a1 Author: dann frazier Date: Tue Feb 23 08:38:42 2010 +0100 cciss: export linux/cciss_defs.h header 'make headers_check' began to fail after cciss_defs.h was introduced in: 429c42c9d246f5bda868495c09974312a0177328 usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is not exported Fix this by exporting cciss_defs.h Signed-off-by: dann frazier Signed-off-by: Jens Axboe commit 32679f95cac3b1bdf27dce8b5273e06af186fd91 Author: Seth Heasley Date: Mon Feb 22 17:31:09 2010 -0800 ALSA: hda - enable snoop for Intel Cougar Point This patch enables snoop, eliminating static during playback. This patch supersedes the previous Cougar Point audio patch. Signed-off-by: Seth Heasley Signed-off-by: Takashi Iwai commit d01aecdf900574cf6be7c1c6114e708801126baf Author: Takashi Iwai Date: Tue Feb 23 08:07:15 2010 +0100 ALSA: hda - Remove identical definitions for macmini3 model The channel mode definitions for macmini3 model are identical with mb5. Signed-off-by: Takashi Iwai commit fa80945269f312bc609e8384302f58b03c916e12 Author: Thomas Renninger Date: Sat Feb 20 11:44:27 2010 +0100 ACPI thermal: Don't invalidate thermal zone if critical trip point is bad V2: Corrected integer/long conversion. Some BIOSes return a negative value for the critical trip point. Especially since Windows 2006... We currently invalidate the whole thermal zone in this case. But it may still be needed for cooling, also without critical trip point. This patch invalidates the critical trip point if no _CRT function is found or if it returns negative values, but does not invalidate the whole thermal zone in this case. Reference: http://bugzilla.novell.com/show_bug.cgi?id=531547 Signed-off-by: Thomas Renninger Tested-by: clarkt@cnsp.com Acked-by: Zhang Rui Signed-off-by: Len Brown commit 94ea5e449ae834af058ef005d16a8ad44fcf13d6 Author: Paul Mundt Date: Tue Feb 23 12:56:30 2010 +0900 sh: wire up SET/GET_UNALIGN_CTL. This hooks up the SET/GET_UNALIGN_CTL knobs cribbing the bulk of it from the PPC and ia64 implementations. The thread flags happen to be the logical inverse of what the global fault mode is set to, so this works out pretty cleanly. By default the global fault mode is used, with tasks now being able to override their own settings via prctl(). Signed-off-by: Paul Mundt commit 7c1b2c6890a1a033dde4f6991c0a1fcd69cf58ce Author: Paul Mundt Date: Tue Feb 23 11:48:50 2010 +0900 sh: allow alignment fault mode to be configured at kernel boot. Follow the ARM change, which is what our alignment helpers are based on in the first place. Signed-off-by: Paul Mundt commit 41dcc17c735d4e99a91002b09850d0f09ee4ab4b Author: Kuninori Morimoto Date: Fri Feb 19 07:52:12 2010 +0000 ARM: mach-shmobile: pfc-sh7377: modify KEYIN settings Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 54b56170e4517e9606b245c3f805fc96baa059f0 Merge: 1f91233 d02e30c Author: H. Peter Anvin Date: Mon Feb 22 16:25:18 2010 -0800 Merge remote branch 'origin/x86/apic' into x86/mrst Conflicts: arch/x86/kernel/apic/io_apic.c commit 295fae568885a93c39a0e29a9455054608b6cc0e Author: Jamal Hadi Salim Date: Mon Feb 22 11:33:00 2010 +0000 xfrm: Allow user space manipulation of SPD mark Add ability for netlink userspace to manipulate the SPD and manipulate the mark, retrieve it and get events with a defined mark, etc. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 6f26b61e177e57a41795355f6222cf817f1212dc Author: Jamal Hadi Salim Date: Mon Feb 22 11:32:59 2010 +0000 xfrm: Allow user space config of SAD mark Add ability for netlink userspace to manipulate the SAD and manipulate the mark, retrieve it and get events with a defined mark. MIGRATE may be added later. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 34f8d8846f69f3b5bc3916ba9145e4eebae9394e Author: Jamal Hadi Salim Date: Mon Feb 22 11:32:58 2010 +0000 xfrm: SP lookups with mark Allow mark to be used when doing SP lookup Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit b16694f70c40ea8d539cdc93a422039771e85870 Author: Kenji Kaneshige Date: Mon Feb 22 14:13:39 2010 +0900 PCIe PME: use pci_pcie_cap() Use pci_pcie_cap() instead of pci_find_capability() to get PCIe capability offset. This reduces redundant search in PCI configuration space. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 6cbf82148ff286ec22a55be6836c3a5bffc489c1 Author: Rafael J. Wysocki Date: Wed Feb 17 23:44:58 2010 +0100 PCI PM: Run-time callbacks for PCI bus type Introduce run-time PM callbacks for the PCI bus type. Make the new callbacks work in analogy with the existing system sleep PM callbacks, so that the drivers already converted to struct dev_pm_ops can use their suspend and resume routines for run-time PM without modifications. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 8ca2e93b557f2a0b35f7769038abf600177e1122 Author: Jamal Hadi Salim Date: Mon Feb 22 11:32:57 2010 +0000 xfrm: SP lookups signature with mark pass mark to all SP lookups to prepare them for when we add code to have them search. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 552be54cc4232dc5acc49ccb372129d6f1b6923f Author: Kenji Kaneshige Date: Mon Feb 22 14:12:24 2010 +0900 PCIe PME: use pci_is_pcie() Use pci_is_pcie() instead of looking at obsolete is_pcie field in struct pci_dev. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 3d6acfa7641fd0a35f608b142f61e79f7ed8db43 Author: Jamal Hadi Salim Date: Mon Feb 22 11:32:56 2010 +0000 xfrm: SA lookups with mark Allow mark to be added to the SA lookup Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit b67ea76172d4b1922c4b3c46c8ea8e9fec1ff38c Author: Rafael J. Wysocki Date: Wed Feb 17 23:44:09 2010 +0100 PCI / ACPI / PM: Platform support for PCI PME wake-up Although the majority of PCI devices can generate PMEs that in principle may be used to wake up devices suspended at run time, platform support is generally necessary to convert PMEs into wake-up events that can be delivered to the kernel. If ACPI is used for this purpose, PME signals generated by a PCI device will trigger the ACPI GPE associated with the device to generate an ACPI wake-up event that we can set up a handler for, provided that everything is configured correctly. Unfortunately, the subset of PCI devices that have GPEs associated with them is quite limited. The devices without dedicated GPEs have to rely on the GPEs associated with other devices (in the majority of cases their upstream bridges and, possibly, the root bridge) to generate ACPI wake-up events in response to PME signals from them. Add ACPI platform support for PCI PME wake-up: o Add a framework making is possible to use ACPI system notify handlers for run-time PM. o Add new PCI platform callback ->run_wake() to struct pci_platform_pm_ops allowing us to enable/disable the platform to generate wake-up events for given device. Implemet this callback for the ACPI platform. o Define ACPI wake-up handlers for PCI devices and PCI root buses and make the PCI-ACPI binding code register wake-up notifiers for all PCI devices present in the ACPI tables. o Add function pci_dev_run_wake() which can be used by PCI drivers to check if given device is capable of generating wake-up events at run time. Developed in cooperation with Matthew Garrett . Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3f0be67188c60ebf1b5d00354b44b4b24f5af313 Author: Rafael J. Wysocki Date: Wed Feb 17 23:42:59 2010 +0100 ACPI / ACPICA: Multiple system notify handlers per device Currently it only is possible to install one system notify handler per namespace node, but this is not enough for PCI run-time power management, because we need to install power management notifiers for devices that already have hotplug notifiers installed. While in principle this could be handled at the PCI level, that would be suboptimal due to the way in which the ACPI-based PCI hotplug code is designed. For this reason, modify ACPICA so that it is possible to install more than one system notify handler per namespace node. Namely, make acpi_install_notify_handler(), acpi_remove_notify_handler() and acpi_ev_notify_dispatch() use a list of system notify handler objects associated with a namespace node. Make acpi_remove_notify_handler() call acpi_os_wait_events_complete() upfront to avoid a situation in which concurrent instance of acpi_remove_notify_handler() removes the handler from under us while we're waiting for the event queues to flush. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit f517709d65beed95f52f021b43e3035b52ef791a Author: Rafael J. Wysocki Date: Wed Feb 17 23:41:49 2010 +0100 ACPI / PM: Add more run-time wake-up fields Use the run_wake flag to mark all devices for which run-time wake-up events may be generated by the platform. Introduce a new wake-up flag, always_enabled, for marking devices that should be permanently enabled to generate run-time events. Also, introduce a reference counter for run-wake devices and a function that will initialize all of the run-time wake-up fields for given device. Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown Signed-off-by: Jesse Barnes commit 9630bdd9b15d2f489c646d8bc04b60e53eb5ec78 Author: Rafael J. Wysocki Date: Wed Feb 17 23:41:07 2010 +0100 ACPI: Use GPE reference counting to support shared GPEs ACPI GPEs may map to multiple devices. The current GPE interface only provides a mechanism for enabling and disabling GPEs, making it difficult to change the state of GPEs at runtime without extensive cooperation between devices. Add an API to allow devices to indicate whether or not they want their device's GPE to be enabled for both runtime and wakeup events. Remove the old GPE type handling entirely, which gets rid of various quirks, like the implicit disabling with GPE type setting. This requires a small amount of rework in order to ensure that non-wake GPEs are enabled by default to preserve existing behaviour. Based on patches from Matthew Garrett . Signed-off-by: Matthew Garrett Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit c39fae1416d59fd565606793f090cebe3720d50d Author: Rafael J. Wysocki Date: Wed Feb 17 23:40:07 2010 +0100 PCI PM: Make it possible to force using INTx for PCIe PME signaling Apparently, some machines may have problems with PCI run-time power management if MSIs are used for the native PCIe PME signaling. In particular, on the MSI Wind U-100 PCIe PME interrupts are not generated by a PCIe root port after a resume from suspend to RAM, if the system wake-up was triggered by a PME from the device attached to this port. [It doesn't help to free the interrupt on suspend and request it back on resume, even if that is done along with disabling the MSI and re-enabling it, respectively.] However, if INTx interrupts are used for this purpose on the same machine, everything works just fine. For this reason, add a kernel command line switch allowing one to request that MSIs be not used for the native PCIe PME signaling, introduce a DMI table allowing us to blacklist machines that need this switch to be set by default and put the MSI Wind U-100 into this table. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit d02e30c31c57683a66ed68a1bcff900ca78f6d56 Merge: 0fdc7a8 aef55d4 Author: H. Peter Anvin Date: Mon Feb 22 16:20:34 2010 -0800 Merge branch 'x86/irq' into x86/apic Merge reason: Conflicts in arch/x86/kernel/apic/io_apic.c Resolved Conflicts: arch/x86/kernel/apic/io_apic.c Signed-off-by: H. Peter Anvin commit c7f486567c1d0acd2e4166c47069835b9f75e77b Author: Rafael J. Wysocki Date: Wed Feb 17 23:39:08 2010 +0100 PCI PM: PCIe PME root port service driver PCIe native PME detection mechanism is based on interrupts generated by root ports or event collectors every time a PCIe device sends a PME message upstream. Once a PME message has been sent by an endpoint device and received by its root port (or event collector in the case of root complex integrated endpoints), the Requester ID from the message header is registered in the root port's Root Status register. At the same time, the PME Status bit of the Root Status register is set to indicate that there's a PME to handle. If PCIe PME interrupt is enabled for the root port, it generates an interrupt once the PME Status has been set. After receiving the interrupt, the kernel can identify the PCIe device that generated the PME using the Requester ID from the root port's Root Status register. [For details, see PCI Express Base Specification, Rev. 2.0.] Implement a driver for the PCIe PME root port service working in accordance with the above description. Based on a patch from Shaohua Li . Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 58ff463396ad00828e922d50998787e97fd32512 Author: Rafael J. Wysocki Date: Wed Feb 17 23:36:58 2010 +0100 PCI PM: Add function for checking PME status of devices Add function pci_check_pme_status() that will check the PME status bit of given device and clear it along with the PME enable bit. It will be necessary for PCI run-time power management. Based on a patch from Shaohua Li Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9 Author: Jamal Hadi Salim Date: Mon Feb 22 16:20:22 2010 -0800 xfrm: SA lookups signature with mark pass mark to all SA lookups to prepare them for when we add code to have them search. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit bf825f81b454fae2ffe1b675f3a549656726440e Author: Jamal Hadi Salim Date: Mon Feb 22 11:32:54 2010 +0000 xfrm: introduce basic mark infrastructure Add basic structuring and accessors for xfrm mark Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 6d3be84aab461815978d970aa45f5bc9e52dd772 Author: Kenji Kaneshige Date: Tue Feb 9 12:21:27 2010 +0900 PCI: mark is_pcie obsolete The "is_pcie" field in struct pci_dev is no longer needed because struct pci_dev has PCIe capability offset in "pcie_cap" field and (pcie_cap != 0) means the device is PCIe capable. This patch marks "is_pcie" fields obsolete. Current users of "is_pcie" field are: - drivers/ssb/scan.c - drivers/net/wireless/ath/ath9k/pci.c - drivers/net/wireless/ath/ath5k/attach.c - drivers/net/wireless/ath/ath5k/reset.c - drivers/acpi/hest.c - drivers/pci/pcie/pme/pcie_pme.c Will post patches for each to use pci_is_pcie() as a follow-up. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 9958610552c0bd7558b41cb8addbd865587f142a Author: Yinghai Lu Date: Fri Jan 22 01:02:28 2010 -0800 PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges Make pci_bridge_check_ranges() store the PCI_PREF_RANGE_TYPE_64 in addition to IORESOURCE_MEM_64. Just like pci_read_bridge_bases(). Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 32180e402f9ff1f3389c99edf3f393425e706080 Author: Yinghai Lu Date: Fri Jan 22 01:02:27 2010 -0800 PCI: pciehp: second try to get big range for pcie devices Handle the case where the slot bridge that doesn't get a pre-allocated resource big enough to handle its child resources.. For example pcie devices need 256M, but the bridge only gets 2M preallocated. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 9789ac979b6b6ae6cc09f7b29c88e95ecb14ec39 Author: Yinghai Lu Date: Fri Jan 22 01:02:26 2010 -0800 PCI: pciehp: cleanup flow in pciehp_configure_device Move bus_size_bridges and assign resources out of pciehp_add_bridge() and do them all together, one time, including slot bridge, to avoid to calling assign resources several times when there are several bridges under the slot bridge. Using pci_assign_unassigned_bridge_resources. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 6841ec681a88b66651e4563040b9c7a7ad25d7b5 Author: Yinghai Lu Date: Fri Jan 22 01:02:25 2010 -0800 PCI: introduce pci_assign_unassigned_bridge_resources For use by pciehp. pci_setup_bridge() will not check enabled for the slot bridge, otherwise update res is not updated to bridge BAR. That is, bridge is already enabled for port service. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 977d17bb1749517b353874ccdc9b85abc7a58c2a Author: Yinghai Lu Date: Fri Jan 22 01:02:24 2010 -0800 PCI: update bridge resources to get more big ranges in PCI assign unssigned BIOS separates IO ranges between several IOHs, and on some slots, BIOS assigns resources to a bridge, but stops assigning resources to the device under that bridge, because the device needs a big resource. So: 1. allocate resources and record the failed device resources 2. clear the BIOS assigned resources of the parent bridge of failing device 3. go back and call pci assign unassigned 4. if it still fails, go up the tree, clear more bridges. and try again Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit d65245c3297ac63abc51a976d92f45f2195d2854 Author: Yinghai Lu Date: Fri Jan 22 01:02:23 2010 -0800 PCI: don't shrink bridge resources When clearing leaf bridge resources, trying to get a big enough one, we could shrink the bridge if there is no resource under it. Confirm against the old resource side to make sure we're increasing the allocation. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit cd81e1ea1a4cda94aa5f3e942301cf0da497c262 Author: Yinghai Lu Date: Fri Jan 22 01:02:22 2010 -0800 PCI: reject mmio ranges starting at 0 on pci_bridge read We already track unassigned resources in struct resource, and this prevents us from overwriting resource flags and info in the unassigned case. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 568ddef8735d4a51a521ba6af026ee0c32281566 Author: Yinghai Lu Date: Fri Jan 22 01:02:21 2010 -0800 PCI: add failed_list to pci_bus_assign_resources This allows us to track failed allocations for later re-trying with reallocation. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 5009b46025acb2d3955d2c93574604fba667ef39 Author: Yinghai Lu Date: Fri Jan 22 01:02:20 2010 -0800 PCI: add pci_bridge_release_resources and pci_bus_release_bridge_resources We use this in later patches to free resrouce ranges for reassignment in an effort to support a wider variety of PCI topologies. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit ba02b242bbf8e4e1bc63d62e8ccec33b4e5ea132 Author: Andrew Morton Date: Tue Feb 2 14:45:54 2010 -0800 PCI hotplug: check ioremap() return value in ibmphp_ebda.c check ioremap() return value. Cc: Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 939fdc67350e15aeeea70457d5b4bc1116bb4fd5 Author: Randy Dunlap Date: Thu Feb 4 12:12:23 2010 -0800 PCI hotplug: fix ibmphp build error Add header file to fix build error: drivers/pci/hotplug/ibmphp_hpc.c:135: error: implicit declaration of function 'init_MUTEX' drivers/pci/hotplug/ibmphp_hpc.c:136: error: implicit declaration of function 'init_MUTEX_LOCKED' drivers/pci/hotplug/ibmphp_hpc.c:797: error: implicit declaration of function 'down' drivers/pci/hotplug/ibmphp_hpc.c:807: error: implicit declaration of function 'up' Signed-off-by: Randy Dunlap Signed-off-by: Jesse Barnes commit 4fb88c1a28a8dc302bdc09858e7cdafc97bef794 Author: Matthew Wilcox Date: Sun Jan 17 14:01:41 2010 -0700 PCI: Make pci_scan_slot more robust Yinghai pointed out that the new pci_scan_slot() crashes when called on an ARI-capable slot that is empty. Fix this by exiting early from pci_scan_slot if there is no device in the slot. Also make next_ari_func() robust against devices not existing in case the ARI capability is corrupt. ARI also requires that the devices be listed in order, so if we find a function listed that is out of order, stop scanning to prevent loops. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 0bf01c3c86d4b9ea279d6215420484db887f5db5 Author: Jiri Slaby Date: Wed Jan 20 14:15:54 2010 +0100 PCI: hotplug/cpcihp, fix pci device refcounting Stanse found an ommitted pci_dev_put on one error path in cpcihp_generic_init. The path is taken on !dev, but also when dev->hdr_type != PCI_HEADER_TYPE_BRIDGE. However it omits to pci_dev_put on the latter. As it is fine to pass NULL to pci_dev_put, put it in there uncoditionally. Signed-off-by: Jiri Slaby Cc: Scott Murray Signed-off-by: Jesse Barnes commit 41a68a748bbc61f5bcea999e33ba72926dfbe6f7 Author: Tilman Schmidt Date: Mon Jan 18 17:24:10 2010 +0100 PCI: push deprecated pci_find_device() function to last user The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Signed-off-by: Tilman Schmidt Signed-off-by: Jesse Barnes commit 7c9342b8dd1a32386fc32bffb9eedebbfe264763 Author: Yinghai Lu Date: Tue Dec 22 15:02:24 2009 -0800 PCI: don't dump resource when bus resource flags indicates unused Don't print out resources without flags to avoid cluttering up the debug output. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 5eeec0ec931a01e85b3701ce121b7d8a1800ec60 Author: Yinghai Lu Date: Tue Dec 22 15:02:22 2009 -0800 resource: add release_child_resources Useful for freeing a portion of the resource tree, e.g. when trying to reallocate resources more efficiently. Signed-off-by: Yinghai Lu Acked-by: Linus Torvalds Signed-off-by: Jesse Barnes commit 7cc5997d1dada3bdeed95a59c2f4f6c66cbb0767 Author: Yinghai Lu Date: Tue Dec 22 15:02:21 2009 -0800 PCI: separate pci_setup_bridge to small functions This is a good cleanup in itself, and makes it easier to modify specific resource types in later code. Signed-off-by: Yinghai Lu Acked-by: Linus Torvalds Signed-off-by: Jesse Barnes commit b0fc889c4311835ae7d02f433154bc20cad9ee11 Author: Chandru Date: Mon Jan 11 11:49:21 2010 +0530 PCI hotplug: ibmphp: read the length of ebda and map entire ebda region ibmphp driver currently maps only 1KB of ebda memory area into kernel address space during driver initialization. This causes kernel oops when the driver is modprobe'd and it accesses memory beyond 1KB within ebda segment. The first byte of ebda segment actually stores the length of the ebda region in Kilobytes. Hence make use of the length parameter and map the entire ebda region. Signed-off-by: Chandru Siddalingappa Signed-off-by: Jesse Barnes commit 6fcaf17ac7a512227112ac81c0e1a5862bab57a6 Author: Jiri Slaby Date: Wed Jan 6 17:47:56 2010 +0100 PCI hotplug: fix memory leaks Stanse found a cut&pasted memory leak in pciehp_queue_pushbutton_work and shpchp_queue_pushbutton_work. info is not freed/assigned on all paths. Fix that. Reviewed-by: Kenji Kaneshige Signed-off-by: Jiri Slaby Signed-off-by: Jesse Barnes commit 3b7a17fcdae532d29dffab9d564a28be08960988 Author: Dominik Brodowski Date: Fri Jan 1 17:40:50 2010 +0100 resource/PCI: mark struct resource as const Now that we return the new resource start position, there is no need to update "struct resource" inside the align function. Therefore, mark the struct resource as const. Cc: Bjorn Helgaas Cc: Yinghai Lu Signed-off-by: Dominik Brodowski Signed-off-by: Jesse Barnes commit b26b2d494b659f988b4d75eb394dfa0ddac415c9 Author: Dominik Brodowski Date: Fri Jan 1 17:40:49 2010 +0100 resource/PCI: align functions now return start of resource As suggested by Linus, align functions should return the start of a resource, not void. An update of "res->start" is no longer necessary. Cc: Bjorn Helgaas Cc: Yinghai Lu Signed-off-by: Dominik Brodowski Signed-off-by: Jesse Barnes commit 93da6202264ce1256b04db8008a43882ae62d060 Author: Seth Heasley Date: Tue Jan 12 16:56:37 2010 -0800 x86/PCI: irq and pci_ids patch for Intel Cougar Point DeviceIDs This patch adds the Intel Cougar Point (PCH) LPC and SMBus Controller DeviceIDs. Signed-off-by: Seth Heasley Signed-off-by: Jesse Barnes commit 93177a748ba0d4f3d3e51c8e6c785773bf6a70df Author: Rafael J. Wysocki Date: Sat Jan 2 22:57:24 2010 +0100 PCI: Clean up build for CONFIG_PCI_QUIRKS unset Currently, drivers/pci/quirks.c is built unconditionally, but if CONFIG_PCI_QUIRKS is unset, the only things actually built in this file are definitions of global variables and empty functions (due to the #ifdef CONFIG_PCI_QUIRKS embracing all of the code inside the file). This is not particularly nice and if someone overlooks the #ifdef CONFIG_PCI_QUIRKS, build errors are introduced. To clean that up, move the definitions of the global variables in quirks.c that are always built to pci.c, move the definitions of the empty functions (compiled when CONFIG_PCI_QUIRKS is unset) to headers (additionally make these functions static inline) and modify drivers/pci/Makefile so that quirks.c is only built if CONFIG_PCI_QUIRKS is set. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3804259475314a50e4d7a8a974a22fddb6ac7dd7 Author: Jesse Barnes Date: Mon Jan 4 15:44:10 2010 -0800 PCI hotplug: remove obsolete usage of get_bus_speed from rpaphp hotplug ops No longer needed and causes build breakage. Reported-by: Stephen Rothwell Signed-off-by: Jesse Barnes commit 9dfd97fe12f79ec8b68feb63912a4ef2f31f571a Author: Matthew Wilcox Date: Sun Dec 13 08:11:35 2009 -0500 PCI: Add support for reporting PCIe 3.0 speeds Add the 8.0 GT/s speed. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 45b4cdd57ef0e57555b2ab61b584784819b39365 Author: Matthew Wilcox Date: Sun Dec 13 08:11:34 2009 -0500 PCI: Add support for AGP in cur/max bus speed Take advantage of some gaps in the table to fit in support for AGP speeds. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 9be60ca0497a2563662fde4c9007841c3b79a742 Author: Matthew Wilcox Date: Sun Dec 13 08:11:33 2009 -0500 PCI: Add support for detection of PCIe and PCI-X bus speeds Both PCIe and PCI-X bridges report their secondary bus speed in their respective capabilities. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 3749c51ac6c1560aa1cb1520066bed84c6f8152a Author: Matthew Wilcox Date: Sun Dec 13 08:11:32 2009 -0500 PCI: Make current and maximum bus speeds part of the PCI core Move the max_bus_speed and cur_bus_speed into the pci_bus. Expose the values through the PCI slot driver instead of the hotplug slot driver. Update all the hotplug drivers to use the pci_bus instead of their own data structures. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 536c8cb49eccd4f753b4782e7e975ef87359cb44 Author: Matthew Wilcox Date: Sun Dec 13 08:11:31 2009 -0500 PCI: Unify pcie_link_speed and pci_bus_speed These enums must not overlap anyway, since we only have a single pci_bus_speed_strings array. Use a single enum, and move it to pci.h. Add 'SPEED' to the pcie names to make it clear what they are. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit f07852d6442c46c50b59c7e2acc8a1b291f9ab6d Author: Matthew Wilcox Date: Sun Dec 13 08:10:02 2009 -0500 PCI: Rewrite pci_scan_slot The Alternate Routing-ID Interpretation capability allows a single device to have up to 256 functions. They can be populated sparsely, so the current technique of scanning every eighth function is not guaranteed to find them all. By introducing a 'next_fn' function pointer, we can use the linked list of functions in the ARI capability to scan all the functions which exist. We can then speed up the pci_scan_slot by skipping the scan of subsequent devfns for PCIe devices which are the direct children of Root Ports or Downstream Ports. These devices are only permitted to implement device 0, unless they are ARI devices, in which case they'll be scanned by the ARI code above. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 Author: Ben Dooks Date: Fri Jan 29 09:02:16 2010 +0000 ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung Move the init.c and time.c files to plat-samsung from plat-s3c, thus clearing the last files that are being built in here. Signed-off-by: Ben Dooks commit 2c420fe22f3d526691773288807d010068ce3033 Author: Ben Dooks Date: Fri Jan 29 09:02:15 2010 +0000 ARM: SAMSUNG: Move DMA support to plat-samsung Move the core of the DMA support to plat-samsung for everyone to use. Signed-off-by: Ben Dooks commit 806c17b5497f62faa65a1fdd235b7fa2df17d704 Author: Ben Dooks Date: Fri Jan 29 09:02:14 2010 +0000 ARM: SAMSUNG: Move pm.c to plat-samsung Move pm.c to plat-samsung, it should be usable by all Samsung systems Signed-off-by: Ben Dooks commit 7086a9df056602c8e0d9ae8fe17b028832d05f3d Author: Ben Dooks Date: Fri Jan 29 09:02:13 2010 +0000 ARM: SAMSUNG: Move map-base to plat-samsung Move the map-base file to plat-samsung. To make the move easier, we do not change the S3C_ prefix on many of the items as this would involve going through altering all the dependencies. Signed-off-by: Ben Dooks commit c116c1d7254348c7247ec4d7ab005dcc3f42565b Author: Ben Dooks Date: Fri Jan 29 09:02:12 2010 +0000 ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung Move common headers from plat-s3c's include/plat directory into plat-samsung. No need to fix any files, these are still included via Signed-off-by: Ben Dooks commit aa5120d2ef228042416d3023fb7eda9ee487dcf9 Author: Rafał Miłecki Date: Thu Feb 18 20:24:28 2010 +0000 drm/radeon/kms: implement reading active PCIE lanes on R600+ Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 08ff2a7a7a13c562e81a406722193f43cbb4e4ef Author: Rafał Miłecki Date: Sun Feb 21 22:46:30 2010 +0000 drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state AtomBIOS tables on non-mobility GPU do not contain POWERSAVE/BATTERY. Signed-off-by: Rafał Miłecki Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit 9038dfdf699a3227004f1f6da32a3ef4ef3ba5a4 Author: Rafał Miłecki Date: Sat Feb 20 23:15:04 2010 +0000 drm/radeon/kms: simplify storing current and requested PM mode We kept pointers to requested and current clock modes in every power state. That was useless, more /global/ pointers in power struct are enough. Signed-off-by: Rafał Miłecki Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit d03f5d5971f2dd4bd259c46e065299661d8fdc9f Author: Alex Deucher Date: Fri Feb 19 16:22:31 2010 -0500 drm/radeon: fixes for r6xx/r7xx gfx init - updated swizzle modes for backend map setup - fix programming of a few gfx regs - properly handle pipe/backend setup on LE cards Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6271901d828b34b27607314026deaf417f9f9b75 Author: Alex Deucher Date: Fri Feb 19 16:07:02 2010 -0500 drm/radeon/rv740: fix backend setup This patch fixes occlusion queries and rendering errors on rv740 boards. Hardcoding the backend map is not an optimal solution, but a better fix is being worked on. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 8e36113082821980c60ce89a6c5d45fc9492fc26 Author: Jerome Glisse Date: Thu Feb 18 14:23:49 2010 +0000 drm/radeon/kms: fix R3XX/R4XX memory controller initialization Version 2 of memory controller did break the initialization for R3XX/R4XX hardware. This patch fix it. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit f735261baab3a275a273533c391d2d1b86a9e66a Author: Dave Airlie Date: Thu Feb 18 15:58:36 2010 +1000 [rfc] drm/radeon/kms: pm debugging check for vbl. This patch adds a check on avivo chips to see if we are in the VBL region for the active crtcs when we trigger the engine change. I appear to have glitches locally on pm transistion (not sure all fixes are in yet) and this at least seems to be correct here, maybe others can test on systems with no glitches. commit b4fe945405e477cded91772b4fec854705443dd5 Author: Pauli Nieminen Date: Mon Feb 1 19:11:16 2010 +0200 drm/radeon: Fix memory allocation failures in the preKMS command stream checking. Allocation of single large block of memory may fail under memory presure. drm_buffer object can hold one large block of data in multiple independ pages which preents alloation failures. This patch converts all access to command stream to use drm_buffer interface. All direct access to array has to go tough drm_buffer functions to get correct pointer. Outputting the command stream to ring buffer needs to be awear of the split nature of drm_buffer. The output operation requires the new OUT_RING_DRM_BUFFER. Signed-off-by: Pauli Nieminen Signed-off-by: Dave Airlie commit 7a9f0dd9c49425e2b0e39ada4757bc7a38c84873 Author: Pauli Nieminen Date: Mon Feb 1 19:11:15 2010 +0200 drm: Add generic multipart buffer. Allocating multiple pages of memory for data that is coming from user space may fail. To fix memory allocation failures the buffer object should be split to multiple independ pages. drm buffer provides generic interface to copy and process large data arrays from user space. Interface includes allocation and free functions to allocate the buffer object and data storage pages. All access operations are performed relative to a internal pointer which is advanced with drm_buffer_advance function. The buffer can be accessed using drm_buffer_pointer_to_XXX functions if it is known that requested object doesn't split over a page boundary. These functions don't do any error checking to maximize performance. If there is large object which could be split there is special drm_buffer_read_object function. drm_buffer_read_object takes a pointer as argument which is used as temporary store for data if it is split over boundary in the buffer. Signed-off-by: Pauli Nieminen Signed-off-by: Dave Airlie commit 7f6b9dbd5afbd966a82dcbafc5ed62305eb9d479 Author: stephen hemminger Date: Mon Feb 22 07:57:19 2010 +0000 af_key: locking change Get rid of custom locking that was using wait queue, lock, and atomic to basically build a queued mutex. Use RCU for read side. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 808f5114a9206fee855117d416440e1071ab375c Author: stephen hemminger Date: Mon Feb 22 07:57:18 2010 +0000 packet: convert socket list to RCU (v3) Convert AF_PACKET to use RCU, eliminating one more reader/writer lock. There is no need for a real sk_del_node_init_rcu(), because sk_del_node_init is doing the equivalent thing to hlst_del_init_rcu already; but added some comments to try and make that obvious. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1cc523271ef0b6305c565a143e3d48f6fff826dd Author: stephen hemminger Date: Mon Feb 22 07:57:17 2010 +0000 seq_file: add RCU versions of new hlist/list iterators (v3) Many usages of seq_file use RCU protected lists, so non RCU iterators will not work safely. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 35e2da46d25a53e0e19956f533cc29272a6cceb2 Author: Sriram Date: Mon Feb 22 03:35:36 2010 +0000 can:ti_hecc: Add pm hook-up Added the suspend and resume implementation in the HECC (CAN) driver. Signed-off-by: K R Baalaaji Signed-off-by: Sriramakrishnan Acked-by: Anant Gole Signed-off-by: David S. Miller commit e5f8d9ac46e0291594abaa76bf467a08367bcccf Author: Tilman Schmidt Date: Mon Feb 22 11:09:38 2010 +0000 isdn: fix a few Kconfig imperfections 1. Rewrite the outdated help texts for config options ISDN and ISDN_CAPI. 2. The MISDN config option appeared between ISDN_I4L and the I4L hardware driver options; move it to a less irritating place. 3. HYSDN is not in fact an I4L driver, and needn't depend on ISDN_I4L, so move it from the I4L section to the general section. 4. ISDN_HDLC is now also used by drivers outside I4L. Move it from the I4L section to the general section, too. Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 48e2f183cb1709600012265a2e723f45a350d5fe Author: Jiri Pirko Date: Mon Feb 22 09:22:26 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part4 Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 7a81e9f3ca712db82344ea3ab2a5879241f59c48 Author: Jiri Pirko Date: Mon Feb 22 09:10:44 2010 +0000 e1000: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0ddf477b8a9b02412a6cabd51c486998811c7dd1 Author: Jiri Pirko Date: Sat Feb 20 00:13:58 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part3 Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 3b9a7728d878a3e7adc79fb89c3bb9ebc23760d7 Author: Jiri Pirko Date: Fri Feb 19 23:06:27 2010 +0000 net/arm: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0bc88e4af07621bc4b84477374745d01a470e85d Author: Joe Perches Date: Sun Feb 21 17:08:47 2010 +0000 drivers/net/typhoon.c: Use (pr|netdev)_ macro helpers David Dillow took my suggestions and improved on them. Here is this latest version. Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Remove #define ERR_PFX Remove now unused member name from struct typhoon Use pr_ Use netdev_ Coalesce long formats Remove version information Signed-off-by: Joe Perches Signed-off-by: David Dillow Signed-off-by: Joe Perches Acked-by: David Dillow Signed-off-by: David S. Miller commit 53639207c032ec63dac3661af94447f9774cd40b Author: Hauke Mehrtens Date: Sat Feb 20 10:55:26 2010 +0000 b44: use netdev_alloc_skb instead of dev_alloc_skb The conversion in bf0dcbd929faf036f1a4f2918090344d0e249cf5 missed the new allocation in b44_rx. This patch was used in OpenWRT for a long time. Signed-off-by: Hauke Mehrtens Signed-off-by: David S. Miller commit 8850dce170b460d9e46a827a62d6d7bb7e7cfcf3 Author: Hauke Mehrtens Date: Sat Feb 20 10:55:25 2010 +0000 b44: Set PHY address to NO_PHY if reset fails. Do a PHY reset to test if there is an active phy and set the PHY address to B44_PHY_ADDR_NO_PHY in case of an not active phy. This is needed for the Linksys WRTSL54GS and Asus WL-500W. This patch was used in OpenWRT for a long time. Signed-off-by: Hauke Mehrtens Signed-off-by: David S. Miller commit 7a0deb6bcda98c2a764cb87f1441eef920fd3663 Author: Alexander Duyck Date: Fri Feb 19 17:57:46 2010 +0000 pci: add support for 82576NS serdes to existing SR-IOV quirk This patch adds support for the 82576NS Serdes adapter to the existing pci quirk for 82576 parts. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3c945e5b3719bcc18c6ddd31bbcae8ef94f3d19a Author: Milton Miller Date: Fri Feb 19 17:44:42 2010 +0000 ixgbe: prevent speculative processing of descriptors before ready The PowerPC architecture does not require loads to independent bytes to be ordered without adding an explicit barrier. In ixgbe_clean_rx_irq we load the status bit then load the packet data. With packet split disabled if these loads go out of order we get a stale packet, but we will notice the bad sequence numbers and drop it. The problem occurs with packet split enabled where the TCP/IP header and data are in different descriptors. If the reads go out of order we may have data that doesn't match the TCP/IP header. Since we use hardware checksumming this bad data is never verified and it makes it all the way to the application. This bug was found during stress testing and adding this barrier has been shown to fix it. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Acked-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7f0ff702cdf51472750f4b6042866f1b83a11215 Merge: d35b7a8 110d85a Author: Ben Dooks Date: Mon Feb 22 23:38:26 2010 +0000 ARM: Merge next-samsung-s3c64xx-platdeletion Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed) commit 110d85acd479b80dc11b7fa3abef63285da8ea0c Author: Ben Dooks Date: Mon Feb 22 23:26:47 2010 +0000 ARM: S3C64XX: Eliminate plat-s3c64xx Now we've move the support out of plat-s3c64xx for everything, eliminate the platform directory arch/arm/plat-s3c64xx and remove it from the ARM build configuration. Note, PLAT_S3C64XX is kept around for the moment until the drivers that depend on it can be updated, so it is moved to the mach-s3c64xx Kconfig. Signed-off-by: Ben Dooks commit 281ff33b7c1b1ba2a5f9b03425e5f692a94913fa Author: Suresh Siddha Date: Thu Feb 18 11:51:40 2010 -0800 x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already We currently enforce the !RW mapping for the kernel mapping that maps holes between different text, rodata and data sections. However, kernel identity mappings will have different RWX permissions to the pages mapping to text and to the pages padding (which are freed) the text, rodata sections. Hence kernel identity mappings will be broken to smaller pages. For 64-bit, kernel text and kernel identity mappings are different, so we can enable protection checks that come with CONFIG_DEBUG_RODATA, as well as retain 2MB large page mappings for kernel text. Konrad reported a boot failure with the Linux Xen paravirt guest because of this. In this paravirt guest case, the kernel text mapping and the kernel identity mapping share the same page-table pages. Thus forcing the !RW mapping for some of the kernel mappings also cause the kernel identity mappings to be read-only resulting in the boot failure. Linux Xen paravirt guest also uses 4k mappings and don't use 2M mapping. Fix this issue and retain large page performance advantage for native kernels by not working hard and not enforcing !RW for the kernel text mapping, if the current mapping is already using small page mapping. Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Suresh Siddha LKML-Reference: <1266522700.2909.34.camel@sbs-t61.sc.intel.com> Tested-by: Konrad Rzeszutek Wilk Cc: stable@kernel.org [2.6.32, 2.6.33] Signed-off-by: H. Peter Anvin commit ad6cfc2ac71180171e090e69ae8762ac511884b1 Merge: 9d3415a bf30a43 Author: Takashi Iwai Date: Mon Feb 22 18:45:34 2010 +0100 Merge remote branch 'alsa/fixes' into fix/misc commit 9df30794f609d9412f14cfd0eb7b45dd64d0b14e Author: Chris Wilson Date: Thu Feb 18 10:24:56 2010 +0000 drm/i915: Record batch buffer following GPU error In order to improve our diagnostic capabilities following a GPU hang and subsequent reset, we need to record the batch buffer that triggered the error. We assume that the current batch buffer, plus a few details about what else is on the active list, will be sufficient -- at the very least an improvement over nothing. The extra information is stored in /debug/dri/.../i915_error_state following an error, and may be decoded using intel_gpu_tools/tools/intel_error_decode. v2: Avoid excessive work under spinlocks. v3: Include ringbuffer for later analysis. v4: Use kunmap correctly and record more buffer state. v5: Search ringbuffer for current batch buffer v6: Use a work fn for the impossible IRQ error case. v7: Avoid non-atomic paths whilst in IRQ context. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 Author: Jesse Barnes Date: Fri Feb 12 09:30:00 2010 -0800 drm/i915: give up on 8xx lid status These old machines more often than not lie about their lid state. So don't use it to detect LVDS presence, but leave the event handler to deal with lid open/close, when we might need to reset the mode. Fixes kernel bug #15248 Signed-off-by: Jesse Barnes Cc: stable@kernel.org Signed-off-by: Eric Anholt commit f590d279eb4978352af163a88b001f156c7147d2 Author: Owain Ainsworth Date: Thu Feb 18 15:33:00 2010 +0000 drm/i915: reduce some of the duplication of tiling checking i915_gem_object_fenceable was mostly just a repeat of the i915_gem_object_fence_offset_ok, but also checking the size (which was checkecd when we allowed that BO to be tiled in the first place). So instead, export the latter function and use it in place. Signed-Off-By: Owain G. Ainsworth Signed-off-by: Eric Anholt commit 10ae9bd25acf394c8fa2f9d795dfa9cec4d19ed6 Author: Daniel Vetter Date: Mon Feb 1 13:59:17 2010 +0100 drm/i915: blow away userspace mappings before fence change This aligns it with the other user of i915_gem_clear_fence_reg, which blows away the mapping before changing the fence reg. Only affects userspace if it races against itself when changing tiling parameters, i.e. behaviour is undefined, anyway. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson Signed-off-by: Eric Anholt commit 4a7266123fce399f695b62b7f87b467b317f1487 Author: Daniel Vetter Date: Mon Feb 1 13:59:16 2010 +0100 drm/i915: move a gtt flush to the correct place No functional change, because gtt flushing is a no-op. Still, try to keep the bookkeeping accurate. The if is still slightly wrong for with execbuf2 even i915-class hw doesn't always need a fence reg for gpu access. But that's for somewhen lateron. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit af86d4b0f064413d2f353a41cdc23b7dbff0823d Author: Zhenyu Wang Date: Wed Feb 10 10:39:33 2010 +0800 agp/intel: official names for Pineview and Ironlake Print official names for Pineview and Ironlake, which is Intel GMA3150 and Intel HD graphics. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 4f8a567c4666c73284832240db89fdadb2c50bd5 Author: Daniel Vetter Date: Thu Feb 11 14:14:43 2010 +0100 drm/i915: overlay: drop superflous gpu flushes Cache-coherency is maintained by gem. Drop these leftover MI_FLUSH commands from the userspace code. Signed-off-by: Daniel Vetter Acked-by: Chris Wilson Signed-off-by: Eric Anholt commit 4667a4a52ffc3789c45f46096cdffb053591a8e1 Author: Daniel Vetter Date: Thu Feb 11 14:14:42 2010 +0100 drm/i915: overlay: nuke readback to flush wc caches I retested this and whatever this papered over, the problem doesn't seem to exist anymore. Signed-off-by: Daniel Vetter Reviewed-by: Eric Anholt [anholt: fixed up compile warning] Signed-off-by: Eric Anholt commit 4a9bef37e5cf2c73b61ecc9ead52cad2eb4a372b Author: Jesse Barnes Date: Fri Feb 5 12:47:35 2010 -0800 drm/i915: provide self-refresh status in debugfs Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit b5e50c3f56ee4aa0d0168eab5ece413ac5df76aa Author: Jesse Barnes Date: Fri Feb 5 12:42:41 2010 -0800 drm/i915: provide FBC status in debugfs Tools like powertop want to check the current FBC status and report it to the user. So add a debugfs file indicating whether FBC is enabled, and if not, why. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit 357b13c3e498bb658f511f91a9e4f09c9553be6e Author: Jesse Barnes Date: Thu Feb 4 14:17:47 2010 -0800 drm/i915: fix drps disable so unload & re-load works At unload time, we need to disable DRPS, but we need to do it correctly or the GPU will hang and we won't be able to load the module again. So set the SFCAVM bit so we can properly restore the DRPS config at unload. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit 060e645ac0181f499478a7be0ccb8a5600edc71a Author: Li Peng Date: Wed Feb 10 01:54:24 2010 +0800 drm/i915: Fix OGLC performance regression on 945 He Shuang reported an OGLC performance regression introduced in the patch "enable memory self refresh on 9xx", In that patch, SR on 945 is disabled everytime when calling intel_mark_busy(), while too much of such operation will impact performance. Actually disable SR is necessary only when GPU and Crtc changing from idle to busy. This patch make such optimization. It fixes upstream bug http://bugs.freedesktop.org/show_bug.cgi?id=26422 Signed-off-by: Li Peng Signed-off-by: Eric Anholt commit b5b72e891a5a6056c849ef8eaf259f126090f88b Author: Matthew Garrett Date: Tue Feb 2 18:30:47 2010 +0000 drm/i915: Deobfuscate the render p-state obfuscation The ironlake render p-state support includes some rather odd variable names. Clean them up in order to improve the readability of the code. Signed-off-by: Matthew Garrett Signed-off-by: Eric Anholt commit f97108d1d0facc7902134ebc453b226bbd4d1cdb Author: Jesse Barnes Date: Fri Jan 29 11:27:07 2010 -0800 drm/i915: add dynamic performance control support for Ironlake Ironlake (and 965GM, which this patch doesn't support) supports a hardware performance and power management feature that allows it to adjust to changes in GPU load over time with software help. The goal if this is to maximize performance/power for a given workload. This patch enables that feature, which is also a requirement for supporting Intelligent Power Sharing, a feature which allows for dynamic budgeting of power between the CPU and GPU in Arrandale platforms. Tested-by: ykzhao [anholt: Resolved against the irq handler loop removal] Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit ee980b8003a25fbfed50c3367f2b426c870eaf90 Author: Li Peng Date: Wed Jan 27 19:01:11 2010 +0800 drm/i915: enable memory self refresh on 9xx Enabling memory self refresh (SR) on 9xx needs to set additional register bits. On 945, we need bit 31 of FW_BLC_SELF to enable the write to self refresh bit and bit 16 to enable the write of self refresh watermark. On 915, bit 12 of INSTPM is used to enable SR. SR will take effect when CPU enters C3+ state and its entry/exit should be automatically controlled by H/W, driver only needs to set SR enable bits in wm update. But this isn't safe in my test on 945 because GPU is hung. So this patch explicitly enables SR when GPU is idle, and disables SR when it is busy. In my test on a netbook of 945GSE chipset, it saves about 0.8W idle power. Signed-off-by: Li Peng [anholt: rebased against 33c5fd121eabbccc9103daf6cda36941eb3c349f by adding disable of INSTPM SR bit on 915GM for two pipe setup] Signed-off-by: Eric Anholt commit 4a6967b88af02eebeedfbb91bc09160750225bb5 Author: Johannes Berg Date: Fri Feb 19 19:18:37 2010 +0100 mwl8k: convert to new station add/remove callbacks This converts mwl8k to use the new station add/remove callbacks instead of using the old sta_notify callback. The new callbacks can sleep, so a lot of code can be removed now. Signed-off-by: Johannes Berg Acked-by: Lennert Buytenhek Signed-off-by: John W. Linville commit e01292b1fd68ff2abe234d584b06e64344d2c1de Author: Heiko Carstens Date: Thu Feb 18 14:25:21 2010 +0100 tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API So that arch developers know how to implement it without the need to dig into changelogs. Reported-by: Mike Frysinger Signed-off-by: Heiko Carstens Acked-by: Masami Hiramatsu Cc: Martin Schwidefsky Cc: "David S . Miller" Cc: Paul Mundt Cc: Steven Rostedt LKML-Reference: <20100218132521.GB2406@osiris.boeblingen.de.ibm.com> [added reference to ptrace.h in the config help] Signed-off-by: Frederic Weisbecker commit b9dd94a87e5b4d0e864636698931aeeeb3c9d770 Author: Peter Ujfalusi Date: Mon Feb 22 13:27:13 2010 +0200 ASoC: core: On resume also check the soc device state Check the card->codec on soc_resume to detect if the soc device is properly initialized. If the card->codec is NULL, than do not continue the resume operation, since the device is not initialized properly. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c4081ba5c9f6f7bdffe49e501a8604a2c0797ef9 Author: Richard Kennedy Date: Mon Feb 22 13:49:24 2010 +0100 cfq: reorder cfq_queue removing padding on 64bit This removes 8 bytes of padding from struct cfq_queue on 64 bit builds, shrinking it's size to 256 bytes, so fitting into 1 fewer cachelines and allowing 1 more object/slab in it's kmem_cache. Signed-off-by: Richard Kennedy Reviewed-by: Jeff Moyer ---- patch against 2.6.33-rc8 tested on x86_64 AMDX2 Signed-off-by: Jens Axboe commit f11cbd74c5ff3614f6390b4de67a6ffdc614c378 Merge: 429c42c aea187c Author: Jens Axboe Date: Mon Feb 22 13:48:51 2010 +0100 Merge branch 'master' into for-2.6.34 commit 429c42c9d246f5bda868495c09974312a0177328 Author: dann frazier Date: Wed Feb 17 16:55:11 2010 -0700 cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h There are several duplicate definitions in cciss_cmd.h and cciss_ioctl.h. Consolidate these into the new cciss_defs.h file. This patch doesn't change the definitions exposed under include/linux, so userspace apps shouldn't be affected. Acked-by: Stephen M. Cameron Signed-off-by: dann frazier Signed-off-by: Jens Axboe commit b028461d66a4dc2754d4e5dab1b3974c44798c5d Author: dann frazier Date: Wed Feb 17 16:53:31 2010 -0700 cciss: remove C99-style comments Some cleanup before the header file split-out so we don't propagate this style into new files. Acked-by: Stephen M. Cameron Signed-off-by: dann frazier Signed-off-by: Jens Axboe commit 8cb3a2ebc19eef58bcbd5460c4fb463f30bc6459 Author: Kuninori Morimoto Date: Mon Feb 22 09:30:12 2010 +0000 ARM: mach-shmobile: ap4evb: Add S6 debug switch support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 5098280e015e36daebfd16f976ec3db6f4975fac Author: Kuninori Morimoto Date: Mon Feb 22 09:20:39 2010 +0000 ARM: mach-shmobile: ap4evb: Add LED support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit bf30a4309d4294d3eca248ea8a20c1c3570f5e74 Author: Clemens Ladisch Date: Mon Feb 22 10:33:13 2010 +0100 ALSA: via82xx: add quirk for D1289 motherboard Add a headphones-only quirk for the Fujitsu Siemens D1289. Signed-off-by: Clemens Ladisch Reported-and-tested-by: Marc Haber Cc: Signed-off-by: Jaroslav Kysela commit 16afc9fb0298a66da25ee015eb3c8a8f55e3744a Author: Kuninori Morimoto Date: Mon Feb 22 05:18:10 2010 +0000 sh: sh7724: Update FSI/SPU2 clock When FSI and Network (= NFS file system) were used at the same time, the I/O of FSI was unstable. This patch updates the SPU2 clock (which is used for FSI) to solve this issue. Special thanks to Jeremy. Signed-off-by: Jeremy Baker Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6f26d19fce5907cdd0fd953ac1a1d0b1e6e5982c Author: Magnus Damm Date: Fri Feb 19 09:33:47 2010 +0000 sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec Update the sh7724 processor code to always enable vpu_clk. On the Ecovec board, set the vpu_clk to 166 Mhz. The 166MHz setting results in a divide-by-6 setup for vpu_clk and improves the VPU performance compared to the power-on-reset/bootloader configuration. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7be85c6eb4462cd973e680d9dcf897a7b5b26165 Author: Magnus Damm Date: Fri Feb 19 09:26:56 2010 +0000 sh: add sh7724 kick callback to clk_div4_table This patch adds a ->kick() callback to clk_div4_table and ties it into sh_clk_div4_set_rate(). A sh7724 specific kick function is also added that updates the KICK bit whenever div4 clocks in FRQCRA and FRQCRB have been set. Allows us to set the VPU clock. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 0a5f337ecd20e70e84a5cfc0f2c24d0366087026 Author: Magnus Damm Date: Fri Feb 19 09:22:25 2010 +0000 sh: introduce struct clk_div4_table This patch introduces struct clk_div4_table. The structure will be used to keep div4 specific data, and is with this patch replacing the struct clk_div_mult_table pointer arg used by the sh_clk_div4_register() functions. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit de7ca2144c36291a491bd39afad172f56432a4bb Author: Magnus Damm Date: Fri Feb 19 09:12:00 2010 +0000 sh: clock-cpg div4 set_rate() shift fix Make sure the div4 bitfield is shifted according to the enable_bit value in sh_clk_div4_set_rate(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 586f64c749a71fa2c86e1e2c121d22c8bc60669a Author: Jiri Kosina Date: Mon Feb 22 11:10:48 2010 +0100 Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed This is a partial revert of commit 3ad2f3fbb961 ("tree-wide: Assorted spelling fixes") as the change in arch/sparc/kernel/leon_kernel.c has been already fixed while refactoring the file in the sparc tree. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina commit 40717382e0c1f572553e4fdefb489db4b95a5e7e Author: Chris J Arges Date: Wed Feb 17 12:12:52 2010 -0600 ALSA: usbaudio Mbox support, output only Signed-off-by: Chris J Arges Signed-off-by: Takashi Iwai commit 2ee78f7b1d8ada2615ecbcd9fea70580008bd6ce Author: Yinghai Lu Date: Wed Feb 17 11:29:49 2010 -0800 x86: Fix non-bootmem compilation on PowerPC These build errors on some non-x86 platforms (PowerPC for example): mm/page_alloc.c: In function '__alloc_memory_core_early': mm/page_alloc.c:3468: error: implicit declaration of function 'find_early_area' mm/page_alloc.c:3483: error: implicit declaration of function 'reserve_early_without_check' The function is only needed on CONFIG_NO_BOOTMEM. Signed-off-by: Yinghai Lu Cc: Andrew Morton Cc: Johannes Weiner Cc: Mel Gorman LKML-Reference: <4B747239.4070907@kernel.org> Signed-off-by: Ingo Molnar commit 0708cc582f0fe2578eaab722841caf2b4f8cfe37 Author: Paul Menzel Date: Mon Feb 8 20:42:46 2010 +0100 ALSA: hda-intel: Add position_fix quirk for ASUS M2V-MX SE. With PulseAudio and an application accessing an input device like `gnome-volume-manager` both have high CPU load as reported in [1]. Loading `snd-hda-intel` with `position_fix=1` fixes this issue. Therefore add a quirk for ASUS M2V-MX SE. The only downside is, when now exiting for example MPlayer when it is playing an audio file a high pitched sound is outputted by the speaker. $ lspci -vvnn | grep -A10 Audio 20:01.0 Audio device [0403]: VIA Technologies, Inc. VT1708/A [Azalia HDAC] (VIA High Definition Audio Controller) [1106:3288] (rev 10) Subsystem: ASUSTeK Computer Inc. Device [1043:8290] Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- Kernel driver in use: HDA Intel [1] http://sourceforge.net/mailarchive/forum.php?thread_name=1265550675.4642.24.camel%40mattotaupa&forum_name=alsa-user Signed-off-by: Paul Menzel Signed-off-by: Takashi Iwai commit 2448158ed2ae64ef3219b51e0176a4e1151ba9ec Author: Paul Menzel Date: Mon Feb 8 20:37:26 2010 +0100 ALSA: Typo. s/distrubs/disturbs/ Signed-off-by: Paul Menzel Signed-off-by: Takashi Iwai commit 9d54f08bc77bf6dfe835b945d03b6e127c9fc5a3 Author: Takashi Iwai Date: Mon Feb 22 08:34:40 2010 +0100 ALSA: hda - Clean up Intel Mac unsol codes Use the standard unsol_event callback with each setup callback for IntelMac models with Realtek ALC885 codecs. Signed-off-by: Takashi Iwai commit e458b1fadf9239d1fdb165ff4c4ea0d807041bec Author: Luke Yelavich Date: Fri Feb 12 16:28:29 2010 +1100 ALSA: hda - Add Macmini 3,1 support BugLink: https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/343989 Add a model quirk for the NVIDIA based Macmini hardware, aka Macmini 3,1. The pinout is almost identical to the mb5 quirk, except for no microphone and the line-in mixer controls being on a different index. Everything works in 2ch mode, but as I am not sure what needs to be changed for 6ch mode, or whether the Mac Mini's chip supports 6ch mode, I have simply duplicated the code from the mb5 quirk for the mac mini chmode management. The new model parameter for this quirk is "macmini3". Signed-off-by: Luke Yelavich Signed-off-by: Takashi Iwai commit ba579eb7b30791751f556ee01905636cda50c864 Author: Daniel T Chen Date: Sat Feb 20 11:16:30 2010 -0500 ALSA: hda: Use 3stack quirk for Toshiba Satellite L40-10Q BugLink: https://bugs.launchpad.net/bugs/524948 The OR has verified that the existing model=laptop-eapd quirk does not function correctly but instead needs model=3stack. Make this change so that manual corrections to module-init-tools file(s) are not required. Reported-by: Lasse Havelund CC: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit a1e1274747b2741188b554e35dc5d4056ef7beac Author: Dmitry Torokhov Date: Sun Feb 21 20:55:31 2010 -0800 Input: gamecon - use pr_err() and friends Tested-by: Scott Moreau Signed-off-by: Dmitry Torokhov commit af930d646251a6d3f4fd80c5fe158177487f43b7 Author: Dmitry Torokhov Date: Sun Feb 21 20:55:09 2010 -0800 Input: gamecon - constify some of the setup structures Tested-by: Scott Moreau Signed-off-by: Dmitry Torokhov commit 0995174dda3e97d70fd9c335c55041b6b5aa11dd Author: Dmitry Torokhov Date: Sun Feb 21 20:54:54 2010 -0800 Input: gamecon - simplify pad type handling Instead of having array bitmasks by type for all gamepads have explicit type field in every pad structure. Tested-by: Scott Moreau Signed-off-by: Dmitry Torokhov commit 315543fd112ae3b573bc44e7dbfef99c11714610 Author: Dmitry Torokhov Date: Sun Feb 21 20:54:31 2010 -0800 Input: gamecon - simplify coordinate calculation for PSX Signed-off-by: Dmitry Torokhov commit d38fcb9690532e6e2e064d711262b14d638113b9 Author: Dmitry Torokhov Date: Sun Feb 21 20:54:28 2010 -0800 Input: gamecon - fix some formatting issues Fix formatting of 'switch' statements and change the code to stay closer to 80 column limit where it does not hurt code readability. Tested-by: Scott Moreau Signed-off-by: Dmitry Torokhov commit 7aa9e0e8263259f4517ba1788f4fbaa88e878400 Author: Scott Moreau Date: Sun Feb 21 20:53:55 2010 -0800 Input: gamecon - add rumble support for N64 pads Add force-feedback support for N64 pads with rumble pak accessory installed. Actually we do not check for the presence of rumble pad but simply assume it is installed and expect the device to ignore FF commands if rumble pak is missing. Signed-off-by: Scott Moreau Signed-off-by: Dmitry Torokhov commit 992426bfe98e71db1ce767fd66f6c68ed18fcc14 Author: Ben Dooks Date: Sat Feb 20 23:01:33 2010 +0000 ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed dma-plat.h is the last file left in plat-s3c64xx, but to remove it we must also change the use of dma-plat.h by the core code and the s3c24xx implementation. Rename the s3c24xx dma-plat.h in the common plat-samsung directory as it may be used for other ports. Move the specific dma bits into the mach-s3c64xx directory and update the build as needed. Signed-off-by: Ben Dooks commit 6d636c68e9253fb641c325052bcf9ba513a58ed3 Author: wanzongshun Date: Fri Feb 19 05:23:36 2010 +0100 ARM: 5949/1: NUC900 add gpio virtual memory map NUC900 add gpio virtual memory map Signed-off-by: Wang Qiang Signed-off-by: Wang Zongshun Signed-off-by: Russell King commit ce746e471f286ab566ae1a4b0df0f90fd8404c67 Author: wanzongshun Date: Fri Feb 19 05:21:51 2010 +0100 ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 Enable timer0 to time4 clock support for nuc910 Signed-off-by: Wang Qiang Signed-off-by: Wang Zongshun Signed-off-by: Russell King commit 64de028948f449af17cf387f45a45f36ffd3c960 Author: Linus Walleij Date: Fri Feb 19 01:09:10 2010 +0100 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk This removes the custom DBG macro in favor of the in-kernel dev_dbg() macro. Probably a leftover from a time when dev_dbg() didn't yet exist. Also remove a printk() in favor of dev_err(). Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 2ae3ba39389b51d8502123de0a59374bec899c4d Author: KaiGai Kohei Date: Wed Feb 17 08:49:41 2010 +0900 selinux: libsepol: remove dead code in check_avtab_hierarchy_callback() This patch revert the commit of 7d52a155e38d5a165759dbbee656455861bf7801 which removed a part of type_attribute_bounds_av as a dead code. However, at that time, we didn't find out the target side boundary allows to handle some of pseudo /proc//* entries with its process's security context well. Signed-off-by: KaiGai Kohei Acked-by: Stephen Smalley -- security/selinux/ss/services.c | 43 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 4 deletions(-) Signed-off-by: James Morris commit faa5c5c36ec50bf43e39c7798ce9701e6b002db3 Author: Arnaldo Carvalho de Melo Date: Fri Feb 19 23:02:07 2010 -0200 perf tools: Don't use parent comm if not set at fork time As the parent comm then is worthless, confusing users about the thread where the sample really happened, leading to think that the sample happened in the parent, not where it really happened, in the children of a thread for which a PERF_RECORD_COMM event was not received. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1266627727-19715-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 10fe12ef631a7e85022ed26304a37f033a6a95b8 Author: Arnaldo Carvalho de Melo Date: Sat Feb 20 19:53:13 2010 -0200 perf symbols: Fix up map end too on modular kernels with no modules installed In 2161db9 we stopped failing when not finding modules when asked too, but then the kernel maps (just one, for vmlinux) wasn't having its ->end field correctly set up, so symbols were not being found for the vmlinux map because its range was 0-0. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1266702793-29434-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit aef55d4922e62a0d887e60d87319f3718aec6ced Merge: ca4dbc6 eb5b379 Author: H. Peter Anvin Date: Sat Feb 20 21:51:42 2010 -0800 Merge branch 'x86/urgent' into x86/irq Merge reason: conflict in arch/x86/kernel/apic/io_apic.c Resolved Conflicts: arch/x86/kernel/apic/io_apic.c Signed-off-by: H. Peter Anvin commit 2ef2d7477549c85b84b24b155baa798650cbf90b Author: David S. Miller Date: Sat Feb 20 19:53:55 2010 -0800 sparc64: If 'slot-names' property exist, create sysfs PCI slot information. Signed-off-by: David S. Miller commit 06c92ee6384c33dbb6e313c66272181db70abbb0 Author: Alexander Beregalov Date: Sat Feb 20 18:48:25 2010 -0800 eepro: fix netdev_mc_count conversion Fix commit 4cd24eaf0 (net: use netdev_mc_count and netdev_mc_empty when appropriate) Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 431fb7df24ebf360ba35895a60d084de364e39f8 Author: Ben Dooks Date: Fri Feb 5 13:52:53 2010 +0100 ARM: SAMSUNG: Move pm-core.h to machine directory Move the pm-core.h to the machine include directory in the process of eliminating the plat-s3c64xx. Signed-off-by: Ben Dooks commit 89f0ce721c0bc95c109300edcd8525d8ea5df8f2 Author: Ben Dooks Date: Tue Jan 26 15:49:15 2010 +0900 ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX directory structure now that the code is moved into mach-s3c64xx. Note, we cannot currently remove plat-s3c64xx directory as we have a pair of include files used within plat-s3c and plat-samsung that need to find a new home. Signed-off-by: Ben Dooks commit 55bf9267dd628c9369674ca75f5b00e275529289 Author: Ben Dooks Date: Tue Jan 26 15:10:38 2010 +0900 ARM: S3C64XX: Combine the clock init code Turn the init sequence of s3c24xx_register_baseclocks(xtal); s3c64xx_register_clocks(); s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK); into a single call as this is now contained within one file. Signed-off-by: Ben Dooks commit 62acb2f82dc27cd40729e7d4c2879e57fe41b927 Author: Ben Dooks Date: Tue Jan 26 14:53:19 2010 +0900 ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the clock code into one place. Note, no effort is made in this patch to squash the init functions together. Signed-off-by: Ben Dooks commit 6ce8fde296e56cda9d7416e015ed2fe495c9c48c Author: Ben Dooks Date: Tue Jan 26 14:32:09 2010 +0900 ARM: S3C64XX: Merge s3c6400-init.c into cpu.c Since this file is small, and is compiled for both systems in this architecture merge it into the cpu support file and remove the original instead of moving it. Signed-off-by: Ben Dooks commit f7be9abaa5f4a64fdcca6808bb7eacb3547e574e Author: Ben Dooks Date: Tue Jan 26 13:41:30 2010 +0900 ARM: S3C64XX: Move core support to mach-s3c64xx Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it. This includes the clock, cpu, cpufreq, dma, gpiolib and pll support. Signed-off-by: Ben Dooks commit 88fc68a280709f3fb9488986ab39eac330d17b6d Author: Ben Dooks Date: Tue Jan 26 11:19:18 2010 +0900 ARM: S3C64XX: Move device and device setup into mach-s3c64xx Move the S3C64XX specific device and setup files into mach-s3c64xx as they are unlikely to be used outside of this code. Signed-off-by: Ben Dooks commit ed618aff8a952f712caf1d475e0947a32a8b6606 Author: Ben Dooks Date: Tue Jan 26 11:07:23 2010 +0900 ARM: S3C64XX: Move IRQ support into mach-s3c64xx Move IRQ support to mach-s3c64xx as it is unlikely to be re-used outside this machine. Signed-off-by: Ben Dooks commit 3501c9ae9fc5414d09c9a8d3a5452d2b167db916 Author: Ben Dooks Date: Tue Jan 26 10:45:40 2010 +0900 ARM: S3C64XX: Move headers into machine include directory Move the register and GPIO definition files from plat-s3c64xx into the machine include direcotry as they are unlikely to be reused outside mach-s3c64xx. This move includes removing the empty and replacing it with the implementation. Signed-off-by: Ben Dooks commit 198d2f63a6096fe575b696b13ba61b62c620266f Merge: 0da2b30 1f47464 Author: David S. Miller Date: Sat Feb 20 13:53:16 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 168cf9af699e87d5a6f44b684583714ecabb8e71 Author: Stefan Richter Date: Sun Feb 14 18:49:18 2010 +0100 firewire: remove incomplete Bus_Time CSR support The current implementation of Bus_Time read access was buggy since it did not ensure that Bus_Time.second_count_hi and second_count_lo came from the same 128 seconds period. Reported-by: Håkan Johansson Instead of a fix, remove Bus_Time register support altogether. The spec requires all cycle master capable nodes to implement this (all Linux nodes are cycle master capable) while it also says that it "may" be initialized by the bus manager or by the IRM standing in for a bus manager. (Neither Linux' firewire-core nor ieee1394 nodemgr implement this.) Since we cannot rely on Bus_Time having been initialized by a bus manager, it is better to return an error instead of a nonsensical value on a read request to Bus_Time. Alternatively, we could fix the Bus_Time read integrity bug _and_ implement (a) cycle master's write support of the register as well as (b) bus manager's Bus_Time initialization service, i.e. preservation of the Bus_Time when the cycle master node of a bus changes. However, that would be quite some code for a feature that is unreliable to begin with and very likely unused in practice. Signed-off-by: Stefan Richter commit 4a9bde9b8ab55a2bb51b57cad215a97bcf80bae2 Author: Stefan Richter Date: Sat Feb 20 22:24:43 2010 +0100 firewire: get_cycle_timer optimization and cleanup ohci: Break out of the retry loop if too many attempts were necessary. This may theoretically happen if the chip is fatally defective or if the get_cycle_timer ioctl was performed after a CardBus controller was ejected. Also micro-optimize the loop by re-using the last two register reads in the next iteration, remove a questionable inline keyword, and shuffle a comment around. core: ioctl_get_cycle_timer() is always called with interrupts on, therefore local_irq_save() can be replaced by local_irq_disable(). Disabled local IRQs imply disabled preemption, hence preempt_disable() can be removed. Signed-off-by: Stefan Richter commit 978ebd97d1426d5708d3f353179ab81f191a7eeb Author: Ben Myers Date: Wed Feb 17 14:05:16 2010 -0600 xfs_export_operations.commit_metadata This is the commit_metadata export operation for XFS. - Takes one inode to be committed. - Forces the log up to the lsn of the inode. - Doesn't force the log if the inode doesn't have a pincount. Signed-off-by: Ben Myers Reviewed-by: Christoph Hellwig Reviewed-by: Dave Chinner [bfields@citi.umich.edu: trivial whitespace fix] Signed-off-by: J. Bruce Fields commit f501912a35c02eadc55ca9396ece55fe36f785d0 Author: Ben Myers Date: Wed Feb 17 14:05:11 2010 -0600 commit_metadata export operation replacing nfsd_sync_dir - Add commit_metadata export_operation to allow the underlying filesystem to decide how to commit an inode most efficiently. - Usage of nfsd_sync_dir and write_inode_now has been replaced with the commit_metadata function that takes a svc_fh. - The commit_metadata function calls the commit_metadata export_op if it's there, or else falls back to sync_inode instead of fsync and write_inode_now because only metadata need be synced here. - nfsd4_sync_rec_dir now uses vfs_fsync so that commit_metadata can be static Signed-off-by: Ben Myers Reviewed-by: Christoph Hellwig Signed-off-by: J. Bruce Fields commit ae1402022edbeef3991f1e4bae8fa99558be291b Author: Russell King Date: Fri Dec 18 16:43:57 2009 +0000 ARM: make_coherent(): fix problems with highpte, part 2 update_mmu_cache() is called with the page table for the faulted-in page still mapped. We need to modify the PTE for this page to ensure coherency with other shared mappings when multiple shared mappings exist within a MM. Signed-off-by: Russell King commit 4b3073e1c53a256275f1079c0fbfbe85883d9275 Author: Russell King Date: Fri Dec 18 16:40:18 2009 +0000 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself On VIVT ARM, when we have multiple shared mappings of the same file in the same MM, we need to ensure that we have coherency across all copies. We do this via make_coherent() by making the pages uncacheable. This used to work fine, until we allowed highmem with highpte - we now have a page table which is mapped as required, and is not available for modification via update_mmu_cache(). Ralf Beache suggested getting rid of the PTE value passed to update_mmu_cache(): On MIPS update_mmu_cache() calls __update_tlb() which walks pagetables to construct a pointer to the pte again. Passing a pte_t * is much more elegant. Maybe we might even replace the pte argument with the pte_t? Ben Herrenschmidt would also like the pte pointer for PowerPC: Passing the ptep in there is exactly what I want. I want that -instead- of the PTE value, because I have issue on some ppc cases, for I$/D$ coherency, where set_pte_at() may decide to mask out the _PAGE_EXEC. So, pass in the mapped page table pointer into update_mmu_cache(), and remove the PTE value, updating all implementations and call sites to suit. Includes a fix from Stephen Rothwell: sparc: fix fallout from update_mmu_cache API change Signed-off-by: Stephen Rothwell Acked-by: Benjamin Herrenschmidt Signed-off-by: Russell King commit 0d561f12b490dd2b993d73112d3297007688e6df Author: Jiro SEKIBA Date: Sat Feb 20 19:47:49 2010 +0900 nilfs2: add reader's lock for cno in nilfs_ioctl_sync This adds reader's lock for the_nilfs->cno in nilfs_ioctl_sync, for the_nilfs->cno should be proctected by segctor_sem when reading. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit 49b764aebde6ceea393f56cd3449bfa5720f8383 Author: Ping Cheng Date: Sat Feb 20 00:53:49 2010 -0800 Input: wacom - add device type to device name string Devices supporting both pen and touch features share the same product ID, but presented as 2 separate input devices. By adding device type to device name string we can help userspace applications and users differentiate between them. 'Finger' is used for the touch since touch has been used as a suffix by userland hotplugging services. Signed-off-by: Jason Childs Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 23c239be223d7427da51656d6f196bde965d9796 Author: Vasily Khoruzhick Date: Sat Feb 20 01:06:20 2010 -0800 Input: s3c24xx_ts - report touch only when stylus is down Currently driver reports touches when it gets (1 << ts.shift) samples, even if stylus is up, which is incorrect. We should only report coordinates and touch condition when stylus is down. Signed-off-by: Vasily Khoruzhick Signed-off-by: Dmitry Torokhov commit 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 Author: Jacob Pan Date: Fri Feb 5 04:06:56 2010 -0800 x86, apic: Remove ioapic_disable_legacy() The ioapic_disable_legacy() call is no longer needed for platforms do not have legacy pic. the legacy pic abstraction has taken care it automatically. This patch also initialize irq-related static variables based on information obtained from legacy_pic. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F0755A30A7660@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit f66d744d23dcb7ef659612595e2c9fb2fde4e009 Author: Ajit Khaparde Date: Fri Feb 19 14:00:03 2010 +0000 MAINTAINERS: Add two maintainers for be2net driver Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 9772a43170854ec98b53b054bce9b6476f260d00 Author: Ajit Khaparde Date: Fri Feb 19 13:58:21 2010 +0000 be2net: Bump the driver version number Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 91992e446cadbbde1a304de6954afd715af5121e Author: Ajit Khaparde Date: Fri Feb 19 13:57:12 2010 +0000 be2net: Maintain tx and rx counters in driver For certain skews of the BE adapter, H/W Tx and Rx counters could be common for more than one interface. Add Tx and Rx counters in the adapter structure (to maintain stats on a per interfae basis). Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 294aedcf875b982e2d3bd6d2d9b8124ccb163bf6 Author: Ajit Khaparde Date: Fri Feb 19 13:54:58 2010 +0000 be2net: update copyright dates Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 353176888386d9025062a12dcec08d49af10cf2c Author: Robert Hancock Date: Fri Feb 19 17:10:15 2010 -0800 r8169: enable 64-bit DMA by default for PCI Express devices (v2) Currently use of 64-bit DMA is disabled in r8169 unless the user passes the use_dac module option. This is reasonable for conventional PCI devices where broken chipsets may not handle dual-address-cycle transfers properly for 32-bit slots and so this may not be safe. However, PCI Express should not have this problem and not using 64-bit DMA results in DMA transfers needlessly using the IOMMU or SWIOTLB. Set the use_dac module parameter to a new default value of -1 which results in 64-bit DMA being enabled by default for PCI Express devices only. Signed-off-by: Robert Hancock Signed-off-by: David S. Miller commit b81bb373a7e832a43921356aa1291044d7f52fb1 Author: Jacob Pan Date: Mon Nov 9 11:27:04 2009 -0800 x86, pic: Make use of legacy_pic abstraction This patch replaces legacy PIC-related global variable and functions with the new legacy_pic abstraction. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D04@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit ef3548668c02cc8c3922f4423f32b53e662811c6 Author: Jacob Pan Date: Mon Nov 9 11:24:14 2009 -0800 x86, pic: Introduce legacy_pic abstraction This patch makes i8259A like legacy programmable interrupt controller code into a driver so that legacy pic functions can be selected at runtime based on platform information, such as HW subarchitecure ID. Default structure of legacy_pic maintains the current code path for x86pc. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D03@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit 35f720c5930f689647d51ad77e2a8d6f0abf66c8 Author: Jacob Pan Date: Thu Sep 17 07:36:43 2009 -0700 x86: Initialize stack canary in secondary start Some secondary clockevent setup code needs to call request_irq, which will cause fake stack check failure in schedule() if voluntary preemption model is chosen. It is safe to have stack canary initialized here early, since start_secondary() does not return. Signed-off-by: Jacob Pan LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D02@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin commit d39f6495f66616b637260405d0b5dc2656bc490e Author: Alek Du Date: Mon Sep 7 16:25:45 2009 +0800 x86, ioapic: Improve handling of i8259A irq init Since we already track the number of legacy vectors by nr_legacy_irqs, we can avoid use static vector allocations -- we can use dynamic one. Signed-off-by: Alek Du LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D01@orsmsx508.amr.corp.intel.com> Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit 9325a28ce2fa7c597e5ed41455a06c30b82b5710 Author: Thomas Gleixner Date: Sat Aug 29 17:51:26 2009 +0200 x86: Add pcibios_fixup_irqs to x86_init Platforms like Moorestown want to override the pcibios_fixup_irqs default function. Add it to x86_init.pci. Signed-off-by: Thomas Gleixner LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D00@orsmsx508.amr.corp.intel.com> Acked-by: Jesse Barnes Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3 Author: Thomas Gleixner Date: Sat Aug 29 17:47:33 2009 +0200 x86: Add pci_init_irq to x86_init Moorestown wants to reuse pcibios_init_irq but needs to provide its own implementation of pci_enable_irq. After we distangled the init we can move the init_irq call to x86_init and remove the pci_enable_irq != NULL check in pcibios_init_irq. pci_enable_irq is compile time initialized to pirq_enable_irq and the special cases which override it (visws and acpi) set the x86_init function pointer to noop. That allows MSRT to override pci_enable_irq and otherwise run pcibios_init_irq unmodified. Signed-off-by: Thomas Gleixner LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFF@orsmsx508.amr.corp.intel.com> Acked-by: Jesse Barnes Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit b72d0db9dd41da1f2ec6274b03e8909583c64e41 Author: Thomas Gleixner Date: Sat Aug 29 16:24:51 2009 +0200 x86: Move pci init function to x86_init The PCI initialization in pci_subsys_init() is a mess. pci_numaq_init, pci_acpi_init, pci_visws_init and pci_legacy_init are called and each implementation checks and eventually modifies the global variable pcibios_scanned. x86_init functions allow us to do this more elegant. The pci.init function pointer is preset to pci_legacy_init. numaq, acpi and visws can modify the pointer in their early setup functions. The functions return 0 when they did the full initialization including bus scan. A non zero return value indicates that pci_legacy_init needs to be called either because the selected function failed or wants the generic bus scan in pci_legacy_init to happen (e.g. visws). Signed-off-by: Thomas Gleixner LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFE@orsmsx508.amr.corp.intel.com> Acked-by: Jesse Barnes Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit cf4c43dd439b90a1a876b3f836ebe745abb9a269 Author: Jesse Barnes Date: Wed Jul 15 13:13:00 2009 -0700 PCI: Add pci_bus_find_ext_capability For use by code that needs to walk extended capability lists before pci_dev structures are set up. Signed-off-by: Jesse Barnes LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFD@orsmsx508.amr.corp.intel.com> Signed-off-by: Jacob Pan Signed-off-by: H. Peter Anvin commit bdfa35118c3149bfa7f6b259ca528f455af07c72 Author: Felipe Balbi Date: Wed Feb 17 14:09:31 2010 -0800 omap: musb: remove unnecessary return trivial patch, no functional changes. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 9bdde53fa575d023ca51ba9df41464f62e22feb7 Author: Felipe Balbi Date: Wed Feb 17 14:09:31 2010 -0800 omap: musb: remove unused dma data we don't use those anywhere on musb driver, so let's remove those old stuff. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 7db51121b87b9282d9f9bf554926c1493c504700 Author: Felipe Balbi Date: Wed Feb 17 14:09:31 2010 -0800 omap: musb: remove unused soft_con field remove unused data. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit bfc110ee653724577e635e0feacf29aad4ed6c7f Author: Felipe Balbi Date: Wed Feb 17 14:09:30 2010 -0800 arm: omap: musb: we can use clk framework ... in order to handle musb's clock. Let's start removing the old musb-only set_clock function. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 68499cc5716bbeca16ca8c83ec6e9f04b8dbfacb Author: Felipe Balbi Date: Wed Feb 17 14:09:30 2010 -0800 omap: musb: remove unused data eps_bits wasn't being used anywhere, let's remove it. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 884b8369ee78c081b5e5a99d1d09a95815d13c28 Author: Maulik Mankad Date: Wed Feb 17 14:09:30 2010 -0800 omap: musb: Pass board specific data from board file Pass board specific data for MUSB (like interface_type, mode etc) from board file by defining board specific structure. Each board file can define this structure based on its requirement and pass this information to the driver. Signed-off-by: Maulik Mankad Cc: Tony Lindgren Cc: Felipe Balbi Cc: David Brownell Cc: Greg Kroah-Hartman Cc: Gupta Ajay Kumar Signed-off-by: Tony Lindgren commit f9828552b945b9522f15f9eccea6d6df0af49753 Author: Felipe Balbi Date: Wed Feb 17 14:09:29 2010 -0800 arm: omap: musb: ioremap only what's ours omap3430 TRM says the OTG address space is 4k, not 8k. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 1a4f4637492f6a5977dd21b0026da09cd269c4a9 Author: Maulik Mankad Date: Wed Feb 17 14:09:29 2010 -0800 omap: musb: Remove #ifdef from board-omap3evm.c This patch removes #ifdef around usb_nop_xceiv_register() from board-omap3evm.c Signed-off-by: Maulik Mankad Acked-by: Olof Johansson Acked-by: Felipe Balbi Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 224e1542b6ca2d38dc0c7ea65fb6760c082b1309 Author: Maulik Mankad Date: Wed Feb 17 14:09:29 2010 -0800 USB: Add empty functions in otg.h Add empty functions for usb_nop_xceiv_register() and usb_nop_xceiv_unregister() in otg.h so that these functions can be called even when CONFIG_NOP_USB_XCEIV is not enabled. It allows to remove ifdef's from board file. Signed-off-by: Maulik Mankad Cc: Sergei Shtylyov Cc: Ajay Kumar Gupta Acked-by: Olof Johansson Acked-by: Felipe Balbi Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 5ebc86eda7ebb36ee66a90a7a5bbfc948f181088 Author: Sanjeev Premi Date: Wed Feb 17 13:56:52 2010 +0000 OMAP3EVM: PM: Update defconfig This patch updates the omap3_evm_defconfig to select these options: * CONFIG_PM_DEBUG * CONFIG_DEBUG_FS * CONFIG_OMAP_SMARTREFLEX Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit 8a88b61b70c7e3cec702043cdb7f8c88606ddf2c Author: Thomas Weber Date: Wed Feb 17 14:09:28 2010 -0800 Add devkit8000_defconfig This patch adds a default config for the Timll Devkit8000. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 476544cad1fc9c0b99bc39089677578070e9e62c Author: Thomas Weber Date: Wed Feb 17 14:09:28 2010 -0800 Add minimal support for DevKit8000 These patches add board support for the Timll DevKit8000. The DevKit8000 is a beagle board clone from Timll, sold by armkits.com. The DevKit8000 has RS232 serial port, LCD, DVI-D, S-Video, Ethernet, SD/MMC, keyboard, camera, SPI, I2C, USB and JTAG interface. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 5d4292a524d8908060b077f4d80c106cb288f2e7 Author: Vaibhav Hiremath Date: Sat Feb 13 11:47:57 2010 +0000 AM3517: Enable I2C-GPIO Expander driver support for AM3517EVM Add platform hook-up interface to support I2C based GPIo expander (TCA6416). There are 3 instances of I2C Expander on AM3517EVM, - One is over I2C-2 mounted on Base board - Two are over I2C3 mounted on UI Card Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit f2afbbb82e263086d02a772e43f5290b1a6f673e Author: Vaibhav Hiremath Date: Sat Feb 13 11:47:56 2010 +0000 AM3517: Enable RTC driver support for AM3517EVM Add platform hook-up interface to support RTC driver (S35390A). Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit 1f738dc306c86a8293c7ea929d07f55f32d52ff6 Author: Vaibhav Hiremath Date: Wed Feb 17 14:09:28 2010 -0800 AM3517: Enable basic I2C Support Add basic I2C board Hook-up support, where all the 3 I2C instances are getting registered. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit b344d87a28d5684ad9b6c4f880e70c48e23215f1 Author: Jonas Zetterberg Date: Sun Feb 14 19:33:26 2010 +0000 IGEPv2: Use Red Led1 as Heartbeat if configured If not configured it will be exported as normal GPIO led. Signed-off-by: Jonas Zetterberg Signed-off-by: Tony Lindgren commit c67b0d987088ae0339edc66de63aea5ac3d76c0d Author: Jonas Zetterberg Date: Sun Feb 14 19:33:24 2010 +0000 IGEPv2: Added WIFI support Enabled VMMC2 LDO voltage regulator on TWL4030. Added GPIO's (power down and reset) for WIFI chip. Signed-off-by: Anders Hedlund Signed-off-by: Jonas Zetterberg Signed-off-by: Tony Lindgren commit cd2b90d9f7bd33f415e7f17e6ea34808b2ff0e29 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:27 2010 -0800 omap3: Update defconfig for IGEP v2 to allow new drivers andfeatures Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 22f1baac70efb547a3e385f13f709625496acb2c Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:27 2010 -0800 omap3: Use timing data for omap2_init_common_hw on IGEP v2 Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit bcd2cbd10ce31c950a40c08d7f601f8ff23537b8 Author: Yehuda Sadeh Date: Fri Feb 19 00:12:21 2010 +0000 ceph: cleanup redundant code in handle_cap_grant There is no state in local vars that requires us to loop after temporarily dropping i_lock. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit c9af9fb68e01eb2c2165e1bc45cfeeed510c64e6 Author: Yehuda Sadeh Date: Fri Feb 19 00:10:11 2010 +0000 ceph: don't truncate dirty pages in invalidate work thread Instead of truncating the whole range of pages, we skip those pages that are dirty or in the middle of writeback. Those pages will be cleared later when the writeback completes. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit e63dc5c780ba32d6d8b3662eecce2b8d96489b41 Author: Yehuda Sadeh Date: Fri Feb 19 00:07:01 2010 +0000 ceph: remove page upon writeback completion if lost cache cap This page should have been removed earlier when the cache cap was revoked, but a writeback was in flight, so it was skipped. We truncate it here just as the writeback finishes, while it's still locked. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 5ecad6fd7bfd30b3eaea51345f546b81de7a6473 Author: Sage Weil Date: Wed Feb 17 10:43:37 2010 -0800 ceph: fix check for invalidate_mapping_pages success We need to know whether there was any page left behind, and not the return value (the total number of pages invalidated). Look at the mapping to see if we were successful or not. Move it all into a helper to simplify the two callers. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 831d06cf5b036a1ed14e412e9311c5e23075ed8d Author: Or Gerlitz Date: Thu Feb 4 11:25:07 2010 +0000 RDMA/nes: Change WQ overflow return code Change the nes driver to return -ENOMEM on SQ/RQ overflow to match the return code of other RDMA HW drivers (e.g cxgb3, ehca, mlx4, mthca). Signed-off-by: Or Gerlitz Acked-by: Chien Tung Signed-off-by: Roland Dreier commit 8e92dc767abb58357e696a48fc3d8ce615a9c01a Author: H. Peter Anvin Date: Fri Feb 19 13:21:38 2010 -0800 x86, setup: Don't skip mode setting for the standard VGA modes The code for setting standard VGA modes probes for the current mode, and skips the mode setting if the mode is 3 (color text 80x25) or 7 (mono text 80x25). Unfortunately, there are BIOSes, including the VMware BIOS, which report the previous mode if function 0F is queried while the screen is in a VESA mode, and of course, nothing can help a mode poked directly into the hardware. As such, the safe option is to set the mode anyway, and only query to see if we should be using mode 7 rather than mode 3. People who don't want any mode setting at all should probably use vga=0x0f04 (VIDEO_CURRENT_MODE). It's possible that should be the kernel default. Reported-by Rene Arends Signed-off-by: H. Peter Anvin LKML-Reference: commit e4fc85600b1b4b8114354846ab9594ad354882d0 Author: FUJITA Tomonori Date: Thu Feb 4 18:57:42 2010 +0000 mlx4: replace the dma_sync_single_range_for_cpu/device API There are only two users of the dma_sync_single_range_for_cpu/device API in mainline (mlx4 and ssb). The dma_sync_single_range_for_cpu/device API has never been documented and the dma_sync_single_for_cpu/device API also support a partial sync. This converts mlx4 to use the dma_sync_single_for_cpu/device API (preparations for the removal of the dma_sync_single_range_for_cpu/device API). Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 6e03718c852a7b2ce756e37ae340f4ebfec2f6f3 Author: kirjanov@gmail.com Date: Fri Feb 19 05:00:52 2010 +0000 greth: some driver cleanups On Fri, Feb 19, 2010 at 13:51 +0100, Jiri Pirko wrote: > > > >>@@ -1031,7 +1029,7 @@ static void greth_set_multicast_list(struct net_device *dev) > >> return; > >> } > >> > >>- if (dev->mc_count == 0) { > >>+ if (!netdev_mc_count(dev)) { > also please use netdev_mc_empty() here. Some driver cleanups: * convert to use phy_find_first/phy_direct_connect * convert to use netdev_mc_* helpers * fixed missing validate_addr hook * removed netdev_priv castings Signed-off-by: Denis Kirjanov Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit 91fea5858418127ad33e0060f726c62be0047eaf Author: Jiri Pirko Date: Fri Feb 19 08:48:47 2010 +0000 net/pcmcia: convert to use netdev_for_each_mc_addr removed fill_multicast_tbl function in smc91c92_cs and do the work inline rewritten set_addresses function in xirc2ps_cs. This was kinda headache. Simulated the original and new functions and they bahave the same. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 2f1eb65f366b81aa3c22c31e6e8db26168777ec5 Author: Jamal Hadi Salim Date: Fri Feb 19 02:00:42 2010 +0000 xfrm: Flushing empty SPD generates false events To see the effect make sure you have an empty SPD. On window1 "ip xfrm mon" and on window2 issue "ip xfrm policy flush" You get prompt back in window2 and you see the flush event on window1. With this fix, you still get prompt on window1 but no event on window2. Thanks to Alexey Dobriyan for finding a bug in earlier version when using pfkey to do the flushing. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9e64cc9572b43afcbcd2d004538db435f2cd0587 Author: Jamal Hadi Salim Date: Fri Feb 19 02:00:41 2010 +0000 xfrm: Flushing empty SAD generates false events To see the effect make sure you have an empty SAD. On window1 "ip xfrm mon" and on window2 issue "ip xfrm state flush" You get prompt back in window2 and you see the flush event on window1. With this fix, you still get prompt on window1 but no event on window2. Thanks to Alexey Dobriyan for finding a bug in earlier version when using pfkey to do the flushing. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 8be987d73481831265d7e8c648bec838271bfd9b Author: Jamal Hadi Salim Date: Fri Feb 19 02:00:40 2010 +0000 pfkey: fix SA and SP flush sequence RFC 2367 says flushing behavior should be: 1) user space -> kernel: flush 2) kernel: flush 3) kernel -> user space: flush event to ALL listeners This is not realistic today in the presence of selinux policies which may reject the flush etc. So we make the sequence become: 1) user space -> kernel: flush 2) kernel: flush 3) kernel -> user space: flush response to originater from #1 4) if there were no errors then: kernel -> user space: flush event to ALL listeners Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 4ca778605cfec53d8a689f0b57babb93b030c784 Author: Johannes Berg Date: Fri Feb 19 19:06:56 2010 +0100 ath9k: convert to new station add/remove callbacks This converts ath9k to use the new station add/remove callbacks instead of using the old sta_notify callback. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1d669cbf52a01490c14a999daa978e0fa00b494d Author: Johannes Berg Date: Fri Feb 19 19:06:55 2010 +0100 mac80211_hwsim: convert to new station add/remove callbacks This converts mac80211_hwsim to use the new station add/remove callbacks instead of using the old sta_notify callback. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 17f6f054fec57b1bd5c8333bc40b1f3b2b7941aa Author: Johannes Berg Date: Fri Feb 19 19:06:54 2010 +0100 p54: convert to new station add/remove callbacks This converts p54 to use the new station add/remove callbacks instead of using the old sta_notify callback. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 3e60f8607e8072e8b554e9ccb8a4691c580adae4 Author: Johannes Berg Date: Fri Feb 19 19:06:53 2010 +0100 ar9170: convert to new station add/remove callbacks This converts ar9170 to use the new station add/remove callbacks instead of using the old sta_notify callback. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit ac5b4e168ebd9046a6cd066d50b3341353f2f309 Author: Larry Finger Date: Fri Feb 19 12:02:44 2010 -0600 ssb: Add PCI ID 0x4322 to PHU handling Some of the N PHYs need a revision in the handling of the PMU. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d8728ee919282c7b01b65cd479ec1e2a9c5d3ba8 Author: Felix Fietkau Date: Fri Feb 19 18:21:42 2010 +0100 ath9k: fix beacon timer restart after a card reset In AP mode, ath_beacon_config_ap only restarts the timer if a TSF restart is requested. Apparently this was added, because this function unconditionally sets the flag for TSF reset. The problem with this is, that ath9k_hw_reset() clobbers the timer registers (specified in the initvals), thus effectively disabling the SWBA interrupt whenever a card reset without TSF reset is issued (happens in a few places in the code). This patch fixes ath_beacon_config_ap to only issue the TSF reset flag when necessary, but reinitialize the timer unconditionally. Tests show, that this is enough to keep the SWBA interrupt going after a call to ath_reset() Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 528c3126a98e75f47fc9fa11b243c82a59271d0d Author: Wey-Yi Guy Date: Thu Feb 18 22:03:07 2010 -0800 iwlwifi: add debugfs to monitor force reset parameters Adding debugfs file to monitor the counters and other information related to "force_reset" request. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 8a472da431998b7357e6dc562e79a3061ed56cad Author: Wey-Yi Guy Date: Thu Feb 18 22:03:06 2010 -0800 iwlwifi: separated time check for different type of force reset Use different timing duration check for different type of force reset, force reset request can come from different source and based on different reason; one type of reset request should not block other type of reset request. Adding structure to keep track of different force reset request. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d5755939e810f38c969a1d1b0effb2b75095b94e Author: Abhijeet Kolekar Date: Thu Feb 18 22:03:05 2010 -0800 iwlwifi: indicate calib version for 6050 series Indicate calibration version to uCode Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d2dfe6df755abb365aa3e2e67d88bda3cce5fd12 Author: Reinette Chatre Date: Thu Feb 18 22:03:04 2010 -0800 iwlwifi: enable serialization of synchronous commands Until now it was only possible to have one synchronous command running at any time. If a synchronous command is in progress when a second request arrives then the second command will fail. Create a new mutex specific for this purpose to only allow one synchronous command at a time, but enable other commands to wait instead of fail if a synchronous command is in progress. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 4a6547c748229ba0425713b4adeb0f2d4000da9e Author: Reinette Chatre Date: Thu Feb 18 22:03:02 2010 -0800 iwl3945: remove STATUS macros from header iwl3945 includes iwl-core.h in which these STATUS flags are already defined. This also removes a potential confusing definition with iwlcore using STATUS_MODE_PENDING with value 18 and iwl3945 defining (but not using) STATUS_CONF_PENDING for value 18. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 5c0ba62fd4b2dce08055a89600f1d834f9f0fe9e Author: Felix Fietkau Date: Fri Feb 19 01:46:36 2010 +0100 ath9k: fix rate control fallback rate selection When selecting the tx fallback rate, rc.c used a separate variable 'nrix' for storing the next rate index, however it did not use that as reference for further rate index lowering. Because of that, it ended up reusing the same rate for multiple multi-rate retry stages, thus decreasing delivery probability under changing link conditions. This patch removes the separate (unnecessary) variable and fixes fallback the way it was intended to work. This should result in increased throughput and better link stability. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 54f2d7361da09f3fc2b5407f93ad3b86df951577 Author: Kalle Valo Date: Thu Feb 18 21:47:51 2010 +0200 MAINTAINERS: update Kalle's email address My nokia.com email address won't work anymore, use my private iki.fi address instead. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit c332a4b8eed69a6853dbdbdf16696a45b93e2bf8 Author: Teemu Paasikivi Date: Thu Feb 18 13:25:57 2010 +0200 wl1271: Added alloc and free hw functions Moved allocation and freeing of context structure of the driver to separate functions from probe and remove functions. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 9b28072220d56fda3249cb7e4e164038b456414d Author: Teemu Paasikivi Date: Thu Feb 18 13:25:56 2010 +0200 wl1271: Added IO reset and init functions Added reset and init functions to IO layer of the driver. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 7b048c52d7283ebf07c826a45c631a6ba225c057 Author: Teemu Paasikivi Date: Thu Feb 18 13:25:55 2010 +0200 wl1271: Renamed IO functions In preparation for integration of SDIO implementation renamed some IO functions from wl1271_spi_* form to wl1271_*. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 521a5b2137cc15430e3b1ea4c148663d1dbe077f Author: Teemu Paasikivi Date: Thu Feb 18 13:25:54 2010 +0200 wl1271: Moved common IO functions from wl271_spi.c to wl1271_io.c In prepraration for integration of SDIO implementation moved some IO functions common for SPI and SDIO to separate file. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit c8c90873520ef4c201cfd03b4892ca8bbf551e2e Author: Kalle Valo Date: Thu Feb 18 13:25:53 2010 +0200 wl1271: add testmode support Testmode will be used to send PLT (Production Line Testing) commands from user space. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 1937e742639c03a6fe77239c3003ce9602302117 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:52 2010 +0200 wl1271: Fix beacon filter table configuration The beacon filter table configuration ACX structure had certain elements reversed, resulting in firmware instability in regard of the feature. Fix the structure. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 8bf29b0eb3ba38c8cf55e60976f124672cda7ab2 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:51 2010 +0200 wl1271: Fix ad-hoc SSID update If re-configuring the SSID while ad-hoc was already enabled, the beacon template would be properly updated, but the SSID passed in the CMD_JOIN would not - hence filtering etc would not work properly. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit ee444cf0501183df1640cd35bebd4250989bfe99 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:50 2010 +0200 wl1271: Fix WEP key handling WEP key index handling was broken: the default key when using key 0 was never specified to the FW, and if using other default than 0, it would be set on the TX path for every single TX'd frame. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit fddc7dd7deaa400db314b214d92de95f865a8af0 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:49 2010 +0200 wl1271: Fix key-remove error The new firmware does not allow removal of unicast keys - they will be automatically removed on the next CMD_JOIN. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 6c71b0ea761da416af54df4f72f48e71050cc012 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:48 2010 +0200 wl1271: Optimized RX path packet retrieval Instead of acking RX packets read from the FW once all (of several possible) buffered packets are retrieved, ack packets one by one as they are read. This enables the FW to start receiving more packets from the network while the host read operation is still ongoing. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit c82c1dde3024715c4cd8b6dd8cc7c75d8d7d93c8 Author: Kalle Valo Date: Thu Feb 18 13:25:47 2010 +0200 wl1271: wakeup chip in op_conf_tx() elp_wakeup() was missing in op_conf_tx() which caused wakeup problems in power save. I forgot to add this part when porting the patch from wl1251. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit e2e77b5ffb14211306ee093f01230f6ec69fab30 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:46 2010 +0200 wl1271: Fix random MAC address setting If reverting to a random MAC address, the driver would not update it to the NVS file, and hence the firmware frame filtering would not work properly. So update the randomized MAC address to the NVS image. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 6f8434a754894f5743efc281fda3925ecac258b9 Author: Luciano Coelho Date: Thu Feb 18 13:25:45 2010 +0200 wl1271: skip 3 unused bytes from the NVS Our NVS uploading mechanism had a bug that was causing it to pass three extra zeros at the start of the NVS. This may be a problem in the NVS generation application, but for now we fix it in the driver. Signed-off-by: Luciano Coelho Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 12419cce88fa591a846a542d35cff43b69d9e271 Author: Luciano Coelho Date: Thu Feb 18 13:25:44 2010 +0200 wl1271: add most of the normal initialization commands to PLT mode We need to configure PLT mode almost in the same way as normal mode. Most of the configuration functions need to be called also when entering PLT, with the exception of a few RX and TX configuration (which cause mac80211 warnings if enable while runnning PLT tests). Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 7b21b6f8216494ab6b8b4dc9d15e48051a0f0a66 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:43 2010 +0200 wl1271: Retrieve device mac address from the nvs file Instead of always randomizing the MAC address, retrieve and configure the MAC address from the device specific nvs file. For now, randomize an address only if the address in the NVS is zero. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 152ee6e09e2ce54d7d1cc9d338b82c0bf3cbbc95 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:42 2010 +0200 wl1271: Use NVS INI file configuration Replace the hardcoded general and radio parameter configuration in the driver with configuration taken from the NVS file directly. Also remove the driver dependency to the structures with the parameter data. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit c6999d831ab9ae5e368b20f3bc11b0ca9c17a7ec Author: Kalle Valo Date: Thu Feb 18 13:25:41 2010 +0200 wl1271: implement WMM Now that necessary commands for WMM are implemented, implement queue handling for WMM. But WMM is not enabled yet, only one queue is used. Based on a similar patch from wl1251. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit f2054df5170734eacd1db82138c70746ec8387de Author: Kalle Valo Date: Thu Feb 18 13:25:40 2010 +0200 wl1271: modify wl1271_acx_tid_cfg() to use function parameters For WMM we need to configure each tid separately so modify wl1271_acx_tid_cfg() to take the configuration from function parameters instead. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 243eeb51eaa0a33caeff3e2275b2460eea5579ec Author: Kalle Valo Date: Thu Feb 18 13:25:39 2010 +0200 wl1271: modify wl1271_acx_ac_cfg() to use function parameters For WMM we need to configure each queue separately so modify wl1271_acx_ac_cfg() to take the configuration from function parameters instead. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 30240fc76a57e37a4bb42976ff7162b5e45e6117 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:38 2010 +0200 wl1271: Add SSID configuration for JOIN in ad-hoc This patch adds code to extract the SSID from the beacon template used for ad-hoc. The mac80211 currently does not provide the SSID, so this is a workaround for that, for now. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: John W. Linville commit ddb01a5b368270f3cc86b606ba6f7ee8795a8a99 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:37 2010 +0200 wl1271: Fix channel changing code The channel changing code would a) change the BSSID to a dummy on upon channel change, breaking connectivity, and b) not update the channel number at all for ad-hoc, breaking adhoc. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: John W. Linville commit d8c42c0c282a5edd9ea2eef4c929d9cec2798653 Author: Juuso Oikarinen Date: Thu Feb 18 13:25:36 2010 +0200 wl1271: Fix PSM entry Currently the PSM entry function assumes successful operation, and enables ELP, BET and beacon filtering right away. This is bad, because the PSM entry may fail due to environmental issues, which will cause the ELP, BET and beacon filtering to be illegally enabled (because FW remains in active state.) Fix this by enabling ELP, BET and beacon filtering only after successful entry, and by ensuring the firmware is in active mode after the failure. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: John W. Linville commit e2117cea27c6b27e1a379acac5eb0433eeb7033a Author: Frederic Leroy Date: Thu Feb 18 00:25:26 2010 +0100 staging: rtl8192su: fix compile error from wireless-testing commit In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr to include/linux/ieee80211.h. This definition collides with one that is in the rtl8192su driver in staging. The conflict is resolved by changing rtl8192su to use the definition from include/linux/ieee80211.h. Signed-off-by: John W. Linville commit 5b9a919a97ac8bdda8020c9b366491b5b91b196e Author: Jean-François Moine Date: Wed Feb 17 10:59:31 2010 -0600 p54usb: Add the USB ID for Belkin (Accton) FD7050E ver 1010ec Yet another USB ID. Signed-off-by: Jean-François Moine Signed-off-by: Larry Finger Cc: Stable Signed-off-by: John W. Linville commit ffb9eb3d8b450c22bbbc688c6b630141ac476fd9 Author: Kalle Valo Date: Wed Feb 17 17:58:10 2010 +0200 nl80211: add power save commands The most needed command from nl80211, which Wireless Extensions had, is support for power save mode. Add a simple command to make it possible to enable and disable power save via nl80211. I was also planning about extending the interface, for example adding the timeout value, but after thinking more about this I decided not to do it. Basically there were three reasons: Firstly, the parameters for power save are very much hardware dependent. Trying to find a unified interface which would work with all hardware, and still make sense to users, will be very difficult. Secondly, IEEE 802.11 power save implementation in Linux is still in state of flux. We have a long way to still to go and there is no way to predict what kind of implementation we will have after few years. And because we need to support nl80211 interface a long time, practically forever, adding now parameters to nl80211 might create maintenance problems later on. Third issue are the users. Power save parameters are mostly used for debugging, so debugfs is better, more flexible, interface for this. For example, wpa_supplicant currently doesn't configure anything related to power save mode. It's better to strive that kernel can automatically optimise the power save parameters, like with help of pm qos network and other traffic parameters. Later on, when we have better understanding of power save, we can extend this command with more features, if there's a need for that. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 088ea189c4c75cdf211146faa4b341a0f7476be6 Author: Darren Jenkins Date: Wed Feb 17 23:40:15 2010 +1100 drivers/net/wireless/p54/txrx.c Fix off by one error fix off by one error in the queue size check of p54_tx_qos_accounting_alloc() Coverity CID: 13314 Signed-off-by: Darren Jenkins Signed-off-by: John W. Linville commit fbc87d67af5ccd733f894273b215564c67e3a749 Author: Pavel Roskin Date: Thu Feb 11 17:56:06 2010 -0500 Introduce PCMCIA_DEVICE_PROD_ID3 ...and use it in hostap_cs and orinoco_cs. Another PCMCIA device with Intersil Prism chipset has been reported: Socket 0: product info: "Gigabyte", "GN-WLM01_P25L_ADAPTER", "ISL37300P", "Eval-RevA" manfid: 0x02e0, 0x1011 function: 6 (network) As it's the case with some other Prism based devices, the third ID string contains a design name that should be sufficient to identify the card as having Intersil Prism chipset and thus compatible with both orinoco_cs and hostap_cs. Introduce PCMCIA_DEVICE_PROD_ID3 that matches the third ID string only. Use it in orinoco_cs and hostap_cs to match cards with the third ID string indicating Prism chipset. Remove corresponding entries that use PCMCIA_DEVICE_PROD_ID123. Reported-by: Ozzy Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 927606a17e802fcf0c9ee82a74bc444b84726e67 Merge: cf261b2 64507fd Author: David S. Miller Date: Fri Feb 19 12:45:20 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 1c1517efe173599ca2f1526ce7a04521cd424a9f Author: Stefan Richter Date: Sun Feb 14 18:47:07 2010 +0100 firewire: ohci: enable cycle timer fix on ALi and NEC controllers Discussed in "read_cycle_timer backwards for sub-cycle 0000, 0001", http://thread.gmane.org/gmane.linux.kernel.firewire.devel/13704 Known bad controllers: ALi M5271, listed by lspci as M5253 [10b9:5253] NEC OrangeLink [1033:00cd] (rev 03) NEC uPD72874 [1033:00f2] (rev 01) VIA VT6306 [1106:3044] (rev 46) VIA VT6308P, listed by lspci as rev c0 Reported-by: Pieter Palmers Reported-by: Håkan Johansson Reported-by: Clemens Ladisch Signed-off-by: Stefan Richter commit b677532b971276f48e82578b4d829fb4382e7b41 Author: Clemens Ladisch Date: Wed Jan 20 09:58:02 2010 +0100 firewire: ohci: work around cycle timer bugs on VIA controllers VIA controllers sometimes return an inconsistent value when reading the isochronous cycle timer register. To work around this, read the register multiple times and add consistency checks. Signed-off-by: Clemens Ladisch Reported-by: Pieter Palmers Reported-by: Håkan Johansson Signed-off-by: Stefan Richter commit 30b172ff8eb025525ad7b32d1935554930cc5625 Author: Faisal Latif Date: Fri Feb 12 19:58:05 2010 +0000 RDMA/nes: Multiple disconnects cause crash during AE handling There is a double disconnect during AE processing, causing crashes. While fixing the crash, also simplify the AE handling code. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 43093b941283b1b0c30213fe0f4f6f65c94d2d63 Author: Faisal Latif Date: Fri Feb 12 19:57:04 2010 +0000 RDMA/nes: Fix crash when listener destroyed during loopback setup When a listener is destroyed and there is an MPA response pending for loopback connection, the active side cm_node gets destroyed twice: once in cm_event_connect_error() and again in nes_accept()/nes_reject(). Increment the cm_node's refcount so it's not destroyed by cm_event_connect_error(). Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 6e10d2e407542605b2bdca43dc88c35fa8bd24b2 Author: Faisal Latif Date: Fri Feb 12 19:55:03 2010 +0000 RDMA/nes: Use atomic counters for CM listener create and destroy After running long iterative MPI tests, sometimes ethtool reports a "CM Destroy Listener" count more than the "CM Create Listener" count. This inconsistency is fixed by making counter variables atomic. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 45e354e3f235ecb51e16576d6668c43cddbb6e68 Author: Alexander Schmidt Date: Tue Feb 16 08:59:50 2010 +0000 IB/ehca: Require in_wc in process_mad() If the caller does not pass a valid in_wc to process_mad(), return MAD failure status, as it is not possible to generate a valid MAD redirect response (and redirects are the only MAD responses ehca generates). Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 9e2dcf72023d1447f09c47d77c99b0c49659e5ce Author: Patrick McHardy Date: Fri Feb 19 18:18:37 2010 +0100 netfilter: nf_conntrack_reasm: properly handle packets fragmented into a single fragment When an ICMPV6_PKT_TOOBIG message is received with a MTU below 1280, all further packets include a fragment header. Unlike regular defragmentation, conntrack also needs to "reassemble" those fragments in order to obtain a packet without the fragment header for connection tracking. Currently nf_conntrack_reasm checks whether a fragment has either IP6_MF set or an offset != 0, which makes it ignore those fragments. Remove the invalid check and make reassembly handle fragment queues containing only a single fragment. Reported-and-tested-by: Ulrich Weber Signed-off-by: Patrick McHardy commit 77c9cfc51b0d732b2524799810fb30018074fd60 Author: Martin K. Petersen Date: Wed Jan 20 02:20:43 2010 -0500 [SCSI] Fix printing of failed 32-byte commands Having the large CDB allocation logic in sd.c means that scsi_io_completion does not have access to the command buffer. That in turn causes garbage to be printed when a 32-byte command fails. Move the command printing to sd_done where the command buffer is intact. Clear the command buffer pointer after the extended CDB has been freed. Make scsi_print_command ignore commands with NULL CDB pointers to inhibit printing of garbled command strings. Signed-off-by: Martin K. Petersen Reviewed-by: Boaz Harrosh Signed-off-by: James Bottomley commit 8475f688d796b875bf98ed161acd53d00a1483ff Author: Martin K. Petersen Date: Wed Jan 20 02:17:40 2010 -0500 [SCSI] Fix printing of variable length commands We dereferenced the MAINTENANCE IN array when decoding variable length commands. Use the right array. Also consolidate identical if statements below. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit 78d85019ba8c13e1094cad0ea9bb4f61caad8320 Author: Bart Van Assche Date: Wed Dec 9 19:52:19 2009 +0100 [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation Fix a bug in the interpretation of the ADDITIONAL CDB LENGTH (add_cdb_len) field of SRP_CMD requests. According to the SRP specification, the layout of this single-byte field is as follows: * Bits 0 and 1 are reserved. * Bits 2 to 7 represent the ADDITIONAL CDB LENGTH field, symbolically represented as n. * Still according to the SRP specification, the ADDITIONAL CDB section takes 4*n bytes. Currently libsrp is only used by the ibmvscsi driver. Since the ibmvscsi driver doesn't support large CDB's, this bug hasn't caused any problems yet. [jejb: use & ~3 to mask the bits] Signed-off-by: Bart Van Assche Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 22963a37b3437a25812cc856afa5a84ad4a3f541 Author: Brian King Date: Fri Feb 19 10:08:31 2010 -0600 [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list Adds IBM Power Virtual SCSI ALUA devices to the ALUA device handler. Signed-off-by: Brian King Signed-off-by: James Bottomley commit cd4a8814d44672bd2c8f04a472121bfbe193809c Author: Mike Christie Date: Thu Feb 18 17:32:03 2010 -0600 [SCSI] scsi_dh_alua: add netapp to dev list Newer Netapp target software supports ALUA, so this patch adds them to the scsi_dev_alua dev list. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 35b7f0a76bb4307db7bcf9b73c4accf793cd88fa Author: Giridhar Malavali Date: Thu Feb 18 10:07:30 2010 -0800 [SCSI] qla2xxx: Update version number to 8.03.02-k1. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 8c1496bda8aeeafd78ecf0c25c060b601e58dedf Author: Richard Lary Date: Thu Feb 18 10:07:29 2010 -0800 [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit ae97c91eb1f139b19c1e7cbc5c1380dae8ad874e Author: Andrew Vasquez Date: Thu Feb 18 10:07:28 2010 -0800 [SCSI] qla2xxx: Add firmware ETS burst support. Can be used to balance NIC/FCoE traffic distribution. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit bb2d52b2fd8b19355957e34271f79917f69e4059 Author: Andrew Vasquez Date: Thu Feb 18 10:07:27 2010 -0800 [SCSI] qla2xxx: Correct loop-resync issues during SNS scans. Original code could inadvertently skip the post processing of port information returned from the SNS scan, if any link-flopping asynchronous-events were received (noticed in FCAL topologies). Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 715848ca6fffeb6362a50887d9c26245bd5dfba9 Author: Andrew Vasquez Date: Thu Feb 18 10:07:26 2010 -0800 [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback. The explicit logout (LOGO) issued at the end of the callback will flush (via normal scsi_cmnd->done()) any outstanding commands (FCP2) the firmware is holding. While iterating through the outstanding_cmnd array in qla2x00_abort_fcport_cmds(), locking and unlocking of the hardware spinlock, opens-up the driver to cases where the processed SRB (sp) could be used after the command completed from interrupt context. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 55e5ed273d758c62d2f1fad47c73716039f7c01c Author: Andrew Vasquez Date: Thu Feb 18 10:07:25 2010 -0800 [SCSI] qla2xxx: Correct EH bus-reset handling. Target-level resets are unlikely to complete if done after the bus (LIP/OLS/NOS) has been reset. Perform target-level resets, if necessary, prior to hitting the bus. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit db3ad7f8852cfdfa03f72b27472e5a8bc9c1e1cf Author: Giridhar Malavali Date: Thu Feb 18 10:07:24 2010 -0800 [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out. Fix for BSG request cleanup when the request timesout. Proper release of driver resources used for BSG request during timeout cleanup. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 236b0249c2274cd24bc98a1fbbb5e78d861d4bd9 Author: Sarang Radke Date: Thu Feb 18 10:07:23 2010 -0800 [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands Since bsg_job->reply->reply_payload_rcv_len is uninitialized in case of failure, fc-transport triggers a warning for each command failed. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 64507fdbc29c3a622180378210ecea8659b14e40 Author: Eric Dumazet Date: Fri Feb 19 15:28:38 2010 +0100 netfilter: nf_queue: fix NF_STOLEN skb leak commit 3bc38712e3a6e059 (handle NF_STOP and unknown verdicts in nf_reinject) was a partial fix to packet leaks. If user asks NF_STOLEN status, we must free the skb as well. Reported-by: Afi Gjermund Signed-off-by: Eric DUmazet Signed-off-by: Patrick McHardy commit a88e22adf5aad79b6e2ddd1bf0109c2ba8b46b0e Author: Pablo Neira Ayuso Date: Fri Feb 19 14:24:39 2010 +0100 netfilter: ctnetlink: fix creation of conntrack with helpers This patch fixes a bug that triggers an assertion if you create a conntrack entry with a helper and netfilter debugging is enabled. Basically, we hit the assertion because the confirmation flag is set before the conntrack extensions are added. To fix this, we move the extension addition before the aforementioned flag is set. This patch also removes the possibility of setting a helper for existing conntracks. This operation would also trigger the assertion since we are not allowed to add new extensions for existing conntracks. We know noone that could benefit from this operation sanely. Thanks to Eric Dumazet for initial posting a preliminary patch to address this issue. Reported-by: David Ramblewski Signed-off-by: Pablo Neira Ayuso Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 2f09586557ed9b6d50bc8bb5104e70006513bdc2 Author: Vasily Khoruzhick Date: Fri Feb 19 01:18:11 2010 -0800 Input: s3c24xx_ts - re-enable IRQ on resume IRQ should be re-enabled on resume, otherwise driver stops reporting events. Signed-off-by: Vasily Khoruzhick Signed-off-by: Dmitry Torokhov commit e87a344d0eef52cadcd5e1ef33a8771afc879896 Author: Dmitry Torokhov Date: Thu Feb 18 01:51:47 2010 -0800 Input: wacom - constify product features data Features are not supposed to be modified; devices use their own private copies, so let's mark them const. Signed-off-by: Dmitry Torokhov commit e33da8a5486aaadf5161118869e6cfb3d119beea Author: Jason Childs Date: Wed Feb 17 22:38:31 2010 -0800 Input: wacom - use per-device instance of wacom_features Since we mangle data in wacom_features when dealing with certain devices let's use a private (per-device) instance of wacom_features in wacom_wac. This way same product ID can support more than one type of device, such as pen and touch, and not interfere with each other. Signed-off-by: Jason Childs Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit c44dcc56d2b5c79ba3063d20f76e5347e2e418f6 Author: Al Viro Date: Thu Feb 11 02:24:46 2010 -0500 switch inotify_user to anon_inode Signed-off-by: Al Viro commit cf261b2392daa7b1a18b91707485e3648dda34d3 Author: David S. Miller Date: Thu Feb 18 23:32:26 2010 -0800 net: Make GRETH driver depend on SPARC. Reported by Stephen Rothwell. Signed-off-by: David S. Miller commit 4bac6b180771f7ef5275b1a6d88e630ca3a3d6f0 Author: Patrick McHardy Date: Fri Feb 19 08:03:28 2010 +0100 netfilter: restore POST_ROUTING hook in NF_HOOK_COND Commit 2249065 ("netfilter: get rid of the grossness in netfilter.h") inverted the logic for conditional hook invocation, breaking the POST_ROUTING hook invoked by ip_output(). Correct the logic and remove an unnecessary initialization. Reported-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 8b7ef6d8f16274da42344cd50746ddb1c93c25ea Author: Thomas Renninger Date: Tue Feb 16 22:55:51 2010 +0100 ACPI thermal: Check for thermal zone requirement ACPI spec says (11.5 Thermal Zone Interface Requirements): A thermal zone must contain at least one trip point (critical, near critical, active, or passive) Check this once at init time. Signed-off-by: Thomas Renninger Tested-by: clarkt@cnsp.com Signed-off-by: Len Brown commit eb572a5c7951288e265b3e8f9a5d37b6abb2e996 Author: H. Peter Anvin Date: Thu Feb 18 22:15:04 2010 -0800 x86-64, setup: Inhibit decompressor output if video info is invalid Inhibit output from the kernel decompressor if the video information is invalid. This was already the case for 32 bits, make 64 bits match. Signed-off-by: H. Peter Anvin LKML-Reference: commit cb19060abfdecac0d1eb2d2f0e7d6b7a3f8bc4f4 Author: Borislav Petkov Date: Thu Feb 18 19:37:14 2010 +0100 x86, cacheinfo: Enable L3 CID only on AMD Final stage linking can fail with arch/x86/built-in.o: In function `store_cache_disable': intel_cacheinfo.c:(.text+0xc509): undefined reference to `amd_get_nb_id' arch/x86/built-in.o: In function `show_cache_disable': intel_cacheinfo.c:(.text+0xc7d3): undefined reference to `amd_get_nb_id' when CONFIG_CPU_SUP_AMD is not enabled because the amd_get_nb_id helper is defined in AMD-specific code but also used in generic code (intel_cacheinfo.c). Reorganize the L3 cache index disable code under CONFIG_CPU_SUP_AMD since it is AMD-only anyway. Signed-off-by: Borislav Petkov LKML-Reference: <20100218184210.GF20473@aftab> Signed-off-by: H. Peter Anvin commit f619b3d8427eb57f0134dab75b0d217325c72411 Author: Borislav Petkov Date: Thu Feb 4 12:09:07 2010 +0100 x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1 The show/store_cache_disable routines depend unnecessarily on NUMA's cpu_to_node and the disabling of cache indices broke when !CONFIG_NUMA. Remove that dependency by using a helper which is always correct. While at it, enable L3 Cache Index disable on rev D1 Istanbuls which sport the feature too. Signed-off-by: Borislav Petkov LKML-Reference: <20100218184339.GG20473@aftab> Signed-off-by: H. Peter Anvin commit eb5b3794062824ba12d883901eea49ea89d0a678 Author: Brandon Philips Date: Sun Feb 7 13:02:50 2010 -0800 x86, irq: Keep chip_data in create_irq_nr and destroy_irq Version 4: use get_irq_chip_data() in destroy_irq() to get rid of some local vars. When two drivers are setting up MSI-X at the same time via pci_enable_msix() there is a race. See this dmesg excerpt: [ 85.170610] ixgbe 0000:02:00.1: irq 97 for MSI/MSI-X [ 85.170611] alloc irq_desc for 99 on node -1 [ 85.170613] igb 0000:08:00.1: irq 98 for MSI/MSI-X [ 85.170614] alloc kstat_irqs on node -1 [ 85.170616] alloc irq_2_iommu on node -1 [ 85.170617] alloc irq_desc for 100 on node -1 [ 85.170619] alloc kstat_irqs on node -1 [ 85.170621] alloc irq_2_iommu on node -1 [ 85.170625] ixgbe 0000:02:00.1: irq 99 for MSI/MSI-X [ 85.170626] alloc irq_desc for 101 on node -1 [ 85.170628] igb 0000:08:00.1: irq 100 for MSI/MSI-X [ 85.170630] alloc kstat_irqs on node -1 [ 85.170631] alloc irq_2_iommu on node -1 [ 85.170635] alloc irq_desc for 102 on node -1 [ 85.170636] alloc kstat_irqs on node -1 [ 85.170639] alloc irq_2_iommu on node -1 [ 85.170646] BUG: unable to handle kernel NULL pointer dereference at 0000000000000088 As you can see igb and ixgbe are both alternating on create_irq_nr() via pci_enable_msix() in their probe function. ixgbe: While looping through irq_desc_ptrs[] via create_irq_nr() ixgbe choses irq_desc_ptrs[102] and exits the loop, drops vector_lock and calls dynamic_irq_init. Then it sets irq_desc_ptrs[102]->chip_data = NULL via dynamic_irq_init(). igb: Grabs the vector_lock now and starts looping over irq_desc_ptrs[] via create_irq_nr(). It gets to irq_desc_ptrs[102] and does this: cfg_new = irq_desc_ptrs[102]->chip_data; if (cfg_new->vector != 0) continue; This hits the NULL deref. Another possible race exists via pci_disable_msix() in a driver or in the number of error paths that call free_msi_irqs(): destroy_irq() dynamic_irq_cleanup() which sets desc->chip_data = NULL ...race window... desc->chip_data = cfg; Remove the save and restore code for cfg in create_irq_nr() and destroy_irq() and take the desc->lock when checking the irq_cfg. Reported-and-analyzed-by: Brandon Philips Signed-off-by: Yinghai Lu LKML-Reference: <20100207210250.GB8256@jenkins.home.ifup.org> Signed-off-by: Brandon Phiilps Cc: stable@kernel.org Signed-off-by: H. Peter Anvin commit 071c06cb570d38efe23a124e885f2f3e643a9206 Author: Thomas Gleixner Date: Thu Feb 18 02:22:27 2010 +0000 powerpc: Convert pmc_owner_lock to raw_spinlock pmc_owner_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit b8f87782e82709d613c5d2a165d1443478e57c00 Author: Thomas Gleixner Date: Thu Feb 18 02:22:31 2010 +0000 powerpc: Convert die.lock to raw_spinlock die.lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 3eb93c558a9e3651f86a88565e59488e936ff346 Author: Thomas Gleixner Date: Thu Feb 18 02:22:44 2010 +0000 powerpc: Convert tlbivax_lock to raw_spinlock tlbivax_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Acked-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt commit 203041ad1f66d2afb893c2adb9c11bfd13209d06 Author: Thomas Gleixner Date: Thu Feb 18 02:23:18 2010 +0000 powerpc: Convert mpic locks to raw_spinlock mpic_lock, irq_rover_lock and fixup_lock need to be real spinlocks in RT. Convert them to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit d0eab3eb557250cead42f22e6f1a4f7e326757f9 Author: Thomas Gleixner Date: Thu Feb 18 02:23:03 2010 +0000 powerpc: Convert pmac_pic_lock to raw_spinlock pmac_pic_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit f95e085b2531c86262b97a081eb0d1cf793606d3 Author: Thomas Gleixner Date: Thu Feb 18 02:22:24 2010 +0000 powerpc: Convert big_irq_lock to raw_spinlock big_irq_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 087d8c7d0cc8a79e6bd6223f9b0018483124e769 Author: Thomas Gleixner Date: Thu Feb 18 02:22:55 2010 +0000 powerpc: Convert feature_lock to raw_spinlock feature_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 47e3c9046bc884d4f727df00f0b6ec73fa387e50 Author: Thomas Gleixner Date: Thu Feb 18 02:23:11 2010 +0000 powerpc: Convert i8259_lock to raw_spinlock i8259_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 7cc8a5e3f52c146d46d286f3778b09181639dc61 Author: Thomas Gleixner Date: Thu Feb 18 02:22:47 2010 +0000 powerpc: Convert beat_htab_lock to raw_spinlock beat_htab_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 3d3726282850761938078cd2013435eeeb2d0375 Author: Thomas Gleixner Date: Thu Feb 18 02:23:07 2010 +0000 powerpc: Convert confirm_error_lock to raw_spinlock confirm_error_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit a9e8bf21cd0f5a5a8ebe63fa356a8f100b8a0955 Author: Thomas Gleixner Date: Thu Feb 18 02:23:14 2010 +0000 powerpc: Convert ipic_lock to raw_spinlock ipic_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 6b9c9b8a66f7696ce392d34f90d4d6aa7045f51d Author: Thomas Gleixner Date: Thu Feb 18 02:22:35 2010 +0000 powerpc: Convert native_tlbie_lock to raw_spinlock native_tlbie_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 5181e7909b28abe5ce6674412a74167fd074824a Author: Thomas Gleixner Date: Thu Feb 18 02:22:52 2010 +0000 powerpc: Convert beatic_irq_mask_lock to raw_spinlock beatic_irq_mask_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 7d725bdc1b25b9c4ff7c14e43d0d0d6c3d677727 Author: Thomas Gleixner Date: Thu Feb 18 02:22:59 2010 +0000 powerpc: Convert nv_lock to raw_spinlock nv_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit be833f3371bd9580d9f5a507390d72452577f394 Author: Thomas Gleixner Date: Thu Feb 18 02:22:39 2010 +0000 powerpc: Convert context_lock to raw_spinlock context_lock needs to be a real spinlock in RT. Convert it to raw_spinlock. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 87d31345c0a90ccdf185feed9923ed14764f45dc Merge: e98efaf d24720a Author: Benjamin Herrenschmidt Date: Fri Feb 19 14:38:23 2010 +1100 Merge commit 'gcl/next' into next commit ca4dbc668412d5fe039be3e26e8e717a616d1ca5 Author: Eric W. Biederman Date: Wed Feb 17 18:49:54 2010 -0800 xen: Remove unnecessary arch specific xen irq functions. Right now xen's use of the x86 and ia64 handle_irq is just bizarre and very fragile as it is very non-obvious the function exists and is is used by code out in drivers/.... Luckily using handle_irq is completely unnecessary, and we can just use the generic irq apis instead. This still leaves drivers/xen/events.c as a problematic user of the generic irq apis it has "static struct irq_info irq_info[NR_IRQS]" but that can be fixed some other time. Signed-off-by: Eric W. Biederman LKML-Reference: <4B7CAAD2.10803@kernel.org> Acked-by: Jeremy Fitzhardinge Cc: Ian Campbell Signed-off-by: H. Peter Anvin commit b7e9f6219d01ccb4af6fe5ad082150032ecae8ab Author: Jiri Kosina Date: Fri Feb 19 00:44:42 2010 +0100 Remove drivers/parport/ChangeLog Remove outdated drivers/parport/ChangeLog. No need for such files since we have git. Acked-by: Alan Cox Signed-off-by: Jiri Kosina commit ad06ab2a1c74a9e0f1136f8260e411bf01c4502f Author: Joe Perches Date: Wed Feb 17 20:00:17 2010 +0000 drivers/net/sis190.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ and netif_msg_ Remove local #define net_ macros Remove periods from formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 05dbe005386e7521153dce6c5ad95c98b73b80c7 Author: Joe Perches Date: Wed Feb 17 19:44:19 2010 +0000 drivers/net/tg3.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Remove periods from most formats Coalesce long formats Use printk_once Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f546444d0b4f46d812a374a6eb2c46b7d24541f4 Author: Chrissie Caulfield Date: Thu Feb 18 01:33:13 2010 +0000 Orphan DECnet Due to lack of time, space, motivation, hardware and probably expertise, I have reluctantly decided to orphan the DECnet code in the kernel. Judging by the deafening silence on the linux-decnet mailing list I suspect it's either not being used anyway, or the few people that are using it are happy with their older kernels. Signed-Off-By: Christine Caulfield Signed-off-by: David S. Miller commit b03388d6389e8853ddd9ae19d2ba15a6dbbe5d21 Author: Sathya Perla Date: Thu Feb 18 00:37:17 2010 +0000 be2net: free tx buffers when completions never arrive be2net: free tx buffers when completions never arrive In cases like when a pci device is disconnected on an error, pending tx completions will never arrive. Unmap and free such buffers in the tx cleanup path. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 72032fdbcde8b333e65b3430e1bcb4358e2d6716 Author: jamal Date: Thu Feb 18 03:35:07 2010 +0000 xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR XFRMINHDRERROR counter is ambigous when validating forwarding path. It makes it tricky to debug when you have both in and fwd validation. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 7e38017557bc0b87434d184f8804cadb102bb903 Author: Andreas Petlund Date: Thu Feb 18 04:48:19 2010 +0000 net: TCP thin dupack This patch enables fast retransmissions after one dupACK for TCP if the stream is identified as thin. This will reduce latencies for thin streams that are not able to trigger fast retransmissions due to high packet interarrival time. This mechanism is only active if enabled by iocontrol or syscontrol and the stream is identified as thin. Signed-off-by: Andreas Petlund Signed-off-by: David S. Miller commit 36e31b0af58728071e8023cf8e20c5166b700717 Author: Andreas Petlund Date: Thu Feb 18 02:47:01 2010 +0000 net: TCP thin linear timeouts This patch will make TCP use only linear timeouts if the stream is thin. This will help to avoid the very high latencies that thin stream suffer because of exponential backoff. This mechanism is only active if enabled by iocontrol or syscontrol and the stream is identified as thin. A maximum of 6 linear timeouts is tried before exponential backoff is resumed. Signed-off-by: Andreas Petlund Signed-off-by: David S. Miller commit 5aa4b32fc86408705337e941ed716880c63d1590 Author: Andreas Petlund Date: Thu Feb 18 02:45:45 2010 +0000 net: TCP thin-stream detection Inline function to dynamically detect thin streams based on the number of packets in flight. Used to dynamically trigger thin-stream mechanisms if enabled by ioctl or sysctl. Signed-off-by: Andreas Petlund Signed-off-by: David S. Miller commit 16cad981863344ef779ab703545bb6f261a0f0ce Author: Jiri Pirko Date: Thu Feb 18 02:47:07 2010 +0000 tokenring: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit d59079425f6f1be0da995926b5ad1d54d9e4545d Author: Jiri Pirko Date: Thu Feb 18 05:10:14 2010 +0000 staging: convert to use netdev_for_each_mc_addr removed needless checks in arlan-main.c and slicoss.c fixed bug in et131x_netdev.c to actually fill addresses in. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit a92635dc77b14f0f28d45c0fbf91b5064d9d7617 Author: Jiri Pirko Date: Thu Feb 18 04:02:26 2010 +0000 net/usb: convert to use netdev_for_each_mc_addr also removed needless checks in smsc95xx Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 4302b67e041ea81c8fc233bee1296516e1294a27 Author: Jiri Pirko Date: Thu Feb 18 03:34:54 2010 +0000 tulip: convert to use netdev_for_each_mc_addr also bug in de2104x.c was corrected: for (i = 0; i < 32; i++) loop should be outside mc_list iteration. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 5508590c193661bc1484ad7b952af5fceacea40d Author: Jiri Pirko Date: Thu Feb 18 00:42:54 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part2 Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 2a0d18f97cc15d57ad0c93259a3df4cb72c5a28b Author: Jiri Pirko Date: Wed Feb 17 23:22:38 2010 +0000 smsc911x: convert to use netdev_for_each_mc_addr also removed unnecessary checks Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 59ce25d9eb2e17b901a404766f9e134759407d26 Author: Jiri Pirko Date: Wed Feb 17 23:12:15 2010 +0000 3c5xx: use netdev_mc_* helpers Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit bf473a268af5d19c3730742a0c4f9aca274843da Author: Jiri Pirko Date: Wed Feb 17 22:55:07 2010 +0000 depca: remove forgotten needless inicialization Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit b54452b07a7b1b8cc1385edba3ef2ef6d4679d5a Author: Alexey Dobriyan Date: Thu Feb 18 08:14:31 2010 +0000 const: struct nla_policy Make remaining netlink policies as const. Fixup coding style where needed. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 3ffe533c87281b68d469b279ff3a5056f9c75862 Author: Alexey Dobriyan Date: Thu Feb 18 08:25:24 2010 +0000 ipv6: drop unused "dev" arg of icmpv6_send() Dunno, what was the idea, it wasn't used for a long time. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit bbef49daca35d4fd21bf606a10b6980f17d9df5d Author: Alexey Dobriyan Date: Thu Feb 18 08:13:30 2010 +0000 ipv6: use standard lists for FIB walks Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit bc417d99bf279f034474bc2d7dedd390838a5480 Author: Alexey Dobriyan Date: Thu Feb 18 08:12:20 2010 +0000 ipv6: remove stale MIB definitions ICMP6 MIB statistics was per-netns for quite a time. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 663717f65c075eb4c6da7a123041295bd5295cc0 Author: Stephen Hemminger Date: Thu Feb 18 14:12:06 2010 -0800 AF_UNIX: update locking comment The lock used in unix_state_lock() is a spin_lock not reader-writer. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b9fb9ee07e67fce0b7bfd517a48710465706c30a Author: Arnd Bergmann Date: Thu Feb 18 05:48:17 2010 +0000 macvtap: add GSO/csum offload support Added flags field to macvtap_queue to enable/disable processing of virtio_net_hdr via IFF_VNET_HDR. This flag is checked to prepend virtio_net_hdr in the receive path and process/skip virtio_net_hdr in the send path. Original patch by Sridhar, further changes by Arnd. Signed-off-by: Sridhar Samudrala Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit 501c774cb13c3ef8fb7fc5f08fa19473f7d9a0db Author: Arnd Bergmann Date: Thu Feb 18 05:46:50 2010 +0000 net/macvtap: add vhost support This adds support for passing a macvtap file descriptor into vhost-net, much like we already do for tun/tap. Most of the new code is taken from the respective patch in the tun driver and may get consolidated in the future. Signed-off-by: Arnd Bergmann Acked-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 02df55d28c6001a3cdb7a997a34a0b01f01d015e Author: Arnd Bergmann Date: Thu Feb 18 05:45:36 2010 +0000 macvtap: rework object lifetime rules This reworks the change done by the previous patch in a more complete way. The original macvtap code has a number of problems resulting from the use of RCU for protecting the access to struct macvtap_queue from open files. This includes - need for GFP_ATOMIC allocations for skbs - potential deadlocks when copy_*_user sleeps - inability to work with vhost-net Changing the lifetime of macvtap_queue to always depend on the open file solves all these. The RCU reference simply moves one step down to the reference on the macvlan_dev, which we only need for nonblocking operations. Signed-off-by: Arnd Bergmann Acked-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 1ef8a5be834117fa54db6cb595fc2d45c14a38cf Author: Jonathan Corbet Date: Thu Feb 18 09:52:00 2010 -0700 Remove drivers/char/ChangeLog The ChangeLog file under drivers/char is 30K of stuff dedicated to the mid-90's TTY exploits of Ted Ts'o; it has been updated once since 1998 - and that was in 2001. It's interesting history, but we don't normally carry that kind of history inline with the code. Let's remove it. Signed-off-by: Jonathan Corbet Acked-by: Alan Cox Acked-by: "Theodore Ts'o" Signed-off-by: Jiri Kosina commit 37ee3d5b3e979a168536e7e2f15bd1e769cb4122 Author: Patrick McHardy Date: Thu Feb 18 19:04:44 2010 +0100 netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n As reported by Randy Dunlap , compilation of nf_defrag_ipv4 fails with: include/net/netfilter/nf_conntrack.h:94: error: field 'ct_general' has incomplete type include/net/netfilter/nf_conntrack.h:178: error: 'const struct sk_buff' has no member named 'nfct' include/net/netfilter/nf_conntrack.h:185: error: implicit declaration of function 'nf_conntrack_put' include/net/netfilter/nf_conntrack.h:294: error: 'const struct sk_buff' has no member named 'nfct' net/ipv4/netfilter/nf_defrag_ipv4.c:45: error: 'struct sk_buff' has no member named 'nfct' net/ipv4/netfilter/nf_defrag_ipv4.c:46: error: 'struct sk_buff' has no member named 'nfct' net/nf_conntrack.h must not be included with NF_CONNTRACK=n, add a few #ifdefs. Long term the header file should be fixed to be usable even with NF_CONNTRACK=n. Tested-by: Randy Dunlap Signed-off-by: Patrick McHardy commit 6bd4b382664d188daed8a48f7df88d188dcd95fa Author: Hartley Sweeten Date: Thu Feb 18 18:16:11 2010 +0100 ARM: 5945/1: ep93xx: include correct irq.h in core.c Currently is included by core.c. This header includes and defines a number of internal functions. These internal functions are not needed by this file. Change the include so that we just get what is needed. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 3b43816f685fc6c2531f43514662f796f4601ffc Author: Rabin Vincent Date: Fri Feb 12 06:43:11 2010 +0100 ARM: 5933/1: amba-pl011: support hardware flow control Enable/disable automatic hardware flow control as requested by the termios. The controller does not allow us to control the RTS line when auto-RTS is enabled, so we enable auto-RTS only if the kernel has not disabled RTS. Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit ee37e09d81a4acf328f68189af12f116401f8c0f Author: Alan Stern Date: Fri Feb 12 12:13:55 2010 -0500 [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev This patch (as1335) fixes a bug in scsi_sysfs_add_sdev(). Its callers always remove the device if anything goes wrong, so it should never remove the device. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit d5469119f0098881ab7f991990ef4f81ef13a194 Author: Alan Stern Date: Fri Feb 12 12:13:39 2010 -0500 [SCSI] fix refcounting bug in scsi_get_host_dev This patch (as1334) fixes a bug in scsi_get_host_dev(). It incorrectly calls get_device() on the new device's target. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 Author: Alan Stern Date: Fri Feb 12 12:13:31 2010 -0500 [SCSI] fix memory leak in scsi_report_lun_scan This patch (as1333) fixes a bug in scsi_report_lun_scan(). If a newly-allocated device can't be used, it should be deleted. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 277e76f1821ab131a409c6a2e04492ef5774fb3c Author: James Smart Date: Thu Feb 18 11:07:15 2010 -0500 [SCSI] lpfc: correct PPC build failure Reported-by: Stephen Rothwell Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2906f66a5682e5670a5eefe991843689b8d8563f Author: Venkata Mohan Reddy Date: Thu Feb 18 12:31:05 2010 +0100 ipvs: SCTP Trasport Loadbalancing Support Enhance IPVS to load balance SCTP transport protocol packets. This is done based on the SCTP rfc 4960. All possible control chunks have been taken care. The state machine used in this code looks some what lengthy. I tried to make the state machine easy to understand. Signed-off-by: Venkata Mohan Reddy Koppula Signed-off-by: Simon Horman Signed-off-by: Patrick McHardy commit 6d2e0bd60848e97756f40e49da207e862f4f3851 Author: Tomi Valkeinen Date: Wed Feb 17 13:38:08 2010 +0200 OMAP: DSS2: OMAPFB: fix cleanup on dssdev enable error If enabling a dss device failed, omapfb didn't exit, leading to crash. Signed-off-by: Tomi Valkeinen commit b3f91eb8d8d17ad3ca5da4fa9f20d2e46133fd99 Author: Tomi Valkeinen Date: Wed Feb 17 12:00:01 2010 +0200 OMAP: DSS2: OMAPFB: fix dssdev cleanup on error If there was a dss device without a driver and thus omapfb probe failed, ref counts could be left to dss devices. Signed-off-by: Tomi Valkeinen commit c121b15244c53637c3e9ca608b8816abcfbe2f8e Author: Tomi Valkeinen Date: Wed Feb 17 11:50:07 2010 +0200 OMAP: DSS2: fix driver probe error handling If driver's probe failed, the uninit was not called. Signed-off-by: Tomi Valkeinen commit e020f9af6d8311cd935217219f49175e161be100 Author: Tomi Valkeinen Date: Wed Feb 17 13:36:48 2010 +0200 OMAP: DSS2: remove sub-panel system The system to allow panel drivers to exists as attached to ctrl drivers did never work very well. It is not useed, and this patch removes it to make the driver cleaner. For now, controller drivers need to include also the panel driver code. In the future a proper mechanism for this should be developed, perhaps by creating busses for controllers. Signed-off-by: Tomi Valkeinen commit 03f29365e84ff6d651be4e6186e0400ca59da6cd Author: Jiro SEKIBA Date: Thu Feb 18 19:11:35 2010 +0900 nilfs2: delete unnecessary condition in load_segment_summary This is a trivial patch to remove unnecessary condition. load_segment_summary() checks crc of segment_summary OR crc of whole log data blocks based on boolean argument full_check. However, callers of the function pass only 1 as full_check, which means only whole log data blocks checking code is running all the time. This patch deletes the condition and full_check argument and also deletes enum 'NILFS_SEG_FAIL_CHECKSUM_SEGSUM' and corresponding case clause, for it is nolonger used anymore. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit 477c608673526afc094be521086fed186c7ccf7d Merge: 6457d26 6e705f5 Author: Patrick McHardy Date: Thu Feb 18 11:41:39 2010 +0100 Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6 commit 8c563a30cdfff2833c4c2078d25b5d1469706a6d Author: Matt Fleming Date: Thu Feb 4 23:46:13 2010 +0000 sh: Turn on speculative return for SH7785 and SH7786 Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 77f36fcc035a5af19e95f50a2e648cda2a6ef2b9 Merge: 838a4a9 d01447b Author: Paul Mundt Date: Thu Feb 18 18:35:20 2010 +0900 Merge branch 'sh/pmb-dynamic' commit 02624a17896036c663fd5992c22919af8dad93ed Author: Kuninori Morimoto Date: Thu Feb 18 17:58:19 2010 +0900 ARM: mach-shmobile: ap4evb: Add tiny document Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b228b48e454007436a8e6ff1c6b6f4f6602fc45e Author: Kuninori Morimoto Date: Thu Feb 18 16:44:41 2010 +0900 ARM: mach-shmobile: ap4evb: Add SCIFA0 support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit d01447b3197c2c470a14666be2c640407bbbfec7 Author: Paul Mundt Date: Thu Feb 18 18:13:51 2010 +0900 sh: Merge legacy and dynamic PMB modes. This implements a bit of rework for the PMB code, which permits us to kill off the legacy PMB mode completely. Rather than trusting the boot loader to do the right thing, we do a quick verification of the PMB contents to determine whether to have the kernel setup the initial mappings or whether it needs to mangle them later on instead. If we're booting from legacy mappings, the kernel will now take control of them and make them match the kernel's initial mapping configuration. This is accomplished by breaking the initialization phase out in to multiple steps: synchronization, merging, and resizing. With the recent rework, the synchronization code establishes page links for compound mappings already, so we build on top of this for promoting mappings and reclaiming unused slots. At the same time, the changes introduced for the uncached helpers also permit us to dynamically resize the uncached mapping without any particular headaches. The smallest page size is more than sufficient for mapping all of kernel text, and as we're careful not to jump to any far off locations in the setup code the mapping can safely be resized regardless of whether we are executing from it or not. Signed-off-by: Paul Mundt commit 0f547dc1f6e4faf05fd9946c6b7e9a828e7f901e Author: Baruch Siach Date: Wed Feb 17 12:33:25 2010 +0200 mx25pdk: add LCD support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 04a03e5fe3d337242e5c0a9c93d2fd24cff545ef Author: Baruch Siach Date: Wed Feb 17 12:33:24 2010 +0200 mx25: add platform support for imxfb Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit f601441916d1e19291d0b4f044b4a7551e2924d0 Author: Baruch Siach Date: Wed Feb 17 12:33:23 2010 +0200 imxfb: add support for i.MX25 The commit also introduces the HAVE_FB_IMX config that is to be selected from the MX25 platform config. Once this commit gets merged, the two other i.MX archs, ARCH_MX1 and ARCH_MX2, should follow this one. Signed-off-by: Baruch Siach Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 04510a74bfbcbfd53dd48b3094aad89d5eca1d28 Author: Florian Zumbiehl Date: Thu Feb 18 07:03:55 2010 +0100 ALSA: cs46xx - fix some typos Signed-off-by: Florian Zumbiehl Signed-off-by: Takashi Iwai commit 7fb2d723e65cc793213515fa1da092b7c92a5b48 Author: Florian Zumbiehl Date: Thu Feb 18 07:01:20 2010 +0100 ALSA: cs46xx - Do test writes to register AC97_REC_GAIN in snd_cs46xx_codec_reset() bypassing the register cache, so as to not clobber the cached register value during resume. Signed-off-by: Florian Zumbiehl Signed-off-by: Takashi Iwai commit d594e46ace22afa1621254f6f669e65430048153 Author: Jerome Glisse Date: Wed Feb 17 21:54:29 2010 +0000 drm/radeon/kms: simplify memory controller setup V2 Get rid of _location and use _start/_end also simplify the computation of vram_start|end & gtt_start|end. For R1XX-R2XX we place VRAM at the same address of PCI aperture, those GPU shouldn't have much memory and seems to behave better when setup that way. For R3XX and newer we place VRAM at 0. For R6XX-R7XX AGP we place VRAM before or after AGP aperture this might limit to limit the VRAM size but it's very unlikely. For IGP we don't change the VRAM placement. Tested on (compiz,quake3,suspend/resume): PCI/PCIE:RV280,R420,RV515,RV570,RV610,RV710 AGP:RV100,RV280,R420,RV350,RV620(RPB*),RV730 IGP:RS480(RPB*),RS690,RS780(RPB*),RS880 RPB: resume previously broken V2 correct commit message to reflect more accurately the bug and move VRAM placement to 0 for most of the GPU to avoid limiting VRAM. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 44ca7478d46aaad488d916f7262253e000ee60f9 Author: Pauli Nieminen Date: Thu Feb 11 17:25:47 2010 +0000 drm/radeon: Add asic hook for dma copy to r200 cards. r200 cards have dma engine which can be used to tranfer data between vram and system memory. r300 dma engine registers match r200 dma engine. Enabling dma copy for r200 is simple as hooking r200 asic to already existing function r300_copy_dma. Rename r300_dma_copy to r200_dma_copyto reflect that supports starts from r200 cards. v2: Created a new asic object for r200 cards. Signed-off-by: Pauli Nieminen Signed-off-by: Dave Airlie commit d80eeb0f347b6effa06e11e7cbcb2e6c559bf404 Author: Pauli Nieminen Date: Thu Feb 11 17:55:35 2010 +0000 drm/radeon/kms: Create asic structure for r300 pcie cards. Setting global asic structure to point to different function would cause problem in system where is multiple r300 cards with different bus type. r300_asic_pcie is just copy from r300_asic with gart tlb functions replaced with pcie versions. Signed-off-by: Pauli Nieminen Signed-off-by: Dave Airlie commit 93f319d31cc42a77bd5e953e861a8f2bfb277ad1 Author: Alex Deucher Date: Thu Feb 11 11:00:13 2010 -0500 drm/radeon/kms: remove unused r600_gart_clear_page r6xx/r7xx use the rs600 variant. This old one just confuses things. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6ad86c311a8b8a6d856527a1b6ba21790ab7054b Author: Alex Deucher Date: Thu Feb 11 10:47:52 2010 -0500 drm/radeon/kms: remove HDP flushes from fence emit (v2) r600_ioctl_wait_idle() now handles this. v2: update blit fence counts Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 8e0d84a63af351f5367103b83478f2cd4d9a3727 Author: Alex Deucher Date: Tue Feb 16 11:44:21 2010 -0500 drm/radeon/kms: add LVDS pll quirk for Dell Studio 15 fixes fdo bug 26358 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit bc4624cad9b53b3fd3248fe3086b432471fc0fe0 Author: Rafał Miłecki Date: Thu Feb 11 21:50:06 2010 +0000 drm/radeon/kms: simplify picking power state Signed-off-by: Dave Airlie commit 2e450643d70b62e0192577681b227d7d5d2efa45 Author: Paul Mundt Date: Thu Feb 18 13:26:05 2010 +0900 sh: Use uncached I/O helpers in PMB setup. The PMB code is an example of something that spends an absurd amount of time running uncached when only a couple of operations really need to be. This switches over to the shiny new uncached helpers, permitting us to spend far more time running cached. Additionally, MMUCR twiddling is perfectly safe from cached space given that it's paired with a control register barrier, so fix that up, too. Signed-off-by: Paul Mundt commit 2745932495ca3634b11a8662b464d2bf0325ae78 Author: Rafał Miłecki Date: Thu Feb 11 22:16:36 2010 +0000 drm/radeon/kms: accept slightly overclocked power modes Fixes fdo bug #26329 Signed-off-by: Rafał Miłecki Tested-by: Tobias Jakobi Signed-off-by: Dave Airlie commit 5230aea62c0d8f53edcc3e014c3404132afcfeb4 Author: Rafał Miłecki Date: Thu Feb 11 22:58:52 2010 +0100 drm/radeon/kms: isolate audio engine management, change fini order We should stop audio-state-reading timer before we turn off engine Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit b8f7918f332873a79e4c820e90e7a245ce4d3042 Author: Paul Mundt Date: Thu Feb 18 13:23:30 2010 +0900 sh: Provide uncached I/O helpers. There are lots of registers that can only be updated from the uncached mapping, so we add some helpers for those cases in order to make it easier to ensure that we only make the jump when it's absolutely necessary. Signed-off-by: Paul Mundt commit 71b10d8762b2a548c4ac2e4461b46d9b205a5c77 Author: Alex Deucher Date: Tue Feb 16 11:28:36 2010 -0500 drm/radeon/r600: fix warnings in CS checker drivers/gpu/drm/radeon/r600_cs.c: In function ‘r600_cs_track_check’: drivers/gpu/drm/radeon/r600_cs.c:166: warning: ‘bpe’ may be used uninitialized in this function drivers/gpu/drm/radeon/r600_cs.c:166: note: ‘bpe’ was declared here drivers/gpu/drm/radeon/r600_cs.c: In function ‘r600_cs_parse’: drivers/gpu/drm/radeon/r600_cs.c:938: warning: ‘bpe’ may be used uninitialized in this function drivers/gpu/drm/radeon/r600_cs.c:938: note: ‘bpe’ was declared here Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e98efaf303ccbff11522a054d155593d7f2bb41f Author: Anton Vorontsov Date: Sat Feb 6 00:06:26 2010 +0300 powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards This patch adds NOR Flash, LEDs and PIB support for MPC8568E-MDS boards. Plus, move bcsr node into localbus node, and add bcsr5 gpio-controller node. Some platform code modifications were also needed. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 32a6275f3076c9e511ea68869ed6b76c58128253 Author: Martyn Welch Date: Mon Jan 11 12:23:56 2010 +0000 powerpc/86xx: Enable VME driver on the GE SBC610 Enable the VME driver (which is currently in staging) on the SBC610. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit f987d82b807aa8f4d775e80287f3a5a85c55c1ba Author: Martyn Welch Date: Mon Jan 11 12:23:50 2010 +0000 powerpc/86xx: Enable VME driver on the GE PPC9A Enable the VME driver (which is currently in staging) on the PPC9A Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 41cbdeef37b6614f6bac4e3953dd2c7208bbe1d0 Author: Malcolm Crossley Date: Mon Jan 11 12:23:44 2010 +0000 powerpc/86xx: Add MSI section to GE PPC9A DTS Add the MSI section to the DTS file for the GE PPC9A. Signed-off-by: Malcolm Crossley Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 26216e3e15ed8257e582966989f5da3bdbdfa135 Author: Martyn Welch Date: Mon Jan 11 12:23:37 2010 +0000 powerpc/86xx: Switch on highmem support on GE SBC610 Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit ae1f7553b9c9ac3762dc91ecb92574bb9fac0b1e Author: Martyn Welch Date: Mon Jan 11 12:23:31 2010 +0000 powerpc/86xx: Basic flash support for GE SBC610 Support for the SBC610 VPX Single Board Computer from GE (PowerPC MPC8641D). This patch adds basic support for the on-board flash. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 1b7e0677fb1513605df327ae2987d17e0b2ae3ea Author: Kuninori Morimoto Date: Wed Feb 17 09:30:14 2010 +0000 ARM: mach-shmobile: SMSC 9220 support for AP4EVB. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b789b3fdccc1690826331f4c878b644c3904ca6b Author: Kuninori Morimoto Date: Wed Feb 17 09:39:10 2010 +0000 ARM: mach-shmobile: Add sh7372 pinmux support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6459ba984a57e90326b3eaf7a35cc2f3fffe26a0 Author: Malcolm Crossley Date: Mon Jan 11 12:23:24 2010 +0000 powerpc/86xx: Add MSI section to GE SBC610 DTS Add the MSI section to the DTS file for the GE SBC610. Signed-off-by: Malcolm Crossley Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 9b952a3970c75bd0b46f73976b3613b3c68476f4 Author: Malcolm Crossley Date: Mon Jan 11 12:23:18 2010 +0000 powerpc/86xx: Fix GE SBC310 XMC site support Correction to interrupt map mask for GE SBC310 XMC site and addition of alias. Signed-off-by: Malcolm Crossley Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit f5d570d32c836c108c4e64c285d5bdb75cc6a737 Author: Martyn Welch Date: Mon Jan 11 12:23:12 2010 +0000 powerpc/86xx: Add MSI section to GE SBC310 DTS Add the MSI section to the DTS file for the GE SBC310. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 51adc548cb0b2441ee9d4c428a84b77021f4d3fa Author: Sebastian Andrzej Siewior Date: Fri Jan 15 17:41:35 2010 +0100 powerpc/fsl-booke: replace a hardcoded constant 24 is offset between the opcode past bl and past rfi. This makes it more obvious. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 6457d26bd40077238799e31df2b800bcf4ef9177 Author: Stephen Hemminger Date: Wed Feb 17 18:48:44 2010 -0800 IPv6: convert mc_lock to spinlock Only used for writing, so convert to spinlock Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dfa1a041094f4a6e5845a19a1b10e317676722e7 Author: Joe Perches Date: Wed Feb 17 18:48:11 2010 -0800 drivers/net/tehuti.c: Reapply use DEFINE_PCI_DEVICE_TABLE() Commit 865a21a5e3d1b384c559a44c898fcad93e187b82 overwrote commit a3aa18842a5303fc28fcc4d57dbd16618bd830a0 Fix it. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit acbbf1f1fd63391eeba70fec991568e4334c80d4 Author: Joe Perches Date: Wed Feb 17 15:02:02 2010 +0000 drivers/net/yellowfin.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Convert formats like %8.8 to %08 Remove periods from formats Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f1f6baf8f1df29be38003089787e378567ce0086 Author: H. Peter Anvin Date: Wed Feb 17 18:32:06 2010 -0800 x86, setup: When restoring the screen, update boot_params.screen_info When we restore the screen content after a mode change, we return the cursor to its former position. However, we need to also update boot_params.screen_info accordingly, so that the decompression code knows where on the screen the cursor is. Just in case the video BIOS does something extra screwy, read the cursor position back from the BIOS instead of relying on it doing the right thing. While we're at it, make sure we cap the cursor position to the new screen coordinates. Reported-by: Wim Osterholt Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 Signed-off-by: H. Peter Anvin commit ada1db5c6fac4d400ec284729af19b47488b332d Author: Joe Perches Date: Wed Feb 17 15:01:59 2010 +0000 drivers/net/sky2.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 67777f9bf255d7561375500a4e117bdb08a883db Author: Joe Perches Date: Wed Feb 17 15:01:58 2010 +0000 drivers/net/skge.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Checkpatch cleaning Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f15063cdd6bd541b4f35cec7e9a6c96f3c644c8d Author: Joe Perches Date: Wed Feb 17 15:01:57 2010 +0000 drivers/net/skge.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9cd31f078ee8b8dd68bbb39680b5c9a51f85f1ea Author: Joe Perches Date: Wed Feb 17 15:01:55 2010 +0000 drivers/net/pci-skeleton.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Checkpatch cleaning Convert formats like 0x%08x to %#08x Remove periods from formats Coalesce long formats Use print_hex_dump Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ddf79b20eefd27797ce461411679a48e998701ca Author: Joe Perches Date: Wed Feb 17 15:01:54 2010 +0000 drivers/net/cnic.c: Use (pr|netdev)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Remove periods from formats Coalesce long formats Use __func__ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 436d27d1db147713e4cd17b2fa491d22374bda98 Author: Joe Perches Date: Wed Feb 17 15:01:53 2010 +0000 drivers/net/cassini.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Remove periods from formats Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 7995c64e5b56ec7fe6032e5fc586f726cde2152b Author: Joe Perches Date: Wed Feb 17 15:01:52 2010 +0000 drivers/net/bnx2x: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Convert struct bnx2x member msglevel to msg_enable for netif_msg_ macros Remove #define PFX Use pr_ Use netdev_ Use netif_ Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 3a9c6a4915e584663aebdb9016bcb9d3897dd779 Author: Joe Perches Date: Wed Feb 17 15:01:51 2010 +0000 drivers/net/bnx2.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Remove periods from formats Coalesce long formats Coalesce some printks Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 2fc96fff4483971aa81795382c368ea7d8100dde Author: Joe Perches Date: Wed Feb 17 15:01:50 2010 +0000 drivers/net/b44.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Remove periods from formats Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 497159aff6c81b61fe88463a64e7dad6f86297e3 Author: Joe Perches Date: Wed Feb 17 15:01:49 2010 +0000 drivers/net/8139too.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Convert formats like %8.8 to %08 Remove periods from formats Coalesce long formats Use print_hex_dump Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b4f18b3faccae13c0530ae8f7f20fe81d18f2bd5 Author: Joe Perches Date: Wed Feb 17 15:01:48 2010 +0000 drivers/net/8139cp.c: Use (pr|netdev|netif)_ macro helpers Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove #define PFX Use pr_ Use netdev_ Use netif_ Remove periods from formats Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 2b633e3fac5efada088b57d31e65401f22bcc18f Author: Yinghai Lu Date: Wed Feb 10 01:20:37 2010 -0800 smp: Use nr_cpus= to set nr_cpu_ids early On x86, before prefill_possible_map(), nr_cpu_ids will be NR_CPUS aka CONFIG_NR_CPUS. Add nr_cpus= to set nr_cpu_ids. so we can simulate cpus <=8 are installed on normal config. -v2: accordging to Christoph, acpi_numa_init should use nr_cpu_ids in stead of NR_CPUS. -v3: add doc in kernel-parameters.txt according to Andrew. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-34-git-send-email-yinghai@kernel.org> Acked-by: Linus Torvalds Signed-off-by: H. Peter Anvin Cc: Tony Luck commit 6738762d73a237ec322b04d8b9d55c8fd5d84713 Author: Yinghai Lu Date: Wed Feb 10 01:20:36 2010 -0800 x86, irq: Remove arch_probe_nr_irqs So keep nr_irqs == NR_IRQS. With radix trees is matters less. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-33-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit be7ce5307ded2e416224baab0bd1e5072591f33f Author: Matt Carlson Date: Wed Feb 17 15:17:05 2010 +0000 tg3: Update version to 3.108 This patch updates the tg3 version to 3.108. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 6a443a0f72ad7706345412dbd2e4d4981fdfce39 Author: Matt Carlson Date: Wed Feb 17 15:17:04 2010 +0000 tg3: Push phylib definitions to phylib This patch pushes phylib definitions out to phylib headers. For phy IDs, this removes some code duplication. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 79eb6904361fe4e54e589919a9b62c5e036c42c3 Author: Matt Carlson Date: Wed Feb 17 15:17:03 2010 +0000 tg3: Rename tg3 phy ID preprocessor definitions The phylib presents the phy ID in a different format than the one tg3 has traditionally used. To highlight the distinction, this patch prepends the tg3 native phy ID format with TG3. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 24daf2b0a4005f3a4e757752fcfed9da276cf202 Author: Matt Carlson Date: Wed Feb 17 15:17:02 2010 +0000 tg3: Reformat SSID to phy ID table This patch reformats the SSID to phy ID table, replacing constants with preprocessor definitions. This patch is also prep work for the following patch, which will push line lengths beyond 80 chars. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 9ea4818dd39cc8c6b31c38c9f51d19d5d4ee0be6 Author: Matt Carlson Date: Wed Feb 17 15:17:01 2010 +0000 tg3: Discover phy address once The phy address will not change after it has been identified. Move the discovery code to a location that only gets executed once. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 0d86df808886d4e56c46a9c356dfb81146e3b6d1 Author: Matt Carlson Date: Wed Feb 17 15:17:00 2010 +0000 tg3: Reduce indent level of tg3_rx_prodring_alloc This patch adds an inverted "jumbo ring enable" test and jumps to the exit if it succeeds. The change reduces the indent level of the remaining code making it more readable. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 144170635b543ceadfe6ba907ac496b40795764e Author: Matt Carlson Date: Wed Feb 17 15:16:59 2010 +0000 tg3: Rename TG3_FLG3_RGMII_STD_IBND_DISABLE The STD part of this preprocessor definition is a bit of a misnomer. This flag is a coarse control of the RGMII inband status facilities. This patch renames the definition to be more accurate. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b474eca74cf647df0a7fd56bc975ee4a812741b7 Author: Matt Carlson Date: Wed Feb 17 15:16:58 2010 +0000 tg3: Add more partno entries for fallback path This patch adds 57765 asic partno entries for the path executed if VPD is not present in NVRAM. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 2712168f856e8cd42265e7ef855d64702da20089 Author: Matt Carlson Date: Wed Feb 17 15:16:57 2010 +0000 tg3: Allow phylib flowctrl changes anytime This patch loosens the restriction that the phylib interface must be up and running to change the flow control parameters. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit a4153d401ac440c73e0721db0b6b031e8e6f77d1 Author: Matt Carlson Date: Wed Feb 17 15:16:56 2010 +0000 tg3: Add support for 2 new selfboot formats This patch adds new offsets to the bootcode version extraction code to support NVRAM format versions 4 and 5. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d110114281fad580dd9ce629507d17b123169cff Author: Matt Carlson Date: Wed Feb 17 15:16:55 2010 +0000 tg3: Make 57791 and 57795 10/100 only This patch adds the 57791 and 57795 to the list of devices that only support 10 and 100 Mbps speeds. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 61e800cf949926b3d463ca3cf3025d964872774b Author: Matt Carlson Date: Wed Feb 17 15:16:54 2010 +0000 tg3: Enforce DMA mapping / skb assignment ordering Michael Chan noted that there is nothing in the code that would prevent the compiler from delaying the access of the "mapping" member of the newly arrived packet until much later. If this happened after the skb = NULL assignment, it is possible for the driver to pass a bad dma_addr value to pci_unmap_single(). To enforce this ordering, we need a write memory barrier. The pairing read memory barrier already exists in tg3_rx_prodring_xfer() under the comments starting with "Ensure that updates to the...". Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b5eb78f76ddfa7caf4340cf6893b032f45d8114a Author: Yinghai Lu Date: Wed Feb 10 01:20:35 2010 -0800 sparseirq: Use radix_tree instead of ptrs array Use radix_tree irq_desc_tree instead of irq_desc_ptrs. -v2: according to Eric and cyrill to use radix_tree_lookup_slot and radix_tree_replace_slot Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-32-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 99558f0bbe68cb09799ec38adbaa3f3b2dc7ba63 Author: Yinghai Lu Date: Wed Feb 10 01:20:34 2010 -0800 sparseirq: Change irq_desc_ptrs to static Add replace_irq_desc() instead of poking at the array directly. -v2: remove unneeded boundary check in replace_irq_desc Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-31-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 773e3eb7b81e5ba13b5155dfb3bb75b8ce37f8f9 Author: Yinghai Lu Date: Wed Feb 10 01:20:33 2010 -0800 init: Move radix_tree_init() early Prepare for using radix trees in early_irq_init(). Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-30-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit febcb0c59ac19fef2081a30e371e7af3619b5e91 Author: Yinghai Lu Date: Wed Feb 10 01:20:32 2010 -0800 irq: Remove unnecessary bootmem code mem_init is moved early already. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-29-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit ec0947fa0f3fabdb34422fffa98edadd060e2758 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:27 2010 -0800 omap3: SDRC: add timing data for Numonyx M65KxxxxAM Add timing data for the Numonyx M65KxxxxAM SDRAM chip, used on the IGEP v2 board. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit cddb483a74a39ed0846e6a276c4e5f4b7ac69d9c Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:26 2010 -0800 omap3: Add support for flash on IGEP v2 board This patch adds support for flashes on IGEP v2 boards. For now only OneNAND is supported. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 691de27f3cdb71a3bb41a5b5cf83ed85ab1b9240 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:26 2010 -0800 omap3: Enable DSS2 for IGEP v2 board Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit d0885486d7cc9ec5f72f04719bb91a39521c8971 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:26 2010 -0800 omap3: Add platform init code for EHCI driver on IGEP v2 Add platform init code for EHCI driver on IGEP v2 Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 28e0f13cd1be5452f795bea6f68657a702000e69 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:26 2010 -0800 omap3: Fix typo on IGEP v2 board Fix typo on IGEP v2 board Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 7f5f23da82c67c8c3786f3615438a22f5d8ac053 Author: Enric Balletbo i Serra Date: Wed Feb 17 14:09:25 2010 -0800 omap3: Add platform data for the twl4030_codec MFD on IGEP v2 Add platform data for the twl4030_codec MFD on IGEP v2 Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 3cca088d07aae6c437b9f4c3b4f3c42dbfd2bb18 Author: Grazvydas Ignotas Date: Wed Feb 17 14:09:25 2010 -0800 omap3: pandora: update defconfig Enable DSS2 and update defconfig for current kernel. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit f6873eedd94df20cfb705856a78440a4c176c6b6 Author: Grazvydas Ignotas Date: Wed Feb 17 14:09:25 2010 -0800 omap3: pandora: update regulator setup Update pandora's regulator setup: - add new regulators: VAUX2, VAUX4 and VSIM - add new consumers: ads7846, nub controllers, USB PHY, audio DAC - use dev names instead of struct device pointers Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit 7b097896e4a5b5ea4798db806e63a1138b1b8eb8 Author: Grazvydas Ignotas Date: Wed Feb 17 14:09:24 2010 -0800 OMAP: pandora: add DSS2 support and related regulators This patch adds configuration data for DSS2 and sets up display related regulators. Signed-off-by: Grazvydas Ignotas Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit 87520aae7c46a725835f5761feca0f794e2eff9e Author: Sanjeev Premi Date: Wed Feb 17 14:09:24 2010 -0800 omap3evm: Configure GPIO175 for touchscreen PEN_IRQ GPIO175 is used for PEN_IRQ on the EVM. This patch sets the mux settings for the same. Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit 0621d75698b3a485d7e31e9d964c76885628c015 Author: Sanjeev Premi Date: Wed Feb 17 14:09:24 2010 -0800 omap3evm: Fixes after moving to matrix_keypad The keypad was not working properly after migrating to matrix_keypad. Swapped the row, col fields of the KEY() macro in the keymap definition to get it working again. Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit aa6912d8850a555dccfab21f496e84aab7ededb6 Author: Sanjeev Premi Date: Wed Feb 17 14:09:23 2010 -0800 omap3evm: Add mux settings for keypad This patch sets SYS_NIRQ for keypad input. It also sets the same as a wakeup event from OFF mode. Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit 99405162598176e830d17ae6d4f3d9e070ad900c Author: Michael S. Tsirkin Date: Sun Feb 14 01:01:10 2010 +0000 tun: socket filter support This patch adds Linux Socket Filter support to tun driver. Signed-off-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit 5ff3f073670b544a9c0547cc6fef1f7eed5762ed Author: Michael S. Tsirkin Date: Sun Feb 14 01:01:00 2010 +0000 net: export attach/detach filter routines Export sk_attach_filter/sk_detach_filter routines, so that tun module can use them. Signed-off-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit 305b0160932af0ed67259b4b13c471aed2a86588 Author: Jiri Pirko Date: Wed Feb 17 11:56:45 2010 +0000 chelsio: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0988d26978561d568efed45cc5576d85ea7b609d Author: Jiri Pirko Date: Wed Feb 17 12:27:14 2010 +0000 cxgb3: convert to use netdev_for_each_addr Removed whole t3_rx_mode structure and appropriate helpers cause they are no longer needed. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit e4a474f82ddaaef65433b0b4f5169f2f6cd8ddb0 Author: kirjanov@gmail.com Date: Tue Feb 16 21:54:58 2010 +0000 smsc911x: replace manual phy lookup. Use phy_find_first() function instead of manual lookup. Signed-off-by: Denis Kirjanov Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit e76b69cc0133952c98aa1ad6330cacacd269fd64 Author: Ajit Khaparde Date: Tue Feb 16 20:25:43 2010 +0000 net: bug fix for vlan + gro issue Traffic (tcp) doesnot start on a vlan interface when gro is enabled. Even the tcp handshake was not taking place. This is because, the eth_type_trans call before the netif_receive_skb in napi_gro_finish() resets the skb->dev to napi->dev from the previously set vlan netdev interface. This causes the ip_route_input to drop the incoming packet considering it as a packet coming from a martian source. I could repro this on 2.6.32.7 (stable) and 2.6.33-rc7. With this fix, the traffic starts and the test runs fine on both vlan and non-vlan interfaces. CC: Herbert Xu CC: Patrick McHardy Signed-off-by: Ajit Khaparde Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 1d4bd947c501ea1da81300280fb6aeec2cca9335 Author: kirjanov@gmail.com Date: Tue Feb 16 20:40:11 2010 +0000 mv643xx_eth: fix missing validate_addr hook Fix missing validate_addr hook. Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit d4c41139df6e74c6fff0cbac43e51cab782133be Author: Kristoffer Glembo Date: Mon Feb 15 03:33:44 2010 +0000 net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver Adds device driver for Aeroflex Gaisler 10/100 and 10/100/1G Ethernet MAC IP cores. Signed-off-by: Kristoffer Glembo Signed-off-by: David S. Miller commit b6ca430599ea37843632b0eaa231dea5414dec25 Author: Simon Kagstrom Date: Thu Feb 11 05:39:55 2010 +0000 via-velocity: Enable scatter/gather IO by default Reduces CPU utilization significantly with sendfile for example. Signed-off-by: Simon Kagstrom Signed-off-by: David S. Miller commit 25cca5352712561fba97bd37c495593d641c1d39 Author: Jeff Mahoney Date: Thu Feb 11 10:26:38 2010 +0000 ipg: Remove device claimed by dl2k from pci id table This patch removes D-Link DGE-550T PCI ID (1186:4000) from the ipg driver. The ipg driver is for IP2000-based cards and the DGE-550T is a DL2000-based card. The driver loads and works for a few moments, but once a real workload is applied it stops operating. The ipg driver claimed this ID since it was introduced in 2.6.24 and it's forced many users to blacklist it. The correct driver for this hardware is the dl2k driver, which has been claiming this PCI ID since the 2.4 days. Signed-off-by: Jeff Mahoney Signed-off-by: David S. Miller commit 8e4a0cf79d4645b88dd18ff717ec579e1ac48c80 Author: Kashyap, Desai Date: Wed Feb 17 16:13:04 2010 +0530 [SCSI] raid_class: add raid1e Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 3ed215259f2d8cd937abc833dc76e309173aaa52 Author: Kashyap, Desai Date: Wed Feb 17 16:08:36 2010 +0530 [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes. For RAID volume sas_is_tlr_enabled call will hit BUG at scsi_transport_sas.c:163, since raid volume is not visible to sas transport layer. Now Added check to make sure arg pass in sas_is_tlr_enabled() is not a volume. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 34c2b712992540ca436e97432ffc57c84c8f8c18 Author: Christof Schmitt Date: Wed Feb 17 11:18:59 2010 +0100 [SCSI] zfcp: Introduce header file for qdio structs and inline functions Move the qdio related structs and some helper functions to a new zfcp_qdio.h header file. While doing this, rename the struct zfcp_queue_req to zfcp_qdio_req to adhere to the naming scheme used in zfcp. This allows a better seperation of the qdio code and inlining the helper functions will save some function calls. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 2d8e62bbf7e83facd5701c100f62fbf0df4ee486 Author: Christof Schmitt Date: Wed Feb 17 11:18:58 2010 +0100 [SCSI] zfcp: Replace FC4 constants with information from exchange port The FC4 types are already available from exchange port. Use this for reporting the FC4 types, instead of having the value hardcoded in zfcp. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ab72528a4498251a702fa7693b51b9311b2432f8 Author: Christof Schmitt Date: Wed Feb 17 11:18:57 2010 +0100 [SCSI] zfcp: Move scsi result tracing decision to zfcp_dbf.h Move the decision which trace tag and trace level to use for the scsi result trace to zfcp_dbf.h. zfcp_dbf_scsi_result is already an inline function, so move the trace code there, simplifying the response handling in zfcp_fsf.c. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 615f59e0daaf56e43dcaaf3ea228967d9bc21584 Author: Christof Schmitt Date: Wed Feb 17 11:18:56 2010 +0100 [SCSI] zfcp: Rename sysfs_device attribute to dev in zfcp_unit and zfcp_port Kernel code uses dev as short name for the struct device. Rename the sysfs_device in zfcp_unit and zfcp_port to match this convention. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 5bdecd2248d4af6f3b311b4d8ca7f3f5f83a7191 Author: Christof Schmitt Date: Wed Feb 17 11:18:55 2010 +0100 [SCSI] zfcp: Remove duplicate assignment of req_seq_no zfcp_fsf_req_create assigns the same value twice to req_seq_no. Remove one assignment and move the req_id and seq_no assignments to one place. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit d21e9daa63e009ce5b87bbcaa6d11ce48e07bbbe Author: Christof Schmitt Date: Wed Feb 17 11:18:54 2010 +0100 [SCSI] zfcp: Dont use 0 to indicate invalid LUN in rec trace 0 is a valid value for a LUN. It is slightly confusing to also see 0 in the trace entries relating to adapter and port. Change this to use 0xFFFFFFFFFFFFFFFF in the LUN field when the trace entry does not relate to a LUN or unit. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 22ed130719987d1081831dc1481160b216224ffd Author: Christof Schmitt Date: Wed Feb 17 11:18:53 2010 +0100 [SCSI] zfcp: Fix warnings from smatch The smatch tool from http://repo.or.cz/w/smatch.git warns about this: drivers/s390/scsi/zfcp_scsi.c +64 zfcp_scsi_command_fail(5) warn: variable dereferenced before check 'scpnt->device' drivers/s390/scsi/zfcp_scsi.c +64 zfcp_scsi_command_fail(5) warn: variable dereferenced before check 'scpnt->device->host' drivers/s390/scsi/zfcp_scsi.c +93 zfcp_scsi_queuecommand(23) warn: variable dereferenced before check 'unit' Fix the first two warnings by removing the checks for scpnt->device and -> host: As long as the SCSI command exists, there is also a scsi_device and a Scsi_Host. Fix the last warning by removing the BUG_ON checks in zfcp_scsi_queuecommand, they are leftovers from previous paranoia about wrong pointers between data structures. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 67feeebaa7038129ad58ae0dcece8142186b36a9 Author: Christof Schmitt Date: Wed Feb 17 11:18:52 2010 +0100 [SCSI] zfcp: Remove unused payload field from zfcp_dbf_san_record Remove the unused payload field from the struct zfcp_dbf_san_record, saving some space in the SAN trace. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 452b505c5ada345103bdfdb39dc550df3ffe9eea Author: Christof Schmitt Date: Wed Feb 17 11:18:51 2010 +0100 [SCSI] zfcp: Remove two FIXME comments On a link down, the adapter reopen is not strictly necessary, but it helps flushing pending requests as quickly as possible. Add a comment mentioning this. qdio returning a problem on the response queue is an unlikely event. The recovery mentioned in the comment might resolve it, so implement it. This also has the advantage that it creates an entry in the recovery trace to see if and when this is occurring. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51 Author: Christof Schmitt Date: Wed Feb 17 11:18:50 2010 +0100 [SCSI] zfcp: Move FSF request tracking code to new file Move the code for tracking FSF requests to new file to have this code in one place. The functions for adding and removing requests on the I/O path are already inline. The alloc and free functions are only called once, so it does not hurt to inline them and add them to the same file. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit e60a6d69f1f84c2ef1cc63aefaadfe7ae9f12934 Author: Christof Schmitt Date: Wed Feb 17 11:18:49 2010 +0100 [SCSI] zfcp: Remove function zfcp_reqlist_find_safe Always use the FSF request id as a reference to the FSF request. With this change the function zfcp_reqlist_find_safe is no longer needed and can be removed. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 2c27c9a57c93a0757b9b4b0e7dc1abeaf1db1ce2 Author: Sage Weil Date: Wed Feb 17 15:45:51 2010 -0800 ceph: fix typo in ceph_queue_writeback debug output Signed-off-by: Sage Weil commit cae727db30e9bcbc0256ec3282edce98b4a85433 Author: Robert Love Date: Tue Feb 16 12:16:00 2010 -0800 [SCSI] MAINTAINERS: Adding FCoE information to the MAINTAINERS file. Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f90f50d7c530793c9c705a8f7fa3deb01714f21a Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:55 2010 -0800 [SCSI] fnic: Set fnic driver version Update fnic driver version. Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit c693a71d2556128ef0b5b2440f0b579cd42c425d Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:50 2010 -0800 [SCSI] fnic: lport stats need to be initialized in fnic_probe() Incorrect initialization of lport stats in fnic_probe() causes fnic to crash at bootup and a node hang if fip is enabled and all links are brought up after fnic is loaded. Signed-off-by: Joe Eykholt Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 Author: Mulyadi Santosa Date: Thu Feb 18 01:22:40 2010 +0700 doc: typo - Table 1-2 should refer to "status", not "statm" Fixes a typo in proc.txt documentation. Table 1-2 should refer to "status", not "statm" Signed-off-by: Mulyadi Santosa Signed-off-by: Jiri Kosina commit aaa5e569ca96f5cf70202679a5864e60798b8ef6 Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:44 2010 -0800 [SCSI] fnic: Allow multicast and unicast address registrations for fnic To enable FIP support in fnic, we have to register with hardware to receive FIP solication frames on a well-known multicast address. Before FIP support, the firmware interface allowed multicast address registrations only for enic devices. This is a minor change in fnic to allow the firmware interface to now register mcast addresses for fnic too. Signed-off-by: Brian Uchino Signed-off-by: Herman Lee Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e9ee2cf438066aa02df98db959733e1547432983 Author: Robert Love Date: Tue Feb 16 12:15:39 2010 -0800 [SCSI] fcoe: Only rmmod fcoe.ko if there are no active connections Currently we're gracefully tearing down each active connection when fcoe.ko is removed. We shouldn't allow the user to destroy connections by removing the module. We should force the user to destroy each connection and then the module can be removed. This patch makes it so a refrerence count on the module is taken each time a fcoe_interface is created. The reference count is dropped when the fcoe_interface is destroyed. This makes it so that module_exit() doesn't get called unless all fcoe_interfaces have been destroyed. This patch leaves the removal of interfaces in the module_exit routine so that if the user does a 'rmmod -f' we'll clean everything up before removing the module. The module_put line was put before the out_putdev goto line because we should only be decrementing the reference count if a fcoe_interface is actually destroyed. If we can't find the netdev or the fcoe_interface then it's assumed that something else has destroyed the fcoe_interface and it would have decremented the reference count at that time. Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 03bf7a5af58e07aa13ea61993f5892f733b6f46d Author: Bhanu Prakash Gollapudi Date: Tue Feb 16 12:15:34 2010 -0800 [SCSI] libfcoe: Send port LKA every FIP_VN_KA_PERIOD secs. libfcoe module doesnt send port keep alive every FIP_VN_KA_PERIOD due to improper assignment of timeout value. Update the port_ka_time appropriately by incrementing it by FIP_VN_KA_PERIOD in fcoe_ctlr_timeout(), so that the link_work is scheduled to send the port LKA. Signed-off-by: Bhanu Gollapudi Acked-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 696c1cff5254bb3ac280fbbb639c66e9ff20306e Author: Hugh Daschbach Date: Tue Feb 16 12:15:28 2010 -0800 [SCSI] libfc: Don't assume response request present. Fix NULL pointer dereference crash occurs in fc_lport_bsg_request() for bsg requests that do not contain a response request. Specifically, FC_BSG_HST_ADD_RPORT and FC_BSG_HST_DEL_RPORT bsg requests are not guaranteed to include a response request. Signed-off-by: Hugh Daschbach Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 5b7a381e55d187e50a148b750abf4525cadd3a4f Author: Hugh Daschbach Date: Tue Feb 16 12:15:23 2010 -0800 [SCSI] libfc: Fix e_d_tov ns -> ms scaling factor in PLOGI response. Both PLOGI and RTV response processing conditionally scale e_d_tov, but use different scaling factors. The scaling factor is correct in RTV response processing. Bring PLOGI e_d_tov scaling in line with RTV common service parameter inspection. Signed-off-by: Hugh Daschbach Acked-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit be88d3b26897e3e942f2f36ad3d0ffbe002c0088 Author: Vasu Dev Date: Tue Feb 16 12:15:18 2010 -0800 [SCSI] libfc: call ddp setup for only FCP reads to avoid accessing junk fsp pointer Adds check to call fc_fcp_ddp_setup for only FCP read cmds to avoid accessing junk fsp pointer at least in ESX since non FCP frame had junk fsp value, though fsp is implicitly initialized to null by __alloc_skb but with this patch no more relying on fsp initialized to null value and hitting junk fsp ptr access. Removes fsp pointer checking in fc_fcp_ddp_setup as this is not needed any more since its only caller for FCP read will always have a valid fsp. Reported by: Frank Zhang Reported by: Rob Love Signed-off-by: Vasu Dev Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 5fceef1f357e1b3485363e6e240369fc8cbee173 Author: James Smart Date: Fri Feb 12 14:43:34 2010 -0500 [SCSI] lpfc 8.3.9: Update Driver version to 8.3.9 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 72100cc43262fa39821b3debc04be1a7a17b3428 Author: James Smart Date: Fri Feb 12 14:43:01 2010 -0500 [SCSI] lpfc 8.3.9: Fix locking and memory issues - Use the hbalock when changing the fc_flag. - Use the host_lock when changeing the sli_flag. - Prevent NULL pointer dereference after dma_alloc_coherent failure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 84d1b006978e78e27f22beb5cfbc4d349bac6df7 Author: James Smart Date: Fri Feb 12 14:42:33 2010 -0500 [SCSI] lpfc 8.3.9: Changes to sysfs interface for the lpfc driver. - Convert all sysfs parameters to uint instead of int. - Add lpfc_supress_link_up parameter. - Change link_state to writable sysfs parameter. - Add support to be able to "up" or "down" link from link_state parameter. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 28baac7492fa084dbff6a1b9c4b42ed0d014b558 Author: James Smart Date: Fri Feb 12 14:42:03 2010 -0500 [SCSI] lpfc 8.3.9: SLI enhancments to support new hardware. - Add support for the INTF (Interface) PCI register. - Add support for greater than 2 page SGLs. - Add support for up to 32 bit BDE lengths. - Implement the Port Capabilities Mailbox command. - Stop checking the Minor Code in the EQE structure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ecfd03c6a99ad98fea5cb75ec83cd9945adff8d9 Author: James Smart Date: Fri Feb 12 14:41:27 2010 -0500 [SCSI] lpfc 8.3.9: Discovery changes to the lpfc driver. - Add init_vpi mailbox command before re-registering VPI. - Add Fast FCF failover support. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 1dfb5a47bc76c700969e41cdc2df6d1bf0adeb62 Author: James Smart Date: Fri Feb 12 14:40:50 2010 -0500 [SCSI] lpfc 8.3.9: PCI Changes to lpfc driver - Call pci_save_state() after pci_restore_state() call to cope with kernel change. - Add support for PCI BAR region 0 if BAR0 is a 64 bit register. Signed-off-by: James Smart Signed-off-by: James Bottomley commit efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292 Merge: 3bffb65 c7b6669 Author: Benjamin Herrenschmidt Date: Thu Feb 18 09:34:38 2010 +1100 Merge commit 'jwb/next' into next commit 31e464cdbc11c7872901851f06eff6d67edfcff5 Author: vikram pandita Date: Wed Feb 17 14:09:23 2010 -0800 omap: zoom3: enable ehci support Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy. GPIO_64 is connected to the PHY reset pin. Signed-off-by: Vikram Pandita Cc: Anand Gadiyar Signed-off-by: Tony Lindgren commit 80c20d543d142ee54ec85259b77aaf0b83c32db5 Merge: d6a2d9b b72c7d5 Author: Tony Lindgren Date: Wed Feb 17 14:08:58 2010 -0800 Merge branch 'omap-fixes-for-linus' into omap-for-linus commit a17d6473cc9eb64a5b41c568310aa73824ebaa64 Author: Sage Weil Date: Wed Feb 17 13:56:07 2010 -0800 ceph: v0.19 release Signed-off-by: Sage Weil commit 069c474e88bb7753183f1eadbd7786c27888c8e3 Author: David S. Miller Date: Wed Feb 17 13:41:40 2010 -0800 xfrm: Revert false event eliding commits. As reported by Alexey Dobriyan: -------------------- setkey now takes several seconds to run this simple script and it spits "recv: Resource temporarily unavailable" messages. #!/usr/sbin/setkey -f flush; spdflush; add A B ipcomp 44 -m tunnel -C deflate; add B A ipcomp 45 -m tunnel -C deflate; spdadd A B any -P in ipsec ipcomp/tunnel/192.168.1.2-192.168.1.3/use; spdadd B A any -P out ipsec ipcomp/tunnel/192.168.1.3-192.168.1.2/use; -------------------- Obviously applications want the events even when the table is empty. So we cannot make this behavioral change. Signed-off-by: David S. Miller commit 08326dbe7b5825295ec3711eec53b093549749e5 Author: Riccardo Ghetta Date: Wed Feb 17 09:28:58 2010 +0000 SiS190/191 half-duplex initialization fix Adds half-duplex specific setup code (taken from SiS own GPL driver). Without those, half-duplex connections are very unreliable, often working on small transfers and failing after a while. Signed-off-by: Riccardo Ghetta Signed-off-by: David S. Miller commit 7af3351f71f4b3b5dbccb66cdc9b097052760a7f Author: Ben Hutchings Date: Wed Feb 17 09:26:54 2010 +0000 ethtool: Don't flush n-tuple list from ethtool_reset() The n-tuple list should be flushed if and only if the ETH_RESET_FILTER flag is set and the driver is able to reset filtering/flow direction hardware without also resetting a component whose flag is not set. This test is best left to the driver. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit a07da6df730b1fef933f66c03b0e51d5e7ad5b3e Author: Vladislav Zolotarov Date: Wed Feb 17 02:05:54 2010 +0000 bnx2x: version number and date Updated release version and date: 1.52.1-6 and 2010/02/16 Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3359fced77f6b4ba1c7de9deace1d7dfa7217bbc Author: Vladislav Zolotarov Date: Wed Feb 17 13:35:01 2010 -0800 bnx2x: Use firmware 5.2.13 Switch to the new firmware version (5.2.13). Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2db29fc71b7e6af41aa1fadb67f588846dc461cf Author: Vladislav Zolotarov Date: Wed Feb 17 13:33:02 2010 -0800 bnx2x: FW 5.2.13 New firmware version (5.2.13). Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0c43f43f48c5c60d62c4d26917da3ee71df464ea Author: Vladislav Zolotarov Date: Wed Feb 17 02:04:00 2010 +0000 bnx2x: fix in 57710 self-test Bug fix: Use the last unicast entry in CAM in bnx2x_test_int(). Relevant for 57710 only. Author: Dmitry Kravkov Signed-off-by: Dmitry Kravkov Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d43a7e67ae2f911765b3d5b6cbb85221a9ffd0a4 Author: Vladislav Zolotarov Date: Wed Feb 17 02:03:40 2010 +0000 bnx2x: Do not allow enabling LRO if disable_tpa=1 Bug fix: Do not allow enabling LRO if disable_tpa=1. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit f1e1a199f3a68a32cf86095b3650d761ee8798b9 Author: Vladislav Zolotarov Date: Wed Feb 17 02:03:33 2010 +0000 bnx2x: clean up in case of error in bnx2x_init_hw() Bug fix: clean up MCP state in case of error in bnx2x_init_hw(). Author: Dmitry Kravkov Signed-off-by: Dmitry Kravkov Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 6cbe5065bb367d4c8db0a71d2e828995bcfae336 Author: Vladislav Zolotarov Date: Wed Feb 17 02:03:27 2010 +0000 bnx2x: Properly release allocated MSI-X/MSI vectors Bug fix: Properly release allocated MSI-X/MSI vectors if ifup failed due to lack of memory. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a475f603d23392f386e45cf377b17c30ed3bbb80 Author: Joe Perches Date: Wed Feb 17 10:30:24 2010 +0000 drivers/net/usb: Use netif_ logging facilities Convert from: if (netif_msg_(priv)) dev_(dev... to netif_(priv, foo, dev... Also convert a few: if (i < REG_TIMEOUT) { etc... return ret; } to if (i >= REG_TIMEOUT) goto fail; etc... return ret; Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 60b86755929e1a7e9038c8d860a8491cfdf8d93a Author: Joe Perches Date: Wed Feb 17 10:30:23 2010 +0000 usbnet: Convert dev(dbg|err|warn|info) macros to netdev_ These macros are too similar to the dev_ equivalents but take a usbnet * argument. Convert them to the recently introduced netdev_ macros and remove the old macros. The old macros had "\n" appended to the format string. Add the "\n" to the converted uses. Some existing uses of the dev macros in cdc_eem.c probably mistakenly had trailing "\n". No "\n" added there. Fix net1080 this/other log message inversion. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 82456b031e3c3b5bf95a7e49bd9b68b146446e76 Author: Sathya Perla Date: Wed Feb 17 01:35:37 2010 +0000 be2net: implement pci shutdown handler Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 89420424fce28769c338909393518087befe8b37 Author: Sathya Perla Date: Wed Feb 17 01:35:26 2010 +0000 be2net: fix rx-path to ignore a flush completion The flush compl (compl with numfrags == 0; no data) is rcvd from hw to indicate completion of RXQ destory operation. Fix the RX path to not process it as RX data. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 7a1e9b2059d147461cff3dfbabbfb43f296a1eef Author: Sathya Perla Date: Wed Feb 17 01:35:11 2010 +0000 be2net: don't rearm mcc cq when device is not open When an MCC cmd is issued (via a netdev/ethtool op) while the device is not open, the MCC CQ gets processed but the EQ is not processed (as isr is not registered.) This can cause the EQ to become full. So, while the device is not open, CQ must not be re-armed to prevent EQ entries. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit a058a632747dd0f1799b12f4ecd54e43f5b5f10d Author: Sathya Perla Date: Wed Feb 17 01:34:22 2010 +0000 be2net: a mini optimization in rx_compl_process() code Introduce unlikely() for skb alloc failure and vlanf checks... Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit aa13bd6ef4ddd81080f972220fae30eb28f65b17 Author: Ron Mercer Date: Wed Feb 17 06:41:23 2010 +0000 qlge: Fix occasional loopback test failure. On some servers we see the cleaning of the RX queue finish before all the loopback packets are sent out. This delay allows the queues to settle before checking for successful completion. Also, delay completion so link has time to come back up. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 801e9096c566d40d2e7c9903dc902fa01a5a0b36 Author: Ron Mercer Date: Wed Feb 17 06:41:22 2010 +0000 qlge: Fix bonding mac address bug. Use local copy of current mac address when initializing. In bonding testing we saw cases where dev_addr was out of data causing failover errors. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit c0c56955e7325ba2f910c760111457adc21ef0d4 Author: Ron Mercer Date: Wed Feb 17 06:41:21 2010 +0000 qlge: Fix dropping of large non-TCP/UDP frames. This was found with pings that were large enough to span multiple rx buffers. The split frame logic handles this case nicely. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 8ea7a37c5a312bfee51ff7f12f78efe4fbc901cc Author: Steven J. Magnani Date: Wed Feb 17 07:55:07 2010 +0000 ll_temac: Fix MAC address configuration from userland A userland command to set the LLTEMAC MAC address, i.e. "ifconfig eth0 hw addr xx:yy:zz:pp:dd:qq", results in a device address of 00:01:xx:yy:zz:pp. Correct this. Signed-off-by: Steven J. Magnani Signed-off-by: David S. Miller commit c3b7c12cd78d5c8264c87c29dcd9a8f1819f8313 Author: Steven J. Magnani Date: Wed Feb 17 07:14:20 2010 +0000 ll_temac: Add support for V2 LLTEMAC core LLTEMAC V1 cores place only received packet length in the app4 word. V2 cores place additional information in app4. Mask out the additional information when retrieving the packet length. Signed-off-by: Steven J. Magnani Signed-off-by: David S. Miller commit e1d444771e0895c7706bc99857d69e4f2a58a531 Author: Jiri Pirko Date: Wed Feb 17 11:09:31 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit d7b855c2dcc89587f36338bd383203322efb9903 Author: Jiri Pirko Date: Wed Feb 17 10:43:33 2010 +0000 cassini: convert to use netdev_for_each_mc_addr Introduced a new function to do the mc list processing, makes code clearer after transition. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit faf234220fb79a05891477a75180e1d9f7ab4105 Author: Alexey Dobriyan Date: Wed Feb 17 09:34:12 2010 +0000 net: use kasprintf() for socket cache names kasprintf() makes code smaller. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 8a5ce54562f296b1996813a413b0f2307ec9351a Author: Eric Dumazet Date: Wed Feb 17 06:43:47 2010 +0000 xt_hashlimit: fix locking Commit 2eff25c18c3d332d3c4dd98f2ac9b7114e9771b0 (netfilter: xt_hashlimit: fix race condition and simplify locking) added a mutex deadlock : htable_create() is called with hashlimit_mutex already locked Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9f0beba9f90847db7ba6ed894f7c87b6038a5bce Author: Pavel Emelyanov Date: Wed Feb 17 01:19:32 2010 +0000 ipmr: remove useless checks from ipmr_device_event The net being checked there is dev_net(dev) and thus this if is always false. Fits both net and net-next trees. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a77ff709dd30a263f8154b05a8514b46098b42ba Author: Nick Nunley Date: Wed Feb 17 01:06:16 2010 +0000 igb: update tx DMA mapping error handling This updates the tx DMA mapping error handling code to resemble e1000e/ixgbe. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 58fd62f525e1182fbb2f7566aecb4545720d9aad Author: Nick Nunley Date: Wed Feb 17 01:05:56 2010 +0000 igb: change descriptor control thresholds This change simplifies the code by setting RX_PTHRESH to 8 for all devices, as it was unlikely that there was any advantage to set it at 16 for earlier cards. Additionally TX_WTHRESH is set to 1 for the 82576 NIC to improve performance by enabling a minimal amount of write combining when writing back descriptors. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fe0592b4be0ce362e87cefd4f6dbf12cb5704d1b Author: Nick Nunley Date: Wed Feb 17 01:05:35 2010 +0000 igb: use igb_free_q_vectors to cleanup failure in igb_alloc_q_vectors This change makes it so that igb_free_q_vectors is reused in igb_alloc_q_vectors to handle the cleanup instead of unwinding through the allocations. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d3eeb62ddd06ea20a054213cface92d328709285 Author: Nick Nunley Date: Wed Feb 17 01:05:15 2010 +0000 igb: remove unused vmolr value In an earlier version of igb_write_mc_addr_list() the vmolr register was modified. This register is no longer accessed, although the variable still exists. This patch removes it from the function. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 91d4ee3382e78bd78e0251a56e2fa96b20c26e30 Author: Nick Nunley Date: Wed Feb 17 01:04:56 2010 +0000 igb: minor type cleanups This change cleans up some instances where unsigned int and u32 were being used interchangeably, and cleans up hdr_len which was being set to 0 twice. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 40e90c26f573fa5082be6e046b346e19ab0cd25f Author: Nick Nunley Date: Wed Feb 17 01:04:37 2010 +0000 igb: move gso_segs into buffer_info structure This change moves gso_segs into the buffer_info structure to avoid a possible cache line miss in clean_tx_irq. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 717ba0893508c2c8706c1408c152aa6d286d5d80 Author: Nick Nunley Date: Wed Feb 17 01:04:18 2010 +0000 igb: inline igb_maybe_stop_tx igb_maybe_stop_tx() is extremely small and appears in several spots in the tx hotpath. This change inlines the function for a possible performance boost. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 43915c7c9a99e38406103d9c72b73edeaa19d0ff Author: Nick Nunley Date: Wed Feb 17 01:03:58 2010 +0000 igb: only read phy specific stats if in internal phy mode There are a couple statistics registers that are not meant to be read when in SGMII/serdes mode. This patch adds a check to verify mode before reading and updating these statistics. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e6bdb6fefc590ad2fb5f79e1d1d3660afbc7c8ff Author: Nick Nunley Date: Wed Feb 17 01:03:38 2010 +0000 igb: only support SRRCTL_DROP_EN when using multiple queues The SRRCTL.DROP_EN bit should only be set when we are supporting multiple queues. This bit is meant to prevent head of line blocking and is unnecessary in the single queue case. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit abe1c3638ccf8b68536afb52b111f6ad46d1cf71 Author: Nick Nunley Date: Wed Feb 17 01:03:19 2010 +0000 igb: cap interrupts at 20K per queue when in itr mode 3 In order to maintain similar performance between MSI-X and legacy/MSI interrupts, this patch reduces the number of interrupts when receiving small packets to 20K when in interrupt throttle rate mode 3. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2d0b0f693578109aff347e055d47f2797c802261 Author: Nick Nunley Date: Wed Feb 17 01:02:59 2010 +0000 igb: remove adaptive IFS from driver Adaptive IFS support has been included in the igb driver since its initial release, but it is not a feature on any igb NICs. This patch removes it from the driver. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3025a446b6d0255ae4399ca5f9b259bd1b51539e Author: Alexander Duyck Date: Wed Feb 17 01:02:39 2010 +0000 igb: Allocate rings seperately instead of as a block This change makes it so that the rings are allocated seperately. As a result we can allocate them on seperate nodes at some point in the future if we so desire. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b94f2d775a71ed09dc8ca2bf24c611bdce9e82e7 Author: Nick Nunley Date: Wed Feb 17 01:02:19 2010 +0000 igb: call pci_save_state after pci_restore_state This patch adds calls to pci_save_state() immediately after calls to pci_restore_state(). Due to a change in the behavior of pci_restore_state() it is necessary to call pci_save_state() to keep the state_saved flag. This patch is based on a similar patch for ixgbe. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 88a268c1a11a2e94b7c55a8cfe97892d845887c8 Author: Nick Nunley Date: Wed Feb 17 01:01:59 2010 +0000 igb: Power down link when interface is down This changes the behavior of the driver to power down the link when the associated interface is down, unless management is enabled. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 53c992fa8497286f24f279ebec5a8c7a58d4e68c Author: Nick Nunley Date: Wed Feb 17 01:01:40 2010 +0000 igb: ignore EEPROM APME check when shutting down serdes link Checking the EEPROM APME state unnecessarily prevents the link from shutting down. The standard power down routines should be sufficient to determine whether the serdes link can power down when going into D3. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3145535ac6e4769e587a38a67d888a10f24a7af9 Author: Nick Nunley Date: Wed Feb 17 01:01:21 2010 +0000 igb: Report link status in ethtool when interface is down With this change ethtool will correctly report link status when the interface is down. Currently ethtool reports the link as not detected when the interface is down. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 22939f0606e515799d83e1a29250917f94c8d07b Author: Nick Nunley Date: Wed Feb 17 01:01:01 2010 +0000 igb: add support for wake-on-link This adds support for wake-on-link/phy activity to the ethtool interface. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 26b39276ca5ff4dbf3c07704e34fd820fd97decf Author: Alexander Duyck Date: Wed Feb 17 01:00:41 2010 +0000 igb: remove unecessary q_vector declarations and remove itr_shift This change removes the use of itr_shift since a mac type call can be used just as easily to identify the only HW that needs to have the itr shifted. In addition it removes two unecessary declarations of a q_vector pointer from the initialization path. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f98c96b0b6572b5491e954148509b20f08f31491 Author: Jayamohan Kallickal Date: Thu Feb 11 05:11:15 2010 +0530 [SCSI] be2iscsi: Adding support for BE3 This patch contains changes to support the BE3 chip Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit b3925514f6f6878e3f671fb6990874e731a26d02 Author: Mike Christie Date: Wed Feb 10 16:51:48 2010 -0600 [SCSI] qla4xxx: fix compile warning due to invalid extHwConfig If the nvram is invalid qla4xxx tries to set Asuint32_t based on the card type. If the card type is not listed then Asuint32_t is going to be gargabe. This just fixes that if/elseif by adding a else to catch the case for new hardware that might not be listed yet. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b64e77f70b8c11766e967e3485331a9e6ef01390 Author: Mike Christie Date: Wed Feb 10 16:51:47 2010 -0600 [SCSI] iscsi_tcp: wake xmit thread when killing session If the connection is bad, then the xmit thread could end up waiting a long time (up to sendtmeo seconds) in tcp_sendpage. This patch has us set the sk_error and wake up the xmit thread so we can quickly fail. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 9f9127fd0cfac1ccbcf4a9456b3d36bc6971355e Author: Mike Christie Date: Wed Feb 10 16:51:46 2010 -0600 [SCSI] bnx2i: set change_queue_depth function No reason that we cannot set the change_queue_depth function for bnx2i. We just forgot to when the driver was created. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 92ed4d69934a1281abcc10c6a82274a04651a260 Author: Mike Christie Date: Wed Feb 10 16:51:45 2010 -0600 [SCSI] libiscsi: reset cmd timer if cmds are making progress This patch resets the cmd timer if cmds started before the timedout command are making progress. The idea is that the cmd probably timed out because we are trying to exeucte too many commands. If it turns out that the device the IO timedout on was bad or the cmd just got screwed up but other IO/devs were ok then we will will figure this out when the cmds ahead of the timed out one complete ok. This also fixes a bug where we were sort of detecting this by setting the last_timeout and last_xfer to the same value when the task was allocated. That caught the case where we never got to send any IO for it. However, if the problem had started right before we started the new task, then we were forced to wait an extra cmd timeout seconds to start the scsi eh. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 9010b94636312c7fb12b591ef09e915f8f80bbd5 Author: Mike Christie Date: Wed Feb 10 16:51:44 2010 -0600 [SCSI] cxgb3i: check for setup netdev If the netdev has not been setup when the host is, we will oops when the iscsi layer calls into the driver and a it tries to reference the netdev in hba->ndev. This can happen if the iscsi driver is loaded before ifup is done. This patch just adds a check, so we can gracefully fail the operation. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d9573e7af16de0e3aa55db1703dbe544faf391de Author: Joe Perches Date: Wed Feb 10 16:51:43 2010 -0600 [SCSI] cxgb3i, bnx2i: remove uses of nipquad use %pi4 Remove uses of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 81fc03909a80bead8f553287a2b749a1d29dca64 Author: Catalin Marinas Date: Mon Feb 8 11:16:24 2010 +0000 kmemcheck: Test the full object in kmemcheck_is_obj_initialized() This is a fix for bug #14845 (bugzilla.kernel.org). The update_checksum() function in mm/kmemleak.c calls kmemcheck_is_obj_initialised() before scanning an object. When KMEMCHECK_PARTIAL_OK is enabled, this function returns true. However, the crc32_le() reads smaller intervals (32-bit) for which kmemleak_is_obj_initialised() may be false leading to a kmemcheck warning. Note that kmemcheck_is_obj_initialized() is currently only used by kmemleak before scanning a memory location. Signed-off-by: Catalin Marinas Cc: Andrew Morton Cc: Christian Casteyde Cc: Vegard Nossum Signed-off-by: Pekka Enberg commit 03cb3829e0e5650518ce37e2b4420a35e034dc9e Author: Michael Reed Date: Wed Feb 10 14:32:00 2010 -0600 [SCSI] fusion: hold off error recovery while alternate ioc is initializing After discussing this patch with LSI, I resubmitting with a recommended 40 second wait for the alternate ioc's initialization to complete. -- Fusion FC chips are two function with some shared resources. During initialization of one function its driver inhibits the ability of the other function's driver to allocate message frames by clearing its "active" flag. Should mid-layer error recovery be initiated for a scsi command during this initialization (which can take up to 40 seconds) error recovery will escalate to the level of host reset. This host reset might fail (as the other function is resetting) resulting in all connected targets being taken offline. This patch holds off mid-layer error recovery for up to 40 seconds to permit initialization of the other function to complete. Signed-off-by: Michael Reed Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley commit 4b5aa7cff0e2bd1a9c81b59553ba8ecfa3aa7e1b Author: Stephen M. Cameron Date: Thu Feb 4 08:43:57 2010 -0600 [SCSI] hpsa: update driver version to 2.0.1-3 Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 71fe75a705aa4eabda23334095c382ad8c48f2d1 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:51 2010 -0600 [SCSI] hpsa: Reorder compat ioctl functions to eliminate some forward declarations. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e39eeaed1f75fcd46783aad34cb9ab8a6046bb01 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:46 2010 -0600 [SCSI] hpsa: eliminate lock_kernel in compat_ioctl The use of the big kernel lock here appears to be ancient cruft that is no longer needed. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 2a8ccf3187aff6defed72f7d8fa562ff2f69ef2a Author: Stephen M. Cameron Date: Thu Feb 4 08:43:41 2010 -0600 [SCSI] hpsa: fix bug in adjust_hpsa_scsi_table fix bug in adjust_hpsa_scsi_table which caused devices which have changed size, etc. to do the wrong thing. The problem was as follows: The driver maintains its current idea of what devices are present in the h->dev[] array. When it updates this array, it scans the hardware, and produces a new list of devices, call it sd[], for scsi devices. Then, it compares each item in h->dev[] vs. sd[], and any items which are not present sd it removes from h->dev[], and any items present in sd[], but different, it modifies in h->dev[]. Then, it looks for items in sd[] which are not present in h->dev[], and adds those items into h->dev[]. All the while, it keeps track of what items were added and removed to/from h->dev[]. Finally, it updates the SCSI mid-layer by removing and adding the same devices it removed and added to/from h->dev[]. (modified devices count as a remove then add.) originally, when a "changed" device was discovered, it was removed then added to h->dev[]. The item was added to the *end* of h->dev[]. And, the item was removed from sd[] as well (nulled out). As it processed h->dev[], these newly added items at the end of the list were encountered, and sd[] was searched, but those items were nulled out. So they ended up getting removed immediately after they were added. The solution is to have a way to replace items in the h->dev[] array instead of doing a remove + add. Then the "changed" items. are not encountered a second time, and removed. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 23231048309ea8eed0189f1eb8f870f08703cac0 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:36 2010 -0600 [SCSI] hpsa: Fix hpsa_find_scsi_entry so that it doesn't try to dereference NULL pointers Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit c7f172dca210bbd105aee02353c6b385c774caac Author: Stephen M. Cameron Date: Thu Feb 4 08:43:31 2010 -0600 [SCSI] hpsa: clarify obscure comment in adjust_hpsa_scsi_table Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 807be732f928c75b3dfb4273fe5f61b34f05df86 Author: Mike Miller Date: Thu Feb 4 08:43:26 2010 -0600 [SCSI] hpsa: print all the bytes of the CDB, not just the first one. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit d416b0c75fc52e1ac840e6c8c1857ac52d1d7132 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:21 2010 -0600 [SCSI] hpsa: when resetting devices, print out which device Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a08a8471b7aed3d50df8e9c852dc2baa08ec8b01 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:16 2010 -0600 [SCSI] hpsa: use scan_start and scan_finished entry points for scanning use scan_start and scan_finished entry points for scanning and route the CCISS_REGNEWD ioctl and sysfs triggering of same functionality through hpsa_scan_start. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a23513e8413e02b7e34e96a03d6bfd1c1948ac00 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:11 2010 -0600 [SCSI] hpsa: Add an shost_to_hba helper function. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 01fb21870d96c83ae01072674e380ac51ebc58c8 Author: Matt Gates Date: Thu Feb 4 08:43:05 2010 -0600 [SCSI] hpsa: Don't return DID_NO_CONNECT when a device is merely not ready Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 1d3b36090551a31b8b8c4ba972aac95eaa8f77dd Author: Matt Gates Date: Thu Feb 4 08:43:00 2010 -0600 [SCSI] hpsa: Retry commands completing with a sense key of ABORTED_COMMAND Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5f0325ab280e92c023a5610dae4a6afb6c1ef151 Author: Matt Gates Date: Thu Feb 4 08:42:55 2010 -0600 [SCSI] hpsa: Return DID_RESET for commands which complete with status of UNSOLICITED ABORT The commands should be retried, and this will make that happen, instead of resulting in an i/o error. Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 339b2b14c634da58626eb742370d915591c2fb6d Author: Stephen M. Cameron Date: Thu Feb 4 08:42:50 2010 -0600 [SCSI] hpsa: Fix p1210m LUN assignment. The p1210m responsds to SCSI report LUNs, unlike traditional Smart Array controllers. This means that the bus, target, and lun assignments done by the driver cannot be arbitrary, but must match what SCSI REPORT LUNS returns. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit f8b01eb9049113920f4eb2f944a0c713ce597673 Author: Mike Miller Date: Thu Feb 4 08:42:45 2010 -0600 [SCSI] hpsa: add pci ids for storageworks 1210m, remove p400, p800, p700m and update pci_ids.h to include new PCI ID for StorageWorks 1210m variant. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 303932fd4ff63e8650d5d5da6cc286a8b5f8318d Author: Don Brace Date: Thu Feb 4 08:42:40 2010 -0600 [SCSI] hpsa: Allow multiple command completions per interrupt. This is done by adding support for the so-called "performant mode" (that's really what they called it). Smart Array controllers have a mode which enables multiple command completions to be delivered with a single interrupt, "performant" mode. We want to use that mode, as some newer controllers will be requiring this mode. Signed-off-by: Don Brace Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: James Bottomley commit 900c54404a9456b3ff10745e5e8f64b12c3a6ef7 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:35 2010 -0600 [SCSI] hpsa: interrupt pending function should return bool not unsigned long Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 84ca0be2a2cd9730683310b831db9d2fa60b3b0b Author: Stephen M. Cameron Date: Thu Feb 4 08:42:30 2010 -0600 [SCSI] hpsa: fix some debug printks to use dev_dbg instead Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a104c99f386191706a11d39be81b8f03cd4f2719 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:24 2010 -0600 [SCSI] hpsa: make tag macros into functions Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 6df1e95496f8dfe08a520756187be59f7896f589 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:19 2010 -0600 [SCSI] hpsa: eliminate unnecessary memcpys Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a9a44cbd4b41bf4b9535c1eb7f5e942d8b2e9d54 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:14 2010 -0600 [SCSI] hpsa: remove unwanted debug code Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ea6d3bc3143a21ec5e1c9330555b36d67979431d Author: Stephen M. Cameron Date: Thu Feb 4 08:42:09 2010 -0600 [SCSI] hpsa: use kzalloc not kmalloc plus memset Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e89c0ae7babc3e702a9da128b3ac1eb04ed73c2c Author: Stephen M. Cameron Date: Thu Feb 4 08:42:04 2010 -0600 [SCSI] hpsa: use sizeof() not an inline constant in memset. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ecd9aad402765abce04a96b8d1ed15163ca6c8a1 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:59 2010 -0600 [SCSI] hpsa: return proper error codes not minus one. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit bcc4425548ada73475606c9c5d7cfce7eae0eb64 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:54 2010 -0600 [SCSI] hpsa: remove superfluous returns from void functions. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 4967bd3e5caa87da43c251ae32504230259b18c6 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:49 2010 -0600 [SCSI] hpsa: make adjust_hpsa_scsi_table return void. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit b2ed4f79194e06766327ae581b063f8747d94ea9 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:44 2010 -0600 [SCSI] hpsa: Use BUG_ON instead of an if statement. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 82a72c0a12326a56a323093297e2bad29fe6c29d Author: Stephen M. Cameron Date: Thu Feb 4 08:41:38 2010 -0600 [SCSI] hpsa: avoid unwanted promotion from unsigned to signed for raid level index Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 01a02ffcd55b74e3459bb7358140970e126d4731 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:33 2010 -0600 [SCSI] hpsa: Use kernel integer types, not userland ones That is, use u64, u32, u16 and u8 rather than __u64, __u32, __u16 and __u8. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 466dc22409b97343c6b2168094d5f867093a70c2 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:28 2010 -0600 [SCSI] hpsa: fix typo in comments Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 08002af25a7a379780244b94c5d5eedb7c098629 Author: Roel Kluin Date: Fri Jan 29 11:25:19 2010 +0100 [SCSI] qla2xxx: negative error return in qla2x00_change_queue_depth() The *change_queue_depth functions usually return a negative error return. Signed-off-by: Roel Kluin Acked-by: Giridhar Malavali Signed-off-by: James Bottomley commit 63bad45db1d4e8aafe0633c5741c9720641f336a Author: Yang, Bo Date: Sun Dec 6 08:42:28 2009 -0700 [SCSI] megaraid_sas: version and documentation update Signed-off-by Bo Yang Signed-off-by: James Bottomley commit c978684254d11e3768c5a0b2780302fb0cada29c Author: Yang, Bo Date: Sun Dec 6 08:39:25 2009 -0700 [SCSI] megaraid_sas: driver fixed the device update issue driver fixed the device update issue after get the AEN PD delete/ADD and LD add/delete from FW. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit bdc6fb8d69fab7b4b7f70823e3932bd8e4cfd7db Author: Yang, Bo Date: Sun Dec 6 08:30:19 2009 -0700 [SCSI] megaraid_sas: add the logical drive list to driver Driver issue the get ld list to fw to get the logic drive list. Driver will keep the logic drive list for the internal use after driver load. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit 780a3762fb9208748baac5aa9c63a4d4c9287753 Author: Yang, Bo Date: Sun Dec 6 08:24:21 2009 -0700 [SCSI] megaraid_sas: Zero pad_0 in mfi structure Add the pad_0 in mfi frame structure to 0 to fix the context value larger than 32bit value issue. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit 4fc51be8fa7043ff9a1e34fef0e99214373332ac Author: Sage Weil Date: Tue Feb 16 15:55:03 2010 -0800 ceph: use rbtree for pg pools; decode new osdmap format Since we can now create and destroy pg pools, the pool ids will be sparse, and an array no longer makes sense for looking up by pool id. Use an rbtree instead. The OSDMap encoding also no longer has a max pool count (previously used to allocate the array). There is a new pool_max, that is the largest pool id we've ever used, although we don't actually need it in the client. Signed-off-by: Sage Weil commit 9794b146fa7b93f8ab74fb62d67fdefad760769f Author: Sage Weil Date: Tue Feb 16 15:53:32 2010 -0800 ceph: fix memory leak when destroying osdmap with pg_temp mappings Also move _lookup_pg_mapping into a helper. Signed-off-by: Sage Weil commit 7c1332b8cb5b27656cf6ab1f5fe808a8eb8bb2c0 Author: Sage Weil Date: Tue Feb 16 11:39:45 2010 -0800 ceph: fix iterate_caps removal race We need to be able to iterate over all caps on a session with a possibly slow callback on each cap. To allow this, we used to prevent cap reordering while we were iterating. However, we were not safe from races with removal: removing the 'next' cap would make the next pointer from list_for_each_entry_safe be invalid, and cause a lock up or similar badness. Instead, we keep an iterator pointer in the session pointing to the current cap. As before, we avoid reordering. For removal, if the cap isn't the current cap we are iterating over, we are fine. If it is, we clear cap->ci (to mark the cap as pending removal) but leave it in the session list. In iterate_caps, we can safely finish removal and get the next cap pointer. While we're at it, clean up put_cap to not take a cap reservation context, as it was never used. Signed-off-by: Sage Weil commit 85ccce43a3fc15a40ded6ae1603e3f68a17f4d24 Author: Sage Weil Date: Wed Feb 17 10:02:43 2010 -0800 ceph: clean up readdir caps reservation Use a global counter for the minimum number of allocated caps instead of hard coding a check against readdir_max. This takes into account multiple client instances, and avoids examining the superblock mount options when a cap is dropped. Signed-off-by: Sage Weil commit 39c662f60c556908faf861ef0430549b1731b891 Author: Thomas Gleixner Date: Sat Jul 25 19:15:48 2009 +0200 x86: Convert tlbstate_lock to raw_spinlock Signed-off-by: Thomas Gleixner commit b7e56edba4b02f2079042c326a8cd72a44635817 Merge: 13ca0fc b0483e7 Author: Thomas Gleixner Date: Wed Feb 17 18:27:37 2010 +0100 Merge branch 'linus' into x86/mm x86/mm is on 32-rc4 and missing the spinlock namespace changes which are needed for further commits into this topic. Signed-off-by: Thomas Gleixner commit f309cb3e4fe79a68cb2fdedfb8a8a950a2cfe490 Author: Dominik Brodowski Date: Wed Feb 17 14:35:33 2010 +0100 pcmcia: allow for extension of resource interval If a new interval overlaps or extends an existing interval in add_interval(), do not fail, but extend the existing interval. Signed-off-by: Dominik Brodowski commit d801c1409ef7d45339cbe8ac9de28ade6ed4699a Author: Dominik Brodowski Date: Wed Feb 17 11:02:22 2010 +0100 pcmcia: remove useless msleep in ds.c As this is the socket thread (pccardd) starting up, we do not have anything to wait for in ds.c. Instead, wait the same amount of time in pccardd to allow userspace to catch up and - possibly - execute pcmcia-socket-startup. Signed-off-by: Dominik Brodowski commit d700518a0e4d17a47321414e5e487ed53f4ae752 Author: Dominik Brodowski Date: Wed Feb 17 18:01:31 2010 +0100 pcmcia: use read_cis_mem return value Signed-off-by: Dominik Brodowski commit a78621bb11fbad32a3ef968c65f9b93858b3341a Author: Dominik Brodowski Date: Sun Jan 24 18:20:22 2010 +0100 pcmcia: handle error in serial_cs config calls Do not ignore the error returned by simple_config() / multi_config(). CC: linux-serial@vger.kernel.org Signed-off-by: Dominik Brodowski commit 7ab24855482fbc47712de46c05726d59cd0748e2 Author: Dominik Brodowski Date: Wed Feb 17 18:00:07 2010 +0100 pcmcia: add locking to pcmcia_{read,write}_cis_mem Signed-off-by: Dominik Brodowski commit 44961a03adbf16d872f0b83ec848d0759516d33f Author: Dominik Brodowski Date: Sun Jan 24 12:11:02 2010 +0100 pcmcia: avoid prod_id memleak Reported-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit c3bfc96ef7366aa996fb8286a36f3333a3b4ff25 Author: Dominik Brodowski Date: Mon Jan 18 08:43:39 2010 +0100 pcmcia: avoid sysfs-related lockup for cardbus In cb_free(), we remove some sysfs files -- other sysfs files might grab ops_mutex, so we cannot hold it while removing sysfs files. This fixes http://lkml.org/lkml/2010/1/17/88 . Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit aa584ca4cdd8db370a524c61fd3ca408303281e9 Author: Dominik Brodowski Date: Sun Jan 24 14:36:59 2010 +0100 pcmcia: use state machine for extended requery The requery callback now also handles the addition of a second pseudo multifunction device. Avoids messing with dev_{g,s}et_drvdata(), and fixes any workqueue <-> skt_mutex deadlock. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit af461fc1875b6ec18e23b5f670af36c4ed35c84e Author: Dominik Brodowski Date: Sun Jan 17 19:30:53 2010 +0100 pcmcia: delay re-scanning and re-querying of PCMCIA bus After a CIS update -- or the finalization of the resource database --, proceed with the re-scanning or re-querying of PCMCIA cards only in a separate thread to avoid deadlocks. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit f971dbd5da4e2fbf756d07b938a9c65a9c75178b Author: Dominik Brodowski Date: Sun Jan 17 18:13:31 2010 +0100 pcmcia: use pccardd to handle eject, insert, suspend and resume requests This avoids any sysfs-related deadlock (or lockdep warning), such as reported at http://lkml.org/lkml/2010/1/17/88 . Reported-by: Ming Lei Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit cfe5d809518eda3d5e2da87c5ccbe8647143573a Author: Dominik Brodowski Date: Sun Jan 17 19:31:45 2010 +0100 pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 3f565232c561fbd9d5e03354aac29b90cb2bc78a Author: Dominik Brodowski Date: Sat Jan 16 13:06:40 2010 +0100 pcmcia: use mutex for dynid lock Even though we weren't calling a blocking function within the dynid spinlock, we do not need a spinlock here but can and should be using a mutex. Reported-by: Jiri Slaby Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 94a819f80297e1f635a7cde4ed5317612e512ba7 Author: Dominik Brodowski Date: Sun Jan 17 18:31:34 2010 +0100 pcmcia: assert locking to struct pcmcia_device Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 3d068261854b00c930df4516cd617900935e7706 Author: Dominik Brodowski Date: Sat Jan 16 09:17:10 2010 +0100 pcmcia: add locking documentation Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 00ce99ff506a17882747a7d6874e3f5206a99043 Author: Dominik Brodowski Date: Sat Jan 16 09:14:11 2010 +0100 pcmcia: simplify locking replace pcmcia_socket->lock and pcmcia_dev_list_lock by using the per-socket "ops_mutex", as we do neither need different locks nor a spinlock here. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 3d3de32fad19e37695e6649136e4cb17f9d46329 Author: Dominik Brodowski Date: Sat Jan 16 08:32:56 2010 +0100 pcmcia: add locking to struct pcmcia_socket->pcmcia_state() Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit e6e4f397e5d0970ee1bb7a5591ac93b37cfa524a Author: Dominik Brodowski Date: Sat Jan 16 01:34:06 2010 +0100 pcmcia: protect s->device_count Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 64d8d46f5f501a19aec4db7ff93faf1b831d05ed Author: Dominik Brodowski Date: Sat Jan 16 01:14:38 2010 +0100 pcmcia: properly lock skt->irq, skt->irq_mask Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 9e86749cff70fca505c7c1a9dc760d193f27a059 Author: Dominik Brodowski Date: Sat Jan 16 00:26:33 2010 +0100 pcmcia: lock ops->set_socket As a side effect, socket_state_t socket; u_int state; u_int suspended_state; are properly protected now. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 8533ee31cdc08fc1f2533e5f21f8e4abf6a57dfc Author: Dominik Brodowski Date: Tue Jan 12 23:52:19 2010 +0100 pcmcia: lock ops->set_io_map() As a side effect, io_window_t io[MAX_IO_WIN]; is explicitely protected now. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 8680c4b3faa298dc768c2a78a94a84d89854eca9 Author: Dominik Brodowski Date: Tue Jan 12 22:05:36 2010 +0100 pcmcia: also lock fake and cache CIS by ops_mutex Specifically, struct list_head cis_cache; size_t fake_cis_len; u8 *fake_cis; are protected. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 6b8e087b86c59c3941e125738d30cf38014089e0 Author: Dominik Brodowski Date: Tue Jan 12 21:42:51 2010 +0100 pcmcia: add locking to set_mem_map() Protect the pccard_operations callback "set_mem_map" by a new mutex ops_mutex. This mutex also protects the following values in struct pcmcia_socket: pccard_mem_map win[] pccard_mem_map cis_mem void __iomem *cis_virt Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit c6958fdb041db6ed77f24e871dd4af5f059d1a2b Author: Wolfram Sang Date: Sat Feb 6 22:09:44 2010 +0100 pcmcia/i82365: fix typos in comments Signed-off-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 0d418dfae81987f09a2c13778318d56abee49529 Author: Uwe Kleine-König Date: Sat Jan 23 21:59:22 2010 +0100 pcmcia/omap_cf: don't redefine SZ_2K This fixes: drivers/pcmcia/omap_cf.c:74:1: warning: "SZ_2K" redefined Since c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM) SZ_2K is defined in arch/arm/include/asm/sizes.h. Signed-off-by: Uwe Kleine-König Signed-off-by: Dominik Brodowski commit 7432a5b6c7e38f5d89e890c6fcc00990006ab997 Author: Uwe Kleine-König Date: Fri Jan 22 20:13:27 2010 +0100 pcmcia/at91_cf: don't redefine SZ_2K This fixes: drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined Since c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM) SZ_2K is defined in arch/arm/include/asm/sizes.h. Signed-off-by: Uwe Kleine-König Acked-by: Andrew Victor Signed-off-by: Dominik Brodowski commit 4aa50bc9c2b2d5ab5c63658e0fadad03a08835cc Author: Uwe Kleine-König Date: Wed Jan 13 12:05:45 2010 +0100 pcmcia/bfin_cf: don't check platform_get_irq's return value against zero platform_get_irq returns -ENXIO on failure, so !irq was probably always true. Better use irq <= 0. Note that a return value of zero is still handled as error even though this could mean irq0. This is a followup to 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0 that changed the return value of platform_get_irq from 0 to -ENXIO on error. Signed-off-by: Uwe Kleine-König Cc: David Vrabel Cc: Greg Kroah-Hartman Cc: Rafael J. Wysocki Signed-off-by: Dominik Brodowski commit 35169529093be3bbef70afd3c4125e35cece7e03 Author: Wolfram Sang Date: Sun Jan 10 09:41:24 2010 +0100 pcmcia/yenta: add module parameter for O2 speedups O2-bridges can do read prefetch and write burst. However, for some combinations of older bridges and cards, this causes problems, so it is disabled for those bridges. Now, as some users know their setup works with the speedups enabled, a new parameter is introduced to the driver. Now, a user can specifically enable or disable these features, while the default is what we have today: detect the bridge and decide accordingly. Fixes Bugzilla entry 15014. Simplify and unify the printouts, fix a whitespace issue while we are here. Signed-off-by: Wolfram Sang Tested-by: frodone@gmail.com [linux@dominikbrodowski.net: whitespace fixes] Signed-off-by: Dominik Brodowski commit 63c9a8b3023e6e276343da56e0f31a98c28ece9b Author: Márton Németh Date: Tue Jan 12 08:56:13 2010 +0100 pcmcia: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Acked-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit c6be9c5ab426693a052e67d7469df19a1c50faf4 Author: H Hartley Sweeten Date: Fri Jan 8 11:30:13 2010 -0700 cm4000_cs.c: Remove unnecessary cast The struct file 'private_data' member is a void *, the cast is not needed. Signed-off-by: H Hartley Sweeten Cc: Harald Welte Signed-off-by: Dominik Brodowski commit 9d9c98e89ee24b7d42f72c4f663c4d644d1c3f81 Author: Michal Marek Date: Thu Jan 7 21:03:11 2010 +0100 pcmcia: fix yenta dependency on PCCARD_NONSTATIC With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] Reported-by: Randy Dunlap Signed-off-by: Michal Marek Acked-by: Randy Dunlap Signed-off-by: Dominik Brodowski commit 3a86e1807a53b7164c4ca2aec538d8a5d15416f1 Author: Dominik Brodowski Date: Wed Jan 6 14:33:15 2010 +0100 pcmcia: do not use resource manager on !PCMCIA If only CardBus cards are used, but not PCMCIA cards, we do not need the extensive resource management functions provided for by rsrc_nonstatic.c (~240K). Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit a3ac9af56c14c366a76fb4916995e57392c7b7d5 Author: Dominik Brodowski Date: Wed Jan 6 14:03:03 2010 +0100 pcmcia: remove remaining rsrc_mgr indirections Move rsrc_mgr indirections only used by the pcmcia module to the pcmcia module. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 6e7b51a733fde86d3be748543215a69da04d5bb7 Author: Dominik Brodowski Date: Wed Jan 6 13:57:43 2010 +0100 pcmcia: move cistpl.c into pcmcia module As PCMCIA is the only real user of CIS access functions, include cistpl.c in the PCMCIA module, not in the PCMCIA & CardBus core module. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b Author: Dominik Brodowski Date: Wed Jan 6 11:19:25 2010 +0100 pcmcia: m8xx_pcmcia.c should use iodyn resource manager The socket driver m8xx_pcmcia.c uses a static memory assignment, but io_offset is set to 0. Therefore, it seems proper to use the iodyn resource manager for this driver, as was previously the case (before commit 80128ff79d282cf71b1819dbca9b8dd47d8ed3e8). CC: Vitaly Bordug CC: Arnd Bergmann CC: Olof Johansson Signed-off-by: Dominik Brodowski commit 6c5f1fed49f96a0600aa9a97ac3faf972c33a341 Author: Mark Brown Date: Wed Feb 17 14:30:44 2010 +0000 ASoC: Make pmdown_time a long Fixes a warning. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e47c796d58a21fc58b00dffb7265bb66de987773 Author: Peter Ujfalusi Date: Wed Feb 17 09:49:54 2010 +0200 ASoC: TWL4030: Use codec defaults for Headset initial configuration Disable the amplifiers for the headset outputs, and do not select routings by default to the headset outputs. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d24720a45ad2928f687c6371482cdfba19b74fc5 Author: Anatolij Gustschin Date: Wed Feb 17 07:33:22 2010 -0700 powerpc/mpc5121: correct DIU compatible property The DIU driver should bind against "fsl,mpc5121-diu" directly. Add this compatible property to the match table and fix DTS and platform code accordingly. Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 85cd7467f3a66800c20815d3fca45d33038b9279 Author: Ernst Schwab Date: Wed Feb 17 07:33:02 2010 -0700 powerpc/of: added documentation for spi chipselects Added devicetree binding documentation for gpios used as chipselect. The code to evaluate these is already present in spi_mpc8xxx.c. Signed-off-by: Ernst Schwab Reviewed-by: Wolfram Sang Signed-off-by: Grant Likely commit 57ab12e418ec4fe24c11788bb1bbdabb29d05679 Author: Jiri Kosina Date: Wed Feb 17 14:25:01 2010 +0100 HID: usbhid: initialize interface pointers early enough Move the initialization of USB interface pointers from _start() over to _probe() callback, which is where it belongs. This fixes case where interface is NULL when parsing of report descriptor fails. LKML-Reference: <20100213135720.603e5f64@neptune.home> Reported-by: Alan Stern Tested-by: Bruno Prémont Signed-off-by: Jiri Kosina commit 7fb3a069bc5d3577409c2ae89f89cd264ff85816 Merge: 291186e 9d3415a Author: Takashi Iwai Date: Wed Feb 17 14:24:46 2010 +0100 Merge branch 'fix/misc' into topic/misc Conflicts: sound/pci/hda/patch_realtek.c commit 9d3415a8cc76ff65c6602a121ac318432c5cd7ba Merge: b721e68 3be522a Author: Takashi Iwai Date: Wed Feb 17 14:22:21 2010 +0100 Merge remote branch 'alsa/fixes' into fix/misc commit 952974ac61f686896bd4134dae106a886a5589f1 Author: Heiko Carstens Date: Fri Feb 12 13:38:40 2010 +0100 s390: Add pt_regs register and stack access API This API is needed for the kprobe-based event tracer. Signed-off-by: Heiko Carstens Reviewed-by: Masami Hiramatsu Cc: Martin Schwidefsky LKML-Reference: <20100212123840.GB27548@osiris.boeblingen.de.ibm.com> Signed-off-by: Frederic Weisbecker commit d53a0d33bc3a50ea0e8dd1680a2e8435770b162a Author: Paul Mundt Date: Wed Feb 17 21:17:02 2010 +0900 sh: PMB locking overhaul. This implements some locking for the PMB code. A high level rwlock is added for dealing with rw accesses on the entry map while a per-entry data structure spinlock is added to deal with the PMB entry changing out from underneath us. Signed-off-by: Paul Mundt commit f850c30c8b426ba1688cb63b1a3e534eed03a138 Author: Heiko Carstens Date: Wed Feb 10 17:25:17 2010 +0100 tracing/kprobes: Make Kconfig dependencies generic KPROBES_EVENT actually depends on the regs and stack access API (b1cf540f) and not on x86. So introduce a new config option which architectures can select if they have the API implemented and switch x86. Signed-off-by: Heiko Carstens Acked-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Martin Schwidefsky LKML-Reference: <20100210162517.GB6933@osiris.boeblingen.de.ibm.com> Signed-off-by: Frederic Weisbecker commit e7b8e675d9c71b868b66f62f725a948047514719 Author: Mike Frysinger Date: Tue Jan 26 04:40:03 2010 -0500 tracing: Unify arch_syscall_addr() implementations Most implementations of arch_syscall_addr() are the same, so create a default version in common code and move the one piece that differs (the syscall table) to asm/syscall.h. New arch ports don't have to waste time copying & pasting this simple function. The s390/sparc versions need to be different, so document why. Signed-off-by: Mike Frysinger Acked-by: David S. Miller Acked-by: Paul Mundt Acked-by: Heiko Carstens Cc: Steven Rostedt LKML-Reference: <1264498803-17278-1-git-send-email-vapier@gentoo.org> Signed-off-by: Frederic Weisbecker commit b721e68bdc5b39c51bf6a1469f8d3663fbe03243 Author: Giuliano Pochini Date: Wed Feb 17 00:57:44 2010 +0100 ALSA: Echoaudio, fix Guru Meditation #00000005.48454C50 This patch fixes a division by zero error in the irq handler. There is a small window between the hw_params() callback and when runtime->frame_bits is set by ALSA middle layer. When another substream is already running, if an interrupt is delivered during that window the irq handler calls pcm_pointer() which does a division by zero. The patch below makes the irq handler skip substreams that are initialized but not started yet. Cc to Clemens Ladisch because he proposed an alternate fix. For more information, please read the original thread in the linux-kernel mailing list: http://lkml.org/lkml/2010/2/2/187 Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 83ab0aa0d5623d823444db82c3b3c34d7ec364ae Author: Thomas Gleixner Date: Wed Feb 17 09:05:48 2010 +0100 sched: Don't use possibly stale sched_class setscheduler() saves task->sched_class outside of the rq->lock held region for a check after the setscheduler changes have become effective. That might result in checking a stale value. rtmutex_setprio() has the same problem, though it is protected by p->pi_lock against setscheduler(), but for correctness sake (and to avoid bad examples) it needs to be fixed as well. Retrieve task->sched_class inside of the rq->lock held region. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Cc: stable@kernel.org commit 0065b96775f1eff167a2c3343a41582e8fab4c6c Author: Paul Mundt Date: Wed Feb 17 18:05:23 2010 +0900 sh: Fix up dynamically created write-through PMB mappings. Write-through PMB mappings still require the cache bit to be set, even if they're to be flagged with a different cache policy and bufferability bit. To reduce some of the confusion surrounding the flag encoding we centralize the cache mask based on the system cache policy while we're at it. Signed-off-by: Paul Mundt commit d7813bc9e8e384f5a293b05c095c799d41af3668 Author: Paul Mundt Date: Wed Feb 17 17:56:38 2010 +0900 sh: Build PMB entry links for existing contiguous multi-page mappings. This plugs in entry sizing support for existing mappings and then builds on top of that for linking together entries that are mapping contiguous areas. This will ultimately permit us to coalesce mappings and promote head pages while reclaiming PMB slots for dynamic remapping. Signed-off-by: Paul Mundt commit 7f978b9bf535cbbd1ae8d9fbdd7c4f60ab38f260 Author: Jiri Kosina Date: Wed Feb 17 09:36:35 2010 +0100 HID: extend mask for BUTTON usage page Now that joystick button usages can expand over 15 buttons, we have to properly mask out the code from hid usage to cover the whole 0xffff available space. Reported-by: Stefan Bader Signed-off-by: Jiri Kosina commit 9874c41cd5e70bfc97bcd52a8b6c98c2a6ba7299 Author: Joe Perches Date: Tue Feb 16 18:40:04 2010 +0000 ipv6.h: reassembly: replace calculated magic number with multiplication On Tue, 2010-02-16 at 16:47 +0100, Patrick McHardy wrote: > Joe Perches wrote: > >> @@ -246,6 +246,8 @@ extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb); > >> int ip6_frag_nqueues(struct net *net); > >> int ip6_frag_mem(struct net *net); > >> > >> +#define IPV6_FRAG_HIGH_THRESH 262144 /* == 256*1024 */ > >> +#define IPV6_FRAG_LOW_THRESH 196608 /* == 192*1024 */ > >> #define IPV6_FRAG_TIMEOUT (60*HZ) /* 60 seconds */ > > > > 196608 isn't a number I want to remember. > > Is this better as: > > > > #define IPV6_FRAG_HIGH_THRESH (256 * 1024) /* 262144 */ > > #define IPV6_FRAG_LOW_THRESH (192 * 1024) /* 196608 */ > > Please send a patch, I'll apply it once these patches are in Dave's > tree. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit dc4c2c31053ba5bf685d273cd62ecca406dddb2d Author: Alexey Dobriyan Date: Fri Feb 12 11:41:39 2010 +0000 net: remove INIT_RCU_HEAD() usage call_rcu() will unconditionally reinitialize RCU head anyway. Signed-off-by: Alexey Dobriyan Acked-by: Paul E. McKenney Signed-off-by: David S. Miller commit f6ca057f1bfe251d944505fc5ba4df3762802539 Author: Jochen Friedrich Date: Fri Feb 12 10:11:54 2010 +0000 b44: Ratelimit timeout error message. Signed-off-by: Jochen Friedrich Signed-off-by: David S. Miller commit 9edef28653a519bf0a48250f36cce96b1736ec4e Author: Paul Mundt Date: Wed Feb 17 16:28:00 2010 +0900 sh: uncached mapping helpers. This adds some helper routines for uncached mapping support. This simplifies some of the cases where we need to check the uncached mapping boundaries in addition to giving us a centralized location for building more complex manipulation on top of. Signed-off-by: Paul Mundt commit 0a832320f1bae6a4169bf683e201378f2437cfc1 Author: Justin P. Mattock Date: Tue Feb 16 15:17:29 2010 -0800 x86: Add iMac9,1 to pci_reboot_dmi_table On the iMac9,1 /sbin/reboot results in a black mangled screen. Adding this DMI entry gets the machine to reboot cleanly as it should. Signed-off-by: Justin P. Mattock LKML-Reference: <1266362249-3337-1-git-send-email-justinmattock@gmail.com> Signed-off-by: H. Peter Anvin Cc: Signed-off-by: Ingo Molnar commit 47d742752df4c1088589d4424840bc761613ab2a Author: Tejun Heo Date: Tue Feb 16 15:21:08 2010 +0000 percpu: add __percpu sparse annotations to net drivers Add __percpu sparse annotations to net drivers. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. Signed-off-by: Tejun Heo Acked-by: David S. Miller Cc: Eric Dumazet Cc: Arnd Bergmann Signed-off-by: David S. Miller commit 7d720c3e4f0c4fc152a6bf17e24244a3c85412d2 Author: Tejun Heo Date: Tue Feb 16 15:20:26 2010 +0000 percpu: add __percpu sparse annotations to net Add __percpu sparse annotations to net. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. The macro and type tricks around snmp stats make things a bit interesting. DEFINE/DECLARE_SNMP_STAT() macros mark the target field as __percpu and SNMP_UPD_PO_STATS() macro is updated accordingly. All snmp_mib_*() users which used to cast the argument to (void **) are updated to cast it to (void __percpu **). Signed-off-by: Tejun Heo Acked-by: David S. Miller Cc: Patrick McHardy Cc: Arnaldo Carvalho de Melo Cc: Vlad Yasevich Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller commit 51becfd96287b3913b13075699433730984e2f4f Author: Paul Mundt Date: Wed Feb 17 15:33:30 2010 +0900 sh: PMB tidying. Some overdue cleanup of the PMB code, killing off unused functionality and duplication sprinkled about the tree. Signed-off-by: Paul Mundt commit 2bb4646fce8d09916b351d1a62f98db7cec6fc41 Merge: 6836b9b b0483e7 Author: David S. Miller Date: Tue Feb 16 22:09:29 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 5ce6e9dbe6805ab8ee67e21936d17f431adc63c6 Author: Sage Weil Date: Mon Feb 15 16:22:28 2010 -0800 ceph: fix authentication races, auth_none oops Call __validate_auth() under monc->mutex, and use helper for initial hello so that the pending_auth flag is set. This fixes possible races in which we have an authentication request (hello or otherwise) pending and send another one. In particular, with auth_none, we _never_ want to call ceph_build_auth() from __validate_auth(), since the ->build_request() method is NULL. Signed-off-by: Sage Weil commit 85ff03f6bfef7d5b59ab3aefd4773f497ffad8a4 Author: Sage Weil Date: Mon Feb 15 14:47:28 2010 -0800 ceph: use rbtree for mon statfs requests An rbtree is lighter weight, particularly given we will generally have very few in-flight statfs requests. Signed-off-by: Sage Weil commit a105f00cf17d711e876b3dc67e15f9a89b7de5a3 Author: Sage Weil Date: Mon Feb 15 14:37:55 2010 -0800 ceph: use rbtree for snap_realms Switch from radix tree to rbtree for snap realms. This is much more appropriate given that realm keys are few and far between. Signed-off-by: Sage Weil commit 44ca18f2682eb1cfbed153849adedb79e3e19790 Author: Sage Weil Date: Mon Feb 15 12:08:46 2010 -0800 ceph: use rbtree for mds requests The rbtree is a more appropriate data structure than a radix_tree. It avoids extra memory usage and simplifies the code. It also fixes a bug where the debugfs 'mdsc' file wasn't including the most recent mds request. Signed-off-by: Sage Weil commit 91e45ce38946a8efa21fefbc65d023ca3c0b434f Author: Sage Weil Date: Mon Feb 15 12:05:09 2010 -0800 ceph: cancel delayed work when closing connection This ensures that if/when we reopen the connection, we can requeue work on the connection immediately, without waiting for an old timer to expire. Queue new delayed work inside con->mutex to avoid any race. This fixes problems with clients failing to reconnect to the MDS due to the client_reconnect message arriving too late (due to waiting for an old delayed work timeout to expire). Signed-off-by: Sage Weil commit e2663ab60de59d20fa33da3528f6d5359f8eb003 Author: Sage Weil Date: Tue Feb 16 22:01:03 2010 -0800 ceph: allow connection to be reopened by fault callback Fix the messenger to allow a ceph_con_open() during the fault callback. Previously the work wasn't getting queued on the connection because the fault path avoids requeued work (normally spurious). Loop on reopening by checking for the OPENING state bit. This fixes OSD reconnects when a TCP connection drops. Signed-off-by: Sage Weil commit 4e45ad5e89128939c671e927f030cb3909fe1d69 Author: Magnus Damm Date: Tue Feb 16 21:50:58 2010 -0800 Input: sh_keysc - enable building on SH-Mobile ARM Update the Kconfig entry for the sh_keysc driver to enable build on SH-Mobile ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit 580e0ad21d6d6f932461d24b47041e3dd499c23f Author: Yinghai Lu Date: Tue Feb 16 18:40:35 2010 -0800 core: Move early_res from arch/x86 to kernel/ This makes the range reservation feature available to other architectures. -v2: add get_max_mapped, max_pfn_mapped only defined in x86... to fix PPC compiling -v3: according to hpa, add CONFIG_HAVE_EARLY_RES -v4: fix typo about EARLY_RES in config Signed-off-by: Yinghai Lu LKML-Reference: <4B7B5723.4070009@kernel.org> Signed-off-by: H. Peter Anvin commit e9cb0a49247ea6b3cd078716bcdcbd5d911e76ac Author: Anatolij Gustschin Date: Tue Feb 16 22:30:04 2010 -0700 powerpc/mpc5121: enable support for more PSC UARTs MPC5121 has 12 PSC devices. Enable UART support for all of them by defining the number of max. PSCs depending on selection of PPC_MPC512x platform support. Signed-off-by: Anatolij Gustschin Acked-by: Greg Kroah-Hartman Signed-off-by: Grant Likely commit 4f35e23eb0d62c5cd8b857933a0b6bd56ebdb010 Author: Anatolij Gustschin Date: Tue Feb 16 22:30:04 2010 -0700 powerpc: doc/dts-bindings: document mpc5121 psc uart dts-bindings Support for MPC5121 PSC UART in the mpc52xx_uart driver added new DTS properties for FSL MPC5121 PSC FIFO Controller. Provide documentation of the new properties and some examples. Signed-off-by: Anatolij Gustschin Acked-by: Greg Kroah-Hartman Signed-off-by: Grant Likely commit 6acc6833510db8f72b5ef343296d97480555fda9 Author: Anatolij Gustschin Date: Tue Feb 16 22:30:03 2010 -0700 serial: mpc52xx_uart: re-enable mpc5121 PSC UART support Currently the support for MPC5121 PSC UART in the mpc52xx_uart driver is broken (only console pre-initialized by the bootloader works). Re-enable it now by providing MPC5121 specific ops for PSCx clock activation, FIFO controller init/uninit and MPC5121 PSC FIFO shared interrupt handling functions. Signed-off-by: John Rigby Signed-off-by: Anatolij Gustschin Acked-by: Greg Kroah-Hartman Signed-off-by: Grant Likely commit 477346ff74f4c2aed50e8a0db96a61069f3e5b80 Author: Dave Airlie Date: Thu Jan 7 17:04:54 2010 +1000 x86-64: Allow fbdev primary video code For some reason the 64-bit tree was doing this differently and I can't see why it would need to. This correct behaviour when you have two GPUs plugged in and 32-bit put the console in one place and 64-bit in another. Signed-off-by: Dave Airlie LKML-Reference: <1262847894-27498-1-git-send-email-airlied@gmail.com> Signed-off-by: H. Peter Anvin commit 7bdda6209f224aa784a036df54b22cb338d2e859 Author: Paul Mundt Date: Wed Feb 17 13:23:00 2010 +0900 sh: Fix up more 64-bit pgprot truncation on SH-X2 TLB. Both the store queue API and the PMB remapping take unsigned long for their pgprot flags, which cuts off the extended protection bits. In the case of the PMB this isn't really a problem since the cache attribute bits that we care about are all in the lower 32-bits, but we do it just to be safe. The store queue remapping on the other hand depends on the extended prot bits for enabling userspace access to the mappings. Signed-off-by: Paul Mundt commit 6836b9bdd98e3b500cd49512484df68f46e14659 Author: jamal Date: Tue Feb 16 02:01:22 2010 +0000 xfrm: avoid spinlock in get_acqseq() used by xfrm user Eric's version fixed it for pfkey. This one is for xfrm user. I thought about amortizing those two get_acqseq()s but it seems reasonable to have two of these sequence spaces for the two different interfaces. cheers, jamal commit d5168d5addbc999c94aacda8f28a4a173756a72b Author: Jamal Hadi Salim Date: Tue Feb 16 06:51:22 2010 -0500 xfrm: avoid spinlock in get_acqseq() used by xfrm user This is in the same spirit as commit 28aecb9d7728dc26bf03ce7925fe622023a83a2a by Eric Dumazet. Use atomic_inc_return() in get_acqseq() to avoid taking a spinlock Signed-off-by: Jamal Hadi Salim Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit e06d41d09f314a1664ad60e46934b0ac131c6fa2 Author: Mike Frysinger Date: Mon Feb 15 14:32:50 2010 +0000 netdev: bfin_mac: drop experimental markings on RMII support The code has been around for a long time now and is known to work on a bunch of different parts/boards. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 838a4a9dcee0cbaeb0943531da00ac44d578f315 Author: Magnus Damm Date: Tue Feb 16 05:19:19 2010 +0000 sh: fix sh7723 SDHI support using INTC force_disable Update the sh7723 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e9125ac0bf78bc19181359a3411d2e2bb757942d Author: Magnus Damm Date: Tue Feb 16 05:17:52 2010 +0000 sh: fix sh7722 SDHI support using INTC force_disable Update the sh7722 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4d2185d93c670902b6e4716b360e2bcb7d2f7b2f Author: Paul Mundt Date: Wed Feb 17 12:37:42 2010 +0900 sh: Use dummy_irq_chip for INTC redirect vectors. Presently there's an ordering issue with the chained handler change which places the set_irq_chip() after set_irq_chained_handler(). This causes a warning to be emitted as the IRQ chip needs to be set first. However, there is the caveat that redirect IRQs can't use the parent IRQ's irq chip as they are just dummy redirects, resulting in intc_enable() blowing up when set_irq_chained_handler() attempts to start up the redirect IRQ. In these cases we can just use dummy_irq_chip directly, as we already extract the parent IRQ and chip from the redirect handler. Signed-off-by: Paul Mundt commit 49f3bfe9334a4cf86079d2ee1d08e674b58862a9 Author: Paul Mundt Date: Wed Feb 17 12:33:22 2010 +0900 sh: Setup boot CPU VBR early to enable early page faults. vmemmap and the vmsplit code amongst others need to be able to take page faults much earlier than trap_init() time, so move this in to the early CPU initialization. VBR setup for secondary CPUs is already handled through start_secondary(), so we only need to do this for the boot CPU. Signed-off-by: Paul Mundt commit 3bffb6529cf10d48a97ac0d6d789986894c25c37 Author: Dave Kleikamp Date: Mon Feb 8 11:51:18 2010 +0000 powerpc/booke: Add support for advanced debug registers powerpc/booke: Add support for advanced debug registers From: Dave Kleikamp Based on patches originally written by Torez Smith. This patch defines context switch and trap related functionality for BookE specific Debug Registers. It adds support to ptrace() for setting and getting BookE related Debug Registers Signed-off-by: Dave Kleikamp Cc: Torez Smith Cc: Benjamin Herrenschmidt Cc: David Gibson Cc: Josh Boyer Cc: Kumar Gala Cc: Sergio Durigan Junior Cc: Thiago Jung Bauermann Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 99396ac105f54fe3584374c7c70a5cb6def766e6 Author: Dave Kleikamp Date: Mon Feb 8 11:53:26 2010 +0000 powerpc/booke: Add definitions for advanced debug registers powerpc/booke: Add definitions for advanced debug registers From: Dave Kleikamp Based on patches originally written by Torez Smith. This patch adds additional definitions for BookE Debug Registers to the reg_booke.h header file. Signed-off-by: Dave Kleikamp Acked-by: David Gibson Cc: Torez Smith Cc: Benjamin Herrenschmidt Cc: Josh Boyer Cc: Kumar Gala Cc: Sergio Durigan Junior Cc: Thiago Jung Bauermann Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 3162d92dfb79a0b5fc03380b8819fa5f870ebf1e Author: Dave Kleikamp Date: Mon Feb 8 11:51:05 2010 +0000 powerpc: Extended ptrace interface powerpc: Extended ptrace interface From: Dave Kleikamp Based on patches originally written by Torez Smith. Add a new extended ptrace interface so that user-space has a single interface for powerpc, without having to know the specific layout of the debug registers. Implement: PPC_PTRACE_GETHWDEBUGINFO PPC_PTRACE_SETHWDEBUG PPC_PTRACE_DELHWDEBUG Signed-off-by: Dave Kleikamp Acked-by: David Gibson Cc: Torez Smith Cc: Benjamin Herrenschmidt Cc: Josh Boyer Cc: Kumar Gala Cc: Sergio Durigan Junior Cc: Thiago Jung Bauermann Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 172ae2e7f8ff9053905a36672453a6d2ff95b182 Author: Dave Kleikamp Date: Mon Feb 8 11:50:57 2010 +0000 powerpc/booke: Introduce new CONFIG options for advanced debug registers powerpc/booke: Introduce new CONFIG options for advanced debug registers From: Dave Kleikamp Introduce new config options to simplify the ifdefs pertaining to the advanced debug registers for booke and 40x processors: CONFIG_PPC_ADV_DEBUG_REGS - boolean: true for dac-based processors CONFIG_PPC_ADV_DEBUG_IACS - number of IAC registers CONFIG_PPC_ADV_DEBUG_DACS - number of DAC registers CONFIG_PPC_ADV_DEBUG_DVCS - number of DVC registers CONFIG_PPC_ADV_DEBUG_DAC_RANGE - DAC ranges supported Beginning conservatively, since I only have the facilities to test 440 hardware. I believe all 40x and booke platforms support at least 2 IAC and 2 DAC registers. For 440, 4 IAC and 2 DVC registers are enabled, as well as the DAC ranges. Signed-off-by: Dave Kleikamp Acked-by: David Gibson Signed-off-by: Benjamin Herrenschmidt commit 789c299ca280f96368c0296b739e89c0bb232f8a Author: Anton Blanchard Date: Wed Feb 10 14:56:26 2010 +0000 powerpc: Improve 64bit copy_tofrom_user Here is a patch from Paul Mackerras that improves the ppc64 copy_tofrom_user. The loop now does 32 bytes at a time and as well as pairing loads and stores. A quick test case that reads 8kB over and over shows the improvement: POWER6: 53% faster POWER7: 51% faster #define _XOPEN_SOURCE 500 #include #include #include #include #include #include #define BUFSIZE (8 * 1024) #define ITERATIONS 10000000 int main() { char tmpfile[] = "/tmp/copy_to_user_testXXXXXX"; int fd; char *buf[BUFSIZE]; unsigned long i; fd = mkstemp(tmpfile); if (fd < 0) { perror("open"); exit(1); } if (write(fd, buf, BUFSIZE) != BUFSIZE) { perror("open"); exit(1); } for (i = 0; i < 10000000; i++) { if (pread(fd, buf, BUFSIZE, 0) != BUFSIZE) { perror("pread"); exit(1); } } unlink(tmpfile); return 0; } Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 63e6c5b8102af7df7a5e1cebbd865d711645886a Author: Anton Blanchard Date: Wed Feb 10 18:07:54 2010 +0000 powerpc: Pair loads and stores in copy_4k_page A number of our chips like loads and stores to be paired. A small kernel module testcase shows the improvement of pairing loads and stores in copy_4k_page: POWER6: +9% POWER7: +1.5% #include #include #define ITERATIONS 10000000 static int __init copypage_init(void) { struct timespec before, after; unsigned long i; struct page *destpage, *srcpage; char *dest, *src; destpage = alloc_page(GFP_KERNEL); srcpage = alloc_page(GFP_KERNEL); dest = page_address(destpage); src = page_address(srcpage); getnstimeofday(&before); for (i = 0; i < ITERATIONS; i++) copy_4K_page(dest, src); getnstimeofday(&after); free_page((unsigned long)dest); free_page((unsigned long)src); printk(KERN_DEBUG "copy_4K_page loop took %lu ns\n", (after.tv_sec - before.tv_sec) * NSEC_PER_SEC + (after.tv_nsec - before.tv_nsec)); return 0; } static void __exit copypage_exit(void) { } module_init(copypage_init) module_exit(copypage_exit) MODULE_LICENSE("GPL"); MODULE_AUTHOR("Anton Blanchard"); Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 5a0e9b5718d921f5d8e17176d6b483f6b8f1844a Author: Anton Blanchard Date: Wed Feb 10 01:10:25 2010 +0000 powerpc: Use lwsync for acquire barrier if CPU supports it Nick Piggin discovered that lwsync barriers around locks were faster than isync on 970. That was a long time ago and I completely dropped the ball in testing his patches across other ppc64 processors. Turns out the idea helps on other chips. Using a microbenchmark that uses a lot of threads to contend on a global pthread mutex (and therefore a global futex), POWER6 improves 8% and POWER7 improves 2%. I checked POWER5 and while I couldn't measure an improvement, there was no regression. This patch uses the lwsync patching code to replace the isyncs with lwsyncs on CPUs that support the instruction. We were marking POWER3 and RS64 as lwsync capable but in reality they treat it as a full sync (ie slow). Remove the CPU_FTR_LWSYNC bit from these CPUs so they continue to use the faster isync method. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 53eae2281ad2607fa66a8ad1cb06186c8900da56 Author: Anton Blanchard Date: Wed Feb 10 01:07:19 2010 +0000 powerpc: Fix lwsync patching code on 64bit do_lwsync_fixups doesn't work on 64bit, we end up writing lwsyncs to the wrong addresses: 0:mon> di c0000001000bfacc c0000001000bfacc 7c2004ac lwsync Since the lwsync section has negative offsets we need to use a signed int pointer so we sign extend the value. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit f10e2e5b4b4c9937de596f96ffe028be3a565598 Author: Anton Blanchard Date: Wed Feb 10 01:04:06 2010 +0000 powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER For performance reasons we are about to change ISYNC_ON_SMP to sometimes be lwsync. Now that the macro name doesn't make sense, change it and LWSYNC_ON_SMP to better explain what the barriers are doing. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 66d99b883419b8df6d0a24ca957da7ab4831cf6e Author: Anton Blanchard Date: Wed Feb 10 01:03:06 2010 +0000 powerpc: Convert open coded native hashtable bit lock Now we have real bit locks use them instead of open coding it. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 864b9e6fd76489aab422bac62162f57c52e06ed8 Author: Anton Blanchard Date: Wed Feb 10 01:02:36 2010 +0000 powerpc: Use lwarx/ldarx hint in bit locks This patch implements the lwarx/ldarx hint bit for bit locks. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 4e14a4d17a8cd66ccab180d32c977091922cfbed Author: Anton Blanchard Date: Wed Feb 10 00:57:28 2010 +0000 powerpc: Use lwarx hint in spinlocks Recent versions of the PowerPC architecture added a hint bit to the larx instructions to differentiate between an atomic operation and a lock operation: > 0 Other programs might attempt to modify the word in storage addressed by EA > even if the subsequent Store Conditional succeeds. > > 1 Other programs will not attempt to modify the word in storage addressed by > EA until the program that has acquired the lock performs a subsequent store > releasing the lock. To avoid a binutils dependency this patch create macros for the extended lwarx format and uses it in the spinlock code. To test this change I used a simple test case that acquires and releases a global pthread mutex: pthread_mutex_lock(&mutex); pthread_mutex_unlock(&mutex); On a 32 core POWER6, running 32 test threads we spend almost all our time in the futex spinlock code: 94.37% perf [kernel] [k] ._raw_spin_lock | |--99.95%-- ._raw_spin_lock | | | |--63.29%-- .futex_wake | | | |--36.64%-- .futex_wait_setup Which is a good test for this patch. The results (in lock/unlock operations per second) are: before: 1538203 ops/sec after: 2189219 ops/sec An improvement of 42% A 32 core POWER7 improves even more: before: 1279529 ops/sec after: 2282076 ops/sec An improvement of 78% Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 17081102a6e0fe32cf47cdbdf8f2e9ab55273b08 Author: Anton Blanchard Date: Sun Jan 31 20:34:36 2010 +0000 powerpc: Convert global "BAD" interrupt to per cpu spurious I often get asked if BAD interrupts are really bad. On some boxes (eg IBM machines running a hypervisor) there are valid cases where are presented with an interrupt that is not for us. These cases are common enough to show up as thousands of BAD interrupts a day. Tone them down by calling them spurious. Since they can be a significant cause of OS jitter, we may as well log them per cpu so we know where they are occurring. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 89713ed10815401a1bfe12e3a076b64048381b56 Author: Anton Blanchard Date: Sun Jan 31 20:34:06 2010 +0000 powerpc: Add timer, performance monitor and machine check counts to /proc/interrupts With NO_HZ it is useful to know how often the decrementer is going off. The patch below adds an entry for it and also adds it into the /proc/stat summaries. While here, I added performance monitoring and machine check exceptions. I found it useful to keep an eye on the PMU exception rate when using the perf tool. Since it's possible to take a completely handled machine check on a System p box it also sounds like a good idea to keep a machine check summary. The event naming matches x86 to keep gratuitous differences to a minimum. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit fc380c0c8a17bc2bd2d9d7fb41d4a88c3e618db2 Author: Anton Blanchard Date: Sun Jan 31 20:33:41 2010 +0000 powerpc: Remove whitespace in irq chip name fields Now we use printf style alignment there is no need to manually space these fields. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit c86845ede8b643ca025aec277dec1892d0ccac01 Author: Anton Blanchard Date: Sun Jan 31 20:33:18 2010 +0000 powerpc: Rework /proc/interrupts On a large machine I noticed the columns of /proc/interrupts failed to line up with the header after CPU9. At sufficiently large numbers of CPUs it becomes impossible to line up the CPU number with the counts. While fixing this I noticed x86 has a number of updates that we may as well pull in. On PowerPC we currently omit an interrupt completely if there is no active handler, whereas on x86 it is printed if there is a non zero count. The x86 code also spaces the first column correctly based on nr_irqs. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit fda9d86100e0b412d0c8a16abe0651c8c8e39e81 Author: Anton Blanchard Date: Sun Jan 31 20:32:51 2010 +0000 powerpc: Reduce footprint of xics_ipi_struct Right now we allocate a cacheline sized NR_CPUS array for xics IPI communication. Use DECLARE_PER_CPU_SHARED_ALIGNED to put it in percpu data in its own cacheline since it is written to by other cpus. On a kernel with NR_CPUS=1024, this saves quite a lot of memory: text data bss dec hex filename 8767779 2944260 1505724 13217763 c9afe3 vmlinux.irq_cpustat 8767555 2813444 1505724 13086723 c7b003 vmlinux.xics A saving of around 128kB. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 8c007bfdf1bab536f824d91fccc76596c18aba78 Author: Anton Blanchard Date: Sun Jan 31 20:30:23 2010 +0000 powerpc: Reduce footprint of irq_stat PowerPC is currently using asm-generic/hardirq.h which statically allocates an NR_CPUS irq_stat array. Switch to an arch specific implementation which uses per cpu data: On a kernel with NR_CPUS=1024, this saves quite a lot of memory: text data bss dec hex filename 8767938 2944132 1636796 13348866 cbb002 vmlinux.baseline 8767779 2944260 1505724 13217763 c9afe3 vmlinux.irq_cpustat A saving of around 128kB. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 8d3d50bf1913561ef3b1f5b53115c5a481ba9b1e Author: Breno Leitao Date: Wed Feb 3 05:56:41 2010 +0000 powerpc/eeh: Fix a bug when pci structure is null During a EEH recover, the pci_dev structure can be null, mainly if an eeh event is detected during cpi config operation. In this case, the pci_dev will not be known (and will be null) the kernel will crash with the following message: Unable to handle kernel paging request for data at address 0x000000a0 Faulting instruction address: 0xc00000000006b8b4 Oops: Kernel access of bad area, sig: 11 [#1] NIP [c00000000006b8b4] .eeh_event_handler+0x10c/0x1a0 LR [c00000000006b8a8] .eeh_event_handler+0x100/0x1a0 Call Trace: [c0000003a80dff00] [c00000000006b8a8] .eeh_event_handler+0x100/0x1a0 [c0000003a80dff90] [c000000000031f1c] .kernel_thread+0x54/0x70 The bug occurs because pci_name() tries to access a null pointer. This patch just guarantee that pci_name() is not called on Null pointers. Signed-off-by: Breno Leitao Signed-off-by: Linas Vepstas Signed-off-by: Benjamin Herrenschmidt commit e0508b1516ad4423499d4118a9037ae0aa4e9c2f Author: Corey Minyard Date: Wed Feb 3 05:08:17 2010 +0000 powerpc: Add coherent_dma_mask to mv64x60 devices DMA ops requires that coherent_dma_mask be set properly for a device, but this was not being done for devices on the MV64x60 that use DMA. Both the serial and ethernet devices need this or they won't be able to allocate memory. Signed-off-by: Corey Minyard Signed-off-by: Benjamin Herrenschmidt commit a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 Author: Tejun Heo Date: Tue Feb 2 14:39:15 2010 +0900 percpu: add __percpu sparse annotations to what's left Add __percpu sparse annotations to places which didn't make it in one of the previous patches. All converions are trivial. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. Signed-off-by: Tejun Heo Acked-by: Borislav Petkov Cc: Dan Williams Cc: Huang Ying Cc: Len Brown Cc: Neil Brown commit 003cb608a2533d0927a83bc4e07e46d7a622eda9 Author: Tejun Heo Date: Tue Feb 2 14:39:01 2010 +0900 percpu: add __percpu sparse annotations to fs Add __percpu sparse annotations to fs. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. Signed-off-by: Tejun Heo Cc: "Theodore Ts'o" Cc: Trond Myklebust Cc: Alex Elder Cc: Christoph Hellwig Cc: Alexander Viro commit 43cf38eb5cea91245502df3fcee4dbfc1c74dd1c Author: Tejun Heo Date: Tue Feb 2 14:38:57 2010 +0900 percpu: add __percpu sparse annotations to core kernel subsystems Add __percpu sparse annotations to core subsystems. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. Signed-off-by: Tejun Heo Reviewed-by: Christoph Lameter Acked-by: Paul E. McKenney Cc: Jens Axboe Cc: linux-mm@kvack.org Cc: Rusty Russell Cc: Dipankar Sarma Cc: Peter Zijlstra Cc: Andrew Morton Cc: Eric Biederman commit 170800088666963de1111d62fb503889c8c82eda Author: Tetsuo Handa Date: Tue Feb 16 21:14:48 2010 +0900 TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain __func__ is used for only debug printk(). We can remove it. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 771f4c87be909ad9feb6af26424485b02deed244 Author: Jan Kiszka Date: Mon Feb 8 10:12:45 2010 +0000 CAPI: Remove experimental tag from middleware feature Despite all its bugs, the middleware support of our CAPI stack was already in use for many, many moons. And after going through its code, fixing all issues I found, I feel it deserves to officially become a non-experimental feature. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 79e95f4717767e9ddc4dbec5d778f0c9970eed34 Author: Jan Kiszka Date: Mon Feb 8 10:12:44 2010 +0000 CAPI: Schedule capifs for removal With dynamic TTY nodes and the help of udev, we no longer need this special filesystem. Schedule it for removal in one year from now. As a last duty to this feature, move its help to right option so that users can read the rationale. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit c6af0437941c92179eeb51579f19423eacc5516c Author: Jan Kiszka Date: Mon Feb 8 10:12:43 2010 +0000 CAPI: Drop special controller lookup from capi20_put_message This strange special rule to fall back to controller 1 cannot be derived from the CAPI specs and looks a lot like it was once dedicated to some out-of-tree driver, probably AVM's broken fcdsl2 (FRITZ!Card DSL v2.0). I found no in-tree user that needs this check, and I'm now taking care of the fcdsl2. So drop these bits from our stack. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit eef0ced02840cdbc9045b24e73378401aae04d4c Author: Jan Kiszka Date: Mon Feb 8 10:12:42 2010 +0000 CAPI: Drop return value of handle_minor_send We did not evaluate handle_minor_send's return value, just (void)'ed it away. Time for a cleanup. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 2b72b5bd65f00bce786ca080aca27e91e90af6df Author: Jan Kiszka Date: Mon Feb 8 10:12:41 2010 +0000 CAPI: Clean up capiminor_*_ack No need for irqsave acquisition of acklock, bh-safe is sufficient. Moverover, move kfree out of the lock and do not take acklock at all in capiminor_del_all_ack as we are the last user of the list here. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit dfbb84ffe94e75e2d56250fa948db40f6c62093f Author: Jan Kiszka Date: Mon Feb 8 10:12:40 2010 +0000 CAPI: Fix locking around capiminor's output queue and drop workaround_lock Introduce outlock as a spin lock that protects capiminor's outqueue, outbytes and outskb (formerly known as ttyskb). outlock can be acquired from soft-IRQ context via capinc_write, so make it bh-safe. This finally removes the last reason for keeping the workaround lock around (which was incomplete and partly broken anyway). And as we no longer call handle_recv_skb in atomic context, gen_data_b3_resp_for can use non-atomic allocation now. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 68d7347b280b4c1f8253c0676a520fb754f213c7 Author: Jan Kiszka Date: Mon Feb 8 10:12:39 2010 +0000 CAPI: Drop capiminor's unused inbytes counter The inbytes counter was only updated but never read. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 42792713f7f2664cf07501e1244d6da33a73ffc1 Author: Jan Kiszka Date: Mon Feb 8 10:12:38 2010 +0000 CAPI: Use atomics for capiminor's datahandle and msgid The capiminor members datahandle and msgid are incremented outside any lock, so better do this atomically. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 42651b5c1aabf5eb60fbe98375ba127f4f6eb943 Author: Jan Kiszka Date: Mon Feb 8 10:12:37 2010 +0000 CAPI: Rename datahandle_queue -> ackqueue_entry This struct is describing a queue entry, not the queue itself. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit a11ef7be8e982426e9fbbfc84fa0c01d23ce05c3 Author: Jan Kiszka Date: Mon Feb 8 10:12:36 2010 +0000 CAPI: Rework capiminor RX handler Avoid re-queuing skbs unless the error detected in handle_recv_skb is expected to be recoverable such as lacking memory, a full CAPI queue, a full TTY input buffer, or a not yet existing TTY. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit b75b2eedcbf6458c68713c772c2ade83ab7a55f0 Author: Jan Kiszka Date: Mon Feb 8 10:12:35 2010 +0000 CAPI: Drop handle_minor_recv from capinc_tty_write Sending a message down the CAPI stack may trigger the reception of an answer, but this will go through capi_recv_message and call handle_minor_recv from there. There is no need to walk the receive queue on capinc_tty_write. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit a84fdf41b25ad4c2b83e7c8ca87268fdbe6207d1 Author: Jan Kiszka Date: Mon Feb 8 10:12:34 2010 +0000 CAPI: Drop atomic ttyopencount Not needed, tty->count keeps track of this information. At this chance, drop traces of ancient attempts to debug this logic via _DEBUG_REFCOUNT. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 3d5d30fe7a6aa4c9d63dc4fe6b6da6abac423bc2 Author: Jan Kiszka Date: Mon Feb 8 10:12:33 2010 +0000 CAPI: Clean up capiminors_lock Use a plain spin lock for capiminors_lock, drop inconsistent irqsafe acquisitions (it's only used in process context anyway). Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 6576c2891adacad81ea0b24f0704ecac9fc727cb Author: Jan Kiszka Date: Mon Feb 8 10:12:32 2010 +0000 CAPI: Drop obsolete nccip from capiminor struct The nccip in capiminor used to serve as an indicator that the NCCI was close. But we don't need this, we issue a hangup on capincci_free_minor. So drop this legacy. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 30bced91d93f7523bf23432d71d882d6b5d6cff6 Author: Jan Kiszka Date: Mon Feb 8 10:12:31 2010 +0000 CAPI: Issue synchronous hangup on capincci_free_minor capincci_free and, thus, capincci_free_minor runs in process context, so we can issue the hangup of the associated TTY synchronously. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 2c8df72259d550ed6dc0b391feb5c2fc13892fb6 Author: Jan Kiszka Date: Mon Feb 8 10:12:30 2010 +0000 CAPI: Drop remaining NULL checks on tty->driver_data tty_struct's driver_data cannot be NULL, no need to test for it. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit fb4b4881ef951f6ed8fb8564ca1821dea10778c4 Author: Jan Kiszka Date: Mon Feb 8 10:12:29 2010 +0000 CAPI: Use tty_port to keep track of capiminor's tty Use the reference management features of tty_port to look up and drop again the tty_struct associated with a capiminor. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 46324511809251adbedb874cc08692e247f7ed68 Author: Jan Kiszka Date: Mon Feb 8 10:12:28 2010 +0000 CAPI: Establish install/cleanup handlers for capiminor TTYs Properly associate/disassociate a capiminor object with its TTY via the install/cleanup handlers instead of trying to guess first open and last close. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 0159d5491fef4acadd116a989b671e1cd350382f Author: Jan Kiszka Date: Mon Feb 8 10:12:27 2010 +0000 CAPI: Use kref on capiminor Install a reference counter for capiminor objects. Acquire it when obtaining a capiminor from the array during capinc_tty_open, drop it when closing the tty again. Another reference is held for the hook-up with capincci. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit e95ac143868752ad30d93068a6fc0b39cf3a1bf4 Author: Jan Kiszka Date: Mon Feb 8 10:12:26 2010 +0000 CAPI: Use dynamic major for NCCI TTYs by default No need to allocate a fixed major for this TTY, both capifs and udev make this transparent to the user. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 40fb2d0da77df5d39f1ba8878502725ebb806554 Author: Jan Kiszka Date: Mon Feb 8 10:12:25 2010 +0000 CAPI: Dynamically register minor devices Register capiminors dynamically with the TTY core so that udev can make them show up as the NCCIs appear or disappear. This removes the need to check if the capiminor requested in capinc_tty_open actually exists. And this completely obsoletes capifs which will be scheduled for removal in a later patch. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit e76b1544074b5fc7983a21fb1f51a7faf03d3179 Author: Jan Kiszka Date: Mon Feb 8 10:12:24 2010 +0000 CAPI: Clean up capinc_tty_init/exit Return proper error code if tty_register_driver fails. In contrast, tty_unregister_driver cannot practically fail, so drop that error handling. Finally, mark capinc_tty_init/exit with __init/__exit. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 81d17fe5e29d863027824928e1c336baa9abfee9 Author: Jan Kiszka Date: Mon Feb 8 10:12:23 2010 +0000 CAPI: Switch capiminor list to array Using a plain array of pointers simplifies the management of capiminors. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 884f5c447901ca9da75432fe8a7a2c2a00327d22 Author: Jan Kiszka Date: Mon Feb 8 10:12:22 2010 +0000 CAPI: Switch NCCI list to standard doubly linked list Replace open-coded NCCI list management with standard mechanisms. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 28a1dbb6f7feade304f43798feb15f6978516624 Author: Jan Kiszka Date: Mon Feb 8 10:12:21 2010 +0000 CAPI: Fix racy capi_read capi_read still used interruptible_sleep_on, risking to miss a wakeup this way. Convert it to wait_event_interruptible. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 54f0fad3d8414cf770c1cf25a1d98fcaec899b5a Author: Jan Kiszka Date: Mon Feb 8 10:12:20 2010 +0000 CAPI: Use non-atomic allocation during NCCI setup Both capincci_alloc and capiminor_alloc run in non-atomic context, update their memory allocations accordingly. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 05b4149433ffae789edaf569da8d998c93eed1aa Author: Jan Kiszka Date: Mon Feb 8 10:12:19 2010 +0000 CAPI: Rework locking of capidev members Rename 'ncci_list_mtx' to 'lock', expressing that it now protects a larger set of capidev members: the NCCI list, ap.applid (ie. the registration of the application), and modifications of userflags. We do not need to protect each and every check for ap.applid because, once an application is registered, it will stay for the whole lifetime of the device. Also, there is no need to apply the capidev mutex during release (if there could be concurrent users, we would crash them anyway by freeing the device at the end of capi_release). Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit eca39dd830dbc58061aa6cd68853c39055236be3 Author: Jan Kiszka Date: Mon Feb 8 10:12:18 2010 +0000 CAPI: Clean up capi_open/release Fold capidev_alloc and capidev_free into capi_open and capi_release - there are no other users. Someone pushed a lock_kernel into capi_open. Drop it, we don't need it. Also remove the useless test from open that checks for private_data == NULL. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit b8f433dc5cd9b910c12ef5cca351bf720d3e68c1 Author: Jan Kiszka Date: Mon Feb 8 10:12:17 2010 +0000 CAPI: Convert capidev_list_lock into a mutex No need for anything "harder" here (specifically no need for irqsave...). Also, make the list removal the first operation of capidev_free to avoid dumping half-released devices via /proc. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 501c87a91909efaad91425635b29b01f1473c659 Author: Jan Kiszka Date: Mon Feb 8 10:12:16 2010 +0000 CAPI: Reduce #ifdef mess around CONFIG_ISDN_CAPI_MIDDLEWARE Make the code a bit more readable be providing stub functions for the !CONFIG_ISDN_CAPI_MIDDLEWARE case. Though a few lines are moved around, this comes with no functional changes. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 88c896ef87fd0dd4dbf36e8e86e019c74b1f6649 Author: Jan Kiszka Date: Mon Feb 8 10:12:15 2010 +0000 CAPI: Rework application locking Drop the application rw-lock in favour of RCU. This synchronizes capi20_release against capi_ctr_handle_message which may dereference an application from (soft-)IRQ context. Any other access to the application list is now protected by the capi_controller_lock as well. This also allows to safely inspect applications for /proc dumping by holding capi_controller_lock. At this chance, drop some useless release_in_progress checks where we obtained the application pointer from the list (which becomes NULL on release_in_progress). Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 0ca3a017a7373a4545dd7b345a8a0cecc16bc7e2 Author: Jan Kiszka Date: Mon Feb 8 10:12:14 2010 +0000 CAPI: Rework locking of controller data structures This patch applies the mutex so far only protecting the controller list to (almost) all accesses of controller data structures. It also reworks waiting on state changes in old_capi_manufacturer so that it no longer poll and holds a module reference to the controller owner while waiting (the latter was partly done already). Modification and checking of the blocked state remains racy by design, the caller is responsible for dealing with this. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit ef69bb2ec6036945da1d3d3f07b75253f484f693 Author: Jan Kiszka Date: Mon Feb 8 10:12:13 2010 +0000 CAPI: Rework controller state notifier Another step towards proper locking: Rework the callback provided to capidrv for controller state changes. This is so far attached to an application, which would require us to hold the corresponding lock across notification calls. But there is no direct relation between a controller up/down event and an application, so let's decouple them and provide a notifier call chain for those events instead. This notifier chain is first of all used internally. Here we request the highest priority to unsure that housekeeping work is done before any other notifications. The chain is exported via [un]register_capictr_notifier to our only user, capidrv, to replace the racy and unfixable capi20_set_callback. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 3efecf7a49cde47e5f2deb1d5504951ff4bede53 Author: Jan Kiszka Date: Mon Feb 8 10:12:12 2010 +0000 CAPI: Rework capi_ctr_ready/down This step prepares the application of proper controller locking: Push all state changing work into the notify handler that are called by capi_ctr_ready and capi_ctr_down, switch detach_capi_ctr to issue a synchronous ctr_down. Also ensure that we do not go through any action if the state did not change. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 9717fb8b64ed41be9dd074bc8010bafd33046f1a Author: Jan Kiszka Date: Mon Feb 8 10:12:11 2010 +0000 CAPI: Convert capi drivers rwlock into mutex Turn the lock protecting registered capi drivers into a mutex and apply it consistently. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 522530311b35ec8fc4785062441dd2d63967ac55 Author: Jan Kiszka Date: Mon Feb 8 10:12:10 2010 +0000 CAPI: Call a controller 'controller', not 'card' At least for our internal use, fix the misnomers that refer to a CAPI controller as 'card'. No functional changes. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 88549d6b76346e677da8d2d52b37615df18a4345 Author: Jan Kiszka Date: Mon Feb 8 10:12:09 2010 +0000 CAPI: Reduce chattiness during module loading/removal The CVS revisions dumped by all CAPI modules are meaningless today. And that some CAPI module is loaded or removed does not necessarily deserve a message. Just keep the message of the central module, capi.ko, drop the rest. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit e11e7ac1ecac6b25439c003c5ca661cd399ec35d Author: Jan Kiszka Date: Mon Feb 8 10:12:08 2010 +0000 CAPI: Pin capifs instead of mounting it Auto-mounting the capifs during module init prevents unloading its module. Instead, pin the filesystem as long as some NCCI node exists. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 07ad603ab8e3cc35762c15043b59a6ef76542454 Author: Jan Kiszka Date: Mon Feb 8 10:12:07 2010 +0000 CAPI: Eliminate capifs_root variable capifs_mnt->mnt_sb->s_root already contains what we need. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 90926f0e58dcd9f4ca877961000568a3be787f2f Author: Jan Kiszka Date: Mon Feb 8 10:12:06 2010 +0000 CAPI: Sanitize capifs API Instead of looking up the dentry of an NCCI node again in capifs_free_ncci pass the pointer via the capifs user. This patch also reduces the #ifdef mess in capi.c a bit as far as capifs was causing it. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit c947862f9126983537a4cc11e07d26882d60b7e7 Author: Jan Kiszka Date: Mon Feb 8 10:12:05 2010 +0000 CAPI: Fix leaks in capifs_new_ncci When something went wrong during capifs_new_ncci, the looked up dentry was not properly released. Neither was the allocated inode. Refactor the function to avoid leaks. Signed-off-by: Jan Kiszka Signed-off-by: David S. Miller commit 54716e3beb0ab20c49471348dfe399a71bfc8fd3 Author: Eric W. Biederman Date: Sun Feb 14 03:27:03 2010 +0000 net neigh: Decouple per interface neighbour table controls from binary sysctls Stop computing the number of neighbour table settings we have by counting the number of binary sysctls. This behaviour was silly and meant that we could not add another neighbour table setting without also adding another binary sysctl. Don't pass the binary sysctl path for neighour table entries into neigh_sysctl_register. These parameters are no longer used and so are just dead code. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 02291680ffba92e5b5865bc0c5e7d1f3056b80ec Author: Eric W. Biederman Date: Sun Feb 14 03:25:51 2010 +0000 net ipv4: Decouple ipv4 interface parameters from binary sysctl numbers Stop using the binary sysctl enumeartion in sysctl.h as an index into a per interface array. This leads to unnecessary binary sysctl number allocation, and a fragility in data structure and implementation because of unnecessary coupling. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 9e3f8063a72a946f2ba29068b34190436573dffe Author: Joe Perches Date: Mon Feb 15 08:34:26 2010 +0000 drivers/net/pcnet32.c: Checkpatch cleaning Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 13ff83b90f1dfae1068a250e8d99d3f9991cfa9d Author: Joe Perches Date: Mon Feb 15 08:34:25 2010 +0000 drivers/net/pcnet32.c: Use (pr|netdev|netif)_ macro helpers Make the output logging messages a bit more consistent. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 249658d5c24e42f19b3721b654d64a46816e9b0e Author: Joe Perches Date: Mon Feb 15 08:34:24 2010 +0000 drivers/net/tehuti.c: trivial checkpatch cleanups Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit cb001a1f7db6ffb0fff0796c60853c2bf2e512c3 Author: Joe Perches Date: Mon Feb 15 08:34:23 2010 +0000 drivers/net/tehuti.c: Hoist assigns out of ifs Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 865a21a5e3d1b384c559a44c898fcad93e187b82 Author: Joe Perches Date: Mon Feb 15 08:34:22 2010 +0000 drivers/net/tehuti.c: Use (pr|netdev|netif)_ macro helpers Make the output logging messages a bit more consistent. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6c35abaedc191e2c7c8fa40a2b4c2b01d553b768 Author: Joe Perches Date: Mon Feb 15 08:34:21 2010 +0000 drivers/net/sky2: Convert to use netif_printk macros Some unlikely(netif_msg_(sky2)) tests are also removed by this change. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6909c66dfbbab99dbbd9931627c9f6e8c45bfbdb Author: Joe Perches Date: Mon Feb 15 08:34:20 2010 +0000 drivers/net/ixgb: Use netif_printk macros Convert private DPRINTK macro uses to netif_ equivalents Remove #define DPRINTK Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 177867ce08f2756fa361e37086fc1792d7b4cf29 Author: David S. Miller Date: Tue Feb 16 15:23:23 2010 -0800 sparc64: Kill bogus ip_tables.h include. Fixes the following build failure: CC arch/sparc/kernel/sys_sparc32.o In file included from include/linux/netfilter_ipv4/ip_tables.h:28, from arch/sparc/kernel/sys_sparc32.c:46: include/linux/netfilter/x_tables.h:525: error: expected declaration specifiers or ‘...’ before ‘nf_hookfn’ Signed-off-by: David S. Miller commit bec92044b73085ba92aabf973cb5aafc251f3a34 Author: Michael Chan Date: Tue Feb 16 15:19:42 2010 -0800 bnx2: Update firmwares and update version to 2.0.8. - Increase FTQ depth to 256 to ehnabce performance. - Fix RV2P context corruption on 5709 when flow control is enabled. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c9885fe5a76dea798543f2938a872bc159e8e69a Author: Patrick Rabau Date: Mon Feb 15 19:42:11 2010 +0000 bnx2: Fix bug when saving statistics. This fixes the problem of dropping the carry when adding 2 32-bit values. Switch to use array indexing for better readability. Reported by and fix provided by Patrick Rabau. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit beb499afe3c9c006bb2d66ceaff0f354d0405ff4 Author: Michael Chan Date: Mon Feb 15 19:42:10 2010 +0000 bnx2: Allow user-specified multiple advertisement speed values. Remove unnecessary code that works around older versions of ethtool that can pass down invalid advertisement speed values. This old code prevents the user from specifying multiple advertisement values. The new code uses simple masking to mask out invalid advertisment bits. Reported-by: Vlad Yasevich Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit 5726026bfffa13e9b1098d7bc177618cbbaa9388 Author: Michael Chan Date: Mon Feb 15 19:42:09 2010 +0000 bnx2: Adjust flow control water marks. The current water marks are too high and can cause unnecessary flow control frames. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit e9f26c49ce790de0064474f97d6402ce1fefac2a Author: Michael Chan Date: Mon Feb 15 19:42:08 2010 +0000 bnx2: Need to call cnic_setup_cnic_irq_info() after MTU change. New status blocks are allocated during MTU change so we need to update this information for the cnic driver. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit efde73a35c2fc88db26a1583b19e0ab0fdfcd4f8 Author: Michael Chan Date: Mon Feb 15 19:42:07 2010 +0000 bnx2: Check BNX2_FLAG_USING_MSIX flag when setting up MSIX. Checking the flag is more correct than checking bp->irq_nvecs. By accident it is not a problem because we always have more than 1 vectors when using MSIX mode. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit 496c185c9495629ef1c65387cb2594578393cfe0 Author: Luis R. Rodriguez Date: Tue Feb 16 15:16:45 2010 -0800 atl1c: Add support for Atheros AR8152 and AR8152 AR8151 is a Gigabit Ethernet device. AR8152 devices are Fast Ethernet devices, there are two revisions, a 1.0 and a 2.0 revision. This has been tested against these devices: Driver Model-name vendor:device Type atl1c AR8131 1969:1063 Gigabit Ethernet atl1c AR8132 1969:1062 Fast Ethernet atl1c AR8151(v1.0) 1969:1073 Gigabit Ethernet atl1c AR8152(v1.1) 1969:2060 Fast Ethernet This device has no hardware available yet so it goes untested, but it should work: atl1c AR8152(v2.0) 1969:2062 Fast Ethernet Signed-off-by: Luis R. Rodriguez Signed-off-by: David S. Miller commit ec144a81ade915b5b38adedf10e84690813ed768 Merge: b919ee8 8862627 Author: Benjamin Herrenschmidt Date: Wed Feb 17 10:00:42 2010 +1100 Merge commit 'origin/master' into next commit d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978 Author: Alexey Dobriyan Date: Tue Feb 16 09:05:04 2010 +0000 tunnels: fix netns vs proto registration ordering Same stuff as in ip_gre patch: receive hook can be called before netns setup is done, oopsing in net_generic(). Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit c2892f02712e9516d72841d5c019ed6916329794 Author: Alexey Dobriyan Date: Tue Feb 16 07:57:44 2010 +0000 gre: fix netns vs proto registration ordering GRE protocol receive hook can be called right after protocol addition is done. If netns stuff is not yet initialized, we're going to oops in net_generic(). This is remotely oopsable if ip_gre is compiled as module and packet comes at unfortunate moment of module loading. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 4f4517c45f325ba511458465430a52864a5d0d30 Author: Ernst Schwab Date: Tue Feb 16 21:02:57 2010 -0700 spi: Correct SPI clock frequency setting in spi_mpc8xxx Correct SPI clock frequency division factor rounding, preventing clock rates higher than the maximum specified clock frequency being used. When specifying spi-max-frequency = <10000000> in the device tree, the resulting frequency was 11.1 MHz, with spibrg being 133333332. According to the freescale data sheet [1], the spi clock rate is spiclk = spibrg / (4 * (pm+1)) The existing code calculated pm = mpc8xxx_spi->spibrg / (hz * 4); pm--; resulting in pm = (int) (3.3333) - 1 = 2, resulting in spiclk = 133333332/(4*(2+1)) = 11111111 With the fix, pm = (mpc8xxx_spi->spibrg - 1) / (hz * 4) + 1; pm--; resulting in pm = (int) (4.3333) - 1 = 3, resulting in spiclk = 133333332/(4*(3+1)) = 8333333 Without the fix, for every desired SPI frequency that is not exactly derivable from spibrg, pm will be too small due to rounding down, resulting in a too high SPI clock, so we need a pm which is one higher. For values that are exactly derivable, spibrg will be dividable by (hz*4) without remainder, and (int) ((spibrg-1)/(hz*4)) will be one lower than (int) (spibrg)/(hz*4), which is compensated by adding 1. For these values, the fixed version calculates the same pm as the unfixed version. For all values that are not exactly derivable, spibrg will be not dividable by (hz*4) without remainder, and (int) ((spibrg-1)/(hz*4)) will be the same as (int) (spibrg)/(hz*4), and the calculated pm will be one higher than calculated by the unfixed version. References: [1] http://www.freescale.com/files/32bit/doc/ref_manual/MPC8315ERM.pdf, page 22-10 -> 1398 Signed-off-by: Ernst Schwab Signed-off-by: Grant Likely commit c13f3d378f77ce3176628ade452b0e461242faf3 Author: FUJITA Tomonori Date: Mon Feb 15 11:33:04 2010 +0900 x86/gart: Unexport gart_iommu_aperture I wrongly exported gart_iommu_aperture in the commit 42590a75019a50012f25a962246498dead428433. It's not necessary so let's unexport it. Signed-off-by: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100215113241P.fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar commit 73b50c1c92666d326b5fa2c945d46509f2f6d91f Author: Curt Wohlgemuth Date: Tue Feb 16 15:06:29 2010 -0500 ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode Calls to ext4_handle_dirty_metadata should only pass in an inode pointer for inode-specific metadata, and not for shared metadata blocks such as inode table blocks, block group descriptors, the superblock, etc. The BUG_ON can get tripped when updating a special device (such as a block device) that is opened (so that i_mapping is set in fs/block_dev.c) and the file system is mounted in no journal mode. Addresses-Google-Bug: #2404870 Signed-off-by: Curt Wohlgemuth Signed-off-by: "Theodore Ts'o" commit b397c836eff58cd9a43f7bd8b853a51b3ecc3420 Author: Eric Anholt Date: Tue Jan 26 09:43:10 2010 -0800 drm/i915: Don't reserve compatibility fence regs in KMS mode. The fence start is for compatibility with UMS X Servers before fence management. KMS X Servers only started doing tiling after fence management appeared. Signed-off-by: Eric Anholt commit c4804411691bdd7d8a57e942cbb502fd52a90074 Author: Zhenyu Wang Date: Thu Dec 17 14:48:43 2009 +0800 drm/i915: Keep MCHBAR always enabled As we need more and more controls within MCHBAR for memory config and power management, this trys to keep MCHBAR enabled from driver load and only tear down in driver unload. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 29105ccc43ead5a0179d04b1404611981e92e278 Author: Chris Wilson Date: Thu Jan 7 10:39:13 2010 +0000 drm/i915: Replace open-coded eviction in i915_gem_idle() With the introduction of the hang-check, we can safely expect that i915_wait_request() will always return even when the GPU hangs, and so do not need to open code the wait in order to manually check for the hang. Also we do not need to always evict all buffers, so only flush the GPU (and wait for it to idle) for KMS, but continue to evict for UMS. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 64b84010f9f85996a219fcc697396e7e11be3459 Author: Jouni Malinen Date: Tue Feb 16 17:56:18 2010 +0200 ath9k: Use the Beacon TX rate from mac80211 Instead of hardcoding the lowest rate for Beacon frames, use the rate index specified in the mac80211 TX info in AP mode. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit bef5d1c70d132145c0fc75b3586a19841a9a82e4 Author: Johannes Berg Date: Tue Feb 16 11:05:00 2010 +0100 mac80211: split ieee80211_drop_unencrypted Currently, ieee80211_drop_unencrypted is called from management and data frame context, and the different contexts pass different frames. This could lead to it processing an 802.3 frame as an 802.11 frame when MFP is enabled. Move the MFP part of ieee80211_drop_unencrypted into a new function that is only called for mgmt frames. Cc: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 04662360854aefcb6337d93701892ad97411fdd0 Author: Pavel Roskin Date: Sat Feb 13 22:13:06 2010 -0500 mwl8k: disable softirqs when accessing sta_notify_list Use spin_[un]lock_bh in mwl8k_sta_notify(). The sta_notify handler is required to be atomic, yet it can be called in process context, so make sure one call won't preempt another. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 749f621e20ab0db35a15ff730088922603c809ba Merge: 339c6e9 3e5e524 Author: David S. Miller Date: Tue Feb 16 11:15:13 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 7833ae0edf50b0eb303e95b1bec5fbd63a1e2672 Author: Peter Ujfalusi Date: Tue Feb 16 13:23:16 2010 +0200 ASoC: tlv320dac33: Correct the OSCSET calculation OSCSET calculation was not correct in case of 44.1KHz sampling rate. With small adjustment both 48 and 44.1 KHz calculation now gives the correct value. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e5e878c1c393de917391477bc7627d729f7568fb Author: Peter Ujfalusi Date: Tue Feb 16 13:23:15 2010 +0200 ASoC: tlv320dac33: Clearing FIFOFLUSH flag before playback In repeated playback the FIFOFLUSH bit remained set, and never has been cleared. Clear it during the setup phase. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dbe21408b15f04da4f80fb89a27b7cb067d6103e Author: Mark Brown Date: Fri Feb 12 11:37:24 2010 +0000 ASoC: Make pmdown_time runtime configurable Provide a sysfs file allowing userspace to inspect and change the pmdown_time setting at runtime. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 96dd362284ddcb546d2783035ae7eeda73692eda Author: Mark Brown Date: Fri Feb 12 11:05:44 2010 +0000 ASoC: Make pmdown_time a per-card setting Make the pmdown_time a per-card setting rather than a global one, initialised before the card initialisation runs. This allows cards to override the default setting if it makes sense to do so (for example, due to an unavoidable pop). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e20908d95e89d04b9537aefecc0734d2e4f7faed Author: Grazvydas Ignotas Date: Fri Feb 12 23:57:23 2010 +0200 power_supply: bq27x00: add BQ27500 support BQ27500 is newer fuel gauge chip from TI with slightly changed register layout and some different register semantics. Add new i2c ID for it and handle differences where needed. Also rename bq27200 functions to bq27x00, as they are no longer bq27200 specific. Signed-off-by: Grazvydas Ignotas Acked-by: Rodolfo Giometti Signed-off-by: Anton Vorontsov commit b4de3608156311b615da4bcc4c095913abc44825 Author: Grazvydas Ignotas Date: Fri Feb 12 23:57:13 2010 +0200 power_supply: bq27x00: fix temperature conversion The power supply class requires tenths of degree Celsius. Signed-off-by: Grazvydas Ignotas Acked-by: Rodolfo Giometti Signed-off-by: Anton Vorontsov commit ba96f8717e77f1ef68c160f6e9a454b3ce2c045b Author: Grazvydas Ignotas Date: Fri Feb 12 23:57:02 2010 +0200 power_supply: bq27x00: remove unused struct fields These are probably leftover from old TI code. Signed-off-by: Grazvydas Ignotas Acked-by: Rodolfo Giometti Signed-off-by: Anton Vorontsov commit 97f70c23a1fa1bffe79187563dc5c6f2c72420a2 Author: Grazvydas Ignotas Date: Fri Feb 12 23:56:46 2010 +0200 power_supply: bq27x00: remove double endian swap The bq27x00 registers are little endian, so just read them as such and don't do double endian swap on LE machines. This also gets rid of strange looking shift that was done after reading 8bit register because endian swap in bq27x00_read() was messing it up. Signed-off-by: Grazvydas Ignotas Acked-by: Rodolfo Giometti Signed-off-by: Anton Vorontsov commit cf24dae14663b88cd64b37df3c7737269aa3cb5e Author: Anatolij Gustschin Date: Tue Feb 16 11:12:26 2010 -0700 powerpc/mpc5121: Add default config for MPC5121 Signed-off-by: Wolfgang Denk Signed-off-by: Detlev Zundel Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit dcc79d7870cfc3b3f11137e040e743dc50f88acf Author: Anatolij Gustschin Date: Tue Feb 16 11:12:04 2010 -0700 powerpc/mpc5121: update mpc5121ads DTS Collects several changes needed after applying previous mpc5121 platform and driver patches: - Add mpc5121 reset module node - Clean up and fix NAND description, remove unused properties here and correct NAND flash chip size. - Clean up I2C nodes: remove obsolete "cell-index" properties, add "fsl,preserve-clocking" property - Add I2C RTC node for m41t61 RTC - Add I2C nodes for AD7414 temperature sensor and AT24C32CD3 EEPROM - Fix compatible property in DMA node - Clean up CAN nodes, remove unused "cell-index" properties - Fix compatible property in DIU node - USB node changes: - use "fsl,mpc5121-usb2-dr" compatible property only - remove "port0" and "port1" properties as these are only used for multi-port host(MHP) module which is not available on MPC5121. - use 'fsl,invert-drvvbus' and 'fsl,invert-pwr-fault' in USB node for internal PHY to specify polarities of the appropriate port pins. Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Detlev Zundel Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 5b2b6255f2fda198cd5176f6cddae600c946a87d Author: Anatolij Gustschin Date: Tue Feb 16 10:47:43 2010 -0700 powerpc/mpc5121: create and register NFC device Instantiate NAND Flash Controller device if it's description is found in the device tree. Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 50aae7241eb94e02d97e03cd88be425ef09e6ab4 Author: Anatolij Gustschin Date: Tue Feb 16 10:47:35 2010 -0700 rtc: Add MPC5121 Real time clock driver Add support for MPC5121 real time clock module. Signed-off-by: John Rigby Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Anatolij Gustschin Acked-by: Alessandro Zummo Signed-off-by: Grant Likely commit a8dbceb755f82f760b56bac4283f9cfc7774e62b Author: Anatolij Gustschin Date: Tue Feb 16 10:36:26 2010 -0700 powerpc/mpc5121: Add machine restart support Add reset module registers representation and machine restart callback for mpc5121 platform. Signed-off-by: Piotr Ziecik Signed-off-by: Wolfgang Denk Signed-off-by: Anatolij Gustschin Reviewed-by: Wolfram Sang Signed-off-by: Grant Likely commit 284ed66fc3beca509a7549aae06af5c74023304c Author: Anatolij Gustschin Date: Tue Feb 16 10:35:13 2010 -0700 powerpc/mpc5121: avoid using arch_initcall for clock init Move mpc5121_clk_init() call to platform init code so it won't get called on non-5121 platforms on a multiplatform kernel. Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 5619c28061ff9d2559a93eaba492935530f2a513 Author: Thomas Gleixner Date: Sat Jul 25 18:35:11 2009 +0200 x86: Convert i8259_lock to raw_spinlock Signed-off-by: Thomas Gleixner commit 0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9 Author: Thomas Gleixner Date: Sat Jul 25 16:49:55 2009 +0200 x86: Convert nmi_lock to raw_spinlock nmi_lock must be a spinning spinlock in -rt. Signed-off-by: Thomas Gleixner commit 40d6753e78a602bdf62e7741c0caa36474882f00 Author: Thomas Gleixner Date: Sat Jul 25 18:33:11 2009 +0200 x86: Convert set_atomicity_lock to raw_spinlock Signed-off-by: Thomas Gleixner commit ff5cf34c809cd5950579e46e7c10c29bc647aaf1 Author: Rafi Rubin Date: Tue Feb 16 10:22:11 2010 -0500 HID: hid-ntrig: Single touch mode tap Add DOUBLETAP to events emitted when in single touch only mode. Users with a single touch firmware report not seeing the DOUBLETAP events; this is a side effect of dropping old mapping for confidence. The confidence mapping may be fine for singletouch mode but causes problems in multitouch mode. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit dade7716925a4e9a31f249f9ca1ed4e2f1495a8c Author: Thomas Gleixner Date: Sat Jul 25 18:39:36 2009 +0200 x86: Convert ioapic_lock and vector_lock to raw_spinlock Signed-off-by: Thomas Gleixner commit 6e705f56a181118f6fbd35e6b443eab33df07290 Author: Florian Westphal Date: Wed Jan 27 14:39:05 2010 +0100 netfilter: ebtables: mark: add CONFIG_COMPAT support Add the required handlers to convert 32 bit ebtables mark match and match target structs to 64bit layout. Signed-off-by: Florian Westphal commit 314ddca3b172fdb9c23a25c545505dbde557602e Author: Florian Westphal Date: Wed Jan 27 14:38:32 2010 +0100 netfilter: ebt_limit: add CONFIG_COMPAT support ebt_limit structure is larger on 64 bit systems due to "long" type used in the (kernel-only) data section. Setting .compatsize is enough in this case, these values have no meaning in userspace. Signed-off-by: Florian Westphal commit 90b89af7e15143c8ea22f5c8818f5a2eec9e75c1 Author: Florian Westphal Date: Sun Feb 7 03:19:12 2010 +0100 netfilter: ebtables: try native set/getsockopt handlers, too ebtables can be compiled to perform userspace-side padding of structures. In that case, all the structures are already in the 'native' format expected by the kernel. This tries to determine what format the userspace program is using. For most set/getsockopts, this can be done by checking the len argument for sizeof(compat_ebt_replace) and re-trying the native handler on error. In case of EBT_SO_GET_ENTRIES, the native handler is tried first, it will error out early when checking the *len argument (the compat version has to defer this check until after iterating over the kernel data set once, to adjust for all the structure size differences). As this would cause error printks, remove those as well, as recommended by Bart de Schuymer. Signed-off-by: Florian Westphal commit 81e675c227ec60a0bdcbb547dc530ebee23ff931 Author: Florian Westphal Date: Tue Jan 5 16:09:46 2010 +0100 netfilter: ebtables: add CONFIG_COMPAT support Main code for 32 bit userland ebtables binary with 64 bit kernels support. Tested on x86_64 kernel only, using 64bit ebtables binary for output comparision. At least ebt_mark, m_mark and ebt_limit need CONFIG_COMPAT hooks, too. remaining problem: The ebtables userland makefile has: ifeq ($(shell uname -m),sparc64) CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 endif struct ebt_replace, ebt_entry_match etc. then contain userland-side padding, i.e. even if we are called from a 32 bit userland, the structures may already be in the right format. This problem is addressed in a follow-up patch. Signed-off-by: Florian Westphal commit 49facff9f92508413f3da598f86aaf6c1121ff27 Author: Florian Westphal Date: Sun Feb 7 02:48:47 2010 +0100 netfilter: ebtables: split update_counters into two functions allows to call do_update_counters() from upcoming CONFIG_COMPAT code instead of copy&pasting the same code. Signed-off-by: Florian Westphal commit 837395aa863142be7c38be0ca780aef21b12b49f Author: Florian Westphal Date: Sun Feb 7 02:11:34 2010 +0100 netfilter: ebtables: split copy_everything_to_user into two functions once CONFIG_COMPAT support is added to ebtables, the new copy_counters_to_user function can be called instead of duplicating code. Also remove last use of MEMPRINT, as requested by Bart De Schuymer. Signed-off-by: Florian Westphal commit e788759f44b29e5b1bc27a265dece7dcfa4234af Author: Florian Westphal Date: Thu Feb 4 18:38:53 2010 +0100 netfilter: ebtables: split do_replace into two functions once CONFIG_COMPAT support is merged this allows to call do_replace_finish() after doing the CONFIG_COMPAT conversion instead of copy & pasting this. Signed-off-by: Florian Westphal commit 17c0e7107bed3d578864e6519f7f4e4c324c8f58 Author: Ingo Molnar Date: Fri Jul 3 08:29:25 2009 -0500 x86: Mark atomic irq ops raw for 32bit legacy The atomic ops emulation for 32bit legacy CPUs floods the tracer with irq off/on entries. The irq disabled regions are short and therefor not interesting when chasing long irq disabled latencies. Mark them raw and keep them out of the trace. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5 Author: Andy Green Date: Mon Feb 1 13:28:54 2010 +0100 imx-serial-excessive-status-clearing-on-break.patch cc: Sasha Hauer We noticed that we were only able to communicate once with a GSM module per session, if we powered down the module then the serial driver was broken until reset, no traffic or /proc/interrupts activity could be seen any more. Volker noticed it was provoked by a long "break" seen on the wire when the RX was not driven during powerdown, we discovered we could kill the serial driver just by forcing RX low extenally for a little while. I saw that the processing for BREAK in the driver gets too excited and clears down all set bits in USR2, including that a character is pending. This stops all further characters getting processed. The attached one-liner makes the serial driver immortal against BREAK. Signed-off-by: Andy Green Signed-off-by: Volker Ernst Signed-off-by: Sascha Hauer commit 6e40f5bbbc734231bc5809d3eb785e3c21f275d7 Merge: 301ba04 0970d29 Author: Thomas Gleixner Date: Tue Feb 16 16:48:56 2010 +0100 Merge branch 'sched/urgent' into sched/core Conflicts: kernel/sched.c Necessary due to the urgent fixes which conflict with the code move from sched.c to sched_fair.c Signed-off-by: Thomas Gleixner commit 83f0d53993b2967e54186468b0fc4321447f68f1 Author: Steven Rostedt Date: Tue Feb 16 10:38:47 2010 -0500 tracing: Add notrace to TRACE_EVENT implementation functions The functions used to implement the TRACE_EVENT macro show up in function tracing. This is considered a distraction, and these should not be displayed. For example: -0 [000] 57.202149: task_of <-update_stats_wait_end -0 [000] 57.202149: ftrace_raw_event_sched_stat_wait <-update_stats_wait_end -0 [000] 57.202150: ftrace_raw_event_id_sched_stat_template <-ftrace_raw_event_sched_stat_wait -0 [000] 57.202150: sched_stat_wait: comm=sshd pid=2735 delay=19207 [ns] The "ftrace_raw_event_*" traces are just the utility functions used by TRACE_EVENT tracepoints. Cc: Thomas Gleixner Requested-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit 0970d2992dfd7d5ec2c787417cf464f01eeaf42a Author: Peter Zijlstra Date: Mon Feb 15 14:45:54 2010 +0100 sched: Fix race between ttwu() and task_rq_lock() Thomas found that due to ttwu() changing a task's cpu without holding the rq->lock, task_rq_lock() might end up locking the wrong rq. Avoid this by serializing against TASK_WAKING. Reported-by: Thomas Gleixner Signed-off-by: Peter Zijlstra LKML-Reference: <1266241712.15770.420.camel@laptop> Signed-off-by: Thomas Gleixner commit 9000f05c6d1607f79c0deacf42b09693be673f4c Author: Suresh Siddha Date: Fri Feb 12 17:14:22 2010 -0800 sched: Fix SMT scheduler regression in find_busiest_queue() Fix a SMT scheduler performance regression that is leading to a scenario where SMT threads in one core are completely idle while both the SMT threads in another core (on the same socket) are busy. This is caused by this commit (with the problematic code highlighted) commit bdb94aa5dbd8b55e75f5a50b61312fe589e2c2d1 Author: Peter Zijlstra Date: Tue Sep 1 10:34:38 2009 +0200 sched: Try to deal with low capacity @@ -4203,15 +4223,18 @@ find_busiest_queue() ... for_each_cpu(i, sched_group_cpus(group)) { + unsigned long power = power_of(i); ... - wl = weighted_cpuload(i); + wl = weighted_cpuload(i) * SCHED_LOAD_SCALE; + wl /= power; - if (rq->nr_running == 1 && wl > imbalance) + if (capacity && rq->nr_running == 1 && wl > imbalance) continue; On a SMT system, power of the HT logical cpu will be 589 and the scheduler load imbalance (for scenarios like the one mentioned above) can be approximately 1024 (SCHED_LOAD_SCALE). The above change of scaling the weighted load with the power will result in "wl > imbalance" and ultimately resulting in find_busiest_queue() return NULL, causing load_balance() to think that the load is well balanced. But infact one of the tasks can be moved to the idle core for optimal performance. We don't need to use the weighted load (wl) scaled by the cpu power to compare with imabalance. In that condition, we already know there is only a single task "rq->nr_running == 1" and the comparison between imbalance, wl is to make sure that we select the correct priority thread which matches imbalance. So we really need to compare the imabalnce with the original weighted load of the cpu and not the scaled load. But in other conditions where we want the most hammered(busiest) cpu, we can use scaled load to ensure that we consider the cpu power in addition to the actual load on that cpu, so that we can move the load away from the guy that is getting most hammered with respect to the actual capacity, as compared with the rest of the cpu's in that busiest group. Fix it. Reported-by: Ma Ling Initial-Analysis-by: Zhang, Yanmin Signed-off-by: Suresh Siddha Signed-off-by: Peter Zijlstra LKML-Reference: <1266023662.2808.118.camel@sbs-t61.sc.intel.com> Cc: stable@kernel.org [2.6.32.x] Signed-off-by: Thomas Gleixner commit 28f5318167adf23b16c844b9c2253f355cb21796 Author: Vaidyanathan Srinivasan Date: Mon Feb 8 15:35:55 2010 +0530 sched: Fix sched_mv_power_savings for !SMT Fix for sched_mc_powersavigs for pre-Nehalem platforms. Child sched domain should clear SD_PREFER_SIBLING if parent will have SD_POWERSAVINGS_BALANCE because they are contradicting. Sets the flags correctly based on sched_mc_power_savings. Signed-off-by: Vaidyanathan Srinivasan Signed-off-by: Peter Zijlstra LKML-Reference: <20100208100555.GD2931@dirshya.in.ibm.com> Cc: stable@kernel.org [2.6.32.x] Signed-off-by: Thomas Gleixner commit dbf2b17de505d390b5ecf5b5944fc0c88f6d66fe Author: Rafi Rubin Date: Fri Feb 12 21:13:05 2010 -0500 HID: hid-ntrig: multitouch cleanup and fix This cleans up the identification of multitouch groups and enables the end of group sync. Taps are now explicitly handled to adjust for the changes in the event stream in multitouch mode. Added triple and quad tap for the benefit of tools that recognize different tap types but do not have full multi touch support. This cleans up the behavior particularly for the latest firmware, which didn't work particularly well with the older version of the driver. In this form, when multitouch is active, both mt and st events will come out of the "N-Trig MultiTouch" device. And when its not st events will come out of "N-Trig Touchscreen". Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit b0549cf1a35a92edf053d94066e60fb0ed02bb71 Author: Rafi Rubin Date: Thu Feb 11 22:14:06 2010 -0500 HID: n-trig: remove unnecessary tool switching With the pen and touch split apart, we no longer need to inject additional tool switching events. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 943ed464f3722de0569cf41ba6ec094768ac046d Author: Rafi Rubin Date: Thu Feb 11 22:14:05 2010 -0500 HID: hid-ntrig add multi input quirk and clean up Added a quirk to enable distinct input devices. The digitizer utilizes three inputs to represent pen, multitouch and a normal touch screen. With the Pen partitioned, it behaves well and does not need special handling. Also, I set names to the input devices to clarify the functions of the various inputs. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 1d5cfcdff793e2f34ec61d902fa5ee0c7e4a2208 Author: Paul Mundt Date: Tue Feb 16 21:43:38 2010 +0900 sh: Kill off some superfluous legacy PMB special casing. The __va()/__pa() offsets and the boot memory offsets are consistent for all PMB users, so there is no need to special case these for legacy PMB. Kill the special casing off and depend on CONFIG_PMB across the board. This also fixes up yet another addressing bug for sh64. Signed-off-by: Paul Mundt commit 8d0c123f8b710561cfd34f6e1a5bebc27988edbe Author: Richard Hartmann Date: Tue Feb 16 20:34:59 2010 +0800 crypto: aes_generic - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0047e81dc366a0690b4765250c3a1d8caf3797c4 Author: Richard Hartmann Date: Tue Feb 16 20:34:07 2010 +0800 crypto: fcrypt - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 5b37c19e36de46d2a96ce127addb4c4bbaa4619a Author: Richard Hartmann Date: Tue Feb 16 20:33:49 2010 +0800 crypto: ecb - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit a501121e30c4b41dbdae47302c1ebebc7821511a Author: Richard Hartmann Date: Tue Feb 16 20:32:31 2010 +0800 crypto: des_generic - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 9472d763b3087f2899379a77b39499fcd37d6d2b Author: Richard Hartmann Date: Tue Feb 16 20:32:13 2010 +0800 crypto: deflate - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit c9af70fb86bbede6197081ded69407a9192716c8 Author: Richard Hartmann Date: Tue Feb 16 20:31:54 2010 +0800 crypto: crypto_null - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit d150975bc759af51d655d109fd6633ad1bc67df8 Author: Richard Hartmann Date: Tue Feb 16 20:31:37 2010 +0800 crypto: cipher - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit db83aabfe115cb8a75f79ada5ce5fdc2d52f5a4d Author: Richard Hartmann Date: Tue Feb 16 20:31:19 2010 +0800 crypto: crc32 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0375d66dd04ba828066807edccf7ae8245f903d2 Author: Richard Hartmann Date: Tue Feb 16 20:31:04 2010 +0800 crypto: compress - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 87c3be87e9e1d8ec4ad57d0e505099529383dd4a Author: Richard Hartmann Date: Tue Feb 16 20:29:45 2010 +0800 crypto: cast6 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit a1f4c9222d5e71f9c2646f47beb4a0a42b42fdc4 Author: Richard Hartmann Date: Tue Feb 16 20:29:01 2010 +0800 crypto: cast5 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 621dd3692978a7dd84df2d8ea822b805b40de498 Author: Richard Hartmann Date: Tue Feb 16 20:27:57 2010 +0800 crypto: camellia - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit f3542e6d7b246e88b038e608358606ddd1f09870 Author: Richard Hartmann Date: Tue Feb 16 20:27:20 2010 +0800 crypto: authenc - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 3d01a33b77b120f8b11d8757c346442ed7961b11 Author: Richard Hartmann Date: Tue Feb 16 20:26:46 2010 +0800 crypto: api - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 189bd4b056af76325e491baea4338a140d0e86d8 Author: Richard Hartmann Date: Tue Feb 16 20:25:39 2010 +0800 crypto: anubis - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 5357c6c43ec0f420c33da91019ae24e17a929ece Author: Richard Hartmann Date: Tue Feb 16 20:25:21 2010 +0800 crypto: algapi - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0d8fb0a139093297851f56e2070bf580e9667dd7 Author: Richard Hartmann Date: Tue Feb 16 20:24:30 2010 +0800 crypto: blowfish - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 3922538fe1625e6ddded56c08c290b3440846cfd Author: Richard Hartmann Date: Tue Feb 16 20:24:07 2010 +0800 crypto: aead - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit c4ede64a6e0220c9b30f07ab41080c8e90245116 Author: Richard Hartmann Date: Tue Feb 16 20:23:37 2010 +0800 crypto: ablkcipher - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 291186e049d7f8178ad31d43c38a53889f25d79e Author: Jaroslav Kysela Date: Tue Feb 16 11:55:18 2010 +0100 ALSA: usbmixer - use MAX_ID_ELEMS where possible Signed-off-by: Jaroslav Kysela commit 7affdc17d49b5d9e9c350d5d99ee34ab8655c7b4 Author: Jaroslav Kysela Date: Tue Feb 16 11:52:27 2010 +0100 ALSA: usbmixer - add usb_id value to usbmixer proc file Signed-off-by: Jaroslav Kysela commit 3be522a9514f58e0596db34898a514df206cadc5 Author: Jaroslav Kysela Date: Tue Feb 16 11:55:43 2010 +0100 ALSA: pcm core - fix fifo_size channels interval check Signed-off-by: Jaroslav Kysela Cc: commit ebfdeea3df2b8c265975b6acc47996a0b7c507e8 Author: Jaroslav Kysela Date: Tue Feb 16 11:17:09 2010 +0100 ALSA: usbmixer - introduce /proc/asound/card#/usbmixer file The usbmixer proc file contains mapping between ALSA control API and USB mixer control units. The purpose of this file is for debugging and a problem diagnostics. Signed-off-by: Jaroslav Kysela commit b8f1f5983fbe751aa3d07d9ce7ebb0c23bf4b7e4 Merge: ba9341d 47b5d02 Author: Jaroslav Kysela Date: Tue Feb 16 11:25:03 2010 +0100 Merge branch 'topic/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel commit ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 Merge: d39e82d f167e1d Author: Jaroslav Kysela Date: Tue Feb 16 11:19:18 2010 +0100 Merge branch 'fixes' into devel commit efd54ea315f645ef318708aab5714a5f1f432d03 Author: Paul Mundt Date: Tue Feb 16 18:39:30 2010 +0900 sh: Merge the legacy PMB mapping and entry synchronization code. This merges the code for iterating over the legacy PMB mappings and the code for synchronizing software state with the hardware mappings. There's really no reason to do the same iteration twice, and this also buys us the legacy entry logging facility for the dynamic PMB case. Signed-off-by: Paul Mundt commit d39e82db73eb876c60d00f00219d767b3be30307 Author: Sebastien Alaiwan Date: Tue Feb 16 08:55:08 2010 +0100 ALSA: USB MIDI support for Access Music VirusTI Here's a patch that adds MIDI support through USB for one of the Access Music synths, the VirusTI. The synth uses standard USBMIDI protocol on its USB interface 3, although it does signal "vendor specific" class. A magic string has to be sent on interface 3 to enable the sending of MIDI from the synth (this string was found by sniffing usb communication of the Windows driver). This is all my patch does, and it works on my computer. Please note that the synth can also do standard usb audio I/O on its interfaces 2&3, which already works with the current snd-usb-audio driver, except for the audio input from the synth. I'm going to work on it when I have some time. Signed-off-by: Sebastien Alaiwan Signed-off-by: Clemens Ladisch (cosmetics, list terminator) Signed-off-by: Jaroslav Kysela commit 38bcb37a6f63fcdfcc0dd0af3ec5c03a4b7be48e Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 2 14:37:56 2010 -0800 ACPICA: fix acpi_ex_release_mutex() comment trivial, leftover from my NULL pointer dereference patch which got 'superseded' by commit fbc3be2 Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ded180e7ebfc324b36a94931f99d0705dcd8da29 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 2 14:37:55 2010 -0800 ACPI: remove superfluous NULL pointer check from acpi_processor_get_throttling_info() Dan's list contains: drivers/acpi/processor_throttling.c +1139 acpi_processor_get_throttling_info(11) warning: variable derefenced before check 'pr' acpi_processor_get_throttling_info() is never called with pr == NULL. [ bart: the potential NULL pointer dereference was finally fixed in (much later than mine) commit 5cfa245 but my patch is still valid ] Reported-by: Dan Carpenter Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 0e026445fb36852d3102cb8bb24868765fe5816a Author: Len Brown Date: Tue Feb 16 03:01:42 2010 -0500 ACPI: delete unused acpi_evaluate_string() Roel found a logic issue in the #if 0 acpi_evaluate_string(): - || (element->type != ACPI_TYPE_BUFFER) + && (element->type != ACPI_TYPE_BUFFER) delete the dead code. pointed-out-by: Roel Kluin Signed-off-by: Len Brown commit 55cef91a5d553265f03fe159f9fcdfac36902248 Author: Paul Mundt Date: Tue Feb 16 17:14:04 2010 +0900 sh: Prevent fixed slot PMB remapping from clobbering boot entries. The PMB initialization code walks the entries and synchronizes the software PMB state with the hardware mappings, preserving the slot index. Unfortunately pmb_alloc() only tested the bit position in the entry map and failed to set it, resulting in subsequent remaps being able to be dynamically assigned a slot that trampled an existing boot mapping with general badness ensuing. Signed-off-by: Paul Mundt commit f167e1d073278fe231bbdd5d6c24fb9d091aa544 Author: Clemens Ladisch Date: Mon Feb 15 08:55:28 2010 +0100 ALSA: usb-audio: reduce MIDI packet size to work around broken firmware Extend the list of devices whose firmware does not expect more than one USB MIDI packet in one USB packet. bug report: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3752 Signed-off-by: Clemens Ladisch Cc: Signed-off-by: Jaroslav Kysela commit 2da5d31bc72d0a36dc16af7f5d5baa4f86df9c76 Author: James Morris Date: Tue Feb 16 17:29:06 2010 +1100 security: fix a couple of sparse warnings Fix a couple of sparse warnings for callers of context_struct_to_string, which takes a *u32, not an *int. These cases are harmless as the values are not used. Signed-off-by: James Morris Acked-by: KaiGai Kohei commit 97d6931ead3e89a764cdaa3ad0924037367f0d34 Author: Tetsuo Handa Date: Tue Feb 16 09:46:15 2010 +0900 TOMOYO: Remove unneeded parameter. tomoyo_path_perm() tomoyo_path2_perm() and tomoyo_check_rewrite_permission() always receive tomoyo_domain(). We can move it from caller to callee. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 339c6e99853d2ef1f02ad8a313e079050a300427 Author: Eric Dumazet Date: Mon Feb 15 21:51:33 2010 -0800 ethtool: reduce stack usage dev_ethtool() is currently using 604 bytes of stack, even with gcc-4.4.2 objdump -d vmlinux | scripts/checkstack.pl ... 0xc04bbc33 dev_ethtool [vmlinux]: 604 ... Adding noinline attributes to selected functions can reduce stack usage. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5cdaaa12866e916d0ada8b56c5f0e543cfc7fe3d Author: John Linn Date: Mon Feb 15 21:51:00 2010 -0800 net: emaclite: adding MDIO and phy lib support These changes add MDIO and phy lib support to the driver as the IP core now supports the MDIO bus. The MDIO bus and phy are added as a child to the emaclite in the device tree as illustrated below. mdio { #address-cells = <1>; #size-cells = <0>; phy0: phy@7 { compatible = "marvell,88e1111"; reg = <7>; } ; } Signed-off-by: Sadanand Mutyala Signed-off-by: John Linn Acked-by: Grant Likely Signed-off-by: David S. Miller commit a9288525d2aed806c1b8a785c226d4a9e6371650 Author: andrew hendry Date: Sun Feb 14 02:00:45 2010 +0000 X25: Dont let x25_bind use addresses containing characters Addresses should be all digits. Stops x25_bind using addresses containing characters. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit b18e7a06857833d2c7c8c8457e5a3a7c3327f643 Author: andrew hendry Date: Sun Feb 14 02:00:11 2010 +0000 X25: Fix x25_create errors for bad protocol and ENOBUFS alloc_socket failures should return -ENOBUFS a bad protocol should return -EINVAL Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit cf588477a3fbf085426e5c0b6205984ebb7e2187 Author: Sathya Perla Date: Sun Feb 14 21:22:01 2010 +0000 be2net: implement EEH pci error recovery handlers The code has been tested on IBM pSeries server. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 0dca3a843632c2fbb6e358734fb08fc23e800f50 Author: jamal Date: Thu Feb 11 00:53:13 2010 +0000 xfrm: Flushing empty SPD generates false events Observed similar behavior on SPD as previouly seen on SAD flushing.. This fixes it. cheers, jamal commit 428b20432dc31bc2e01a94cd451cf5a2c00d2bf4 Author: Jamal Hadi Salim Date: Thu Feb 11 05:49:38 2010 -0500 xfrm: Flushing empty SPD generates false events To see the effect make sure you have an empty SPD. On window1 "ip xfrm mon" and on window2 issue "ip xfrm policy flush" You get prompt back in window1 and you see the flush event on window2. With this fix, you still get prompt on window1 but no event on window2. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 19f4c7133fc1b94001b997c4843d0a9192ee63e5 Author: jamal Date: Wed Feb 10 23:51:27 2010 +0000 xfrm: Flushing empty SAD generates false events To see the effect make sure you have an empty SAD. -On window1 "ip xfrm mon" -on window2 issue "ip xfrm state flush" You get prompt back in window1 and you see the flush event on window2. With this fix, you still get prompt on window1 but no event on window2. I was tempted to return -ESRCH on window1 (which would show "RTNETLINK answers: No such process") but didnt want to change current behavior. cheers, jamal commit 5f3dd4a772326166e1bcf54acc2391df00dc7ab5 Author: Jamal Hadi Salim Date: Thu Feb 11 04:41:36 2010 -0500 xfrm: Flushing empty SAD generates false events To see the effect make sure you have an empty SAD. On window1 "ip xfrm mon" and on window2 issue "ip xfrm state flush" You get prompt back in window1 and you see the flush event on window2. With this fix, you still get prompt on window1 but no event on window2. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9546377c42e12513b33925ab829d893dcf521c5f Author: Shan Wei Date: Thu Feb 11 00:12:45 2010 +0000 IPv6: Delete redundant counter of IPSTATS_MIB_REASMFAILS When no more memory can be allocated, fq_find() will return NULL and increase the value of IPSTATS_MIB_REASMFAILS. In this case, ipv6_frag_rcv() also increase the value of IPSTATS_MIB_REASMFAILS. So, the patch deletes redundant counter of IPSTATS_MIB_REASMFAILS in fq_find(). and deletes the unused parameter of idev. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 564517e804c9c6d4e29c270bfc1517404d27107b Author: Arnd Bergmann Date: Thu Feb 11 05:55:39 2010 +0000 net/macvtap: fix reference counting The RCU usage in the original code was broken because there are cases where we possibly sleep with rcu_read_lock held. As a fix, change the macvtap_file_get_queue to get a reference on the socket and the netdev instead of taking the full rcu_read_lock. Also, change macvtap_file_get_queue failure case to not require a subsequent macvtap_file_put_queue, as pointed out by Ed Swierk. Signed-off-by: Arnd Bergmann Cc: Ed Swierk Cc: Sridhar Samudrala Acked-by: Sridhar Samudrala Acked-by: Ed Swierk Signed-off-by: David S. Miller commit e9449d85c67127d6f9d01aad8963d567ab02cb96 Author: Divy Le Ray Date: Sat Feb 13 09:44:35 2010 +0000 cxgb3: fix link flap The driver is expected to report that the link is up when the phy Rx signal is established and the mac has not detected a link fault. The code is however broken, the driver does not check the link fault status when the phy link status changes. The link fault status being checked within a short period of time, it leads to link up/link down events. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 38a8fc0fcf86f131f8bddf3787f9dfa7325bd981 Author: Divy Le Ray Date: Sat Feb 13 09:44:30 2010 +0000 cxgb3: FIx VLAN over Jumbo frames The mac is expected to auto-inflate the Maximum Frame size for VLAN tagged frames. It however does not work with jumbo frames. Work around the bug adding 4 to the Maximum Frame for MTUs greater than 1536. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit d41a5b7da223f7a80844fb3e948e8d5e6181f214 Author: Peter Waskiewicz Date: Fri Feb 12 13:48:44 2010 +0000 ixgbe: Cleanup incorrect header comments The recent n-tuple patches added some comments to the headers of the Flow Director functions that aren't accurate. This cleans them up, and is a purely cosmetic patch. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0d643e1fb4207711d9c148b5c6a2820550a4a154 Author: Peter Waskiewicz Date: Fri Feb 12 13:48:25 2010 +0000 ethtool: Move n-tuple capability check into set_flags set_flags should check if the underlying device supports n-tuple filter programming before setting the device flags on the netdevice. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e858911804f5ecadb41afd61582a11f68d416328 Author: Peter Waskiewicz Date: Fri Feb 12 13:48:05 2010 +0000 ethtool: Fix filter addition when caching n-tuple filters We can allow a filter to be added successfully to the underlying hardware, but still return an error if the cached list memory allocation fails. This patch fixes that condition. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 Author: Nobuhiro Iwamatsu Date: Mon Feb 15 08:37:50 2010 +0000 sh: Fix zImage boot using fixed PMB. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit fb1e776050f0f6a7b90eba03a1d001756454f9dc Author: Magnus Damm Date: Mon Feb 15 11:53:43 2010 +0000 sh: fix sh7724 SDHI support using INTC force_disable Update the sh7724 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d85429a31790361b9e952be3817134c23b3b758a Author: Magnus Damm Date: Mon Feb 15 11:40:25 2010 +0000 sh: extend INTC with force_disable Extend the shared INTC code with force_disable support to allow keeping mask bits statically disabled. Needed for SDHI support to mask out unsupported interrupt sources. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 92e1f9a7ed613b36f3aaf8b04a79e2fd4fa37ec1 Author: Phil Edworthy Date: Thu Feb 11 10:24:25 2010 +0000 video: sh_mobile_lcdcfb: Fix panning. Fixed SH-Mobile panning. Previously the address of the frame to be displayed was updated in the VSync end interrupt. This meant there was a minimum of 1 frame bewteen calling FBIOPAN_DISPLAY ioctl and the pan occuring. This meant that apps were not able to use the FBIO_WAITFORVSYNC ioctl to wait for the pan to complete. This patch moves the write to LDSA1R mirror reg into the pan ioctl. Tested on MS7724 board against 2.6.33-rc7 Signed-off-by: Phil Edworthy Signed-off-by: Paul Mundt commit 40331b21f5fdb746e80fc609ef60ef71b5cd47d9 Author: Phil Edworthy Date: Mon Feb 15 13:57:49 2010 +0000 video: sh_mobile_lcdcfb: Add wait for vsync. Added FBIO_WAITFORVSYNC ioctl for SH-Mobile devices. Tested on MS7724 and MigoR boards against 2.6.33-rc7. Signed-off-by: Phil Edworthy Signed-off-by: Paul Mundt commit 942fa3b63eb525aa0512ba28c42e656d8efc6787 Author: Alan Cox Date: Mon Feb 8 10:03:17 2010 +0000 x86, mtrr: Kill over the top warn Fixes bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=12558 Fixes bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=12317 (and if this really needed to be a warn you'd be responding to the bugs left in bugzilla from it...) Signed-off-by: Alan Cox LKML-Reference: <20100208100239.2568.2940.stgit@localhost.localdomain> Signed-off-by: H. Peter Anvin commit 7ef612331fb219620cc1abfc2446bb027d388aa0 Author: Tetsuo Handa Date: Tue Feb 16 08:03:30 2010 +0900 TOMOYO: Use shorter names. Use shorter name to reduce newlines needed for 80 columns limit. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit ca2107c9d6cf44fb915402d6f12b9d9ff3925cd7 Author: David Rientjes Date: Mon Feb 15 13:43:33 2010 -0800 x86, numa: Remove configurable node size support for numa emulation Now that numa=fake=[MG] is implemented, it is possible to remove configurable node size support. The command-line parsing was already broken (numa=fake=*128, for example, would not work) and since fake nodes are now interleaved over physical nodes, this support is no longer required. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 8df5bb34defd685fe86f60746bbf3d47d1c6f033 Author: David Rientjes Date: Mon Feb 15 13:43:30 2010 -0800 x86, numa: Add fixed node size option for numa emulation numa=fake=N specifies the number of fake nodes, N, to partition the system into and then allocates them by interleaving over physical nodes. This requires knowledge of the system capacity when attempting to allocate nodes of a certain size: either very large nodes to benchmark scalability of code that operates on individual nodes, or very small nodes to find bugs in the VM. This patch introduces numa=fake=[MG] so it is possible to specify the size of each node to allocate. When used, nodes of the size specified will be allocated and interleaved over the set of physical nodes. FAKE_NODE_MIN_SIZE was also moved to the more-appropriate include/asm/numa_64.h. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 68fd111e02b979876359c7b471a8bcbca0628b75 Author: David Rientjes Date: Mon Feb 15 13:43:25 2010 -0800 x86, numa: Fix numa emulation calculation of big nodes numa=fake=N uses split_nodes_interleave() to partition the system into N fake nodes. Each node size must have be a multiple of FAKE_NODE_MIN_SIZE, otherwise it is possible to get strange alignments. Because of this, the remaining memory from each node when rounded to FAKE_NODE_MIN_SIZE is consolidated into a number of "big nodes" that are bigger than the rest. The calculation of the number of big nodes is incorrect since it is using a logical AND operator when it should be multiplying the rounded-off portion of each node with N. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 084da356f6e55ce42f1d2739178502023908c107 Author: Tetsuo Handa Date: Mon Feb 15 15:10:39 2010 +0900 TOMOYO: Use enum for index numbers. Use enum to declare index numbers. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 6cb8e1f71c407930f0f07feceeea1da73881038b Author: Jerome Glisse Date: Mon Feb 15 21:36:33 2010 +0100 drm/radeon/kms: fix bo's fence association Previous code did associate fence to bo before the fence was emited and it also didn't lock protected access to ttm sync_obj member. Both of this flaw leads to possible race between different code path. This patch fix this by associating fence only once the fence is emitted and properly lock protect access to sync_obj member of ttm. Fix: https://bugs.freedesktop.org/show_bug.cgi?id=26438 and likely similar others bugs Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit e821767bebdae6a46f6d897a4385f6218bee7f27 Author: Jerome Glisse Date: Mon Feb 15 21:36:13 2010 +0100 drm/radeon/kms: fix indirect buffer management V2 There is 3 different distinct states for an indirect buffer (IB) : 1- free with no fence 2- free with a fence 3- non free (fence doesn't matter) Previous code mixed case 2 & 3 in a single one leading to possible catastrophique failure. This patch rework the handling and properly separate each case. So when you get ib we set the ib as non free and fence status doesn't matter. Fence become active (ie has a meaning for the ib code) once the ib is scheduled or free. This patch also get rid of the alloc bitmap as it was overkill, we know go through IB pool list like in a ring buffer as the oldest IB is the first one the will be free. Fix : https://bugs.freedesktop.org/show_bug.cgi?id=26438 and likely other bugs. V2 remove the scheduled list, it's useless now, fix free ib scanning Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 18fe1cad889fe6c1acbf4dfc576e82a13cf1a30c Author: Fenkart/Bostandzhyan Date: Sun Feb 7 21:48:38 2010 +0100 ARM: 5930/1: Add PKMAP area description to memory.txt. Also adapts delimiters of neighbouring modules area. Tested-by: H Hartley Sweeten Signed-off-by: Andreas Fenkart Signed-off-by: Russell King commit a183927213df225bd93d21857b6aaafbb95e590d Author: Fenkart/Bostandzhyan Date: Sun Feb 7 21:47:58 2010 +0100 ARM: 5929/1: Add checks to detect overlap of memory regions. Tested-by: H Hartley Sweeten Signed-off-by: Andreas Fenkart Signed-off-by: Russell King commit c931b4f655a1b86c929384e674eb8c31795f3bd7 Author: Fenkart/Bostandzhyan Date: Sun Feb 7 21:47:17 2010 +0100 ARM: 5928/1: Change type of VMALLOC_END to unsigned long. Makes it consistent with VMALLOC_START Tested-by: H Hartley Sweeten Signed-off-by: Andreas Fenkart Signed-off-by: Russell King commit a7bd08c82e4f74387a39eeebb942712f23967420 Author: Fenkart/Bostandzhyan Date: Sun Feb 7 21:46:33 2010 +0100 ARM: 5927/1: Make delimiters of DMA area globally visibly. Adds DMA area to 'virtual memory map' startup message Tested-by: H Hartley Sweeten Signed-off-by: Andreas Fenkart Signed-off-by: Russell King commit db9ef1af4879c121c354ad2f653f185f1d50fd89 Author: Fenkart/Bostandzhyan Date: Sun Feb 7 21:45:47 2010 +0100 ARM: 5926/1: Add "Virtual kernel memory..." printout. Code based on parisc and x86_32. Tested-by: H Hartley Sweeten Signed-off-by: Andreas Fenkart Signed-off-by: Russell King commit 22192b37bbeec5d850c233491f3cb7610363ce34 Author: Santosh Shilimkar Date: Thu Feb 4 19:44:52 2010 +0100 ARM: 5920/1: OMAP4: Enable L2 Cache This patch enables L2 cache and associated Errata on the OMAP4430 SDP. Signed-off-by: Santosh Shilimkar Acked-by: Tony Lindgren Signed-off-by: Russell King commit 9e65582a8e8715f883a34eea66e0643778ce878d Author: Santosh Shilimkar Date: Thu Feb 4 19:42:42 2010 +0100 ARM: 5919/1: ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean lines This patch implements the work-around for the errata 588369.The secure API is used to alter L2 debug register because of trust-zone. This version updated with comments from Russell and Catalin and generated against 2.6.33-rc6 mainline kernel. Detail comments can be found: http://www.spinics.net/lists/linux-omap/msg23431.html Signed-off-by: Woodruff Richard Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Acked-by: Tony Lindgren Signed-off-by: Russell King commit d309427e792ea750cdd312e7a92cf6047ae44962 Author: Santosh Shilimkar Date: Thu Feb 4 19:37:09 2010 +0100 ARM: 5917/1: OMAP4: Add L2 Cache support This patch adds L2 Cache support for OMAP4. External L2 cache is used in OMAP4 CC: Catalin Marinas Signed-off-by: Santosh Shilimkar Acked-by: Tony Lindgren Signed-off-by: Russell King commit 424d6b145f863d012c540082d0c1afb5bb4dea48 Author: Santosh Shilimkar Date: Thu Feb 4 19:35:06 2010 +0100 ARM: 5916/1: ARM: L2 : Add maintainace by line helper functions This patch adds the cache maintainance by line helper functions. Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Acked-by: Tony Lindgren Signed-off-by: Russell King commit ad187f956108e1c56b444706212bf08d84c0bee0 Author: Russell King Date: Sat Feb 6 11:36:23 2010 +0000 ARM: vfp ptrace: no point flushing hw context for PTRACE_GETVFPREGS If we're only reading the VFP context via the ptrace call, there's no need to invalidate the hardware context - we only need to do that on PTRACE_SETVFPREGS. This allows more efficient monitoring of a traced task. Signed-off-by: Russell King commit 54cb3dbb4a1cccd6b1bffc169ff638f8e74daf44 Author: Russell King Date: Sat Feb 6 11:27:45 2010 +0000 ARM: vfp: fix vfp_sync_state() The more I look at vfp_sync_state(), the more I believe it's trying to do its job in a really obscure way. Essentially, last_VFP_context[] tracks who owns the state in the VFP hardware. If last_VFP_context[] is the context for the thread which we're interested in, then the VFP hardware has context which is not saved in the software state - so we need to bring the software state up to date. If last_VFP_context[] is for some other thread, we really don't care what state the VFP hardware is in; it doesn't contain any information pertinent to the thread we're trying to deal with - so don't touch the hardware. Signed-off-by: Russell King commit 462f39a8c7496c95f4de91ef46d875f46e0fa271 Author: Russell King Date: Sat Feb 6 10:35:23 2010 +0000 ARM: ptrace: get rid of PTRACE_{PEEK,POKE}{TEXT,DATA} The generic ptrace_request() handles these for us, so there's no need to duplicate them in arch code. Signed-off-by: Russell King commit d23bc1b3a7e6db935acb9a949a5985d9b77dfd13 Author: Daniel Jacobowitz Date: Tue Feb 2 18:22:16 2010 +0100 ARM: 5912/1: Define a 32-bit Thumb-2 breakpoint instruction Recognize 0xf7f0 0xa000 as a 32-bit breakpoint instruction for Thumb-2. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 1a28e3d977860dc760909083df625b300f695680 Author: Tony Lindgren Date: Mon Feb 1 23:30:26 2010 +0100 ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selected Otherwise the kernel built with both CPU_V6 and CPU_V7 will not boot on omap2. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 11805bcfa411c816b7c76fc40724be6733c74ffc Author: Catalin Marinas Date: Tue Jan 26 19:09:42 2010 +0100 ARM: 5905/1: ARM: Global ASID allocation on SMP The current ASID allocation algorithm doesn't ensure the notification of the other CPUs when the ASID rolls over. This may lead to two processes using the same ASID (but different generation) or multiple threads of the same process using different ASIDs. This patch adds the broadcasting of the ASID rollover event to the other CPUs. To avoid a race on multiple CPUs modifying "cpu_last_asid" during the handling of the broadcast, the ASID numbering now starts at "smp_processor_id() + 1". At rollover, the cpu_last_asid will be set to NR_CPUS. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 48ab7e09e0a7c00a217f87e4b57dfbee9c603e79 Author: Jeremy Kerr Date: Wed Jan 27 01:13:31 2010 +0100 ARM: 5906/1: arm: change command_line to cmd_line drivers/of/fdt expects a cmd_line symbol, while arm uses command_line. Change to the former, so that we can eventually share with the fdt code. Signed-off-by: Jeremy Kerr Signed-off-by: Russell King commit c5113b61baf7a9a8616eca83e20847e7fecdc679 Author: Rabin Vincent Date: Mon Jan 25 19:43:03 2010 +0100 ARM: 5897/1: spinlock: don't use deprecated barriers on ARMv7 On ARMv7, the use of the cp15 operations for barriers is deprecated in favour of the isb, dsb, and dmb instructions. Change the locking functions to use the appropriate type of dsb for the architecture being built for. Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 24b44a66fa240f6fc63343623ca730d39754047e Author: Will Deacon Date: Wed Jan 20 19:05:07 2010 +0100 ARM: 5889/1: Add atomic64 routines for ARMv6k and above. In preparation for perf-events support, ARM needs to support atomic64_t operations. v6k and above support the ldrexd and strexd instructions to do just that. This patch adds atomic64 support to the ARM architecture. v6k and above make use of new instructions whilst older cores fall back on the generic solution using spinlocks. If and when v7-M cores are supported by Linux, they will need to fall back on the spinlock implementation too. Signed-off-by: Will Deacon Acked-by: Catalin Marinas Signed-off-by: Russell King commit a9221de66d2d94e6e34c3f56bbdd744935020737 Author: Russell King Date: Wed Jan 20 17:02:54 2010 +0000 ARM: add notify_die() support Kernel debuggers want to be informed of die() events, so that they can take some action to allow the problem to be inspected. Provide the hook in a similar manner to x86. Note that we currently don't implement the individual trap hooks. Acked-by: Jason Wessel Signed-off-by: Russell King commit 2b0d8c251b8876d530a6bf671eb5425838fa698a Author: Jeremy Kerr Date: Mon Jan 11 23:17:34 2010 +0100 ARM: 5880/1: arm: use generic infrastructure for early params The ARM setup code includes its own parser for early params, there's also one in the generic init code. This patch removes __early_init (and related code) from arch/arm/kernel/setup.c, and changes users to the generic early_init macro instead. The generic macro takes a char * argument, rather than char **, so we need to update the parser functions a little. Signed-off-by: Jeremy Kerr Signed-off-by: Russell King commit e119bfff1f102f8d1505910cd6c09df55c776b43 Author: Russell King Date: Sun Jan 10 17:23:29 2010 +0000 ARM: Move creation of /proc/cpu out of alignment.c Always creating this directory avoids other users having to jump through silly hoops when they want to share this directory. Signed-off-by: Russell King commit 373b32abf9b33616ad94283461bb2ab49e8371d5 Author: Russell King Date: Sun Jan 10 17:15:32 2010 +0000 ARM: move LED support code out of arch/arm/kernel/time.c Signed-off-by: Russell King commit 7921fc4a25800f4210bca96c05dea67a6b736d32 Author: Russell King Date: Sun Jan 10 17:05:08 2010 +0000 ARM: remove old RTC support All RTC drivers have been converted to rtclib, so the old code providing the set_rtc function pointer, save_time_delta() and restore_time_delta() functions is obsolete. Remove it. Signed-off-by: Russell King commit 31aa8fd6fd30b0f36416df7d09619768d26b4332 Author: Russell King Date: Fri Dec 18 11:10:03 2009 +0000 ARM: Add caller information to ioremap This allows the procfs vmallocinfo file to show who created the ioremap regions. Note: __builtin_return_address(0) doesn't do what's expected if its used in an inline function, so we leave __arm_ioremap callers in such places alone. Signed-off-by: Russell King commit ba869023eac8354b17acdcff82b851ea8e7b1809 Author: dingdinghua Date: Mon Feb 15 16:35:42 2010 -0500 jbd2: delay discarding buffers in journal_unmap_buffer Delay discarding buffers in journal_unmap_buffer until we know that "add to orphan" operation has definitely been committed, otherwise the log space of committing transation may be freed and reused before truncate get committed, updates may get lost if crash happens. Signed-off-by: dingdinghua Signed-off-by: "Theodore Ts'o" commit aca92ff6f57c000d1b4523e383c8bd6b8269b8b1 Author: Leonard Michlmayr Date: Thu Mar 4 17:07:28 2010 -0500 ext4: correctly calculate number of blocks for fiemap ext4_fiemap() rounds the length of the requested range down to blocksize, which is is not the true number of blocks that cover the requested region. This problem is especially impressive if the user requests only the first byte of a file: not a single extent will be reported. We fix this by calculating the last block of the region and then subtract to find the number of blocks in the extents. Signed-off-by: Leonard Michlmayr Signed-off-by: "Theodore Ts'o" commit 2f68ffd11aa76b251921976c982b814df9ebe890 Merge: 5601280 a602f0f Author: Russell King Date: Mon Feb 15 21:20:33 2010 +0000 Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable commit 56012808f4d5606e401539f663d92009d964425b Merge: a814290 b2a731a Author: Russell King Date: Mon Feb 15 21:20:18 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable Conflicts: arch/arm/Makefile commit 026331c4d9b526561ea96f95fac4bfc52b69e316 Author: Jouni Malinen Date: Mon Feb 15 12:53:10 2010 +0200 cfg80211/mac80211: allow registering for and sending action frames This implements a new command to register for action frames that userspace wants to handle instead of the in-kernel rejection. It is then responsible for rejecting ones that it decided not to handle. There is no unregistration, but the socket can be closed for that. Frames that are not registered for will not be forwarded to userspace and will be rejected by the kernel, the cfg80211 API helps implementing that. Additionally, this patch adds a new command that allows doing action frame transmission from userspace. It can be used either to exchange action frames on the current operational channel (e.g., with the AP with which we are currently associated) or to exchange off-channel Public Action frames with the remain-on-channel command. Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8404080568613d93ad7cf0a16dfb68459b42a264 Author: Johannes Berg Date: Mon Feb 15 12:46:39 2010 +0200 mac80211: reject unhandled action frames 802.11-2007 7.3.1.11 mandates that we need to reject action frames we don't handle by setting the 0x80 bit in the category and returning them to the sender, so do that. In AP mode, hostapd is responsible for this. Additionally, drop completely malformed action frames or ones that should've been encrypted as unusable, userspace shouldn't see those. Signed-off-by: Johannes Berg Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit de1ebdceb6a4fe1b7073b81d273285b7c8bed312 Author: Gertjan van Wingerde Date: Sun Feb 14 12:52:05 2010 +0100 rt2x00: rt2800 - Make rt30xx and rt35xx chipsets configurable. Support for rt30xx- and rt35xx-based devices is currently not functional in rt2800pci and rt2800usb. In order to not confuse users we shouldn't claim the PCI and USB device ID's for these devices. However, to allow for testing it is good to still have them available, although disabled by default. Make support for these device configuration options that default to off. For rt2800usb a 3rd class of devices is added, which are the unknown devices. For these devices it is known that they are either based on rt28xx, rt30xx or rt35xx, but it is not known on what chipset exactly. These devices are disabled by default as well, until it can be established on what chipset exactly they are based. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 49e721ec6ca74f90ee99089ad2de1c338a95c6d5 Author: Gertjan van Wingerde Date: Sat Feb 13 20:55:49 2010 +0100 rt2x00: rework RT chipset and revision determination for PCI an SOC devices. The recent rt2800 devices are no longer really identified by their PCI ID's, but rather by the contents of their CSR0 register. Also for the other chipsets is the contents of this CSR0 register important. Change the chipset determination logic to be more aligned with the rt2800 model. Preparation for the support of rt3070 / rt3090 based devices. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 714fa6636331d33c6045efe394f36c964a6c14ee Author: Gertjan van Wingerde Date: Sat Feb 13 20:55:48 2010 +0100 rt2x00: Reorganize RT chipset setting for PCI/SOC devices. Don't set the RT chipset for a device from within the generic PCI/SOC code, but rather from the individual drivers, so that individual drivers have more control over what RT chipset is set. Preparation for chip handling updates for rt2800 devices. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit cea90e55969ff70b970d64d564076a5469331527 Author: Gertjan van Wingerde Date: Sat Feb 13 20:55:47 2010 +0100 rt2x00: Introduce SoC interface type. Introduce the SoC interface type to detect SoC devices, instead of having them mimic being PCI devices. This allows for easier detection of SoC devices. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 15a69a81731d337a3d9db51692ff8704c1114f43 Author: Shimada Hirofumi Date: Sun Feb 14 04:16:16 2010 +0900 p54usb: Add usbid for Corega CG-WLUSB2GT. Signed-off-by: Shimada Hirofumi Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: John W. Linville commit 0052b8bb5ad24ff2c5b065adc7ed44dc8390bd4b Author: Hauke Mehrtens Date: Sat Feb 13 18:10:54 2010 +0100 ssb: fix typo in ifdef comment Cc: Michael Buesch Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 634c8d2587abbd680603e016ae1060129abdf46f Author: Hauke Mehrtens Date: Sat Feb 13 18:10:53 2010 +0100 rtl8187: fix typo in ifdef comment Cc: Herton Ronaldo Krzesinski Cc: Larry Finger Signed-off-by: Hauke Mehrtens Acked-by: Hin-Tak Leung Signed-off-by: John W. Linville commit 063b2dfffc896fc5ac6943248c940619b94f09c2 Author: Hauke Mehrtens Date: Sat Feb 13 18:10:52 2010 +0100 b43legacy: fix typo in ifdef comment Cc: Larry Finger Cc: Stefano Brivio Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 2bf9fa6980a5ca12333634e48c8dd69024b88eba Author: Randy Dunlap Date: Fri Feb 12 13:02:23 2010 -0800 wireless: airo_cs build fixes When WEXT_PRIV is not enabled, airo_cs has build errors. It needs to include net/iw_handler.h and it should select WEXT_PRIV, like the airo driver does. drivers/net/wireless/airo.c:7655: error: unknown field 'num_private' specified in initializer drivers/net/wireless/airo.c:7655: warning: initialization makes pointer from integer without a cast drivers/net/wireless/airo.c:7656: error: unknown field 'num_private_args' specified in initializer drivers/net/wireless/airo.c:7656: warning: excess elements in struct initializer drivers/net/wireless/airo.c:7656: warning: (near initialization for 'airo_handler_def') drivers/net/wireless/airo.c:7658: error: unknown field 'private' specified in initializer drivers/net/wireless/airo.c:7658: warning: initialization makes integer from pointer without a cast drivers/net/wireless/airo.c:7658: error: initializer element is not computable at load time drivers/net/wireless/airo.c:7658: error: (near initialization for 'airo_handler_def.num_standard') drivers/net/wireless/airo.c:7659: error: unknown field 'private_args' specified in initializer drivers/net/wireless/airo.c:7659: warning: initialization from incompatible pointer type Signed-off-by: Randy Dunlap Signed-off-by: John W. Linville commit 0e956c132f822d414a4ce84726ac1d1294364581 Author: Thadeu Lima de Souza Cascardo Date: Fri Feb 12 12:34:50 2010 -0200 nl80211: does not allow NEW_STATION and DEL_STATION for mesh As discussed in linux-wireless mailing list, adding and removing stations for mesh topologies is not necessary. Since doing it triggers bugs, the sugestion was to simply disable it. Tested using a custom iw command "station new". Works only after using hostapd. "station del" command also works. Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Johannes Berg Cc: Simon Raffeiner Cc: Andrey Yurovsky Cc: Javier Cardona Signed-off-by: John W. Linville commit 2f5265e6e785b2a666dd985ea157bc8c260be8fa Author: Johannes Berg Date: Fri Feb 12 10:45:05 2010 +0100 mac80211: fix netdev rename Fix a copy bug introduced by commit 47846c9b0c10808d9337d2e7d09361f3e0a0a71a Author: Johannes Berg Date: Wed Nov 25 17:46:19 2009 +0100 mac80211: reduce reliance on netdev This manifested itself only in debug messages and in the debugfs rename failure that would always happen due to trying to rename the dir over itself. Signed-off-by: Johannes Berg Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit f318d658decb5789cfbb43041daf3dc3aade1df0 Merge: 42c4568 1db5950 Author: John W. Linville Date: Mon Feb 15 16:04:43 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 153a008bf7915ea9127341409170cb197d111282 Author: Sage Weil Date: Mon Feb 15 12:11:51 2010 -0800 ceph: reset osd connections after fault A single osd connection fault (e.g. tcp disconnect) wasn't reopening the connection, which causes all current and future requests for that osd to hang. Signed-off-by: Sage Weil commit dd2ac961e273c2ac9f58cfa13c9e566e4bdb3b13 Author: Ryan Mallon Date: Mon Feb 15 01:16:01 2010 +0100 ARM: 5937/1: Add support for EP9315 based Snapper CL15 board Add support for Bluewater Systems EP9315 based Snapper CL15 single board computer module. Signed-off-by: Ryan Mallon Acked-by: Hartley Sweeten Signed-off-by: Russell King commit 9aaab0589baa61d637a52badddbff2d74f35a955 Author: Roel Kluin Date: Mon Feb 15 14:26:16 2010 -0500 ext4: add missing error checking to ext4_expand_extra_isize_ea() Signed-off-by: Roel Kluin commit 12062dddda450976b129dcb1bacd91acaf4d8030 Author: Eric Sandeen Date: Mon Feb 15 14:19:27 2010 -0500 ext4: move __func__ into a macro for ext4_warning, ext4_error Just a pet peeve of mine; we had a mishash of calls with either __func__ or "function_name" and the latter tends to get out of sync. I think it's easier to just hide the __func__ in a macro, and it'll be consistent from then on. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit d6a2d9b800276140abf352908abbd0c240890692 Author: Jorge Eduardo Candelaria Date: Mon Feb 15 10:03:35 2010 -0800 OMAP4: MCPDM: Register McPDM platform device Add platform device for McPDM interface in OMAP4 and register its memory and irq resources. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Tony Lindgren commit 302720f3b722b8084bc59b214b8da5f50dd3e0b1 Author: Jorge Eduardo Candelaria Date: Mon Feb 15 10:03:35 2010 -0800 ARM: OMAP4: Add McPDM base address Define McPDM physical and L3 base address for OMAP4 Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Tony Lindgren commit 57852d761a924a636411eb65fa089de832a4207c Author: Jorge Eduardo Candelaria Date: Mon Feb 15 10:03:35 2010 -0800 OMAP4: IRQ: Add McPDM IRQ definition Support for McPDM IRQs in OMAP4 Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Tony Lindgren commit 52abcbc9c4aa9cfd06c53afd5883296ca2a58f90 Author: Felipe Balbi Date: Mon Feb 15 10:03:35 2010 -0800 arm: omap: kill compile warning on board-4430-sdp.c sdp4430_uart_config isn't used anywhere, so remove it. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 91fbb8c6d9bb32797d455755ddd34376485bd632 Author: Vaibhav Hiremath Date: Mon Feb 15 10:03:35 2010 -0800 AM35xx: Update irq.h for AM35xx IPSS module interrupts Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit 07dcbd07866691c33a3ff6f2d845292f23760669 Author: Vaibhav Hiremath Date: Mon Feb 15 10:03:35 2010 -0800 AM35xx: Add AM35xx intr_clr & sw_rst cntrl reg bit definition AM3517/05 has few additional control module registers to control the new IP's, like VPFE, USBOTG, CPGMAC. This patch adds the bit defination for INTR_CLR and SW_RST control register. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit e3d4d0a2385593e7873e7d7688eeffea949facff Author: Vaibhav Hiremath Date: Mon Feb 15 10:03:35 2010 -0800 AM35xx: Introduce am35xx.h file Add base address definations for new AM35xx IPSS modules, like VPFE, USBOTG, CPGMAC. Please note that the OMAP34xx IVA2 memory space is being used for AM35xx IPSS modules. Signed-off-by: Vaibhav Hiremath Signed-off-by: Sriramakrishnan Signed-off-by: Tony Lindgren commit a1e63642a9ed167f74afd10245fb907ac41a54d0 Author: Lesly A M Date: Mon Feb 15 10:03:35 2010 -0800 omap3: pm: Add T2 Keypad as a wakeup source Changes for setting the padconf value for sys_nirq line which is connected to T2 INTR1. This will fix the T2 keypad wakeup. Signed-off-by: Lesly A M Signed-off-by: Teerth Reddy Signed-off-by: Tony Lindgren commit 321cfc851dbb866e4d5efd555eca5919895324ca Author: Tony Lindgren Date: Mon Feb 15 10:03:35 2010 -0800 omap3: Clean-up for omap_mux_init Get rid of the ifdeffery in omap_mux_init by creating omap_mux_init_package and omap_mux_init_signals functions. Signed-off-by: Tony Lindgren commit b702b1060ab1c29ac08b904a0c188c61cda880eb Author: Adrian Hunter Date: Mon Feb 15 10:03:35 2010 -0800 omap_hsmmc: allow compile without regulator framework It is still possible to use the omap_hsmmc module without the regulator framework. Accordingly, ifdef out regulator-specific functions. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit e0eb2424469ec2333885672d3db8bd07d322455d Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Allow for a shared VccQ EMMC can have two voltage supplies, Vcc and VccQ which are implemented in the code as consumer supplies vmmc and vmmc_aux. If the regulator that supplies vmmc_aux is shared with other consumers, then sending it to sleep will disrupt those consumers. However, the TWL4030-family regulators may have OFF remapped to SLEEP, in which case 'regulator_disable()' will put the regulator to sleep only when all consumers are disabled - which is the desired behaviour. This patch adds a platform data field to allow that option. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 6da20c89af64b75302399369a90b9d50c1a87665 Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Ensure regulator enable / disable are paired Stop using 'regulator_is_enabled()' and just pair enables with disables so that the regulator reference counts can work correctly. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 4380eea266940a82e5b8edd5c16ce0289679bcfe Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Fix disable timeouts Disable timeouts are in msecs not jiffies. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 1df58db8a25ec7656005f1dd161a9ede044551b7 Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Allow for power saving without going off An eMMC may be always powered on, so that the lowest power saving state possible is sleeping. Add a field to the platform data to indicate that. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit ce6f00165d5314698afd04ee20cede156cfcc593 Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap: RX51: Remux to pull eMMC lines down when powering off It has been discovered that, when eMMC is powered off, current will flow from OMAP eMMC data pull-ups to the eMMC voltage supply. Configuring pads for OMAP off-mode does not help because eMMC is powered off independently of OMAP off-mode. Hence the pads are now re-configured when eMMC is powered on or off. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit e3df0fb4132fff8717cb0c08403c12138fd3ae39 Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap: Reconnect hsmmc context loss count Call the PM context-loss count function, now that there is a prototype for it. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 68ff04231ce9128d400f47762ae3c921be79cd49 Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap: Rename hsmmc symbols to reflect independence from twl4030 hsmmc.[ch] no longer has any dependency on twl4030 and variable names should be renamed to reflect that. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit d02a900b5952597b6beebd709d92ab392fa3005a Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap: Rename mmc-twl4030 files to hsmmc mmc-twl4030.[ch] no longer has any dependency on twl4030 and should be renamed to reflect that. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit db0fefc5119e2cfaa8f57565331e0abe47f0801e Author: Adrian Hunter Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Move gpio and regulator control from board file This patch moves the setup code for GPIO's and Voltage Regulators from the board file mmc-twl4030.c to the driver omap_hsmmc.c. PBIAS and other system control configuration remains in the board file. Moving GPIO code to the driver makes the board initialisation code independent of when GPIO's are defined. That makes the board initialisation now entirely independent of its original twl4030 roots. Moving Voltage Regulator code to the driver allows for further development of regulator support in the core MMC code. It also permits the MMC core to be compiled as a module, because the board code no longer calls MMC core functions. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 88c8460ac32283e2a25e36e4670ff5ab02f3b521 Author: Vimal Singh Date: Mon Feb 15 10:03:34 2010 -0800 omap3: Add support for flash on 3430SDP board This patch adds support for flashes on 3430SDP boards. All three NAND, NOR and OneNAND are supported. I have tested it on 3430SDP (ES2 and ES3.1). This patch can be treated as an example to "how to utilize": 'gpmc-nand.c' and 'board-sdp-flash.c'. Similar patches can be created for 2430sdp and 3630sdp or any other similar board. Signed-off-by: Vimal Singh Signed-off-by: Tony Lindgren commit c2798e9342a1394de966c31703e0410ee3988378 Author: Vimal Singh Date: Mon Feb 15 10:03:33 2010 -0800 omap3: SDP: Introducing 'board-sdp-flash.c' for flash init This patch adds 'board-sdp-flash.c', which could be utilized by boards similar to 3430SDP. (For ex: 2430sdp, 36030sdp). This file does initialization for all three flash devices present in SDP boards (NOR, NAND, OneNAND), by finding there 'cs' number dynamically using switch setting information (S8: 1-4). This also expects partition information from core board files (for ex: board-3430sdp.c). Which allows to choose different default partitions for different boards. A new structure is created for this purpose: 'flash_partitions' in 'mach/board-sdp.h'. This has two members: 1. struct mtd_partition *parts 2. int nr_parts A board file is expected to fill this structure and pass it to 'sdp-flsash-init'. Partition information should be passed in structure array of 'flash_partitions'. Partition information should be passed in below sequence in array: NOR OneNAND NAND Signed-off-by: Vimal Singh Signed-off-by: Tony Lindgren commit 2f70a1e93657bea0baa7d449aa49e44a08582dc8 Author: Vimal Singh Date: Mon Feb 15 10:03:33 2010 -0800 omap2/3/4: Introducing 'gpmc-nand.c' for GPMC specific NAND init Introducing 'gpmc-nand.c' for GPMC specific NAND init. For example: GPMC timing parameters and all. This patch also migrates gpmc related calls from 'nand/omap2.c' to 'gpmc-nand.c'. Signed-off-by: Vimal Singh Signed-off-by: Tony Lindgren commit 30e53bccfa15c6c0839c87705a66d478bb10baf5 Author: vikram pandita Date: Mon Feb 15 10:03:33 2010 -0800 omap2/3/4: serial: fix coding style indentaion No logical code change Fix coding style indentaion as per checkpatch.pl Fix multi-line comment style reported by Nishanth Menon Signed-off-by: Vikram Pandita Cc: Nishanth Menon Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 2586ef0d1db6d606e5ceb7fbf97f34c8b402e90c Author: Felipe Balbi Date: Mon Feb 15 10:03:33 2010 -0800 omap2/3/4: gpmc: avoid section definitions on headers trivial patch, no functional changes. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit b2fa3b7c602258c1ab9d1cb66c30d72e9085c762 Author: Felipe Balbi Date: Mon Feb 15 10:03:33 2010 -0800 omap2/3/4: gpmc: kill compile warning Get rid of the following warnings: arch/arm/mach-omap2/gpmc.c:550:30: warning: non-ANSI function declaration of function 'omap3_gpmc_save_context' arch/arm/mach-omap2/gpmc.c:581:33: warning: non-ANSI function declaration of function 'omap3_gpmc_restore_context' Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 0cd7e1cc76c38b29ec459294750660855fa11ca8 Author: Felipe Balbi Date: Mon Feb 15 10:03:33 2010 -0800 omap2/3/4: mailbox: kill compile warning in mailbox.c Change %d to %ld to avoid the compile warning. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit d761585a0571c9d508b26735a3d268ff3ec3a548 Author: Felipe Balbi Date: Mon Feb 15 10:03:33 2010 -0800 omap1: mailbox: kill compile warning use ioremap and remove unused variable to get rid of compile warnings. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 96fbd74551e9cae8fd5e9cb62a0a19336a3064fa Author: Janusz Krzysztofik Date: Mon Feb 15 10:03:33 2010 -0800 omap: McBSP: Use cache when modifying individual register bits Change the way McBSP registers are updated: use cached values instead of relying upon those read back from the device. With this patch, I have finally managed to get rid of all random playback/recording hangups on my OMAP1510 based Amstrad Delta hardware. Before that, values read back from McBSP registers to be used for updating them happened to be errornous. From the hardware side, the issue appeared to be caused by a relatively high power requirements of an external USB adapter connected to the board's printer dedicated USB port. I think there is one important point that makes this patch worth of applying, apart from my hardware quality. With the current code, if it ever happens to any machine, no matter if OMAP1510 or newer, to read incorrect value from a McBSP register, this wrong value will get written back without any checking. That can lead to hardware damage if, for example, an input pin is turned into output as a result. Applies on top of patch 3 from this series: [PATCH v9 3/4] OMAP: McBSP: Introduce caching in register write operations Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with omap_3430sdp_defconfig. Signed-off-by: Janusz Krzysztofik Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit c8c99699bd25d8b238ba75d2530d1be90e3c39ea Author: Janusz Krzysztofik Date: Mon Feb 15 10:03:33 2010 -0800 omap: McBSP: Introduce caching in register write operations Determine cache size required per McBSP port at init time, based on processor type running on. Allocate space for storing cached copies of McBSP register values at port request. Modify omap_msbcp_write() function to update the cache with every register write operation. Modify omap_mcbsp_read() to support reading from cache or hardware. Update MCBSP_READ() macro for modified omap_mcbsp_read() function API. Introduce a new macro that reads from the cache. Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with: omap_perseus2_730_defconfig, omap_generic_1610_defconfig, omap_generic_2420_defconfig, omap_2430sdp_defconfig, omap_3430sdp_defconfig, omap_4430sdp_defconfig with CONFIG_OMAP_MCBSP=y selected. Signed-off-by: Janusz Krzysztofik Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 8ea3200f1de1c3d8f3c884a704107fb1e7449547 Author: Janusz Krzysztofik Date: Mon Feb 15 10:03:32 2010 -0800 omap: McBSP: Modify macros/functions API for easy cache access OMAP_MCBSP_READ()/_WRITE() macros and omap_mcbsp_read()/_write() functions accept McBSP register base address as an argument. In order to support caching, that must be replaced with an address of the omap_mcbsp structure that would provide addresses for both register AND cache access. Since OMAP_ prefix seems obvious in macro names, drop it off in order to minimize line wrapping throughout the file. Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11). Compile-tested with omap_3430sdp_defconfig. Signed-off-by: Janusz Krzysztofik Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 14f796375b5c2bcc27986de12b6f769ec3827f36 Author: Janusz Krzysztofik Date: Mon Feb 15 10:03:32 2010 -0800 omap: McBSP: Use macros for all register read/write operations There are several places where readw()/writew() functions are used instead of OMAP_MCBSP_READ()/WRITE() macros for manipulating McBSP registers. Replace them with macros to ensure consistent behaviour after caching is introduced. Tested on OMAP1510 based Amstrad Delta. Compile-tested with omap_3430sdp_defconfig. Signed-off-by: Janusz Krzysztofik Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit c127c7dc1abb7f02dcfbbea173e7abb4f2d4585e Author: Hiroshi DOYU Date: Mon Feb 15 10:03:32 2010 -0800 omap iommu: fix incorrect address for largepage 1st entry There was a potential risk that the following "memset" could override its range if a given address was not the 1st entry of a largepage. This is not the case for "iovmm". Reported-by: Hari Nagalla Signed-off-by: Hiroshi DOYU Signed-off-by: Hari Nagalla Signed-off-by: Tony Lindgren commit 8d33ea5881bce56f85de7fcc90e1c5618fa5b62d Author: Hiroshi DOYU Date: Mon Feb 15 10:03:32 2010 -0800 omap: iommu: fix incorrect address for supersection 1st entry There was a potential risk that the following "memset" could override its range if a given address was not the 1st entry of a supersection. This is not the case for "iovmm". Signed-off-by: Hiroshi DOYU Signed-off-by: Hari Nagalla Signed-off-by: Tony Lindgren commit 97ec7d585b33bbcc2be92dafa05b540959b4ea47 Author: Hiroshi DOYU Date: Mon Feb 15 10:03:32 2010 -0800 omap iommu: cleanup iommu page address mask and definitions This is just a cleanup, but adds a few macros here, which can be used in the proceeding patches. Signed-off-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit cc87edb173effdf74e680ee6d622a935ff0c1d6f Author: Ladislav Michl Date: Mon Feb 15 10:03:32 2010 -0800 MTD: remove no longer used OMAP flash map All OMAP boards are now using physmap-flash. Cc: linux-mtd@lists.infradead.org Signed-off-by: Ladislav Michl Signed-off-by: Tony Lindgren commit 561b036ad9d0b4f0cd311d2e38025919c2cb437f Author: Ladislav Michl Date: Mon Feb 15 10:03:32 2010 -0800 omap: convert boards to use physmap-flash Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree Cc: linux-mtd@lists.infradead.org Signed-off-by: Ladislav Michl Signed-off-by: Tony Lindgren commit fd17a25fe9423bbde16a326466330ad486321dfc Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap2/3/4: Add omap4 into omap3_defconfig Add omap4 into omap3_defconfig. Note that this does not yet boot on omap4, but boots on omap2 and omap3. Also note that CONFIG_SMP does not currently work on uniprocessor ARMs. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit a3a9b36e6b1c420088460af8e83ba7b83330669f Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap2/3/4: Fix mach-omap2/serial.c for multiboot Initialize UART4 only for 3630 and 44xx. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 3f1686a9bfe74979c6ad538c78039730f665f77e Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap: Fix gpio.c for multi-omap for omap4 Set up METHOD_GPIO_44XX instead of trying to use the METHOD_GPIO_24XX. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 4751227df948582e82f19df30efa662ab71fa980 Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap3/4: Fix compile for multi-omap for clkops_noncore_dpll_ops Rename clkops_noncore_dpll_ops for omap3 and omap4. Acked-by: Santosh Shilimkar Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 61a07c80a7cf7333475e7eda9934dac9a8a9c8b9 Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap2/3/4: Allow booting omap4 with multi-omap configuration Allow booting omap4 with multi-omap configuration. Tested only on omap2 and omap3, please somebody test on omap4 and ack. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit e735aa8a20fdc60439141b7b0c0382a3ce031f3b Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap2/3/4: Clean up entry-macro.s for adding support for omap4 multiboot Move defines around and set up handlers based on MULTI_OMAP2. Note that this will only allow compiling in omap4 with omap2 and omap3. It will not yet make omap4 boot with multi-omap. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit be8f317740f218bda59cc5ae5aefcdd7a333762a Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap4: Use get_irqnr_preamble Use get_irqnr_preamble Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 95d2b4e9cbba4c9a2ac63205e846e7ccfebe69b4 Author: Tony Lindgren Date: Mon Feb 15 09:27:24 2010 -0800 omap2/3/4: Clean up defines for entry-macro.S Define the irq base the same way as for omap2 and omap3, and start using get_irqnr_preamble. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 1cf9d079637e1479842dad0b25f445b5ceec0bab Author: Tony Lindgren Date: Mon Feb 15 09:27:24 2010 -0800 omap: Move multi-omap ifdeffery into it's own header file This way we can include it easily as needed also for .S files. Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 78aee23f32447bff0ef8dd012d9b0eaf1e3a79a1 Author: Tony Lindgren Date: Fri Feb 12 12:26:49 2010 -0800 omap2/3: Update omap3_defconfig to build in all the 2420 based boards Note that booting 2420 depends on another patch posted earlier to not select CONFIG_CPU_32v6K if CONFIG_ARCH_OMAP2 is selected. Also note that we cannot add omap2430 in yet because of the different clock addresses compared to 2420. Also note that we cannot have CONFIG_CPU_32v6K=y in order to boot on 24xx. Signed-off-by: Tony Lindgren commit 4323e9f71903f654abc6d21a3ef81c08e0ac2288 Author: Tony Lindgren Date: Fri Feb 12 12:26:48 2010 -0800 omap2/3: Fix initcalls for multi-omap Otherwise the wrong initcalls can run. Signed-off-by: Tony Lindgren commit 140455fa007a618d2d1bf5e6e888206534035e6f Author: Tony Lindgren Date: Fri Feb 12 12:26:48 2010 -0800 omap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS omap: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS Signed-off-by: Tony Lindgren commit a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 Author: Tony Lindgren Date: Fri Feb 12 12:26:48 2010 -0800 omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren commit 088ef950dc0dd58d2f339e1616c9092fea923f06 Author: Tony Lindgren Date: Fri Feb 12 12:26:47 2010 -0800 omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 Convert ARCH_OMAP24XX to ARCH_OMAP2 Signed-off-by: Tony Lindgren commit d10f2b6e745f1232ff6517b335faf3bfd7005bec Author: Tony Lindgren Date: Fri Feb 12 12:26:47 2010 -0800 omap2/3/4: Fix mbox init for multi-omap Fix mbox init for multi-omap Signed-off-by: Tony Lindgren commit 6fbd55d077cdf2aeb7a170ff9f5779d19506bf9e Author: Tony Lindgren Date: Fri Feb 12 12:26:47 2010 -0800 omap2/3/4: Fix omap2_map_common_io for multi-omap Fix omap2_map_common_io for multi-omap Signed-off-by: Tony Lindgren commit 882c0518e5317a41834d0fceee07ae6ada2d7429 Author: Tony Lindgren Date: Fri Feb 12 12:26:46 2010 -0800 omap: Fix dmtimer.c for multi-omap boot Fix dmtimer.c for multi-omap boot. Also remove legacy clk_enable/disable wrappers that are no longer needed. Note that the clock handling should be further improved to make use of the clock aliases. Signed-off-by: Tony Lindgren commit 56213ca4e440c0b6e56a48f5901c55c4ce3cf1ba Author: Tony Lindgren Date: Fri Feb 12 12:26:46 2010 -0800 omap2/3: Multiboot compile fixes to compile in omap2 and omap3 Allows compiling in omap2 and omap3. Signed-off-by: Tony Lindgren commit 9556175183ddf19e9a7afa449c259a0a5081fa29 Author: Tony Lindgren Date: Mon Feb 15 09:26:51 2010 -0800 omap2/3: Make get_irqnr_and_base common for mach-omap2 multiboot Make get_irqnr_and_base common for mach-omap2 multiboot Thanks to a tip from Russell King , this also optimizes the code for non-multiboot configurations by using get_irqnr_preamble. Note that this will only work currently for 24xx and 34xx. Support for 44xx can be added later on for basic multiboot, and similar patch should be done for mach-omap1/entry-macro.S. Signed-off-by: Tony Lindgren commit be26a3df0b80307bf8f73cea535c112210151bb9 Merge: 918cae1 61b603b Author: Tony Lindgren Date: Mon Feb 15 09:26:07 2010 -0800 Merge branch 'debug-ll' into omap-for-linus commit 3e5e524ffb5fcf2447eb5dd9f8e54ad22dd9baa7 Author: Florian Westphal Date: Mon Feb 15 18:17:10 2010 +0100 netfilter: CONFIG_COMPAT: allow delta to exceed 32767 with 32 bit userland and 64 bit kernels, it is unlikely but possible that insertion of new rules fails even tough there are only about 2000 iptables rules. This happens because the compat delta is using a short int. Easily reproducible via "iptables -m limit" ; after about 2050 rules inserting new ones fails with -ELOOP. Note that compat_delta included 2 bytes of padding on x86_64, so structure size remains the same. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit fc0e3df4f00a5f62c2f2fce84bf496136b58c474 Author: Florian Westphal Date: Mon Feb 15 18:16:26 2010 +0100 netfilter: ebtables: avoid explicit XT_ALIGN() in match/targets This will cause trouble once CONFIG_COMPAT support is added to ebtables. xt_compat_*_offset() calculate the kernel/userland structure size delta using: XT_ALIGN(size) - COMPAT_XT_ALIGN(size) If the match/target sizes are aligned at registration time, delta is always zero. Should have zero effect for existing systems: xtables uses XT_ALIGN() whenever it deals with match/target sizes. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 1756de262e41112a8a8927808eb2f03d21fd4786 Author: Florian Westphal Date: Mon Feb 15 18:15:55 2010 +0100 netfilter: ebtables: abort if next_offset is too small next_offset must be > 0, otherwise this loops forever. The offset also contains the size of the ebt_entry structure itself, so anything smaller is invalid. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit ef00f89f1eb7e056aab9dfe068521e6f2320c94a Author: Patrick McHardy Date: Mon Feb 15 18:14:57 2010 +0100 netfilter: ctnetlink: add zone support Parse and dump the conntrack zone in ctnetlink. Signed-off-by: Patrick McHardy commit 5d0aa2ccd4699a01cfdf14886191c249d7b45a01 Author: Patrick McHardy Date: Mon Feb 15 18:13:33 2010 +0100 netfilter: nf_conntrack: add support for "conntrack zones" Normally, each connection needs a unique identity. Conntrack zones allow to specify a numerical zone using the CT target, connections in different zones can use the same identity. Example: iptables -t raw -A PREROUTING -i veth0 -j CT --zone 1 iptables -t raw -A OUTPUT -o veth1 -j CT --zone 1 Signed-off-by: Patrick McHardy commit 61b603b4ee0c70708539e2fa5c3d47f17b7c7849 Author: Tony Lindgren Date: Mon Feb 15 08:49:14 2010 -0800 omap: Remove old DEBUG_LL serial port options These are no longer needed. Note that zoom boards should now set their own function in uncompress.h and debug-macro.S for the external UART. Signed-off-by: Tony Lindgren commit 0c8219f0302d0d27fda52c790d38406801e547ec Author: Tony Lindgren Date: Mon Feb 15 08:49:01 2010 -0800 omap: Make uncompress code and DEBUG_LL code generic Define arch_decomp_setup() the same way as some other architectures do. Use arch_id to configure the debug uart based on the machine_is by storing it into the uart scratchpad register for DEBUG_LL code to use. Signed-off-by: Tony Lindgren commit 4f2c49fedf833e522001bc51824b894732900a3d Author: Tony Lindgren Date: Mon Feb 15 08:48:53 2010 -0800 omap: Clean the serial port defines This way we don't have conflicts with the defines with compiling in multiple omaps. Set the addresses for uarts in struct omap_globals for the early serial init code. Signed-off-by: Tony Lindgren commit 8fea97ec1772bbf553d89187340ef624d548e115 Author: Patrick McHardy Date: Mon Feb 15 17:45:08 2010 +0100 netfilter: nf_conntrack: pass template to l4proto ->error() handler The error handlers might need the template to get the conntrack zone introduced in the next patches to perform a conntrack lookup. Signed-off-by: Patrick McHardy commit f0d3ab49110327516b7f0b6d27fd33d6fa079d6c Author: Uwe Kleine-König Date: Fri Feb 5 16:57:59 2010 +0100 arm/mx2: define seperate imx_nand devices for imx21 and imx27 As the NFC controller has different addresses on imx21 and imx27 there are two different devices needed if not relying on the overloaded cpp macro NFC_BASE_ADDR. So some cpp magic is added to minimize code duplication. As obviously these two defines need different names, the name of the old device is #defined to the new one when building for only one of imx21 or imx27. Signed-off-by: Uwe Kleine-König commit d5d1baa15f5b05e9110403724d5dc72d6d541e04 Author: Jan Engelhardt Date: Fri Jun 26 07:51:59 2009 +0200 netfilter: xtables: add const qualifiers This should make it easier to remove redundant arguments later. Signed-off-by: Jan Engelhardt commit 739674fb7febf116e7d647031fab16989a08a965 Author: Jan Engelhardt Date: Fri Jun 26 08:23:19 2009 +0200 netfilter: xtables: constify args in compat copying functions Signed-off-by: Jan Engelhardt commit b402405d71beed8e4df354844353f66b4e18269f Author: Jan Engelhardt Date: Thu Jun 25 18:32:12 2009 +0200 netfilter: xtables: print details on size mismatch Print which revision has been used and which size are which (kernel/user) for easier debugging. Signed-off-by: Jan Engelhardt commit 2249065f4b22b493bae2caf549b86f175f33188e Author: Jan Engelhardt Date: Sat Jun 13 04:13:26 2009 +0200 netfilter: get rid of the grossness in netfilter.h GCC is now smart enough to follow the inline trail correctly. vmlinux size remain the same. Signed-off-by: Jan Engelhardt commit 23f3733d440b918ccb7746718f77256334cf6176 Author: Jan Engelhardt Date: Fri Jun 5 17:31:46 2009 +0200 netfilter: reduce NF_HOOK by one argument No changes in vmlinux filesize. Signed-off-by: Jan Engelhardt commit fa96a0e2e67fe34a3d994e3f354a5c229dd14286 Author: Jan Engelhardt Date: Sun Nov 1 00:36:40 2009 +0100 netfilter: iptables: remove unused function arguments Signed-off-by: Jan Engelhardt commit 98e6d2d5ee26bf56850a10eb64139c68fb09ba19 Author: Jan Engelhardt Date: Mon Feb 15 16:31:35 2010 +0100 netfilter: xt_recent: inform user when hitcount is too large It is one of these things that iptables cannot catch and which can cause "Invalid argument" to be printed. Without a hint in dmesg, it is not going to be helpful. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 2ffe2da3e71652d4f4cae19539b5c78c2a239136 Author: Russell King Date: Sat Oct 31 16:52:16 2009 +0000 ARM: dma-mapping: fix for speculative prefetching ARMv6 and ARMv7 CPUs can perform speculative prefetching, which makes DMA cache coherency handling slightly more interesting. Rather than being able to rely upon the CPU not accessing the DMA buffer until DMA has completed, we now must expect that the cache could be loaded with possibly stale data from the DMA buffer. Where DMA involves data being transferred to the device, we clean the cache before handing it over for DMA, otherwise we invalidate the buffer to get rid of potential writebacks. On DMA Completion, if data was transferred from the device, we invalidate the buffer to get rid of any stale speculative prefetches. Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit 702b94bff3c50542a6e4ab9a4f4cef093262fe65 Author: Russell King Date: Thu Nov 26 16:24:19 2009 +0000 ARM: dma-mapping: remove dmac_clean_range and dmac_inv_range These are now unused, and so can be removed. Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit a9c9147eb9b1dba0ce567a41897c7773b4d1b0bc Author: Russell King Date: Thu Nov 26 16:19:58 2009 +0000 ARM: dma-mapping: provide per-cpu type map/unmap functions Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit 93f1d629e22b08642eb713ad96ac2cb9ade0641c Author: Russell King Date: Tue Nov 24 14:41:01 2009 +0000 ARM: dma-mapping: simplify dma_cache_maint_page dma_cache_maint_contiguous is now simple enough to live inside dma_cache_maint_page, so move it there. Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit 65af191a0414d0e1145f67c153e1b63d122dfbb4 Author: Russell King Date: Tue Nov 24 17:53:33 2009 +0000 ARM: dma-mapping: move selection of page ops out of dma_cache_maint_contiguous Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit 4ea0d7371e808628d11154b0d44140b70f05b998 Author: Russell King Date: Tue Nov 24 16:27:17 2009 +0000 ARM: dma-mapping: push buffer ownership down into dma-mapping.c Signed-off-by: Russell King Tested-By: Santosh Shilimkar commit 18eabe2347ae7a11b3db768695913724166dfb0e Author: Russell King Date: Sat Oct 31 16:52:16 2009 +0000 ARM: dma-mapping: introduce the idea of buffer ownership The DMA API has the notion of buffer ownership; make it explicit in the ARM implementation of this API. This gives us a set of hooks to allow us to deal with CPU cache issues arising from non-cache coherent DMA. Signed-off-by: Russell King Tested-By: Santosh Shilimkar Tested-By: Jamie Iles commit dfff0615d28bdb3e8d213e5537dd069265912667 Author: Uwe Kleine-König Date: Fri Feb 12 21:58:11 2010 +0100 tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit e296264977f68ddf395b8f93f8e174930f88499a Author: Tomi Valkeinen Date: Tue Dec 1 13:23:25 2009 +0200 OMAP: DSS2: Check ctx loss count only when starting the first clock When OMAP PM layer is no-op/debug, the PM layer will increment context loss count with every call. This resulted DSS2 to restore context whenever a clock was enabled. This commit checks the context loss count only when the context actually could have been lost, ie. when enabling a clock when no clocks had been previously enabled. Signed-off-by: Tomi Valkeinen commit 6eed73debf5840a42ebe9ea90958d2ce4a38c6b0 Author: Tomi Valkeinen Date: Fri Feb 5 14:44:05 2010 +0200 OMAP: DSS2: DSI: remove dsi_vc_print_status() It was not used. Signed-off-by: Tomi Valkeinen commit dd8079d6a9c2aa292dacaf1b42f526558e20379f Author: Tomi Valkeinen Date: Wed Dec 16 16:49:03 2009 +0200 OMAP: DSS2: DSI: configure all DSI VCs Instead of configuring only VC0 to be usable, configure all four VCs similarly. This is needed to utilize the other VCs. Setting the FIFO sizes evenly for all VCs, regardless of how many VCs are actually used, is not optimal. However, this affects only cases when larger amounts of data are written or read via L4, meaning that normal use cases are not affected. At some point this could be optimized better to suit different use cases. Signed-off-by: Tomi Valkeinen commit 61140c9a88ce1f1dee4e98a0c442f9a84b4c5e6b Author: Tomi Valkeinen Date: Tue Jan 12 16:00:30 2010 +0200 OMAP: DSS2: DSI: export dsi_vc_enable_hs() Rename and export dsi_vc_enable_hs() so that the display drivers can control the mode of the DSI link. Signed-off-by: Tomi Valkeinen commit 828c48f8c51ebfc2a00e1a834b0bc9e7fd35060f Author: Tomi Valkeinen Date: Wed Dec 16 14:53:15 2009 +0200 OMAP: DSS2: DSI: add helpers for DCS read/write Add helper functions for most common DCS read and write operations. Signed-off-by: Tomi Valkeinen commit 4f76502374ff91bc80a48a32cabb1009087a3b9d Author: Tomi Valkeinen Date: Mon Jan 18 16:27:52 2010 +0200 OMAP: DSS2: DSI: add dsi_bus_is_locked() Helper function to clean up the checking of the bus lock. Signed-off-by: Tomi Valkeinen commit 2f18c4d89861fc1abdfa2531ba76017acb78edc5 Author: Tomi Valkeinen Date: Fri Jan 8 18:00:36 2010 +0200 OMAP: DSS2: improve DSS clk src selection dss_select_clk_source() was rather confusing. Selecting the source with enums is much clearer. The clk source selection is also stored into memory, so that we know what is the selected source, even when clocks are off. This is important during setup, as we need to what clocks to turn on before the clocks are turned on. Signed-off-by: Tomi Valkeinen commit b63c97f5184684c841be84ec80928e3c5fe57fbe Author: Tomi Valkeinen Date: Fri Feb 5 14:46:19 2010 +0200 OMAP: DSS2: OMAPFB: Add omapfb_update_window prototype Signed-off-by: Tomi Valkeinen commit 853525d7785761d2d9c121b41326ab19d3af4a22 Author: Tomi Valkeinen Date: Mon Feb 8 12:19:46 2010 +0200 OMAP: DSS2: fix irq-stats compilation Fix compilation of the CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS feature. Signed-off-by: Tomi Valkeinen commit 6dd2e42bd892b2e16080ceba451fd9c3ed633145 Author: Tomi Valkeinen Date: Thu Jan 14 17:32:13 2010 +0200 OMAP: DSS2: OMAPFB: implement OMAPFB_GET_DISPLAY_INFO Previously the only place to get the size of the display was from the DSS's sysfs interface, making, for example, configuring overlays and doing updates on manual displays more difficult. Signed-off-by: Tomi Valkeinen commit 47b5d028fdce8f809bf22852ac900338fb90e8aa Author: Giuliano Pochini Date: Sun Feb 14 18:16:10 2010 +0100 ALSA: Echoaudio - Add suspend support #2 This patch adds rearranges parts of the initialization code and adds suspend and resume callbacks. This patch adds suspend and resume callbacks. It also rearranges parts of the initialization code so it can be used in both the first initialization (when the module is loaded we also have to load default settings) and the resume callback (where we have to restore the previous settings). Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit ad3499f4668f684ef6e5d0222ae14d5e4ade1fdd Author: Giuliano Pochini Date: Sun Feb 14 18:15:59 2010 +0100 ALSA: Echoaudio - Add suspend support #1 Move the controls init code outside the init_hw() function because is must not be called during resume. This patch moves the code that initializes the card's controls with default valued from the init_hw() function into a separated set_mixer_defaults() function (one for each of the 16 supported cards). This change is necessary because during resume we must resurrect the hardware without losing the previous settings. set_mixer_defaults() must be called only once when the module is loaded. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 4f8ada444cc7a7ea70cdc81f098b34c5f1f2df41 Author: Giuliano Pochini Date: Sun Feb 14 18:15:51 2010 +0100 ALSA: Echoaudio - Add firmware cache #2 This patch implements a simple cache for the firmware files when CONFIG_PM is defined. This patch changes get_firmware(), free_firmware() and adds free_firmware_cache(). The first two functions implement a very simple cache and the latter is used to actually release all the stored firmwares when the module is unloaded. When CONFIG_PM is not enabled those functions act as before, that is free_firmware() releases the firmware immediately and free_firmware_cache() does nothing. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 19b50063780953563e3c3a2867c39aad7b9e64cf Author: Giuliano Pochini Date: Sun Feb 14 18:15:34 2010 +0100 ALSA: Echoaudio - Add firmware cache #1 Changes the way the firmware is passed through functions. When CONFIG_PM is enabled the firmware cannot be released because the driver will need it again to resume the card. With this patch the firmware is passed as an index of the struct firmware card_fw[] in place of a pointer. That same index is then used to locate the firmware in the firmware cache. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 02b1bae5e1c0f810168037be0134685085e95e88 Author: David S. Miller Date: Mon Feb 15 00:07:00 2010 -0800 niu: Refinements to kernel logging. Fix unconditional empty kerne log message every interrupt. Kill some informational log messages that are superfluous and anyways occur before the netdev is registered. Signed-off-by: David S. Miller commit 04c869735541c27dd137c55f35f8a18bb372bbe1 Author: Paul Mundt Date: Mon Feb 15 16:10:57 2010 +0900 sh: Fix up legacy PMB mode offset calculation. The change for fixing up sh64 inadvertently inverted the logic for legacy PMB, fix that back up. Signed-off-by: Paul Mundt commit 228da6c2e63b3b2064492b24ef83c07bcc48abbd Author: David S. Miller Date: Sun Feb 14 22:49:52 2010 -0800 mac80211: Fix error introduced in netdev_mc_count() changes. Commit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 ("net: use netdev_mc_count and netdev_mc_empty when appropriate") added this hunk to net/mac80211/iface.c: __dev_addr_unsync(&local->mc_list, &local->mc_count, - &dev->mc_list, &dev->mc_count); + &dev->mc_list, dev->mc_count); which is definitely not correct, introduced a warning (reported by Stephen Rothwell): net/mac80211/iface.c: In function 'ieee80211_stop': net/mac80211/iface.c:416: warning: passing argument 4 of '__dev_addr_unsync' makes pointer from integer without a cast include/linux/netdevice.h:1967: note: expected 'int *' but argument is of type 'int' and is thus reverted here. Signed-off-by: David S. Miller commit 5659338c88963ea791118e5e11e314b24f90c3eb Author: Michael S. Tsirkin Date: Mon Feb 1 07:21:02 2010 +0000 vhost-net: switch to smp barriers vhost-net only uses memory barriers to control SMP effects (communication with userspace potentially running on a different CPU), so it should use SMP barriers and not mandatory barriers for memory access ordering, as suggested by Documentation/memory-barriers.txt Signed-off-by: Michael S. Tsirkin Acked-by: Rusty Russell Signed-off-by: David S. Miller commit f10a1f2e7e93a35cb603b63090ff0e70a576a641 Author: Joe Perches Date: Sun Feb 14 22:40:39 2010 -0800 niu: Use pr_, netdev_ and netif_ macros Remove #define PFX Add pr_fmt(fmt) KBUILD_MODNAME ": " fmt Convert printks to pr_ Convert printks without levels to pr_cont Convert pr_ with np->dev to netdev_ Convert dev_ to netdev_ Convert niudbg to netif_printk Convert niuinfo, niuwarn macros to netif_(priv, type, dev... Coalesce long formats Convert embedded function names to "%s", __func__ Always use "%s()..." when __func__ is printed Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a1467085dcad8214bbb1d7edafbaa295cbd8c0e7 Author: David S. Miller Date: Sun Feb 14 22:38:54 2010 -0800 ethtool: Fix includes build break Based upon a patch by Oliver Hartkopp . Signed-off-by: David S. Miller commit 1a5778aa000ebfec7f07eed0ffa2852ffb5d16bb Author: Ben Hutchings Date: Sun Feb 14 22:35:47 2010 -0800 net: Fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 5ecccb74dc91e22496a142b103ba958f93c29275 Merge: f6f2230 3d0beb9 Author: David S. Miller Date: Sun Feb 14 22:30:54 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/mac80211/rate.c commit 2e98f10a7a87ebae4dcc3949028a32008b46ceef Author: Dave Airlie Date: Mon Feb 15 15:54:45 2010 +1000 drm/radeon/kms: flush HDP cache on GART table updates. Suggested by Alex Deucher @ AMD Signed-off-by: Dave Airlie commit 028c5d5d596651bce13d06737eb3707a7e99a30c Merge: 19f6b8b 4b505db Author: Paul Mundt Date: Mon Feb 15 14:49:37 2010 +0900 Merge branch 'sh/stable-updates' commit 8b833c506c05c498d4215e2c260be44225daf6de Author: Masami Hiramatsu Date: Fri Feb 5 01:24:34 2010 -0500 kprobes: Add mcount to the kprobes blacklist Since mcount function can be called from everywhere, it should be blacklisted. Moreover, the "mcount" symbol is a special symbol name. So, it is better to put it in the generic blacklist. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Steven Rostedt LKML-Reference: <20100205062433.3745.36726.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit deded43508f065c95af506d18b8309ba842c397e Author: Kuninori Morimoto Date: Fri Feb 12 09:55:08 2010 +0000 ARM: mach-shmobile: intc-sh7372 tidyup This patch is based on Rev 0.5 manual Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit aa18ef609b65a76e4531b09dd0c196be3e04eb94 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:11:18 2010 +0000 ARM: mach-shmobile: G4EVM USBHS support Add G4EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7377. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 276b4f623cfd30320c004269725683ba8f262bb6 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:10:06 2010 +0000 ARM: mach-shmobile: sh7377 and G4EVM pinmux support Add support for the sh 7377 pinmux using drivers/sh/pfc.c and some LEDs on G4EVM. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit f6f223039c0d0683bdea1eabd35b309e10311a60 Merge: b3b3f04 42c4568 Author: David S. Miller Date: Sun Feb 14 17:45:59 2010 -0800 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit d40956665dc0c2fe2608268c2e7cff561ddcce11 Author: Linus Walleij Date: Sun Feb 14 19:41:35 2010 +0100 ARM: 5935/1: [U300] Fix the DMA configuration This fixes a few bugs in the DMA configuration for the COH 901 318 DMA engine used in U300. It also removes the directional parameter for each channel: separate DMA engine patches (submitted to the DMA engine maintainer) switches that mechanism over to using dynamic configuration of this, to handle bidirectional DMA channels. Cc: Dan Williams Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 59778fb6c402d48b1efa154e0e79d5e94726365e Author: Rabin Vincent Date: Fri Feb 12 06:23:07 2010 +0100 ARM: 5932/1: ux500: fix DEBUG_LL/earlyprintk Add a static mapping for the UART and correct its virtual address in debug-macro.S, to make DEBUG_LL/earlyprintk work. Acked-by: Srinidhi Kasagar Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 847b173ea3d6f50936823d07f2245059bf44713b Author: Tetsuo Handa Date: Thu Feb 11 09:43:54 2010 +0900 TOMOYO: Add garbage collector. This patch adds garbage collector support to TOMOYO. Elements are protected by "struct srcu_struct tomoyo_ss". Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit ec8e6a4e062e2edebef91e930c20572c9f4c0dda Author: Tetsuo Handa Date: Thu Feb 11 09:43:20 2010 +0900 TOMOYO: Add refcounter on domain structure. Add refcounter to "struct tomoyo_domain_info" since garbage collector needs to determine whether this struct is referred by "struct cred"->security or not. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit 76bb0895d038be7bcdb6ccfcd2dd7deb30371d6b Author: Tetsuo Handa Date: Thu Feb 11 09:42:40 2010 +0900 TOMOYO: Merge headers. Gather structures and constants scattered around security/tomoyo/ directory. This is for preparation for adding garbage collector since garbage collector needs to know structures and constants which TOMOYO uses. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit bf24fb016c861b7f52be0c36c4cedd3e89afa2e2 Author: Tetsuo Handa Date: Thu Feb 11 09:41:58 2010 +0900 TOMOYO: Add refcounter on string data. Add refcounter to "struct tomoyo_name_entry" and replace tomoyo_save_name() with tomoyo_get_name()/tomoyo_put_name() pair so that we can kfree() when garbage collector is added. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit df0edeb59eb559be0bee53452fda2f5cc0ae133f Author: Grant Likely Date: Sun Feb 14 14:14:00 2010 -0700 of: remove undefined request_OF_resource & release_OF_resource Neither request_OF_resource or release_OF_resource are defined anywhere. Remove the declarations. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 0d351c3e932c2e155ef5e4c3f5b87223abd4eea6 Author: Grant Likely Date: Sun Feb 14 14:13:57 2010 -0700 of/sparc: Remove sparc-local declaration of allnodes and devtree_lock Both allnodes and devtree_lock are defined in common code. The extern declaration should be in the common header too so that the compiler can type check. allnodes is already in of.h, but devtree_lock should be declared there too. This patch removes the SPARC declarations and uses decls in of.h instead. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek Acked-by: David S. Miller commit fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e Author: Grant Likely Date: Sun Feb 14 07:13:55 2010 -0700 of: move definition of of_chosen into common code. Rather than defining of_chosen in each arch, it can be defined for all in driver/of/base.c Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 22d5579e66101162fd1119f2e7f4f999ca8b48c7 Author: Grant Likely Date: Sun Feb 14 07:13:52 2010 -0700 of: remove unused extern reference to devtree_lock Neither the powerpc nor the microblaze code use devtree_lock anymore. Remove the extern reference. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 7c7b60cb87547b1664a4385c187f029bf514a737 Author: Grant Likely Date: Sun Feb 14 07:13:50 2010 -0700 of: put default string compare and #a/s-cell values into common header Most architectures don't need to change these. Put them into common code to eliminate some duplication Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 4ef7b373df330bc0ff037dc4792d373c9346375f Author: Jeremy Kerr Date: Sun Feb 14 07:13:47 2010 -0700 of/flattree: Don't assume HAVE_LMB We don't always have lmb available, so make arches provide an early_init_dt_alloc_memory_arch() to handle the allocation of memory in the fdt code. When we don't have lmb.h included, we need asm/page.h for __va. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 9dfbf207802c7e8cda9d081a8d750b50633c82d2 Author: Jeremy Kerr Date: Sun Feb 14 07:13:43 2010 -0700 of: protect linux/of.h with CONFIG_OF For platforms that have CONFIG_OF optional, we need to make the contents of linux/of.h conditional on CONFIG_OF. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 7c540d9e3da38c3d1c15fb8059e4577a84ac0066 Author: Jeremy Kerr Date: Sun Feb 14 07:13:41 2010 -0700 proc_devtree: fix THIS_MODULE without module.h Commit e22f628395432b967f2f505858c64450f7835365 introduced a build breakage for ARM devtree work: the THIS_MODULE macro was added, but we don't have module.h This change adds the necessary #include to get THIS_MODULE defined. While we could just replace it with NULL (PROC_FS is a bool, not a tristate), using THIS_MODULE will prevent unexpected breakage if we ever do compile this as a module. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 21b082ecdd7e6b8a5eba2cc013cae41b24de7f51 Author: Grant Likely Date: Sun Feb 14 07:13:38 2010 -0700 of: Remove old and misplaced function declarations The following functions don't exist: finish_device_tree() print_properties() prom_n_intr_cells() prom_get_irq_senses() The following functions are in drivers/of/base.c, so the declaration belongs in of.h instead of of_fdt.h of_machine_is_compatible() prom_add_property() prom_remove_property() prom_update_property() Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 6c5d1a49e5e88ee831117f4b2375829933ad15da Author: Sage Weil Date: Sat Feb 13 20:29:31 2010 -0800 ceph: fix msgr to keep sent messages until acked The test was backwards from commit b3d1dbbd: keep the message if the connection _isn't_ lossy. This allows the client to continue when the TCP connection drops for some reason (network glitch) but both ends survive. Signed-off-by: Sage Weil commit 414bb144efa2d2fe16d104d836d0d6b6e9265788 Author: Joerg Roedel Date: Mon Dec 14 13:08:41 2009 +0100 x86, cpu: Print AMD virtualization features in /proc/cpuinfo This patch adds code to cpu initialization path to detect the extended virtualization features of AMD cpus to show them in /proc/cpuinfo. Signed-off-by: Joerg Roedel LKML-Reference: <1260792521-15212-1-git-send-email-joerg.roedel@amd.com> Signed-off-by: H. Peter Anvin commit 0d1622d7f526311d87d7da2ee7dd14b73e45d3fc Author: Avi Kivity Date: Sat Feb 13 10:33:12 2010 +0200 x86-64, rwsem: Avoid store forwarding hazard in __downgrade_write The Intel Architecture Optimization Reference Manual states that a short load that follows a long store to the same object will suffer a store forwading penalty, particularly if the two accesses use different addresses. Trivially, a long load that follows a short store will also suffer a penalty. __downgrade_write() in rwsem incurs both penalties: the increment operation will not be able to reuse a recently-loaded rwsem value, and its result will not be reused by any recently-following rwsem operation. A comment in the code states that this is because 64-bit immediates are special and expensive; but while they are slightly special (only a single instruction allows them), they aren't expensive: a test shows that two loops, one loading a 32-bit immediate and one loading a 64-bit immediate, both take 1.5 cycles per iteration. Fix this by changing __downgrade_write to use the same add instruction on i386 and on x86_64, so that it uses the same operand size as all the other rwsem functions. Signed-off-by: Avi Kivity LKML-Reference: <1266049992-17419-1-git-send-email-avi@redhat.com> Signed-off-by: H. Peter Anvin commit d67b1b03254c501fef371b0e5916c94a52bfc2c5 Author: Julia Lawall Date: Sat Feb 6 08:45:15 2010 +0000 fs/xfs: Correct NULL test Test the value that was just allocated rather than the previously tested one. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // Signed-off-by: Julia Lawall Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit cfd3d8dcf7b4fc783db0806ac3936a7b44735bf7 Author: Greg Alexander Date: Sat Feb 13 02:02:25 2010 -0500 ALSA: hda - Add support for Lenovo IdeaPad U150 Add patch for the Conexant 5066 HDA codec to support the Lenovo IdeaPad U150 Signed-off-by: Greg Alexander Signed-off-by: Takashi Iwai commit d1c6b72a7224f6cd6924f7079f79580cde696d68 Author: Ryusuke Konishi Date: Thu Dec 17 00:55:40 2009 +0900 nilfs2: move iterator to write log into segment buffer This moves iterator to submit write requests for a series of logs into segbuf.c, and hides nilfs_segbuf_write() and nilfs_segbuf_wait() in the file. Signed-off-by: Ryusuke Konishi commit e605f0a7249d8002c660af379f884896cbaa45ae Author: Ryusuke Konishi Date: Wed Dec 9 00:57:52 2009 +0900 nilfs2: get rid of s_dirt flag use This replaces s_dirt flag use in nilfs with a new flag added on the nilfs object. The s_dirt flag was used to indicate if sop->write_super() should be called, however the current version of nilfs does not use the callback. Thus, it can be replaced with the own flag. Signed-off-by: Ryusuke Konishi Cc: Jiro SEKIBA commit dcd76186955e2b595c378dbe5b9bb6c8c5374b10 Author: Ryusuke Konishi Date: Tue Jan 26 15:20:15 2010 +0900 nilfs2: get rid of nilfs_segctor_req struct This will clean up nilfs_segctor_req struct and the obscure request argument passed among private methods of segment constructor. Signed-off-by: Ryusuke Konishi commit 086d1764b22bb2d9d79bb8e2198927acf028d732 Author: Jiro SEKIBA Date: Fri Feb 5 23:15:26 2010 +0900 nilfs2: delete unnecessary condition in nilfs_dat_translate This is a trivial patch to delete unnecessary condition in nilfs_dat_translate. nilfs_dat_translate() will asign translated address to *blocknrp if blocknrp is not NULL. However the condition is unneeded, because all callers of nilfs_dat_translate() pass blocknrp properly. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit fe5f171bb272946ce5fbf843ce2f8467d0d41b9a Author: Ryusuke Konishi Date: Sun Jan 31 19:46:40 2010 +0900 nilfs2: fix potential hang in nilfs_error on errors=remount-ro nilfs_error() calls nilfs_detach_segment_constructor() if errors=remount-ro option is specified, and this may lead to a hang due to recursive locking of, for instance, nilfs->ns_segctor_sem and others. In this case, detaching segment constructor is not necessary because read-only flag is set to the filesystem and further writes are blocked. This fixes the potential hang issue by removing the nilfs_detach_segment_constructor() call from nilfs_error. Signed-off-by: Ryusuke Konishi commit 7512487e6d6459e4c3f9c7cedc53050a6c30e387 Author: Ryusuke Konishi Date: Tue Jan 26 13:59:40 2010 +0900 nilfs2: use mnt_want_write in ioctls where write access is needed A few nilfs2 ioctls need to ask for and then later release write access to the mount in order to avoid potential write to read-only mounts. This adds the missing mnt_want_write and mnt_drop_write in nilfs_ioctl_change_cpmode, nilfs_ioctl_delete_checkpoint, and nilfs_ioctl_clean_segments. Signed-off-by: Ryusuke Konishi commit e902ec9906e844f4613fa6190c6fa65f162dc86e Author: Jiro SEKIBA Date: Sat Jan 30 18:06:35 2010 +0900 nilfs2: issue discard request after cleaning segments This adds a function to send discard requests for given array of segment numbers, and calls the function when garbage collection succeeded. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 Author: Matt Carlson Date: Fri Feb 12 14:47:13 2010 +0000 tg3: Update driver version to 3.107 This patch updates the tg3 version to 3.107. Signed-off-by: Matt Carlson Signed-off-by: David S. Miller commit 1061b7c56482310bbb8197045d51e2986afabfce Author: Matt Carlson Date: Fri Feb 12 14:47:12 2010 +0000 tg3: Fix AC131 loopback test errors for 5785 The AC131 does not enable the forced transmit clock settings immediately. The workaround is to read the register again to get the setting to take effect. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit c88734054e787542ea093b02120e324e92cad882 Author: Matt Carlson Date: Fri Feb 12 14:47:11 2010 +0000 tg3: Fix napi assignments in loopback test The 57765 lacks TSS support. This renders the napi assignments incorrect in the loopback test function. This patch fixes the problem. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 603f11738cee4d46a2a1d394ae80d718f8d37cba Author: Matt Carlson Date: Fri Feb 12 14:47:10 2010 +0000 tg3: Reset phy during bringup when using phylib The driver puts the phy into low-power mode when it releases the device. If the device were to be reacquired, the phy needs a reset to bring it back to full powered operation. This patch allows phylib-enabled devices to reset the phy. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 0339e4e3effeae71e2b19c6340ef9672fb7a2cb3 Author: Matt Carlson Date: Fri Feb 12 14:47:09 2010 +0000 tg3: Turn off multiple DMA reads for 5717 The 5717's DMA read engine has a bug when initiating multiple DMA reads across the PCIe bus. This patch disables the feature. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 6b10c1653e425e30cff7f41d0e6f9743bfa9810f Author: Matt Carlson Date: Fri Feb 12 14:47:08 2010 +0000 tg3: Fix 57765 A0 bootcode race condition On A0 revision of 57765 asic rev devices, the bootcode will perform some hardware operations, after the magic signature is presented, that will collide with setup operations performed by the driver. The best way to avoid the contention is to have the driver delay an additional 10 milliseconds. B0 revisions of the chip will make this workaround unnecessary. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit f89f38b8ec3171664314669a1396ab70b43e8961 Author: Matt Carlson Date: Fri Feb 12 14:47:07 2010 +0000 tg3: Unwedge stuck MSI-X vectors The previous patch changed the code so that new rx buffer submissions to the hardware stall if a new submission would overwrite data needed by an unserviced rx packet. On very busy 5717 and 57765 asic rev devices, there is a corner case where the hardware will fail to assert an MSI-X interrupt for rx traffic. If that vector's interrupt never has another reason to assert, any rx buffers held will never be serviced. If the buffers are never serviced and the hardware consumes all the available rx packets for other rx rings, deadlock will result. The most reliable and least intrusive way to work around the problem is to detect the case where new submissions would overwrite existing data and force all rx interrupt vectors to fire. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit e92967bfb1f4fa7da7c425df9239c4bb615dec30 Author: Matt Carlson Date: Fri Feb 12 14:47:06 2010 +0000 tg3: Prevent rx producer ring overruns When operating in RSS mode, it is possible for one rx return ring to submit enough rx buffers back to the hardware such that it inadvertently overwrites data needed by another rx return ring. This patch addresses the problem by looking for non-NULL skb pointers in the rx_[std|jmb]_buffers rings that parallel the rx producer rings. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit e4af1af900328e4aa71cd5df75bb22669ab11522 Author: Matt Carlson Date: Fri Feb 12 14:47:05 2010 +0000 tg3: Give MSI-X vec 1 rx backlog space RSS ring 1 is responsible for submitting new rx buffers to the hardware on behalf of all the other RSS rx return rings. Up until now this ring submitted its new rx buffers to the producer ring directly. The following patch will require that this ring have a place to put backlogged rx packets. As a consequence, it can no longer submit new buffers to the producer ring. This patch adds code to allocate an extra shadow producer ring for this RSS ring and adds RSS ring 1 to the list of rings needing buffer transfers. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 8151d2948e088c20b7d29c793cf1fd744b6a2699 Author: Williams, Mitch A Date: Wed Feb 10 01:44:24 2010 +0000 igb: support for VF configuration tools Add support to the igb driver for VF configuration mechanisms through the PF interface. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 Author: Williams, Mitch A Date: Wed Feb 10 01:44:05 2010 +0000 rtnetlink: Add VF config code to rtnetlink Add code to allow rtnetlink clients to query and set VF information through the PF driver. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 95c26df829ba4a25f40595cadb4c9433883cbe28 Author: Williams, Mitch A Date: Wed Feb 10 01:43:46 2010 +0000 net: Add netdev ops for SR-IOV configuration Add netdev ops for configuring SR-IOV VF devices through the PF driver. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b280da8d54b8d82b52f368a8703b7ada6c1744d5 Author: Williams, Mitch A Date: Wed Feb 10 01:43:24 2010 +0000 if_link: Add SR-IOV configuration methods Add SR-IOV VF management methods to IFLA_LINKINFO. This allows userspace to use rtnetlink to configure VF network devices. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fb8a0d9d1bfd1e4355f307e86a6da7209eefd5f3 Author: Williams, Mitch A Date: Wed Feb 10 01:43:04 2010 +0000 pci: Add SR-IOV convenience functions and macros Add and export pci_num_vf to allow other subsystems to determine how many virtual function devices are associated with an SR-IOV physical function device. Add macros dev_is_pci, dev_is_ps, and dev_num_vf to make it easier for non-PCI specific code to determine SR-IOV capabilities. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 81d54ec8479a2c695760da81f05b5a9fb2dbe40a Author: Gerrit Renker Date: Wed Feb 10 20:26:19 2010 +0000 udp: remove redundant variable The variable 'copied' is used in udp_recvmsg() to emphasize that the passed 'len' is adjusted to fit the actual datagram length. But the same can be done by adjusting 'len' directly. This patch thus removes the indirection. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 55d955902a7f78e3e7c9ddbc71a4a050d9d44810 Author: Gerrit Renker Date: Wed Feb 10 20:26:18 2010 +0000 dccp: support for passing MSG_TRUNC DCCP is datagram-oriented but lacks UDP's support for MSG_TRUNC as defined in recvmsg(2)/recv(2). Hence the following 'Hello world\0' receiver len = recv(fd, buf, 10, MSG_PEEK | MSG_TRUNC); wrongly (always) returns 10, while in UDP it returns 12 as expected. This patch adds the missing MSG_TRUNC support to recvmsg(). Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit cfc0861ba32643c63901832a583054bea0445961 Author: stephen hemminger Date: Fri Feb 12 06:58:07 2010 +0000 sky2: version 1.27 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8a0c9228f110218f443d9ef8f9ab629251959733 Author: Mike McCormack Date: Fri Feb 12 06:58:06 2010 +0000 sky2: Avoid down and up during sky2_reset Rewrite sky2_reset to work with interrupts disabled and avoid freeing and reallocing memory. The old code used sky2_down and sky2_up to implement sky2_reset, which meant interrupts could not be disabled, and the transmit and receive ring buffers would be free'd and reallocated. To avoid the interrupt handler waking the transmit queue while we're doing a reset, it's better to have interrupts and NAPI polls disabled. Note: Modified Mike's patch to do IRQ disable in sky2_down before calling sky2_hw_down - Stephen Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit f2b31cb3ae491f9e82443cf25cc5a9ebdbc63619 Author: Mike McCormack Date: Fri Feb 12 06:58:05 2010 +0000 sky2: Refactor sky2_down into two functions Create a sky2_hw_down that brings the hardware down. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminber Signed-off-by: David S. Miller commit ea0f71e59c20ea1e413cacfc971e051b3d6c6f64 Author: Mike McCormack Date: Fri Feb 12 06:58:04 2010 +0000 sky2: Refactor sky2_up into two functions Move hardware initialization into sky2_hw_up. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 200ac492b3c366346fcabd11897fadbd1a7a6599 Author: Mike McCormack Date: Fri Feb 12 06:58:03 2010 +0000 sky2: Allocate initial skbs in sky2_alloc_buffers Allocate everything in one place so there's a single point of failure in sky2_up, and sky2_rx_start can no longer fail. Don't leave the hardware in a partially initialized state in the case rx ring allocation fails. As with the old code, the rx ring still needs to be fully allocated for sky2_up to succeed. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 39ef110ba859f44efeb9a88d0e85316cd1bbecda Author: Mike McCormack Date: Fri Feb 12 06:58:02 2010 +0000 sky2: Factor out code to calculate packet sizes Move code to calculate receive threshold and packet size out of sky2_rx_start() so that is can be called from elsewhere easily. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 44dde56d37787cbad2e867a41fe87d6b0aa37fc8 Author: stephen hemminger Date: Fri Feb 12 06:58:01 2010 +0000 sky2: jumbo packet changes Change how FIFO is programmed in jumbo mode (to match vendor driver). Mostly cosmetic, the only register change is that the bits 22,23 are not programemd used. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511 Author: stephen hemminger Date: Fri Feb 12 06:58:00 2010 +0000 sky2: dont enable PME legacy mode This bit is not changed by vendor driver, and should be left alone. The documentation implies this a debug bit. 0 = WAKE# only asserted when VMAIN not available 1 = WAKE# is depend on wake events and independent of VMAIN. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5f8ae5c537d937bab9cfeb83a30a9b670c3cfb35 Author: stephen hemminger Date: Fri Feb 12 06:57:59 2010 +0000 sky2: WoL changes Change Wake On Lan code to be similar to vendor driver. The definition of Y2_HW_WOL_ON is confusing; what it means is transition to firmware SPI setting when doing power change. Since same code is done for both shutdown and suspend, use common code path. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8b05543129a5f216e08625e947a16b844bc4766d Author: stephen hemminger Date: Fri Feb 12 06:57:58 2010 +0000 sky2: fix sparse warning Warning about hidden variable Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fa55e30bc35bf4ec5a7304a537c0ce5438e908e2 Author: Alexander Schmidt Date: Wed Jan 27 17:03:08 2010 +0000 IB/ehca: Allow access for ib_query_qp() The max_dest_rd_atomic and max_qp_rd_atomic values are properly returned by query_qp(), so there should not be an error returned when they are queried. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 25ef756385ce01834504977c22bcce8d8f000e5b Author: Alexander Schmidt Date: Wed Jan 27 17:01:56 2010 +0000 IB/ehca: Do not turn off irqs in tasklet context The irq_spinlock is only taken in tasklet context, so it is safe not to disable hardware interrupts. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit a478868a1b891da8f3c67c1b933e870df89dca80 Author: Eli Cohen Date: Wed Jan 27 13:57:03 2010 +0000 IB/mlx4: Simplify retrieval of ib_device struct ib_qp already holds a pointer to the ib device. No need to dive to the hw device object to retrieve it. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit a63374631e7192a64648ecc6672619a7abf9ebcd Author: jamal Date: Tue Feb 9 13:21:17 2010 +0000 xfrm: use proper kernel types kernel side should use uxx instead of __uxx types Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c28e93040b497e895d5c41b54abef3bc8db17fa9 Author: jamal Date: Tue Feb 9 03:59:38 2010 +0000 xfrm: validate attributes Some XFRM attributes were not going through basic validation. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit d707204c1fd21ab49242aad17f92f949538e1507 Author: Joe Perches Date: Tue Feb 9 11:49:53 2010 +0000 drivers/net/skge.c: Use netif_printk macros Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ae9540f75d5a69e7604cc5391cc0726b3aa82ff6 Author: Joe Perches Date: Tue Feb 9 11:49:52 2010 +0000 drivers/net/qlge: Use netif_printk helpers Convert QPRINTK macros to netif_ equivalents. Expands and standardizes the logging message output. Removes __func__ from most logging messages. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f8502ce4f986a8fd486302980285b5e786b8dabe Author: Joe Perches Date: Tue Feb 9 11:49:51 2010 +0000 drivers/net/jme: Use netif_printk helpers Convert uses of msg_ to netif_( Remove msg_ macros Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit bf82c189a92f06967cf790d3ab0fc9827a9d00ff Author: Joe Perches Date: Tue Feb 9 11:49:50 2010 +0000 drivers/net/r8196.c: Use netif_printk macros Simplify the logic a bit, make the message logs a bit more consistent. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b3d95c5c93d4b57eaea0ad3f582b08a6b5fb3eb1 Author: Joe Perches Date: Tue Feb 9 11:49:49 2010 +0000 include/linux/netdevice.h: Add netif_printk helpers Add macros to test a private structure for msg_enable bits and the netif_msg_##bit to test and call netdev_printk if set Simplifies logic in callers and adds message logging consistency Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ba211e3ec35820eced89bfe12e2d94e6352a4c5f Author: Joe Perches Date: Tue Feb 9 11:49:48 2010 +0000 drivers/net/atl1e: Use netdev_printk helpers Logging messages sometimes had duplicated "ATL1E" output. For instance: ATL1E 0000:03:00.0: ATL1E: eth0 NIC Link is Up<100 Mbps Full Duplex> is now: ATL1E 0000:03:00.0: eth0: NIC Link is Up <100 Mbps Full Duplex> Add some consistency to logging messages Add some missing \n's to logging messages Miscellaneous typo spelling corrections Change atl1e_validate_option argument from pdev to adapter Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 571ba42303813106d533bf6bda929d8e289f51bf Author: Joe Perches Date: Tue Feb 9 11:49:47 2010 +0000 netdevice.h: Add netdev_printk helpers like dev_printk These netdev_printk routines take a struct net_device * and emit dev_printk logging messages adding "%s: " ... netdev->dev.parent to the dev_printk format and arguments. This can create some uniformity in the output message log. These helpers should not be used until a successful alloc_netdev. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 21809fafa042fcfff3f788419bed99f3c289745c Author: stephen hemminger Date: Mon Feb 8 19:48:52 2010 +0000 IPv6: remove trivial nested _bh suffix Don't need to disable bottom half it is already down in the previous lock. Move some blank lines to group locking in same context. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dc2b99f71ef477a31020511876ab4403fb7c4420 Author: stephen hemminger Date: Mon Feb 8 19:48:05 2010 +0000 IPv6: keep permanent addresses on admin down Permanent IPV6 addresses should not be removed when the link is set to admin down, only when device is removed. When link is lost permanent addresses should be marked as tentative so that when link comes back they are subject to duplicate address detection (if DAD was enabled for that address). Other routing systems keep manually configured IPv6 addresses when link is set down. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c0ad98453f23b98f73a1f1be2a75303a6c0dee4c Author: Ajit Khaparde Date: Mon Feb 8 17:51:26 2010 +0000 be2net: bug fix in be_read_eeprom The offset to read the eeprom data was missing and wrong eeprom data was being dumped. This patch fixes this. >From Suresh R Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 1a8cdc5d49cdbd79dedce8db3840fca825304d8d Author: Ajit Khaparde Date: Tue Feb 9 01:39:05 2010 +0000 be2net: remove ASIC generation number from Kconfig Since the driver is supporting multiple generations of the ASIC don't mention any ASIC generation number. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 35ecf03c833d9aae35df9f1d86e6efa86d3d2628 Author: Ajit Khaparde Date: Tue Feb 9 01:38:06 2010 +0000 be2net: change the driver description Since the driver is supporting multiple generations of the ASIC remove ASIC generation information from the driver description. This information is displayed by modinfo. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 82903e4bfca1578336a91c0c17839b484c12295d Author: Ajit Khaparde Date: Tue Feb 9 01:34:57 2010 +0000 be2net: fix to limit max vlans supported in certain skews In certain skews the ASIC can support only 16 vlans per interface. Once the limit is crossed, the ASIC is programmed in vlan promiscuous mode. Switch off the vlan promiscuous mode once the number of vlans falls back to the max vlans supported. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 205859a2ff922d0587a819b08007398cbd0a6a30 Author: Ajit Khaparde Date: Tue Feb 9 01:34:21 2010 +0000 be2net: minor code optimizations Couple of code optimizations in the Rx path (to avoid a memset). From: Sathya P Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 34a89b8c75abe2873a95524552cc266fdd3b6a85 Author: Ajit Khaparde Date: Tue Feb 9 01:32:43 2010 +0000 be2net: bug fix in be_change_mtu Current code allows the new mtu to cross the supported value. This patch fixes the boundary checks. From: Suresh R Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 3f0d4560aedaa67546eaeb3dc75fcdf68ec21036 Author: Ajit Khaparde Date: Tue Feb 9 01:30:35 2010 +0000 be2net: bug fix for flashing the BladeEngine3 ASIC Now flashing both BE2 and BE3 devices is supported. From: Naresh G Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit e254f6ecaeb4e7c0588e739bf4641df0e8c22bba Author: Ajit Khaparde Date: Tue Feb 9 01:28:35 2010 +0000 be2net: remove unused pci device id We are not going to use this device id. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 830a8a976ff2236ebc383e9a06f7872ed9243bfb Author: Shirley Ma Date: Mon Feb 8 14:14:42 2010 +0000 virtio_net: remove send queue Now we have a virtio detach API (in commit f9bfbebf34eab707b065116cdc9699d25ba4252a), we don't need to track xmit skbs in the virio_net driver, which improves transmission performance. Signed-off-by: Shirley Ma Acked-by: Rusty Russell Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit b25822ca5e3d6551b74506e2c69afada7c29c967 Author: Tristram Ha Date: Mon Feb 8 11:40:04 2010 +0000 net: Makefile change for KSZ884X driver Add Micrel KSZ884X network driver for KSZ8841/KSZ8842 PCI Ethernet chips. Signed-off-by: Tristram Ha Signed-off-by: David S. Miller commit 1eb1cc7a209f9593312ba014f1b1f02c31eda4fb Author: Tristram Ha Date: Mon Feb 8 11:38:28 2010 +0000 net: Kconfig change for KSZ884X driver Add Micrel KSZ8841/KSZ8842 PCI Ethernet chip support. Signed-off-by: Tristram Ha Signed-off-by: David S. Miller commit 8ca86fd83eae6c73db5f6b23ee3a63b77d52c8ee Author: Tristram Ha Date: Mon Feb 8 11:36:53 2010 +0000 net: Micrel KSZ8841/2 PCI Ethernet driver This is a new network driver for Micrel KSZ8841/KSZ8842 PCI Ethernet chips. The same driver can run both chips at the same time. It supports IPv4 TCP hardware checksumming and so can use scatter/gather transmission. The KSZ8842 switch has 2 ports. Some users like to take direct control of those ports. So KSZ8842 has a multiple devices mode in which the driver creates another network device so that users can specify which port to send packets. This mode is enabled by passing the "multi_dev=1" parameter to the driver during loading. The KSZ884X can receive huge frames with size up to 1916 bytes. To use this feature change the network device MTU from 1500 to 1898. The KSZ884X driver has 3 packet receive processing functions for the normal mode, multiple devices mode, and huge frame mode. Those functions are identical except for more checking for the new features. In normal programming point of view the huge frame version is the one to use because it covers all the cases, but this is done for performance consideration because the target clients for the KSZ884X chips are embedded systems, which unlike desktop PC may not have powerful CPU. Signed-off-by: Tristram Ha Signed-off-by: David S. Miller commit 447d8c2603a417cca68240059fbf1babfd27774f Author: Uwe Kleine-König Date: Fri Feb 12 12:10:47 2010 -0800 net: move am79c961's probe function to .devinit.text A pointer to am79c961_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 Signed-off-by: David S. Miller commit 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af Author: Frans Pop Date: Fri Feb 12 12:08:51 2010 -0800 sparc: remove trailing space in messages Also fixes a typo in one message. Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit 2bec5a369ee79576a3eea2c23863325089785a2c Author: Patrick McHardy Date: Mon Feb 8 05:19:03 2010 +0000 ipv6: fib: fix crash when changing large fib while dumping it When the fib size exceeds what can be dumped in a single skb, the dump is suspended and resumed once the last skb has been received by userspace. When the fib is changed while the dump is suspended, the walker might contain stale pointers, causing a crash when the dump is resumed. BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: [] fib6_walk_continue+0xbb/0x124 [ipv6] PGD 5347a067 PUD 65c7067 PMD 0 Oops: 0000 [#1] PREEMPT SMP ... RIP: 0010:[] [] fib6_walk_continue+0xbb/0x124 [ipv6] ... Call Trace: [] ? mutex_spin_on_owner+0x59/0x71 [] inet6_dump_fib+0x11b/0x1b9 [ipv6] [] netlink_dump+0x5b/0x19e [] ? consume_skb+0x28/0x2a [] netlink_recvmsg+0x1ab/0x2c6 [] ? netlink_unicast+0xfa/0x151 [] __sock_recvmsg+0x6d/0x79 [] sock_recvmsg+0xca/0xe3 [] ? autoremove_wake_function+0x0/0x38 [] ? radix_tree_lookup_slot+0xe/0x10 [] ? find_get_page+0x90/0xa5 [] ? filemap_fault+0x201/0x34f [] ? fget_light+0x2f/0xac [] ? verify_iovec+0x4f/0x94 [] sys_recvmsg+0x14d/0x223 Store the serial number when beginning to walk the fib and reload pointers when continuing to walk after a change occured. Similar to other dumping functions, this might cause unrelated entries to be missed when entries are deleted. Tested-by: Ben Greear Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 69a6a0b38a139ccceef32222108caca8a9b0b795 Author: Gerrit Renker Date: Sun Feb 7 20:20:28 2010 +0000 dccp: allow probing of CCID-array length This fixes a problem in the DCCP getsockopt() API: currently there is no way for a user to a priori know the number of built-in CCIDs, other than trying DCCP_SOCKOPT_AVAILABLE_CCIDS in a loop, incrementing the option length until EINVAL is no longer returned. This patch truncates the array to the user-provided length. No copy is made when the length is <= 0. Due to the length restriction in do_dccp_getsockopt() to sizeof(int), the minimum array length remains 4, which is a reasonable default (only 3 CCIDs, CCID-2..4, are currently defined). Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 180040b89ee2aed88c0a0b1fcf7ada9a512b12e3 Author: Christoph Hellwig Date: Fri Feb 5 09:57:55 2010 +0000 xfs: optimize log flushing in xfs_fsync If we have a pinned inode it must have a log item attached to it. Usually that log item will have ili_last_lsn already set, in which case we only need to flush the log up to that LSN instead of doing a full log force. This gives speedups of about 5% in some fsync heavy workloads. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 87185517de81101da5afbc82cefdeed6eeaa38fb Author: Christoph Hellwig Date: Wed Feb 3 19:43:31 2010 +0000 xfs: only clear the suid bit once in xfs_write file_remove_suid already calls into ->setattr to clear the suid and sgid bits if needed, no need to start a second transaction to do it ourselves. Note that xfs_write_clear_setuid issues a sync transaction while the path through ->setattr doesn't, but that is consistant with the other filesystems. Signed-off-by: Christoph Hellwig Reviewed-by: Alex Elder Signed-off-by: Alex Elder commit 918cae14872c56446415299fc17cf98704c9a537 Merge: 0482e3c 7f049ad Author: Tony Lindgren Date: Fri Feb 12 11:39:53 2010 -0800 Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus commit 7455a76f170f794498d26081a5f15b797ef1a2aa Author: Jiri Pirko Date: Mon Feb 8 05:12:08 2010 +0000 macb: straighten out macb_mii_probe function Use "phy_find_first" instead of manual lookup. Also use "phy_connect_direct" instead of "phy_connect" since we already have phy_device pointer here. Signed-off-by: Jiri Pirko Acked-by: Haavard Skinnemoen Signed-off-by: David S. Miller commit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 Author: Jiri Pirko Date: Mon Feb 8 04:30:35 2010 +0000 net: use netdev_mc_count and netdev_mc_empty when appropriate This patch replaces dev->mc_count in all drivers (hopefully I didn't miss anything). Used spatch and did small tweaks and conding style changes when it was suitable. Jirka Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e Author: Felix Fietkau Date: Thu Feb 11 18:07:19 2010 +0100 ath9k: add a workaround for ack timeout issues Adding support for setting the coverage class in some cases broke association and data transfer, as it overwrote the initial ACK timeout value from the initvals with a smaller value. I don't know why the new value works in 5 GHz (matches the initval there), but not in 2.4 GHz (initvals use 64us here), so until the problem is fully understood, the value should be increased again. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit dd645cee7b50b61cb2d05b59eb6027679c437af6 Author: Yinghai Lu Date: Wed Feb 10 01:20:30 2010 -0800 x86: Add find_fw_memmap_area ... so we can move early_res up. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-27-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 9b3be9f99203d9a400e8547f0e80f1d8f8e5738c Author: Yinghai Lu Date: Wed Feb 10 01:20:29 2010 -0800 Move round_up/down to kernel.h ... in preparation of moving early_res to kernel/. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-26-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 59be5a8e8ce765cf739ec7f07176219972de7481 Author: Yinghai Lu Date: Wed Feb 10 01:20:28 2010 -0800 x86: Make 32bit support NO_BOOTMEM Let's make 32bit consistent with 64bit. -v2: Andrew pointed out for 32bit that we should use -1ULL Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-25-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 53db62a2529280ff216c941d8a2650204547e44a Author: Yinghai Lu Date: Wed Feb 10 01:20:27 2010 -0800 early_res: Enhance check_and_double_early_res ... to make it always try to start from low at first. This makes it less likely for early_memtest to reserve a bad range, in particular it puts new early_res in a range that is already tested. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-24-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit efdd0e81df0f23830c6d2cb971cf87f415b8dbdb Author: Yinghai Lu Date: Wed Feb 10 01:20:26 2010 -0800 x86: Move back find_e820_area to e820.c Makes early_res.c more clean, so later could move it to /kernel. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-23-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 7da657d1f1dd27fa9d8289d5f7e53479c7fd3a95 Author: Yinghai Lu Date: Wed Feb 10 01:20:25 2010 -0800 x86: Add find_early_area_size Prepare to move bck find_e820_area_size back to e820.c. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-22-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit a678c2be75773e112f6d656a22a7f1645c4dbd6c Author: Yinghai Lu Date: Wed Feb 10 01:20:24 2010 -0800 x86: Separate early_res related code from e820.c ... to make e820.c smaller. -v2: fix 32bit compiling with MAX_DMA32_PFN Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-21-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit db8f77c889542b09457b8b97efb311343c99a75d Author: Yinghai Lu Date: Wed Feb 10 01:20:23 2010 -0800 x86: Move bios page reserve early to head32/64.c So prepare to make one more clean of early_res.c. -v2: don't need to reserve first page in early_res because we already mark that in e820 as reserved already. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-20-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 9bdac914240759457175ac0d6529a37d2820bc4d Author: Yinghai Lu Date: Wed Feb 10 01:20:22 2010 -0800 sparsemem: Put mem map for one node together. Add vmemmap_alloc_block_buf for mem map only. It will fallback to the old way if it cannot get a block that big. Before this patch, when a node have 128g ram installed, memmap are split into two parts or more. [ 0.000000] [ffffea0000000000-ffffea003fffffff] PMD -> [ffff880100600000-ffff88013e9fffff] on node 1 [ 0.000000] [ffffea0040000000-ffffea006fffffff] PMD -> [ffff88013ec00000-ffff88016ebfffff] on node 1 [ 0.000000] [ffffea0070000000-ffffea007fffffff] PMD -> [ffff882000600000-ffff8820105fffff] on node 0 [ 0.000000] [ffffea0080000000-ffffea00bfffffff] PMD -> [ffff882010800000-ffff8820507fffff] on node 0 [ 0.000000] [ffffea00c0000000-ffffea00dfffffff] PMD -> [ffff882050a00000-ffff8820709fffff] on node 0 [ 0.000000] [ffffea00e0000000-ffffea00ffffffff] PMD -> [ffff884000600000-ffff8840205fffff] on node 2 [ 0.000000] [ffffea0100000000-ffffea013fffffff] PMD -> [ffff884020800000-ffff8840607fffff] on node 2 [ 0.000000] [ffffea0140000000-ffffea014fffffff] PMD -> [ffff884060a00000-ffff8840709fffff] on node 2 [ 0.000000] [ffffea0150000000-ffffea017fffffff] PMD -> [ffff886000600000-ffff8860305fffff] on node 3 [ 0.000000] [ffffea0180000000-ffffea01bfffffff] PMD -> [ffff886030800000-ffff8860707fffff] on node 3 [ 0.000000] [ffffea01c0000000-ffffea01ffffffff] PMD -> [ffff888000600000-ffff8880405fffff] on node 4 [ 0.000000] [ffffea0200000000-ffffea022fffffff] PMD -> [ffff888040800000-ffff8880707fffff] on node 4 [ 0.000000] [ffffea0230000000-ffffea023fffffff] PMD -> [ffff88a000600000-ffff88a0105fffff] on node 5 [ 0.000000] [ffffea0240000000-ffffea027fffffff] PMD -> [ffff88a010800000-ffff88a0507fffff] on node 5 [ 0.000000] [ffffea0280000000-ffffea029fffffff] PMD -> [ffff88a050a00000-ffff88a0709fffff] on node 5 [ 0.000000] [ffffea02a0000000-ffffea02bfffffff] PMD -> [ffff88c000600000-ffff88c0205fffff] on node 6 [ 0.000000] [ffffea02c0000000-ffffea02ffffffff] PMD -> [ffff88c020800000-ffff88c0607fffff] on node 6 [ 0.000000] [ffffea0300000000-ffffea030fffffff] PMD -> [ffff88c060a00000-ffff88c0709fffff] on node 6 [ 0.000000] [ffffea0310000000-ffffea033fffffff] PMD -> [ffff88e000600000-ffff88e0305fffff] on node 7 [ 0.000000] [ffffea0340000000-ffffea037fffffff] PMD -> [ffff88e030800000-ffff88e0707fffff] on node 7 after patch will get [ 0.000000] [ffffea0000000000-ffffea006fffffff] PMD -> [ffff880100200000-ffff88016e5fffff] on node 0 [ 0.000000] [ffffea0070000000-ffffea00dfffffff] PMD -> [ffff882000200000-ffff8820701fffff] on node 1 [ 0.000000] [ffffea00e0000000-ffffea014fffffff] PMD -> [ffff884000200000-ffff8840701fffff] on node 2 [ 0.000000] [ffffea0150000000-ffffea01bfffffff] PMD -> [ffff886000200000-ffff8860701fffff] on node 3 [ 0.000000] [ffffea01c0000000-ffffea022fffffff] PMD -> [ffff888000200000-ffff8880701fffff] on node 4 [ 0.000000] [ffffea0230000000-ffffea029fffffff] PMD -> [ffff88a000200000-ffff88a0701fffff] on node 5 [ 0.000000] [ffffea02a0000000-ffffea030fffffff] PMD -> [ffff88c000200000-ffff88c0701fffff] on node 6 [ 0.000000] [ffffea0310000000-ffffea037fffffff] PMD -> [ffff88e000200000-ffff88e0701fffff] on node 7 -v2: change buf to vmemmap_buf instead according to Ingo also add CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER according to Ingo -v3: according to Andrew, use sizeof(name) instead of hard coded 15 Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-19-git-send-email-yinghai@kernel.org> Cc: Christoph Lameter Acked-by: Christoph Lameter Signed-off-by: H. Peter Anvin commit a4322e1bad91fbca27056fc38d2cbca3f1eae0cf Author: Yinghai Lu Date: Wed Feb 10 01:20:21 2010 -0800 sparsemem: Put usemap for one node together Could save some buffer space instead of applying one by one. Could help that system that is going to use early_res instead of bootmem less entries in early_res make search more faster on system with more memory. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-18-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 08677214e318297f228237be0042aac754f48f1d Author: Yinghai Lu Date: Wed Feb 10 01:20:20 2010 -0800 x86: Make 64 bit use early_res instead of bootmem before slab Finally we can use early_res to replace bootmem for x86_64 now. Still can use CONFIG_NO_BOOTMEM to enable it or not. -v2: fix 32bit compiling about MAX_DMA32_PFN -v3: folded bug fix from LKML message below Signed-off-by: Yinghai Lu LKML-Reference: <4B747239.4070907@kernel.org> Signed-off-by: H. Peter Anvin commit eed18b5fa4d297c681b00144e8c6942dd35d39a7 Author: Russell King Date: Sat Nov 21 12:58:13 2009 +0000 ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it Signed-off-by: Russell King commit 7e20c837208f6fdd553d04f5fe3e80f44570698b Author: Russell King Date: Sat Nov 21 12:56:13 2009 +0000 ARM: PNX4008: i2c-pnx makes no use of asm/uaccess.h nor asm/irq.h Remove unnecessary includes Signed-off-by: Russell King commit 4be53dbe74818a12cc737a89b5d0aec6095956e0 Author: Russell King Date: Sat Nov 21 12:46:31 2009 +0000 ARM: PNX4008: i2c-pnx: don't split messages across several lines It makes them harder to grep for. Signed-off-by: Russell King commit 81d6724a564fa5bd20b006eae0da4462d599bb92 Author: Russell King Date: Sat Nov 21 12:40:00 2009 +0000 ARM: PNX4008: Use i2c driver data for passing between internal functions Since the drivers data now contains the i2c adapter structure, we can pass around the drivers data between internal functions (which is what they want) rather than using the i2c adapter structure and having an additional pointer dereference each time. Signed-off-by: Russell King commit 9d7f73632c87ef1b6187eb539d1efd63c3cf0e36 Author: Russell King Date: Sat Nov 21 12:25:27 2009 +0000 ARM: PNX4008: move i2c_adapter structure inside the drivers private data Signed-off-by: Russell King commit 44c5d739181886cff8e3903dfa38cd704f3d9640 Author: Russell King Date: Sat Nov 21 12:10:54 2009 +0000 ARM: PNX4008: kzalloc i2c drivers internal data Signed-off-by: Russell King commit 88d968b22fa26d5e3a8cab46fc7c3a21c89a91d3 Author: Russell King Date: Sat Nov 21 11:58:36 2009 +0000 ARM: PNX4008: Make ioaddr 'void __iomem *' rather than 'u32' This avoids unnecessary casting. Signed-off-by: Russell King commit 2781681ea6629ac0a685f5afe2011f916ab3c8ba Author: Russell King Date: Sat Nov 21 11:43:33 2009 +0000 ARM: PNX4008: remove platform definitions from mach/timex.h mach/timex.h is only supposed to contain a definition for CLOCK_TICK_RATE. Remove additional includes, and move private definitions to a private header file. Signed-off-by: Russell King commit 6fff3da998ac3cc9ed8a84bf4f19911bd63c8c32 Author: Russell King Date: Fri Nov 20 12:46:07 2009 +0000 ARM: PNX4008: get i2c clock rate from clk API Acked-by: Vitaly Wool Signed-off-by: Russell King commit ebdbbf2003ae2342147c87c2a6c6ed8984b9cede Author: Russell King Date: Fri Nov 20 11:44:46 2009 +0000 ARM: PNX4008: convert i2c-pnx to use clk API enable/disable calls clk_set_rate() is not supposed to be used to turn clocks on and off. That's what clk_enable/clk_disable is for. Acked-by: Vitaly Wool Signed-off-by: Russell King commit 0321cb83e1c3f3a4282bd620c6cec78c5b80b572 Author: Russell King Date: Fri Nov 20 11:12:26 2009 +0000 ARM: PNX4008: move i2c clock start/stop into driver Acked-by: Vitaly Wool Signed-off-by: Russell King commit a0dcf19f59d4f37150a6b7e115925d72aca15293 Author: Russell King Date: Fri Nov 20 10:50:34 2009 +0000 ARM: PNX4008: move i2c suspend/resume callbacks into driver Acked-by: Vitaly Wool Signed-off-by: Russell King commit bba2be480b981bc1e7bea24c2a2552b0ad7e9774 Author: Russell King Date: Fri Nov 20 10:46:24 2009 +0000 ARM: PNX4008: convert i2c clocks to match by device only Acked-by: Vitaly Wool Signed-off-by: Russell King commit 24fd1edaac79fe9554c557f9f93b3197c136c236 Author: Russell King Date: Fri Nov 20 13:04:14 2009 +0000 ARM: PNX4008: convert watchdog to use clk API enable/disable calls clk_set_rate() is not supposed to be used to turn clocks on and off. That's what clk_enable/clk_disable is for. Acked-by: Wim Van Sebroeck Acked-by: Vitaly Wool Signed-off-by: Russell King commit 9bb787f435c86ffed079b66efa3ef6a8c577568c Author: Russell King Date: Fri Nov 20 13:07:28 2009 +0000 ARM: PNX4008: convert watchdog clocks to match by device only Acked-by: Wim Van Sebroeck Acked-by: Vitaly Wool Signed-off-by: Russell King commit 0c452df9f08d4f0b829802cec3501d987390ada2 Author: Russell King Date: Fri Nov 20 11:28:59 2009 +0000 ARM: PNX4008: provide clock enable/disable methods and initialization Acked-by: Vitaly Wool Signed-off-by: Russell King commit 5413f7464e976e2c2ddb20686fc2e66ae8795b6e Author: Russell King Date: Fri Nov 20 11:25:44 2009 +0000 ARM: PNX4008: simplify clk enable/disable paths Acked-by: Vitaly Wool Signed-off-by: Russell King commit 6985a5ad0d719d8c8d584a69f6e5d7138a2e19ab Author: Russell King Date: Fri Nov 20 10:32:41 2009 +0000 ARM: PNX4008: convert to clkdev Acked-by: Vitaly Wool Signed-off-by: Russell King commit 0a0300dc8c4b3f3ce5c9ef5a0a4be5442590398f Author: Russell King Date: Tue Jan 12 12:28:00 2010 +0000 ARM: Consolidate clks_register() and similar Most machine classes want some way to register a block of clk_lookup structures, and most do it by implementing a clks_register() type function which walks an array, or by open-coding a loop. Consolidate all this into clkdev_add_table(). Acked-by: H Hartley Sweeten Reviewed-by: Kevin Hilman Acked-by: Eric Miao Signed-off-by: Russell King commit 4e6d488af37980d224cbf298224db6173673f362 Author: Tony Lindgren Date: Mon Feb 1 23:26:53 2010 +0100 ARM: 5910/1: ARM: Add tmp register for addruart and loadsp Otherwise more complicated uart configuration won't be possible. We can use r1 for tmp register for both head.S and debug.S. NOTE: This patch depends on another patch to add the the tmp register into all debug-macro.S files. That can be done with: $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" arch/arm/*/include/*/debug-macro.S Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 796d12959ad374cae8eb77faaf4243455a305433 Author: Jean PIHET Date: Tue Jan 26 18:51:05 2010 +0100 ARM: 5903/1: arm/perfevents: add support for ARMv7 Adds the Performance Events support for ARMv7 processor, using the PMNC unit in HW. Supports the following: - Cortex-A8 and Cortex-A9 processors, - dynamic detection of the number of available counters, based on the PMCR value, - runtime detection of the CPU arch (v6 or v7) and model (Cortex-A8 or Cortex-A9) Tested on OMAP3 (Cortex-A8) only. Signed-off-by: Jean Pihet Signed-off-by: Russell King commit 1b8873a0c6ec511870c106c80b94658f857c47f2 Author: Jamie Iles Date: Tue Feb 2 20:25:44 2010 +0100 ARM: 5902/4: arm/perfevents: implement perf event support for ARMv6 This patch implements support for ARMv6 performance counters in the Linux performance events subsystem. ARMv6 architectures that have the performance counters should enable HW_PERF_EVENTS to get hardware performance events support in addition to the software events. Note: only ARM Ltd ARM cores are supported. This implementation also provides an ARM PMU abstraction layer to allow ARMv7 and others to be supported in the future by adding new a 'struct arm_pmu'. Cc: Jean Pihet Cc: Will Deacon Signed-off-by: Jamie Iles Signed-off-by: Russell King commit 7ada189f5c8627662c23f49b3e68463f86fc511e Author: Jamie Iles Date: Tue Feb 2 20:24:58 2010 +0100 ARM: 5900/2: arm: enable support for software perf events The perf events subsystem allows counting of both hardware and software events. This patch implements the bare minimum for software performance events. Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Jamie Iles Signed-off-by: Russell King commit 1618fdd9602c689de2f820a88cb3e283a39c3d90 Author: Jamie Iles Date: Tue Feb 2 20:24:07 2010 +0100 ARM: 5901/2: arm/oprofile: reserve the PMU when starting Make sure that we have access to the performance counters and that they aren't being used by perf events or anything else. Cc: Will Deacon Cc: Jean Pihet Signed-off-by: Jamie Iles Signed-off-by: Russell King commit 0f4f0672ac950c96cffaf84a666d35e817d7c3ca Author: Jamie Iles Date: Tue Feb 2 20:23:15 2010 +0100 ARM: 5899/2: arm: provide a mechanism to reserve performance counters To add support for perf events and to allow the hardware counters to be shared with oprofile, we need a way to reserve access to the pmu (performance monitor unit). Platforms with PMU interrupts should register the interrupts in arch/arm/kernel/pmu.c Signed-off-by: Jamie Iles Signed-off-by: Russell King commit c7b66698122796623f1838c0ee6a8e12ec832468 Author: Stefan Roese Date: Wed Feb 10 03:54:59 2010 +0000 powerpc/40x: Add support for PPC40x boards with > 512MB SDRAM This patch adds support for boards with more that 512MByte RAM. Currently only 512MB of memory are enabled in the DCCR/ICCR real-mode cache control registers. This patch now enables caching in real-mode for 2GByte. Signed-off-by: Stefan Roese Cc: Benjamin Herrenschmidt Cc: Josh Boyer Signed-off-by: Josh Boyer commit 858155fbcc0cd713f6382c527bb1c3abc0ed6d00 Author: Oliver Neukum Date: Fri Feb 12 13:02:28 2010 +0100 HID: usbhid: introduce timeout for stuck ctrl/out URBs Some devices do not react to a control request (seen on APC UPS's) resulting in a slow stream of messages, "generic-usb ... control queue full". Therefore request needs a timeout. Cc: stable@kernel.org Signed-off-by: Oliver Neukum Signed-off-by: David Fries Signed-off-by: Jiri Kosina commit 92fe0ff16a9299233104187bd6ceb2101501badc Author: Aaro Koskinen Date: Wed Dec 9 17:26:25 2009 +0100 OMAP: DSS: Taal: fix error returns in taal_probe() The workqueue creation error branch attempted to destroy a NULL wq, and, in turn, a failed registration does not destroy the newly created workqueue. The problem was reported by a static analysis tool. Signed-off-by: Aaro Koskinen Signed-off-by: Tomi Valkeinen commit 80b1cc23ac96373bd5ff17f8959f2587d6fc37dd Author: Tomi Valkeinen Date: Thu Feb 4 17:13:16 2010 +0200 OMAP: 3430SDP: remove vdvi regulator The regulator is now enabled by DSS driver, and thus the panel driver doesn't need to touch it. Signed-off-by: Tomi Valkeinen commit 8a2cfea8ccb6292dc43c37968fe08475ae7c2576 Author: Tomi Valkeinen Date: Thu Feb 4 17:03:41 2010 +0200 OMAP: DSS2: enable VDDS_DSI when using DPI It looks like on OMAP3 some DSS pins need VDDS_DSI to function properly. This has not been confirmed from TI, but looking at figure 15-1 "Display subsystem highlight" from the TRM, some data pins come near the DSI and SDI blocks. This is not very hard evidence, but the fact remains that with the power on, pixels are ok, and with the power off, pixels are not ok. It may also be that VDDS_SDI is needed to power some pins, but as normally both VDDS_SDI and VDDS_DSI come from the same power source, this hasn't been shown. It seems that a single driver can only get a regulator once. This patch solves it by getting all the required regulators in one place, and from which the submodules then get the regulators they need. Signed-off-by: Tomi Valkeinen commit e721032785b72afbc3da14c5525ca570bc2ed108 Author: Janusz Krzysztofik Date: Fri Dec 11 13:21:46 2009 +0000 omapfb: lcd_ams_delta: add support for contrast control The patch extends the Amstrad Delta LCD panel driver with optional support for changing contrast using standard LCD class device API instead of setting it silently to a default value at panel enable. It also allows for lowering power consumption by turning off OMAP_PWL_CLK_ENABLE via lcd_ops.set_power callback. Created and tested against linux-omap for-next, commit 155a75d9725e66e5ec8a383822957dee52427057. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tomi Valkeinen commit 3e9ff04408483b7972240cf433c7fb4b6b88cf0a Author: Janusz Krzysztofik Date: Thu Jan 14 21:25:43 2010 +0100 omapfb: Fix 12-bit display (RGB444 color mode) handling Support for RGB444 (12-bit) pixel format has been introduced into omapfb/lcdc by Mark Underwood on 2006-05-26 (commit f74edb6668aad9fc8e81585861b18f996c78a574) in preparation for Amstrad Delta (E3) videophone LCD display support. Before the Amstrad Delta LCD patch by Jonathan McDowell was applied (on 2006-08-04, commit 8d22fb2ea004cdb6379b54c1a8fd1546cfe40ed7), omapfb and lcdc code was changed substantially (commit e563dc81aa01bd8bbb01bc53975a15c398715f62 dated 2006-06-26) in a way that broke Mark's 12-bit display support. Than, a patch by Jonathan, that supposed to correct the problem, was introduced immediatelly (on 2006-08-04, commit e10a75b49e7a57ae17c28b705153c70eba15a8ef). As a result, the Amstrad Delta display was working correctly at boot time, with fbset reporting: geometry 480 320 480 320 16 ... rgba 4/8,4/4,4/0,0/0 However, after first framebuffer reinitialization, colors were no longer being displayed correctly and fbset was reporting: rgba 5/11,6/5,5/0,0/0 The patch tries to correct the issue by setting plane->color_mode depending on panel->bpp, not var->bits_per_pixel. Created and tested on Amstrad Delta against linux-2.6.33-rc3. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tomi Valkeinen commit 60596045ac3d73ab6aac85d1eca617ba4c97b020 Author: Tomi Valkeinen Date: Thu Jan 14 15:12:47 2010 +0200 OMAP: DSS2: Improve Kconfig help texts Signed-off-by: Tomi Valkeinen commit 9ce4ad0a7b2e21363ce1d1d4c8eb4c2ae213cb59 Author: Grazvydas Ignotas Date: Fri Dec 11 21:30:14 2009 +0200 OMAP: DSS: add TPO TD043MTEA1 panel Add support of TPO TD043MTEA1 TFT LCD panel to DSS2 driver. This panel is used by OMAP3 Pandora device. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tomi Valkeinen commit 751ef159c5600e7ee53e64c3d04f3e2d78908ce5 Author: Mike Rapoport Date: Mon Dec 14 09:01:07 2009 +0100 OMAP: DSS2: add Toppoly TDO35S panel Signed-off-by: Mike Rapoport Signed-off-by: Tomi Valkeinen commit 3a66d3877eaa4ab9818000a15c07326adaa9ca79 Author: Mark Brown Date: Thu Feb 11 13:27:19 2010 +0000 ASoC: Add WM2000 driver The WM2000 is a low power, high quality handset receiver speaker driver with Wolfson myZone™ Ambient Noise Cancellation (ANC). It provides enhanced voice communication quality in a noisy environment if the handset acoustics are designed appropriately. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7f049ad15ece7f63b59ad438b51629434cdc0198 Author: Mike Rapoport Date: Mon Dec 14 09:01:08 2009 +0100 omap3: cm-t35: add DSS2 display support Signed-off-by: Mike Rapoport Signed-off-by: Tomi Valkeinen commit c3d33329f400587976613c0224ffa2e266677cfb Author: Vaibhav Hiremath Date: Wed Jan 13 17:17:10 2010 +0530 OMAP: AM3517: Enable DSS2 for AM3517EVM board Signed-off-by: Vaibhav Hiremath [tomi.valkeinen@nokia.com: removed defconfig changes] Signed-off-by: Tomi Valkeinen commit 703e3061a043a7b87df2460044666d68394bdb69 Author: Vaibhav Hiremath Date: Mon Jan 4 15:34:16 2010 +0100 OMAP: Enable DSS2 for OMAP3EVM board Signed-off-by: Vaibhav Hiremath [tomi.valkeinen@nokia.com: removed evm defconfig changes] Signed-off-by: Tomi Valkeinen commit 6db29675b1cb60e878d04a1f69aba265189b2e33 Author: Guennadi Liakhovetski Date: Thu Feb 11 18:11:10 2010 +0100 ASoC: fix compile breakage if CONFIG_SH_DMA_API=y && CONFIG_SND_SIU_MIGOR!=n Audio on Migo-R cannot work if CONFIG_SH_DMA_API=y, but compilation should not break anyway. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a540e13386e90f8c833c5cd0d16d877b8a277af1 Merge: cebe41d c3a3e04 Author: Takashi Iwai Date: Fri Feb 12 10:42:38 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc commit 6b79b264ce04e2acd24330140e147801cdbaa39f Author: Jiri Kosina Date: Fri Feb 12 10:31:37 2010 +0100 No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h This is partial revert of commit 9404c9c392d5 ("Fix misspelling of "should" and "shouldn't" in comments"). According to Dave Airlie: "Can we drop any cleanups to atombios.h? This file comes from AMD and we normally drop it into place, so they just get overwritten next time." Reported-by: Dave Airlie Signed-off-by: Jiri Kosina commit 19f6b8b44e3f633d5d7d1ed68848b1eb89a1e800 Author: Paul Mundt Date: Fri Feb 12 15:41:45 2010 +0900 sh64: fix up memory offset calculation. The linker script offsets were broken by the recent 29/32-bit integration, so this fixes it up for sh64. Signed-off-by: Paul Mundt commit b0f3ae03aca0f331b851ae94bc066124e7f104df Author: Paul Mundt Date: Fri Feb 12 15:40:00 2010 +0900 sh: Isolate uncached mapping support. This splits out the uncached mapping support under its own config option, presently only used by 29-bit mode and 32-bit + PMB. This will make it possible to optionally add an uncached mapping on sh64 as well as booting without an uncached mapping for 32-bit. Signed-off-by: Paul Mundt commit ca1c2e2da9637c131436bf6d6ae41b58f5353afe Author: Alexey Dobriyan Date: Fri Feb 12 06:25:36 2010 +0100 netfilter: don't use INIT_RCU_HEAD() call_rcu() will unconditionally reinitialize RCU head anyway. Signed-off-by: Alexey Dobriyan Reviewed-by: Paul E. McKenney Signed-off-by: Patrick McHardy commit 857b409a48bdc33e824dff2d730e271b964e78bd Author: Alexey Dobriyan Date: Fri Feb 12 06:24:46 2010 +0100 netfilter: nf_conntrack: elegantly simplify nf_ct_exp_net() Remove #ifdef at nf_ct_exp_net() by using nf_ct_net(). Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 3a7b802d1a8c279876ec74094d71f3c6c45d8030 Author: Magnus Damm Date: Wed Feb 10 20:13:31 2010 +0900 ARM: mach-shmobile: G3EVM USBHS support Add G3EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7367. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7fdda6780aaa21c7a94e09975649649bb0f4a932 Author: Magnus Damm Date: Wed Feb 10 20:10:55 2010 +0900 ARM: mach-shmobile: sh7367 and G3EVM pinmux support Add support for the sh7367 pinmux using drivers/sh/pfc.c and select serial console pins and some LEDs on G3EVM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit ccbe9f0b11b137c9453771a7ca3bf417dc7ce152 Author: Jiri Slaby Date: Thu Feb 11 15:40:48 2010 -0800 RDMA: Use rlimit helpers Make sure compiler won't do weird things with limits by using the rlimit helpers added in 3e10e716 ("resource: add helpers for fetching rlimits"). E.g. fetching them twice may return 2 different values after writable limits are implemented. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Roland Dreier commit 757bebb3f989f10acc6f105e89305b0d19aa7c55 Author: Or Gerlitz Date: Thu Feb 11 15:40:40 2010 -0800 IPoIB: Remove TX moderation settings from ethtool support As of commit f56bcd8 ("IPoIB: Use separate CQ for UD send completions"), there are no TX interrupts. Change the ethtool code not to report TX moderation settings, so users will not be misled to think they can control TX interrupt moderation. Pointed out by Alex Vainman Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 2542322485be45853cc72d542d8ed84fae82c981 Author: Steve Wise Date: Thu Feb 11 15:40:29 2010 -0800 RDMA/cxgb3: Remove BUG_ON() on CQ rearm failure Failure to rearm a CQ means the cxgb3 device is wedged, but we shouldn't kill the whole system with a BUG_ON() if this happens. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit cf4f7e8c47b3298cf90239bad5d86fdcad0c89eb Author: Sean Hefty Date: Thu Feb 11 15:40:25 2010 -0800 RDMA/cm: Remove unused definition of RDMA_PS_SCTP The defined SCTP number is incorrect (0x83, rather than 0x84), and since it is not used anywhere, simply remove the definition. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 2225a122ae26d542bdce523d9d87a4a7ba10e07b Author: Suresh Siddha Date: Thu Feb 11 11:51:00 2010 -0800 ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET Generic support for PTRACE_GETREGSET/PTRACE_SETREGSET commands which export the regsets supported by each architecture using the correponding NT_* types. These NT_* types are already part of the userland ABI, used in representing the architecture specific register sets as different NOTES in an ELF core file. 'addr' parameter for the ptrace system call encode the REGSET type (using the corresppnding NT_* type) and the 'data' parameter points to the struct iovec having the user buffer and the length of that buffer. struct iovec iov = { buf, len}; ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov); On successful completion, iov.len will be updated by the kernel specifying how much the kernel has written/read to/from the user's iov.buf. x86 extended state registers are primarily exported using this interface. Signed-off-by: Suresh Siddha LKML-Reference: <20100211195614.886724710@sbs-t61.sc.intel.com> Acked-by: Hongjiu Lu Cc: Roland McGrath Signed-off-by: H. Peter Anvin commit 5b3efd500854d45d305b53c54c97db5970959980 Author: Suresh Siddha Date: Thu Feb 11 11:50:59 2010 -0800 x86, ptrace: regset extensions to support xstate Add the xstate regset support which helps extend the kernel ptrace and the core-dump interfaces to support AVX state etc. This regset interface is designed to support all the future state that gets supported using xsave/xrstor infrastructure. Looking at the memory layout saved by "xsave", one can't say which state is represented in the memory layout. This is because if a particular state is in init state, in the xsave hdr it can be represented by bit '0'. And hence we can't really say by the xsave header wether a state is in init state or the state is not saved in the memory layout. And hence the xsave memory layout available through this regset interface uses SW usable bytes [464..511] to convey what state is represented in the memory layout. First 8 bytes of the sw_usable_bytes[464..467] will be set to OS enabled xstate mask(which is same as the 64bit mask returned by the xgetbv's xCR0). The note NT_X86_XSTATE represents the extended state information in the core file, using the above mentioned memory layout. Signed-off-by: Suresh Siddha LKML-Reference: <20100211195614.802495327@sbs-t61.sc.intel.com> Signed-off-by: Hongjiu Lu Cc: Roland McGrath Signed-off-by: H. Peter Anvin commit 7cb72ef4d39978e6e07415a2d552b06d567c3079 Author: Jerome Glisse Date: Thu Feb 11 12:44:32 2010 +0100 drm/radeon/kms: fix r600/r700 cs checker to avoid double kfree radeon_cs kfree the tracker structure but for r6xx/r7xx we want to kfree it inside the parse function because we share it with the UMS code path. Set tracker to NULL after freeing it will avoid double free. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 8e5574211d96c0552f84c757718475fdb4021be7 Author: Roland Dreier Date: Thu Feb 11 12:14:23 2010 -0800 ethtool: Use explicit designated initializers for .cmd Initialize the .cmd member of various ethtool using a designated struct initializer rather. This makes things a teeny bit more robust, although the chance of a struct layout changing is extremely remote, and also makes the code a little easier to read. Signed-off-by: Roland Dreier Signed-off-by: David S. Miller commit 867af973a3b38f2a564d612326efd2694d931f30 Author: Thomas Weber Date: Thu Feb 11 16:13:59 2010 +0100 Add ASoC support for Devkit8000 This patch expands the omap3beagle sound soc for the beagle board clone DevKit8000. Signed-off-by: Thomas Weber Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8031049147c58d9d8b6226c3ac31a9d72d053e25 Author: Sage Weil Date: Tue Feb 9 16:43:11 2010 -0800 ceph: remove bogus invalidate_mapping_pages We were invalidating mapping pages when dropping FILE_CACHE in __send_cap(). But ceph_check_caps attempts to invalidate already, and also checks for success, so we should never get to this point. Signed-off-by: Sage Weil commit 0840d8af3e6e40bcd5f2366698eb2755f88acfea Author: Sage Weil Date: Tue Feb 9 15:44:16 2010 -0800 ceph: invalidate pages even if truncate is pending There is no reason not to invalidate pages when a truncate is pending. Both throw out page cache pages. Signed-off-by: Sage Weil commit 3c6f6b79a64db7f1c7abf09d693db3b0066784fb Author: Sage Weil Date: Tue Feb 9 15:24:44 2010 -0800 ceph: cleanup async writeback, truncation, invalidate helpers Grab inode ref in helper. Make work functions static, with consistent naming. Signed-off-by: Sage Weil commit 6a026589ba333185c466c906376fe022a27a53f9 Author: Sage Weil Date: Tue Feb 9 14:04:02 2010 -0800 ceph: fix sync read eof check deadlock If a sync read gets a short result from the OSD, it may need to do a getattr to see if it is short due to reaching end-of-file. The getattr was being done while holding a reference to FILE_RD, which can lead to a deadlock if the MDS is revoking that capability bit and can't process the getattr until it does. We fix this by setting a flag if EOF size validation is needed, and doing the getattr in ceph_aio_read, after the RD cap ref is dropped. If the read needs to be continued, we loop and continue traversing the file. Signed-off-by: Sage Weil commit 68c283236a1e0772e1a469dd2ffc17afc300b07b Author: Sage Weil Date: Tue Feb 9 13:41:47 2010 -0800 ceph: do not retain caps that are being revoked Never retain caps in __send_cap() that are being revoked. Signed-off-by: Sage Weil commit cbd03635913a86afb7c2cfc0058932956b05b51e Author: Sage Weil Date: Tue Feb 9 13:41:18 2010 -0800 ceph: cap revocation fixes Try to invalidate pages in ceph_check_caps() if FILE_CACHE is being revoked. If we fail, queue an immediate async invalidate if FILE_CACHE is being revoked. (If it's not being revoked, we just queue the caps for later evaluation later, as per the old behavior.) Signed-off-by: Sage Weil commit 29065a513aa4c7e4b46b77cbcd25f814a4ca0bfe Author: Yehuda Sadeh Date: Tue Feb 9 11:14:41 2010 -0800 ceph: sync read/write considers page cache In the cases where we either do a sync read or a write, we need to make sure that everything in the page cache is flushed. In the case of a sync write we invalidate the relevant pages, so that subsequent read/write reflects the new data written. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 3d497d858ae6e5f23a28783030aecc69074e102d Author: Yehuda Sadeh Date: Tue Feb 9 11:08:40 2010 -0800 ceph: fix truncation when not holding caps A truncation should occur when either we have the specified caps for the file, or (in cases where we are not the only ones referencing the file) when it is mapped or when it is opened. The latter two cases were not handled. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 4af6b2257ee0eb8f4bf3b1dc8acb643c0e8a887f Author: Yehuda Sadeh Date: Tue Feb 9 11:02:51 2010 -0800 ceph: refactor ceph_write_begin, fix ceph_page_mkwrite Originally ceph_page_mkwrite called ceph_write_begin, hoping that the returned locked page would be the page that it was requested to mkwrite. Factored out relevant part of ceph_page_mkwrite and we lock the right page anyway. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 972f0d3ab1a15cb5d790dd8c53903066084b28f2 Author: Yehuda Sadeh Date: Thu Feb 4 13:41:41 2010 -0800 ceph: fix short synchronous reads Zeroing of holes was not done correctly: page_off was miscalculated and zeroing the tail didn't not adjust the 'read' value to include the zeroed portion. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 02f90c61096ec3ad691e808a4aa7ca5a06e550ec Author: Sage Weil Date: Thu Feb 4 16:18:10 2010 -0800 ceph: add uid field to ceph_pg_pool Also verify encoding version as we go. Signed-off-by: Sage Weil commit f5a2041bd96c9f05ff10172b9c814c14f247084e Author: Yehuda Sadeh Date: Wed Feb 3 11:00:26 2010 -0800 ceph: put unused osd connections on lru Instead of removing osd connection immediately when the requests list is empty, put the osd connection on an lru. Only if that osd has not been used for more than a specified time, will it be removed. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit b056c8769d1da6a6a80ce780a4b8957b70434a41 Author: Yehuda Sadeh Date: Wed Feb 3 10:47:48 2010 -0800 ceph: remove unused variable Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit ec0994e48ea2aebf62ff08376227f3a9ccf46262 Author: Sage Weil Date: Tue Feb 2 16:25:35 2010 -0800 ceph: add support for auth_x authentication protocol The auth_x protocol implements support for a kerberos-like mutual authentication infrastructure used by Ceph. We do not simply use vanilla kerberos because of scalability and performance issues when dealing with a large cluster of nodes providing a single logical service. Auth_x provides mutual authentication of client and server and protects against replay and man in the middle attacks. It does not encrypt the full session over the wire, however, so data payload may still be snooped. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit c7c6b1fe9f942c1a30585ec2210a09dfff238506 Author: Li Zefan Date: Wed Feb 10 15:43:04 2010 +0800 ftrace: Allow to remove a single function from function graph filter I don't see why we can only clear all functions from the filter. After patching: # echo sys_open > set_graph_function # echo sys_close >> set_graph_function # cat set_graph_function sys_open sys_close # echo '!sys_close' >> set_graph_function # cat set_graph_function sys_open Signed-off-by: Li Zefan LKML-Reference: <4B726388.2000408@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 1db5950f1d0b82e07371b211a48317b8972da063 Author: Trieu 'Andrew' Nguyen Date: Wed Feb 10 10:27:34 2010 -0800 iwlwifi: Monitor and recover the aggregation TX flow failure This change monitors the tx statistics to detect the drop in throughput. When the throughput drops, the ratio of the actual_ack_count and the expected_ ack_count also drops. At the same time, the aggregated ba_timeout (the number of ba timeout retries) also rises. If the actual_ack_count/expected_ack_count ratio is 0 and the number of ba timeout retries rises to 16, no tx packets (tcp, udp, or ping - icmp) can be delivered. The driver recovers from this situation by reseting the uCode firmware. If the actual_ack_count/expected_ ack_count ratio drops below 50% (but not 0) and the aggregated ba_timeout retries just exceed 5 (but not 16), then the driver can reset the radio to bring the throughput up. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Reinette Chatre commit a9e10fb9b1c6ad16e73cf2656951fce3a817611e Author: Wey-Yi Guy Date: Tue Feb 9 08:14:11 2010 -0800 iwlwifi: clear all the stop_queue flag after load firmware All the queues are awake and ready to use after loading firmware, for firmware reload case, if any queues was stopped before reload, mac80211 will wake those queues after restart hardware, so make sure all the flag used to keep track of the queue status are reset correctly. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit f36d04abe684f9e2b07c6ebe9f77ae20eb5c1e84 Author: Stanislaw Gruszka Date: Wed Feb 10 05:07:45 2010 -0800 iwlwifi: use dma_alloc_coherent Change pci_alloc_consistent() to dma_alloc_coherent() so we can use GFP_KERNEL flag. Signed-off-by: Stanislaw Gruszka Signed-off-by: Reinette Chatre commit 6c3872e1d52290dcd506473028867cacc6b7393d Author: Trieu 'Andrew' Nguyen Date: Mon Feb 8 13:53:05 2010 -0800 iwlwifi: Adjusting PLCP error threshold for 1000 NIC While testing the station with the NIC 1000 family, it is found that the plcp error can easily exceed 50 value in 100mSecs. This creates unneccessary radio reset/tuning. This patch raises the PLCP error threshold of the NIC 1000 from 50 to 200 error count. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Reinette Chatre commit 4843b5a731b31916d100cfc5ba4d03ae78462ed9 Author: Reinette Chatre Date: Wed Feb 3 09:38:59 2010 -0800 iwlwifi: reset card during probe To ensure that card is in a sane state during probe we add a reset call. This change was prompted by users of kdump who was not able to bring up the wireless driver in the kdump kernel. The problem here was that the primary kernel, which is not running at the time, left the wireless card up and running. When the kdump kernel starts it is thus possible to immediately receive interrupts from firmware after registering interrupt, but without being ready to deal with interrupts from firmware yet. Reported-by: Stanislaw Gruszka Signed-off-by: Reinette Chatre commit bbcbb9ef9735c67da303d30bd6beb9e699f0f508 Author: Reinette Chatre Date: Tue Feb 2 10:57:12 2010 -0800 iwlwifi: fix scan race There is a problem if an "internal short scan" is in progress when a mac80211 requested scan arrives. If this new scan request arrives within the "next_scan_jiffies" period then driver will immediately return success and complete the scan. The problem here is that the scan has not been fully initialized at this time (is_internal_short_scan is still set to true because of the currently running scan), which results in the scan completion never to be sent to mac80211. At this time also, evan though the internal short scan is still running the state (is_internal_short_scan) will be set to false, so when the internal scan does complete then mac80211 will receive a scan completion. Fix this by checking right away if a scan is in progress when a scan request arrives from mac80211. Signed-off-by: Reinette Chatre commit 7bfedc59ee350727b115bbc79780c69b114f162d Author: Abhijeet Kolekar Date: Wed Feb 3 13:47:56 2010 -0800 iwlwifi: cleanup return values Cleanup return values and removes unnecessary code. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit a24dd27c47fcb31ba5c906b66e5cbc28bfa3fa5e Author: Wey-Yi Guy Date: Wed Feb 3 12:51:07 2010 -0800 iwlwifi: remove unused op-code in PHY Calibration command Number of calibration op-code are not used by driver, remove those from iwl-commands.h Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 45d427001b5eec03cecaacddb53c73af46bb263e Author: Wey-Yi Guy Date: Wed Feb 3 12:24:44 2010 -0800 iwlwifi: check for aggregation frame and queue Error checking for aggregation frames should go into aggregation queue, if aggregation queue not available, use legacy queue instead. Also make sure the aggregation queue is available to activate, if driver and mac80211 is out-of-sync, try to disable the queue and sync-up with mac80211. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 04cafd7fa74d5f70efc93bef36f118177057ff74 Author: Wey-Yi Guy Date: Wed Feb 3 11:47:20 2010 -0800 iwlwifi: add debug function to reset/reload radio/firmware Adding function to force reset radio or reload firmware from debugfs. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit a93e7973d0983d22fcbe5f691244736211639fe7 Author: Wey-Yi Guy Date: Wed Feb 3 11:47:19 2010 -0800 iwlwifi: multiple force reset mode Provide the function to perform different type of uCode reset/reload operation. When uCode detect error and can not fix itself, this iwl_force_reset() function allow driver to perform the necessary reset/reload functions and help to bring uCode back to normal operation state. Currently only 2 type of force reset are available: - reset radio - reload firmware Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit dff010ac8e57e43669518a14c0e945dfeb80c2a7 Author: Wey-Yi Guy Date: Tue Feb 2 16:58:34 2010 -0800 iwlwifi: clear all tx queues when firmware ready Reset and clear all the tx queues when finished downloading runtime uCode and ready to go into operation mode. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit b2907e501945d5d13326a6a7441c13e41cd0e799 Author: Alexey Dobriyan Date: Thu Feb 11 18:41:35 2010 +0100 netfilter: xtables: fix mangle tables In POST_ROUTING hook, calling dev_net(in) is going to oops. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit c3a3e040f01457d2ea4f199f75ca205401001a3b Author: Jaroslav Kysela Date: Thu Feb 11 17:50:44 2010 +0100 ALSA: usbmixer - add possibility to remap dB values USB devices tends to represent dB ranges in different way than ALSA expects. Add possibility to override these values and add guessed values for SoundBlaster MP3+. Also rename 'Capture Input Source' control to 'Capture Source' for SoundBlaster MP3+ and Extigy. Signed-off-by: Jaroslav Kysela commit 5c42dc7070c94622ca914b5a2e227f3744e857e7 Author: Jean Delvare Date: Thu Feb 11 15:04:36 2010 +0100 devres/irq: Fix devm_irq_match comment Fix the reference (in comment). Signed-off-by: Jean Delvare Signed-off-by: Jiri Kosina commit 9d288dffe3a276e1f06ba556845c456d696c5a4f Author: Patrick McHardy Date: Thu Feb 11 12:30:21 2010 +0100 netfilter: nf_conntrack_sip: add T.38 FAX support Signed-off-by: Patrick McHardy commit 48f8ac26537c1b7b1a2422f5232f45d06c945348 Author: Patrick McHardy Date: Thu Feb 11 12:29:38 2010 +0100 netfilter: nf_nat_sip: add TCP support Add support for mangling TCP SIP packets. Signed-off-by: Patrick McHardy commit 010c0b9f34a4c567b431f8b49a58b7332ed42e47 Author: Patrick McHardy Date: Thu Feb 11 12:27:09 2010 +0100 netfilter: nf_nat: support mangling a single TCP packet multiple times nf_nat_mangle_tcp_packet() can currently only handle a single mangling per window because it only maintains two sequence adjustment positions: the one before the last adjustment and the one after. This patch makes sequence number adjustment tracking in nf_nat_mangle_tcp_packet() optional and allows a helper to manually update the offsets after the packet has been fully handled. Signed-off-by: Patrick McHardy commit f5b321bd37fbec9188feb1f721ab46a5ac0b35da Author: Patrick McHardy Date: Thu Feb 11 12:26:19 2010 +0100 netfilter: nf_conntrack_sip: add TCP support Add TCP support, which is mandated by RFC3261 for all SIP elements. SIP over TCP is similar to UDP, except that messages are delimited by Content-Length: headers and multiple messages may appear in one packet. Signed-off-by: Patrick McHardy commit 3b6b9fab42fe98358d70735cf98d43fc18dc79c9 Author: Patrick McHardy Date: Thu Feb 11 12:23:53 2010 +0100 netfilter: nf_conntrack_sip: pass data offset to NAT functions When using TCP multiple SIP messages might be present in a single packet. A following patch will parse them by setting the dptr to the beginning of each message. The NAT helper needs to reload the dptr value after mangling the packet however, so it needs to know the offset of the message to the beginning of the packet. Signed-off-by: Patrick McHardy commit 54101f4f3bed87fa968b57f77f8ff3b09fd88bcf Author: Patrick McHardy Date: Thu Feb 11 12:23:12 2010 +0100 netfilter: nf_conntrack_sip: fix ct_sip_parse_request() REGISTER request parsing When requests are parsed, the "sip:" part of the SIP URI should be skipped. Usually this doesn't matter because address parsing skips forward until after the username part, but in case REGISTER requests it doesn't contain a username and the address can not be parsed. Signed-off-by: Patrick McHardy commit b87921bdf25485afd8f5a5f25e86b5acef32a9cf Author: Patrick McHardy Date: Thu Feb 11 12:22:48 2010 +0100 netfilter: nf_conntrack: show helper and class in /proc/net/nf_conntrack_expect Make the output a bit more informative by showing the helper an expectation belongs to and the expectation class. Signed-off-by: Patrick McHardy commit d1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf Author: Patrick McHardy Date: Thu Feb 11 12:22:28 2010 +0100 netfilter: ctnetlink: dump expectation helper name Signed-off-by: Patrick McHardy commit 71b38bd4c1cc4f2b653064357e4efab77dfd711d Author: Michael Poole Date: Thu Feb 11 00:32:57 2010 -0500 HID: magicmouse: coding style and probe failure fixes Use proper values to initialize bool configuration variables, tabs rather than spaces, no braces for one-line else clause, __set_bit() when the operation doesn't have to be atomic, input_set_abs_params() rather than writing the fields directly, and call hid_hw_stop() when appropriate to handle failures in the probe. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit 82568565683b4991964a5fc89a9ca0c7122818e8 Author: Dave Airlie Date: Fri Feb 5 16:00:07 2010 +1000 drm/radeon/kms: set gart pages to invalid on unbind and point to dummy page this uses a new entrypoint to invalidate gart entries instead of using 0. Changed to rather than pointing to 0 address point empty entry to dummy page. This might help to avoid hard lockup if for some wrong reasons GPU try to access unmapped GART entry. I'm not 100% sure this is going to work, we probably need to allocate a dummy page and point all the GTT entries at it similiar to what AGP does. but we can test this first I suppose. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit e34398952e056bbd99f9099fae77be26e5c6aa78 Author: Dave Airlie Date: Thu Feb 11 15:38:23 2010 +1000 drm/radeon/kms: check for valid PCI bios and not OF rom stops us trying to treat a OF rom as a PCI rom. Signed-off-by: Dave Airlie commit 03047cdf724d8de9fbfd38b53d768c190225290f Author: Michel Dänzer Date: Wed Feb 10 11:05:11 2010 +0100 drm/radeon/kms: Test rdev->bios centrally in combios_get_table_offset(). It's happened time and time again (most recently with the support for EDID hardcoded in the BIOS ROM) that new code didn't check for rdev->bios being non-NULL before triggering dereferences of it. This would result in an oops/panic on setups with no BIOS ROM. Hopefully this central test will be more robust. Signed-off-by: Michel Dänzer Signed-off-by: Dave Airlie commit 961fb597c17e2e4f55407d56b7211c188ab41eff Author: Jerome Glisse Date: Wed Feb 10 22:30:05 2010 +0000 drm/radeon/kms: r600/r700 command stream checker This patch add cs checker to r600/r700 hw. Command stream checking will rewrite some of the cs value in order to restrict GPU access to BO size. This doesn't break old userspace but just enforce safe value. It should break any things that was using the r600/r700 cs ioctl to do forbidden things (malicious software), though we are not aware of such things. Here is the list of thing we check : - enforcing resource size - enforcing color buffer slice tile max, will restrict cb access - enforcing db buffer slice tile max, will restrict db access We don't check for shader bigger than the BO in which they are supposed to be, such use would lead to GPU lockup and is harmless from security POV, as far as we can tell (note that even checking for this wouldn't prevent someone to write bogus shader that lead to lockup). This patch has received as much testing as humanly possible with old userspace to check that it didn't break such configuration. However not all the applications out there were tested, thus it might broke some odd, rare applications. [airlied: fix rules for cs checker for parallel builds] Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit b036f6fb3aa23a52d90da5fc57e0803f08292e82 Author: Bastian Blank Date: Wed Feb 10 23:06:23 2010 -0800 Input: wacom - get features from driver info Get the features information from the driver info of the usb device id structure provided by the caller. The device ids and feature structs are strong coupled using indices. Signed-off-by: Bastian Blank Tested-by: Jason Childs Acked-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 5deeac99fe1146532eb7c64f9adb17d17628d751 Author: Andrew Clayton Date: Wed Feb 10 23:18:05 2010 -0800 Input: rotary-encoder - set gpio direction for each requested gpio Even with the correct pin mux settings, you still need to explicitly set the gpio direction. Call gpio_direction_input() after each requested gpio. Signed-off-by: Andrew Clayton Signed-off-by: Mark Somerville Tested-by: H Hartley Sweeten Acked-by: Daniel Mack Signed-off-by: Dmitry Torokhov commit 8f8be2439cd368cc6ba94888919ee90b5a26f0cb Author: Magnus Damm Date: Wed Feb 10 23:03:22 2010 -0800 Input: sh_keysc - update the driver with mode 6 Add mode 6 support to the sh_keysc driver. Also update the KYOUTDR mask value to include all 16 register bits. Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit 324e5ade1569111a40c349726d8a2694b28d7943 Author: Magnus Damm Date: Wed Feb 10 22:13:21 2010 -0800 Input: sh_keysc - switch to using bitmaps Use bitmaps instead of using 32-bit integers to keep track of the key states. With this change in place the driver supports key pads with more than 32 keys. Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit 2b14a808fbbb042d0de323260d939bdf95e9efdf Author: Magnus Damm Date: Wed Feb 10 22:13:21 2010 -0800 Input: sh_keysc - factor out hw access functions Update the sh_keysc driver to factor out the register access functions sh_keysc_read(), sh_keysc_write() together with sh_keysc_level_mode(). This makes the code a bit easier to follow. Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit b63de38591605916fff5d483e0bedc65dfe3d395 Author: Eric Miao Date: Sun Feb 7 23:10:05 2010 -0800 Input: schedule corgi_ssp and corgi_ts to be removed Signed-off-by: Eric Miao Acked-by: Richard Purdie Acked-by: Pavel Machek Signed-off-by: Dmitry Torokhov commit 74e7e725e4766a2045708d274d4d07cd4fae8adc Author: Eric Miao Date: Sun Feb 7 23:10:05 2010 -0800 Input: mark {corgi,spitz,tosa}kbd drivers deprecated Provided that now keyboards on these devices are fully supported by generic GPIO based matrix keypad driver, mark these hardcoded and difficult to maintain drivers as deprecated. Signed-off-by: Eric Miao Acked-by: Pavel Machek Signed-off-by: Dmitry Torokhov commit ca0b7df3374c5566468c17f26fa2dfd3fe3c6a37 Author: Tetsuo Handa Date: Sun Feb 7 20:23:59 2010 +0900 TOMOYO: Reduce lines by using common path for addition and deletion. Since the codes for adding an entry and removing an entry are similar, we can save some lines by using "if (is_delete) { ... } else { ... }" branches. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit 172e91f535dc3607a7dba1d249ab9e918444548a Author: Pavel Roskin Date: Thu Feb 11 14:31:32 2010 +1000 drm/kms: fix spelling of "CLOCK" Signed-off-by: Pavel Roskin [clemens@ladisch.de: merged into drm_fb_helper] Signed-off-by: Clemens Ladisch Signed-off-by: Dave Airlie commit 8dff4742a6a718e71d15a9b7a8d3d2255bfbc91a Author: Dave Airlie Date: Thu Feb 11 14:28:58 2010 +1000 drm/kms: fix fb_changed = true else statement a patch from Roel was wrong, fix this properly, really if the fb ptrs are different fb changed shuold be true. Signed-off-by: Dave Airlie commit 3b40a4434f4d65321332dec590a079d7a75077d8 Author: Andy Shevchenko Date: Tue Feb 2 14:40:32 2010 -0800 drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi() Kernel has simple_strtol() which would be used as atoi(). This is quite the same fix as in 2cb96f86628d6e97fcbda5fe4d8d74876239834c ("fbdev: drop custom atoi from drivers/video/modedb.c") because code in drivers/gpu/drm/drm_fb_helper.c is based on drivers/video/modedb.c. Signed-off-by: Andy Shevchenko Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 9a1420d1185693b6e24719d3937a0c20a3e0e31d Author: Dave Airlie Date: Wed Feb 3 19:14:35 2010 +1000 drm: switch all GEM/KMS ioctls to unlocked ioctl status. These ioctls are all protected by their own locking mechanisms so should be fine to not bother locking around. Signed-off-by: Dave Airlie commit bc9025bdc4e2b591734cca17697093845007b63d Author: Luca Barbieri Date: Tue Feb 9 05:49:12 2010 +0000 Use drm_gem_object_[handle_]unreference_unlocked where possible Mostly obvious simplifications. The i915 pread/pwrite ioctls, intel_overlay_put_image and nouveau_gem_new were incorrectly using the locked versions without locking: this is also fixed in this patch. Signed-off-by: Luca Barbieri Signed-off-by: Dave Airlie commit c3ae90c099bb62387507e86da7cf799850444b08 Author: Luca Barbieri Date: Tue Feb 9 05:49:11 2010 +0000 drm: introduce drm_gem_object_[handle_]unreference_unlocked This patch introduces the drm_gem_object_unreference_unlocked and drm_gem_object_handle_unreference_unlocked functions that do not require holding struct_mutex. drm_gem_object_unreference_unlocked calls the new ->gem_free_object_unlocked entry point if available, and otherwise just takes struct_mutex and just calls ->gem_free_object Signed-off-by: Luca Barbieri Signed-off-by: Dave Airlie commit 92eb879ff59c5995bf18f76eb0a00cb7db758e42 Author: Peter Waskiewicz Date: Wed Feb 10 16:08:13 2010 +0000 ixgbe: Bump driver version up Driver has gone under significant changes, the version should reflect that. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9a713e7c7cca2f31c89367bb7b48310ab8a3e630 Author: Peter Waskiewicz Date: Wed Feb 10 16:07:54 2010 +0000 ixgbe: Add support for the new ethtool n-tuple programming interface This patch adds n-tuple filter programming to 82599. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 15682bc488d4af8c9bb998844a94281025e0a333 Author: Peter P Waskiewicz Jr Date: Wed Feb 10 20:03:05 2010 -0800 ethtool: Introduce n-tuple filter programming support This patchset enables the ethtool layer to program n-tuple filters to an underlying device. The idea is to allow capable hardware to have static rules applied that can assist steering flows into appropriate queues. Hardware that is known to support these types of filters today are ixgbe and niu. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4c36b678a23d33b82d614afe4f958a9d244ede5d Author: Alex Deucher Date: Tue Feb 9 18:22:00 2010 -0500 drm/radeon/kms/evergreen: adapt to i2c changes original evergreen patches we against a kernel tree without my radeon i2c algo changes. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 12d7798f71107e7f4391a532af8c6690bda16f66 Author: Alex Deucher Date: Tue Feb 9 17:18:48 2010 -0500 drm/radeon/kms/evergreen: fix multi-head Fix a typo in crtc offset setup that set the crtc instances wrong for all crtcs except the first. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 37b4390ec7f12f82e47a2ef56dccee094f26d34f Author: Alex Deucher Date: Tue Feb 9 12:04:43 2010 -0500 drm/radeon/kms/atom: replace 0/1 in crtc code with ATOM_DISABLE/ATOM_ENABLE Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9dad76e8be982b3c72bc89a72f7d603bae87fa96 Author: Alex Deucher Date: Mon Feb 8 14:34:43 2010 -0500 drm/radeon/kms: fix prescale calculations Pre-pcie chips seem to use the reference clock rather than the sclk. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 Merge: 9ba8745 a6c7fdd Author: Tony Lindgren Date: Wed Feb 10 18:18:13 2010 -0800 Merge branch 'omap-fixes-for-linus' into omap-for-linus commit 375c568844e49d292885c7485d4a255f71680e56 Author: stephen hemminger Date: Sun Feb 7 06:28:36 2010 +0000 sky2: receive checksum refactoring Break the largish case for handling receive checksum into a separate function, and if there is a problem use dev_XXX routines to show which hardware is the problem. Turn one corner case into a BUG(). This only happens if the driver is expecting one behavior but the chip does the old behavior; only ever saw this when bringing up a new chip type and driver was buggy. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit acd12dde26eef5186a9d2ead9399d136932d2398 Author: stephen hemminger Date: Sun Feb 7 06:24:50 2010 +0000 sky2: disable ASF on Yukon Supreme Clone of vendor code to disable ASF on Extreme and Supreme chips. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a0db28b898266265c1cc2ff84f041a561a265504 Author: stephen hemminger Date: Sun Feb 7 06:23:53 2010 +0000 sky2: resume clocks Change the resume path to use pci write config for a couple of reasons: 1. pci_write_config_dword() allows for more error checking of PCI health after resume. 2. better to toggle this register on all chip types, since that is what vendor driver does. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c252a5bb1f57afb1e336d68085217727ca7b2134 Author: Yinghai Lu Date: Wed Feb 10 01:20:19 2010 -0800 x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA 64bit NUMA already make enough space under 4G with new early_node_mem. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-16-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit cef625eef8b4cd573a9f6a17861d34226aebf6c2 Author: Yinghai Lu Date: Wed Feb 10 01:20:18 2010 -0800 x86: Make early_node_mem get mem > 4 GB if possible So we could put pgdata for the node high, and later sparse vmmap will get the section nr that need. With this patch will make <4 GB ram not use a sparse vmmap. before this patch, will get, before swiotlb try get bootmem [ 0.000000] nid=1 start=0 end=2080000 aligned=1 [ 0.000000] free [10 - 96] [ 0.000000] free [b12 - 1000] [ 0.000000] free [359f - 38a3] [ 0.000000] free [38b5 - 3a00] [ 0.000000] free [41e01 - 42000] [ 0.000000] free [73dde - 73e00] [ 0.000000] free [73fdd - 74000] [ 0.000000] free [741dd - 74200] [ 0.000000] free [743dd - 74400] [ 0.000000] free [745dd - 74600] [ 0.000000] free [747dd - 74800] [ 0.000000] free [749dd - 74a00] [ 0.000000] free [74bdd - 74c00] [ 0.000000] free [74ddd - 74e00] [ 0.000000] free [74fdd - 75000] [ 0.000000] free [751dd - 75200] [ 0.000000] free [753dd - 75400] [ 0.000000] free [755dd - 75600] [ 0.000000] free [757dd - 75800] [ 0.000000] free [759dd - 75a00] [ 0.000000] free [75bdd - 7bf5f] [ 0.000000] free [7f730 - 7f750] [ 0.000000] free [100000 - 2080000] [ 0.000000] total free 1f87170 [ 93.301474] Placing 64MB software IO TLB between ffff880075bdd000 - ffff880079bdd000 [ 93.311814] software IO TLB at phys 0x75bdd000 - 0x79bdd000 with this patch will get: before swiotlb try get bootmem [ 0.000000] nid=1 start=0 end=2080000 aligned=1 [ 0.000000] free [a - 96] [ 0.000000] free [702 - 1000] [ 0.000000] free [359f - 3600] [ 0.000000] free [37de - 3800] [ 0.000000] free [39dd - 3a00] [ 0.000000] free [3bdd - 3c00] [ 0.000000] free [3ddd - 3e00] [ 0.000000] free [3fdd - 4000] [ 0.000000] free [41dd - 4200] [ 0.000000] free [43dd - 4400] [ 0.000000] free [45dd - 4600] [ 0.000000] free [47dd - 4800] [ 0.000000] free [49dd - 4a00] [ 0.000000] free [4bdd - 4c00] [ 0.000000] free [4ddd - 4e00] [ 0.000000] free [4fdd - 5000] [ 0.000000] free [51dd - 5200] [ 0.000000] free [53dd - 5400] [ 0.000000] free [55dd - 7bf5f] [ 0.000000] free [7f730 - 7f750] [ 0.000000] free [100428 - 100600] [ 0.000000] free [13ea01 - 13ec00] [ 0.000000] free [170800 - 2080000] [ 0.000000] total free 1f87170 [ 92.689485] PCI-DMA: Using software bounce buffering for IO (SWIOTLB) [ 92.699799] Placing 64MB software IO TLB between ffff8800055dd000 - ffff8800095dd000 [ 92.710916] software IO TLB at phys 0x55dd000 - 0x95dd000 so will get enough space below 4G, aka pfn 0x100000 Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-15-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 28b1c57d3c1f8df69c958f2ae7b9e4b67538ff4d Author: Yinghai Lu Date: Wed Feb 10 01:20:17 2010 -0800 x86: Dynamically increase early_res array size Use early_res_count to track the num, and use find_e820 to get a new buffer, then copy from the old to the new one. Also, clear early_res to prevent later invalid usage. -v2 _check_and_double_early_res should take new start Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-14-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 264ebb182e85f30aa473fa2189d5d5ea173ec3ab Author: Yinghai Lu Date: Wed Feb 10 01:20:16 2010 -0800 x86: Introduce max_early_res and early_res_count To prepare allocate early res array from fine_e820_area. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-13-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 1842f90cc98625d4d9bf8f8b927f17705ceb4e9c Author: Yinghai Lu Date: Wed Feb 10 01:20:15 2010 -0800 x86: Call early_res_to_bootmem one time Simplify setup_node_mem: don't use bootmem from other node, instead just find_e820_area in early_node_mem. This keeps the boundary between early_res and boot mem more clear, and lets us only call early_res_to_bootmem() one time instead of for all nodes. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-12-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 79c601695870ca2a9c0ba9949a97d2be78ec07b2 Author: Yinghai Lu Date: Wed Feb 10 01:20:14 2010 -0800 x86: Print out RAM buffer information So we can check that early in the bootlog. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-11-git-send-email-yinghai@kernel.org> Reviewed-by: Christoph Lameter Signed-off-by: H. Peter Anvin commit e9a0064ad03b899938059bb576615ad9ed0f27f9 Author: Yinghai Lu Date: Wed Feb 10 01:20:13 2010 -0800 x86: Change range end to start+size So make interface more consistent with early_res. Later we can share some code with early_res. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-10-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit 284f933d45a1e60404328440910bc2651c0fb51d Author: Yinghai Lu Date: Wed Feb 10 01:20:12 2010 -0800 x86/pci: Enable pci root res read out for 32bit too Should be good for 32bit too. -v3: cast res->start -v4: according to Linus, to use %pR instead of cast Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-9-git-send-email-yinghai@kernel.org> Acked-by: Jesse Barnes Signed-off-by: H. Peter Anvin commit 9ad3f2c7c69659c343843393944d739fec1f2e73 Author: Yinghai Lu Date: Wed Feb 10 01:20:11 2010 -0800 x86/pci: Add cap_resource() Prepare for 32bit pci root bus -v2: hpa said we should compare with (resource_size_t)~0 -v3: according to Linus to use MAX_RESOURCE instead. also need need to put related patches together -v4: according to Andrew, use min in cap_resource() Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-8-git-send-email-yinghai@kernel.org> Acked-by: Jesse Barnes Signed-off-by: H. Peter Anvin commit 97445c3b86e0b64e059b4829a7193f8e26fb5bfc Author: Yinghai Lu Date: Wed Feb 10 01:20:10 2010 -0800 x86/pci: Use u64 instead of size_t in amd_bus.c Prepare to enable it for 32bit. -v2: remove not needed cast Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-7-git-send-email-yinghai@kernel.org> Acked-by: Jesse Barnes Signed-off-by: H. Peter Anvin commit 3e3da00c01d050307e753fb7b3e84aefc16da0d0 Author: Yinghai Lu Date: Wed Feb 10 01:20:09 2010 -0800 x86/pci: AMD one chain system to use pci read out res Found MSI amd k8 based laptops is hiding [0x70000000, 0x80000000) RAM from e820. enable amd one chain even for all. -v2: use bool for found, according to Andrew Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-6-git-send-email-yinghai@kernel.org> Acked-by: Jesse Barnes Signed-off-by: H. Peter Anvin commit b74fd238a9cf39a81d94152f375b756bf795b4af Author: Yinghai Lu Date: Wed Feb 10 01:20:08 2010 -0800 x86/pci: Use resource_size_t in update_res Prepare to enable 32bit intel and amd bus. Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-5-git-send-email-yinghai@kernel.org> Acked-by: Jesse Barnes Signed-off-by: H. Peter Anvin commit 27811d8cabe56e0c3622251b049086f49face4ff Author: Yinghai Lu Date: Wed Feb 10 01:20:07 2010 -0800 x86: Move range related operation to one file We have almost the same code for mtrr cleanup and amd_bus checkup, and this code will also be used in replacing bootmem with early_res, so try to move them together and reuse it from different parts. Also rename update_range to subtract_range as that is what the function is actually doing. -v2: update comments as Christoph requested Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-4-git-send-email-yinghai@kernel.org> Signed-off-by: H. Peter Anvin commit c85e4aae699360e8db4ebfe710e917ac9b6fc77e Author: H. Peter Anvin Date: Wed Feb 10 17:45:09 2010 -0800 ibmphp: Rename add_range() to add_bus_range() to avoid conflict Rename add_range() to add_bus_range() to avoid conflict with the naming of the generic range manipulation functions. LKML-Reference: <1265793639-15071-4-git-send-email-yinghai@kernel.org> Cc: Yinghai Lu Cc: Jesse Barnes Cc: Greg Kroah-Hartman Signed-off-by: H. Peter Anvin commit 84abd88a70090cf00f9e45c3a81680874f17626e Merge: 13ca0fc e28cab4 Author: H. Peter Anvin Date: Wed Feb 10 16:55:28 2010 -0800 Merge remote branch 'linus/master' into x86/bootmem commit 07c8739c521cb029d0f3549556aae2d304513978 Author: Sage Weil Date: Thu Feb 4 09:42:20 2010 -0800 ceph: add struct version to auth encoding Inlucde struct version in encoding. This will streamline future protocol changes. Signed-off-by: Sage Weil commit 9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba Author: Sage Weil Date: Tue Feb 2 16:21:06 2010 -0800 ceph: allow renewal of auth credentials Add infrastructure to allow the mon_client to periodically renew its auth credentials. Also add a messenger callback that will force such a renewal if a peer rejects our authenticator. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 8b6e4f2d8b21c25225b1ce8d53a2e03b92cc8522 Author: Sage Weil Date: Tue Feb 2 16:07:07 2010 -0800 ceph: aes crypto and base64 encode/decode helpers Helpers to encrypt/decrypt AES and base64. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit c7e337d6490d6f2f5e66ddf1b04d00b0dbd10108 Author: Sage Weil Date: Tue Feb 2 16:11:19 2010 -0800 ceph: buffer decoding helpers Helper for decoding into a ceph_buffer, and other misc decoding helpers we will need. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit ced5b697a76d325e7a7ac7d382dbbb632c765093 Author: Brandon Phiilps Date: Wed Feb 10 01:20:06 2010 -0800 x86: Avoid race condition in pci_enable_msix() Keep chip_data in create_irq_nr and destroy_irq. When two drivers are setting up MSI-X at the same time via pci_enable_msix() there is a race. See this dmesg excerpt: [ 85.170610] ixgbe 0000:02:00.1: irq 97 for MSI/MSI-X [ 85.170611] alloc irq_desc for 99 on node -1 [ 85.170613] igb 0000:08:00.1: irq 98 for MSI/MSI-X [ 85.170614] alloc kstat_irqs on node -1 [ 85.170616] alloc irq_2_iommu on node -1 [ 85.170617] alloc irq_desc for 100 on node -1 [ 85.170619] alloc kstat_irqs on node -1 [ 85.170621] alloc irq_2_iommu on node -1 [ 85.170625] ixgbe 0000:02:00.1: irq 99 for MSI/MSI-X [ 85.170626] alloc irq_desc for 101 on node -1 [ 85.170628] igb 0000:08:00.1: irq 100 for MSI/MSI-X [ 85.170630] alloc kstat_irqs on node -1 [ 85.170631] alloc irq_2_iommu on node -1 [ 85.170635] alloc irq_desc for 102 on node -1 [ 85.170636] alloc kstat_irqs on node -1 [ 85.170639] alloc irq_2_iommu on node -1 [ 85.170646] BUG: unable to handle kernel NULL pointer dereference at 0000000000000088 As you can see igb and ixgbe are both alternating on create_irq_nr() via pci_enable_msix() in their probe function. ixgbe: While looping through irq_desc_ptrs[] via create_irq_nr() ixgbe choses irq_desc_ptrs[102] and exits the loop, drops vector_lock and calls dynamic_irq_init. Then it sets irq_desc_ptrs[102]->chip_data = NULL via dynamic_irq_init(). igb: Grabs the vector_lock now and starts looping over irq_desc_ptrs[] via create_irq_nr(). It gets to irq_desc_ptrs[102] and does this: cfg_new = irq_desc_ptrs[102]->chip_data; if (cfg_new->vector != 0) continue; This hits the NULL deref. Another possible race exists via pci_disable_msix() in a driver or in the number of error paths that call free_msi_irqs(): destroy_irq() dynamic_irq_cleanup() which sets desc->chip_data = NULL ...race window... desc->chip_data = cfg; Remove the save and restore code for cfg in create_irq_nr() and destroy_irq() and take the desc->lock when checking the irq_cfg. Reported-and-analyzed-by: Brandon Philips Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-3-git-send-email-yinghai@kernel.org> Signed-off-by: Brandon Phililps Cc: stable@kernel.org Signed-off-by: H. Peter Anvin commit 18dce6ba5c8c6bd0f3ab4efa4cbdd698dab5c40a Author: Yinghai Lu Date: Wed Feb 10 01:20:05 2010 -0800 x86: Fix SCI on IOAPIC != 0 Thomas Renninger reported on IBM x3330 booting a latest kernel on this machine results in: PCI: PCI BIOS revision 2.10 entry at 0xfd61c, last bus=1 PCI: Using configuration type 1 for base access bio: create slab at 0 ACPI: SCI (IRQ30) allocation failed ACPI Exception: AE_NOT_ACQUIRED, Unable to install System Control Interrupt handler (20090903/evevent-161) ACPI: Unable to start the ACPI Interpreter Later all kind of devices fail... and bisect it down to this commit: commit b9c61b70075c87a8612624736faf4a2de5b1ed30 x86/pci: update pirq_enable_irq() to setup io apic routing it turns out we need to set irq routing for the sci on ioapic1 early. -v2: make it work without sparseirq too. -v3: fix checkpatch.pl warning, and cc to stable Reported-by: Thomas Renninger Bisected-by: Thomas Renninger Tested-by: Thomas Renninger Signed-off-by: Yinghai Lu LKML-Reference: <1265793639-15071-2-git-send-email-yinghai@kernel.org> Cc: stable@kernel.org Signed-off-by: H. Peter Anvin commit 4cad6c7c38930618d77e65af82c1403d63879eee Author: Sujith Date: Wed Feb 10 14:52:21 2010 +0530 mac80211: Deny TX BA session requests during disassociation In associated state, when bringing an interface down, existing BA sessions are torn down. When this is in progress, nothing prevents mac80211 from accepting another BA session start request. Use a new station flag to fix this. Signed-off-by: Sujith Acked-by: Johannes Berg Signed-off-by: John W. Linville commit f32338319f10c4ca5499c19edc5b3618896920ba Author: Deepak Saxena Date: Tue Feb 9 13:35:43 2010 -0800 Add Station and AdHoc mode support to libertas_tf Add support for using the libertas_tf driver on a managed or ad-hoc network. Signed-off-by: Deepak Saxena Signed-off-by: John W. Linville commit 2ac2927a953a01c83df255118922cce1523d1a18 Author: Bob Copeland Date: Tue Feb 9 13:06:54 2010 -0500 ath5k: use correct packet type when transmitting The hardware needs to know what type of frames are being sent in order to fill in various fields, for example the timestamp in probe responses (before this patch, it was always 0). Set it correctly when initializing the TX descriptor. Signed-off-by: Bob Copeland Cc: stable@kernel.org Signed-off-by: John W. Linville commit bd011e8826978b0f6cd0f929edec353fd755f49b Author: Amit Kucheria Date: Fri Feb 5 08:56:22 2010 +0000 fec: Add ARCH_MX5 as a dependency i.MX51 babbage board has a FEC ethernet controller Signed-off-by: Amit Kucheria Signed-off-by: David S. Miller commit fceb2919192d7a667be81c17c0bfa227fd7fa992 Author: Amit Kucheria Date: Fri Feb 5 08:56:21 2010 +0000 fec: Add LAN8700 phy support The i.MX51 babbage board has a FEC ethernet controller with this phy. In the long term we should resurrect the phylib patches for fec. Signed-off-by: Amit Kucheria Acked-by: Grant Likely Signed-off-by: David S. Miller commit 633e7533cec78b99d806248e832fc83e689d2453 Author: Rob Herring Date: Fri Feb 5 08:56:20 2010 +0000 fec: fix uninitialized rx buffer usage The fec driver was enabling receive buffer descriptor without allocating the buffers. Make sure the buffer descriptors are initialized to not start receiving packets. Open also calls fec_restart after the rx buffers are allocated. With the code in fec_restart, it zeroes out the buffer descriptors that have just been setup. Signed-off-by: Rob Herring Signed-off-by: Amit Kucheria Acked-by: Grant Likely Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 67de792420be2daa1c6fec07ec8552af9ea0bde3 Author: Li Zefan Date: Mon Feb 8 23:21:51 2010 +0000 net: atm: use seq_list_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit a2b79b414df97a70c33f874b631e06830431d233 Author: Li Zefan Date: Mon Feb 8 23:21:22 2010 +0000 net: ipx: use seq_list_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 216437eb8b5adf12ab91e1f0c046ffba22c63431 Author: Li Zefan Date: Mon Feb 8 23:21:05 2010 +0000 net: irda: use seq_list_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 318f6b228ba88a394ef560efc1bfe028ad5ae6b6 Author: Jiri Slaby Date: Wed Feb 10 20:55:16 2010 +0100 x86, ia32_aout: do not kill argument mapping Do not set current->mm->mmap to NULL in 32-bit emulation on 64-bit load_aout_binary after flush_old_exec as it would destroy already set brpm mapping with arguments. Introduced by b6a2fea39318e43fee84fa7b0b90d68bed92d2ba mm: variable length argument support where the argument mapping in bprm was added. [ hpa: this is a regression from 2.6.22... time to kill a.out? ] Signed-off-by: Jiri Slaby LKML-Reference: <1265831716-7668-1-git-send-email-jslaby@suse.cz> Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Ollie Wild Cc: x86@kernel.org Cc: Signed-off-by: H. Peter Anvin commit 1349ea08e8de7b3e09998f33ea4e6c74f3e0db1a Author: Jan Engelhardt Date: Wed Feb 10 11:47:57 2010 -0800 sparc: remove redundant return statements Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 4f134204f740d9fbf992843a6615175f5105f49e Author: Li Zefan Date: Mon Feb 8 23:20:42 2010 +0000 net: x25: use seq_list_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 27b5b8657a2aa761f76e45fa60c20b7bafc249dc Author: Li Zefan Date: Mon Feb 8 23:20:29 2010 +0000 net: af_key: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit efaffb78d875a155b9f327532c2ddccf28c592b4 Author: Li Zefan Date: Mon Feb 8 23:20:15 2010 +0000 net: appletalk: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit b512f3d841370aedee9a2c24a14a0ab5fc0a02b2 Author: Li Zefan Date: Mon Feb 8 23:19:59 2010 +0000 net: ax25: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 90dd7f5ace558314fa431ae0f59388ed3e5c7695 Author: Li Zefan Date: Mon Feb 8 23:19:42 2010 +0000 net: netrom: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit b7ceabd9b528417973619c5b655bc5b21857ac36 Author: Li Zefan Date: Mon Feb 8 23:19:29 2010 +0000 net: packet: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit b999748acce739675a5e9420f21e54b8cbad9d81 Author: Li Zefan Date: Mon Feb 8 23:19:17 2010 +0000 net: rose: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 32d2e3a149772441a6a146ad96cbae319e27742a Author: Li Zefan Date: Mon Feb 8 23:19:04 2010 +0000 net: x25: use seq_hlist_foo() helpers Simplify seq_file code. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit c4146644a56b1f213c4c5567c75771883bec33c7 Author: Li Zefan Date: Mon Feb 8 23:18:45 2010 +0000 net: add a wrapper sk_entry() Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 66655de6d132b726be64c324bc3f9ea366d20697 Author: Li Zefan Date: Mon Feb 8 23:18:22 2010 +0000 seq_file: Add helpers for iteration over a hlist Some places in kernel need to iterate over a hlist in seq_file, so provide some common helpers. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 0271f91003d3703675be13b8865618359a6caa1f Author: Haicheng Li Date: Thu Feb 4 19:06:33 2010 +0800 x86, acpi: Map hotadded cpu to correct node. When hotadd new cpu to system, if its affinitive node is online, should map the cpu to its own node. Otherwise, let kernel select one online node for the new cpu later. Signed-off-by: Haicheng Li LKML-Reference: <4B6AAA39.6000300@linux.intel.com> Tested-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit a8c28d05150f758625c5da38199b247887735e65 Merge: d0b0268 e3eaa99 Author: Patrick McHardy Date: Wed Feb 10 17:56:46 2010 +0100 Merge branch 'master' of git://dev.medozas.de/linux commit e3eaa9910b380530cfd2c0670fcd3f627674da8a Author: Jan Engelhardt Date: Wed Jun 17 22:14:54 2009 +0200 netfilter: xtables: generate initial table on-demand The static initial tables are pretty large, and after the net namespace has been instantiated, they just hang around for nothing. This commit removes them and creates tables on-demand at runtime when needed. Size shrinks by 7735 bytes (x86_64). Signed-off-by: Jan Engelhardt commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a Author: Laurie Bradshaw Date: Wed Feb 10 16:10:43 2010 +0000 [ARM] orion5x: D-link DNS-323 revision A1 power LED This patch fixes the power LED on DNS-323 revision A1, and adds timer support for (hopefully) both A1 and B1 revisions. Power LED on revision A1 is active low and also requires GPIO 4 to be low to work. Tested on my DNS-323 revision A1. I have set the default trigger to timer as that replicates the behaviour of the original firmware, userspace can change the trigger at the end of the boot process providing a useful indication that booting has completed. Signed-off-by: Nicolas Pitre commit 2b95efe7f6bb750256a702cc32d33b0cb2cd8223 Author: Jan Engelhardt Date: Wed Jun 17 13:57:48 2009 +0200 netfilter: xtables: use xt_table for hook instantiation The respective xt_table structures already have most of the metadata needed for hook setup. Add a 'priority' field to struct xt_table so that xt_hook_link() can be called with a reduced number of arguments. So should we be having more tables in the future, it comes at no static cost (only runtime, as before) - space saved: 6807373->6806555. Signed-off-by: Jan Engelhardt commit 2b21e051472fdb4680076278b2ccf63ebc1cc3bc Author: Jan Engelhardt Date: Sat Jun 13 06:57:10 2009 +0200 netfilter: xtables: compact table hook functions (2/2) The calls to ip6t_do_table only show minimal differences, so it seems like a good cleanup to merge them to a single one too. Space saving obtained by both patches: 6807725->6807373 ("Total" column from `size -A`.) Signed-off-by: Jan Engelhardt commit 737535c5cf3524e4bfaa91e22edefd52eccabbce Author: Jan Engelhardt Date: Sat Jun 13 06:46:36 2009 +0200 netfilter: xtables: compact table hook functions (1/2) This patch combines all the per-hook functions in a given table into a single function. Together with the 2nd patch, further simplifications are possible up to the point of output code reduction. Signed-off-by: Jan Engelhardt commit eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 Author: Kevin Dankwardt Date: Wed Feb 10 23:43:40 2010 +0900 fat: Fix stat->f_namelen I found that the length of a file name when created cannot exceed 255 characters, yet, pathconf(), via statfs(), returns the maximum as 260. Signed-off-by: Kevin Dankwardt Signed-off-by: OGAWA Hirofumi commit d0b0268fddea3235a8df35e52167c3b206bf2f5a Author: Patrick McHardy Date: Wed Feb 10 15:38:33 2010 +0100 netfilter: ctnetlink: add missing netlink attribute policies Signed-off-by: Patrick McHardy commit c8a8602b76b6703df1243e31be01cf0e4451e4a6 Author: Jiri Kosina Date: Wed Feb 10 15:29:02 2010 +0100 HID: remove MODULE_VERSION from new drivers MODULE_VERSION doesn't make too much sense for drivers merged into main tree, as git is much better tracking revisions than any developer might ever be. Signed-off-by: Jiri Kosina commit 42107f5009da223daa800d6da6904d77297ae829 Author: Alexey Dobriyan Date: Wed Feb 10 15:03:27 2010 +0100 netfilter: xtables: symmetric COMPAT_XT_ALIGN definition Rewrite COMPAT_XT_ALIGN in terms of dummy structure hack. Compat counters logically have nothing to do with it. Use ALIGN() macro while I'm at it for same types. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 0a02604628c49037e1de2091d75462fd856b26ed Author: Alexey Dobriyan Date: Wed Feb 10 15:00:32 2010 +0100 netfilter: xtables: consistent struct compat_xt_counters definition There is compat_u64 type which deals with different u64 type alignment on different compat-capable platforms, so use it and removed some hardcoded assumptions. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 9f5231472340ebcaf2dec75428b67d5d0d872857 Author: Jiri Kosina Date: Wed Feb 10 14:59:03 2010 +0100 HID: fix up Kconfig entry for MagicMouse Make Apple MagicMouse Kconfig entry consistent with other dirvers. Also expand the tristate text a little bit more, so that it doesn't clash with already existing HID_APPLE. Signed-off-by: Jiri Kosina commit 128537cea464d919febeaea2000e256749f317eb Author: Michael Poole Date: Sat Feb 6 12:24:36 2010 -0500 HID: add a device driver for the Apple Magic Mouse. The Magic Mouse requires that a driver send an unlock Report(Feature) command, similar to the Wacom wireless tablet and Sixaxis controller quirks. This turns on an Input Report that isn't published in the input Report descriptor that contains touch data (and usually overrides the normal motion and click Report). Because the mouse has only one switch and no scroll wheel, the driver (under control of parameters) emulates a middle button and scroll wheel. User space could also ignore and/or re-synthesize those events based on the reported events. Some user-space tools to talk to the mouse directly (that is, when it is not associated with the host's HIDP stack) are at http://github.com/entrope/linux-magicmouse Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit 90a006abf8015c8cab893555244d8fc673b24839 Author: Michael Poole Date: Sun Jan 24 22:32:29 2010 -0500 HID: Export hid_register_report The Apple Magic Mouse (and probably other devices) publish reports that are not called out in their HID report descriptors -- they only send them when enabled through other writes to the device. This allows a driver to handle these unlisted reports. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit 77f720b71d88a3cbf574c113566a31c93099f97d Author: Stephane Chatty Date: Sat Feb 6 15:17:13 2010 +0100 HID: Support for MosArt multitouch panel Added support for MosArt dual-touch panels, present in the Asus T91MT notebook. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit f895c53f8ace3c3e49ebf9def90e63fc6d46d2bf Author: Chuck Lever Date: Mon Feb 1 14:17:50 2010 -0500 NFS: Make close(2) asynchronous when closing NFS O_DIRECT files For NFSv2 and v3: O_DIRECT writes are always synchronous, and aren't cached, so nothing should be flushed when closing an NFS O_DIRECT file descriptor. Thus there are no write errors to report on close(2). In addition, there's no cached data to verify on the next open(2), so we don't need clean GETATTR results at close time to compare with. Thus, there's no need for the nfs_revalidate_inode() call when closing an NFS O_DIRECT file. This reduces the number of synchronous on-the-wire requests for a simple open-write-close of an NFS O_DIRECT file by roughly 20%. For NFSv4: Call nfs4_do_close() with wait set to zero when closing an NFS O_DIRECT file. The CLOSE will go on the wire, but the application won't wait for it to complete. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7e381172cf6e0282a56374e50667515aed55166a Author: Chuck Lever Date: Mon Feb 1 14:17:41 2010 -0500 NFS: Improve NFS iostat byte count accuracy for writes The bytes counted by the performance counters for NFS writes should reflect write and sync errors. If the write(2) system call reports an error, the bytes should not be counted. And, if the write is short, the actual number of bytes that was written should be counted, not the number of bytes that was requested. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit aa2f1ef10e6ad65c9138ec576f82c08f32e6f32c Author: Chuck Lever Date: Mon Feb 1 14:17:32 2010 -0500 NFS: Account for NFS bytes read via the splice API Bytes read via the splice API should be accounted for in the NFS performance statistics. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 4184dcf2dbde481b34d370e1704f2b91a8c9f0d1 Author: Chuck Lever Date: Mon Feb 1 14:17:23 2010 -0500 NFS: Fix byte accounting for generic NFS reads Currently, the NFS I/O counters count the number of bytes requested by applications, rather than the number of bytes actually read by the system calls. The number of bytes requested for reads is actually not that useful, because the value is usually a buffer size for reads. That is, that requested number is usually a maximum, and frequently doesn't reflect the actual number of bytes read. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit c2459dc46269728e4a080ec8d5a316b2bba2e142 Author: Chuck Lever Date: Mon Feb 1 14:17:14 2010 -0500 NFS: Proper accounting for NFS VFS calls Nit: The VFSOPEN and VFSFLUSH counters are function call counters. Count every call to these routines. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit ba17686f62db88f6a591121e768a0c83a2a2647d Author: Andy Adamson Date: Tue Jan 26 21:24:04 2010 -0500 nfs41 do not allocate unused back channel pages Signed-off-by: Andy Adamson [Trond.Myklebust@netapp.com: moved definition of svc_is_backchannel() into include/linux/sunrpc/bc_xprt.h.] Signed-off-by: Trond Myklebust commit 9733f0d9289cbcac4fa03db0cb5aec1ab01c6bc9 Author: Andy Adamson Date: Fri Jan 22 12:03:08 2010 -0500 nfs41: cleanup callback code to use __be32 type Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 41f54a55480c752d9419cac5e647785cb794142e Author: Andy Adamson Date: Thu Jan 21 14:54:13 2010 -0500 nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit bae0ac0ee1839e345a9b26d8c00eb3ef565caad1 Author: Andy Adamson Date: Thu Jan 21 14:19:16 2010 -0500 nfs41: fix nfs4_callback_recallslot Return NFS4_OK if target high slotid equals enforced high slotid. Fix nfs_client reference leak. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 104aeba484c9291cde2def6d037b836af46d8eb0 Author: Andy Adamson Date: Thu Jan 14 17:45:10 2010 -0500 nfs41: resize slot table in reset When session is reset, client can renegotiate slot table size. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit b9efa1b27e25b1286504973c0a6bf0f24106faa8 Author: Andy Adamson Date: Wed Jan 20 16:06:27 2010 -0500 nfs41: implement cb_recall_slot Drain the fore channel and reset the max_slots to the new value. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 4911096f1a5df73c12c287a42ece4e7b5d9c19ec Author: Andy Adamson Date: Thu Jan 14 17:45:08 2010 -0500 nfs41: back channel drc minimal implementation For now the back channel ca_maxresponsesize_cached is 0 and there is no backchannel DRC. Return NFS4ERR_REP_TOO_BIG_TO_CACHE when a cb_sequence cachethis is true. When it is false, return NFS4ERR_RETRY_UNCACHED_REP as the next operation error. Remember the replay error accross compound operation processing. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit b2f28bd78354b9bbcd178bf6bbf6b2277cd9b761 Author: Andy Adamson Date: Thu Jan 14 17:45:07 2010 -0500 nfs41: prepare for back channel drc Make all cb_sequence arguments available to verify_seqid which will make replay decisions. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit e95e60daee44fade63f32429ddcf1c2012a95632 Author: Andy Adamson Date: Thu Jan 14 17:45:06 2010 -0500 nfs41: remove uneeded checks in callback processing All callback operations have arguments to decode and require processing. The preprocess_nfs4X_op functions catch unsupported or illegal ops so decode_args and process_op pointers are always non NULL. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit b92b30190093377828efcde5fc4cf7598fa1ee46 Author: Andy Adamson Date: Thu Jan 14 17:45:05 2010 -0500 nfs41: directly encode back channel error Skip all other processing when error is encountered. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 31d2b4356b054537c35f4f8a7533e0b4a494dcc6 Author: Andy Adamson Date: Thu Jan 14 17:45:04 2010 -0500 nfs41: fix wrong error on callback header xdr overflow Set NFS4ERR_RESOURCE as CB_COMPOUND status and do not return an op on decode_op_hdr or encode_op_hdr buffer overflow. NFS4ERR_RESOURCE is correct for v4.0. Will fix the return for v4.1 along with all the other NFS4ERR_RESOURCE errors in a later patch. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 72ce2b3c064471fc511a9ca2fb6c38d90d2ab826 Author: Mike Sager Date: Tue Jan 19 12:54:41 2010 -0500 nfs41: Process callback's referring call list If a CB_SEQUENCE referring call triple matches a slot table entry, the client is still waiting for a response to the original request. In this case, return NFS4ERR_DELAY as the response to the callback. Signed-off-by: Mike Sager Signed-off-by: Trond Myklebust commit a7989c3e4702203baa5ddb3614f92bfc49a6e491 Author: Mike Sager Date: Tue Jan 19 12:54:40 2010 -0500 nfs41: Check slot table for referring calls Traverse a list of referring calls and look for a session/slot/seq number match. Signed-off-by: Mike Sager Signed-off-by: Trond Myklebust commit 8e0d46e13833b06832395e7eacccae8af8743461 Author: Mike Sager Date: Thu Dec 17 12:06:26 2009 -0500 nfs41: Adjust max cache response size value For the CREATE_SESSION attribute ca_maxresponsesize_cached, calculate the value based on the rpc reply header size plus the maximum nfs compound reply size. Signed-off-by: Mike Sager Signed-off-by: Trond Myklebust commit 5a51f13adf7909caec2f8182767485c30e21364e Author: H Hartley Sweeten Date: Thu Jan 14 15:38:31 2010 -0700 xprtsock.c: make bc_{malloc/free} static xprtsock.c: make bc_{malloc/free} static The server backchannel buf_alloc and buf_free methods should be static since they are not used outside this file. Signed-off-by: H Hartley Sweeten Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Cc: David S. Miller Signed-off-by: Trond Myklebust commit 7a88efe9760de3bc75bde61b0a4c56dbb6cf2494 Author: Chuck Lever Date: Tue Jan 12 17:41:20 2010 -0500 SUNRPC: Don't display zero scope IDs A zero scope ID means that it wasn't set, so we don't need to append it to presentation format addresses. Signed-off-by: Chuck Lever Acked-by: Jeff Layton Signed-off-by: Trond Myklebust commit f1a89a118299df9e5afbaaedf83e5709a28632b6 Author: Chuck Lever Date: Tue Jan 12 17:41:10 2010 -0500 SUNRPC: Deprecate support for site-local addresses RFC 3879 "formally deprecates" site-local IPv6 addresses. We interpret that to mean that the scope ID is ignored for all but link-local addresses. Signed-off-by: Chuck Lever Acked-by: Jeff Layton Signed-off-by: Trond Myklebust commit 97cefcc6d0aa6b4fc9ba67eb1ef4cc9e25f826f2 Author: Jeff Layton Date: Fri Jan 8 12:17:21 2010 -0500 nfs: handle NFSv2 -EKEYEXPIRED returns from RPC layer appropriately Add a wrapper around rpc_call_sync that handles -EKEYEXPIRED errors from the RPC layer as it would an -EJUKEBOX error if NFSv2 had such a thing. Also, add a handler for that error for async calls that makes it resubmit the RPC on -EKEYEXPIRED. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit b68d69b8c6d19f4c2174f26fe8b750a0e82eb732 Author: Jeff Layton Date: Thu Jan 7 09:42:04 2010 -0500 nfs: handle NFSv3 -EKEYEXPIRED errors as we would -EJUKEBOX We're using -EKEYEXPIRED to indicate that a krb5 credcache contains an expired ticket and that we should have the NFS layer retry the RPC call instead of returning an error back to the caller. Handle this as we would an -EJUKEBOX error return. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit 2c6434888cef9e5f450d6c5b7df6d8c625ed27c1 Author: Jeff Layton Date: Thu Jan 7 09:42:03 2010 -0500 nfs4: handle -EKEYEXPIRED errors from RPC layer If a KRB5 TGT ticket expires, we don't want to return an error immediatel. If someone has a long running job and just forgets to run "kinit" in time then this will make it fail. Instead, we want to treat this situation as we would NFS4ERR_DELAY and retry the upcall after delaying a bit with an exponential backoff. This patch just makes any place that would handle NFS4ERR_DELAY also handle -EKEYEXPIRED the same way. In the future, we may want to be more sophisticated however and handle hard vs. soft mounts differently, or specify some upper limit on how long we'll wait for a new TGT to be acquired. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit dc5ddce956660247e004a4b20a26b7d137ab1644 Author: Jeff Layton Date: Thu Jan 7 09:42:02 2010 -0500 sunrpc: parse and return errors reported by gssd The kernel currently ignores any error code sent by gssd and always considers it to be -EACCES. In order to better handle the situation of an expired KRB5 TGT, the kernel needs to be able to parse and deal with the errors that gssd sends. Aside from -EACCES the only error we care about is -EKEYEXPIRED, which we're using to indicate that the upper layers should retry the call a little later. To maintain backward compatibility with older gssd's, any error other than -EKEYEXPIRED is interpreted as -EACCES. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit 573bff5ab9437b4e59ba9be34a7b08bca5ff054a Author: Stefan Roese Date: Tue Jan 26 05:53:20 2010 +0000 powerpc/44x: Add MTD support to katmai defconfig Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 5a6543e8da6e338fef3cd42cc79ac85f6f53a8e7 Author: Stefan Roese Date: Tue Feb 9 23:08:28 2010 +0000 powerpc/44x: Update Glacier dts Sync Glacier dts with latest Canyonlands version: - Add l2 cache support - Add NDFC support - Add RTC support - Add AD7414 hwmon support - Change EMAC compatible node from emac4 to emac4sync and correct the register size - Add support for ISA holes on 4xx PCI/X/E (as done in Benjamin Herrenschmidt's patch for Canyonlands) - Add Crypto device node Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 6f57518cfa097b170a8f500d6d70651e81589e30 Author: Stefan Roese Date: Tue Feb 9 23:08:34 2010 +0000 powerpc/44x: Update Arches dts Sync Arches dts with latest Canyonlands version: - Add 16k FIFO size to supported EMAC nodes - Add next-level-cache property - Add Crypto device node Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 036f290d8952fdcafa9d6c9e2d94efbcb793d123 Author: Stefan Roese Date: Tue Jan 26 05:56:30 2010 +0000 powerpc/44x: Add MTD support (NOR FLASH) to Katmai dts This patch adds NOR FLASH MTD support to the Katmai (440SPe) dts file. For this the OPB ranges address is mapped differently (base 0x00000000 -> 0xe0000000). This results in the address being identical to the lower 32bit of its physical address. This is needed for the MTD mapping to work correctly, since U-Boot will insert the physical addresses of the EBC chip selects into the EBC ranges property. This is the way its done in most other 4xx dts files as well. Additionally with a small whitespace cleanup. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 28ef35eb33d7e291bf0e1fe1137915a7e38805ff Author: Stefan Roese Date: Tue Feb 9 23:08:17 2010 +0000 powerpc/44x: Fix L2-cache support for 460GT Also set L2C_CFG_RDBW on 460GT platforms and not only on 460EX. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 9ab99d5a43e9f283738fd9fd365539306d13eaac Merge: 7678037 b1109bf Author: Patrick McHardy Date: Wed Feb 10 14:17:10 2010 +0100 Merge branch 'master' of /repos/git/net-next-2.6 Signed-off-by: Patrick McHardy commit c6848bf566c7217a6090693ff5cc47091fa772f5 Author: Paul Menzel Date: Tue Feb 9 11:42:27 2010 +0100 ASoC: Typo. s/Freecale/Freescale/ Signed-off-by: Paul Menzel Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c42a59ea277a8898b8f7c83fc89b00be225ea6aa Author: Peter Ujfalusi Date: Tue Feb 9 15:24:04 2010 +0200 ASoC: TWL4030: Add supply for audio serial interface control The serial interface (TDM/I2S) for the audio block have been constantly enabled. Introduce a new DAPM_SUPPLY for handling the AIF_EN bit, so the interface is only enabled, when there is a need for it. For example when only the analog loopback is enabled, there is no need to keep the serial interface active. I have added the persons who contributed to the Voice path of twl4030 codec driver, so they might have the ability to test this patch, and send an update for the Voice path, if it is necessary Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 580363db92572cccbe6226bf83321e50a9ea50ea Author: Stephane Chatty Date: Sat Feb 6 15:20:03 2010 +0100 HID: add pressure support for the Stantum multitouch panel Added pressure handling for Stantum multitouch panels Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit b32758c7216f337044ceb6dcaa754b8eda95a59f Author: Stephane Chatty Date: Wed Feb 10 12:09:17 2010 +0100 HID: fixed bug in single-touch emulation on the stantum panel Fixed stupid copy-paste bug in touchscreen emulation for the Stantum multitouch panel: a flag was reset just before being tested. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit c0ff4bcd2e8505b09e0bedc74d08ad2da1e326f8 Author: Daniel Mack Date: Tue Feb 9 02:32:59 2010 +0800 ASoC: cs4270: enable regulators at probe time Enable the bulk regulators at probe time so we can safely disable them again when going to suspend without confusing the reference counter. Signed-off-by: Daniel Mack Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 22313eafe92aeec1db9839f5afb71675bf2a5c33 Author: Mark Brown Date: Wed Feb 10 10:42:33 2010 +0000 ASoC: add phycore-ac97 sound support This patch adds sound support for Phytec PhyCORE / PhyCARD modules in AC97 mode. Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e335c75cf32b7014f84c90bbe7ed9b7ecd8e7778 Author: Valentin Longchamp Date: Tue Feb 9 18:13:36 2010 +0100 mx31moboard: support for the smartbot baseboard This baseboard is used on the handbot and eybot robots. The sel gpios are used as enables and rst signals on smartbot, thus the sel init is moved from mx31moboard file to board files. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit cda82f85c2bba92daa3d017f7c7bc5f8c61a2e11 Author: Valentin Longchamp Date: Tue Feb 9 18:13:35 2010 +0100 mx31moboard: make usbh2 enable gpio claim more atomic It is more cosmetic than fixing a real problem, but the code looks more logical like that Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit f8594c283e409024d817e75027074570ce27dcc5 Author: Valentin Longchamp Date: Tue Feb 9 18:13:34 2010 +0100 mx31moboard: change initial reset status for robot microcontollers We want the microcontrollers to be held in reset during kernel boot. We also set the turretcam as the default camera since it is present on all marxbots. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit fed9b63ca5aa999e618140cc1cc6bd73f212ec9b Merge: d2831d1 3d48e1d Author: Sascha Hauer Date: Wed Feb 10 11:11:37 2010 +0100 Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master commit d2831d1f543489ef97a20e6e65f625e195b521bf Author: Sascha Hauer Date: Tue Feb 9 11:04:36 2010 +0100 i.MX pcm043: Add AC97 sound support Signed-off-by: Sascha Hauer commit c8a6885f2153087668b64d4ee25f78a7dda1dadb Author: Sascha Hauer Date: Mon Feb 8 16:42:28 2010 +0100 pca100: add sound support Signed-off-by: Sascha Hauer commit d9e557e5cb2052164f04af75c7d3d9bdd4111054 Author: Sascha Hauer Date: Tue Feb 9 10:48:16 2010 +0100 add ssi header file Signed-off-by: Sascha Hauer commit a4dad4c75c4ae378c2a5d66938b8467802c2e98f Author: Paul Mundt Date: Wed Feb 10 16:06:42 2010 +0900 sh: update sdk7786 defconfig. This plugs in USB and PCI and other bits for SDK7786. Signed-off-by: Paul Mundt commit 7578a4c625a5cc32812946338a4549f3090be113 Author: Paul Mundt Date: Wed Feb 10 16:00:58 2010 +0900 sh: Fix up multi-resource mapping for SH7786 PCIe. This reworks some of the SH7786 PCIe initialization code to dynamically setup and size the various resource windows, as opposed to the original code that simply wired in a couple of them statically. At the same time, we tidy up the initialization code a bit, kill off some read-only register twiddling that was gleaned from the bus analyzer, and also propagate the physical slot/channel mapping. Signed-off-by: Paul Mundt commit ede55c9d78101fef0d8e620940a5163f14b02f29 Author: Steven Rostedt Date: Wed Jan 27 11:25:54 2010 -0500 tracing: Add correct/incorrect to sort keys for branch annotation output The branch annotation is a bit difficult to see the worst offenders because it only sorts by percentage: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 0 163 100 qdisc_restart sch_generic.c 179 0 163 100 pfifo_fast_dequeue sch_generic.c 447 0 4 100 pskb_trim_rcsum skbuff.h 1689 0 4 100 llc_rcv llc_input.c 170 0 18 100 psmouse_interrupt psmouse-base.c 304 0 3 100 atkbd_interrupt atkbd.c 389 0 5 100 usb_alloc_dev usb.c 437 0 11 100 vsscanf vsprintf.c 1897 0 2 100 IS_ERR err.h 34 0 23 100 __rmqueue_fallback page_alloc.c 865 0 4 100 probe_wakeup_sched_switch trace_sched_wakeup.c 142 0 3 100 move_masked_irq migration.c 11 Adding the incorrect and correct values as sort keys makes this file a bit more informative: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 0 366541 100 audit_syscall_entry auditsc.c 1637 0 366538 100 audit_syscall_exit auditsc.c 1685 0 115839 100 sched_info_switch sched_stats.h 269 0 74567 100 sched_info_queued sched_stats.h 222 0 66578 100 sched_info_dequeued sched_stats.h 177 0 15113 100 trace_workqueue_insertion workqueue.h 38 0 15107 100 trace_workqueue_execution workqueue.h 45 0 3622 100 syscall_trace_leave ptrace.c 1772 0 2750 100 sched_move_task sched.c 10100 0 2750 100 sched_move_task sched.c 10110 0 1815 100 pre_schedule_rt sched_rt.c 1462 0 837 100 audit_alloc auditsc.c 879 0 814 100 tcp_mss_split_point tcp_output.c 1302 Signed-off-by: Steven Rostedt commit 1afeea84bd821e9a8c1c6606ba677bc229dd57de Author: Simon Guinot Date: Tue Feb 9 21:20:56 2010 +0100 [ARM] Kirkwood: define SATA LED for netspace_v2 This patch add a GPIO LED named "ns_v2:blue:sata" which can be used to enable or disable SATA activity LED blinking. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit ca9cea939932a0a64fee9d83b3c631431359446f Author: Simon Guinot Date: Tue Feb 9 21:20:55 2010 +0100 [ARM] Kirkwood: add LaCie Internet Space v2 support The Internet and Network Space v2 boards are very close. The only difference is that there is no USB type B plug wired on the Internet Space v2. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit 7a15726cb4aca67150b93a5ce5413efe6e87c95d Author: Simon Guinot Date: Tue Feb 9 21:21:50 2010 +0100 [ARM] Orion5x: enable SATA LED blinking for d2net Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit d74b96a73a99853708d6b278c2ce683657fa1ec5 Author: Simon Guinot Date: Tue Feb 9 21:21:49 2010 +0100 [ARM] Orion5x: set valid GPIO inhibit power-off for d2net This patch allow user-space to configure the switch power-off behaviour via the gpiolib sysfs interface. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit b2d6efe7fa18ad14ee6e9964c90643095b6ac7e2 Merge: dce17d4 fed08d0 Author: Takashi Iwai Date: Tue Feb 9 21:34:18 2010 +0100 Merge branch 'fix/hda' into topic/hda commit b1109bf085c8dd69537b7876ea83f914dd1fe46a Merge: 889b8f9 44bfce5 Author: David S. Miller Date: Tue Feb 9 11:44:44 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 05df49865be08b30e7ba91b9d3d94d7d52dd3033 Author: Vivek Natarajan Date: Tue Feb 9 11:34:50 2010 +0530 ath9k: Enable IEEE80211_HW_REPORTS_TX_ACK_STATUS flag for ath9k. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 375177bf35efc08e1bd37bbda4cc0c8cc4db8500 Author: Vivek Natarajan Date: Tue Feb 9 14:50:28 2010 +0530 mac80211: Retry null data frame for power save. Even if the null data frame is not acked by the AP, mac80211 goes into power save. This might lead to loss of frames from the AP. Prevent this by restarting dynamic_ps_timer when ack is not received for null data frames. Cc: Johannes Berg Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 3d48e1d0e8701d004ce7e1dd66088f42e429d079 Author: Amit Kucheria Date: Thu Feb 4 15:57:29 2010 -0800 mxc: MAINTAINERS: Add maintainer for mach-mx5 Add self to MAINTAINERS for Freescale i.MX5 SoCs Signed-off-by: Amit Kucheria commit 51c23a04c39e6a95a37b8af8625a550e674ddef6 Author: Amit Kucheria Date: Fri Dec 4 00:57:20 2009 +0200 mxc: Add mx51_defconfig This config is used to test the base support for i.MX51 processors on the Babbage board Signed-off-by: Amit Kucheria commit b996b5830364c1b1d2469be574f4ebe831987ba9 Author: Amit Kucheria Date: Tue Feb 2 11:57:53 2010 -0800 mxc: Add support for the Babbage board (i.MX5) Babbage is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefiles to enable Freescale i.MX51 processor and Babbage board. Boot tested on a Babbage2.5 board Signed-off-by: Amit Kucheria commit a329b48c43e5e2e6b51ce159d99aefeb90c7c066 Author: Amit Kucheria Date: Thu Feb 4 12:21:53 2010 -0800 mxc: Core support for Freescale i.MX5 series Add basic clock support, cpu identification, I/O mapping, interrupt controller, serial port and ethernet. Signed-off-by: Amit Kucheria commit 438caa3f6c91ba21c539a8547c4075b619dc6500 Author: Amit Kucheria Date: Thu Feb 4 12:09:40 2010 -0800 mxc: changes to common plat-mxc code to add support for i.MX5 Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc code. Signed-off-by: Amit Kucheria commit 04b954a673dd02f585a2769c4945a43880faa989 Author: David Gibson Date: Mon Feb 1 21:34:15 2010 -0700 of/flattree: Make the kernel accept ePAPR style phandle information Currently when processing flattened device trees, the kernel expects the phandle in a property called "linux,phandle". The ePAPR spec - not being Linux specific - instead requires phandles to be encoded in a property named simply "phandle". This patch makes the kernel accept either form when unflattening the device tree. Signed-off-by: David Gibson Signed-off-by: Grant Likely commit 087f79c48c090a2c0cd9ee45231d63290d2036d2 Author: Jeremy Kerr Date: Sat Jan 30 04:14:19 2010 -0700 of/flattree: endian-convert members of boot_param_header The boot_param_header has big-endian fields, so change the types to __be32, and perform endian conversion when we access them. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 337148812f97368a8ec4a69f1691e4c5ce3af494 Author: Jeremy Kerr Date: Sat Jan 30 01:45:26 2010 -0700 of: assume big-endian properties, adding conversions where necessary Properties in the device tree are specified as big-endian. At present, the only platforms to support device trees are also big-endian, so we've been acessing the properties as raw values. We'd like to add device tree support to little-endian platforms too, so add endian conversion to the sites where we access property values in the common of code. Compiled on powerpc (ppc44x_defconfig & ppc64_defconfig) and arm (fdt support only for now). Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 2e89e685a8fd0e8334de967739d11e2e28c1a4dd Author: Jeremy Kerr Date: Sat Jan 30 01:41:49 2010 -0700 of: use __be32 for cell value accessors Currently, we're using u32 for cell values, and hence assuming host-endian device trees. As we'd like to support little-endian platforms, use a __be32 for cell values, and convert in the cell accessors. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 36b9d3070d653af5807cef74ff129721d9047107 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing At present we're using hard-coded values for defaults when parsing the FDT. This change uses the #defines instead. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 1406bc2f57787797d1f6a3675c019a7093769275 Author: Jeremy Kerr Date: Sat Jan 30 01:31:21 2010 -0700 of/flattree: use callback to setup initrd from /chosen At present, the fdt code sets the kernel-wide initrd_start and initrd_end variables when parsing /chosen. On ARM, we only set these once the bootmem has been reserved. This change adds an arch hook to setup the initrd from the device tree: void early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end); The arch-specific code can then setup the initrd however it likes. Compiled on powerpc, with CONFIG_BLK_DEV_INITRD=y and =n. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 50ab2fe147e22c8786552cda1791a61ae81b84d2 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 proc_devtree: include linux/of.h Currenly, proc_devtree.c depends on asm/prom.h to include linux/of.h, to provide some device-tree definitions (eg, struct property). Instead, include linux/of.h directly. We still need asm/prom.h for HAVE_ARCH_DEVTREE_FIXUPS. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 8cfb3343f70bcf9403218df120ecf345f06dd585 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of: make set_node_proc_entry private to proc_devtree.c We only need set_node_proc_entry in proc_devtree.c, so move it there. This fixes the !HAVE_ARCH_DEVTREE_FIXUPS build, as we can't make make the definition in linux/of.h conditional on this #define (definitions in asm/prom.h can't be exposed to linux/of.h, due to the enforced #include ordering). Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit a9f2f63a671d5e91ed89ade408d87f1692a373de Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of: include linux/proc_fs.h We use a few procfs-specific functions (eg, proc_device_tree_*) which aren't covered by the current includes. This causes the following build error on arm: drivers/of/base.c: In function 'prom_add_property': drivers/of/base.c:861: error: implicit declaration of function 'proc_device_tree_add_prop' drivers/of/base.c: In function 'prom_remove_property': drivers/of/base.c:902: error: implicit declaration of function 'proc_device_tree_remove_prop' drivers/of/base.c: In function 'prom_update_property': drivers/of/base.c:946: error: implicit declaration of function 'proc_device_tree_update_prop' Add proc_fs.h for these prototypes. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 51975db0b7333cf389b64b5040c2a910341d241a Author: Grant Likely Date: Mon Feb 1 21:34:14 2010 -0700 of/flattree: merge early_init_dt_scan_memory() common code Merge common code between PowerPC and Microblaze architectures. Signed-off-by: Grant Likely Acked-by: Michal Simek commit 71a157e8edca55198e808f8561dd49017a54ee34 Author: Grant Likely Date: Mon Feb 1 21:34:14 2010 -0700 of: add 'of_' prefix to machine_is_compatible() machine is compatible is an OF-specific call. It should have the of_ prefix to protect the global namespace. Signed-off-by: Grant Likely Acked-by: Michal Simek commit 89751a7cb70a20f0d604dd7c4be29dd7b0011718 Author: Jeremy Kerr Date: Mon Feb 1 21:34:11 2010 -0700 of: merge of_find_node_by_phandle Merge common function between powerpc, sparc and microblaze. Code is identical for powerpc and microblaze, but adds a lock (and release) of the devtree_lock on sparc. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit fcdeb7fedf89f4bbc2e11959794968080cd8426e Author: Grant Likely Date: Fri Jan 29 05:04:33 2010 -0700 of: merge of_attach_node() & of_detach_node() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 580537140568caddbc8a727d4c2f238d38707f68 Author: Grant Likely Date: Thu Jan 28 22:18:56 2010 -0700 microblaze: remove early_init_dt_scan_cpus() and phyp_dump_*() Microblaze only has one CPU, it isn't SMP at all. early_init_dt_scan_cpus() is effectively just a no-op, so remove it. Microblaze doesn't support hypervisor assisted dump either, so the phyp stuff can also go. Signed-off-by: Grant Likely Acked-by: Michal Simek commit 0f3332c4fabb2227b1bc15dc7542017d08f10a09 Author: Sascha Hauer Date: Fri Dec 4 09:34:51 2009 +0100 mxc: refactor timer code to use timer versions Refactor the timer code into version 1 and version 2. Essentially there are 2 versions of the timer hardware on Freescale MXC hardware. Version 1 is found on MX1/MXL, MX21 and MX27. Version 2 is found on MX25, MX31, MX35, MX37, MX51, and future parts. Signed-off-by: Sascha Hauer Acked-by: Grant Likely Signed-off-by: Amit Kucheria commit a003708ad4ee9384226251431c7953a24079ff80 Author: Amit Kucheria Date: Thu Dec 3 22:36:41 2009 +0200 mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 family Freescale i.MX51 processor uses a new interrupt controller. Add driver for TrustZone Interrupt Controller Signed-off-by: Amit Kucheria commit 301ba0457f1ed853fc08e57785f8c87fe7e49c68 Author: Anton Blanchard Date: Tue Feb 9 15:07:40 2010 +1100 kthread, sched: Remove reference to kthread_create_on_cpu kthread_create_on_cpu doesn't exist so update a comment in kthread.c to reflect this. Signed-off-by: Anton Blanchard Acked-by: Rusty Russell Cc: Peter Zijlstra LKML-Reference: <20100209040740.GB3702@kryten> Signed-off-by: Ingo Molnar commit eabe5c90580a065aed8ce6a5ba53eb443d317fae Author: Bastien Nocera Date: Tue Feb 9 11:43:19 2010 +0100 HID: fix typo in error message Signed-off-by: Jiri Kosina commit b80109e256bc17ed66c9d559175f087b03ca2a8e Author: Anton Blanchard Date: Tue Feb 9 15:07:40 2010 +1100 Remove reference to kthread_create_on_cpu kthread_create_on_cpu doesn't exist so update a comment in kthread.c to reflect this. Signed-off-by: Anton Blanchard Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 0690535d6bcec5eb28573824df5c8a49ec85b696 Author: Leo P White Date: Mon Feb 8 13:02:05 2010 +0000 HID: add mapping for "AL Network Chat" usage Adding a mapping for the 'AL Network Chat' usage from the 'Consumer' usage page (USB HID Usage Tables v1.11). This usage is used by some keyboards for a multimedia key. Signed-off-by: Leo P White Signed-off-by: Jiri Kosina commit 3ad2f3fbb961429d2aa627465ae4829758bc7e07 Author: Daniel Mack Date: Wed Feb 3 08:01:28 2010 +0800 tree-wide: Assorted spelling fixes In particular, several occurances of funny versions of 'success', 'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address', 'beginning', 'desirable', 'separate' and 'necessary' are fixed. Signed-off-by: Daniel Mack Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit cebe41d4b8f8092359de31e241815fcb4b4dc0be Author: Alexey Dobriyan Date: Sat Feb 6 00:21:03 2010 +0200 sound: use DEFINE_PCI_DEVICE_TABLE Use DEFINE_PCI_DEVICE_TABLE() to make PCI device ids go to .devinit.rodata section, so they can be discarded in some cases, and make them const. Signed-off-by: Alexey Dobriyan Signed-off-by: Takashi Iwai commit 801cd56e3e2c2b727399d2c50c50139b2d7c98e8 Author: Magnus Damm Date: Tue Feb 9 08:22:30 2010 +0000 sh: break out enable/reparent div4 clocks on sh7723 Break out sh7723 div4 clocks for SIU and IRDA as reparent / enable clocks. Similar to the SIU clock patch for sh7722 by Guennadi. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e6f077592d1de2f6a4fc760e7b5d6f20b37d3a27 Author: Magnus Damm Date: Tue Feb 9 07:17:20 2010 +0000 sh: fix INTC to use set_irq_chained_handler() for redirects This patch updates the shared INTC code to use set_irq_chained_handler() for intc_redirect_irq(). With this in place request_irq() on a merged irq which has been redirected will now return -EINVAL instead of 0 together with a crash. This thanks to the protection of the IRQ_NOREQUEST flag set for chained interrupt handlers. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3844eadcfd2ba975110e3ca8479efa8c093129ce Author: Magnus Damm Date: Tue Feb 9 06:50:04 2010 +0000 sh: sh7724/Ecovec24/KFR2R09/MS7724SE SDHI vector merge Merge the SDHI vectors in the sh7724 INTC table and update the SDHI platform data for Ecovec24, KFR2R09 and MS7724SE. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e3e80046e0ce2a595e607a62b650a9b4efea6558 Author: Magnus Damm Date: Tue Feb 9 06:49:56 2010 +0000 sh: sh7723/AP325 SDHI vector merge Merge the SDHI vectors in the sh7723 INTC table and update the SDHI platform data for AP325. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8d9adabac3a3a3742c7a47da9e456108a0fd2efb Author: Magnus Damm Date: Tue Feb 9 06:49:48 2010 +0000 sh: sh7722/Migo-R SDHI vector merge Merge the SDHI vectors in the sh7722 INTC table and update the SDHI platform data for Migo-R. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7896cd0f5a4fa7eb833064e31d8970b95c9faac5 Merge: 7561f2d d519095 Author: Paul Mundt Date: Tue Feb 9 18:24:14 2010 +0900 Merge branch 'sh/intc-extension' commit d519095344fda705c9840a579acf6aa6205c37cc Author: Magnus Damm Date: Tue Feb 9 04:29:22 2010 +0000 sh: extend INTC with force_enable Extend the shared INTC code with force_enable support to allow keeping mask bits statically enabled. Needed by upcoming INTC SDHI patches that mux together a bunch of vectors to a single linux interrupt which is masked by a priority register, but needs individual mask bits constantly enabled. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 577cd7584cf5199f1ea22cca0ad1fa129a98effa Author: Magnus Damm Date: Tue Feb 9 04:24:46 2010 +0000 sh: extend INTC with struct intc_hw_desc This patch updates the INTC code by moving all vectors, groups and registers from struct intc_desc to struct intc_hw_desc. The idea is that INTC tables should go from using the macro(s) DECLARE_INTC_DESC..() only to using struct intc_desc with name and hw initialized using the macro INTC_HW_DESC(). This move makes it easy to initialize an extended struct intc_desc in the future. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e4e430c611db75f58d3ca33869e182a530859426 Author: Magnus Damm Date: Tue Feb 9 03:36:03 2010 +0000 ARM: mach-shmobile: sh7372 INTCA support Add support for the sh7372 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6673be73809c8aa1ca5255c83f4fc85c43fdbfab Author: Magnus Damm Date: Tue Feb 9 03:35:53 2010 +0000 ARM: mach-shmobile: sh7377 INTCA support Add support for the sh7377 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f8eef1305b33438dd7a3a01e43b94e57ca87fc9b Author: Magnus Damm Date: Tue Feb 9 03:35:42 2010 +0000 ARM: mach-shmobile: sh7367 INTCA support Add support for the sh7367 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit dce17d4ff366230aeeaaf42512bba3711243cf1c Author: Takashi Iwai Date: Tue Feb 9 09:25:26 2010 +0100 ALSA: hda - Fix default polarity of mute-LED GPIO on 92HD83x/88x codecs The previous commit caused a regression on HP laptops with 92HD83x/88x codecs. The default polarity of mute-LED GPIO is inverted on these devices. Reference: Novell bnc#578190 https://bugzilla.novell.com/show_bug.cgi?id=578190 Signed-off-by: Takashi Iwai commit b919ee827e048826786fd7e889a2b04f63382fe6 Author: Anton Blanchard Date: Sun Feb 7 19:26:29 2010 +0000 powerpc: Only print clockevent settings once The clockevent multiplier and shift is useful information, but we only need to print it once. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 44c9f3cc1a07503b653b571eac5792436da39a30 Author: Anton Blanchard Date: Sun Feb 7 19:37:29 2010 +0000 powerpc: Clear MSR_RI during RTAS calls RTAS should never cause an exception but if it does (for example accessing outside our RMO) then we might go a long way through the kernel before oopsing. If we unset MSR_RI we should at least stop things on exception exit. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 8354be9c104db8e92bb079e29540fbafb7f09b5c Author: Frans Pop Date: Sat Feb 6 07:47:20 2010 +0000 powerpc: Remove trailing space in messages Signed-off-by: Frans Pop Cc: linuxppc-dev@ozlabs.org Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Benjamin Herrenschmidt commit 0b9612c210f6bf6efb32ab84b8f34018eaacb08d Author: Anton Blanchard Date: Sun Feb 7 13:07:36 2010 +0000 powerpc: Make powerpc_firmware_features __read_mostly We use firmware_has_feature quite a lot these days, so it's worth putting powerpc_firmware_features into __read_mostly. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit a13672fb30b46eaf9fa50357e1e863de00631401 Author: Anton Blanchard Date: Sun Feb 7 13:23:30 2010 +0000 powerpc: Reformat SD_NODE_INIT to match x86 Clean up SD_NODE_INITS so we can easily compare it to x86. Similar to the work in 47734f89be0614b5acbd6a532390f9c72f019648 (sched: Clean up topology.h) Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 7317ac87119dfb6fac36af4bcc64a25b62b5898d Author: Anton Blanchard Date: Sun Feb 7 12:30:12 2010 +0000 powerpc: Convert mmu context allocator from idr to ida We can use the much more lightweight ida allocator since we don't need the pointer storage idr provides. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 66fcb1059deeae072c1bf1536a8e2613028bce3e Author: Anton Blanchard Date: Sun Feb 7 14:44:16 2010 +0000 powerpc: Add last sysfs file and dump of ftrace buffer to oops printout Add printout of last accessed sysfs file, added to x86 in ae87221d3ce49d9de1e43756da834fd0bf05a2ad (sysfs: crash debugging) Also add the notify_die hook that allows us to print out the ftrace buffer on oops. This is useful in conjunction with ftrace function_graph: Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=128 NUMA pSeries last sysfs file: /sys/class/net/tunl0/type Dumping ftrace buffer: ... 0) | .sysrq_handle_crash() { 0) 0.476 us | .hash_page(); 0) 0.488 us | .xmon_fault_handler(); 0) | .bad_page_fault() { 0) | .search_exception_tables() { 0) 0.590 us | .search_module_extables(); 0) 2.546 us | } 0) | .printk() { 0) | .vprintk() { 0) 0.488 us | ._raw_spin_lock(); 0) 0.572 us | .emit_log_char(); Showing the function graph of a sysrq-c crash. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit b926a88a7b77bc27c0e7f67166f34b854fe21ccc Author: Anton Blanchard Date: Sun Feb 7 12:26:28 2010 +0000 powerpc: Reduce differences between pseries and ppc64 defconfigs The pseries and ppc64 defconfigs have drifted apart over the years. Reduce some of the differences while still keeping the idea that the ppc64 defconfig is cross platform but enables fewer features than pseries, eg NR_CPUS is lower. Also enable a number of common adapters as modules. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 20a8ab97372e453f58a7b49e0d5e0f832406cffe Author: Anton Blanchard Date: Sun Feb 7 13:52:05 2010 +0000 powerpc/pseries: Quieten cede latency printk The cede latency stuff is relatively new and we don't need to complain about it not working on older firmware. Signed-off-by: Anton Blanchard Acked-by: Balbir Singh Signed-off-by: Benjamin Herrenschmidt commit 5a2ad98e920dd8ac4cfbc0c1556e930ba2d65427 Author: Joe Perches Date: Sun Jan 31 10:02:03 2010 +0000 arch/powerpc: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Benjamin Herrenschmidt commit 25ef231de2678690198d95dca949c3caa67a76de Author: Will Schmidt Date: Wed Nov 25 06:12:09 2009 +0000 powerpc/pseries: Hypervisor call tracepoints hcall_stats touchup The tb_total and purr_total values reported via the hcall_stats code should be cumulative, rather than being replaced by the latest delta tb or purr value. Tested-by: Will Schmidt Signed-off-by: Will Schmidt Acked-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 4ae04acb81256719a71125c0f0280e2a3ad68e25 Author: Magnus Damm Date: Mon Feb 8 11:02:54 2010 +0000 ARM: mach-shmobile: early console support using earlyprintk Add support for early console to the SH-Mobile boards. Simply perform an early platform probe for "earlyprintk" to trigger the early serial console code in sh-sci.c. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 62f60d6a37910501814c6281e6c21b485434a7f1 Author: Magnus Damm Date: Mon Feb 8 10:53:13 2010 +0000 ARM: mach-shmobile: optimize get_irqnr_preamble/and_base macros Optimize the SH-Mobile interrupt assembly macros to avoid reloading the INTFLGA register address in case of multiple pending interrupts. Kindly pointed out by Russell King. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7c0616b85ba23d0467bf0b5a6f288f5296eb05ff Author: James Smart Date: Tue Jan 26 23:10:40 2010 -0500 [SCSI] lpfc 8.3.8: Update Driver version to 8.3.8 Update Driver version to 8.3.8 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 3b5dd52aaffd291edea9f939ed46a960b240bb45 Author: James Smart Date: Tue Jan 26 23:10:15 2010 -0500 [SCSI] lpfc 8.3.8: (BSG4) Add new vendor specific BSG Commands Add the following new vendor specific BSG commands. - Add LPFC_BSG_VENDOR_GET_MGMT_REV command - Add LPFC_BSG_VENDOR_MBOX command - Add LPFC_BSG_VENDOR_DIAG_MODE command - Add LPFC_BSG_VENDOR_DIAG_TEST command Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4cc0e56e977f12e6f400cbab3df7cf1e11d6f58a Author: James Smart Date: Tue Jan 26 23:09:48 2010 -0500 [SCSI] lpfc 8.3.8: (BSG3) Modify BSG commands to operate asynchronously Modify the following BSG commands to operate asynchronously. - FC_BSG_RPT_ELS - FC_BSG_RPT_CT - LPFC_BSG_VENDOR_GET_CT_EVENT - LPFC_BSG_VENDOR_SET_CT_EVENT Signed-off-by: James Smart Signed-off-by: James Bottomley commit c79c1292df87fa9c63383ca551fa719c0c2fda7c Author: James Smart Date: Tue Jan 26 23:09:22 2010 -0500 [SCSI] lpfc 8.3.8: (BSG2) Create lpfc_bsg.h Create lpfc_bsg.h - structures, etc used by bsg-related routines. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4fede78f7552479c4bb3bab221133ec5244e4154 Author: James Smart Date: Tue Jan 26 23:08:55 2010 -0500 [SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure Update BSG infrastructure to handle new vendor specific BSG commands. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 65467b6bdffd3efde111444663bc9de35b59b22a Author: James Smart Date: Tue Jan 26 23:08:29 2010 -0500 [SCSI] lpfc 8.3.8: Add code to display logical link speed Display Logical Link Speed when supported and is non-zero. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 695a814e18561c52456acf5051fac0ea4b8111da Author: James Smart Date: Tue Jan 26 23:08:03 2010 -0500 [SCSI] lpfc 8.3.8: BugFixes: Discovery relates changes Discovery relates changes: - Separated VPI_REGISTERED state of physical port into VFI_REGISTERED and VPI_REGISTERED state so that driver can unregister physical port VPI independent of VFI. - Add code to unregister, re-init and re-register physical port VPI when physical port NportID change. - Add code to unregister and re-register VPI of a vport when its Nport ID change. - Add code in FDISC completion path to re-start FLOGI discovery when a FDISC complete with LOGIN_REQUIRED reason code. - Fix a memory leak in lpfc_init_vpi_cmpl - Add code to start a timer for vport to retry FDISC when CVL is received by a vport or physical port. If all Nports receive CVLs, then all timers are cancelled and a logical link level discovery will be started after one second. - Flush ELS commands after killing all delayed ELS commands. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 341af10239c4c87192bf762f53c7bcb1f3a1e767 Author: James Smart Date: Tue Jan 26 23:07:37 2010 -0500 [SCSI] lpfc 8.3.8: BugFixes: SLI relates changes Fix hardware/SLI relates issues: - Handle XB bit so that ELS XRIs are not prematurely released. - Handle XB bit so that FCP XRIs are not prematurely released. - Define new security SLI Commands. - Remove unused security SLI commands - Skip receive data size parameter check on received FLOGI. - Added LPFC_USE_FCPWQIDX flag to iocb to force SLI layer to submit abort WQE on same WQ as the command WQE. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2cec802980727f1daa46d8c31b411e083d49d7a2 Author: Ben Hutchings Date: Sat Jan 23 18:40:29 2010 +0000 [SCSI] qla1280: Drop host_lock while requesting firmware request_firmware() may sleep and it appears to be safe to release the spinlock here. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: James Bottomley commit 7c56533cf4fb072abc39e850e7ef4fb6166cc83b Author: Jayamohan Kallickal Date: Sat Jan 23 05:39:37 2010 +0530 [SCSI] be2iscsi: correction in the claculation for num_cxn_wrb This patch correct the math done for num_cxn_wrb Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit b30c6dab1d87cc638a7413dd0e778d8c9a5232eb Author: Jayamohan Kallickal Date: Sat Jan 23 05:38:56 2010 +0530 [SCSI] be2iscsi: changing the chip opcode for TEXT This patch corrects the chipopcode for text and chooses correct paramters for that command Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit caf818f118b1ea60226a884072f1c3a9d5714766 Author: Jayamohan Kallickal Date: Sat Jan 23 05:38:18 2010 +0530 [SCSI] be2iscsi: Ensure clean reuse of wrb This patch ensures that wrb is cleanly resued for io path and is memset to zero for non io path Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit f55a24f2c24b63f8b4329eb28b4aec02a4bcf5d0 Author: Jayamohan Kallickal Date: Sat Jan 23 05:37:40 2010 +0530 [SCSI] be2iscsi: correcting the return This patch fixes an issue where return was not called properly. Thanks to Mike Christie for spotting this Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 5dc1c416b39531e3bcf0651ca4123e64228dd553 Author: Jayamohan Kallickal Date: Sat Jan 23 05:36:52 2010 +0530 [SCSI] be2iscsi: Proper checking of state This patch adds proper checking of value in for hba state. We would be adding more states later on Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 230dceb4316da9c8e05c82b64f2527aee95da2ff Author: Jayamohan Kallickal Date: Sat Jan 23 05:36:10 2010 +0530 [SCSI] be2iscsi: Fix for first_burst This patch fixes the first_burst being modified instead of max_burst Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d2eeb1ac35a7146cbd4b1f6bf09bb6384ccdfb0d Author: Jayamohan Kallickal Date: Sat Jan 23 05:35:15 2010 +0530 [SCSI] be2iscsi: changing copyright to 2010 This patch replaces 2009 with 2010 in copyright statement Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 32951dd8cd70e525eb523c9e2b62d79d9157fae9 Author: Jayamohan Kallickal Date: Sat Jan 23 05:34:24 2010 +0530 [SCSI] be2iscsi: Remove Ring mode from driver Ring mode is not used. This patch removes the code. Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d0e2ddff7c4b493acff50a9000564b67cbe7d676 Author: Dmitry Torokhov Date: Tue Jan 19 10:24:40 2010 -0800 [SCSI] vmw_pvscsi: fix signedness warning with newer compilers pvscsi_setup_msix() expects 'irq' argument to be an int but is being passed unsigned int. Unsigned int is more proper type for IRQ number so let's use it. This shuts off a compile warning with recent compilers. Signed-off-by: Dmitry Torokhov Acked-by: Alok Kataria Signed-off-by: James Bottomley commit fa4698fcf59c3bd01c171e5e558bae9e8eb396f1 Author: Martin K. Petersen Date: Mon Jan 18 18:43:18 2010 -0500 [SCSI] sd: Combine DIF/DIX error handling DIF and DIX errors are handled identically at this point. Collapse the switch cases into one and let scsi_io_completion print result and sense data. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit d44a6d2bbffd9e5c87f0a78cbe9c089e21289162 Author: Roel Kluin Date: Sun Jan 17 16:15:57 2010 +0100 [SCSI] lpfc: unify two if branches with the same code in lpfc_decode_firmware_rev() Regardless of the flag state, the branches execute the same code Signed-off-by: Roel Kluin Acked-by: James Smart Signed-off-by: James Bottomley commit a3babda5b3b60b5d28dbab127b1ecc8ba707b6e7 Author: Jayamohan Kallickal Date: Thu Jan 7 01:51:44 2010 +0530 [SCSI] be2iscsi: Fix to allow driver to load when the FW allows more cids This fix allows the driver to load when the FW allows more cids than than the driver supports. The driver will limit the number of cid to what it can support. There was no reason to fail the driver load,so, correcting that Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit aa3590329fdf789902e3c1383589bad12a74fb09 Author: Jayamohan Kallickal Date: Thu Jan 7 01:51:04 2010 +0530 [SCSI] be2iscsi: Fixing the number of SGE's The number of SGE's supported is fixed to what the chip expects. Also, the max sectors set to tested values Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 48bd86cf213a5780346b603b703c4b83978611a8 Author: Jayamohan Kallickal Date: Thu Jan 7 01:50:19 2010 +0530 [SCSI] be2iscsi: Fixing Bug for multiple SGEs The patch fixes a but where the sg_next is not assigned and hence the first sge was being resused wrongly Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit e4b8972c6172950ce226afdf7a921098f7672d5c Author: Kashyap, Desai Date: Wed Dec 16 18:57:02 2009 +0530 [SCSI] mpt2sas: Bump version 04.100.01.00 Version upgraded to 04.100.01.00. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 84f0b04a0e3b279a0b0a851b93eb403a626ca4b8 Author: Kashyap, Desai Date: Wed Dec 16 18:56:28 2009 +0530 [SCSI] mpt2sas: Enable TLR for SSP TAPE drives (Added SAS Transport APIs) If TLR is supported for end device, MPT2SAS driver will enable the TLR bit in the SCSI_IO for every request. If there is a response with MPI2_SCSITASKMGMT_RSP_INVALID_FRAME, the driver will turn off the TLR logic. [jejb: updated to new transport class TLR API] Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit f4af3c14113d1b0d98d5a5e717b8aa1f484065b6 Author: Kashyap, Desai Date: Wed Dec 16 18:55:54 2009 +0530 [SCSI] mpt2sas: Update driver header to latest MPI Spec. Update header to latest MPI SPEC revision. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 50d5c60634673a79f8d88564e10345b50fca7378 Author: Kashyap, Desai Date: Wed Dec 16 18:55:26 2009 +0530 [SCSI] mpt2sas: Added phy_enable and set_phy_speed sysfs callback support. Added new callbacks phy_enable and set_phy_speed in the mpt2sas_transport_functions template. This will allow end user to enable/disable phys and change links rates using the SysFS interface. Current implementation only supports direct attached phys, but we could in the future add support for expander based phys. A new subroutine mpt2sas_config_set_sas_iounit_pg1 was added; this wrapper function used to send request to controller firmware to modify the phys and link rates. A new subroutine _transport_find_local_phy was added; a function for easly obtaining the local phy object for direct attached. Example to disable a phy echo 0 > /sys/class/phy3:0/enable Example to enable the same phy echo 1 > /sys/class/phy3:0/enable Example to change the link rate to 1.5 #echo "1.5 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 1.5 Gbit Example to change the link rate to 3.0 #echo "3.0 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 3.0 Gbit Example to change the link rate to 6.0 #echo "6.0 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 6.0 Gbit Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit f7c95ef02b564d9984c0655c9659791b1dd5d7ad Author: Kashyap, Desai Date: Wed Dec 16 18:54:42 2009 +0530 [SCSI] mpt2sas: Added raid transport support Adding support for raid transport layer. This will provide sysfs attributes containing raid level, state, and resync rate. MPT2SAS module will select RAID_ATTRS. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 22c88425e03e8476176375ab0457c88ff3a5b68c Author: Kashyap, Desai Date: Wed Dec 16 18:53:04 2009 +0530 [SCSI] mpt2sas: Use compat_ptr to setup the pointer compatibility. On ppc64, an 32bit application was failing due to data buffers not being copied properly from user to kernel memory. The problem due to improper conversion of 32 to 64 bit pointers. The fix is to use compat_ptr to setup the pointer compatibility in the routine _ctl_compat_mpt_command. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit e75b9b6d9d81e35aed5ef2692285c4948e173c5c Author: Kashyap, Desai Date: Wed Dec 16 18:52:39 2009 +0530 [SCSI] mpt2sas: Set ioc->fwfault_debug to the cmd line option mpt2sas_fwfault_debug. (1) change the formentioned string from logging_level to fwfault_debug (2) set ioc->fwfault_debug to the command line option mpt2sas_fwfault_debug setting at driver load time. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 6846e75cdfa76c6609ac0381a6739c9f4af8fd3b Author: Kashyap, Desai Date: Wed Dec 16 18:51:45 2009 +0530 [SCSI] mpt2sas: User resource_size_t instead of unsigned long Use resource_size_t to define the type resource for the system interface register set. The existing implementation was using "unsigned long" which would be 32 bit in 32 bit OS. If 32 bit OS is using 64 bit physical address space for the system interface register set, we need to shift to using resource_size_t which takes care of physical address space. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit b2ff36ba19dec02b05d3e26e36923b71ab64f34a Author: Kashyap, Desai Date: Wed Dec 16 18:51:05 2009 +0530 [SCSI] mpt2sas: Return -ENODATA on IOCTL timeout The driver was modified to return -ENODATA when there is a timeout via ioctl path. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit d7384b28afb2bf2b7be835ddc8c852bdc5e0ce1c Author: Kashyap, Desai Date: Wed Dec 16 18:50:06 2009 +0530 [SCSI] mpt2sas: Delete volume before HBA detach. The driver hangs when doing `rmmod mpt2sas` if there are any IR volumes present.The hang is due the scsi midlayer trying to access the IR volumes after the driver releases controller resources. Perhaps when scsi_remove_host is called,the scsi mid layer is sending some request. This doesn't occur for bare drives becuase the driver is already reporting those drives deleted prior to calling mpt2sas_base_detach. To solve this issue, we need to delete the volumes as well. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit bcc1c2a1d22974215e39dc87ce746ba9a39223e5 Author: Alex Deucher Date: Tue Jan 12 17:54:34 2010 -0500 drm/radeon/kms: add initial Evergreen support (Radeon HD 5xxx) This adds initial Evergreen KMS support, it doesn't include any acceleration features or interrupt handling yet. Major changes are DCE4 handling for PLLs for the > 2 crtcs. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e97bd974448ce90f8e4720499d84580bcd6a2f7a Author: Alex Deucher Date: Tue Jan 12 17:17:33 2010 -0500 drm/radeon/kms: update atombios.h to latest upstream. This merges ugly whitespace we want to keep for consistency along with the latest upstream changes. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9f93ed39804a9cfe10577cfae66059fe6bc6e3a5 Author: Jerome Glisse Date: Thu Jan 28 18:22:31 2010 +0100 drm/radeon/kms: bogus cs recorder utilities This add an utilities function radeon_ib_bogus_add which will save an ib into a list of ib which can then be dumped using debugfs. Once dumped the ib is removed from the list. This should allow to save & capute ib for further debugging. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 73a6d3fc104827db574e4bd206a025299fef0bb1 Author: Rafał Miłecki Date: Fri Jan 8 00:22:47 2010 +0100 drm/radeon/kms: use wait queue (events) for VBLANK sync This already simplifies code significally and makes it maintaible in case of adding memory reclocking plus voltage changing in future. Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 20d6c346f69ec68f3f4956c726d830c978f911a8 Author: Dave Airlie Date: Sun Jan 31 07:07:14 2010 +1000 drm/radeon/kms: use udelay for short delays For usec delays use udelay instead of scheduling, this should allow reclocking to happen faster. Signed-off-by: Dave Airlie commit 57fcab620d05c3eb32b4787ce7501565c4c3162d Author: Alex Deucher Date: Sat Feb 6 17:06:42 2010 -0500 drm/radeon/kms: take the pm mutex when using hw i2c we need a constant sclk for i2c prescale. Also, get the current sclk when calculating prescale rather than using the default sclk. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6d7f2d8da106ecf794a5a3e98c4239f348119e3c Author: Alex Deucher Date: Fri Feb 5 00:55:32 2010 -0500 drm/radeon/kms: dynclks fixes - only r4xx/r5xx/rs6xx/rs740 have clock gating atom table, so disable it on r6xx. it's already disabled on r7xx - check to make sure the clock_gating hook exists before calling it. This avoids a segfault on asics without that function. - remove unused static power management function. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a0eb38eb8637a81bb7770d34036e498d2ba63a26 Author: Rafał Miłecki Date: Thu Dec 24 03:28:33 2009 +0100 drm/radeon/kms: get_power_state early, not when processing IRQ Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 530079a8f3f35828a80ba4981c1be902982363e7 Author: Alex Deucher Date: Wed Dec 23 14:39:36 2009 -0500 drm/radeon/kms: use power states for dynamic reclocking Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 516d0e46c80d2d20391f4145c2c5e3915253b8bf Author: Alex Deucher Date: Wed Dec 23 14:28:05 2009 -0500 drm/radeon/kms: add code to select power state not hooked up yet. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0ec0e74f784ca08eab0354ab1dada46924c39b73 Author: Alex Deucher Date: Wed Dec 23 13:21:58 2009 -0500 drm/radeon/kms: add a power state type based on power state flags The idea is to flag a power state with a certain type and use that type to decide on what state to select. On r6xx+, we select a state and then transition between clock modes in that state. On pre-r6xx, we transition between states directly. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 845db70da0bd285813b25bb522a0281f28efbf89 Author: Rafał Miłecki Date: Wed Dec 23 00:42:43 2009 +0100 drm/radeon/kms: don't set pcie lanes for ignored power_state Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 56278a8edacee9ae9e3bc9d8c8e2d37e9969f3eb Author: Alex Deucher Date: Mon Dec 28 13:58:44 2009 -0500 drm/radeon/kms: pull power mode info from bios tables (v3) The general idea is to validate the current hw state against the set of power states and select a power state based on that. This patch just pulls the power states from the bios and prints the information. It is not currently hooked up in the actual power management code. Hooking it up will require reworking the the current power state selection code and will be handled in a future patch. Additionally, we'd need to decide on some default lower power states for cards without power tables. v2 - increment state_index after checking for default state v3 - fix typo in pm init on pre-atom cards, handle pre-atom cards without x86 bioses Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c836a4126768cd76af9ee33b3c11f57695d5fda6 Author: Alex Deucher Date: Wed Dec 23 10:07:50 2009 -0500 drm/radeon/kms: add functions to get current pcie lanes Currently unused. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c913e23a145ae07b6f9f88aae8cd5ad06b5729ff Author: Rafał Miłecki Date: Tue Dec 22 23:02:16 2009 +0100 drm/radeon/kms: add dynamic engine reclocking (V9) V2: reorganize functions, fix modesetting calls V3: rebase patch, use radeon's workqueue V4: enable on tested chipsets only, request VBLANK IRQs V5: enable PM on older hardware (IRQs, mode_fixup, dpms) V6: use separate dynpm module parameter V7: drop RADEON_ prefix, set minimum mode for dpms off V8: update legacy encoder call, fix order in rs600 IRQ V9: update compute_clocks call in legacy, not only DPMS_OFF Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie commit 18917b60bca094e7830e4046e336d024f73f1c90 Author: Alex Deucher Date: Mon Feb 1 16:02:25 2010 -0500 drm/radeon/kms: consolidate crtc count in rdev Set the number of crtcs in rdev at crtc init and use it whenever we need the crtc count rather than recalculating it everytime. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 44224c3f455886190b101dbb00befbaff5e98466 Author: Alex Deucher Date: Thu Feb 4 11:01:52 2010 -0500 drm/radeon/kms/r600: reduce gpu cache flushing Only flush the gpu caches before we submit a fence. This leads to a small performance boost when we take the extra gpu cache flushes out of the ddx and mesa. Once this patch is in and the drm version is bumped, we can remove the flushes from the ddx and drm. Also, remove the extra cache flushes from the blit routine. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a0c07a69bc5d060362e4861d6c4f7c67dab57f1e Author: Dave Airlie Date: Wed Feb 3 19:17:14 2010 +1000 drm/radeon/kms: switch all KMS driver ioctls to unlocked. Internal locking should be sufficent for all these cases. Signed-off-by: Dave Airlie commit 9ae4786712166638a8daed902886ef400e88ab24 Author: Alex Deucher Date: Mon Feb 1 19:06:06 2010 -0500 drm/radeon/kms/atom: add a helper function to get the radeon connector priv This is used in a lot of places in the atom encoder code. While here fix the spelling of crtc_source_params. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 26b9fc3ab13587d4e86b217be43d1fb7ca934576 Author: Alex Deucher Date: Mon Feb 1 16:39:11 2010 -0500 drm/radeon/kms/atom: clean up spread spectrum code use a union for the atom args. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 093972788f009cabf8f8fb726dc5267b60b3d09e Author: Alex Deucher Date: Tue Feb 2 12:06:28 2010 -0500 drm/radeon/kms: add pll quirk for toshiba laptop panel The panel on the Toshiba A300-1BU laptop does not like the PLL dividers selected by the avivo pll algo, but works fine using the older method. Add a quirk to handle it. Should fix fdo bug 26358. Signed-off-by: Alex Deucher commit 7c27f87d2bde885e9bcda74c208a7aae8bef8e76 Author: Alex Deucher Date: Tue Feb 2 12:05:01 2010 -0500 drm/radeon/kms: rework pll algo selection Rework the pll algo selection so that the pll algo in use can be selected more easily. This allows us to select different pll divider selection algos for specific monitors that work better with one algo or the other. This is needed for the next patch which adds an LVDS pll quirk for a specific notebook. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4612dc97991a09e1a9e4d5d981e16589d7cb150c Author: Alex Deucher Date: Fri Feb 5 01:58:28 2010 -0500 drm/radeon/kms: clean up some low-hanging magic numbers Switch some magic numbers to their proper defines. The register header madness needs to be cleaned up at some point. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3c537889e17232e9073f75ae8710ea0f008c5a29 Author: Alex Deucher Date: Fri Feb 5 04:21:19 2010 -0500 drm/radeon/kms: add support for hardcoded edids in rom (v2) Some servers hardcode an edid in rom so that they will work properly with KVMs. This is a port of the relevant code from the ddx. [airlied: reworked to validate edid at boot stage - and remove special quirk, if there is a valid EDID in the BIOS rom we'll just try and use it.] Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 2739d49cd7f1f44876cad614b072da698967b370 Author: Alex Deucher Date: Fri Feb 5 03:34:16 2010 -0500 drm/radeon/kms: add workaround for rn50/rv100 servers Some servers have two VGA ports but only report one in the bios connector tables. On these systems always set up the TV DAC so that it displays properly even if the bios is wrong. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 40bacf1631a3e8654b1128aa9b72e73ca801c9e4 Author: Alex Deucher Date: Wed Dec 23 03:23:21 2009 -0500 drm/radeon/kms: add support for hw i2c on r1xx-r5xx wire hw i2c support into radeon i2c algo. fixes merged: - handle bus probing correctly - use meaningful error numbers - abort if transaction fails - The line mapping is different depending on the asic. - protect hw i2c engine with a mutex - rs300 doesn't have a pin select bit - r200 has a different pin select setup Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0f88009d5cfae890bd3466126d1622ad4f16b798 Author: James Bottomley Date: Mon Jan 18 10:14:51 2010 -0600 [SCSI] scsi_transport_sas: add support for transport layer retries (TLR) The mpt2sas driver wants to use transport layer retries (TLR) so the simplest thing to do seems to be to add the enabling flags and checks to the SAS transport class, since they're a SAS specific protocol feature. Signed-off-by: James Bottomley commit e15276a4b220c54db665cf46a92bd9ceb9aeb052 Author: Vivek Natarajan Date: Mon Feb 8 17:47:01 2010 +0530 mac80211: Reset dynamic ps timer in Rx path. The current mac80211 implementation enables power save if there is no Tx traffic for a specific timeout. Hence, PS is triggered even if there is a continuous Rx only traffic(like UDP) going on. This makes the drivers to wait on the tim bit in the next beacon to awake which leads to redundant sleep-wake cycles. Fix this by restarting the dynamic ps timer on receiving every data packet. Signed-off-by: Vivek Natarajan CC: stable@kernel.org Signed-off-by: John W. Linville commit 209c671db7a917740ab9873d442b10ae7e369937 Author: Andres Salomon Date: Sun Feb 7 21:47:50 2010 -0500 mac80211: make rate_control_alloc static rate_control_alloc is not used by anything outside of ieee80211_init_rate_ctrl_alg. Both are in rate.c; there's no reason to make rate_control_alloc visible outside of it. Signed-off-by: Andres Salomon Signed-off-by: John W. Linville commit 641eabb0a3717020d1a93d3f91493ab0d826c910 Author: Christian Lamparter Date: Sun Feb 7 16:01:55 2010 +0100 ath: fix WARN_ON with Polish (Poland) Contry code This patch fixes a WARN_ON which is triggered by Poland's country code. ath: EEPROM regdomain: 0x8268 ath: EEPROM indicates we should expect a country code ath: doing EEPROM country->regdmn map search ath: country maps to regdmn code: 0x37 ath: Country alpha2 being used: PL ath: Regpair used: 0x37 -----------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/regd.c:155 ath_regd_init+0x30b Pid: 12661, comm: firmware/carl91 2.6.33-rc5-wl #18 Call Trace: [<>] ? warn_slowpath_common+0x76/0x8c [<>] ? ar9170_reg_notifier+0x0/0x2d [carl9170usb] [<>] ? ath_regd_init+0x30b/0x377 [ath] [<>] ? ar9170_register+0x3b3/0x3ca [carl9170usb] [...] ---[ end trace ]--- Note: Poland is just an example. But it is very likely that more country codes are affected. Cc: Luis R. Rodriguez Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 349e6b7289f8a3d3d5d3b859e00b41f27d1211df Author: Kalle Valo Date: Sun Feb 7 10:22:01 2010 +0200 mac80211: remove get_tx_stats() driver op get_tx_stats() driver operation is not currently used anywhere in mac80211 and there are no plans to use it in the not-so-near future. So it can go without anyone missing it. Signed-off-by: Kalle Valo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 00a08eb62f790383bcc8ea309d4afb9ef346ef0b Author: Kalle Valo Date: Sun Feb 7 10:21:53 2010 +0200 rt2x00: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Signed-off-by: Kalle Valo Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 97e93fcd866ee7cc02082fc62509378f50547936 Author: Kalle Valo Date: Sun Feb 7 10:21:46 2010 +0200 p54: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. p54 uses struct ieee80211_tx_queue_stats also internally, so create a new identical struct p54_tx_queue_stats which the driver can use. Compile-tested only. Signed-off-by: Kalle Valo Tested-by: Christian Lamparter Signed-off-by: John W. Linville commit 1296d4744516aeae8809e2f47ceecd88df4b037f Author: Kalle Valo Date: Sun Feb 7 10:21:37 2010 +0200 iwlwifi: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Cc: Zhu Yi Signed-off-by: Kalle Valo Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit 8b2bbe66abfdc60f73b094a56ab29bfbf939201c Author: Kalle Valo Date: Sun Feb 7 19:51:00 2010 +0200 b43legacy: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Cc: Larry Finger Cc: Stefano Brivio Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 3b27521a5be8b700451d54d4fa670f754e7f9720 Author: Kalle Valo Date: Sun Feb 7 19:50:50 2010 +0200 b43: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Cc: Stefano Brivio Cc: Michael Buesch Cc: Larry Finger Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 3b2119096d7ec4ef50427e07b562897f2c139c11 Author: Kalle Valo Date: Sun Feb 7 10:21:07 2010 +0200 ath5k: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Cc: Jiri Slaby Cc: Nick Kossifidis Cc: Luis R. Rodriguez Signed-off-by: Kalle Valo Acked-by: Bob Copeland Signed-off-by: John W. Linville commit d1ace8e57a4e3af78767684c6f6b5f8b88417abb Author: Kalle Valo Date: Sun Feb 7 10:21:00 2010 +0200 ar9170: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Because ar9170 uses ieee80211_tx_queue_stats internally, create a new identical struct ar9170_tx_queue_stats which the driver can use. Compile-tested only. Signed-off-by: Kalle Valo Tested-by: Christian Lamparter Signed-off-by: John W. Linville commit 8ccbc3b8b0c919e8609560ca56cd777ece8d2c41 Author: Kalle Valo Date: Sun Feb 7 10:20:52 2010 +0200 mwl8k: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. mwl8k used struct ieee80211_tx_queue_stats internally to track the queue lenght. Replace struct ieee80211_tx_queue_stats with a simple len field in struct mwl8k_tx_queue. Limit and count fields seemed to be unused. Compile-tested only. Cc: Lennert Buytenhek Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 4046fe66ce74b66b553035c57c892f4715e074db Author: Kalle Valo Date: Sun Feb 7 10:20:44 2010 +0200 adm821: remove get_tx_stats() mac80211 op get_tx_stats() will be removed from mac80211. Compile-tested only. Cc: Michael Wu Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 733da37dab72de6b3f8b0c56b5cdea322f18a684 Author: Ming Lei Date: Sat Feb 6 22:38:23 2010 +0800 ath9k: fix keycache leak in split tkip case If split tkip key is used, ath_delete_key should delete rx key and rx mic key. This patch fixes the leak of hw keycache in the case. Signed-off-by: John W. Linville commit 29165e4c8b265a415f1fd1dca947b5d4c72abc47 Author: Johannes Berg Date: Sat Feb 6 15:20:13 2010 +0100 mac80211: fix deauth race When userspace requests a deauth while the authentication work is pending in the auth (not probe) state, we do not properly abort the work and then things get confused. Fix that and also improve the checks here to include the correct virtual interface, just in case two virtual interfaces would ever try to connect to the same BSS. Also fix a bug -- need to use list_del_rcu instead of just list_del to free a work item. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9 Author: Samuel Ortiz Date: Fri Feb 5 11:33:48 2010 -0800 iwlwifi: Send broadcast probe request only when asked to When running directed active scans we currently end up sending both the SSID probe requests and an additional broadcast one. This is due to the fact that we always leave the probe request template SSID IE length to 0. Instead we should set it to the first SSID to scan, and fill the direct_scan array with the remaining SSIDs to scan for. This way we only send what we've been asked to: a broadcast probe request when no directed scan is requested, and directed probe requests otherwise. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit ed56a3f15a0561e900957ecca0dee42b9b453a9e Author: Ben Cahill Date: Fri Feb 5 11:33:47 2010 -0800 iwlwifi: Add chain_noise support for 6050 Existing iwl6050_ops->iwl6050_hcmd_utils structure had no pointers to chain noise functions (gain_computation and chain_noise_reset). As it turns out, by adding chain_noise_scale (see related patch), there is no need for separate chain noise function, so simply use iwl6000_ops->iwl5000_hcmd_utils, and remove those for 6050. Signed-off-by: Ben Cahill Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d4fe5ac9e04e6e175a7bd7e29844b351533be591 Author: Ben Cahill Date: Fri Feb 5 11:33:46 2010 -0800 iwlwifi: Add chain noise scaling factor 6x50 device requires a different scaling factor for Rx gain values sent to device via PHY_CALIBRATION_CMD (CHAIN_NOISE_GAIN_CMD). Rather than create a new iwlXXXX_gain_computation() function, add new chain_noise_scale member to struct iwl_cfg, and keep using iwl5000_gain_computation(). Signed-off-by: Ben Cahill Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 19885c4fbd79439efd6b3798bfb73f2f30e27104 Author: Johannes Berg Date: Fri Feb 5 11:45:06 2010 +0100 mac80211: fix bss_conf.dtim_period In AP mode, the only mode where the parameter is supposed to be valid, we never assign it! Fix that to allow drivers to avoid parsing the TIM IE for the value. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 199d69f27326858b16449eb1cc1623299db64415 Author: Benoit Papillault Date: Thu Feb 4 22:00:20 2010 +0100 mac80211: Added a new debugfs file for reading channel_type This file helps debugging HT channels since it displays if we are on ht20 or ht40+/ht40- Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit 40e6fa829a2544c9f8fd5a94844fe502334d6afc Author: Holger Schurig Date: Thu Feb 4 14:37:45 2010 +0100 libertas: don't retry commands Retrying commands seldomly works, most often the firmware is in a weird state anyway and needs the device to reset. So it's better to report the broken state back to user-space. Also rename command_timer_fn() into lbs_cmd_timeout_handler(), which better reflect it's usage. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 85359499eec796e784e2f1e3d7bbb31d84dd4c2b Author: Kalle Valo Date: Thu Feb 4 15:33:25 2010 +0200 wl1251: fix txop unit mac80211 uses unit units of 32 usec with txop but wl1251_acx_ac_cfg() expects it to be usecs. This fortunately didn't cause any severe problems, only that firmware was using incorrect WMM settings. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 40bd5203ddb6b946b55c35d1c26dfe9ec1b232f5 Author: Rafał Miłecki Date: Thu Feb 4 13:11:54 2010 +0100 b43: N-PHY: handle allocation fail in samples generation Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5f6393ecf5cc7d064ba9172e0a2e1c64bcaaaf2f Author: Rafał Miłecki Date: Thu Feb 4 13:08:08 2010 +0100 b43: N-PHY: load generated samples Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 9442e5b58edb4a108ec5aae420a6fff3a63acab0 Author: Rafał Miłecki Date: Thu Feb 4 12:23:12 2010 +0100 b43: N-PHY: partly implement SPUR workaround Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bbc6dc121de92dee506e359eeb9b1d3973d0740a Author: Rafał Miłecki Date: Thu Feb 4 12:23:11 2010 +0100 b43: N-PHY: save calibration for further restore Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 984ff4ffb7fa36b9ac440a3802fd19658eccc84e Author: Rafał Miłecki Date: Thu Feb 4 12:23:10 2010 +0100 b43: N-PHY: prepare code for reapplying TX cal coeffs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 67cbc3ed5b96a5acfddae142fa0e2adb1b6270d5 Author: Rafał Miłecki Date: Thu Feb 4 12:23:08 2010 +0100 b43: N-PHY: implement overriding RF control intc Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 371ba88322ea5750ad411fdef7674dcee50f7235 Author: Randy Dunlap Date: Wed Feb 3 15:31:07 2010 -0800 libertas/if_spi: needs linux/semaphore.h libertas/if_spi.c needs to #include linux/semaphore.h to fix build errors: drivers/net/wireless/libertas/if_spi.c:59: error: field 'spi_ready' has incomplete type drivers/net/wireless/libertas/if_spi.c:60: error: field 'spi_thread_terminated' has incomplete type drivers/net/wireless/libertas/if_spi.c:785: error: implicit declaration of function 'down_interruptible' drivers/net/wireless/libertas/if_spi.c:787: error: implicit declaration of function 'up' drivers/net/wireless/libertas/if_spi.c:834: error: implicit declaration of function 'down' drivers/net/wireless/libertas/if_spi.c:943: error: implicit declaration of function 'sema_init' Signed-off-by: Randy Dunlap Acked-by: Dan Williams Signed-off-by: John W. Linville commit 83e34f03ee9b86b49bde4707a1fe03a1837e29be Author: Jochen Friedrich Date: Wed Feb 3 21:28:11 2010 +0100 ssb: fix interrupt assignment Explicitely enable shared interrupt 2 for any core that didn't get a dedicated IRQ anymore (fallthrough case) and for EXTIF cores to make gpio interrupts work. Also remove a bogus comment. Signed-off-by: Jochen Friedrich Signed-off-by: John W. Linville commit 0866b03c7d7dee8a34ffa527ecda426c0f405518 Author: Larry Finger Date: Wed Feb 3 13:33:44 2010 -0600 b43/b43legacy: Wake queues in wireless_core_start If b43 or b43legacy are deauthenticated or disconnected, there is a possibility that a reconnection is tried with the queues stopped in mac80211. To prevent this, start the queues before setting STAT_INITIALIZED. In b43, a similar change has been in place (twice) in the wireless_core_init() routine. Remove the duplicate and add similar code to b43legacy. Signed-off-by: Larry Finger Cc: Stable [2.6.32] Signed-off-by: John W. Linville commit 74e2bd1fa3ae9695af566ad5a7a288898787b909 Author: Wey-Yi Guy Date: Wed Feb 3 09:28:55 2010 -0800 mac80211: tear down all agg queues when restart/reconfig hw When there is a need to restart/reconfig hw, tear down all the aggregation queues and let the mac80211 and driver get in-sync to have the opportunity to re-establish the aggregation queues again. Need to wait until driver re-establish all the station information before tear down the aggregation queues, driver(at least iwlwifi driver) will reject the stop aggregation queue request if station is not ready. But also need to make sure the aggregation queues are tear down before waking up the queues, so mac80211 will not sending frames with aggregation bit set. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3f7c5c10e9dc6bf90179eb9f7c06151d508fb324 Author: Senthil Balasubramanian Date: Wed Feb 3 22:51:13 2010 +0530 ath9k: Enable TIM timer interrupt only when needed. The TIM timer interrupt is enabled even before the ACK of nullqos is received which is unnecessary. Also clean up the CONF_PS part of config callback properly for better readability. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 1a20034a73a40b8056731f9db0c535cec2961eb7 Author: Senthil Balasubramanian Date: Wed Feb 3 22:50:18 2010 +0530 ath9k: configure the beacon only if the STA is associated beacons configuration SHOULD be done only if the STA is associated. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 34e895075e21be3e21e71d6317440d1ee7969ad0 Author: Johannes Berg Date: Wed Feb 3 13:59:58 2010 +0100 mac80211: allow station add/remove to sleep Many drivers would like to sleep during station addition and removal, and currently have a high complexity there from not being able to. This introduces two new callbacks sta_add() and sta_remove() that drivers can implement instead of using sta_notify() and that can sleep, and the new sta_add() callback is also allowed to fail. The reason we didn't do this previously is that the IBSS code wants to insert stations from the RX path, which is a tasklet, so cannot sleep. This patch will keep the station allocation in that path, but moves adding the station to the driver out of line. Since the addition can now fail, we can have IBSS peer structs the driver rejected -- in that case we still talk to the station but never tell the driver about it in the control.sta pointer. If there will ever be a driver that has a low limit on the number of stations and that cannot talk to any stations that are not known to it, we need to do come up with a new strategy of handling larger IBSSs, maybe quicker expiry or rejecting peers. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 070bb5477fb4029131aad4941d7aaf0093db0c38 Author: Johannes Berg Date: Wed Feb 3 13:57:46 2010 +0100 mac80211: don't probe if we have probe response We can now easily determine whether we already have probe response information for the BSS we are asked to connect to, in which case there's little point in probing the BSS again. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 33e5a2f776e331dc8a4379b6efb660d38f182d96 Author: Johannes Berg Date: Wed Feb 3 10:24:30 2010 +0100 wireless: update radiotap parser Upstream radiotap has adopted the namespace proposal David Young made and I then took care of, for which I had adapted the radiotap parser as a library outside the kernel. This brings the in-kernel parser up to speed. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 690680360cd22b55235481ca3421a3450a96138a Author: Johannes Berg Date: Wed Feb 3 10:47:55 2010 +0100 mac80211_hwsim: add fake hw scan handler For debugging hardware scan trigger/complete functionality, it was useful to have code in hwsim that pretends to do a hardware scan. This code could be extended to actually do the scan, but for now it was sufficient for me to only pretend. Since hwsim was written to ease debugging, it only makes sense to add it to it permanently. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6e7e6213e4956828927c30e3ef5a42812d00c650 Merge: 5ffaf8a c0ce77b Author: John W. Linville Date: Mon Feb 8 16:38:38 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: net/mac80211/scan.c commit 8007f10259d04f37044c2c731bf9ccdd9161d825 Author: Xiaotian Feng Date: Tue Feb 9 08:22:24 2010 +1100 selinux: fix memory leak in sel_make_bools In sel_make_bools, kernel allocates memory for bool_pending_names[i] with security_get_bools. So if we just free bool_pending_names, those memories for bool_pending_names[i] will be leaked. This patch resolves dozens of following kmemleak report after resuming from suspend: unreferenced object 0xffff88022e4c7380 (size 32): comm "init", pid 1, jiffies 4294677173 backtrace: [] create_object+0x1a2/0x2a9 [] kmemleak_alloc+0x26/0x4b [] __kmalloc+0x18f/0x1b8 [] security_get_bools+0xd7/0x16f [] sel_write_load+0x12e/0x62b [] vfs_write+0xae/0x10b [] sys_write+0x4a/0x6e [] system_call_fastpath+0x16/0x1b [] 0xffffffffffffffff Signed-off-by: Xiaotian Feng Signed-off-by: James Morris commit 7e469af97eed947ba9204712601281a69ae8eb6c Author: Jeff Layton Date: Fri Feb 5 15:09:22 2010 -0500 lockd: don't clear sm_monitored on nsm_reboot_lookup When lockd gets a notify downcall from statd, it'll search its hosts cache and then clear the sm_monitored bit on the host it finds. The idea is apparently to make lockd redo a SM_MON on the next lock request. This is unnecessary and causes the kernel's NSM cache to go out of sync with statd. statd doesn't stop monitoring a host when it gets a SM_NOTIFY and there's no guarantee that another lock will occur after the reclaim and before the unmount. In that event, no SM_UNMON will occur. Signed-off-by: Jeff Layton Reviewed-by: Chuck Lever Signed-off-by: J. Bruce Fields commit cdd30fa1664e0245fa64330c7cc2ddab7e47c223 Author: Jeff Layton Date: Fri Feb 5 15:09:12 2010 -0500 lockd: release reference to nsm_handle in nlm_host_rebooted nsm_reboot_lookup takes a reference to the nsm_handle that it returns, but nlm_host_rebooted never releases that reference. Signed-off-by: Jeff Layton Reviewed-by: Chuck Lever Signed-off-by: J. Bruce Fields commit cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 Author: Al Viro Date: Fri Dec 25 05:07:33 2009 -0500 Lose the first argument of audit_inode_child() it's always equal to ->d_name.name of the second argument Signed-off-by: Al Viro commit 123df2944c436c80640c4281c5bc9c7950b18687 Author: Al Viro Date: Fri Dec 25 04:57:57 2009 -0500 Lose the new_name argument of fsnotify_move() it's always new_dentry->d_name.name Signed-off-by: Al Viro commit 32974ad4907cdde6c9de612cd1b2ee0568fb9409 Author: Tony Luck Date: Mon Feb 8 10:42:17 2010 -0800 [IA64] Remove COMPAT_IA32 support This has been broken since May 2008 when Al Viro killed altroot support. Since nobody has complained, it would appear that there are no users of this code (A plausible theory since the main OSVs that support ia64 prefer to use the IA32-EL software emulation). Signed-off-by: Tony Luck commit f7e7ee36757f68778700cde1aaed89e1d23e59fd Author: austin_zhang@linux.intel.com Date: Fri Feb 5 09:02:42 2010 -0800 perf record: Fix existing process callgraph symbol When 'perf record -g' a existing process, even with debuginfo packages, still cannnot get symbol from 'perf report'. try: perf record -g -p `pidof xxx` -f perf report 68.26% :1181 b74870f2 [.] 0x000000b74870f2 | |--32.09%-- 0xb73b5b44 | 0xb7487102 | 0xb748a4e2 | 0xb748633d | 0xb73b41cd | 0xb73b4467 | 0xb747d531 The reason is: for existing process, in __cmd_record(), the pid is 0 rather than the existing process id. Signed-off-by: Austin Zhang Acked-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <4710.10.255.24.35.1265389362.squirrel@linux.intel.com> Signed-off-by: Ingo Molnar commit 76780373190d7e8ddfb6fed06aef068e2445c743 Author: Florian Westphal Date: Mon Feb 8 15:39:16 2010 +0100 netfilter: fix build failure with CONNTRACK=y NAT=n net/ipv4/netfilter/nf_defrag_ipv4.c: In function 'ipv4_conntrack_defrag': net/ipv4/netfilter/nf_defrag_ipv4.c:62: error: implicit declaration of function 'nf_ct_is_template' Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 1c64606968538396ffe87eb6da4121a5bffe5e34 Author: Vaibhav Hiremath Date: Mon Jan 4 15:34:15 2010 +0100 OMAP: DSS2: Add Sharp LQ043T1DG01 panel driver Signed-off-by: Vaibhav Hiremath Signed-off-by: Tomi Valkeinen commit b99a776d0b17ae0f3a54e86009887a00ac4889d0 Author: Takashi Iwai Date: Mon Feb 8 15:21:09 2010 +0100 ALSA: hda - Remove static gpio_led setup via model We have now a better mute-LED GPIO detection, and no need to assign the values statically per model option. Signed-off-by: Takashi Iwai commit c21bd0254371c207636e84c9e033d13a6fe48d43 Author: Takashi Iwai Date: Mon Feb 8 15:16:08 2010 +0100 ALSA: hda - Merge HP mute-LED status callback on both IDT 92HD7x and 8x codecs Merge the mute-LED status callback function for both IDT 92HD7x and 8x codecs to one function. Also it's changed to check all DACs, and called in the initialization to sync with the current status. Signed-off-by: Takashi Iwai commit 07f804495cb08c8fdf16eee8f7d90edce4a3c9c5 Author: Takashi Iwai Date: Mon Feb 8 15:06:13 2010 +0100 ALSA: hda - Detect HP mute-LED GPIO setup from GPIO counts The GPIO pin number for the mute LED control on HP laptops can be determined more easily by checking the number of available GPIO pins of the codec chip. On a small package with up to 3 GPIOs, GPIO 0 is used while GPIO 3 is used for others. This fixes the missing mute GPIO for some HP laptops with new codecs. Signed-off-by: Takashi Iwai commit 58152a16901dfce8662f5ec7e16d06dfce6fd31e Author: Uwe Kleine-König Date: Fri Feb 5 11:42:54 2010 +0100 arm/mx2/devices: use SoC-prefixed names where possible There is only NFC_BASE_ADDR left which is defined differently for mx21 and mx27. Signed-off-by: Uwe Kleine-König commit 69ddb488035068fce9a4ac4a63cffa91dfb3f37f Author: Uwe Kleine-König Date: Fri Feb 5 12:03:37 2010 +0100 arm/mx2: use cpp magic to create imx-ssi devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit ccd0e42c827666e91296b6395b7b7b04fb8c8803 Author: Uwe Kleine-König Date: Fri Feb 5 10:46:56 2010 +0100 arm/mx2: use cpp magic to create imx-mmc devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 9309b2ba54d9082b8eb2ce641ad395cf5d9929f4 Author: Uwe Kleine-König Date: Thu Feb 4 22:13:52 2010 +0100 arm/mx2: use cpp magic to create imx-i2c devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 2b84a3640ffdebbbea3ec004eae963e920c16e1a Author: Uwe Kleine-König Date: Thu Feb 4 14:11:02 2010 +0100 arm/mx2: use cpp magic to create imx_gpt devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 68c94b40b31926f627573a7f656b903f6644744e Author: Uwe Kleine-König Date: Thu Feb 4 22:04:32 2010 +0100 arm/mx2: use cpp magic to create spi_imx devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit fa535a77bd3fa32b9215ba375d6a202fe73e1dd6 Author: Anton Blanchard Date: Tue Feb 2 14:46:13 2010 -0800 sched: cpuacct: Use bigger percpu counter batch values for stats counters When CONFIG_VIRT_CPU_ACCOUNTING and CONFIG_CGROUP_CPUACCT are enabled we can call cpuacct_update_stats with values much larger than percpu_counter_batch. This means the call to percpu_counter_add will always add to the global count which is protected by a spinlock and we end up with a global spinlock in the scheduler. Based on an idea by KOSAKI Motohiro, this patch scales the batch value by cputime_one_jiffy such that we have the same batch limit as we would if CONFIG_VIRT_CPU_ACCOUNTING was disabled. His patch did this once at boot but that initialisation happened too early on PowerPC (before time_init) and it was never updated at runtime as a result of a hotplug cpu add/remove. This patch instead scales percpu_counter_batch by cputime_one_jiffy at runtime, which keeps the batch correct even after cpu hotplug operations. We cap it at INT_MAX in case of overflow. For architectures that do not support CONFIG_VIRT_CPU_ACCOUNTING, cputime_one_jiffy is the constant 1 and gcc is smart enough to optimise min(s32 percpu_counter_batch, INT_MAX) to just percpu_counter_batch at least on x86 and PowerPC. So there is no need to add an #ifdef. On a 64 thread PowerPC box with CONFIG_VIRT_CPU_ACCOUNTING and CONFIG_CGROUP_CPUACCT enabled, a context switch microbenchmark is 234x faster and almost matches a CONFIG_CGROUP_CPUACCT disabled kernel: CONFIG_CGROUP_CPUACCT disabled: 16906698 ctx switches/sec CONFIG_CGROUP_CPUACCT enabled: 61720 ctx switches/sec CONFIG_CGROUP_CPUACCT + patch: 16663217 ctx switches/sec Tested with: wget http://ozlabs.org/~anton/junkcode/context_switch.c make context_switch for i in `seq 0 63`; do taskset -c $i ./context_switch & done vmstat 1 Signed-off-by: Anton Blanchard Reviewed-by: KOSAKI Motohiro Acked-by: Balbir Singh Tested-by: Balbir Singh Cc: Peter Zijlstra Cc: Martin Schwidefsky Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 0c9cf2efd74dbc90354e2ccc7dbd6bad68ec6c4d Author: Anton Blanchard Date: Tue Feb 2 14:46:10 2010 -0800 percpu_counter: Make __percpu_counter_add an inline function on UP Even though batch isn't used on UP, we may want to pass one in to keep the SMP and UP code paths similar. Convert __percpu_counter_add to an inline function so we wont get variable unused warnings if we do. Signed-off-by: Anton Blanchard Cc: KOSAKI Motohiro Cc: Peter Zijlstra Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 6d3e0907b8b239d16720d144e2675ecf10d3bc3b Merge: 2357725 50200df Author: Ingo Molnar Date: Mon Feb 8 08:55:43 2010 +0100 Merge branch 'sched/urgent' into sched/core Merge reason: Merge dependent fix, update to latest -rc. Signed-off-by: Ingo Molnar commit 50200df462023b187d80a99a52f5f2cfe3c86c26 Author: Andrew Morton Date: Tue Feb 2 14:46:13 2010 -0800 kernel/sched.c: Suppress unused var warning On UP: kernel/sched.c: In function 'wake_up_new_task': kernel/sched.c:2631: warning: unused variable 'cpu' Signed-off-by: Andrew Morton Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 7561f2dd393bd0c6397e6b2a6b021cdb827a2eb1 Author: Paul Mundt Date: Mon Feb 8 16:36:56 2010 +0900 sh: Fix up SH7786 PCI resource definitions. This adds in some of the missing memory resources for channels 1/2 and gets the code building again for the recent changes. Signed-off-by: Paul Mundt commit 34bf0fc54a4634ebb0a992e8562191a01233e240 Author: Magnus Damm Date: Mon Feb 8 03:35:46 2010 +0000 ARM: mach-shmobile: G3EVM, G4EVM and AP4EVB defconfigs Add defconfigs for G3EVM, G4EVM and AP4EVB. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d48d38e87c2ce56dcee030a8bcd5e9e1090c232f Author: Paul Mundt Date: Mon Feb 8 12:50:24 2010 +0900 MAINTAINERS: Add entry for ARM-based SH-Mobile architecture. Signed-off-by: Paul Mundt commit 8a77b8d0744ab21b59a9413c41c6a3d6cb9b0b4f Author: Magnus Damm Date: Fri Feb 5 11:15:33 2010 +0000 serial: sh-sci: Support ARM-based SH-Mobile CPUs. Add support for ARM-based SH-Mobile CPUs to the sh-sci driver. Also remove the SCLSR register that is missing on sh772x, sh7705 and SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 65a5b28f0af00dddd785b516914739460562638f Author: Magnus Damm Date: Fri Feb 5 11:15:25 2010 +0000 sh: Let INTC set IRQF_VALID on ARM platforms. Reuse the SuperH INTC code on ARM by using set_irq_flags() to set IRQF_VALID on ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 13d605de2ece8c8f7c17a88747d90b7931350ee5 Author: Magnus Damm Date: Fri Feb 5 11:15:15 2010 +0000 sh: Build drivers/sh for ARM-based SH-Mobile CPUs. Build drivers/sh in the case of ARM-based SH-Mobile CPUs. Shared code for the interrupt controller (INTC) and the gpio/pinmux (PFC) is located there. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2b7eda63e489a43575f776a1a32bcfbcd75b9476 Author: Magnus Damm Date: Fri Feb 5 11:14:58 2010 +0000 ARM: mach-shmobile: SH-Mobile AP4 support. This adds preliminary support for the SH7372 (SH-Mobile AP4) CPU and the AP4EVB reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f2aaf66df0858116b2fcdbbfe8126d4ff925ac61 Author: Magnus Damm Date: Fri Feb 5 11:15:07 2010 +0000 ARM: mach-shmobile: SH-Mobile G4 support. This adds preliminary support for the SH7377 (SH-Mobile G4) CPU and the G4EVM reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c793c1b0c8ea11b46caf5a532752214b27a2df42 Author: Magnus Damm Date: Fri Feb 5 11:14:49 2010 +0000 ARM: mach-shmobile: SH-Mobile G3 support. This adds preliminary support for the SH-Mobile G-series. The SH-Mobile G-series is a series of ARM/SH multi-core CPUs that aside from the ARM MPU are primarily composed of existing SH IP blocks. This includes initial support for the SH7367 (SH-Mobile G3) CPU and the G3EVM reference board. Only timer, serial console, and NOR flash are supported at this point. Patches for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit ea13ddbad0eb4be9cdc406cd7e0804fa4011f6e4 Author: Tetsuo Handa Date: Wed Feb 3 06:43:06 2010 +0900 TOMOYO: Extract bitfield Since list elements are rounded up to kmalloc() size rather than sizeof(int), saving one byte by using bitfields is no longer helpful. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit 13fd7aeb9af0a106905757369362137996f3feb0 Merge: 2e18e04 858918b 9e9622d Author: Paul Mundt Date: Mon Feb 8 11:48:10 2010 +0900 Merge branches 'sh/dwarf-unwinder', 'sh/g3-prep' and 'sh/stable-updates' commit 9e9622d1a064705181bea0600ea9eacd95adab7f Author: Magnus Damm Date: Mon Feb 8 11:47:44 2010 +0900 serial: sh-sci: remove SCIF code in sci_rxd_in() Since sci_rxd_in() is used by SCI only, clean up the header file by killing off code dealing with SCIF ports and their register definitions. Also introduce a default sci_rxd_in() function which can be shared by all SCIF-only processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2e18e047981ae04be9bd0d9760057f7c1a7b3785 Merge: b06ede8 cfefe99 Author: Paul Mundt Date: Mon Feb 8 11:34:03 2010 +0900 Merge branch 'sh/dmaengine' Conflicts: arch/sh/drivers/dma/dma-sh.c commit 858918b77b29d0e9ce7f524d1b57d602d85f5d64 Author: Matt Fleming Date: Sun Feb 7 12:40:36 2010 +0000 sh: Optimise FDE/CIE lookup by using red-black trees Now that the DWARF unwinder is being used to provide perf callstacks unwinding speed is an issue. It is no longer being used in exceptional circumstances where we don't care about runtime performance, e.g. when panicing, so it makes sense improve performance is possible. With this patch I saw a 42% improvement in unwind time when calling return_address(1). Greater improvements will be seen as the number of levels unwound increases as each unwind is now cheaper. Note that insertion time has doubled but that's just the price we pay for keeping the trees balanced. However, this is a one-time cost for kernel boot/module load and so the improvements in lookup time dominate the extra time we spend keeping the trees balanced. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit cfefe99795251d76d92e8457f4152f532a961ec5 Author: Guennadi Liakhovetski Date: Wed Feb 3 14:46:41 2010 +0000 sh: implement DMA_SLAVE capability in SH dmaengine driver Tested to work with a SIU ASoC driver on sh7722 (migor). Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit 623b4ac4bf9e767991c66e29b47dd4b19458fb42 Author: Guennadi Liakhovetski Date: Wed Feb 3 14:44:12 2010 +0000 sh: fix Transfer Size calculation in both DMA drivers Both the original arch/sh/drivers/dma/dma-sh.c and the new SH dmaengine drivers do not take into account bits 3:2 of the Transfer Size field in the CHCR register, besides, bit-field defines set bit 2, but the mask only passes bits 1:0 through. TS_16BLK and TS_32BLK macros are bogus too. This patch fixes all these issues for sh7722 and sh7724, other CPUs stay unchanged and might need to be fixed too. Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit fc4618575f79eea062cdc51715040e40cd35b71c Author: Guennadi Liakhovetski Date: Tue Jan 19 07:24:55 2010 +0000 sh: prepare the DMA driver for slave functionality Slave DMA functionality uses scatter-gather arrays for data transfers, whereas memcpy just uses a single data buffer. This patch converts the current memcpy implementation in shdma.c to use scatter-gather, making it just a special case with one SG-element. This allows us to isolate descriptor list manipulations and locking into one function, thus reducing error chances. Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit 076dc4a65a6d99a16979e2c7917e669fb8c91ee5 Author: Masami Hiramatsu Date: Fri Feb 5 12:16:47 2010 -0500 x86/alternatives: Fix build warning Fixes these warnings: arch/x86/kernel/alternative.c: In function 'alternatives_text_reserved': arch/x86/kernel/alternative.c:402: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:402: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:405: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:405: warning: comparison of distinct pointer types lacks a cast Caused by: 2cfa197: ftrace/alternatives: Introducing *_text_reserved functions Changes in v2: - Use local variables to compare, instead of type casts. Reported-by: Ingo Molnar Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100205171647.15750.37221.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 3235dc3f22378f35ce77eba0d0f62db2d9c4844e Author: Frans Pop Date: Sat Feb 6 18:47:17 2010 +0100 x86: Remove trailing spaces in messages Signed-off-by: Frans Pop Cc: Avi Kivity Cc: x86@kernel.org LKML-Reference: <1265478443-31072-10-git-send-email-elendil@planet.nl> [ Left out the KVM bits. ] Signed-off-by: Ingo Molnar commit 5f485364365f00853e5249cb3ae31f876936b552 Author: Arnaldo Carvalho de Melo Date: Sun Feb 7 11:46:16 2010 -0200 perf top: Use address pattern in lookup_sym_source Because we may have aliases, like __GI___strcoll_l in /lib64/libc-2.10.2.so that appears in objdump as: $ objdump --start-address=0x0000003715a86420 \ --stop-address=0x0000003715a872dc -dS /lib64/libc-2.10.2.so 0000003715a86420 <__strcoll_l>: 3715a86420: 55 push %rbp 3715a86421: 48 89 e5 mov %rsp,%rbp 3715a86424: 41 57 push %r15 [root@doppio linux-2.6-tip]# So look for the address exactly at the start of the line instead so that annotation can work for in these cases. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Kirill Smelkov Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265550376-12665-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ee11b90b12eb1ec25e1044bac861e90bfd19ec9e Author: Kirill Smelkov Date: Sun Feb 7 11:46:15 2010 -0200 perf top: Fix annotate for userspace First, for programs and prelinked libraries, annotate code was fooled by objdump output IPs (src->eip in the code) being wrongly converted to absolute IPs. In such case there were no conversion needed, but in src->eip = strtoull(src->line, NULL, 16); src->eip = map->unmap_ip(map, src->eip); // = eip + map->start - map->pgoff we were reading absolute address from objdump (e.g. 8048604) and then almost doubling it, because eip & map->start are approximately close for small programs. Needless to say, that later, in record_precise_ip() there was no matching with real runtime IPs. And second, like with `perf annotate` the problem with non-prelinked *.so was that we were doing rip -> objdump address conversion wrong. Also, because unlike `perf annotate`, `perf top` code does annotation based on absolute IPs for performance reasons(*), new helper for mapping objdump addresse to IP is introduced. (*) we get samples info in absolute IPs, and since we do lots of hit-testing on absolute IPs at runtime in record_precise_ip(), it's better to convert objdump addresses to IPs once and do no conversion at runtime. I also had to fix how objdump output is parsed (with hardcoded 8/16 characters format, which was inappropriate for ET_DYN dsos with small addresses like '4ac') Also note, that not all objdump output lines has associtated IPs, e.g. look at source lines here: 000004ac : extern "C" int my_strlen(const char *s) 4ac: 55 push %ebp 4ad: 89 e5 mov %esp,%ebp 4af: 83 ec 10 sub $0x10,%esp { int len = 0; 4b2: c7 45 fc 00 00 00 00 movl $0x0,-0x4(%ebp) 4b9: eb 08 jmp 4c3 while (*s) { ++len; 4bb: 83 45 fc 01 addl $0x1,-0x4(%ebp) ++s; 4bf: 83 45 08 01 addl $0x1,0x8(%ebp) So we mark them with eip=0, and ignore such lines in annotate lookup code. Signed-off-by: Kirill Smelkov [ Note: one hunk of this patch was applied by Mike in 57d8188 ] Signed-off-by: Arnaldo Carvalho de Melo Cc: Mike Galbraith LKML-Reference: <1265550376-12665-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 889b8f964f2f226b7cd5a0a515109e3d8d9d1613 Author: David S. Miller Date: Fri Feb 5 16:29:48 2010 -0800 packet: Kill CONFIG_PACKET_MMAP. Early on this was an experimental facility that few people other than Alexey Kuznetsov played with. Now it's a pretty fundamental thing and as people add more features to AF_PACKET sockets this config options creates ifdef spaghetti. So kill it off. Signed-off-by: David S. Miller commit 36028f3383872eefb558a4aae4c12ec2b5fa640f Author: Mike Travis Date: Tue Feb 2 17:45:01 2010 -0800 vgaarb: Add user selectability of the number of GPUS in a system Update the VGA Arbiter to allow the user to select the number of GPU's supported in a system. v2: simplify setting of MAX_USER_CARDS, revert back to original default of 16 Signed-off-by: Mike Travis LKML-Reference: <4B68D51D.6090401@sgi.com> Cc: Thomas Gleixner Cc: Robin Holt Cc: Jack Steiner Cc: Ingo Molnar Cc: Jesse Barnes Cc: David Airlie Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b Author: Mike Travis Date: Tue Feb 2 14:38:15 2010 -0800 vgaarb: Fix VGA arbiter to accept PCI domains other than 0 Update the VGA Arbiter to accept PCI Domains other than 0. Signed-off-by: Mike Travis LKML-Reference: <201002022238.o12McFe8018730@imap1.linux-foundation.org> Cc: Thomas Gleixner Cc: Robin Holt Cc: Jack Steiner Cc: Ingo Molnar Cc: Jesse Barnes Cc: David Airlie Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 841582ea9e29a8f757c30c5377ce649586ba793a Author: Mike Travis Date: Tue Feb 2 14:38:14 2010 -0800 x86, uv: Update UV arch to target Legacy VGA I/O correctly. Add function to direct Legacy VGA I/O traffic to correct I/O Hub. Signed-off-by: Mike Travis LKML-Reference: <201002022238.o12McEbi018727@imap1.linux-foundation.org> Cc: Thomas Gleixner Cc: Robin Holt Cc: Jack Steiner Cc: Ingo Molnar Cc: Jesse Barnes Cc: David Airlie Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 95a8b6efc5d07103583f706c8a5889437d537939 Author: Mike Travis Date: Tue Feb 2 14:38:13 2010 -0800 pci: Update pci_set_vga_state() to call arch functions Update pci_set_vga_state to call arch dependent functions to enable Legacy VGA I/O transactions to be redirected to correct target. [akpm@linux-foundation.org: make pci_register_set_vga_state() __init] Signed-off-by: Mike Travis LKML-Reference: <201002022238.o12McE1J018723@imap1.linux-foundation.org> Cc: Thomas Gleixner Cc: Robin Holt Cc: Jack Steiner Cc: Ingo Molnar Cc: Jesse Barnes Cc: David Airlie Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 1c5b9069e12e20d2fe883076ae0bf73966492108 Author: Brian Gerst Date: Fri Feb 5 09:37:09 2010 -0500 x86: Merge io.h io_32.h and io_64.h are now identical. Merge them into io.h. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-8-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 910bf6ad0be3e1efbda0e9d358794937b52c9860 Author: Brian Gerst Date: Fri Feb 5 09:37:08 2010 -0500 x86: Simplify flush_write_buffers() Always make it an inline instead of using a macro for the no-op case. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-7-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 6175ddf06b6172046a329e3abfd9c901a43efd2e Author: Brian Gerst Date: Fri Feb 5 09:37:07 2010 -0500 x86: Clean up mem*io functions. Iomem has no special significance on x86. Use the standard mem* functions instead of trying to call other versions. Some fixups are needed to match the function prototypes. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-6-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 2b4df4d4f7de1a834d252c7da3197fce634cbf0e Author: Brian Gerst Date: Fri Feb 5 09:37:06 2010 -0500 x86-64: Use BUILDIO in io_64.h Copied from io_32.h. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-5-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 2e16fc7728a77755b5b2dc6b27dde62cd97b9ea5 Author: Brian Gerst Date: Fri Feb 5 09:37:05 2010 -0500 x86-64: Reorganize io_64.h Make it more similar to io_32.h. No real code changes. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-4-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit bd2984e96452855d148ebce76f696dcecbc96340 Author: Brian Gerst Date: Fri Feb 5 09:37:04 2010 -0500 x86-32: Remove _local variants of in/out from io_32.h These were leftover from the numaq support that was removed in commit 1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-3-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 5c64c7019e571a726f4aa9c1896402c15391a8ed Author: Brian Gerst Date: Fri Feb 5 09:37:03 2010 -0500 x86-32: Move XQUAD definitions to numaq.h The XQUAD stuff is part of the NUMAQ architecture, so move it there. Signed-off-by: Brian Gerst LKML-Reference: <1265380629-3212-2-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 73c77e2ccc14413c232c3e0b3aa43a0c4b72ec70 Author: James Bottomley Date: Mon Jan 25 11:42:24 2010 -0600 xfs: fix xfs to work with Virtually Indexed architectures xfs_buf.c includes what is essentially a hand rolled version of blk_rq_map_kern(). In order to work properly with the vmalloc buffers that xfs uses, this hand rolled routine must also implement the flushing API for vmap/vmalloc areas. [style updates from hch@lst.de] Acked-by: Christoph Hellwig Signed-off-by: James Bottomley commit c9334f6067dbe0380141fc75b122e0a533878838 Author: James Bottomley Date: Mon Jan 25 11:42:23 2010 -0600 sh: add mm API for DMA to vmalloc/vmap areas Signed-off-by: James Bottomley commit 252a9afff76097667429b583e8b5b170b47665a4 Author: James Bottomley Date: Mon Jan 25 11:42:22 2010 -0600 arm: add mm API for DMA to vmalloc/vmap areas ARM cannot prevent cache movein, so this patch implements both the flush and invalidate pieces of the API. Signed-off-by: James Bottomley commit ef7cc35b0ee03431731186320b18e5da585341ff Author: James Bottomley Date: Mon Jan 25 11:42:21 2010 -0600 parisc: add mm API for DMA to vmalloc/vmap areas We already have an API to flush a kernel page along an alias address, so use it. The TLB purge prevents the CPU from doing speculative moveins on the flushed address, so we don't need to implement and invalidate. Acked-by: Kyle McMartin Signed-off-by: James Bottomley commit c50749de02f272be6e09b9016e13a17307d29066 Author: Grazvydas Ignotas Date: Fri Feb 5 16:29:53 2010 +0200 ASoC: pandora: Add DAC regulator support Pandora's external DAC is connected to VSIM TWL4030 supply, so let's start switching it too to save more power. Also DAC got it's own DAPM handler. Signed-off-by: Grazvydas Ignotas Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7aeef972cce30b0ab04047e07918b04d867e7a29 Author: Jiri Pirko Date: Fri Feb 5 02:52:39 2010 +0000 net: e1000e: convert to use mc helpers Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 2cc04d27c497af9e8d11181fa8ddef9c99592c78 Author: Jiri Pirko Date: Fri Feb 5 02:51:24 2010 +0000 net: dm9601: convert to use mc helpers Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6d55ad4a534e7de3417819c6e894ff1c0a38f626 Author: Jiri Pirko Date: Fri Feb 5 02:48:11 2010 +0000 net: 8139too: convert to use mc helpers Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit a56ed41d94f80e4342116318754878a045835f40 Author: Jiri Pirko Date: Fri Feb 5 02:47:28 2010 +0000 net: 8139cp: convert to use mc helpers Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6622e670b26fbaa9c4ae7772a4d2d0abd3414b51 Author: H Hartley Sweeten Date: Tue Feb 2 14:41:42 2010 -0800 posix-timers.c: Don't export local functions Signed-off-by: H Hartley Sweeten Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit c81628848af8a01f103acc8166299c698898a8f4 Author: Magnus Damm Date: Tue Feb 2 14:41:40 2010 -0800 clocksource: start CMT at clocksource resume Add code to start the CMT timer on clocksource resume. While at it handle the suspend case as well. Remove the platform device specific suspend calls. This makes sure the timer is started during sysdev_resume(). Without this patch the clocksource may be read as suspended, this after sysdev resume but before platform device resume. Signed-off-by: Magnus Damm Cc: john stultz Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit c54a42b19fbaae4e9f212322ecca25a6bc95c1ba Author: Magnus Damm Date: Tue Feb 2 14:41:41 2010 -0800 clocksource: add suspend callback Add a clocksource suspend callback. This callback can be used by the clocksource driver to shutdown and perform any kind of late suspend activities even though the clocksource driver itself is a non-sysdev driver. One example where this is useful is to fix the sh_cmt.c platform driver that today suspends using the platform bus and shuts down the clocksource too early. With this callback in place the sh_cmt driver will suspend using the clocksource and clockevent hooks and leave the platform device pm callbacks unused. Signed-off-by: Magnus Damm Cc: Paul Mundt Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 17622339af2536b32cf29699ddd4ba0fe79a61d5 Author: Magnus Damm Date: Tue Feb 2 14:41:39 2010 -0800 clocksource: add argument to resume callback Pass the clocksource as an argument to the clocksource resume callback. Needed so we can point out which CMT channel the sh_cmt.c driver shall resume. Signed-off-by: Magnus Damm Cc: john stultz Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 4f2c120d1860ce33a71c617f59cf80c700b30d2a Merge: cb67286 3b9447f Author: Mark Brown Date: Fri Feb 5 12:43:50 2010 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit 1537a3638cbf741d3826c1002026cce487a6bee0 Author: Daniel Mack Date: Fri Jan 29 15:57:49 2010 +0800 tree-wide: fix 'lenght' typo in comments and code Some misspelled occurences of 'octet' and some comments were also fixed as I was on it. Signed-off-by: Daniel Mack Cc: Jiri Kosina Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit b5218a87cbe0f01d551b2dae90b54cad8ded72df Author: Pavel Roskin Date: Tue Jan 19 13:25:50 2010 +0100 drm/kms: fix spelling in error message Signed-off-by: Pavel Roskin [clemens@ladisch.de: merged into drm_fb_helper] Signed-off-by: Clemens Ladisch Signed-off-by: Jiri Kosina commit a64061e100826be758145462f8c656ba17c9541b Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:26:47 2010 -0200 doc: capitalization and other minor fixes in pnp doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 9ce8e498ee58bb8a866a6c3c08fcb385ed66e9d2 Author: Baruch Siach Date: Tue Feb 2 08:54:51 2010 +0200 devres: typo fix s/dev/devm/ Signed-off-by: Baruch Siach Signed-off-by: Jiri Kosina commit 350f82586b7554240bee18c41cc5c842f63265ae Author: Edward Z. Yang Date: Mon Feb 1 18:26:59 2010 -0500 Remove redundant trailing semicolons from macros Signed-off-by: Edward Z. Yang Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 7d9b48ea81ee49779b95ecd0df5a8c2789e4f836 Author: Uwe Kleine-König Date: Thu Jan 28 22:09:43 2010 +0100 fix typo "definetly" -> "definitely" in comment Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 551e378ca1852dc51609b722014416d4da0770c6 Author: Daniel Mack Date: Thu Jan 28 16:11:51 2010 +0800 tree-wide: s/widht/width/g typo in comments Signed-off-by: Daniel Mack Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit d9a5f04b6a8e0e681ae37fde84016a57ca17371f Author: Shahar Havivi Date: Wed Jan 27 10:18:28 2010 +0100 vt: remove unused variables Remove unused fields in drivers/char/vt.c variables orig_buf and orig_count are assigned but never used. Signed-off-by: Shahar Havivi Signed-off-by: Jiri Kosina commit 7dd607e82d823e40675b0b87f035ff04dcb0b5c0 Author: Jiri Kosina Date: Wed Jan 27 01:00:10 2010 +0100 crypto: fix typo in Kconfig help text Reported-by: Toralf Förster Signed-off-by: Jiri Kosina commit 5e39df5625fb903587ac8e281fa57d76714996e4 Author: Uwe Kleine-König Date: Mon Jan 25 21:38:09 2010 +0100 grammar fix in comment Signed-off-by: Uwe Kleine-König Cc: Nicolas Pitre Signed-off-by: Jiri Kosina commit 9ddc5b6f18fbac07d2746566b73b89e89fdd4e6a Author: Uwe Kleine-König Date: Wed Jan 20 17:02:24 2010 +0100 tree-wide: fix typos "ammount" -> "amount" Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 659431fcafd820cc426afedadcc4548933224985 Author: Uwe Kleine-König Date: Mon Jan 18 16:02:48 2010 +0100 fix typos "precidence" -> "precedence" in comments This patch was generated by git grep -E -i -l 'precidence' | xargs -r perl -p -i -e 's/precidence/precedence/' Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 3333e9ee9f8b82307f99fb8466724649da573025 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:27:32 2010 -0200 doc: fix Defaultd -> Defaults typo in EISA doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 19afd8e2ffd7a6e4026d51d63495e14d2a7bacc3 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 18:30:05 2010 -0200 doc: update 00-INDEX for Documentation/laptops/ Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 2273130de8b24adeb59231a9a8c6274bf5d35447 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:23:14 2010 -0200 fix comment typo leve -> level in powerpc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit de8164fb2242d77c8a83fb3c63830eb7914d696d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:22:28 2010 -0200 doc: fix leve -> level typo in pm-runtime doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit af66585270ef99aa6097faf3bd7344855077e75d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:14:26 2010 -0200 fix comment typo boo -> boot in ksysfs.c Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit d6b198bc8a67deee5984fb9506f000ae4fce9d75 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:10:07 2010 -0200 fix ext3/ext4 comment typo compain -> complain Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit db18efac0bd644e4b7af757394ca0bef8d91dcee Author: Jaak Ristioja Date: Fri Jan 15 12:05:07 2010 +0200 bio: Fix outdated comment about bio_alloc_bioset() In commit 451a9ebf653d28337ba53ed5b4b70b0b9543cca1 bio_alloc_bioset() was refactored not to take NULL as a valid argument for bs. This patch changes the comment for that function accordingly. Currently, passing NULL as argument to parameter bs would result in a NULL pointer dereference. Signed-off-by: Jaak Ristioja Signed-off-by: Jiri Kosina commit 6382dc334064bb0b41a95df0e3c438de35f2ffb7 Author: Justin P. Mattock Date: Thu Jan 14 23:03:18 2010 -0800 fix comment typos in avc.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit fb637f3cd31783db2b654842ea32ffec15c4bd62 Author: Justin P. Mattock Date: Thu Jan 14 22:16:16 2010 -0800 fix comment typo in pci-dma.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 0747e3bc54b43faaa88ab0b37eb5b6f50972965b Author: Stefan Weil Date: Thu Jan 7 00:44:08 2010 +0100 Fix spelling of 'platform' in log messages Replace platfrom -> platform. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 947af2943576400628bba085eaa6b85143526133 Author: Stefan Weil Date: Thu Jan 7 00:03:52 2010 +0100 Fix spelling of 'platform' in comments and doc Replace platfrom -> platform. This is a frequent spelling bug. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 3d956d1dfffef3b19d743aa1a443ab5a300051cb Author: Peter Huewe Date: Tue Dec 22 09:41:42 2009 +0100 isdn/mISDN: add __init/__exit macros to dsp_core.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/mISDN/dsp_core.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 60c14a1507a9fcd2e3b8eb53c218cb74ae404bcf Author: Peter Huewe Date: Tue Dec 22 09:38:14 2009 +0100 media/dvb: add __init/__exit macros to bt878.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/media/dvb/bt8xx/bt878.c Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Jiri Kosina commit 73a98fce881c46eaeb33c1aef23ab607f4d03344 Author: Peter Huewe Date: Tue Dec 22 09:38:02 2009 +0100 w1: add __init/__exit macros to w1.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/w1/w1.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 8885074038b219b90cb0f5cd1a049ba80c7e815b Author: Peter Huewe Date: Tue Dec 22 09:27:06 2009 +0100 isdn/hardware: add __init/__exit macros to mISDNisar.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/hardware/mISDN/mISDNisar.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 71709247aa852b5c4a01e70a9186590800d15575 Author: Robert P. J. Day Date: Mon Dec 28 11:50:29 2009 -0500 xen: Fix misspelled CONFIG variable in comment. Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 473a72a18bf446f51837f7731214db297981f0ed Author: Peter Huewe Date: Tue Dec 22 09:27:05 2009 +0100 uwb/i1480: add __init/__exit macros Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of uwb/i1480/i1480-est.c Signed-off-by: Peter Huewe Acked-by: David Vrabel Signed-off-by: Jiri Kosina commit c9404c9c392d557a4687c4cbda022b03cb787ce9 Author: Adam Buchbinder Date: Fri Dec 18 15:40:42 2009 -0500 Fix misspelling of "should" and "shouldn't" in comments. Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 634bad68bc25753816594ecd390dcea980528315 Author: Adam Buchbinder Date: Fri Dec 18 15:40:41 2009 -0500 Fix misspelling of "successful" and variants in comments. Some comments misspell "successful" or variants of the word; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 Author: Fang Wenqi Date: Wed Dec 30 18:37:13 2009 +0800 fuse: fix large stack use gcc 4.4 warns about: fs/fuse/dev.c: In function ‘fuse_notify_inval_entry’: fs/fuse/dev.c:925: warning: the frame size of 1060 bytes is larger than 1024 bytes The problem is we declare two structures and a large array on the stack, I move the array alway from the stack and allocate memory for it dynamically. Signed-off-by: Fang Wenqi Signed-off-by: Miklos Szeredi commit b21dda438baa450a76a375a35653ae0377793fab Author: Miklos Szeredi Date: Fri Feb 5 12:08:31 2010 +0100 fuse: cleanup in fuse_notify_inval_...() Small cleanup in fuse_notify_inval_inode() and fuse_notify_inval_entry(). Signed-off-by: Miklos Szeredi commit b06ede84dd1473dec7c6af03a41c8d04d2fee437 Author: Paul Mundt Date: Fri Feb 5 17:45:14 2010 +0900 sh: Fix up hp6xx build. With the sparseirq conversion there was a stray irq_desc reference left over, this tidies it up and brings the demuxer in line with what the solution engine boards are doing. Signed-off-by: Paul Mundt commit 794d6206508673d7c7426976d4e78e6af10b3e4f Merge: cec27c8 9492837 Author: Takashi Iwai Date: Fri Feb 5 09:09:25 2010 +0100 Merge branch 'fix/hda' into topic/hda commit 350a514787a4516746f738f69bff6aa0d4ac70e9 Author: Sebastien Alaiwan Date: Fri Feb 5 08:58:20 2010 +0100 ALSA: ice1712: fix: lock samplerate when samplerate locking is enabled I found that the sampling rate locking setting of the ice1712 sound driver was only half-respected : when the driver was locked to, let's say, 44100Hz, and a usermode app was requesting 48000Hz playback, the request was succesful although the soundcard would continue to run at 44100Hz. Here's a patch that will make those requests to fail. Signed-off-by: Sebastien Alaiwan Signed-off-by: Takashi Iwai commit 5ecaafdbf44b1ba400b746c60c401d54c7ee0863 Author: Masami Hiramatsu Date: Fri Feb 5 01:24:34 2010 -0500 kprobes: Add mcount to the kprobes blacklist Since mcount function can be called from everywhere, it should be blacklisted. Moreover, the "mcount" symbol is a special symbol name. So, it is better to put it in the generic blacklist. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Steven Rostedt LKML-Reference: <20100205062433.3745.36726.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7 Author: Paul Mundt Date: Fri Feb 5 16:11:25 2010 +0900 sh: Fix an off-by-1 in SH7780 PCIC memory resource mapping. Signed-off-by: Paul Mundt commit f40a70861ace69001524644473cc389543b06c3c Author: Kees Cook Date: Thu Feb 4 14:28:06 2010 -0800 syslog: clean up needless comment Drop my typoed comment as it is both unhelpful and redundant. Signed-off-by: Kees Cook Acked-by: Serge Hallyn Signed-off-by: James Morris commit b405e8df26dfe4c56ab3f88f5cc1dfab0d220289 Author: David S. Miller Date: Thu Feb 4 22:31:41 2010 -0800 e1000e: Fix namespace conflicts wrt. e1000_has_link Reported by Stephen Rothwell. Signed-off-by: David S. Miller commit e233230f9c8f02d4c3a643ec5067ca21bc90ee9a Author: Nicolas Pitre Date: Fri Feb 5 00:24:33 2010 -0500 [ARM] orion5x: update defconfig Signed-off-by: Nicolas Pitre commit f123560a07313218108d3cc652af99eaaf04d67f Author: Nicolas Pitre Date: Thu Feb 4 23:27:23 2010 -0500 [ARM] Kirkwood: update defconfig Signed-off-by: Nicolas Pitre commit 1961528959aa523a351b49236f8627b30793ee80 Author: Nicolas Pitre Date: Fri Feb 5 00:20:24 2010 -0500 [ARM] orion5x: fix some improper includes in Linkstation files ... and replace misuse of arch_reset() with arm_machine_restart(). Signed-off-by: Nicolas Pitre commit 2d18638ec010a2ed1daa08b4774ed12108647a53 Author: Zhu Qingsen Date: Thu Feb 4 19:33:27 2010 -0800 [ARM] Orion: Add Buffalo Linkstation LS-HGL support Signed-off-by: Zhu Qingsen Signed-off-by: Nicolas Pitre commit b2fdb5660fccc060e47658baad8911a963397ced Author: Alexander Clouter Date: Mon Jan 18 23:38:19 2010 +0000 [ARM] kirkwood: combine support for openrd base/client support Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together. Signed-off-by: Alexander Clouter Acked-by: Simon Kagstrom Signed-off-by: Nicolas Pitre commit 639b9be60ec2045a0a59b2ea33479937c4b5acef Author: H Hartley Sweeten Date: Fri Jan 29 15:30:53 2010 -0700 mach-dove/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Signed-off-by: Nicolas Pitre commit 5a6f98f5bff7f975c61d56b5c756b5a96c4db167 Author: Alex Deucher Date: Tue Dec 22 15:04:48 2009 -0500 drm/radeon/kms: add radeon i2c algo Currently just a wrapper around bit algo Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 570930fe1ee497de6aafd895dbe80116cb10525f Author: Herbert Xu Date: Thu Feb 4 20:28:48 2010 -0800 bridge: Remove unused age_list This patch removes the unused age_list member from the net_bridge structure. Signed-off-by: Herbert Xu Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit bfd5f4a3d605e0f6054df0b59fe0907ff7e696d3 Author: Sridhar Samudrala Date: Thu Feb 4 20:24:10 2010 -0800 packet: Add GSO/csum offload support. This patch adds GSO/checksum offload to af_packet sockets using virtio_net_hdr. Based on Rusty's patch to add this support to tun. It allows GSO/checksum offload to be enabled when using raw socket backend with virtio_net. Adds PACKET_VNET_HDR socket option to prepend virtio_net_hdr in the receive path and process/skip virtio_net_hdr in the send path. This option is only allowed with SOCK_RAW sockets attached to ethernet type devices. v2 updates ---------- Michael's Comments - Perform length check in packet_snd() when GSO is off even when vnet_hdr is present. - Check for SKB_GSO_FCOE type and return -EINVAL - don't allow tx/rx ring when vnet_hdr is enabled. Herbert's Comments - Removed ethernet specific code. - protocol value is assumed to be passed in by the caller. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 8e04221029067cbaff3fc8f4daf991532afbcbaf Merge: 9ad62ec 2c940db Author: Paul Mundt Date: Fri Feb 5 12:16:39 2010 +0900 Merge branch 'sh/stable-updates' commit 3e3e65fc425588a4a4b9143d7dfe40e52a2bf0be Author: H Hartley Sweeten Date: Fri Jan 29 14:43:52 2010 -0800 mach-kirkwood/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit ef4a6777cf33c4a7a76e74ecd593f74a1df30b96 Author: H Hartley Sweeten Date: Fri Jan 29 14:56:58 2010 -0800 mach-orion5x/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 746079dabcf74be2a16dc983ac597156e3d2e051 Author: Breno Leitao Date: Thu Feb 4 10:11:19 2010 +0000 qlge: Code clean up Just reordering this assignment that doesn't depend on any condition. Signed-off-by: Breno Leitao Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit e0fee99fce97af37b1db6ed8dd6951fb9a8d7201 Author: Breno Leitao Date: Thu Feb 4 10:11:18 2010 +0000 qlge: removing unreachable block of code Currently the qlge_change_mtu() is never called if the new_mtu is equal current MTU, due this condition on dev_set_mtu(): if (new_mtu == dev->mtu) return 0; So, this block of code is never reached and is being removed. Signed-off-by: Breno Leitao Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit d088dde7b19628f386c486f16cd471f5b5682ca8 Author: Christoph Egger Date: Wed Feb 3 06:05:54 2010 +0000 ipv4: obsolete config in kernel source (IP_ROUTE_PERVASIVE) CONFIG_IP_ROUTE_PERVASIVE is missing a corresponding config IP_ROUTE_PERVASIVE somewhere in KConfig (and missing it for ages already) so it looks like some aging artefact no longer needed. Therefor this patch kills of the only remaining reference to that config Item removing the already unrechable code snipet. Signed-off-by: Christoph Egger Signed-off-by: David S. Miller commit b0f83b280fcfa9cdd66b748f0c12fb26ce69e391 Author: Brian Haley Date: Thu Feb 4 13:36:50 2010 -0800 doc: document IPv6 parameters Update documentation to describe IPv6 parameters. Reported by . Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 15c052fc7f4a1b3544602be8af77e31bba9261bf Author: Ron Mercer Date: Thu Feb 4 13:32:46 2010 -0800 qlge: Add watchdog timer. Add periodic heartbeat register read to trigger the eeh recovery process. We see cases where an eeh error was injected and the slot was suspended. An asic access attempt is required to flush the recovery process, but without interrupts the process can stall. Adding this periodic register read causes the recovery process to begin. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 08aca087f263e8089420b2723fe0c1a0cbe5de0c Author: Kevin Hilman Date: Mon Jan 11 08:22:23 2010 -0800 davinci: clkdev cleanup: remove clk_lookup wrapper, use clkdev_add_table() Remove unneeded 'struct davinci_clk' wrapper around 'struct clk_lookup' and use clkdev_add_table() to add the list of clocks in one go. Signed-off-by: Kevin Hilman commit e89861e9b44fcd606cdade6230eb0037ad5911bf Author: Miguel Aguilar Date: Thu Jan 21 11:41:51 2010 -0600 DaVinci: DM365: Voice codec support for the DM365 SoC This patch adds the generic Voice Codec support for the DM365 based platforms. Signed-off-by: Miguel Aguilar Acked-by: Mark Brown Signed-off-by: Kevin Hilman commit 3b43cd6f2dcbf871b8cabe16ae4ac8c036c959ac Author: Sekhar Nori Date: Tue Jan 12 18:55:35 2010 +0530 davinci: clock: let clk->set_rate function sleep When supporting I2C/SPI based on-board PLLs like CDCE949, it is essential that clk->set_rate be able to sleep. Currently, this is not possible because clk->set_rate is called from within spin-lock in clk_set_rate This patch brings clk->set_rate outside of the spin-lock and lets the individual set_rate implementations achieve serialization through appropiate means. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 00642f6616a0d1893ab1dcfec4d833210f310e95 Author: Philby John Date: Mon Jan 11 15:53:31 2010 +0530 Add SDA and SCL pin numbers to i2c platform data Patch adds SDA and SCL pin numbers to the i2c platform data structure for Davinci DM355 and DM6446. This at present is used for i2c bus recovery. TODO: Add SDA and SCL pin number information to include all Davinci platforms such as dm355-leopard, dm365, dm646x, da8xx etc. Signed-off-by: Philby John Signed-off-by: Kevin Hilman commit 3f995f2fd7e0814630f55be37c650a5983e4077e Author: Sudhakar Rajashekhara Date: Wed Jan 6 17:30:06 2010 +0530 davinci: da8xx/omap-l1xx: Add EDMA platform data for da850/omap-l138 Currently da850/omap-l138 supports only one channel controller instance of EDMA though EDMA driver as such supports multiple channel controller instances. This patch adds platform data for the 2nd EDMA channel controller. As, the platform data differ between da830/omap-l137 and da850/omap-l138, existing code has been re-shuffled to accommodate this. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit f900d552f95a009e4c4910aff7acbd45f952aa2e Author: Sudhakar Rajashekhara Date: Wed Jan 6 17:29:49 2010 +0530 davinci: build list of unused EDMA events dynamically Currently, the edma_noevent list is passed from platform data. But on some architectures, there will be many EDMA channels which will not be used at all. This patch scans all the platform devices and then builds a list of events which are not being used. The unused event list will be used to allocate EDMA channels in case of EDMA_CHANNEL_ANY usage instead of the edma_noevent being used earlier for this purpose. This patch is based on David Brownells's suggestion at http://article.gmane.org/gmane.linux.davinci/15176. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 447f18f1b4a3e86159353d016dcaac25414b3a42 Author: Sudhakar Rajashekhara Date: Wed Jan 6 17:29:11 2010 +0530 davinci: Fix edma_alloc_channel api for EDMA_CHANNEL_ANY case Though edma_alloc_channel api was looping through the available channel controllers in EDMA_CHANNEL_ANY case, it was never returning the channel for 2nd channel controller, if 1st channel controller had no free channels. This issue has been fixed with this patch. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 2d517508060c22ef371a61495773cf890def291a Author: Sudhakar Rajashekhara Date: Wed Jan 6 17:28:44 2010 +0530 davinci: Keep count of channel controllers on a platform Some architectures have only one channel controller, but the edma_alloc_channel api loops twice to findout the free channel available in EDMA_CHANNEL_ANY case. A new variable has been introduced to keep count of number of channel controllers being used on a particular architecture. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 0e6cb8d296308a75e4047fabc752731ff7836182 Author: Sudhakar Rajashekhara Date: Wed Jan 6 17:28:36 2010 +0530 davinci: Correct return value of edma_alloc_channel api Currently, edma_alloc_channel api is returning the channel number without prepending the controller on which the channel was allocated. So, if a channel is allocated on 2nd controller, calls subsequent to edma_alloc_channel would never know that channel was allocated on the 2nd controller, and continue to operate on 1st controller, resulting in edma failure. This patch fixes this issue. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 77a92c710b65864fe07491864f3bbac9fbac51bc Author: Nageswari Srinivasan Date: Wed Jan 6 17:19:49 2010 +0530 davinci: add CDCE949 support on DM6467 EVM This patch adds the CDCE949 reference oscillator to the davinci clock list. On the DM6467T EVM, the CDCE949 is responsible for generating the pixel clock for display. On the DM6467 EVM, this pixel clock was being obtained from an internal source. This is not possible on the DM6467T EVM because of the presence of a 33MHz oscillator. The TSIF module also requires the CDCE949 to generate the data clocks. The actual clock definitions will be added by patches adding support for DM6467T VPIF and TSIF. This patch mearly lays the foundation for that work. Signed-off-by: Nageswari Srinivasan Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 5b8972d1b6461d0081d2d49dde4d129290da26f0 Author: Nageswari Srinivasan Date: Wed Jan 6 17:19:48 2010 +0530 davinci: add support for CDCE949 clock synthesizer This patch adds support for TI's CDCE949 - a clock synthesizer with 4 PLLs and 9 outputs. It is used on DM6467 EVM. On the EVM, it generates clocks required for VPIF, TSIF and Audio modules. This patch adds it as part of the DaVinci clock framework. Testing: The various frequency outputs on Y1 have been tested using a out-of-tree VPIF video driver supporting HD video. The register values for Y5 frequency outputs have been derived from TSIF driver sources in MontaVista LSP kernel, but actual output has not been tested for lack of TSIF driver which actually works on the latest kernel. Signed-off-by: Nageswari Srinivasan Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 635344436385bbdca24b57ef14f2dde53e9af082 Author: Sekhar Nori Date: Thu Dec 17 18:29:33 2009 +0530 davinci: da850/omap-l138 EVM: register for suspend support Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 044ca01521d077a35b46a445b02b93f413109a4b Author: Sekhar Nori Date: Thu Dec 17 18:29:32 2009 +0530 davinci: da850/omap-l138: add support for SoC suspend This patch adds support for registering for suspend-to-RAM functionality on da850/omap-l138 SoCs. da850 supports wakeup based on external event and RTC alarm. Currently only RTC alarm based wakeup is supported. Support for wakeup based on external event will be added as later improvements. For scheduling an alarm event on RTC some useful code is present in Documentation/rtc.txt Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit efc1bb8a6fd56f6df5b797dff5156c935175c319 Author: Sekhar Nori Date: Thu Dec 17 18:29:31 2009 +0530 davinci: add power management support This patch adds core power management (suspend-to-RAM) support for DaVinci SoCs. The code depends on the the "deepsleep" feature to suspend the SoC and saves power by gating the input clock. The wakeup can be based on an external event as supported by the SoC. Assembly code (in sleep.S) is added to aid gating DDR2 clocks. Code doing this work should not be accessing DDR2. The assembly code is relocated to SRAM by the code in pm.c The support has been validated on DA850/OMAP-L138 only though the code is (hopefully) generic enough that other SoCs supporting deepsleep feature simply requires SoC specific code to start using this driver. Note that all the device drivers don't support suspend/resume still and are being worked on. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 7307d093e6f05d845fc5ce47893c391c819a5c2b Author: Sandeep Paulraj Date: Tue Dec 15 14:05:43 2009 -0500 DaVinci: DM365: Changing default queue for DM365. In DM365 Q0, Q1 and Q2 are used by codecs. LSP drivers should use Q3. This patch changes the default queue for DM365. Signed-off-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 679f9218cac9e7d63ae3868c0c71b45b1ba5f766 Author: Chaithrika U S Date: Tue Dec 15 18:02:58 2009 +0530 davinci: clock: Check CLK_PSC flag before disabling PSC Some modules do not have PSC to control their clocks. The 'lpsc' field in the clk structure is 0 for such clocks. In the clock disable function check for CLK PSC flag before disabling the PSC. If this is not taken care of then it may so happen that module controlled by LPSC 0 is erroneously disabled. Signed-off-by: Chaithrika U S Signed-off-by: Kevin Hilman commit ad021ae8862209864dc8ebd3b7d3a55ce84b9ea2 Author: Sriramakrishnan Date: Thu Nov 19 15:58:27 2009 +0530 TI Davinci EMAC : Abstract Buffer address translation logic. When programming the DMA engine, the next pointers must be programmed with physical address as seen from the DMA master address space. This address may be different from physical address of the buffer RAM area. This patch abstracts the buffer address translation logic. Signed-off-by: Sriramakrishnan Acked-by: Chaithrika U S Acked-by: David S. Miller Signed-off-by: Kevin Hilman commit 01a9af36cd9d25fc71e28192974732d8053bd1c0 Author: Sriramakrishnan Date: Thu Nov 19 15:58:26 2009 +0530 TI Davinci EMAC : add platform specific interrupt enable/disable logic. On certain SOCs, the EMAC controller is interfaced with a wrapper logic for handling interrupts. This patch implements a platform specific hook to cater to platforms that require custom interrupt handling logic Signed-off-by: Sriramakrishnan Acked-by: Chaithrika U S Acked-by: David S. Miller Signed-off-by: Kevin Hilman commit 8ee2bf9ab792d0c02b13ca3acbd036debb7745d9 Author: Sriramakrishnan Date: Thu Nov 19 15:58:25 2009 +0530 TI Davinci EMAC : Re-use driver for other platforms. The davinci EMAC peripheral is also available on other TI platforms -notably TI AM3517 SoC. This patch modifies the config option and the platform structure header files so that the driver can be reused on non-davinci platforms as well. Signed-off-by: Sriramakrishnan Acked-by: Chaithrika U S Acked-by: David S. Miller Signed-off-by: Kevin Hilman commit fc42e335ee6a7dd1f740c0fc868d607cc689d7c4 Author: Sudhakar Rajashekhara Date: Wed Nov 18 12:11:41 2009 +0530 davinci: da850/omap-l138: Enable 4-bit ecc This patch initializes the platform data to enable 4-bit ecc support on DA850/OMAP-L138. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit e2abd5a282b2b146aeae7515fb42c3dbd2ff7204 Author: Sudhakar Rajashekhara Date: Wed Nov 18 11:48:37 2009 +0530 davinci: da850/omap-l138: Modify NOR partition info On DA850/OMAP-L138, NOR flash partition was starting from offset ZERO erasing the UBL and u-boot when the complete NOR is erased. This patch moves the start of the partition to 512K, after the bootloaders and u-boot env variables. This patch also creates a new partition on NOR Flash to store Linux kernel image. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 2f72e8dcc5f528976a8cd631b44dffae0591612a Author: Sekhar Nori Date: Thu Dec 3 15:36:52 2009 +0530 davinci: move /proc/davinci_clocks to debugfs Move /proc/davinci_clocks to /sys/kernel/debug/davinci_clocks (debugfs). debugfs is more suited for this since the clock dump is debug information. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit f979aa6e17fe11fb7b603992c742898175327499 Author: Sekhar Nori Date: Thu Dec 3 15:36:51 2009 +0530 davinci: make /proc/davinci_clocks display multi-rooted clock tree This patch modifies clock dump to take care of clock tress rooted at multiple oscillators. Current code assumes the entire tree is rooted on a single oscillator. When using off-chip clock synthesizers, some of the clocks can be obtained from a different on-board oscillator. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit c1978e1dfb3d171010f6a22eb0a9eed89a245666 Author: Sekhar Nori Date: Tue Nov 24 18:25:15 2009 +0530 davinci: add support for DM6467T EVM DM6467T (T for Turbo) is a newer and faster DM6467 part from TI. The new part supports 1080p video and has the ARM running at 495MHz. More SoC information: http://focus.ti.com/docs/prod/folders/print/tms320dm6467t.html Spectrum Digital, Inc has a new EVM for this part. It is _mostly_ same as the older DM6467 EVM except for a 33MHz crystal input and THS8200 video encoder for 1080p support. The meat of this patch is dedicated to initializing the crystal frequency from EVM board file. Additional notes: I did consider some alternative ways to make the crystal input board specific including - (1) having board code initialize the crystal frequency using the first member of soc_info->cpu_clks array (2) introducing a new ref_clk_rate member in soc_info structure. But, the current way seems to be the simplest and least intruding considering that both the clock array and SoC info structure are actually private to the SoC file. Also the fact that davinci_common_init() initializes both the soc_info and clocks in one go. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit b73b526ec36068b102e735064b61dc724d45d2db Author: Sekhar Nori Date: Tue Nov 24 18:25:14 2009 +0530 davinci: board-dm646x-evm.c: arrange related code together Currently all the #defines and static variables in the board-dm646x-evm.c file are located right at the start of the file because of which the related code is not together - making reading the code difficult. This patch moves around the code keeping related code together. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 5b5052e32dc53e6e76da188c547f14c4e5e35624 Author: Sekhar Nori Date: Mon Nov 23 15:27:15 2009 +0530 davinci: explain CLOCK_TICK_RATE of 27MHz in include/mach/timex.h Leave a comment explaining the constant value of 27Mhz used in include/mach/timex.h for all DaVinci platforms. Many of the platforms actually run at 24MHz timer frequency (Eg. EVMs of DM355, DM365 and OMAP-L1). The comment also serves as a porting alert. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 60cd02e1f4a1574c26c9ae8d29d63bd3d179c0c2 Author: Sekhar Nori Date: Mon Nov 16 17:21:39 2009 +0530 davinci: da850/omap-l138: create static map for SRAM Create static map for internal SRAM and populate SRAM base and size in soc_info structure to allow SRAM allocation functions from arch/arm/mach-davinci/sram.c to work. On DA850 SRAM is used for suspend-to-RAM implementation in places where DDR2 cannot be accessed as its clocks are stopped. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 7aad472bb5602242113718fc170e61b127460cbe Author: Sekhar Nori Date: Mon Nov 16 17:21:38 2009 +0530 davinci: da850/omap-l138: unlock PLL registers during init On omap-l1 devices the PLL registers can be locked from writes. Currently the cpufreq rate setting code unlocks PLL0 before the write actually happens. With suspend support getting added PLL1 registers need be be unlocked as well. To facilitate this, unlock both PLLs during the init time itself. This also obviates the need to unlock PLL registers for each CPUFreq transtition. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 948c66df0d5e23dbcb84bee39a11b56c8a0d3e41 Author: Sekhar Nori Date: Mon Nov 16 17:21:37 2009 +0530 davinci: cpuidle: move mapping of DDR2 controller registers out of driver When suspend is supported, both cpuidle and suspend code need to work on DDR2 registers. Instead of mapping the DDR2 registers twice, do it once outside of cpuidle driver and let cpuidle driver get the virtual base address of DDR2 registers. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit e2da3aaa4254d9e79d9524190fc7e5f0cbdc3c33 Author: Sekhar Nori Date: Mon Nov 16 17:21:36 2009 +0530 davinci: make it possible to include clock.h and psc.h in assembly code psc.h contains register defines for PSC module which need to be accessed in assembly code which helps the DA850/OMAP-L138 SoC go to sleep. Shutting down DDR clock using PSC is a part of the sleep procedure. Also, the PLL related hardware definitions in clock.h are needed in assembly code to bypass the DDR2 PLL. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit c94fa15ba2d736af786ac1e56686d41987b1aba0 Author: Sekhar Nori Date: Mon Nov 16 17:21:35 2009 +0530 davinci: move PSC register definitions from psc.c to psc.h The motivation behind the change is to use the same definitions in the assembly code responsible for suspending the SoC, a part of which is to clock gate the DDR2 clock. Note that the assembly code cannot invoke the C function meant for this. The main reason being that stack in DDR2 cannot be accessed while DDR2 clock is being clock gated. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 7ec4b24326ec9b0467ab23b0417ec6b63e8e5524 Author: Sekhar Nori Date: Mon Nov 16 17:21:34 2009 +0530 davinci: move DDR2 controller defines to memory.h Move defintions of DDR2 controller registers to memory.h from cpuidle.c. The motivation behind the change is to be able to use these defintions in assembly code that puts DDR2 in self-refresh and enables the SoC to enter suspend state. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 9a219a9ecf49ab156df4c18267ade4d468d9930e Author: Sekhar Nori Date: Mon Nov 16 17:21:33 2009 +0530 davinci: move PLL wait time values to clock.h As suspend support is added, the code supporting the suspend operation needs to bypass PLLs and needs to access the same wait time values as the PLL code in clock.c. To facilitate this, move the PLL wait times to clock.h where they can be accessed by suspend code. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit d2de05827cce9438dfc61d5a4cf13b6ca82ebdee Author: Sekhar Nori Date: Mon Nov 16 17:21:32 2009 +0530 davinci: da8xx/omapl1: add support for the second sysconfig module OMAP-L138 adds a second SYSCFG region having useful functionality like deep sleep, pull up/down control and SATA clock stop. This patch makes provision for accessing registers from second SYSCFG region in da8xx code. Note that OMAP-L137 has a single SYSCFG region. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit f2a4c59df62f4493c7cf7dfd349ec66bdd4b9fec Author: Murali Karicheri Date: Mon Feb 1 17:38:53 2010 -0500 DaVinci - Adding platform & board changes for vpfe capture on DM365 This patch adds following changes:- 1) add sub device configuration data for TVP5146 used by vpfe capture 2) registers platform devices for vpfe_capture, isif and vpss 3) defines hardware resources for the devices listed under 2) 4) defines clock aliase for isif driver 5) adding setup_pinmux() for isif Signed-off-by: Murali Karicheri Signed-off-by: Kevin Hilman commit cb2dc111b156eb41f61ed4e5b3a3a5df90526d9d Author: Sascha Hauer Date: Thu Feb 4 14:32:53 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit ee14373cdc91fbc9ad8db0bf38e28d58f577b181 Author: Sascha Hauer Date: Thu Feb 4 09:32:44 2010 +0100 i.MX31 pcm037: Add USB support Signed-off-by: Sascha Hauer commit f8f76db1db369f3a130ac3fd33e2eee5f1610d9c Author: Jiri Pirko Date: Thu Feb 4 10:23:02 2010 -0800 libphy: add phy_find_first function Many drivers do this in them manually. Now they can use this function. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6683ece36e3531fc8c75f69e7165c5f20930be88 Author: Jiri Pirko Date: Thu Feb 4 10:22:25 2010 -0800 net: use helpers to access mc list V2 This patch introduces the similar helpers as those already done for uc list. However multicast lists are no list_head lists but "mademanually". The three macros added by this patch will make the transition of mc_list to list_head smooth in two steps: 1) convert all drivers to use these macros (with the original iterator of type "struct dev_mc_list") 2) once all drivers are converted, convert list type and iterators to "struct netdev_hw_addr" in one patch. >From now on, drivers can (and should) use "netdev_for_each_mc_addr" to iterate over the addresses with iterator of type "struct netdev_hw_addr". Also macros "netdev_mc_count" and "netdev_mc_empty" to read list's length. This is the state which should be reached in all drivers. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit d91a8910d9585950706536a643ece51b67c695ec Author: Russell King Date: Thu Feb 4 18:13:17 2010 +0000 ARM: Fix badly placed nuc932 Kconfig entry Signed-off-by: Russell King commit c72881e8377ca713427486add16fc63256f0231b Author: Linus Walleij Date: Thu Feb 4 12:50:13 2010 +0100 ARM: 5914/1: Modify PL031 for Nomadik and U8500 v2 This extends the existing PrimeCell PL031 driver with support for the ST Microelectronics and ST-Ericsson derivatives, in a first and second version as used on the Nomadik and U8500 platforms. It also rids the old ioctl() alarm on/off functions in favor of the new .alarm_irq_enable field of the RTC class ops. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit d48a41c181c8abdb8b09f746e02839c6161dc3ea Author: Srinidhi Kasagar Date: Wed Feb 3 13:02:48 2010 +0100 ARM: 5913/1: ARM U8500: add I2C platform configurations This adds platform configurations to support four i2c controllers found on early MOP500 platform This depends on the patch 5908/1 for build to succeed. Signed-off-by: Srinidhi Kasagar Signed-off-by: Russell King commit e208c447bd728920e4f3d438a706344ea31249b9 Author: Srinidhi Kasagar Date: Mon Feb 1 14:58:22 2010 +0100 ARM: 5908/1: nomadik: add platform specific i2c configuration This adds the platform specific i2c configuration data structures to setup the nomadik/ux500 i2c block. Signed-off-by: srinidhi kasagar Signed-off-by: Russell King commit 8e58ed34d926d89969796a0832ab38381a4c90ed Author: Linus Walleij Date: Thu Feb 4 12:50:58 2010 +0100 ARM: 5915/1: Add RTC PL031 derivative platform config for ux500 This configures the PL031 RTC resources for ux500. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit c2c3489c5b0fdb8fbf0f5e9424905c2994ab5660 Author: Thadeu Lima de Souza Cascardo Date: Thu Feb 4 13:36:24 2010 -0200 HID: use multi input quirk for TouchPack touchscreen This device generates ABS_Z and ABS_RX events, while it should be generating ABS_X and ABS_Y instead. Using the MULTI_INPUT quirk solves this issue. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Daniel Oliveira Nascimento [jkosina@suse.cz: fixed blacklist ordering while resolving conflict] [jkosina@suse.cz: fixed typo to make it compile] Signed-off-by: Jiri Kosina commit 1b924032533033a4dae1a239981677bdae21949b Author: Giuseppe Cavallaro Date: Thu Feb 4 09:33:21 2010 -0800 stmmac: fix 'lenght' typo in comments and code Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit ae06b8330aefb0338017c427d5694fc8ea9144c8 Author: Thadeu Lima de Souza Cascardo Date: Thu Feb 4 09:21:28 2010 -0800 can: ems_usb: removed duplicated code setting local echo support Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: David S. Miller commit 10be7eb36b93364b98688831ee7d26f58402bb96 Merge: 90c3033 5ffaf8a Author: David S. Miller Date: Thu Feb 4 08:58:14 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 773f206b2f3745bde8ee17ec0f884c19db3917a5 Author: Sascha Hauer Date: Wed Feb 3 17:13:41 2010 +0100 i.MX27 pcm038: Add USB support Signed-off-by: Sascha Hauer commit eee7c497d250bbb2bfd0fdc2b41b9b6ff02148a2 Author: Sascha Hauer Date: Wed Feb 3 17:13:29 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit d186f04c17d86e587e72bc402302df56a9b820f3 Author: Sascha Hauer Date: Thu Feb 4 14:34:48 2010 +0100 i.MX35: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 9cf945cbef42a4524b6a58486bd8bfb96640e97f Author: Sascha Hauer Date: Thu Feb 4 14:45:41 2010 +0100 i.MX27: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 84ab80616b0eb5fac4d1970f10ea1b3cf75280e1 Author: Sascha Hauer Date: Thu Feb 4 14:45:11 2010 +0100 i.MX ehci platform support: Some fixes - The SIC mask is only 2bits wide, not 4 - MX31_OTG_PM_BIT and MX31_H1_PM_BIT use negative logic - clear MX31_H1_DT_BIT and MX31_H2_DT_BIT so that they can be cleared, not only set. - return -EINVAL if called with an invalid controller number Signed-off-by: Sascha Hauer Cc: Daniel Mack commit ba593e5966440deec8684863e0cba9b502c4a377 Author: Sascha Hauer Date: Thu Feb 4 14:40:59 2010 +0100 fsl_mx3_udc: Add i.MX35 support The i.MX35 works fine with this driver, but we do not have the usb_ahb clock. Signed-off-by: Sascha Hauer Cc: Guennadi Liakhovetski commit cec27c891b805b2ab2302f9fcbdacb6f179ac0d4 Author: Kailang Yang Date: Thu Feb 4 14:18:18 2010 +0100 ALSA: hda - Add support of ALC665 - Add support for ALC665 - Add more ASUS model - Modify common patch for ALC272 ALC273 ALC661 ALC662 ALC663 ALC665 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 84898e87cc0fff976202d5b91656f2db949fc2dd Author: Kailang Yang Date: Thu Feb 4 14:16:14 2010 +0100 ALSA: hda - Add ALC269VB support - Add new models ALC269VB_AMIC ALC269VB_DMIC - Add alc269vb_laptop_dmic_setup The record source index Dmic is 0x6 for ALC269VB. - Change eeepc words for ALC269 - Modify init_verb tables of patch_alc269 patch_alc662 patch_alc882 - Modify common patch for ALC270 ALC269VB ALC275 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 88102f3f841b680412714d0b0b7da33c2a00c1f9 Author: Kailang Yang Date: Thu Feb 4 14:12:58 2010 +0100 ALSA: hda - Remove superfluous init verb entries for ALC88[235] The default values are no need to be set in init_verbs. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit e34b7005e5f55a55964c13ec9784e8e2b427a83c Author: Jasper Spaans Date: Fri Nov 20 14:20:05 2009 +0100 arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code Make the comment match the code, this also holds for intel systems, according to probe_64.c in the same directory. Signed-off-by: Jasper Spaans Signed-off-by: Jiri Kosina commit 5d93a14241bf5ba299422440bc366ec43970c002 Author: Shaun Patterson Date: Sat Dec 5 22:30:52 2009 -0500 vmiclock: fix comment spelling mistake Signed-off-by: Shaun Patterson Signed-off-by: Jiri Kosina commit 640462cbd659990bcceaf86ab17ccbc02147e62a Author: Rudy Matela Date: Wed Dec 9 11:35:40 2009 -0300 Coding style correction of some wan drivers Added a space separating some if/switch/while keywords from the following parenthesis to conform to the CodingStyle. Signed-off-by: Rudy Matela Acked-by: Krzysztof Halasa Signed-off-by: Jiri Kosina commit 7e2a10836c0455cb3ca397f89b8280496148d571 Author: Julia Lawall Date: Thu Nov 12 23:08:36 2009 +0100 fs/qnx4: decrement sizeof size in strncmp As an identical match is wanted in this case, strcmp can be used instead. The semantic match that lead to detecting this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression foo; constant char *abc; @@ *strncmp(foo, abc, sizeof(abc)) // Signed-off-by: Julia Lawall Signed-off-by: Anders Larsen Signed-off-by: Jiri Kosina commit fe9a2302230fa287715a11a3d3aec74eec75a6a4 Author: Ali Gholami Rudi Date: Sun Nov 8 19:29:23 2009 +0330 doc: fix checking socket() in net tstamp example Signed-off-by: Ali Gholami Rudi Acked-by: Patrick Ohly Signed-off-by: Jiri Kosina commit edf86baae2e92bc03615086b2a341cd6d56c20f2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:41 2009 -0500 Fix misspellings of "separate" in strings. Some string messages misspell "separate"; this fixes them. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 2a61aa401638529cd4231f6106980d307fba98fa Author: Adam Buchbinder Date: Fri Dec 11 16:35:40 2009 -0500 Fix misspellings of "invocation" in comments. Some comments misspell "invocation"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c41b20e721ea4f6f20f66a66e7f0c3c97a2ca9c2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:39 2009 -0500 Fix misspellings of "truly" in comments. Some comments misspell "truly"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit a089377f29d3af0f62f3bdc6db0c5042513fc3f3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:38 2009 -0500 Fix misspelling of "truly" in a label. A label reads 'truely_dead' rather than 'truly_dead'; this fixes it. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 303863f43fa5106637325a213717b2f306e2efc3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:37 2009 -0500 Fix a grammar error (redundant "be") in comment Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c14e522b1aab6a1a3765db182aacca4f359f6d91 Author: Sebastian Andrzej Siewior Date: Wed Dec 16 23:13:44 2009 +0100 tree wide: remove execute flag from .c files Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Jiri Kosina commit c5c7b32d3c67049ab4e509d0e8bf93811c433dfb Author: Geert Uytterhoeven Date: Sun Dec 13 20:07:31 2009 +0100 ataflop: Killl warning about unused variable flags After commit e0c0978699a83f26f2341f7eedc1463b79e31aff ("ataflop: remove buggy/commented-out IRQ disable from do_fd_request()") the `flags' variable became unused: drivers/block/ataflop.c:1473: warning: unused variable 'flags' Hence remove it. Signed-off-by: Geert Uytterhoeven Signed-off-by: Jiri Kosina commit cb67286d6629ecb5bfc44071d664cf1cbd01a350 Author: Peter Ujfalusi Date: Thu Feb 4 09:10:10 2010 +0200 ASoC: TWL4030: Module unloading fix The module unloading path had several problems: - it freed up the private structure twice - it freed up the codec structure, which was allocated as part of the private structure - it did not freed up the reg_cache - it did not unregistered the dais and the codec Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8c1264740e7c9688c5d11b96d26e4393618ef60e Author: Mark Brown Date: Wed Feb 3 19:33:49 2010 +0000 ASoC: Add WM8912 DAC support The WM8912 is a DAC only device register compatible with the WM8904 CODEC with ADC portions omitted. Support it within the WM8904 driver based on the configured I2C device name. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e4bc669610d75106a00b0f96f2410ac5898ef1ca Author: Mark Brown Date: Wed Feb 3 19:51:33 2010 +0000 ASoC: Optimise WM8904 output stage power control Handle the output PGAs as part of the output powerup since they can never be powered separately and reorder things so that we remove the output shorts after both line and headphone outputs have been brought up, minimising the opportunity for any issues. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c133421800d9d1dfec0c98de6c9da0a7a99e0573 Author: Mark Brown Date: Tue Jan 26 22:37:11 2010 +0000 ASoC: Add support for BIAS_OFF when idle to WM8904 As well as disabling the biases of the CODEC the drop into BIAS_OFF will also disable all the regulators powering the CODEC, allowing even greater power savings on appropriately configured systems. Since the regulator API does not currently provide notification when regulators are disabled we assume that this always happens when we stop using the regulators. Once 2.6.34 is merged this code can be optimised to only sync the cache when power was actually removed. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit cf56f62746c3e2f70bfad3d6fd051427a0022368 Author: Mark Brown Date: Wed Feb 3 17:55:55 2010 +0000 ASoC: Disable WM8993 regulators when turning bias off While the regulators are disabled we cache all register writes. Currently we assume that the regulator disable actually takes effect, after the merge with the regulator tree in 2.6.34 the regulator API will be able to notify us if the power is actually removed (due to constraints or regulator sharing it may not be). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b37e399bfc7fcb5b523e3e2e74686c8cc95c0cba Author: Mark Brown Date: Wed Feb 3 11:51:42 2010 +0000 ASoC: Initial WM8993 regulator API hookup At the minute the regulators are simply enabled for the entire lifetime of the device. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3bf6e4217e3c69438f6dc41a009664107eb27ab1 Author: Mark Brown Date: Mon Feb 1 19:05:09 2010 +0000 ASoC: Convert WM8993 to use shared cache I/O code Saves a little bit of code duplication. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a3032b47c46920ed3f2fd58e64f484e3dab49f23 Author: Mark Brown Date: Mon Feb 1 18:48:03 2010 +0000 ASoC: Add a cache_sync bit to the CODEC structure Add a bit to the CODEC structure indicating if a cache sync is required. By default this will be set if a cache only write is done to a soc-cache register cache. This allows us to avoid syncing the cache back after using cache only writes if there were no changes. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60 Merge: 5c17ef8 e27bf72 Author: Sascha Hauer Date: Thu Feb 4 11:18:09 2010 +0100 Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 04b5efe5fa7f71c37b938053666fac317b67c636 Author: Charles Chin Date: Thu Feb 4 10:28:02 2010 +0100 ALSA: hda - Fix docking output for IDT 92HD8xx codecs This patch fixes docking output support for IDT 92HD81/83/88 family codecs. Typically one of ports 0xE or 0xF is used for docking output, while only port 0xF is common on all the three codec families. We don't want the pin to select the analog mixer here. Signed-off-by: Charles Chin Signed-off-by: Takashi Iwai commit 2161db969313cb94ffd9377a525fb75c3fee9eeb Author: Ingo Molnar Date: Thu Feb 4 10:22:01 2010 +0100 perf tools: Fix session init on non-modular kernels perf top and perf record refuses to initialize on non-modular kernels: refuse to initialize: $ perf top -v map_groups__set_modules_path_dir: cannot open /lib/modules/2.6.33-rc6-tip-00586-g398dde3-dirty/ Cc: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f887f3019e56389a73617f4e70f512e82cc89adb Author: Xiao Guangrong Date: Thu Feb 4 16:46:42 2010 +0800 perf tools: Clean up O_LARGEFILE et al usage Setting _FILE_OFFSET_BITS and using O_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for pointing it out. So, this patch removes O_LARGEFILE, lseek64, etc. Suggested-by: "H. Peter Anvin" Signed-off-by: Xiao Guangrong Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <4B6A8972.3070605@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 34d2819f20782feb60f9434470ecfb200875fd41 Author: Borislav Petkov Date: Thu Feb 4 09:51:28 2010 +0100 x86, mtrr: Remove unused mtrr/state.c The last reference to the helpers in went away with 9a6b344ea967efa0bb5ca4cb5405f840652b66c4 leaving unused code. Remove it. Signed-off-by: Borislav Petkov LKML-Reference: <20100204085128.GA513@liondog.tnic> Signed-off-by: Ingo Molnar commit 447a194b393f32699607fd99617a40abd6a95114 Author: Stephane Eranian Date: Mon Feb 1 14:50:01 2010 +0200 perf_events, x86: Fix bug in hw_perf_enable() We cannot assume that because hwc->idx == assign[i], we can avoid reprogramming the counter in hw_perf_enable(). The event may have been scheduled out and another event may have been programmed into this counter. Thus, we need a more robust way of verifying if the counter still contains config/data related to an event. This patch adds a generation number to each counter on each cpu. Using this mechanism we can verify reliabilty whether the content of a counter corresponds to an event. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <4b66dc67.0b38560a.1635.ffffae18@mx.google.com> Signed-off-by: Ingo Molnar commit fce877e3a429940a986e085a41e8b57f2d922e36 Author: Peter Zijlstra Date: Fri Jan 29 13:25:12 2010 +0100 bitops: Ensure the compile time HWEIGHT is only used for such Avoid accidental misuse by failing to compile things Suggested-by: Andrew Morton Signed-off-by: Peter Zijlstra Cc: Linus Torvalds LKML-Reference: Signed-off-by: Ingo Molnar commit 8c48e444191de0ff84e85d41180d7bc3e74f14ef Author: Peter Zijlstra Date: Fri Jan 29 13:25:31 2010 +0100 perf_events, x86: Implement intel core solo/duo support Implement Intel Core Solo/Duo, aka. Intel Architectural Performance Monitoring Version 1. Signed-off-by: Peter Zijlstra Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Arjan van de Ven LKML-Reference: Signed-off-by: Ingo Molnar commit 9717e6cd3db22eade7dbae0fc9235c66325a7132 Author: Peter Zijlstra Date: Thu Jan 28 13:57:44 2010 +0100 perf_events: Optimize perf_event_task_tick() Pretty much all of the calls do perf_disable/perf_enable cycles, pull that out to cut back on hardware programming. Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 23577256953c870de9b724c3a2611ce7be6a1e4e Author: Yong Zhang Date: Fri Jan 29 14:58:47 2010 +0800 sched: Remove member rt_se from struct rt_rq It's a duplicate of tg->rt_se[cpu] and the only usage is sched_rt_rq_dequeue() and sched_rt_rq_enqueue(). After the first patch to those two function. rt_se can be removed. Signed-off-by: Yong Zhang Cc: Rusty Russell Signed-off-by: Peter Zijlstra LKML-Reference: <2674af741001282258q38781619u653ca4a7dd267347@mail.gmail.com> Signed-off-by: Ingo Molnar commit 74b7eb5885415ed41d012f432398d1b697115b5f Author: Yong Zhang Date: Fri Jan 29 14:57:52 2010 +0800 sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu] This is the first step to remove rt_rq member rt_se because it have the same meaning with tg->rt_se[cpu]. And the latter style is also used by the fair scheduling class. Signed-off-by: Yong Zhang Cc: Rusty Russell Signed-off-by: Peter Zijlstra LKML-Reference: <2674af741001282257r28c97a92o9f90cf16fe8d3d84@mail.gmail.com> Signed-off-by: Ingo Molnar commit 9e3af04f8787315f63f55b191bb9a06741dbf183 Author: Mika Westerberg Date: Thu Feb 4 00:48:00 2010 -0800 Input: gpio-keys - add support for disabling gpios through sysfs Now gpio-keys input driver exports 4 new attributes to userland through sysfs: /sys/devices/platform/gpio-keys/keys [ro] /sys/devices/platform/gpio-keys/switches [ro] /sys/devices/platform/gpio-keys/disabled_keys [rw] /sys/devices/platform/gpio-keys/disables_switches [rw] With these attributes, userland program can read which keys and switches can be disabled and then disable/enable them as needed. Keys and switches are exported as stringified bitmap of codes (keycodes or switch codes). For example keys 15, 89, 100, 101, 102 are exported as: '15,89,100-102'. Description of the attributes: keys - bitmap of keys which can be disabled switches - bitmap of switches which can be disabled disabled_keys - bitmap of currently disabled keys (bit 1 means disabled, 0 enabled) disabled_switches - bitmap of currently disabled switches (bit 1 means disabled, 0 enabled) Signed-off-by: Mika Westerberg Signed-off-by: Dmitry Torokhov commit f24bb999d2b9f2950e5cac5b69bffedf73c24ea4 Author: Masami Hiramatsu Date: Tue Feb 2 16:49:25 2010 -0500 ftrace: Remove record freezing Remove record freezing. Because kprobes never puts probe on ftrace's mcount call anymore, it doesn't need ftrace to check whether kprobes on it. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Steven Rostedt Cc: przemyslaw@pawelczyk.it Cc: Frederic Weisbecker LKML-Reference: <20100202214925.4694.73469.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 4554dbcb85a4ed2abaa2b6fa15649b796699ec89 Author: Masami Hiramatsu Date: Tue Feb 2 16:49:18 2010 -0500 kprobes: Check probe address is reserved Check whether the address of new probe is already reserved by ftrace or alternatives (on x86) when registering new probe. If reserved, it returns an error and not register the probe. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Steven Rostedt Cc: przemyslaw@pawelczyk.it Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Mathieu Desnoyers Cc: Jason Baron LKML-Reference: <20100202214918.4694.94179.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 2cfa19780d61740f65790c5bae363b759d7c96fa Author: Masami Hiramatsu Date: Tue Feb 2 16:49:11 2010 -0500 ftrace/alternatives: Introducing *_text_reserved functions Introducing *_text_reserved functions for checking the text address range is partially reserved or not. This patch provides checking routines for x86 smp alternatives and dynamic ftrace. Since both functions modify fixed pieces of kernel text, they should reserve and protect those from other dynamic text modifier, like kprobes. This will also be extended when introducing other subsystems which modify fixed pieces of kernel text. Dynamic text modifiers should avoid those. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Steven Rostedt Cc: przemyslaw@pawelczyk.it Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jim Keniston Cc: Mathieu Desnoyers Cc: Jason Baron LKML-Reference: <20100202214911.4694.16587.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 615d0ebbc782b67296e3226c293f520f93f93515 Author: Masami Hiramatsu Date: Tue Feb 2 16:49:04 2010 -0500 kprobes: Disable booster when CONFIG_PREEMPT=y Disable kprobe booster when CONFIG_PREEMPT=y at this time, because it can't ensure that all kernel threads preempted on kprobe's boosted slot run out from the slot even using freeze_processes(). The booster on preemptive kernel will be resumed if synchronize_tasks() or something like that is introduced. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Ananth N Mavinakayanahalli Cc: Frederic Weisbecker Cc: Jim Keniston Cc: Mathieu Desnoyers Cc: Steven Rostedt LKML-Reference: <20100202214904.4694.24330.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 57d818895f9d294ab9080e5a662675fdee943ff1 Author: Mike Galbraith Date: Thu Feb 4 07:31:46 2010 +0100 perf annotate: Fix perf top module symbol annotation Signed-off-by: Mike Galbraith Cc: Kirill Smelkov Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <1265265106.6364.5.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 6cff0e8dbaa4d5d822a814e5028683d7e71c3291 Author: Kirill Smelkov Date: Wed Feb 3 16:52:08 2010 -0200 perf top: Teach it to autolocate vmlinux By relying on logic in dso__load_kernel_sym(), we can automatically load vmlinux. The only thing which needs to be adjusted, is how --sym-annotate option is handled - now we can't rely on vmlinux been loaded until full successful pass of dso__load_vmlinux(), but that's not the case if we'll do sym_filter_entry setup in symbol_filter(). So move this step right after event__process_sample() where we know the whole dso__load_kernel_sym() pass is done. By the way, though conceptually similar `perf top` still can't annotate userspace - see next patches with fixes. Signed-off-by: Kirill Smelkov Signed-off-by: Arnaldo Carvalho de Melo Cc: Mike Galbraith LKML-Reference: <1265223128-11786-9-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 7a2b6209863626cf8362e5ff4653491558f91e67 Author: Kirill Smelkov Date: Wed Feb 3 16:52:07 2010 -0200 perf annotate: Fix it for non-prelinked *.so The problem was we were incorrectly calculating objdump addresses for sym->start and sym->end, look: For simple ET_DYN type DSO (*.so) with one function, objdump -dS output is something like this: 000004ac : int my_strlen(const char *s) 4ac: 55 push %ebp 4ad: 89 e5 mov %esp,%ebp 4af: 83 ec 10 sub $0x10,%esp { i.e. we have relative-to-dso-mapping IPs (=RIP) there. For ET_EXEC type and probably for prelinked libs as well (sorry can't test - I don't use prelink) objdump outputs absolute IPs, e.g. 08048604 : extern "C" int zz_strlen(const char *s) 8048604: 55 push %ebp 8048605: 89 e5 mov %esp,%ebp 8048607: 83 ec 10 sub $0x10,%esp { So, if sym->start is always relative to dso mapping(*), we'll have to unmap it for ET_EXEC like cases, and leave as is for ET_DYN cases. (*) and it is - we've explicitely made it relative. Look for adjust_symbols handling in dso__load_sym() Previously we were always unmapping sym->start and for ET_DYN dsos resulting addresses were wrong, and so objdump output was empty. The end result was that perf annotate output for symbols from non-prelinked *.so had always 0.00% percents only, which is wrong. To fix it, let's introduce a helper for converting rip to objdump address, and also let's document what map_ip() and unmap_ip() do -- I had to study sources for several hours to understand it. Signed-off-by: Kirill Smelkov Signed-off-by: Arnaldo Carvalho de Melo Cc: Mike Galbraith LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 29a9f66d703cb9464e24084e09edab5683e1b6b8 Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:06 2010 -0200 perf tools: Adjust some verbosity levels Not to pollute too much 'perf annotate' debugging sessions. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-7-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 6122e4e4f5d0913e319ef8a4dc60a47afe4abc0a Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:05 2010 -0200 perf record: Stop intercepting events, use postprocessing to get build-ids We want to stream events as fast as possible to perf.data, and also in the future we want to have splice working, when no interception will be possible. Using build_id__mark_dso_hit_ops to create the list of DSOs that back MMAPs we also optimize disk usage in the build-id cache by only caching DSOs that had hits. Suggested-by: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo Cc: Xiao Guangrong Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras LKML-Reference: <1265223128-11786-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 7b2567c1f57c059de29d3f2ca03aca84473865c8 Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:04 2010 -0200 perf build-id: Move the routine to find DSOs with hits to the lib Because 'perf record' will have to find the build-ids in after we stop recording, so as to reduce even more the impact in the workload while we do the measurement. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8ad94c6052649a8e32120b464eefa0ffd8f2f04f Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:03 2010 -0200 perf probe: Don't use a perf_session instance just to resolve symbols With the recent modifications done to untie the session and symbol layers, 'perf probe' now can use just the symbols layer. Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Masami Hiramatsu Cc: Frédéric Weisbecker Cc: Masami Hiramatsu Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Ingo Molnar commit 8d92c02ab07602786eaa6d4e5b519395730b3fd3 Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:02 2010 -0200 perf symbols: Ditch vdso global variable We can check using strcmp, most DSOs don't start with '[' so the test is cheap enough and we had to test it there anyway since when reading perf.data files we weren't calling the routine that created this global variable and thus weren't setting it as "loaded", which was causing a bogus: Failed to open [vdso], continuing without symbols Message as the first line of 'perf report'. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 6275ce2d5f44ae4f8575c24724525cbb2a3a141b Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:01 2010 -0200 perf symbols: Fixup vsyscall maps While debugging a problem reported by Pekka Enberg by printing the IP and all the maps for a thread when we don't find a map for an IP I noticed that dso__load_sym needs to fixup these extra maps it creates to hold symbols in different ELF sections than the main kernel one. Now we're back showing things like: [root@doppio linux-2.6-tip]# perf report | grep vsyscall 0.02% mutt [kernel.kallsyms].vsyscall_fn [.] vread_hpet 0.01% named [kernel.kallsyms].vsyscall_fn [.] vread_hpet 0.01% NetworkManager [kernel.kallsyms].vsyscall_fn [.] vread_hpet 0.01% gconfd-2 [kernel.kallsyms].vsyscall_0 [.] vgettimeofday 0.01% hald-addon-rfki [kernel.kallsyms].vsyscall_fn [.] vread_hpet 0.00% dbus-daemon [kernel.kallsyms].vsyscall_fn [.] vread_hpet [root@doppio linux-2.6-tip]# Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 9de89fe7c577847877ae00ea1aa6315559b10243 Author: Arnaldo Carvalho de Melo Date: Wed Feb 3 16:52:00 2010 -0200 perf symbols: Remove perf_session usage in symbols layer I noticed while writing the first test in 'perf regtest' that to just test the symbol handling routines one needs to create a perf session, that is a layer centered on a perf.data file, events, etc, so I untied these layers. This reduces the complexity for the users as the number of parameters to most of the symbols and session APIs now was reduced while not adding more state to all the map instances by only having data that is needed to split the kernel (kallsyms and ELF symtab sections) maps and do vmlinux relocation on the main kernel map. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1265223128-11786-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c Author: Roel Kluin Date: Wed Feb 3 20:19:00 2010 +0100 MX1/MX2: -EINVAL overwritten in second iteration in mxc_gpio_setup_multiple_pins() Due to the `ret = gpio_request()' below in the loop, the initial -EINVAL value of ret is overwritten. Signed-off-by: Roel Kluin Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 3d7bbd4575cfb23e6ef7368fff1f7d7e198b7930 Author: Dmitry Torokhov Date: Thu Feb 4 00:30:42 2010 -0800 Input: mark input interfaces as non-seekable Seeking does not make sense for input interfaces such as evdev and joydev so let's use nonseekable_open to mark them non-seekable. Signed-off-by: Dmitry Torokhov commit daf8a96b2d4a5d4d1d288831be43457c84c55a2f Author: Dmitry Torokhov Date: Thu Feb 4 00:30:39 2010 -0800 Input: uinput - mark as non-seekable Seeking does not make sense for uinput so let's use nonseekable_open to mark the device non-seekable. Signed-off-by: Dmitry Torokhov commit f266d7f5f89652a68e21e9882c44ee9104ad8d61 Author: Alexey Dobriyan Date: Wed Feb 3 21:21:32 2010 +0200 x86_64: Print modules like i386 does Print modules list during kernel BUG. Signed-off-by: Alexey Dobriyan Cc: Arjan van de Ven Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: Signed-off-by: Ingo Molnar commit 0b7024ac4df5821347141c18e680b7166bc1cb20 Author: Dmitry Torokhov Date: Tue Feb 2 21:08:26 2010 -0800 Input: add match() method to input hanlders Get rid of blacklist in input handler structure and instead allow handlers to define their own match() method to perform fine-grained filtering of supported devices. Signed-off-by: Dmitry Torokhov commit 1e87a43080a259a0e9739377708ece163b08de8d Author: Ondrej Zary Date: Thu Feb 4 00:20:35 2010 -0800 Input: usbtouchscreen - fix leaks and check return value of usb_submit_urb() Fix urb leak in error path of initialization and make sure we handle errors from initial usb_submit_urb(). Signed-off-by: Ondrej Zary Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 5197424cdcccd2b0b1922babb93969b2515c43ce Author: Ondrej Zary Date: Thu Feb 4 00:17:18 2010 -0800 Input: usbtouchscreen - add NEXIO (or iNexio) support Add support for NEXIO (or iNexio) USB touchscreens to usbtouchscreen driver. Tested with NEX170MRT 17" LCD monitor with integrated touchscreen (with xserver-xorg-input-evtouch 0.8.8-1): T:  Bus=02 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 54 Spd=12  MxCh= 0 D:  Ver= 1.10 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1 P:  Vendor=1870 ProdID=0001 Rev= 1.00 S:  Manufacturer=iNexio S:  Product=iNexio USB C:* #Ifs= 2 Cfg#= 1 Atr=c0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=00 Driver=(none) E:  Ad=83(I) Atr=03(Int.) MxPS=   8 Ivl=255ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=(none) E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms No datasheet is available, this was written by capturing some data with SniffUSB in Windows: http://www.rainbow-software.org/linux_files/nexio/ Signed-off-by: Ondrej Zary Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit f4a5e359c4bafc2269766ccd74256024160ed7ac Author: Ondrej Zary Date: Wed Feb 3 23:54:59 2010 -0800 Input: usbtouchscreen - find input endpoint automatically Find input enpoint automatically instead of assuming that the first one is OK. This is needed for devices with multiple endpoints such as iNexio where the first endpoint might be output. Signed-off-by: Ondrej Zary Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit fea4d14b69567e134e1838155a5dc857ebca70cb Author: Ondrej Zary Date: Wed Feb 3 23:46:48 2010 -0800 Input: usbtouchscreen - convert from usb_device to usb_interface Convert usbtouchscreen from storing usb_device to usb_interface. This is needed for multi-interface touchscreen devices such as iNexio. Signed-off-by: Ondrej Zary Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit a9694faa287888b4fb10849649b6c94d0a1c9940 Author: Vitaliy Kulikov Date: Thu Feb 4 08:58:23 2010 +0100 ALSA: hda - Adding support for another IDT 92HD83XXX codec Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit 90c30335a70e96b8b8493b7deb15e6b30e6d9fce Author: Stephen Hemminger Date: Wed Feb 3 08:31:12 2010 +0000 sky2: Flow control frames recorded as dropped packets Thanks for your patch. A more general solution would be to move the rx_dropped up into sky2_receive. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3fbd9187d004149fb8a98c9cb51ef9f4a4f66aca Author: stephen hemminger Date: Mon Feb 1 13:45:41 2010 +0000 sky2: hand receive DMA mapping failures If receive buffer mapping failed, then it was possible to get stuck with unmapped receive buffer in DMA ring. This would be an extremely rare condition because the driver had just released the map for the last receive so it should be able to get another map again (in soft-irq). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1621e0940294c20e302faf401f41204de7252e22 Author: Alexey Dobriyan Date: Mon Feb 1 09:44:19 2010 +0000 net: CONFIG_COMPAT redux Ifdef out struct proto_ops::compat_ioctl struct proto_ops::compat_setsockopt struct proto_ops::compat_getsockopt to make structures smaller on COMPAT=n kernels. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit bf66f3736a945dd4e92d86427276c6eeab0a6c1d Author: Christian Pellegrin Date: Wed Feb 3 07:39:54 2010 +0000 can: mcp251x: Move to threaded interrupts instead of workqueues. This patch addresses concerns about efficiency of handling incoming packets. Handling of interrupts is done in a threaded interrupt handler which has a smaller latency than workqueues. This change needed a rework of the locking scheme that was much simplified. Some other (more or less longstanding) bugs are fixed: utilization of just half of the RX buffers, useless wait for interrupt on open, more reliable reset sequence. The MERR interrupt is not used anymore: it overloads the CPU in error-passive state without any additional information. One shot mode is disabled because it's not clear if it can be handled efficiently on this CAN controller. Signed-off-by: Christian Pellegrin Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 35cfabdc5e9b99e732899db8f36c63a215e105bc Author: Ajit Khaparde Date: Mon Feb 1 14:06:52 2010 +0000 bonding: Remove net_device_stats from bonding struct There is no need to maintain stats in the bonding structure. Use the instance of net_device_stats in netdevice. Signed-off-by: Ajit Khaparde Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 235ecb1db09f481840569fd85eda62e70d03580c Author: Joe Perches Date: Mon Feb 1 21:22:11 2010 +0000 drivers/net/davinci_emac.c: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 59b26c72914920fd12695033c5a099fb0bfae935 Author: Thadeu Lima de Souza Cascardo Date: Mon Feb 1 07:58:59 2010 +0000 trivial: remove duplicated "from" in CAN USB EMS Kconfig help Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: David S. Miller commit 20d29d7a916a47bf533b5709437fe735b6b5b79e Author: Arnd Bergmann Date: Sat Jan 30 12:24:26 2010 +0000 net: macvtap driver In order to use macvlan with qemu and other tools that require a tap file descriptor, the macvtap driver adds a small backend with a character device with the same interface as the tun driver, with a minimum set of features. Macvtap interfaces are created in the same way as macvlan interfaces using ip link, but the netif is just used as a handle for configuration and accounting, while the data goes through the chardev. Each macvtap interface has its own character device, simplifying permission management significantly over the generic tun/tap driver. Cc: Patrick McHardy Cc: Stephen Hemminger Cc: David S. Miller" Cc: "Michael S. Tsirkin" Cc: Herbert Xu Cc: Or Gerlitz Cc: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit fc0663d6b5e6d8e9b57f872a644c0aafd82361b7 Author: Arnd Bergmann Date: Sat Jan 30 12:23:40 2010 +0000 macvlan: allow multiple driver backends This makes it possible to hook into the macvlan driver from another kernel module. In particular, the goal is to extend it with the macvtap backend that provides a tun/tap compatible interface directly on the macvlan device. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit 8a83a00b0735190384a348156837918271034144 Author: Arnd Bergmann Date: Sat Jan 30 12:23:03 2010 +0000 net: maintain namespace isolation between vlan and real device In the vlan and macvlan drivers, the start_xmit function forwards data to the dev_queue_xmit function for another device, which may potentially belong to a different namespace. To make sure that classification stays within a single namespace, this resets the potentially critical fields. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit 6884b348ed759184032306c9435a727741a72298 Author: Joe Perches Date: Tue Feb 2 12:43:59 2010 +0000 net/rds: remove uses of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Cc: Andy Grover Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 650b2ef5d7f1378f65e6a313909d783e4b6477ed Author: Roel Kluin Date: Tue Feb 2 12:43:47 2010 +0000 mISDN: positive error return should be negative in mode_hfcmulti() The error return should be negative. Its only caller that acts upon its return, handle_bmsg(), transmits the positive error but can also return negative errors. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3e5981774755f2f967cd1d3f3898576cff20e565 Author: Jiri Slaby Date: Tue Feb 2 12:43:46 2010 +0000 isdn: mISDN, don't compile unused stuff Remove these compiler warnings: drivers/isdn/hardware/mISDN/w6692.c:534: warning: `setvolume' defined but not used drivers/isdn/hardware/mISDN/w6692.c:561: warning: `enable_pots' defined but not used by moving the functions inside #if 0 ... #endif. And an alternative is to remove them completely if nobody has plans to use them. Signed-off-by: Jiri Slaby Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f0f4d641d4ebfeb4194e9c26dfa6286802e2e8d1 Author: Darren Jenkins Date: Tue Feb 2 12:43:45 2010 +0000 hardware/mISDN/mISDNinfineon.c: bail out of loop on error If setup_instance() fails we kfree() the card, and then use it in the next loop iteration. So lets bail out of the loop instead. Coverity CID: 13357 Signed-off-by: Darren Jenkins Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit e23e11792a77c7d54f363841cd5e33074fb0c8c9 Author: Roel Kluin Date: Tue Feb 2 12:43:44 2010 +0000 hisax: timeout off by one in waitrecmsg() With `while (timeout++ < maxdelay)' timeout reaches maxdelay + 1 after the loop This is probably unlikely a problem in practice. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4bbd1a1903639f826215d76af74f4901efc34daa Author: Ron Mercer Date: Wed Feb 3 07:24:12 2010 +0000 qlge: Add check for eeh failure when closing device. Fix crash where resources are freed twice on an eeh recovery failure. If eeh recovery fails we set a flag to indicate to close() that resources have been freed. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit a112fd4ce3ed965dfb8dc6791622cb4f25ba3619 Author: Ron Mercer Date: Wed Feb 3 07:24:11 2010 +0000 qlge: Move reset from eeh io_resume to slot_reset. Issue asic reset and verify functionality before continuing to the resume call. This allows proper error code to be returned in the case the asic does not recover. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 4a0b9ca015bae64df7d97c9e0a1d33159b36e69f Author: PJ Waskiewicz Date: Wed Feb 3 14:19:12 2010 +0000 ixgbe: Make descriptor ring allocations NUMA-aware This patch allocates the ring structures themselves on each NUMA node along with the buffer_info structures. This way we don't allocate the entire ring memory on a single node in one big block, thus reducing NUMA node memory crosstalk. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1a6c14a2c7c313c584f26730e67f062f474bb744 Author: Jesse Brandeburg Date: Wed Feb 3 14:18:50 2010 +0000 ixgbe: Allocate driver resources per NUMA node The default policy for the current driver is to do all its memory allocation on whatever processor is running insmod/modprobe. This is less than optimal. This driver's default mode of operation will be to use each node for each subsequent transmit/receive queue. The most efficient allocation will be to then have the interrupts bound in such a way as to match up the interrupt of the queue to the cpu where its memory was allocated. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dbb5aaebc44ce7f64b12904c58fbc1dd487982a7 Author: Nick Nunley Date: Wed Feb 3 14:49:48 2010 +0000 e1000: call pci_save_state after pci_restore_state This patch adds a call to pci_save_state() immediately after the call to pci_restore_state(). Due to a change in the behavior of pci_restore_state() it is necessary to call pci_save_state() to keep the state_saved flag. This patch is based on a similar patch for ixgbe. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b548192acaebcb05d6a87d1e94f19835b1a18a8b Author: Nick Nunley Date: Wed Feb 3 14:49:28 2010 +0000 e1000: Report link status in ethtool when interface is down With this change ethtool will correctly report link status when the interface is down. Currently ethtool reports the link as not detected when the interface is down. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 10eec95569513206877769ad9336591c08015cfe Author: John Fastabend Date: Wed Feb 3 14:23:32 2010 +0000 ixgbe: only process one ixgbe_watchdog_task at a time. Processing multiple ixgbe_watchdog_task calls may cause the link_up variable and IXGBE_FLAG_NEED_LINK_UPDATE flag to be set incorrectly. In the worse case this is causing the netif_carrier_off to be called inappropriately which results in an interface that can't be brought up. Although schedule_work() will only schedule the task if it is not already on the work queue the WORK_STRUCT_PENDING bits are cleared just before calling the work function. This allows WORK_STRUCT_PENDING to be cleared, the work function to start and meanwhile schedule another task. This patch adds a mutex to the watchdog task. This bug is actualized by changing DCB settings or doing extended cable pull or reset tests. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9c119ba54c0fcae72881948af3d37b47a2f8e1f9 Merge: a4b97f2 fdd3d63 Author: David S. Miller Date: Wed Feb 3 19:38:22 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit efec959f63de850fbd2442189f7dfc9c38efe251 Author: Benjamin Herrenschmidt Date: Thu Feb 4 14:33:54 2010 +1100 powerpc/pseries: Pass more accurate number of supported cores to firmware Updated variant of a patch by Joel Schopp. The field containing the number of supported cores which we pass to firmware via the ibm,client-architecture call was set by a previous patch statically as high as is possible (NR_CPUS). However, that value isn't quite right for a system that supports multiple threads per core, thus permitting the firmware to assign more cores to a Linux partition than it can really cope with. This patch improves it by using the device-tree to determine the number of threads supported by the processors in order to adjust the value passed to firmware. Signed-off-by: Joel Schopp Signed-off-by: Benjamin Herrenschmidt commit d78ca3cd733d8a2c3dcd88471beb1a15d973eed8 Author: Kees Cook Date: Wed Feb 3 15:37:13 2010 -0800 syslog: use defined constants instead of raw numbers Right now the syslog "type" action are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity. Signed-off-by: Kees Cook Acked-by: John Johansen Acked-by: Serge Hallyn Signed-off-by: James Morris commit 002345925e6c45861f60db6f4fc6236713fd8847 Author: Kees Cook Date: Wed Feb 3 15:36:43 2010 -0800 syslog: distinguish between /proc/kmsg and syscalls This allows the LSM to distinguish between syslog functions originating from /proc/kmsg access and direct syscalls. By default, the commoncaps will now no longer require CAP_SYS_ADMIN to read an opened /proc/kmsg file descriptor. For example the kernel syslog reader can now drop privileges after opening /proc/kmsg, instead of staying privileged with CAP_SYS_ADMIN. MAC systems that implement security_syslog have unchanged behavior. Signed-off-by: Kees Cook Acked-by: Serge Hallyn Acked-by: John Johansen Signed-off-by: James Morris commit a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47 Author: Ben Hutchings Date: Wed Feb 3 09:32:06 2010 +0000 sfc: Do not include unneeded headers Earlier refactoring has made these inclusions unnecessary. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 754c653a4e62bfa19b4e015c45198863c4211947 Author: Ben Hutchings Date: Wed Feb 3 09:31:57 2010 +0000 sfc: Fix some incorrect or redundant comments In particular, the comment about EVQ_RPTR_REG is based on inconsistent preliminary hardware documentation, though the following code was fixed long before release. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 2291b20f4bee6a28087cf4f4b2b382a92063c8b5 Author: Ben Hutchings Date: Wed Feb 3 09:31:46 2010 +0000 sfc: Remove declarations of nonexistent functions Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4cddca5484e047fa77ce090bec96fbfb92a6eb19 Author: Steve Hodgson Date: Wed Feb 3 09:31:40 2010 +0000 sfc: Add some missing bits to register self-test masks Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c91f48d61c5b6fb36a6fc50de923db4db009b0dc Author: Guido Barzini Date: Wed Feb 3 09:31:24 2010 +0000 sfc: Survive ISR0=0 bug in the shared IRQ case Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 2e803407400efe592e5294993a5b1e8251f6dd49 Author: Ben Hutchings Date: Wed Feb 3 09:31:01 2010 +0000 sfc: Implement NVRAM selftest for SFC9000 family Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4f16c0739145476ba37a7fa9eea0c33850efc2ce Author: Ben Hutchings Date: Wed Feb 3 09:30:50 2010 +0000 sfc: Replace PHY MDIO test with an 'alive' test SFC9000-family boards do not all use MDIO PHYs, so we need a different test for PHY aliveness. Introduce a PHY operation test_alive(). For PHYs attached to Falcon, use a common implementation based on the existing PHY MDIO test. For PHYs managed through MCDI, use the appropriate MCDI request. Change test name in ethtool from 'core mdio' to 'phy alive'. Rename test_results::mdio to phy_alive and test_results::phy to phy_ext. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 7a6b8f6f7f74085a1330b0f9765d81bcea8c58b7 Author: Steve Hodgson Date: Wed Feb 3 09:30:38 2010 +0000 sfc: Enable autonegotiated flow-control by default if supported Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 8b2103add08b79abd3ac7015b4bac744c0af534e Author: Steve Hodgson Date: Wed Feb 3 09:30:17 2010 +0000 sfc: Handle firmware assertion failure while resetting This allows the driver to recover if the MC firmware has crashed due to an assertion failure. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 5297a98d5dd6de86fe1e2ffc9ea60cdf59b71443 Author: Ben Hutchings Date: Wed Feb 3 09:28:14 2010 +0000 sfc: Update MCDI protocol definitions Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit b1681c56f5b6bf551bed2617a395855055836571 Author: Joe Perches Date: Wed Feb 3 18:44:44 2010 -0800 drivers/ide: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 91e83432f8abc1fc93499a2323f6c4bd6026029e Author: Joe Perches Date: Sun Jan 31 10:02:09 2010 +0000 drivers/net/amd8111e.c: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 24c4a3b29255f9f8bc48d93597a58256b5a1f83f Author: Pavel Cheblakov Date: Mon Feb 1 09:42:44 2010 +0000 can: add support for CAN interface cards based on the PLX90xx PCI bridge This driver is for CAN interface cards based on the PLX90xx PCI bridge. Driver supports now: - Adlink PCI-7841/cPCI-7841 card (http://www.adlinktech.com/) - Adlink PCI-7841/cPCI-7841 SE card - Marathon CAN-bus-PCI card (http://www.marathon.ru/) - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/) Changes since v1: - Added some defines for static inline int plx_pci_check_sja1000(...) - static struct pci_device_id plx_pci_tbl[] replaced by static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) - Typo fixed Signed-off-by: Pavel Cheblakov Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 2e02644abc4b3574533b027782820b5a6dfe1920 Author: Divy Le Ray Date: Mon Feb 1 10:29:29 2010 +0000 cxgb3: add memory barriers Add memory barriers to fix crashes observed on newest PowerPC platforms. The HW and driver state of the receive rings were getting out of sync. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit ace2a4d0fbf868c00625a8fd91c44ad9fabe7012 Author: Andreas Mohr Date: Sun Jan 31 02:58:42 2010 +0000 MCS7830 USB-Ether: resume _with_ working link, via .reset_resume support ChangeLog: Implement .reset_resume support to retain a live network connection during suspend despite USB power loss. - rework operation to reference cached data in mcs7830_data and netdev->dev_addr - update netdev->dev_addr only in case new MAC was set successfully . Tests done: . ethtool -d pre-/post-suspend: register values match . running ssh session suspend, resume: works . ifdown device, suspend, resume: works . ifup, suspend, unplug, resume: WORKS (eth1 is removed, re-ifup of eth1 after card replug works) . verified identical MAC in ifconfig post-resume (ok, should be verified on network side to be fully certain...) Keywords: suspend resume network connection dead interface down Signed-off-by: Andreas Mohr Signed-off-by: David S. Miller commit c774651a5ffc0250f82d72730753f196c86884c5 Author: Andreas Mohr Date: Sun Jan 31 02:58:33 2010 +0000 MCS7830 USB-Ether: change register define ChangeLog: - rename register, add comment Signed-off-by: Andreas Mohr Signed-off-by: David S. Miller commit 00e499131e250324a89c93d5dd88c8f2b4bf6dbb Author: Andreas Mohr Date: Sun Jan 31 02:58:26 2010 +0000 MCS7830 USB-Ether: Spelling corrections ChangeLog: - spelling corrections / whitespace Signed-off-by: Andreas Mohr Signed-off-by: David S. Miller commit 76802851b6e1b78b614ba611d6b5d27a83f60ded Author: Andreas Mohr Date: Sun Jan 31 02:58:19 2010 +0000 MCS7830 USB-Ether: add Rx error support ChangeLog: - evaluate Rx error statistics from trailing Rx status byte - add driver TODO list - add myself to authors Quilt series run-tested, based on 2.6.33-rc4 (net-2.6.git mcs7830 has idle history, should be good to go). Signed-off-by: Andreas Mohr Signed-off-by: David S. Miller commit 5a1436beec5744029f3ac90b6fe71a698dcd6155 Author: Steffen Klassert Date: Thu Feb 4 11:40:17 2010 +1100 crypto: pcrypt - call the complete function on error This fixes three forgotten calls to the complete function in the error case. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit e054f1647162d7098a9ff619405a72bd7c417213 Author: Roel Kluin Date: Thu Feb 4 11:39:13 2010 +1100 crypto: geode-aes - Fix cip/blk confusion a crypto_cipher cip member was set where a crypto_cipher blk members should have been. Signed-off-by: Roel Kluin Signed-off-by: Herbert Xu commit 5322892d867e186c6b4c5fff5c99ea4863696a60 Author: Dave Chinner Date: Thu Feb 4 10:09:14 2010 +1100 xfs: kill xfs_bawrite There are no more users of this function left in the XFS code now that we've switched everything to delayed write flushing. Remove it. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 07fec73625dc0db6f9aed68019918208a2ca53f5 Author: Christoph Hellwig Date: Tue Feb 9 11:43:49 2010 +1100 xfs: log changed inodes instead of writing them synchronously When an inode has already be flushed delayed write, xfs_inode_clean() returns true and hence xfs_fs_write_inode() can return on a synchronous inode write without having written the inode. Currently these sycnhronous writes only come sync(1), unmount, a sycnhronous NFS export and cachefiles so should be relatively rare and out of common performance paths. Realistically, a synchronous inode write is not necessary here; we can avoid writing the inode by logging any non-transactional changes that are pending. This needs to be done with synchronous transactions, but it avoids seeking between the log and inode clusters as we do now. We don't force the log if the inode is pinned, though, so this differs from the fsync case. For normal sys_sync and unmount behaviour this is fine because we do a synchronous log force in xfs_sync_data which is called from the ->sync_fs code. It does however break the NFS synchronous export guarantees for now, but work is under way to fix this at a higher level or for the higher level to provide an additional flag in the writeback control to tell us that a log force is needed. Portions of this patch are based on work from Dave Chinner. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Alex Elder commit 0719aaf5ead7555b7b7a4a080ebf2826a871384e Author: Guido Trentalancia Date: Wed Feb 3 16:40:20 2010 +0100 selinux: allow MLS->non-MLS and vice versa upon policy reload Allow runtime switching between different policy types (e.g. from a MLS/MCS policy to a non-MLS/non-MCS policy or viceversa). Signed-off-by: Guido Trentalancia Acked-by: Stephen Smalley Signed-off-by: James Morris commit 42596eafdd75257a640f64701b9b07090bcd84b0 Author: Guido Trentalancia Date: Wed Feb 3 17:06:01 2010 +0100 selinux: load the initial SIDs upon every policy load Always load the initial SIDs, even in the case of a policy reload and not just at the initial policy load. This comes particularly handy after the introduction of a recent patch for enabling runtime switching between different policy types, although this patch is in theory independent from that feature. Signed-off-by: Guido Trentalancia Acked-by: Stephen Smalley Signed-off-by: James Morris commit 8c961bcca1d10be4f2c06375eb561679167653a0 Author: Mark Brown Date: Mon Feb 1 18:46:10 2010 +0000 ASoC: Allow CODECs to ask soc-cache to suppress physical writes Currently the soc-cache code will always write to the device, meaning that we need the device to be powered and active at pretty much all times the system is active. Allowing cache only writes lays some groundwork for future enhancements to allow devices to be put into a full off state when the audio subsystem is idle. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 0f69d9782c6e6a7b0e60113a850845bc642c3f4e Author: Guennadi Liakhovetski Date: Wed Feb 3 17:37:23 2010 +0100 ASoC: fix compilation breakage in sound/soc/sh/fsi.c ctrl_outl() has become void at some point, which breaks compilation of fsi.c. Make writing functions void, as their output is anyway not evaluated, and use __raw_writel and __raw_readl instead of deprecated ctrl_outl and ctrl_inl respectively. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3cebbb81c7e75321e25cc586d07a25a3d98278fc Author: Michal Marek Date: Wed Feb 3 17:20:14 2010 +0100 kconfig: Simplify LSMOD= handling Signed-off-by: Michal Marek LKML-Reference: <20100203162014.GA10956@sepie.suse.cz> Signed-off-by: Steven Rostedt commit 84f3bb9ae9db90f7fb15d98b55279a58ab1b2363 Author: Patrick McHardy Date: Wed Feb 3 17:17:06 2010 +0100 netfilter: xtables: add CT target Add a new target for the raw table, which can be used to specify conntrack parameters for specific connections, f.i. the conntrack helper. The target attaches a "template" connection tracking entry to the skb, which is used by the conntrack core when initializing a new conntrack. Signed-off-by: Patrick McHardy commit 2dbf209d7a7ab94266b936bd2da6a4026c279992 Author: Jiri Kosina Date: Wed Feb 3 16:11:12 2010 +0100 HID: make full-fledged hid-bus drivers properly selectable For historical reasons, we don't have most of the in-tree drivers residing on hid-bus properly selectable in kernel configuration unless CONFIG_EMBEDDED is set. This has been introduced on Linus' request from 14 Oct === As to the Kconfig options - do they really add so much space that you need to ask for the quirks? You didn't use to. Can you make the questions depend on EMBEDDED, or at least on the HID_COMPAT thing or whatever? === This still makes perfect sense for small and tiny drivers, which just fix report descriptors, fix up HID->input mappings that slightly violates HUT standard, send one extra packet to the device that is needed before it becomes functional, etc. Since then, we have been gathering more and more HID-bus drivers, which are full-fledged drivers. For these, the size argument becomes more valid. Plus the devices are much more special than "just violates HID specification in this one or two tiny unimportant points". Therefore I am marking such drivers as properly selectable no matter the setting of CONFIG_EMBEDDED, while keeping all the small and tiny ones compiled by default. Signed-off-by: Jiri Kosina commit 342f31e84eec9002b75f6fcdec6bd932ac77a390 Author: Jiri Kosina Date: Wed Feb 3 15:52:31 2010 +0100 HID: make Wacom modesetting failures non-fatal With Wacom tablet mode-setting moved from userspace into kernel, we don't have to consider failures of device queries through the _raw callback as hard failure, as the driver can safely continue anyway. This is consistent with the current USB driver in wacom_sys.c Reported-by: Ping Cheng Signed-off-by: Jiri Kosina commit f9ce7c283c16538955d5d094101889792bcde109 Author: Bastien Nocera Date: Wed Jan 20 12:01:53 2010 +0000 HID: Enable Sixaxis controller over Bluetooth Now that hid_output_raw_report works, port the PS3 Sixaxis Bluetooth quirk from user-space, into kernel-space. Signed-off-by: Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit 46a709b900bfcf43244cd19cf3245c77484ec733 Author: Bastien Nocera Date: Wed Jan 20 12:00:53 2010 +0000 HID: Implement Wacom quirk in the kernel The hid-wacom driver required user-space to poke at the tablet to make it send data about the cursor location. This patch makes it do the same thing but in the kernel. Signed-off-by: Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit d4bfa033ed84e0ae446eff445d107ffd5ee78df3 Author: Jiri Kosina Date: Fri Jan 29 15:03:36 2010 +0100 HID: make raw reports possible for both feature and output reports In commit 2da31939a42 ("Bluetooth: Implement raw output support for HIDP layer"), support for Bluetooth hid_output_raw_report was added, but it pushes the data to the intr socket instead of the ctrl one. This has been fixed by 6bf8268f9a91f1 ("Bluetooth: Use the control channel for raw HID reports") Still, it is necessary to distinguish whether the report in question should be either FEATURE or OUTPUT. For this, we have to extend the generic HID API, so that hid_output_raw_report() callback provides means to specify this value so that it can be passed down to lower level hardware drivers (currently Bluetooth and USB). Based on original patch by Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit b2a15a604d379af323645e330638e2cfcc696aff Author: Patrick McHardy Date: Wed Feb 3 14:13:03 2010 +0100 netfilter: nf_conntrack: support conntrack templates Support initializing selected parameters of new conntrack entries from a "conntrack template", which is a specially marked conntrack entry attached to the skb. Currently the helper and the event delivery masks can be initialized this way. Signed-off-by: Patrick McHardy commit 0cebe4b4163b6373c9d24c1a192939777bc27e55 Author: Patrick McHardy Date: Wed Feb 3 13:51:51 2010 +0100 netfilter: ctnetlink: support selective event delivery Add two masks for conntrack end expectation events to struct nf_conntrack_ecache and use them to filter events. Their default value is "all events" when the event sysctl is on and "no events" when it is off. A following patch will add specific initializations. Expectation events depend on the ecache struct of their master conntrack. Signed-off-by: Patrick McHardy commit 858b31330054a9ad259feceea0ad1ce5385c47f0 Author: Patrick McHardy Date: Wed Feb 3 13:48:53 2010 +0100 netfilter: nf_conntrack: split up IPCT_STATUS event Split up the IPCT_STATUS event into an IPCT_REPLY event, which is generated when the IPS_SEEN_REPLY bit is set, and an IPCT_ASSURED event, which is generated when the IPS_ASSURED bit is set. In combination with a following patch to support selective event delivery, this can be used for "sparse" conntrack replication: start replicating the conntrack entry after it reached the ASSURED state and that way it's SYN-flood resistant. Signed-off-by: Patrick McHardy commit add67461240c1dadc7c8d97e66f8f92b556ca523 Author: Patrick McHardy Date: Wed Feb 3 13:45:12 2010 +0100 netfilter: add struct net * to target parameters Signed-off-by: Patrick McHardy commit 794e68716bab578ae8f8912dc934496d7c7abc90 Author: Patrick McHardy Date: Wed Feb 3 13:41:29 2010 +0100 netfilter: ctnetlink: only assign helpers for matching protocols Make sure not to assign a helper for a different network or transport layer protocol to a connection. Additionally change expectation deletion by helper to compare the name directly - there might be multiple helper registrations using the same name, currently one of them is chosen in an unpredictable manner and only those expectations are removed. Signed-off-by: Patrick McHardy commit 2eff25c18c3d332d3c4dd98f2ac9b7114e9771b0 Author: Patrick McHardy Date: Wed Feb 3 13:24:54 2010 +0100 netfilter: xt_hashlimit: fix race condition and simplify locking As noticed by Shin Hong , there is a race between htable_find_get() and htable_put(): htable_put(): htable_find_get(): spin_lock_bh(&hashlimit_lock); atomic_dec_and_test(&hinfo->use) atomic_inc(&hinfo->use) spin_unlock_bh(&hashlimit_lock) return hinfo; spin_lock_bh(&hashlimit_lock); hlist_del(&hinfo->node); spin_unlock_bh(&hashlimit_lock); htable_destroy(hinfo); The entire locking concept is overly complicated, tables are only created/referenced and released in process context, so a single mutex works just fine. Remove the hashinfo_spinlock and atomic reference count and use the mutex to protect table lookups/creation and reference count changes. Signed-off-by: Patrick McHardy commit f54405db66fbec11679241daefd16fd8291a5762 Author: Alex Neblett Date: Tue Feb 2 21:16:03 2010 -0800 HID: add support for Pixart Imaging Optical Touch Screen Added support for the Pixart Imaging Inc. Optical Touch Screen found in the MSI AE2220 and other new all in one computers to the Quanta Optical Touch dual-touch panel driver found in the latest git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git. Signed-off-by: Alex Neblett Signed-off-by: Jiri Kosina commit b8f46c5a34fa64fd456295388d18f50ae69d9f37 Author: Xiao Guangrong Date: Wed Feb 3 11:53:14 2010 +0800 perf tools: Use O_LARGEFILE to open perf data file Open perf data file with O_LARGEFILE flag since its size is easily larger that 2G. For example: # rm -rf perf.data # ./perf kmem record sleep 300 [ perf record: Woken up 0 times to write data ] [ perf record: Captured and wrote 3142.147 MB perf.data (~137282513 samples) ] # ll -h perf.data -rw------- 1 root root 3.1G ..... Signed-off-by: Xiao Guangrong Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <4B68F32A.9040203@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 Author: Paul Mundt Date: Wed Feb 3 16:46:20 2010 +0900 sh: Fix up early PCI PERR/SERR IRQ handling. This adds support for handling early PERR/SERR triggering in between controller registration and the initial bus scan. Buggy cards end up asserting these as soon as the M66EN scan is undertaken, resulting in an early crash. Signed-off-by: Paul Mundt commit 9ad7bd2944bd979ef4877cd439719be44c5f3b47 Author: Roel Kluin Date: Wed Jan 20 01:25:56 2010 +0100 dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() In these cases the same statements are executed. Signed-off-by: Roel Kluin Acked-by: Guennadi Liakhovetski Signed-off-by: Andrew Morton Signed-off-by: Dan Williams commit 28bb9ee13aa0ee4c57dc3568f539cc84920b43aa Author: jschopp@austin.ibm.com Date: Mon Feb 1 12:50:48 2010 +0000 powerpc: Add static fields to ibm,client-architecture call This patch adds 2 fields to the ibm_architecture_vec array. The first of these fields indicates the number of cores which Linux can boot. It does not account for SMT, so it may result in cpus assigned to Linux which cannot be booted. A second patch follows that dynamically updates this for SMT. The second field just indicates that our OS is Linux, and not another OS. The system may or may not use this hint to performance tune settings for Linux. Signed-off-by: Joel Schopp Signed-off-by: Benjamin Herrenschmidt commit 4b1cf1facca31b7db2a61d8aa2ba40d5a93a0957 Author: Márton Németh Date: Tue Feb 2 23:41:06 2010 -0700 dma: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk [dan.j.williams@intel.com: resolved conflict with recent fsldma updates] Signed-off-by: Dan Williams commit 6c504d423147770d7bd73aab3228726379700786 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 11:23:14 2010 +0000 powerpc: Fix typo s/leve/level/ in TLB code Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Benjamin Herrenschmidt commit 24551f64d47af9539a7f324343bffeea09d9dcfa Author: Michael Ellerman Date: Tue Jan 12 21:25:24 2010 +0000 lmb: Add lmb_free() We can free memory allocated with lmb_alloc() by removing it from the list of reserved LMBs. Rework lmb_remove() to allow that possibility and add lmb_free() which exploits it. BenH: Removed some useless parenthesis Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 859aefc5afc6c00dae630680e5470f7a2c27c4a0 Author: Anton Blanchard Date: Sun Jan 31 01:14:03 2010 +0000 powerpc: Increase NR_IRQS Kconfig maximum to 32768 With dynamic irq descriptors the overhead of a large NR_IRQS is much lower than it used to be. With more MSI-X capable adapters and drivers exploiting multiple vectors we may as well allow the user to increase it beyond the current maximum of 512. 32768 seems large enough that we'd never have to bump it again (although I bet my prediction is horribly wrong). It boot tests OK and the vmlinux footprint increase is only around 500kB due to: struct irq_map_entry irq_map[NR_IRQS]; We format /proc/interrupts correctly with the previous changes: CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 286: 0 0 0 0 0 0 516: 0 0 0 0 0 0 16689: 1833 0 0 0 0 0 17157: 0 0 0 0 0 0 17158: 319 0 0 0 0 0 25092: 0 0 0 0 0 0 Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 98ceb75c7c14eada76b0aa9f03a635a735cee3cb Author: Jean Delvare Date: Sun Jan 31 04:03:23 2010 +0000 macintosh/hwmon/ams: Fix device removal sequence Some code that is in ams_exit() (the module exit code) should instead be called when the device (not module) is removed. It probably doesn't make much of a difference in the PMU case, but in the I2C case it does matter. I make no guarantee that my fix isn't racy, I'm not familiar enough with the ams driver code to tell for sure. Signed-off-by: Jean Delvare Tested-by: Christian Kujau Cc: Benjamin Herrenschmidt Cc: Stelian Pop Cc: Michael Hanselmann Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt commit 33a470f6d5e1879c26f16f6b34dc09f82d44f6e9 Author: Jean Delvare Date: Sun Jan 31 04:00:30 2010 +0000 macintosh/therm_adt746x: Fix sysfs attributes lifetime Looking at drivers/macintosh/therm_adt746x.c, the sysfs files are created in thermostat_init() and removed in thermostat_exit(), which are the driver's init and exit functions. These files are backed-up by a per-device structure, so it looks like the wrong thing to do: the sysfs files have a lifetime longer than the data structure that is backing it up. I think that sysfs files creation should be moved to the end of probe_thermostat() and sysfs files removal should be moved to the beginning of remove_thermostat(). Signed-off-by: Jean Delvare Tested-by: Christian Kujau Cc: Benjamin Herrenschmidt Cc: Colin Leroy Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt commit 119ea10947cc1402abbf9d6200815b0606536906 Author: Amit Shah Date: Mon Jan 18 03:44:58 2010 +0000 hvc_console: Remove __devinit annotation from hvc_alloc Virtio consoles can be hotplugged, so hvc_alloc gets called from multiple sites: from the initial probe() routine as well as later on from workqueue handlers which aren't __devinit code. So, drop the __devinit annotation for hvc_alloc. Signed-off-by: Amit Shah Cc: linuxppc-dev@ozlabs.org Signed-off-by: Benjamin Herrenschmidt commit b51130685817d8c1b56386f9957405b5be2cdfe0 Author: Rusty Russell Date: Mon Jan 18 03:44:57 2010 +0000 hvc_console: Make the ops pointer const. This is nicer for modern R/O protection. And noone needs it non-const, so constify the callers as well. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah To: Christian Borntraeger Cc: linuxppc-dev@ozlabs.org Signed-off-by: Benjamin Herrenschmidt commit 7b62922a071aea362e879252d7482e448bd63d9c Author: Peter Tyser Date: Fri Dec 18 12:50:37 2009 +0000 powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem Recent U-Boot commit 5ccd29c3679b3669b0bde5c501c1aa0f325a7acb caused the "cpu-release-addr" device tree property to contain the physical RAM location that secondary cores were spinning at. Previously, the "cpu-release-addr" property contained a value referencing the boot page translation address range of 0xfffffxxx, which then indirectly accessed RAM. The "cpu-release-addr" is currently ioremapped and the secondary cores kicked. However, due to the recent change in "cpu-release-addr", it sometimes points to a memory location in low memory that cannot be ioremapped. For example on a P2020-based board with 512MB of RAM the following error occurs on bootup: <...> mpic: requesting IPIs ... __ioremap(): phys addr 0x1ffff000 is RAM lr c05df9a0 Unable to handle kernel paging request for data at address 0x00000014 Faulting instruction address: 0xc05df9b0 Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=2 P2020 RDB Modules linked in: <... eventual kernel panic> Adding logic to conditionally ioremap or access memory directly resolves the issue. Signed-off-by: Peter Tyser Signed-off-by: Nate Case Reported-by: Dipen Dudhat Tested-by: Dipen Dudhat Signed-off-by: Benjamin Herrenschmidt commit 5be3492f972b73051ead7ecbac6fb9efd1e8e0ec Author: Anton Blanchard Date: Tue Jan 12 00:50:14 2010 +0000 powerpc: Mark some variables in the page fault path __read_mostly Using perf to trace L1 dcache misses and dumping data addresses I found a few variables taking a lot of misses. Since they are almost never written, they should go into the __read_mostly section. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 61c03ddbdff2e080702521bc1b757854ca58c46a Author: Anton Blanchard Date: Wed Jan 13 12:04:11 2010 +0000 powerpc: Replace per_cpu(, smp_processor_id()) with __get_cpu_var() The cputime code has a few places that do per_cpu(, smp_processor_id()). Replace them with __get_cpu_var(). Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 4ba525d134a882e6994bf8f5bd93fd020376588c Author: Robert P. J. Day Date: Thu Dec 31 10:45:50 2009 +0000 powerpc: Simplify param.h by including Signed-off-by: Robert P. J. Day Signed-off-by: Benjamin Herrenschmidt commit dc942cee2fcb734d6f3ef7966040e4e034b67d5b Author: Joe Perches Date: Tue Dec 22 21:22:59 2009 +0000 powerpc/viodasd: Remove VIOD_KERN_ macros for printks Use #define pr_fmt(fmt) "viod: " fmt Remove #define VIOD_KERN_WARNING and VIOD_KERN_INFO Convert printk(VIOD_KERN_ to pr_ Coalesce long format strings Signed-off-by: Joe Perches Acked-by: Stephen Rothwell drivers/block/viodasd.c | 86 +++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 50 deletions(-) Signed-off-by: Benjamin Herrenschmidt commit 615f0833aa4c4aa944ceb78895bbffa8bd1884df Author: Steven Rostedt Date: Tue Feb 2 21:51:27 2010 -0500 kconfig: Add LSMOD=file to override the lsmod for localmodconfig Doing the following: make LSMOD=file localmodconfig Will make the streamline-config code use the given file instead of lsmod. If the file is an executable, it will execute it, otherwise it will read it as text. make LSMOD=/my/local/path/lsmod localmodconfig The above will execute the lsmod in /my/local/path instead of the lsmods that may be located elsewhere. make LSMOD=embedded_board_lsmod localmodconfig The above will read the "embedded_board_lsmod" as a text file. This is useful if you are doing a cross compile and need to run the config against modules that exist on an embedded device. Note, if the LSMOD= file does is not a path, it will add the path to the object directory. That is, the above example will look for "embedded_board_lsmod" in the directory that the binary will be built in (the O=dir directory). Signed-off-by: Steven Rostedt On branch config/linus commit d35b7a829a13b69c4747b69380b504b6544a2375 Merge: 28db4ed 84c9b72 Author: Ben Dooks Date: Wed Feb 3 01:56:07 2010 +0000 ARM: Merge next-samsung-s3c244x-merge Merge branch 'next-samsung-s3c244x-merge' into next-samsung commit 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 Merge: 87aef30 91492b4 Author: Ben Dooks Date: Wed Feb 3 01:55:39 2010 +0000 ARM: Merge next-samsung-devupdates2 Merge branch 'next-samsung-devupdates2' into next-samsung commit 91492b4a04586e7cb191c72de9d1b22545a3ce16 Author: Maurus Cuelenaere Date: Sat Jan 30 18:01:48 2010 +0100 ARM: SAMSUNG: Add support for 12bit ADC The S3C64XX SoC series support 12bit ADC data, enable this and mask the data accordingly. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit cf9814eb6d83f066d5db63f4144598e9c6ca2951 Author: Ben Dooks Date: Fri Jan 29 13:03:34 2010 +0900 ARM: S3C64XX: Make audio device code built unconditionally Making the code depend on CONFIG_SND_S3C24XX_SOC means that if the ASoC code is build modularily, the boards will fail to link due to the device code also being built as a module. As per Mark Brown's suggestions, just compile this always as it is expected many machines will have audio. Also move the obj-y line out of the device setup area into a new area just for devices. Signed-off-by: Ben Dooks commit 1de203adf6210b9dd81d907ea8cda587bc61cf4c Author: Ben Dooks Date: Fri Jan 29 10:53:35 2010 +0900 ARM: SAMSUNG: Use PLAT_SAMSUNG instead of PLAT_S3C As part of the development process, it is hoped PLAT_S3C is either removed from all of the PLAT_SAMSUNG derived platforms or removed entirely. It is also better to use PLAT_SAMSUNG as this is the current base of all Samsung devices. Change the two places that use PLAT_S3C to use PLAT_SAMSUNG Signed-off-by: Ben Dooks commit 3bd9377e8761cb7f1000b3075763df779ab9aeca Author: Ben Dooks Date: Fri Jan 29 10:52:02 2010 +0900 ARM: SAMSUNG: Add SERIAL_SAMSUNG_UARTS_4 Kconfig option Add SERIAL_SAMSUNG_UARTS_4 to mop up the number of cases currently using four Samsung compatible UARTS. Signed-off-by: Ben Dooks commit 21030403209f0c253d462492f881c613bd8eeda2 Author: Michel Pollet Date: Wed Jan 27 16:38:08 2010 +0000 ARM: S3C2412: SoC has the fractional baud rate register The S3C2412 has a fractional baud rate register, this patch adds the corresponding flag to the UART definition to allow generation of more precise baud rates for the various clock combinations. Signed-off-by: Michel Pollet Signed-off-by: Ben Dooks commit 4b4c662571bb3a19d6bacb4433886ec35c7093fa Author: Jassi Brar Date: Thu Jan 28 17:14:49 2010 +0900 ARM: S3C64XX: SPI: Make platform device compilation selectable The SPI controller platform devices should be compiled in independent of the driver support, otherwise we might end up with dev-spi built as kernel module. Change this to make every machine select if it has some SPI device and wants to build device definitions. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 2848552cef6a14fe4e54e676a61a340c8fd023b3 Author: Ben Dooks Date: Wed Jan 27 18:13:59 2010 +0900 ARM: SAMSUNG: Add DMA masks to hsotg device Add the required DMA masks to the hs-otg device definition to allow DMA to work with it. Signed-off-by: Ben Dooks commit 79788c698b290426320e60374ed1324e4b5c69eb Author: Sage Weil Date: Tue Feb 2 16:34:04 2010 -0800 ceph: release all pages after successful osd write response We release all the pages, even if the osd response was different than the number of pages written. This could only happen due to truncation that arrives the osd in different order, for which we want the pages released anyway. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 0c948992a00d478c17042f4790b7d6b35299cf94 Author: Yehuda Sadeh Date: Mon Feb 1 16:10:45 2010 -0800 ceph: always send truncation info with read and write osd ops This fixes a bug where the read/write ops arrive the osd after a following truncation request. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit cdaff1854f32ac9ddb4733530f617d32188665ed Author: Amit Kumar Salecha Date: Mon Feb 1 05:25:00 2010 +0000 qlcnic: add loopback diagnostic test Loopback test (offline) added in ethtool self test. o Set device in loopback mode o Send packets o Process receive packets in qlcnic_process_rcv_ring_diag() o Compare packets o Reset device in normal mode. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7eb9855d68faabe0004ed18c2af1f0974d3c2c63 Author: Amit Kumar Salecha Date: Mon Feb 1 05:24:59 2010 +0000 qlcnic: add interrupt diagnostic test Interrupt test (offline) added in ethtool self test. Register a temporary interrupt handler and then send command to fw to raise an interrupt. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 897d3596e0dfc4c25963cff00f1159c79eaf38d3 Author: Sucheta Chakraborty Date: Mon Feb 1 05:24:58 2010 +0000 qlcnic: support LED blink for device identification Added support of device identification by blinking LED for specified time. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit ce6684433fb277406dd861fd8a17133253e7c367 Author: Amit Kumar Salecha Date: Mon Feb 1 05:24:57 2010 +0000 qlcnic: protect resoruce cleanup by rtnl lock o context resources can be in used, while resoruce cleanup is in progress, during fw recover. o Null pointer execption can occur in send_cmd_desc, if fw recovery module frees tx ring without rtnl lock. o Same applies to ethtool register dump and FW health registers should be dump in any case. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 1b95a839587f40abab2f9cb3e5254dc821b9829b Author: Amit Kumar Salecha Date: Mon Feb 1 05:24:56 2010 +0000 qlcnic: clear device reset state after fw recovery o After firmware recovery, clear device reset state transition register. Otherwise firmware reload can occur unnecessary. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 02420be6fc5fc63526aca43b5bfc571547a1c926 Author: Amit Kumar Salecha Date: Mon Feb 1 05:24:55 2010 +0000 qlcnic: add ethernet identifier in board info Added missing identifier that distinguishes between FCOE/ISCSI/ETHERNET functions. Signed-off-by: Rajesh K Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6a902881cc6993f136906559ca04b6a4c9e260fc Author: Amit Kumar Salecha Date: Mon Feb 1 05:24:54 2010 +0000 qlcnic: use DEFINE_PCI_DEVICE_TABLE Use DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section in every case. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 0c2dc318e88100e1abdff07e8a7d60460984a2d2 Author: Jarek Poplawski Date: Mon Feb 1 00:19:07 2010 +0000 sky2: Fix TX_MAP_PAGE misspelling Btw of the dma-debug problem reported by Michael Breuer I spotted a tiny misspelling in TX_MAP_PAGE definition introduced by commit 6b84dacadbdc3. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 9ab86bbcf8be755256f0a5e994e0b38af6b4d399 Author: Shirley Ma Date: Fri Jan 29 03:20:04 2010 +0000 virtio_net: Defer skb allocation in receive path Date: Wed, 13 Jan 2010 12:53:38 -0800 virtio_net receives packets from its pre-allocated vring buffers, then it delivers these packets to upper layer protocols as skb buffs. So it's not necessary to pre-allocate skb for each mergable buffer, then frees extra skbs when buffers are merged into a large packet. This patch has deferred skb allocation in receiving packets for both big packets and mergeable buffers to reduce skb pre-allocations and skb frees. It frees unused buffers by calling detach_unused_buf in vring, so recv skb queue is not needed. Signed-off-by: Shirley Ma Signed-off-by: Rusty Russell Signed-off-by: David S. Miller commit f9bfbebf34eab707b065116cdc9699d25ba4252a Author: Shirley Ma Date: Fri Jan 29 03:19:05 2010 +0000 virtio: Add ability to detach unused buffers from vrings There's currently no way for a virtio driver to ask for unused buffers, so it has to keep a list itself to reclaim them at shutdown. This is redundant, since virtio_ring stores that information. So add a new hook to do this. Signed-off-by: Shirley Ma Signed-off-by: Amit Shah Signed-off-by: Rusty Russell Signed-off-by: David S. Miller commit 28aecb9d7728dc26bf03ce7925fe622023a83a2a Author: Eric Dumazet Date: Fri Jan 29 04:05:52 2010 +0000 xfrm: avoid spinlock in get_acqseq() Use atomic_inc_return() in get_acqseq() to avoid taking a spinlock Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5324dc0e3872324ed0bf372bce7bc437436910b6 Author: Stefan Weil Date: Tue Feb 2 14:45:04 2010 -0800 da9030_battery: fix spelling in comment platfrom -> platform monotor -> monitor Signed-off-by: Stefan Weil Cc: Anton Vorontsov Acked-by: Mike Rapoport Signed-off-by: Andrew Morton Signed-off-by: Anton Vorontsov commit e1a0bdd8022317e98650e70850de73eccfcde5ad Merge: 8127f4e 1a45dcf Author: Jiri Kosina Date: Tue Feb 2 23:10:39 2010 +0100 Merge branch 'master' into upstream Conflicts: drivers/hid/hid-ids.h commit 8127f4e883666c9960cfa89cffd36313748f8bab Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 2 18:09:06 2010 -0200 HID: use multi input quirk for eTurboTouch touchscreen This device generates ABS_Z and ABS_RX events, while it should be generating ABS_X and ABS_Y instead. Using the MULTI_INPUT quirk solves this issue. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Daniel Oliveira Nascimento Signed-off-by: Jiri Kosina commit 9c3a50b7d7ec45da34e73cac66cde12dd6092dd8 Author: Ira Snyder Date: Wed Jan 6 13:34:06 2010 +0000 fsldma: major cleanups and fixes Fix locking. Use two queues in the driver, one for pending transacions, and one for transactions which are actually running on the hardware. Call dma_run_dependencies() on descriptor cleanup so that the async_tx API works correctly. There are a number of places throughout the code where lists of descriptors are freed in a loop. Create functions to handle this, and use them instead of open-coding the loop each time. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit a1c03319018061304be28d131073ac13a5cb86fb Author: Ira Snyder Date: Wed Jan 6 13:34:05 2010 +0000 fsldma: rename fsl_chan to chan The name fsl_chan seems too long, so it has been shortened to chan. There are only a few places where the higher level "struct dma_chan *chan" name conflicts. These have been changed to "struct dma_chan *dchan" instead. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit d3f620b2c4fecdc8e060b70e8d92d29fc01c6126 Author: Ira Snyder Date: Wed Jan 6 13:34:04 2010 +0000 fsldma: simplify IRQ probing and handling The IRQ probing is needlessly complex. All off the 83xx device trees in arch/powerpc/boot/dts/ specify 5 interrupts per DMA controller: one for the controller, and one for each channel. These interrupts are all attached to the same IRQ line. This causes an interesting situation if two channels interrupt at the same time. The per-controller handler will handle the first channel, and the per-channel handler will handle the remaining channels. Instead of this mess, we fix the bug in the per-controller handler, and make it handle all channels that generated an interrupt. When a per-controller handler is specified in the device tree, we prefer to use the shared handler instead of the per-channel handler. The 85xx/86xx controllers do not have a per-controller interrupt, and instead use a per-channel interrupt. This behavior has not been changed. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit e7a29151de1bd52081f27f149b68074fac0323be Author: Ira Snyder Date: Wed Jan 6 13:34:03 2010 +0000 fsldma: clean up the OF subsystem routines This fixes some errors in the cleanup paths of the OF subsystem, including missing checks for ioremap failing. Also, some variables were renamed for brevity. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 738f5f7e1ae876448cb7d9c82bea258b69386647 Author: Ira Snyder Date: Wed Jan 6 13:34:02 2010 +0000 fsldma: rename dest to dst for uniformity Most functions in the standard library use "dst" as a parameter, rather than "dest". This renames all use of "dest" to "dst" to match the usual convention. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit a4f56d4b103d4e5d1a59a9118db0185a6bd1a83b Author: Ira Snyder Date: Wed Jan 6 13:34:01 2010 +0000 fsldma: rename struct fsl_dma_chan to struct fsldma_chan This is the beginning of a cleanup which will change all instances of "fsl_dma" to "fsldma" to match the name of the driver itself. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 4ce0e953f6286777452bf07c83056342d6b9b257 Author: Ira Snyder Date: Wed Jan 6 13:34:00 2010 +0000 fsldma: remove unused structure members Remove some unused members from the fsldma data structures. A few trivial uses of struct resource were converted to use the stack rather than keeping the memory allocated for the lifetime of the driver. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 272ca655090978bdaa2630fc44fb2c03da5576fd Author: Ira Snyder Date: Wed Jan 6 13:33:59 2010 +0000 fsldma: reduce kernel text size Some of the functions are written in a way where they use multiple reads and writes where a single read/write pair could suffice. This shrinks the kernel text size measurably, while making the functions easier to understand. add/remove: 0/0 grow/shrink: 1/4 up/down: 4/-196 (-192) function old new delta fsl_chan_set_request_count 120 124 +4 dma_halt 300 272 -28 fsl_chan_set_src_loop_size 208 156 -52 fsl_chan_set_dest_loop_size 208 156 -52 fsl_chan_xfer_ld_queue 500 436 -64 Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit b6cac5a30b325e14cda425670bb3568d3cad0aa8 Author: Stephen Smalley Date: Tue Feb 2 11:31:51 2010 -0500 selinux: Only audit permissions specified in policy Only audit the permissions specified by the policy rules. Before: type=AVC msg=audit(01/28/2010 14:30:46.690:3250) : avc: denied { read append } for pid=14092 comm=foo name=test_file dev=dm-1 ino=132932 scontext=unconfined_u:unconfined_r:load_policy_t:s0-s0:c0.c1023 tcontext=unconfined_u:object_r:rpm_tmp_t:s0 tclass=file After: type=AVC msg=audit(01/28/2010 14:52:37.448:26) : avc: denied { append } for pid=1917 comm=foo name=test_file dev=dm-1 ino=132932 scontext=unconfined_u:unconfined_r:load_policy_t:s0-s0:c0.c1023 tcontext=unconfined_u:object_r:rpm_tmp_t:s0 tclass=file Reference: https://bugzilla.redhat.com/show_bug.cgi?id=558499 Reported-by: Tom London Signed-off-by: Stephen D. Smalley Signed-off-by: James Morris commit 5ffaf8a361b4c9025963959a744f21d8173c7669 Author: Luis R. Rodriguez Date: Tue Feb 2 11:58:33 2010 -0500 ath9k: add support for 802.11n bonded out AR2427 Some single chip family devices are sold in the market with 802.11n bonded out, these have no hardware capability for 802.11n but ath9k can still support them. These are called AR2427. Cc: stable@kernel.org Reported-by: Rolf Leggewie Tested-by: Bernhard Reiter Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f09c256375c7cf1e112b8ef6306cdd313490d7c0 Author: Stanislaw Gruszka Date: Tue Feb 2 15:34:50 2010 +0100 airo: fix setting zero length WEP key Patch prevents call set_wep_key() with zero key length. That fix long standing regression since commit c0380693520b1a1e4f756799a0edc379378b462a "airo: clean up WEP key operations". Additionally print call trace when someone will try to use improper parameters, and remove key.len = 0 assignment, because it is in not possible code path. Reported-by: Chris Siebenmann Bisected-by: Chris Siebenmann Tested-by: Chris Siebenmann Cc: Dan Williams Cc: Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 299af9d3db0fd3a4994e5e66717ecd276bdd60da Author: Andriy Tkachuk Date: Tue Feb 2 16:33:53 2010 +0200 lib80211: Introduce TKIP_HDR_LEN define for code clarity Introduce TKIP_HDR_LEN define for code clarity (in the same way as CCMP_HDR_LEN). Also odd len variable (not used) dropped from lib80211_tkip_hdr(). Signed-off-by: Andriy V. Tkachuk Signed-off-by: John W. Linville commit d0833a6a2dbc169aba3abcc0904e5aea348bb4d3 Author: Andriy Tkachuk Date: Tue Feb 2 15:58:53 2010 +0200 lib80211: Cosmetics - make room for MIC/CRC near the actual calculation Signed-off-by: Andriy V. Tkachuk Signed-off-by: John W. Linville commit 1c3a02c215a5b955b342f29dc1719e1a5771eaf1 Author: Alexander Shishkin Date: Tue Feb 2 18:43:32 2010 +0200 HID: add NOGET quirk for Prodige Cordless Combo I happen to own a keyboard identified as 05af:3062 which is labeled as "FlatX Coldless Combo" by "Prodige", which exhibits input problems without NOGET quirk. For some reason, lsusb reports this device as "Jing-Mold Enterprise Co., Ltd", which is not mentioned anywhere on the package. A quick search on the intenet shows that there a other people who have this in their lsusb output, but apparently they don't have the problem I am seeing (or they are not such furious typists as myself). Signed-off-by: Alexander Shishkin Signed-off-by: Jiri Kosina commit d7eecb483cc29e929bbc5515b8def830d7fc6ad2 Author: Daniel Mack Date: Thu Jan 28 16:13:01 2010 +0800 jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g Signed-off-by: Daniel Mack Signed-off-by: Dave Kleikamp Cc: Jiri Kosina Cc: André Goddard Rosa Cc: jfs-discussion@lists.sourceforge.net commit d1c9ae6d1e7b95cedc8e39e8949e795379a0669e Author: Patrick McHardy Date: Tue Feb 2 11:46:50 2010 -0800 ipv4: ip_fragment: fix unbalanced rcu_read_unlock() Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7d39e849912f0c3c8c6fc94be7bf7d120b1ee0ba Author: Jiri Kosina Date: Tue Feb 2 20:46:34 2010 +0100 HID: update copyright Signed-off-by: Jiri Kosina commit 88f66ea98d7ae6a8b6a34e38b1b4fa51abc1c9ca Author: Steven Rostedt Date: Wed Jan 6 18:49:44 2010 -0500 kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl Distributions now have lsmod in /bin instead of /sbin. But to handle both cases, we look for it in /sbin /bin /usr/bin and /usr/sbin. If lsmod is not found in any of those paths, it defaults to use just lsmod and hopes that it lies in the path of the user. Tested-by: Xavier Chantry Signed-off-by: Steven Rostedt commit d5e1ca05f758fec2845a97fd7aa1eeca91c51a21 Author: Jaroslav Kysela Date: Tue Feb 2 17:48:51 2010 +0100 ALSA: dummy driver - add model parameter This is a cleanup for the dummy driver. The model kernel module parameter is introduced to select the soundcard emulation. Signed-off-by: Jaroslav Kysela commit 2a6ace1b3d4dc65401e71fc01af100692b9f27f8 Author: Kuninori Morimoto Date: Tue Feb 2 07:47:56 2010 -0800 net/irda: sh_sir: Add SuperH IrDA driver This is very simple IrDA SIR driver for SuperH. This driver was tested by irdaping/ircp on SH7724 EcoVec24 board Signed-off-by: Kuninori Morimoto Signed-off-by: David S. Miller commit c85bb41e93184bf5494dde6d8fe5a81b564c84c8 Author: Flavio Leitner Date: Tue Feb 2 07:32:29 2010 -0800 igmp: fix ip_mc_sf_allow race [v5] Almost all igmp functions accessing inet->mc_list are protected by rtnl_lock(), but there is one exception which is ip_mc_sf_allow(), so there is a chance of either ip_mc_drop_socket or ip_mc_leave_group remove an entry while ip_mc_sf_allow is running causing a crash. Signed-off-by: Flavio Leitner Signed-off-by: David S. Miller commit 8b64056dacf6ec81986d63dff96fca039fe95f6e Author: Oliver Hartkopp Date: Tue Feb 2 07:21:34 2010 -0800 can: deny filterlist access on non-CAN interfaces In commit 20dd3850bcf860561496827b711fa10fecf6e787 "can: Speed up CAN frame receiption by using ml_priv" the formerly used hlist of receiver lists for each CAN netdevice has been replaced. The hlist content ensured only CAN netdevices to be accessed by the can_rx_(un)register() functions which accidently dropped away together with the hlist receiver implementation. This patch re-introduces the check for CAN netdevices in can_rx_(un)register(). Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 10a199394b8f9b4c4e0be6e14a61109a7d891b1b Author: Simon Arlott Date: Tue Feb 2 15:33:38 2010 +0100 netfilter: xt_TCPMSS: SYN packets are allowed to contain data The TCPMSS target is dropping SYN packets where: 1) There is data, or 2) The data offset makes the TCP header larger than the packet. Both of these result in an error level printk. This printk has been removed. This change avoids dropping SYN packets containing data. If there is also no MSS option (as well as data), one will not be added because of possible complications due to the increased packet size. Signed-off-by: Simon Arlott Signed-off-by: Patrick McHardy commit c30f540b63047437ffa894b5353216410c480d1a Author: Alexey Dobriyan Date: Tue Feb 2 15:03:24 2010 +0100 netfilter: xtables: CONFIG_COMPAT redux Ifdef out struct nf_sockopt_ops::compat_set struct nf_sockopt_ops::compat_get struct xt_match::compat_from_user struct xt_match::compat_to_user struct xt_match::compatsize to make structures smaller on COMPAT=n kernels. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 026384d614b827f368834860c9b623ce08439b7e Author: Daniel Mack Date: Tue Feb 2 18:45:27 2010 +0800 ASoC: fix PXA SSP port resume Unconditionally save the register states when suspending and restore them again at resume time. Register contents were not preserved over suspend, and hence the driver takes false assumptions about them. The clock must be enabled to access the register block. Signed-off-by: Daniel Mack Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 59cdd9bc057a54384a7838231dd2672a89dff2ac Author: Joe Perches Date: Mon Feb 1 23:22:16 2010 -0800 ASoC: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 07cd8ada1aba5556b0d5d2264ce0f40d1ff1d131 Author: Joonyoung Shim Date: Tue Feb 2 18:53:19 2010 +0900 ASoC: Fix BCLK calculation of WM8994 This fixes BCLK calculation and removes unnecessary check code. Signed-off-by: Joonyoung Shim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fead215d1c0a385fc27a1fa96b7abbc4d66fb4c6 Author: Mark Brown Date: Tue Feb 2 10:06:55 2010 +0000 ASoC: Fix WM8994 dependency The dependency on MFD_WM8994 rather than I2C went awry. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 37feecb0ae8c29b713b957c053b05ad10c42c73b Author: Paul Mundt Date: Tue Feb 2 19:17:42 2010 +0900 sh: Disable generic IRQ probing. IRQ autoprobing hasn't actually worked for us at all since very early in 2.6, but no one seems to have noticed given that none of the drivers that use it see much testing. yenta_socket is the odd one out, and that depends on PCI IRQs which are fixed on all SH platforms anyways. Consequently, turning off autoprobing fixes up crashes triggered by yenta_socket and at least gets it working again on r7785rp. Signed-off-by: Paul Mundt commit 4b842c8571240d1173eaf00e114cc5cc160f1722 Author: Paul Mundt Date: Tue Feb 2 19:15:17 2010 +0900 sh: enable sparseirq for highlander and r2d. highlander and r2d are the only remaining ones that were blocking sparseirq being turned on by default, but it turns out that they already work fine with it by virtue of register_intc_controller(). As such, we can kill off the dependencies and turn it on by default. Signed-off-by: Paul Mundt commit deb9b22b8968fa0166d89c8ad1346e816cf1aec4 Author: Paul Mundt Date: Tue Feb 2 18:01:55 2010 +0900 sh: mach-dreamcast: Convert to sparseirq. Signed-off-by: Paul Mundt commit 6eb6f98396f7bd653d8fb15b06364c8c7d70e22c Author: Paul Mundt Date: Tue Feb 2 17:48:17 2010 +0900 sh: hd6446x: Convert to sparseirq. Follows the se7724 change and converts the hd64461 IRQ handling to sparseirq. Signed-off-by: Paul Mundt commit c7a967273a539a9a38413753c58125e777e2d30d Author: Paul Mundt Date: Tue Feb 2 17:38:04 2010 +0900 sh: mach-se: Convert SH7724 solution engine FPGA to sparseirq. This uses the new create_irq_nr() to build up the FPGA's desired virtual IRQ mapping and permits us to finally flip on sparseirq for this board. Signed-off-by: Paul Mundt commit e9867c569970d8afb4b882bafbbe81426bd46333 Author: Paul Mundt Date: Tue Feb 2 17:35:13 2010 +0900 sh: Provide create_irq_nr() for dynamic IRQ creation by number. This just reworks the existing create_irq_on_node() in to the new create_irq_nr() which is generally exposed. This permits boards that haven't converted over to sparseirq to try and use their existing ranges, rather than having arbitrary vectors assigned to them. Signed-off-by: Paul Mundt commit e27bf72465f4d867a2aea33cad5e9e255c4d92ff Author: Uwe Kleine-König Date: Sat Jan 30 16:23:51 2010 +0100 imx/mx25: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König commit 34101237d975ba37d19cbfe9318984af78332816 Author: Uwe Kleine-König Date: Fri Jan 29 17:36:05 2010 +0100 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König commit 7fc06d8c24fb7915d9cebc9aad7d3b40d8a6ef0b Author: Uwe Kleine-König Date: Fri Jan 15 10:13:30 2010 +0100 imx2x: convert serial.c to use soc-prefixed constants This makes the file compilable for a kernel that supports both imx21 and imx27. Signed-off-by: Uwe Kleine-König commit 08f9bf167c2729b46920fdef459787667ee68130 Author: Uwe Kleine-König Date: Thu Jan 14 22:04:49 2010 +0100 mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS This simplifies the macro and makes is similar to the other ..._IO_ADDRESS macros defined for imx SOCs. Signed-off-by: Uwe Kleine-König commit 9ea07ec05e8030f6b4e12c4a41a9d633c0ccb618 Author: Uwe Kleine-König Date: Wed Jan 13 18:07:11 2010 +0100 mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS Apart from MXC91231_IO_ADDRESS itself this was the only usage of MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with IMX_IO_ADDRESS and all helper macros can go away. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Fabio Estevam Cc: Daniel Schaeffer Cc: Alberto Panizzo Cc: Ivo Clarysse commit 8ac5b7c5ec8d46ad273d37aaa0d6e1f9cd2b01d9 Author: Uwe Kleine-König Date: Wed Jan 13 17:58:04 2010 +0100 imx: WARN in clk_disable if the clock isn't enabled Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 8a349d4b13c41c00564cd79f6fabdec347084758 Author: Joe Perches Date: Tue Feb 2 07:22:13 2010 +0000 spi/spi_s3c64xx.c: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Grant Likely commit fb7899b1f0b748ef966071f5dc23c59ebd57d08f Merge: 212b3c8 abe94c7 Author: Grant Likely Date: Tue Feb 2 01:05:22 2010 -0700 Merge commit 'v2.6.33-rc6' into secretlab/next-spi commit 4a461c85b643258e305eb5a3aced34009db2f818 Author: Peter Zijlstra Date: Mon Feb 1 11:13:39 2010 +0100 sched: Remove unused update_shares_locked() Commit f492e12ef050e02bf0185b6b57874992591b9be1 ("sched: Remove load_balance_newidle()") removed the only user of this function, so remove it too. Reported-by: Stephen Rothwell Signed-off-by: Peter Zijlstra LKML-Reference: <1265019219.24455.128.camel@laptop> Signed-off-by: Ingo Molnar commit 90fdbdb48442a03c72cae5463e6edb64cb3a3a7d Author: Akinobu Mita Date: Sun Jan 31 20:53:24 2010 +0900 sched: Use for_each_bit No change in functionality. Signed-off-by: Akinobu Mita Cc: Peter Zijlstra Cc: Andrew Morton LKML-Reference: <1264938810-4173-1-git-send-email-akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar commit ab386128f20c44c458a90039ab1bdc265ac474c9 Merge: dbfc196 ab65832 Author: Tejun Heo Date: Tue Feb 2 14:38:15 2010 +0900 Merge branch 'master' into percpu commit b4f74767a04e175c028336e06507fcc05f5a8618 Author: Guennadi Liakhovetski Date: Tue Jan 19 07:31:13 2010 +0000 sh: add high impedance mode management for SIUA pins on sh7722 This improves power management for the SIUA controller on sh7722. Similar patches might be desired for other SIU-enabled SH platforms. Signed-off-by: Guennadi Liakhovetski Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit 010ab820582d03bcd3648416b5837107e8a9c5f3 Author: Magnus Damm Date: Wed Jan 27 09:17:21 2010 +0000 mtd: sh_flctl SHBUSSEL and SEL_16BIT support This patch extends the sh_flctl driver with support for 16-bit bus configuration using SEL_16BIT and support for multiplexed pins using SHBUSSEL. Signed-off-by: Magnus Damm Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit b79c7adf82e8b8a6d6ad1dadf7e687a4a030cf8c Author: Magnus Damm Date: Tue Feb 2 13:01:25 2010 +0900 mtd: trivial sh_flctl changes This patch contains a few changes for the sh_flctl driver: - not sh7723-only driver - get rid of kconfig dependency - use dev_err() instead of printk() - use __devinit and __devexit for probe()/remove() - fix probe() return values Signed-off-by: Magnus Damm Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 9d3f1881abeae0494a27716b08fcf2d3264bb0fa Merge: b6c58b1 bc10e87 Author: Paul Mundt Date: Tue Feb 2 11:33:45 2010 +0900 Merge branch 'sh/stable-updates' commit 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f Author: Wu Fengguang Date: Fri Jan 22 11:21:05 2010 +0800 x86: Use the generic page_is_ram() The generic resource based page_is_ram() works better with memory hotplug/hotremove. So switch the x86 e820map based code to it. CC: Andi Kleen CC: KAMEZAWA Hiroyuki CC: Yinghai Lu Signed-off-by: Wu Fengguang LKML-Reference: <20100122033004.470767217@intel.com> Cc: Andrew Morton Signed-off-by: H. Peter Anvin commit 1b5576e69a5fe168c08a159685ac366316ac9bbc Author: Yinghai Lu Date: Fri Jan 22 11:21:04 2010 +0800 x86: Remove BIOS data range from e820 In preparation for moving to the generic page_is_ram(), make explicit what we expect to be reserved and not reserved. Tested-by: Wu Fengguang Signed-off-by: Yinghai Lu LKML-Reference: <20100122033004.335813103@intel.com> Cc: Andrew Morton Signed-off-by: H. Peter Anvin commit 53df8fdc15fb646b0219e43c989c2cdab1ab100c Author: Wu Fengguang Date: Wed Jan 27 11:06:39 2010 +0800 Move page_is_ram() declaration to mm.h Move page_is_ram() declaration to mm.h, it makes no sense in . Signed-off-by: Wu Fengguang LKML-Reference: <20100127030639.GD8132@localhost> Signed-off-by: H. Peter Anvin commit e52730071567ec5b6f57e21d6693b112e01e1d0e Author: Andrew Morton Date: Tue Jan 26 16:31:19 2010 -0800 Generic page_is_ram: use __weak Use __weak instead of __attribute__((weak)). Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin commit 61ef2489dbf587258526cfd4ebf4bba3b079f401 Author: Wu Fengguang Date: Fri Jan 22 16:16:19 2010 +0800 resources: introduce generic page_is_ram() It's based on walk_system_ram_range(), for archs that don't have their own page_is_ram(). The static verions in MIPS and SCORE are also made global. v4: prefer plain 1 instead of PAGE_IS_RAM (H. Peter Anvin) v3: add comment (KAMEZAWA Hiroyuki) "AFAIK, this "System RAM" information has been used for kdump to grab valid memory area and seems good for the kernel itself." v2: add PAGE_IS_RAM macro (Américo Wang) Cc: Chen Liqin Cc: Lennox Wu Cc: Américo Wang Cc: linux-mips@linux-mips.org Cc: Yinghai Lu Acked-by: Ralf Baechle Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang LKML-Reference: <20100122081619.GA6431@localhost> Cc: Andrew Morton Signed-off-by: H. Peter Anvin commit c85a400499093b2025238413198e48e4d825723e Author: Thadeu Lima de Souza Cascardo Date: Mon Feb 1 16:17:01 2010 -0200 ALSA: trivial: sound seq ioctl dbg: print hexadecimal value padded with 0s Instead of padding with blanks and printing "number=0x a", print "number=0x0a". Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Takashi Iwai commit e8b217e7530c6a073ac69f1c85b922d93fdf5647 Author: Christoph Hellwig Date: Tue Feb 2 10:16:26 2010 +1100 xfs: remove invalid barrier optimization from xfs_fsync We always need to flush the disk write cache and can't skip it just because the no inode attributes have changed. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner commit 20026d92013d7bb3abb295337191def6758fc086 Author: Dave Chinner Date: Thu Feb 4 09:48:58 2010 +1100 xfs: kill the unused XFS_QMOPT_* flush flags V2 dquots are never flushed asynchronously. Remove the flag and the async write support from the flush function. Make the default flush a delwri flush to make the inode flush code, which leaves the XFS_QMOPT_SYNC the only flag remaining. Convert that to use SYNC_WAIT instead, just like the inode flush code. V2: - just pass flush flags straight through Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit ab5132a26236e308c6d3d832a3e04fca351656d8 Author: Pavel Roskin Date: Sat Jan 30 21:37:24 2010 -0500 ath9k: fix access to freed data on unload Calling ath_bus_cleanup() after ieee80211_free_hw() resulted in access to common->bus_ops, which is already freed as part of the device data. Remove the cleanup field in struct ath_bus_ops, as it was never used properly. Remove ath_bus_cleanup(). Merge cleanup functions in place of the ath_bus_cleanup() calls. Take care not to use any device data after ieee80211_free_hw(). Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e389900ed31975f3ce091764bf394b045058dad1 Author: Hamish Guthrie Date: Mon Feb 1 17:42:38 2010 +0100 ps3_gelic_wireless: Remove superfluous debug info Signed-off-by: John W. Linville commit 3c384053ce4cb1949f5575c28e30e6ceea8cb39b Author: Vasanthakumar Date: Mon Feb 1 18:49:07 2010 +0530 mac80211: Don't call rate control when HW handles it Rate control should not be called to update the tx status when HW does the RC. Signed-off-by: Vasanthakumar Signed-off-by: John W. Linville commit b4d57adb727ec7c34020390eeb0eeb9e0a2959bc Author: Felix Fietkau Date: Sun Jan 31 23:25:24 2010 +0100 mac80211: fix sta lookup with AP VLAN interfaces and injected frames When injecting frames, mac80211 currently looks for the first AP interface that matches the source address of the injected frame. This breaks when such a frame is directed at a STA that has been moved to a VLAN. This patch fixes it by using sta_info_get_bss instead of sta_info_get, which also finds stations belonging to a VLAN interface of the same BSS as the AP interface. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 17ad353b8d9843731258b5d23556667b764939e9 Author: Felix Fietkau Date: Sun Jan 31 21:56:25 2010 +0100 mac80211: fix monitor mode tx radiotap header handling When an injected frame gets buffered for a powersave STA or filtered and retransmitted, mac80211 attempts to parse the radiotap header again, which doesn't work because it's gone at that point. This patch adds a new flag for checking the availability of a radiotap header, so that it only attempts to parse it once, reusing the tx info on the next call to ieee80211_tx(). This fixes severe issues with rekeying in AP mode. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 4754ffd68bc14de8db01451c49bb07adebe1e422 Author: Felix Fietkau Date: Sun Jan 31 21:50:12 2010 +0100 mac80211: fix sta lookup for received action frames on an AP VLAN When looking for a matching interface, __ieee80211_rx_handle_packet loops over all active interfaces, looking for matching stations. Because AP VLAN interfaces are not processed as part of this loop, it needs to use sta_info_get_bss instead of sta_info_get in order to find a STA that has been moved to a VLAN. This fixes issues with aggregation setup/teardown. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e0b20f1c67fc4379fce430ff720969f35e123eed Author: Pavel Roskin Date: Sat Jan 30 19:55:27 2010 -0500 mac80211: reduce stack usage in sta_agg_status_read() Use a more compact and readable format for "agg_status" to reduce the stack frame to less than 1024 bytes. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 4c82bf8e5689b1dddd9bcec70efc3b70edef1670 Author: Pavel Roskin Date: Sat Jan 30 19:55:09 2010 -0500 mac80211: reduce stack usage in sta_ht_capa_read() The maximal size of the "ht_capa" file is 430 bytes. In most cases, it's much shorter. Use a 512 byte long buffer. 1024 bytes is too much and causes a warning with CONFIG_FRAME_WARN=1024. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 9501fefec6aa9a3319bb61edb99851ba30653f30 Author: Rafał Miłecki Date: Sat Jan 30 20:18:07 2010 +0100 b43: N-PHY: implement setting RF sequence Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 52cb5e978f505ba6436dfe1867da0d2818fdb9b7 Author: Rafał Miłecki Date: Sat Jan 30 20:18:06 2010 +0100 b43: N-PHY: add TX radio setup for newer PHYs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 38bb902921dc31c15a707b74ebc6896438bb357e Author: Rafał Miłecki Date: Sat Jan 30 20:18:05 2010 +0100 b43: N-PHY: fix Cal TX IQ LO for newer PHYs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6e3b15a9e7c3e4f22e9ade658b9e185311078648 Author: Rafał Miłecki Date: Sat Jan 30 20:18:04 2010 +0100 b43: N-PHY: add RSSI selection for newer PHYs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 99b82c419bc685c5ca3d8d815564bac41e2716e2 Author: Rafał Miłecki Date: Sat Jan 30 20:18:03 2010 +0100 b43: N-PHY: split RSSI selection into two per-PHY-revision functions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 09d989d179d0c679043556dda77c51b41a2dae7e Author: Luis R. Rodriguez Date: Fri Jan 29 19:58:57 2010 -0500 cfg80211: add regulatory hint disconnect support This adds a new regulatory hint to be used when we know all devices have been disconnected and idle. This can happen when we suspend, for instance. When we disconnect we can no longer assume the same regulatory rules learned from a country IE or beacon hints are applicable so restore regulatory settings to an initial state. Since driver hints are cached on the wiphy that called the hint, those hints are not reproduced onto cfg80211 as the wiphy will respect its own wiphy->regd regardless. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a2bff2694b02448e1d5873ac010582bc9898021c Author: Luis R. Rodriguez Date: Fri Jan 29 19:58:56 2010 -0500 cfg80211: avoid flushing the global workqueue for core reg hints When cfg80211 starts it will send a core regulatory hint. This is sent to the global workqueue but we force processing of it by flushing the global workqueue. The flushing was done since cfg80211 needs last_request to always be populated. Avoid flushing the global workqueue by processing the work required immediately instead of putting it into a linked list and processing it after the flush. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ef5127a4d256b9c0f47caae6cdc8ccfceedb09f9 Author: Rafał Miłecki Date: Sat Jan 30 00:12:20 2010 +0100 b43: N-PHY: add workarounds for gain control Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 28fd7daabfb35b7a0df2f7eaf460221e16dd2608 Author: Rafał Miłecki Date: Sat Jan 30 00:12:19 2010 +0100 b43: N-PHY: update general workarounds Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 991a0987d9e821df1790bbbc368cf36db0c678d3 Author: Pavel Roskin Date: Fri Jan 29 17:22:26 2010 -0500 ath9k: allocate string buffer in read_file_dma() by kmalloc() Using stack for that causes warnings with CONFIG_FRAME_WARN=1024 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit f643e51d717b52ac28830e8bb98559b006a73bf4 Author: Pavel Roskin Date: Fri Jan 29 17:22:12 2010 -0500 ath: make gcc check format arguments of ath_print(), fix all misuses Numeric channel is hard to get, so it won't be printed. Replace Mhz with MHz on the affected lines and add commas as needed. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 3b9cfc0a99f88c0db7c72363620584a9b40b4543 Author: Emese Revfy Date: Sun Jan 31 20:16:34 2010 +0100 x86, mtrr: Constify struct mtrr_ops This is part of the ops structure constification effort started by Arjan van de Ven et al. Benefits of this constification: * prevents modification of data that is shared (referenced) by many other structure instances at runtime * detects/prevents accidental (but not intentional) modification attempts on archs that enforce read-only kernel data at runtime * potentially better optimized code as the compiler can assume that the const data cannot be changed * the compiler/linker move const data into .rodata and therefore exclude them from false sharing Signed-off-by: Emese Revfy LKML-Reference: <4B65D712.3080804@gmail.com> Signed-off-by: H. Peter Anvin commit 9e6e96a197a03752d39a63e4f83e0b707ccedad7 Author: Mark Brown Date: Fri Jan 29 17:47:12 2010 +0000 ASoC: Add WM8994 CODEC driver The WM8994 is a highly integrated ultra-low power hi-fi audio subsystem designed for smartphones and other portable devices rich in multimedia features. It provides advanced digital mixing facilities enabling low power high quality interconnection of CPU, baseband and other audio sources through flexible digital and analogue routing, and integrates a class W headphone driver and stereo class D speaker drivers. Signed-off-by: Mark Brown commit be587ef4f20cb5a0e42264909fa702a24081a160 Author: Mark Brown Date: Mon Feb 1 18:31:06 2010 +0000 ASoC: Activate DCS correction for WM8993 Use a two code correction for optimal performance. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3ed7074c4cc0de5ba77e180e5d96c23ef96859f0 Author: Mark Brown Date: Wed Jan 20 17:39:45 2010 +0000 ASoC: Improved wm_hubs headphone handling Perform DC servo offset calibration using a series update sequence rather than startup update sequence, tuning the configuration of the WM8993 DC servo to make best use of this. Also introduce currently unused data allowing us to correct for any systematic errors in the DC servo calibration results and an alternative startup path for the headphone output which performs better with some chip revisions. The alternative setup sequence is enabled for WM8993. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 84c9b7271a0af08c4e5fce3901a0ad3d952036bc Author: Ben Dooks Date: Tue Jan 26 16:54:21 2010 +0900 ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h Merge these two headers into one, these two SoCs are so similar. Note, correct fault in mach-smdk2443.h including the wrong header. Signed-off-by: Ben Dooks commit 58bac7b8ded70c39bcd5f7037091051c277618aa Author: Ben Dooks Date: Tue Jan 26 16:47:41 2010 +0900 ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx into mach-s3c2440 now this directory is serving both SoCs. Signed-off-by: Ben Dooks commit 70556b143ae4cf404a73c2461a6bf7fef3fefbf7 Author: Ben Dooks Date: Tue Jan 26 16:37:50 2010 +0900 ARM: S3C24XX: Remove old mach-s3c2442 Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process. Signed-off-by: Ben Dooks commit 916ee9249a7f19d8eb18cc9ee16ca495a517ab34 Author: Ben Dooks Date: Tue Jan 26 16:31:32 2010 +0900 ARM: S3C244X: Move S3C2442 code into S3C2440 Move the remaining S3C2442 code into mach-s3c2440 as there is only one file currently in there and these two SoCs are very similar. Signed-off-by: Ben Dooks commit 1f51bbfd5905b8c860cc95ae10c20e0844d0ade8 Author: Ben Dooks Date: Tue Jan 26 16:27:08 2010 +0900 ARM: S3C2440: Fix SMDK2440 SoC selection Fix the entries for SMDK2440 should have allowed for S3C2440 or S3C2440 SoC selection but this depended on ARCH_S3C2440 which has not been around for a while. Remove the dependency to allow this to be selected. Signed-off-by: Ben Dooks commit 491547d43bc2393de914b5ad18b6f5219107f918 Author: Ben Dooks Date: Tue Jan 26 16:13:35 2010 +0900 ARM: S3C2442: Merge s3c2442.c and clock.c Merge s3c2442.c and clock.c as the s3c242.c does not contain much and the clock parts are always built for s3c2442 anyway. Signed-off-by: Ben Dooks commit 5cbcccb370355d4cd8534796bf32ac8bb04627cc Author: Ben Dooks Date: Tue Jan 26 16:06:46 2010 +0900 ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440 directory as the S3C2440 and S3C2442 are very close. Signed-off-by: Ben Dooks commit c6c97bdaa3307d0811f14c99c38c63a8dae36e1f Author: John W. Linville Date: Mon Feb 1 09:55:56 2010 -0500 ps3_gelic_wireless: fix format warning Signed-off-by: John W. Linville commit 30ede1b9f08204db178bf17bb1800dfee8327caa Merge: d0d2c38 6123637 Author: Takashi Iwai Date: Mon Feb 1 15:46:00 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc commit 2f1ff6614cb5938e5c5760358752d92deb67fb63 Author: Joe Perches Date: Sun Jan 31 12:02:12 2010 -0800 ASoC: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b0580913797034a1001e867b8b492c75226bf77e Author: Guennadi Liakhovetski Date: Fri Jan 29 14:51:26 2010 +0100 ASoC: improve MCLKDIV calculation in wm8978, when OPCLK is not used In case, if OPCLK is not used, and PLL is used for driving the codec, the choice of PLL output frequency could result in a needlessly imprecise system clock frequency. Use an iterative process to select a precise configuration. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6e9065d756df5dac6dc02b94b82b4f5dbbf38caf Author: Artem Bityutskiy Date: Mon Jan 25 17:09:30 2010 +0200 UBI: add write checking Add an extra debugging check function which validates writes. After every write it reads the data back, compares it with the original data, and complains if they mismatch. Useful for debugging. No-op if extra debugging checks are disabled. Signed-off-by: Artem Bityutskiy commit adbf05e3ec6ea380ba145b6fa89d9125ed76eb98 Author: Artem Bityutskiy Date: Wed Jan 20 10:28:58 2010 +0200 UBI: simplify debugging return codes UBI debugging functions were a little bit over-engineered and returned more error codes than needed, and the callers had to do useless checks. Simplify the return codes. Impact: only debugging code is affected, which means that for non-developers this is a no-op patch. Signed-off-by: Artem Bityutskiy commit 0bf1c4399afee6a2031b0ee943a4c016e53f727c Author: Artem Bityutskiy Date: Tue Jan 12 12:26:42 2010 +0200 UBI: fix attaching error path In the error path of 'ubi_attach_mtd_dev()' we have a tricky situation: we have to release things differently depending on at which point the failure happening. Namely, if @ubi->dev is not initialized, we have to free everything ourselves. But if it was, we should not free the @ubi object, because it will be freed in the 'dev_release()' function. And we did not get this situation right. This patch introduces additional argument to the 'uif_init()' function. On exit, this argument indicates whether the final 'free(ubi)' will happen in 'dev_release()' or not. So the caller always knows how to properly release the resources. Impact: all memory is now correctly released when UBI fails to attach an MTD device. Signed-off-by: Artem Bityutskiy commit f9b0080e10e0ce3b8acbe91ae6a50da4f2ed7339 Author: Artem Bityutskiy Date: Tue Jan 5 16:48:40 2010 +0200 UBI: support attaching by MTD character device name This patch adds a capability to attach MTD devices by their character device paths. For example, one can do: $ modprobe ubi mtd=/dev/mtd0 to attach /dev/mtd0. Signed-off-by: Artem Bityutskiy commit 9e0c7ef3f6c95357ce359a4f9223f0dfcd21cef7 Author: Artem Bityutskiy Date: Wed Jan 6 14:20:31 2010 +0200 UBI: mark few variables as __initdata The @mtd_devs and @mtd_dev_param variables are used only during the initialization, and all functions that use the variables have the __init prefix. This means we can safely mark the variables as __initdata, which is a tiny optimization. Impact: tiny RAM consumption optimization when UBI is used as a kernel module. Signed-off-by: Artem Bityutskiy commit 6123637fafbf445cc9ce5774dc9516da0b2daa88 Author: Clemens Ladisch Date: Mon Feb 1 13:30:56 2010 +0100 sound: control: fix minimum TLV length Allow TLV blocks that do not have any values; the smallest possible TLV is an empty container or one where the information is only in the tag. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit a75d7a4cf50d1cee14d8c9aaa2b971232d10f2c1 Author: Clemens Ladisch Date: Mon Feb 1 13:29:50 2010 +0100 sound: control: actually allow TLV command access Creating a control with TLV_COMMAND access was not possible because snd_ctl_new1() forgot to include it in the mask of allowable access bits. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit b6c58b1d987a5795086c5c2babd8c7367d2fdb8c Author: Paul Mundt Date: Mon Feb 1 20:01:50 2010 +0900 sh: Improved multi-resource handling for SH7780 PCI. The SH7780 PCI controller supports 3 different ranges of PCI memory in addition to its PCI I/O window. In the case of 29-bit mode, only 2 memory windows are supported, while in 32-bit mode all 3 are visible. This attempts to make the resource handling completely dynamic and to permit platforms to map in as many apertures as they can handle. Signed-off-by: Paul Mundt commit ef407beefbd9928792ccc93857e408e0057bc17b Author: Paul Mundt Date: Mon Feb 1 16:39:46 2010 +0900 sh: Hook up ERR/PERR/SERR detection for SH7780 PCI host controllers. These were never handled before, so implement some common infrastructure to support them, then make use of that in the SH7780-specific code. In practice there is little here that can not be generalized for SH4 parts, which will be an incremental change as the 7780/7751 code is gradually unified. Signed-off-by: Paul Mundt commit 44298ec0f20c45b9be96e181976aef1152d373b2 Author: Joe Perches Date: Thu Jan 28 20:59:29 2010 +0000 tulip/xircom_cb.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove DRV_NAME and xircom_cb from pr_ Convert embedded function names in logging messages to %s, __func__ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a1e37bc5e2d0ff8d025221e27c2bfff762072311 Author: Joe Perches Date: Thu Jan 28 20:59:28 2010 +0000 tulip/winbond-840.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Convert %d.%d.%d.%d to %pI4 Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e02fb7aa0714ca9357571bb15ef0fe278a150cc7 Author: Joe Perches Date: Thu Jan 28 20:59:27 2010 +0000 tulip/uli526x.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove DRV_NAME from logging messages Add do {} while(0) to ULI526X_DBUG macro Make SHOW_MEDIA_TYPE macro more readable Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 27146c43c4dbb727c4a211541af46577de2984af Author: Joe Perches Date: Thu Jan 28 20:59:26 2010 +0000 tulip/timer.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 22086a1172b69b9f6200e169dc99a252a204affb Author: Joe Perches Date: Thu Jan 28 20:59:25 2010 +0000 tulip/pnic2.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1df8bbd1420705277cd382b1386cda724d61a678 Author: Joe Perches Date: Thu Jan 28 20:59:24 2010 +0000 tulip/pnic.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit fa0b9a4c41490d550ebd3bd418f4551c989fec5d Author: Joe Perches Date: Thu Jan 28 20:59:23 2010 +0000 tulip/media.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit abe02af8263ae17e201994a1be7fc5eac6642acf Author: Joe Perches Date: Thu Jan 28 20:59:22 2010 +0000 tulip/interrupt.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e9cd1cbcda5e21706b03b543b1b73600b07f323f Author: Joe Perches Date: Thu Jan 28 20:59:21 2010 +0000 tulip/eeprom.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit dde7c8ef167996689bc464eb65d2b09ef05263c2 Author: Joe Perches Date: Thu Jan 28 20:59:20 2010 +0000 tulip/dmfe.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove 'DRV_NAME ": ' from logging messages Convert commented out printks to pr_debug Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f639dc7dadcbd97f1d666d5ffe00eab1ea3c0f6d Author: Joe Perches Date: Thu Jan 28 20:59:19 2010 +0000 tulip/de2104x.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 985a63ed3faf0faaba840d806f5ca4d360d13ad3 Author: Joe Perches Date: Thu Jan 28 20:59:18 2010 +0000 tulip/21142.c: Use dev_ and pr_ Convert printks to dev_ where a dev is available Convert printks to pr_ where not Coalesce format strings Change print formats with %d.dx to %0dx Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit d60bec4eb7076acfc940cca3f9f219e7653a1466 Author: Joe Perches Date: Thu Jan 28 20:59:17 2010 +0000 tulip_core: Use dev_ and pr_ Convert printks to dev_ where appropriate Convert printks to pr_ Change print formats with %d.dx to %0dx Coalesce long formats Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit bcf39352eb9e9026f7a1028d4bce3707b65f104b Author: Paul Mundt Date: Mon Feb 1 13:11:25 2010 +0900 sh: Handle PCI controller resource conflicts. register_pci_controller() can fail, but presently is a void function. Change this over to an int so that we can bail early before continuing on with post-registration initialization (such as throwing the controller in to 66MHz mode in the case of the SH7780 host controller). Signed-off-by: Paul Mundt commit 85b59f5bb24aeca1a987cbb206e228bf630c8327 Author: Paul Mundt Date: Mon Feb 1 13:01:42 2010 +0900 sh: Enable PCI66 support for SH7780 host controller. This adds some helper glue for scanning the bus and determining if all of the devices are 66MHz capable or not before flipping on 66MHz mode. This isn't quite to spec, but it's fairly consistent with what other embedded controllers end up having to do. Scanning code cribbed from the MIPS txx9 PCI code. Signed-off-by: Paul Mundt commit aee4467b5ce5047401efb4175b1360ec1734affc Author: Paul Mundt Date: Mon Feb 1 11:33:22 2010 +0900 sh: Fix up large system memory handling for SH7780 PCI. For systems that have more than 512MB we need to set up an additional mapping, this fixes up the rounding to the next power of two and splits out the mapping accordingly between the two local bus mapping windows. Signed-off-by: Paul Mundt commit 76cdc083f4d1a2a12a961634672fb9ca7adca29c Author: Alberto Panizzo Date: Sun Jan 31 17:52:07 2010 -0800 Input: add imx-keypad driver to support the IMX Keypad Port The IMX family of Application Processors is shipped with a Keypad Port supported by this driver. The peripheral can control up to an 8x8 matrix key pad where all the scanning is done via software. The hardware provides two interrupts: one for key presses (KDI) and one for all key releases (KRI). There is also a simple circuit for glitch reduction (said for synchronization) made by two series of 3 D-latches clocked by the keypad-clock that stabilize the interrupts sources. KDI and KRI are fired only if the respective conditions are maintained for at last 4 keypad-clock cycle. Since those circuits are poor for a correct debounce process (the keypad-clock frequency is 32K and bounces longer than 94us are not masked) the driver, when an interrupt arrives, samples the matrix with a period of 10ms until the readins are stable for IMX_KEYPAD_SCANS_FOR_STABILITY times (currently set at 3). After getting stable result appropriate events are sent through the input stack. If some keys are maintained pressed, the driver continues to scan the matrix with a longer period (60ms) to catch possible multiple key presses without overloading the cpu. This process ends when all keys are released. This driver is tested to build in kernel or as a module and follow the specification of Freescale Application processors: i.MX25 i.MX27 i.MX31 i.MX35 i.MX51 especially tested on i.MX31. Signed-off-by: Alberto Panizzo Signed-off-by: Dmitry Torokhov commit 59f411b62c9282891274e721fea29026b0eda3cc Author: Ingo Molnar Date: Sun Jan 31 08:27:58 2010 +0100 perf lock: Clean up various details Fix up a few small stylistic details: - use consistent vertical spacing/alignment - remove line80 artifacts - group some global variables better - remove dead code Plus rename 'prof' to 'report' to make it more in line with other tools, and remove the line/file keying as we really want to use IPs like the other tools do. Signed-off-by: Ingo Molnar Cc: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1264851813-8413-12-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 9b5e350c7a46a471d5b452836dbafe9aeaeca435 Author: Hitoshi Mitake Date: Sat Jan 30 20:43:33 2010 +0900 perf lock: Introduce new tool "perf lock", for analyzing lock statistics Adding new subcommand "perf lock" to perf. I have a lot of remaining ToDos, but for now perf lock can already provide minimal functionality for analyzing lock statistics. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1264851813-8413-12-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit c965be10ca3cb0bdd04016c852764afaf8e647c8 Author: Hitoshi Mitake Date: Sat Jan 30 20:43:32 2010 +0900 perf lock: Enhance information of lock trace events Add wait time and lock identification details. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1264851813-8413-11-git-send-email-mitake@dcl.info.waseda.ac.jp> [ removed the file/line bits as we can do that better via IPs ] Signed-off-by: Ingo Molnar commit 18e97e06b5fb2d7f6cf272ca07d26d8247db8723 Author: Hitoshi Mitake Date: Sat Jan 30 20:43:24 2010 +0900 perf: Add util/include/linuxhash.h to include hash.h of kernel linux/hash.h, hash header of kernel, is also useful for perf. util/include/linuxhash.h includes linux/hash.h, so we can use hash facilities (e.g. hash_long()) in perf now. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1264851813-8413-3-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 86d8d29634de4464d568e7c335c0da6cba64e8ab Author: Hitoshi Mitake Date: Sat Jan 30 20:43:23 2010 +0900 perf tools: Add __data_loc support This patch is required to test the next patch for perf lock. At 064739bc4b3d7f424b2f25547e6611bcf0132415 , support for the modifier "__data_loc" of format is added. But, when I wanted to parse format of lock_acquired (or some event else), raw_field_ptr() did not returned correct pointer. So I modified raw_field_ptr() like this patch. Then raw_field_ptr() works well. Signed-off-by: Hitoshi Mitake Acked-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Tom Zanussi Cc: Steven Rostedt LKML-Reference: <1264851813-8413-2-git-send-email-mitake@dcl.info.waseda.ac.jp> [ v3: fixed minor stylistic detail ] Signed-off-by: Ingo Molnar commit a8e6f734ce9a79d44ebb296f2a341f435227b34e Author: Hitoshi Mitake Date: Sat Jan 30 20:55:41 2010 +0900 Revert "perf record: Intercept all events" This reverts commit f5a2c3dce03621b55f84496f58adc2d1a87ca16f. This patch is required for making "perf lock rec" work. The commit f5a2c3dce0 changes write_event() of builtin-record.c . And changed write_event() sometimes doesn't stop with perf lock rec. Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: [ that commit also causes perf record to not be Ctrl-C-able, and it's concetually wrong to parse the data at record time (unconditionally - even when not needed), as we eventually want to be able to do zero-copy recording, at least for non-archive recordings. ] Signed-off-by: Ingo Molnar commit 44b57f1cc72a4a30b31f11b07a927d1534f1b93d Author: Nick Piggin Date: Wed Jan 27 22:27:40 2010 +1100 slab: fix regression in touched logic When factoring common code into transfer_objects in commit 3ded175 ("slab: add transfer_objects() function"), the 'touched' logic got a bit broken. When refilling from the shared array (taking objects from the shared array), we are making use of the shared array so it should be marked as touched. Subsequently pulling an element from the cpu array and allocating it should also touch the cpu array, but that is taken care of after the alloc_done label. (So yes, the cpu array was getting touched = 1 twice). So revert this logic to how it worked in earlier kernels. This also affects the behaviour in __drain_alien_cache, which would previously 'touch' the shared array and now does not. I think it is more logical not to touch there, because we are pushing objects into the shared array rather than pulling them off. So there is no good reason to postpone reaping them -- if the shared array is getting utilized, then it will get 'touched' in the alloc path (where this patch now restores the touch). Acked-by: Christoph Lameter Signed-off-by: Nick Piggin Signed-off-by: Pekka Enberg commit 66ac2f28b658f1938035966cafc42501758b4324 Author: Uwe Kleine-König Date: Mon Jan 25 17:55:16 2010 +0100 mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR Signed-off-by: Uwe Kleine-König commit 7d58289fc315258b4829a29d21c540eb35dd6feb Author: Uwe Kleine-König Date: Mon Jan 11 11:37:24 2010 +0100 mx1: prefix SOC specific defines with MX1_ and deprecate old names The old names are defined only if the cpp symbol IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all files below arch/arm/mach-mx1. This was done earlier for mx2 and mx3, too. USBD_INT0 is for now defined unconditionally to prevent breaking drivers/usb/gadget/imx_udc. While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which adds a cast to the IO_ADDRESS macro fixing many warnings like arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast . Signed-off-by: Uwe Kleine-König commit 429722e19dff319aa87ee552beadee71d41a3655 Author: Dmitry Torokhov Date: Sat Jan 30 01:44:20 2010 -0800 Input: Mac button emulation - allow compiling as a module Not all systems require Mac-style button emulation, however distributions enable it by default so it is readily available. Allow compiling it as a module so it can be loaded only on systems that actually require it. Signed-off-by: Dmitry Torokhov commit 99b089c3c38a83ebaeb1cc4584ddcde841626467 Author: Dmitry Torokhov Date: Sat Jan 30 00:53:29 2010 -0800 Input: Mac button emulation - implement as an input filter Current implementation of Mac mouse button emulation plugs into legacy keyboard driver, converts certain keys into button events on a separate device, and suppresses the real events from reaching tty. This worked well enough until user space started using evdev which was completely unaware of this arrangement and kept sending original key presses to its users. Change the implementation to use newly added input filter framework so that original key presses are not transmitted to any handlers. As a bonus remove SYSCTL dependencies from the code and use Kconfig instead; also do not create the emulated mouse device until user activates emulation. Signed-off-by: Dmitry Torokhov commit ef7995f4e46b1677f3eaaf547316e1a910b38dcb Author: Dmitry Torokhov Date: Fri Jan 29 23:59:12 2010 -0800 Input: implement input filters Sometimes it is desirable to suppress certain events from reaching input handlers and thus user space. One such example is Mac mouse button emulation code which catches certain key presses and converts them into button clicks as if they were emitted by a virtual mouse. The original key press events should be completely suppressed, otherwise user space will be confused, and while keyboard driver does it on its own evdev is blissfully unaware of this arrangement. This patch adds notion of 'filter' to the standard input handlers, which may flag event as filtered thus preventing it from reaching other input handlers. Filters don't (nor will they ever) have a notion of priority relative to each other, input core will run all of them first and any one of them may mark event as filtered. This patch is inspired by similar patch by Matthew Garret but the implementation and intended usage are quite different. Signed-off-by: Dmitry Torokhov commit 45cdba4d376adfd30cfbda1b7d43110818d967cc Author: Thadeu Lima de Souza Cascardo Date: Fri Jan 29 23:53:57 2010 -0800 Input: uinput - remove BKL from uinput_open function Commit 8702965848ed4bee27486a3e3d2ae34ebba6dd83 pushed down the BKL into uinput open function. However, there's nothing that needs locking in there. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Dmitry Torokhov commit 4ec07bba6945290c48dcc5b789cbd7adeabd7695 Author: Ben Dooks Date: Sat Jan 30 15:02:58 2010 +0900 ARM: S3C2443: Use common clock gate code Add common clock gate code for each of the S3C2443 clock gate code. Whether to move this elsewhere will be decided later. Signed-off-by: Ben Dooks commit 31a090ae0693af189fc7a8ad16cece4878acad33 Author: Paul Mundt Date: Sat Jan 30 11:29:56 2010 +0900 sh: Fix up asm/hw_breakpoint.h header check. Presently headers_check complains about linux/kdebug.h being unexported, so just bump the __KERNEL__ ifdef up, as per the x86 change. Signed-off-by: Paul Mundt commit 97b19778ee5dd0484493f12f6a9cf9391cf0aefb Author: Paul Mundt Date: Sat Jan 30 11:04:38 2010 +0900 sh: mach-se: Fix up irq_desc reference. The irq_desc needs to be accessed with irq_to_desc(), this fixes up a build error with irq_desc being undefined. Signed-off-by: Paul Mundt commit aa696a6f349638428982bb52763f4cda851632fa Author: Trond Myklebust Date: Fri Jan 29 16:44:25 2010 -0500 nfsd: Use vfs_fsync_range() in nfsd_commit The NFS COMMIT operation allows the client to specify the exact byte range that it wishes to sync to disk in order to optimise server performance. Signed-off-by: Trond Myklebust Reviewed-by: Christoph Hellwig Signed-off-by: J. Bruce Fields commit 9d133e5db993d577bd868b54083869fe5479fcff Author: Suresh Siddha Date: Fri Jan 29 11:42:21 2010 -0800 x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path Lowest priority delivery of logical flat mode is broken on some systems, such that even when IO-APIC RTE says deliver the interrupt to a particular CPU, interrupt subsystem delivers the interrupt to totally different CPU. For example, this behavior was observed on a P4 based system with SiS chipset which was reported by Li Zefan. We have been handling this kind of behavior by making sure that in logical flat mode, we assign the same vector to irq mappings on all the 8 possible logical cpu's. But we have been doing this initial assignment (__setup_vector_irq()) a little late (before which interrupts were already enabled for a short duration). Move the __setup_vector_irq() before the first irq enable point in the cpu online path to avoid the issue of not handling some interrupts that wrongly hit the cpu which is still coming online. Signed-off-by: Suresh Siddha LKML-Reference: <20100129194330.283696385@sbs-t61.sc.intel.com> Tested-by: Li Zefan Cc: Yinghai Lu Cc: Eric W. Biederman Signed-off-by: H. Peter Anvin commit 69c89efb51510b3dc0fa336f7fa257c6e1799ee4 Author: Suresh Siddha Date: Fri Jan 29 11:42:20 2010 -0800 x86, irq: Update the vector domain for legacy irqs handled by io-apic In the recent change of not reserving IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's, we start with irq 0..15 getting directed to (and handled on) cpu-0. In the logical flat mode, once the AP's are online (and before irqbalance comes into picture), kernel intends to handle these IRQ's on any cpu (as the logical flat mode allows to specify multiple cpu's for the irq destination and the chipset based routing can deliver to the interrupt to any one of the specified cpu's). This was broken with our recent change, which was ending up using only cpu 0 as the destination, even when the kernel was specifying to use all online cpu's for the logical flat mode case. Fix this by updating vector allocation domain (cfg->domain) for legacy irqs, when the IO-APIC handles them. Signed-off-by: Suresh Siddha LKML-Reference: <20100129194330.207790269@sbs-t61.sc.intel.com> Tested-by: Li Zefan Cc: Yinghai Lu Cc: Eric W. Biederman Signed-off-by: H. Peter Anvin commit 0f26c4b21b684825a6dd41f2bc04d48ff62d72f8 Author: Yehuda Sadeh Date: Fri Jan 29 11:01:11 2010 -0800 ceph: remove unreachable code We never truncate to a smaller size without contacting the MDS. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit ac8839d7b264d0fa478fca7c4f9b6bb833540a80 Author: Sage Weil Date: Wed Jan 27 14:28:10 2010 -0800 ceph: include type in ceph_entity_addr, filepath Include a type/version in ceph_entity_addr and filepath. Include extra byte in filepath encoding as necessary. Signed-off-by: Sage Weil commit 9ba874506b7b3883d78b8cad61eba39c4bb09885 Merge: 4f4e65d 98fa3d8 Author: Tony Lindgren Date: Fri Jan 29 11:37:48 2010 -0800 Merge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap-for-linus commit d3a571971e5af241074947fc80f6284677f6e014 Author: Reinette Chatre Date: Thu Jan 21 11:52:28 2010 -0800 iwlwifi: iwl_power_update_mode always hold mutex iwl_power_update_mode expects to be called with mutex held, for example to protect priv->vif. Only one caller currently does not do this, fix this. Also, add a comment to iwl_power_update_mode to indicate this requirement. Signed-off-by: Reinette Chatre commit 7ae810776a51dc4dc6580013b0f6ba0f34d2b165 Author: Johannes Berg Date: Thu Jan 21 11:47:59 2010 -0800 iwlwifi: fix typo in IWL_CCK_RATES_MASK Due to a typo, the variable contains OFDM rates as well. The only user doesn't care, so this change doesn't really do anything but fix up my confusion. Signed-off-by: Johannes Berg commit 71d75cf9ab858b99d072fece9784ab338af8e388 Author: Johannes Berg Date: Thu Jan 21 06:08:19 2010 -0800 iwlwifi: remove unused work structs auth_work, calibrated_work, update_link_led and report_work are never used, so remove them. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 80676518da523e926e70794ac2767829effcf3ba Author: Johannes Berg Date: Thu Jan 21 06:07:17 2010 -0800 iwlwifi: remove bg_up work There's no need to queue a work struct from within a work struct, just move the code to execute directly. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 9f1f3ceacb7e52d9bc0364b4f26ae418de79656f Author: Johannes Berg Date: Thu Jan 21 05:28:40 2010 -0800 iwlagn: simplify ucode loading Move the waiting into iwl5000_load_section instead of duplicating it in the caller. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 4d6959219bb71aa34383fc1a1a520820aee6292b Author: Johannes Berg Date: Thu Jan 21 05:24:04 2010 -0800 iwlwifi: no need to test iw_mode in power saving mac80211 will only enable powersaving for station mode. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit fac06108701a2a081a47d4dc6f03220aaab54486 Author: Wey-Yi Guy Date: Wed Jan 20 12:22:54 2010 -0800 iwlwifi: update sensitivity calibration data for 1000 series Update sensitivity range values for 1000 series Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 9bead7632adb6341548056a80ec36e7ae098f4f4 Author: Wey-Yi Guy Date: Wed Jan 20 12:22:53 2010 -0800 iwlwifi: update sensitivity calibration data for 5x00 series Update sensitivity range values for 5x00 series Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 2494f63cc7394fc4424c4833b83d1831f52e54c8 Author: Wey-Yi Guy Date: Wed Jan 20 12:22:52 2010 -0800 iwlwifi: update sensitivity calibration data for 6x00 series Update sensitivity range values for 6000 & 6x50 series Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 47e28f41dce90ea4317d35cf23f232c1a6b07adf Author: Johannes Berg Date: Wed Jan 20 11:21:06 2010 -0800 iwlwifi: fix locking in iwl_mac_add_interface The corresponding iwl_mac_remove_interface only acquires the mutex, leading me to believe that the spinlock is not necessary. However, this doesn't actually acquire the mutex around the vif pointer check and assignment, fix that. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a7fce6ee8dd693fb2a9d19ddf9ee1fe380893fa1 Author: Wey-Yi Guy Date: Tue Jan 19 16:51:50 2010 -0800 iwlwifi: sysassert identifier change Change in uCode to include a unique identifier as part of sysassert, in order to tell the difference, add the "ADVANCED SYSASSERT" description when dump nic error to indicate the difference. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 49dcc819b077c2d473062e17d5a1373a8b660e02 Author: Daniel Halperin Date: Tue Jan 19 10:22:19 2010 -0800 iwlwifi: optimize power saving In hostap AP mode, every time the client sends the AP a packet the STA_NOTIFY_AWAKE code is sent from mac80211. This results in a command being sent to the uCode even if the client was not asleep. The following simple patch has fixed the issue for me without any degradation that I can find. Signed-off-by: Daniel Halperin Acked-by: Johannes Berg Signed-off-by: Reinette Chatre commit 98fa3d8aeabf7a039cc920a9c2ffebc6b4648e2b Author: Paul Walmsley Date: Tue Jan 26 20:13:13 2010 -0700 OMAP2+ powerdomains/clockdomains: prepare for multi-OMAP configs Convert CONFIG_ARCH_OMAP34XX to CONFIG_ARCH_OMAP3, and CONFIG_ARCH_OMAP24XX to CONFIG_ARCH_OMAP2, in preparation for Tony's multi-OMAP patches. While here, update some copyrights, convert instances of "34xx" to "3xxx" where applicable, and convert preprocessor directives of the form #if defined(CONFIG_ARCH_OMAP2) | defined(CONFIG_ARCH_OMAP3) to #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) for standardization. Signed-off-by: Paul Walmsley Cc: Tony Lindgren commit 56ef28acf122d30b137851aa6a599ba48319a6b0 Author: Rajendra Nayak Date: Tue Jan 26 20:13:12 2010 -0700 OMAP4: PRCM: Define shift macros as n instead of 1 << n The macros defining the shift bits in registers for various register bit fields are defined as 1 << n. Instead define them as n. They can then be used as val << n. The changes are generated by updating the script which autogenerates the files modifed in the patch. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit e80a9729b15f4c2c00ed51d61aa543fb4269d5ca Author: Paul Walmsley Date: Tue Jan 26 20:13:12 2010 -0700 OMAP2/3/4 clock: rename and clean the omap2_clk_init() functions Rename the omap2_clk_init() in the OMAP2, 3, and 4 clock code to be omap2xxx_clk_init(), omap3xxx_clk_init(), etc. Remove all traces of the (commented) old virt_prcm_set code from omap3xxx_clk_init() and omap4xxx_clk_init(), since this will be handled with the OPP code that is cooking in the PM branch. After this patch, there should be very little else in the clock code that blocks a multi-OMAP 2+3 kernel. (OMAP2420+OMAP2430 still has some outstanding issues that need to be resolved; this is pending on some additions to the hwmod data.) Signed-off-by: Paul Walmsley commit d3730192294c1c98b17a67aadbbdc4c28ad05c6e Author: Paul Walmsley Date: Tue Jan 26 20:13:11 2010 -0700 OMAP clock: resolve all remaining sparse warnings Resolve all remaining sparse warnings in the OMAP clock code. Signed-off-by: Paul Walmsley commit 60c3f65191d077dc4f69fca8eca39fb47f72d8b0 Author: Paul Walmsley Date: Tue Jan 26 20:13:11 2010 -0700 OMAP3 DPLL: reorganize static functions Move all static functions up to the top of the file to match the practice in other OMAP clock code. Make omap3_noncore_dpll_program() static (noted by sparse) and prepend an underscore to the function name to mark that it is file-local. Signed-off-by: Paul Walmsley commit feec1277a5c599ebca6217bc6bb9f6410e84793b Author: Paul Walmsley Date: Tue Jan 26 20:13:11 2010 -0700 OMAP2/3/4 clock: omap2_clk_prepare_for_reboot() is OMAP2xxx-only omap2_clk_prepare_for_reboot() is only applicable to OMAP2xxx chips, so rename it to omap2xxx_clk_prepare_for_reboot() and only call it when running on OMAP2xxx chips. Remove the old stub in the OMAP3 clock code. Signed-off-by: Paul Walmsley commit da4d2904abc0c31ac829e9c6d52106d5a6606507 Author: Paul Walmsley Date: Tue Jan 26 20:13:10 2010 -0700 OMAP2/3 clock: remove unnecessary includes and clean up header Now that almost all of the code has been removed from clock2xxx.c and clock34xx.c, many of the includes are now unnecessary and can be removed. While we're here, standardize the initial comment blocks. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Jouni Högander commit 4680c29f69e981106da2abfea7f1a3e6f1b03791 Author: Paul Walmsley Date: Tue Jan 26 20:13:09 2010 -0700 OMAP2/3 clock: clean up omap*_clk_arch_init() In the OMAP3xxx clock code, remove the #ifdef CONFIG_ARCH_OMAP3 in clock34xx.c, since this file is only compiled for OMAP3xxx builds. Also, rename omap2_clk_arch_init in this file to omap3xxx_clk_arch_init() to pave the way for multi-OMAP kernels. Ensure that it is not executed on non-OMAP3xxx systems. In the OMAP2xxx clock code, rename omap2_clk_arch_init in this file to omap2xxx_clk_arch_init() to pave the way for multi-OMAP kernels. Ensure that it is not executed on non-OMAP2xxx systems. Signed-off-by: Paul Walmsley commit 396c56a9c69ebb0baf9171a6365ac9fda322728d Author: Paul Mundt Date: Sat Jan 30 01:41:21 2010 +0900 sh: Kill off broken type 1 PCI config access checks. The host controllers only support type 1, so there's not much else to test for. Some of the older controllers also supported type 2 accesses, but we've never supported those, and likely never will. Beyond that, the P1SEG test is meaningless for 32-bit mode, so rather than refactoring it, just kill the type 1 test off completely. Signed-off-by: Paul Mundt commit 1dbfd9d46a6df5232ba0b12d2da950da89eff3da Author: Vivek Natarajan Date: Fri Jan 29 16:56:51 2010 +0530 ath9k: Handle full sleep in ps_restore. IDLE PS (Full Sleep) doesn't work when ifconfig up is done during Idle unassociated state. Fix this by restoring FULL SLEEP in ps_restore if CONF_IDLE is set. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit b2c3e923110f6ca60ccb30cf4a6bda5211454c4f Author: Guennadi Liakhovetski Date: Fri Jan 29 15:31:06 2010 +0100 ASoC: clean up wm8974 and wm8978 clock divider handling wm8974 and wm8978 codec drivers control DAC and ADC oversampling rates in their .set_clkdiv() methods, which is wrong, because these are simple boolean switches and not clock dividers. Move these bits to sound controls. Also remove manual configuration of the MCLK divider in wm8978, since it is configured automatically. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 660c63a4a289a835aa9af93a45884c5d0c004b20 Merge: 640b796 5bbd495 Author: Mark Brown Date: Fri Jan 29 14:31:06 2010 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit 640b796f2ca88113bf2fefd380bc807092ce6fa1 Author: Guennadi Liakhovetski Date: Thu Jan 28 16:28:55 2010 +0100 ASoC: remove bogus SLEEP mode from wm8978 driver Tests showed, that bit 6 of the WM8978_POWER_MANAGEMENT_2 register of wm8978 affects codec clocks. Being useless for suspend / resume, it cannot be used in bias-level control either. Remove this bit handling. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9f5b64b767203131a7a3a280859e70d4413c9672 Author: Guennadi Liakhovetski Date: Wed Jan 27 12:15:00 2010 +0100 ASoC: add support for the sh7722 Migo-R board Add support for audio on sh7722-based Migo-R boards, using SIU and wm8978 codec, recording via external microphone and playback via headphones are implemented. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9e9d04c05fd01018da35fa1daa9bda844cac6162 Author: Jassi Brar Date: Fri Jan 29 10:57:07 2010 +0900 ASoC: AC97: SMDK-WM9713: Convert notes from cset to sset It's more robust when references are provided in control names rather than numid. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f8d94eb77e4ef6d80c6b7e5e02b92180d9a6f37b Author: Mark Brown Date: Wed Jan 27 20:45:35 2010 +0000 wm97xx_battery: Clean up some warnings Staticise work_lock (nothing outside the driver has any reason to see it) and specify dev when requesting the charger IRQ (since that's what we pass in when we free it). Signed-off-by: Mark Brown Acked-by: Marek Vasut Signed-off-by: Anton Vorontsov commit 320e68da59353fe6ad51b81f6865c4b674ad66ea Author: Paul Mundt Date: Fri Jan 29 22:38:13 2010 +0900 sh: support PCI domains. Newer SH parts are now commonly shipping with multiple controllers, so we wire up PCI domain support to deal with them. Shamelessly cloned from the MIPS implementation. Signed-off-by: Paul Mundt commit ac8ab54a8e41a5ed0ee2161d45b6dc855490989f Author: Paul Mundt Date: Fri Jan 29 22:22:27 2010 +0900 sh: Bail out early on PCI resource conflicts. Presently we just call in to request_resource() for the ioport and iomem resources without checking for errors. This has already hidden a couple of bugs, so add some error handling in for good measure. Signed-off-by: Paul Mundt commit a45635dfb08a1fa2cf77bf1f2c4074961ce2e625 Author: Paul Mundt Date: Fri Jan 29 22:19:04 2010 +0900 sh: Reworked SH7780 PCI initialization. This consolidates the PCI initialization code for all of the pci-sh7780 users, and sets up the memory window dynamically as opposed to using hardcoded window positions. A number of bugs were fixed at the same time, including the PIO handling and master abort timeout settings being incorrect. Signed-off-by: Paul Mundt commit 36706005d90642bccabfaacbb24d135155e984a8 Author: Charles Chin Date: Fri Jan 29 12:05:51 2010 +0100 ALSA: hda - Add support for IDT 92HD88 family codecs Signed-off-by: Charles Chin Signed-off-by: Takashi Iwai commit 1eaa4f2762899d2f3c54ba7a4fee564e255ad0a5 Author: Baruch Siach Date: Wed Jan 27 15:00:49 2010 +0200 mx25pdk: platform code for the DryIce RTC module Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit dcbabbc1fce2c32e4cfe0e18a2651226a72ecaae Author: Baruch Siach Date: Wed Jan 27 15:00:48 2010 +0200 mx25: add support for the DryIce rtc Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 4cb73288b195dc04c1f604c38bd4ebd2081db9fa Merge: 70c91a3 66ddfc6 Author: Sascha Hauer Date: Fri Jan 29 10:43:17 2010 +0100 Merge branch 'mxc-rc' into mxc-master commit 6a1b751fb89b61ef7240f2e3ed65a2e2776e7cfd Author: John Kacur Date: Wed Jan 27 21:05:54 2010 -0200 perf: Ignore perf-archive temp file Tell git to ignore perf-archive. Signed-off-by: John Kacur Signed-off-by: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1264633557-17597-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 4c574159d03f4d8a136a7adff2d0b1d82cadcb18 Author: Thiago Farina Date: Wed Jan 27 21:05:55 2010 -0200 tools/perf/perf.c: Clean up trivial style issues Checked with: ./../scripts/checkpatch.pl --terse --file perf.c perf.c: 51: ERROR: open brace '{' following function declarations go on the next line perf.c: 73: ERROR: "foo*** bar" should be "foo ***bar" perf.c:112: ERROR: space prohibited before that close parenthesis ')' perf.c:127: ERROR: space prohibited before that close parenthesis ')' perf.c:171: ERROR: "foo** bar" should be "foo **bar" perf.c:213: ERROR: "(foo*)" should be "(foo *)" perf.c:216: ERROR: "(foo*)" should be "(foo *)" perf.c:217: ERROR: space required before that '*' (ctx:OxV) perf.c:452: ERROR: do not initialise statics to 0 or NULL perf.c:453: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Masami Hiramatsu LKML-Reference: <1264633557-17597-7-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ae7f6711d6231c9ba54feb5ba9856c3775e482f8 Merge: 64abebf b23ff0e Author: Ingo Molnar Date: Fri Jan 29 09:24:57 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: We want to queue up a dependent patch. Also update to later -rc's. Signed-off-by: Ingo Molnar commit 7e1b584774c6168ca5b27c340fbeff8f67651e4f Author: John Stultz Date: Thu Jan 28 20:20:44 2010 -0800 ntp: Cleanup xtime references in ntp.c ntp.c doesn't need to access timekeeping internals directly, so change xtime references to use the get_seconds() timekeeping interface. Signed-off-by: John Stultz Cc: richard@rsk.demon.co.uk LKML-Reference: <1264738844-21935-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 1f5b8f8a2031ae9507eb67743cad4d424739bfff Author: john stultz Date: Thu Jan 28 15:02:41 2010 -0800 ntp: Make time_esterror and time_maxerror static Make time_esterror and time_maxerror static as no one uses them outside of ntp.c Signed-off-by: John Stultz Cc: richard@rsk.demon.co.uk LKML-Reference: <1264719761.3437.47.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 64abebf731df87e6f4ae7d9ffc340bdf0c033e44 Author: Arnaldo Carvalho de Melo Date: Wed Jan 27 21:05:52 2010 -0200 perf session: Create kernel maps in the constructor Removing one extra step needed in the tools that need this, fixing a bug in 'perf probe' where this was not being done. Signed-off-by: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264633557-17597-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit fd1d908c543fbdfae82839d24b0872c542fceedc Author: Arnaldo Carvalho de Melo Date: Wed Jan 27 21:05:51 2010 -0200 perf symbols: Split helpers used when creating kernel dso object To make it clear and allow for direct usage by, for instance, regression test suites. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264633557-17597-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit a19afe46412452fef89cc623873a8931b3685944 Author: Arnaldo Carvalho de Melo Date: Wed Jan 27 21:05:50 2010 -0200 perf symbols: Factor out dso__load_vmlinux_path() So that we can call it directly from regression tests, and also to reduce the size of dso__load_kernel_sym(), making it more clear. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264633557-17597-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 72b8fa1730207274f6818b47b891ce5dff79287e Author: Arnaldo Carvalho de Melo Date: Wed Jan 27 21:05:49 2010 -0200 perf top: Exit if specified --vmlinux can't be used As we do lazy loading of symtabs we only will know if the specified vmlinux file is invalid when we actually have a hit in kernel space and then try to load it. So if we get kernel hits and there are _no_ symbols in the DSO backing the kernel map, bail out. Reported-by: Mike Galbraith Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264633557-17597-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 75c9f3284a7ff957829f44baace82406a6354ceb Author: Peter Zijlstra Date: Fri Jan 29 09:04:26 2010 +0100 perf_events: Fix sample_period transfer on inherit One problem with frequency driven counters is that we cannot predict the rate at which they trigger, therefore we have to start them at period=1, this causes a ramp up effect. However, if we fail to propagate the stable state on fork each new child will have to ramp up again. This can lead to significant artifacts in sample data. Signed-off-by: Peter Zijlstra Cc: eranian@google.com Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1264752266.4283.2121.camel@laptop> Signed-off-by: Ingo Molnar commit 488991e28e55b4fbca8067edf0259f69d1a6f92c Author: Alan D. Brunelle Date: Fri Jan 29 09:04:08 2010 +0100 block: Added in stricter no merge semantics for block I/O Updated 'nomerges' tunable to accept a value of '2' - indicating that _no_ merges at all are to be attempted (not even the simple one-hit cache). The following table illustrates the additional benefit - 5 minute runs of a random I/O load were applied to a dozen devices on a 16-way x86_64 system. nomerges Throughput %System Improvement (tput / %sys) -------- ------------ ----------- ------------------------- 0 12.45 MB/sec 0.669365609 1 12.50 MB/sec 0.641519199 0.40% / 2.71% 2 12.52 MB/sec 0.639849750 0.56% / 2.96% Signed-off-by: Alan D. Brunelle Signed-off-by: Jens Axboe commit 18c01f8abff51e4910cc5ffb4b710e8c6eea60c9 Author: Peter Zijlstra Date: Wed Jan 27 23:07:49 2010 +0100 perf_events, x86: Remove spurious counter reset from x86_pmu_enable() At enable time the counter might still have a ->idx pointing to a previously occupied location that might now be taken by another event. Resetting the counter at that location with data from this event will destroy the other counter's count. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100127221122.261477183@chello.nl> Signed-off-by: Ingo Molnar commit 452a339a976e7f782c786eb3f73080401e2fa3a6 Author: Peter Zijlstra Date: Wed Jan 27 23:07:48 2010 +0100 perf_events, x86: Implement Intel Westmere support The new Intel documentation includes Westmere arch specific event maps that are significantly different from the Nehalem ones. Add support for this generation. Found the CPUID model numbers on wikipedia. Also ammend some Nehalem constraints, spotted those when looking for the differences between Nehalem and Westmere. Signed-off-by: Peter Zijlstra Cc: Arjan van de Ven Cc: "H. Peter Anvin" Cc: Stephane Eranian LKML-Reference: <20100127221122.151865645@chello.nl> Signed-off-by: Ingo Molnar commit 1a6e21f791fe85b40a9ddbafe999ab8ccffc3f78 Author: Peter Zijlstra Date: Wed Jan 27 23:07:47 2010 +0100 perf_events, x86: Clean up hw_perf_*_all() implementation Put the recursion avoidance code in the generic hook instead of replicating it in each implementation. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100127221122.057507285@chello.nl> Signed-off-by: Ingo Molnar commit ed8777fc132e589d48a0ba854fdbb5d8203b58e5 Author: Peter Zijlstra Date: Wed Jan 27 23:07:46 2010 +0100 perf_events, x86: Fix event constraint masks Since constraints are specified on the event number, not number and unit mask shorten the constraint masks so that we'll actually match something. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100127221121.967610372@chello.nl> Signed-off-by: Ingo Molnar commit 2e8418736dff9c6fdadb2f87dcc2087cebf32167 Author: Peter Zijlstra Date: Mon Jan 25 15:58:43 2010 +0100 perf_event: x86: Deduplicate the disable code Share the meat of the x86_pmu_disable() code with hw_perf_enable(). Also remove the barrier() from that code, since I could not convince myself we actually need it. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 184f412c3341cd24fbd26604634a5800b83dbdc3 Author: Ingo Molnar Date: Wed Jan 27 08:39:39 2010 +0100 perf, x86: Clean up event constraints code a bit - Remove stray debug code - Improve ugly macros a bit - Remove some whitespace damage - (Also fix up some accumulated damage in perf_event.h) Signed-off-by: Ingo Molnar Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: commit 6c9687abeb24d5b7aae7db5be070c2139ad29e29 Author: Peter Zijlstra Date: Mon Jan 25 11:57:25 2010 +0100 perf_event: x86: Optimize x86_pmu_disable() x86_pmu_disable() removes the event from the cpuc->event_list[], however since an event can only be on that list once, stop looking after we found it. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit c933c1a603d5bf700ddce79216c1be0ec3bc0e6c Author: Peter Zijlstra Date: Fri Jan 22 16:40:12 2010 +0100 perf_event: x86: Optimize the fast path a little more Remove num from the fast path and save a few ops. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155536.056430539@chello.nl> Signed-off-by: Ingo Molnar commit 272d30be622c9c6cbd514b1211ff359292001baa Author: Peter Zijlstra Date: Fri Jan 22 16:32:17 2010 +0100 perf_event: x86: Optimize constraint weight computation Add a weight member to the constraint structure and avoid recomputing the weight at runtime. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.963944926@chello.nl> Signed-off-by: Ingo Molnar commit 63b146490befc027a7e0923e333269e68b20d380 Author: Peter Zijlstra Date: Fri Jan 22 16:32:17 2010 +0100 perf_event: x86: Optimize the constraint searching bits Instead of copying bitmasks around, pass pointers to the constraint structure. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.887853503@chello.nl> Signed-off-by: Ingo Molnar commit 9f41699ed067fa695faff8e2e9981b2550abec62 Author: Peter Zijlstra Date: Fri Jan 22 15:59:29 2010 +0100 bitops: Provide compile time HWEIGHT{8,16,32,64} Provide compile time versions of hweight. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian Cc: Linus Torvalds Cc: Andrew Morton Cc: Thomas Gleixner LKML-Reference: <20100122155535.797688466@chello.nl> [ Remove some whitespace damage while we are at it ] Signed-off-by: Ingo Molnar commit 8433be1184e4f22c37d4b8ed36cde529a47882f4 Author: Peter Zijlstra Date: Fri Jan 22 15:38:26 2010 +0100 perf_event: x86: Reduce some overly long lines with some MACROs Introduce INTEL_EVENT_CONSTRAINT and FIXED_EVENT_CONSTRAINT to reduce some line length and typing work. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.688730371@chello.nl> Signed-off-by: Ingo Molnar commit c91e0f5da81c6f3a611a1bd6d0cca6717c90fdab Author: Peter Zijlstra Date: Fri Jan 22 15:25:59 2010 +0100 perf_event: x86: Clean up some of the u64/long bitmask casting We need this to be u64 for direct assigment, but the bitmask functions all work on unsigned long, leading to cast heaven, solve this by using a union. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.595961269@chello.nl> Signed-off-by: Ingo Molnar commit 81269a085669b5130058a0275aa7ba9f94abd1fa Author: Peter Zijlstra Date: Fri Jan 22 14:55:22 2010 +0100 perf_event: x86: Fixup constraints typing issue Constraints gets defined an u64 but in long quantities and then cast to long. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.504916780@chello.nl> Signed-off-by: Ingo Molnar commit 502568d563bcc37ac505a83341c0c95b88c015a8 Author: Peter Zijlstra Date: Fri Jan 22 14:35:46 2010 +0100 perf_event: x86: Allocate the fake_cpuc GCC was complaining the stack usage was too large, so allocate the structure. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20100122155535.411197266@chello.nl> Signed-off-by: Ingo Molnar commit 8113070d6639d2245c6c79afb8df42cedab30540 Author: Stephane Eranian Date: Thu Jan 21 17:39:01 2010 +0200 perf_events: Add fast-path to the rescheduling code Implement correct fastpath scheduling, i.e., reuse previous assignment. Signed-off-by: Stephane Eranian [ split from larger patch] Signed-off-by: Peter Zijlstra LKML-Reference: <4b588464.1818d00a.4456.383b@mx.google.com> Signed-off-by: Ingo Molnar commit 1da53e023029c067ba1277a33038c65d6e4c99b3 Author: Stephane Eranian Date: Mon Jan 18 10:58:01 2010 +0200 perf_events, x86: Improve x86 event scheduling This patch improves event scheduling by maximizing the use of PMU registers regardless of the order in which events are created in a group. The algorithm takes into account the list of counter constraints for each event. It assigns events to counters from the most constrained, i.e., works on only one counter, to the least constrained, i.e., works on any counter. Intel Fixed counter events and the BTS special event are also handled via this algorithm which is designed to be fairly generic. The patch also updates the validation of an event to use the scheduling algorithm. This will cause early failure in perf_event_open(). The 2nd version of this patch follows the model used by PPC, by running the scheduling algorithm and the actual assignment separately. Actual assignment takes place in hw_perf_enable() whereas scheduling is implemented in hw_perf_group_sched_in() and x86_pmu_enable(). Signed-off-by: Stephane Eranian [ fixup whitespace and style nits as well as adding is_x86_event() ] Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <4b5430c6.0f975e0a.1bf9.ffff85fe@mx.google.com> Signed-off-by: Ingo Molnar commit 9762528f37ddc7071509dddb10e7b4b3b957fd01 Author: Paul Mundt Date: Fri Jan 29 16:14:29 2010 +0900 sh: Kill off deprecated fixed PCI memory window accessors. This kills off the deprected fixed memory range accessors for the cases of non-translatable ioremapping. Signed-off-by: Paul Mundt commit dcfc32babbece923381bd3bffaf17373b5d97568 Author: Mark Brown Date: Thu Jan 28 22:37:39 2010 -0800 Input: wm97xx - provide coordinate logs for accelerated I/O This aids debug of problematic systems. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 57dbb2d83d100ea601c54fe129bfde0678db5dee Author: Hagen Paul Pfeifer Date: Sun Jan 24 12:30:59 2010 +0000 sched: add head drop fifo queue This adds an additional queuing strategy, called pfifo_head_drop, to remove the oldest skb in the case of an overflow within the queue - the head element - instead of the last skb (tail). To remove the oldest skb in congested situations is useful for sensor network environments where newer packets reflect the superior information. Reviewed-by: Florian Westphal Acked-by: Patrick McHardy Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit e0e53db6133c32964fd17f20b17073a402f07ed3 Author: K.Prasad Date: Thu Jan 28 16:44:15 2010 +0530 x86/hw-breakpoints: Optimize return code from notifier chain in hw_breakpoint_handler Processing of debug exceptions in do_debug() can stop if it originated from a hw-breakpoint exception by returning NOTIFY_STOP in most cases. But for certain cases such as: a) user-space breakpoints with pending SIGTRAP signal delivery (as in the case of ptrace induced breakpoints). b) exceptions due to other causes than breakpoints We will continue to process the exception by returning NOTIFY_DONE. Signed-off-by: K.Prasad Cc: Ingo Molnar Cc: Roland McGrath Cc: Alan Stern Cc: Jan Kiszka LKML-Reference: <20100128111415.GC13935@in.ibm.com> Signed-off-by: Frederic Weisbecker commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec Author: Atul Dahiya Date: Fri Jan 29 09:08:28 2010 +0900 ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series. Currently, S5P_TIMER_IRQ is based at the end of VICs. This patch changes the S5P_TIMER_IRQ base from end of VICs to 11 in ISA IRQ space. No of VICs varies between SOCs. This causes an exception on S5P6442. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 40f9249a73f6c251adea492b1c3d19d39e2a9bda Author: K.Prasad Date: Thu Jan 28 16:44:01 2010 +0530 x86/debug: Clear reserved bits of DR6 in do_debug() Clear the reserved bits from the stored copy of debug status register (DR6). This will help easy bitwise operations such as quick testing of a debug event origin. Signed-off-by: K.Prasad Cc: Roland McGrath Cc: Jan Kiszka Cc: Alan Stern Cc: Ingo Molnar LKML-Reference: <20100128111401.GB13935@in.ibm.com> Signed-off-by: Frederic Weisbecker commit 1e12a4a7a3a78bc9c3aaf3486dde3b8ab1cdf465 Author: Xiao Guangrong Date: Thu Jan 28 09:34:27 2010 +0800 tracing/kprobe: Cleanup unused return value of tracing functions The return values of the kprobe's tracing functions are meaningless, lets remove these. Signed-off-by: Xiao Guangrong Acked-by: Masami Hiramatsu Cc: Steven Rostedt Cc: Ingo Molnar Cc: Paul Mackerras Cc: Jason Baron Cc: Peter Zijlstra LKML-Reference: <4B60E9A3.2040505@cn.fujitsu.com> [fweisbec@gmail: whitespace fixes, drop useless void returns in end of functions] Signed-off-by: Frederic Weisbecker commit 35e424e2c0229aa1e32776fac23902150bd0ab9a Author: Paul Walmsley Date: Tue Jan 26 20:13:09 2010 -0700 OMAP3 clock: split out DPLL3 M2 divider functions into mach-omap2/clkt34xx_dpll3m2.c Split the DPLL3 M2 divider clock functions out of clock34xx.c and move them into mach-omap2/clkt34xx_dpll3m2.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage the OMAP3 DPLL3 M2 divider are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for the DPLL3 M2 clock alone. This should reduce unnecessary console noise when debugging DVFS. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap34xx/ directory, rather than shared with other chip types that don't use this clock type. This patch also lays the groundwork to skip compilation of this code on OMAP3 chips that don't support DVFS (e.g., AM35xx) via the Makefile, rather than via #ifdefs. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Jouni Högander Cc: Alexander Shishkin commit 6ebe0d88f5fead21d6e1ac328acc683c173d26fc Author: Paul Walmsley Date: Tue Jan 26 20:13:09 2010 -0700 OMAP2 clock: don't compile OMAP2430-only functions on non-2430 builds omap2430_clk_i2chs_find_idlest() doesn't need to be compiled in on non-2430 builds, so skip it in those cases to save memory. Signed-off-by: Paul Walmsley commit 44da0a51032f3d90a441bd80c2efe68532104980 Author: Paul Walmsley Date: Tue Jan 26 20:13:08 2010 -0700 OMAP2xxx clock: move sys_clk code into mach-omap2/clkt2xxx_sys.c Move the sys_clk clock functions from clock2xxx.c to mach-omap2/clkt2xxx_sys.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage the sys_clk are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for the sys_clk clock alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/ directory, rather than shared with other chip types that don't use this clock type. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Alexander Shishkin commit 87a1b26c2d31dce62758b78c077ff5a1b5a52ab8 Author: Paul Walmsley Date: Tue Jan 26 20:13:07 2010 -0700 OMAP2xxx clock: move osc_clk code into mach-omap2/clkt2xxx_osc.c Move the osc_clk clock functions from clock2xxx.c to mach-omap2/clkt2xxx_osc. This is intended to make the clock code easier to understand, since all of the functions needed to manage the osc_clk are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for osc_clk clocks alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/ directory, rather than shared with other chip types that don't use this clock type. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Alexander Shishkin commit 49214640f52506fbba00eb998fc39f10653a840a Author: Paul Walmsley Date: Tue Jan 26 20:13:06 2010 -0700 OMAP2xxx clock: move the APLL clock code into mach-omap2/clkt2xxx_apll.c Move the APLL-related clock functions from clock2xxx.c to mach-omap2/clkt2xxx_apll.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage APLLs are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for APLL clocks alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/ directory, rather than shared with other chip types that don't use this clock type. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Alexander Shishkin commit 430ad5a600a83956749307b13257c464c3826b55 Author: Xiao Guangrong Date: Thu Jan 28 09:32:29 2010 +0800 perf: Factorize trace events raw sample buffer operations Introduce ftrace_perf_buf_prepare() and ftrace_perf_buf_submit() to gather the common code that operates on raw events sampling buffer. This cleans up redundant code between regular trace events, syscall events and kprobe events. Changelog v1->v2: - Rename function name as per Masami and Frederic's suggestion - Add __kprobes for ftrace_perf_buf_prepare() and make ftrace_perf_buf_submit() inline as per Masami's suggestion - Export ftrace_perf_buf_prepare since modules will use it Signed-off-by: Xiao Guangrong Acked-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Steven Rostedt Cc: Paul Mackerras Cc: Jason Baron Cc: Peter Zijlstra LKML-Reference: <4B60E92D.9000808@cn.fujitsu.com> Signed-off-by: Frederic Weisbecker commit ea2c68a08fedb5053ba312d661e47df9f4d72411 Author: Lai Jiangshan Date: Wed Jan 13 19:38:30 2010 +0800 tracing: Simplify test for function_graph tracing start point In the function graph tracer, a calling function is to be traced only when it is enabled through the set_graph_function file, or when it is nested in an enabled function. Current code uses TSK_TRACE_FL_GRAPH to test whether it is nested or not. Looking at the code, we can get this: (trace->depth > 0) <==> (TSK_TRACE_FL_GRAPH is set) trace->depth is more explicit to tell that it is nested. So we use trace->depth directly and simplify the code. No functionality is changed. TSK_TRACE_FL_GRAPH is not removed yet, it is left for future usage. Signed-off-by: Lai Jiangshan Cc: Ingo Molnar Cc: Steven Rostedt LKML-Reference: <4B4DB0B6.7040607@cn.fujitsu.com> Signed-off-by: Frederic Weisbecker commit 0ada0a73120c28cc432bcdbac061781465c2f48f Merge: 6016a36 92dcffb Author: Grant Likely Date: Thu Jan 28 14:38:25 2010 -0700 Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree commit 6016a363f6b56b46b24655bcfc0499b715851cf3 Author: Grant Likely Date: Thu Jan 28 14:06:53 2010 -0700 of: unify phandle name in struct device_node In struct device_node, the phandle is named 'linux_phandle' for PowerPC and MicroBlaze, and 'node' for SPARC. There is no good reason for the difference, it is just an artifact of the code diverging over a couple of years. This patch renames both to simply .phandle. Note: the .node also existed in PowerPC/MicroBlaze, but the only user seems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn't look like the assignment between .linux_phandle and .node is significantly different enough to warrant the separate code paths unless ibm,phandle properties actually appear in Apple device trees. I think it is safe to eliminate the old .node property and use phandle everywhere. Signed-off-by: Grant Likely Acked-by: David S. Miller Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 923f7e30b480438f1e86e01e5cde814248b59a39 Author: Grant Likely Date: Thu Jan 28 13:52:53 2010 -0700 of: Merge of_node_get() and of_node_put() Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 1f43cfb9474d1c4f22598b6e3213ec035be6dd56 Author: Grant Likely Date: Thu Jan 28 13:47:25 2010 -0700 of: merge machine_is_compatible() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit f276586a8af410d2b79733daf52471605b6559e9 Author: Hamish Guthrie Date: Thu Jan 28 12:54:10 2010 +0100 ps3_gelic_wireless: fix directed ssid scan If the association worker requests a directed ssid scan and a bss list already exists, the directed scan is not done. This patch corrects this and cleans up a few typos and debug messages. Signed-off-by: Hamish Guthrie Acked-by: Geoff Levand Signed-off-by: John W. Linville commit c1596b75c29eb5b32c65ef1e186c8b08c289bf05 Author: Hamish Guthrie Date: Thu Jan 28 12:54:09 2010 +0100 ps3_gelic_wireless: Remove PS3 gelic legacy wpa support The current PS3 gelic wireless driver has support for wireless extensions. The original PS3 gelic wireless driver exposed a dedicated API for a dedicated wpa_supplicant driver. This old API could be enabled with CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE, however, as this is not being used by any distros, and it is being removed from the driver and from wpa_supplicant. Signed-off-by: Hamish Guthrie Acked-by: Geoff Levand Signed-off-by: John W. Linville commit e108c7b79e91b45a3f04762c44fd404a5d9be069 Author: Vitaliy Kulikov Date: Thu Jan 28 19:21:07 2010 +0100 ALSA: hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec This patch adds HP mute LED support for IDT 92HD81/3 family of the codecs. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit 30ed7ed11cb88fd56d821a67b9aab1e0d50fb626 Author: Takashi Iwai Date: Thu Jan 28 17:11:45 2010 +0100 ALSA: hda - Fix index of HP Compaq F700 mic amp The amp used for the mic input on HP Compaq F700 with Cxt5051 codec has no multiple inputs, thus its index should be 0 instead of 1. Signed-off-by: Takashi Iwai commit c89362225152fc6f2247f65371bfe3ccced3203b Author: Takashi Iwai Date: Thu Jan 28 17:08:53 2010 +0100 ALSA: hda - Define max number of PCM devices in hda_codec.h Define the constant rather in the common header file. Signed-off-by: Takashi Iwai commit 7b36ea967cc5b5088a57fe225f1f72a3c160058b Author: Wei Ni Date: Thu Jan 28 16:13:07 2010 +0800 ALSA: hda - Change the AZX_MAX_PCMS to 10 In hda_codec.c, it has define "[HDA_PCM_TYPE_HDMI] = { 3, 7, 8, 9, -1 },", it support up to device 9 for HDMI. But in hda_intel.c, it only define AZX_MAX_PCMS as 8. So if it have 4 hdmi codecs, when run azx_attach_pcm_stream(), it will show error "Invalid PCM device number 8", and "... number 9", and return "-EINVAL". We should change the AZX_MAX_PCMS to 10. Signed-off-by: Wei Ni Signed-off-by: Takashi Iwai commit 2718625fba1e07bf2ce8a752036658737c1f76a7 Author: Mark Brown Date: Thu Jan 28 12:36:29 2010 +0000 ASoC: Set codec->dev for AC97 devices Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e03a8d2cf663429e2480a8db78b132ee300f79af Author: Mark Brown Date: Thu Jan 28 12:36:07 2010 +0000 ASoC: Add TLV information and additional volumes to WM9713 Also renames a few things to make volumes and switches match up in alsamixer. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fb58a2ff300cb3fd6077484ca7d8c6e6f13a0350 Author: Mark Brown Date: Thu Jan 28 10:22:45 2010 +0000 ASoC: Remove version display from WM9713 The version isn't being updated or used, the kernel revision tracking is enough. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c812459396733b42655e0d656763af02e06f97ed Author: Peter Ujfalusi Date: Thu Jan 28 15:57:04 2010 +0200 ASoC: TWL4030: Modify codec default settings Change the legacy default register configuration, which left some internal components on. Now we have either DAPM, or other ways to control these bits, so there is no need to enable them by default. The affected parts: Disable ADCL and ADCR Disable ARXL2 and ARXR2 analog PGA (playback) Disable APLL by default Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d74340d31bf1dbeb00acadddd8697666528a7846 Author: Alexey Dobriyan Date: Mon Jan 25 10:39:09 2010 +0000 netns xfrm: ipcomp6 support Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit a92df2545402c1a08e7a158f4477a52dea0eeeed Author: Alexey Dobriyan Date: Mon Jan 25 10:38:34 2010 +0000 netns xfrm: ipcomp support Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit a1664773907a2b69e2a3019598dcbeffa6bc724b Author: Alexey Dobriyan Date: Mon Jan 25 10:37:54 2010 +0000 netns xfrm: xfrm6_tunnel in netns I'm not sure about rcu stuff near kmem cache destruction: * checks for non-empty hashes look bogus, they're done _before_ rcu_berrier() * unregistering netns ops is done before kmem_cache destoy (as it should), and unregistering involves rcu barriers by itself So it looks nothing should be done. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit e924960dacdf85d118a98c7262edf2f99c3015cf Author: Alexey Dobriyan Date: Mon Jan 25 10:28:21 2010 +0000 netns xfrm: fixup xfrm6_tunnel error propagation Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f Author: Stephen Rothwell Date: Thu Jan 28 06:13:13 2010 -0800 net: merge fixup for qlge_main Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 05ba712d7eb156009753e18e5116cabd869cc6e2 Merge: 257ddbd b473946 Author: David S. Miller Date: Thu Jan 28 06:12:38 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 8495fb1b8d016657133c01a2f258c5f192d2a1b7 Author: Chris Frey Date: Thu Jan 28 06:04:50 2010 -0800 ide: fixed section mismatch warning in cmd640.c Signed-off-by: Chris Frey Signed-off-by: David S. Miller commit 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 Author: Alexey Dobriyan Date: Wed Jan 27 10:17:41 2010 +0000 netdev: remove HAVE_ leftovers Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 339ce1a4dc2ca26444c4f65c31b71a5056f3bb0b Author: Anton Blanchard Date: Mon Jan 18 16:47:07 2010 +1100 perf: Fix inconsistency between IP and callchain sampling When running perf across all cpus with backtracing (-a -g), sometimes we get samples without associated backtraces: 23.44% init [kernel] [k] restore 11.46% init eeba0c [k] 0x00000000eeba0c 6.77% swapper [kernel] [k] .perf_ctx_adjust_freq 5.73% init [kernel] [k] .__trace_hcall_entry 4.69% perf libc-2.9.so [.] 0x0000000006bb8c | |--11.11%-- 0xfffa941bbbc It turns out the backtrace code has a check for the idle task and the IP sampling does not. This creates problems when profiling an interrupt heavy workload (in my case 10Gbit ethernet) since we get no backtraces for interrupts received while idle (ie most of the workload). Right now x86 and sh check that current is not NULL, which should never happen so remove that too. Idle task's exclusion must be performed from the core code, on top of perf_event_attr:exclude_idle. Signed-off-by: Anton Blanchard Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Paul Mundt LKML-Reference: <20100118054707.GT12666@kryten> Signed-off-by: Frederic Weisbecker commit 8fc176d5abb2d92c52df859faac7974b4a1585c1 Author: Kuninori Morimoto Date: Thu Jan 28 13:46:16 2010 +0900 ASoC: fsi: Add spin lock operation for accessing shared area fsi_master_xxx function should be protected by spin lock, because it are used from both FSI-A and FSI-B. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit abec86a80247ab3a40d2afc9c8e8c26efcab2391 Author: Paul Mundt Date: Thu Jan 28 18:26:37 2010 +0900 sh: Kill off superfluous sh_bios references from compressed loader. The VBR value needs to be initialized in order for any of the bios trapping to work, and as we don't do that until slightly later in the boot process, this has no real chance of working. The only reason for using this in the past was due to the fact that early serial initialization wasn't possible, but now that early sh-sci is supported by everyone, there's no longer any reason to support the sh_bios hacks in the first place. Given that, we just kill off the references completely. Signed-off-by: Paul Mundt commit d627a2ebd1a303aa4ac1962c553d1e8738735d01 Author: Paul Mundt Date: Thu Jan 28 18:17:29 2010 +0900 sh: Fix up the ioremap_fixed() build for nommu. arch/sh/kernel/setup.c:455: error: implicit declaration of function 'ioremap_fixed_init' Signed-off-by: Paul Mundt commit 849593591ce3b5f9352966c9d410284dc04d03b6 Author: Paul Mundt Date: Thu Jan 28 18:15:05 2010 +0900 sh: Fix up read-only variable assignment in pcibios_align_resource(). arch/sh/drivers/pci/pci.c:167: error: assignment of read-only location '*res' Signed-off-by: Paul Mundt commit 621266bdf4b78fa92f7eabd7688b86f0dbd61d64 Author: Paul Mundt Date: Thu Jan 28 15:55:37 2010 +0900 sh: Quiet noisy coherent DMA unmapping on R2D. IRQs are re-enabled at a later stage when doing the unmapping on R2D via the sm501 USB coherent DMA, resulting in the irqs_disabled() check producing considerable noise for this configuration. Just kill off the check, which was blindly copied from x86 anyways. Signed-off-by: Paul Mundt commit 439913fffd39374c3737186b22d2d56c3a0ae526 Author: Lin Ming Date: Thu Jan 28 10:53:19 2010 +0800 ACPI: replace acpi_integer by u64 acpi_integer is now obsolete and removed from the ACPICA code base, replaced by u64. Signed-off-by: Lin Ming Signed-off-by: Len Brown commit f655f5e956eaf4fcda983f3b3d37c76371556c27 Author: Paul Mundt Date: Thu Jan 28 15:08:21 2010 +0900 sh: mach-titan: Kill off unused PIO port mangling. Nothing is using this, kill it off. Fixing up access sizes can be done with trapped I/O for anyone wanting to make use of this for devices that need it, everything else is already pure MMIO. Signed-off-by: Paul Mundt commit 2854e72b58dad82f5248b30a45dda0df49e5fe05 Author: Jiri Slaby Date: Wed Jan 27 17:32:22 2010 +0100 x86: Use helpers for rlimits Make sure compiler won't do weird things with limits. Fetching them twice may return 2 different values after writable limits are implemented. We can either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd or ACCESS_ONCE if not applicable; this patch uses the helpers. Signed-off-by: Jiri Slaby LKML-Reference: <1264609942-24621-1-git-send-email-jslaby@suse.cz> Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: H. Peter Anvin commit b09f3e78ee7bb69171411b75bd9e771fc7f24749 Author: Takashi Iwai Date: Thu Jan 28 00:01:53 2010 +0100 ALSA: hda - Allow override more fields via patch loader Allow the override of vendor-id, subsystem-id, revision-id and chip name via patch loading. Updated the document, too. Signed-off-by: Takashi Iwai commit a814290e17ae314bd614476cffc6119846eca27e Merge: e55d193 ab5d97d Author: Russell King Date: Wed Jan 27 22:11:32 2010 +0000 Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable commit e00d9d4b1796dae3adf6e39c9a766e760dd1c796 Author: Mikael Pettersson Date: Sat Jan 9 13:03:59 2010 +0100 ARM: 5869/1: ixp4xx: implement sched_clock() Add a better sched_clock() to the ixp4xx platform, implemented via its clocksource support. This is based on the sched_clock() I implemented for the IOP platform. Tested on a ds101 ixp420 machine. Signed-off-by: Mikael Pettersson Signed-off-by: Russell King commit a62e90308f7b6965310cf4ec61393aef6861f50d Author: wanzongshun Date: Thu Dec 31 15:06:05 2009 +0100 ARM: 5859/1: Add nuc93x platform support The previous nuc932 support patches have been discarded by me and because it belongs to another SoCs series named nuc93x,at present, which included nuc931 and nuc932, I think it is better to create a new mach-nuc93x,So I made the patch,and request your advice.Thanks! Signed-off-by: Wan ZongShun Signed-off-by: Russell King commit 37498292aa97658a5d0a9bb84699ce8c1016bb74 Author: Chuck Lever Date: Tue Jan 26 14:04:22 2010 -0500 NFSD: Create PF_INET6 listener in write_ports Try to create a PF_INET6 listener for NFSD, if IPv6 is enabled in the kernel. Make sure nfsd_serv's reference count is decreased if __write_ports_addxprt() failed to create a listener. See __write_ports_addfd(). Our current plan is to rely on rpc.nfsd to create appropriate IPv6 listeners when server-side NFS/IPv6 support is desired. Legacy behavior, via the write_threads or write_svc kernel APIs, will remain the same -- only IPv4 listeners are created. Signed-off-by: Chuck Lever [bfields@citi.umich.edu: Move error-handling code to end] Signed-off-by: J. Bruce Fields commit f28e8a4d027e4e21c3d0a52706527bb87397bea0 Author: Linus Walleij Date: Mon Jan 25 07:14:46 2010 +0100 ARM: 5896/1: MMCI: work around a hardware bug in U300 In the U300 some hardware bug makes the status flag not come up signalling a successful write (or anything else, like an error, for that matter) on write requests. This little quirk makes the writes work on U300. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 633e81a66b7e6c22a50da860371159cfa2b06d53 Author: Linus Walleij Date: Mon Jan 25 07:18:16 2010 +0100 ARM: 5895/2: Alter name of U300 watchdog resource This changes the bus name of the U300 watchdog from just "wdog" to "coh901327_wdog" which is used to match the corresponding driver. This makes the watchdog probe properly. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit fc05475f867624dddd5ea7089cf8f434f95fbec5 Author: Linus Walleij Date: Fri Jan 22 13:53:30 2010 +0100 ARM: 5893/1: SPI AMBA PL022: Limit TX FIFO fills Added logic to cap TX FIFO fill size based on current free RX FIFO entries instead of TX status flags. This is to prevent an issue with RX FIFO overflows. Signed-off-by: Kevin Wells Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 08d1e2e68da977956ff10735148ac1de21c85afd Author: Linus Walleij Date: Thu Dec 17 09:46:24 2009 +0100 ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 This adds platform configuration for the COH 901 318 DMA driver for the U300 series mobile platforms. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 0d34e91596ef537c2893a031f0483014bb82adf3 Author: Guennadi Liakhovetski Date: Wed Jan 27 18:56:23 2010 +0100 ASoC: add a WM8978 codec driver The WM8978 codec from Wolfson Microelectronics is very similar to wm8974, but is stereo and also has some differences in pin configuration and internal signal routing. This driver is based on wm8974 and takes the differences into account. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 583b2be626b047eeb4f9a26721e38fe4992b2d02 Author: Mark Brown Date: Wed Jan 27 20:54:13 2010 +0000 ASoC: Note jumper settings for smdk_wm9713 driver on SMDK6410 The board supports both GPIO sets for the AC97 bus and the analogue outputs can be switched between this and the WM8580 so add some comments saying what the setup the standard kernel expects is. Signed-off-by: Mark Brown commit 7beba4d50d5f70c3851f608927882959d532671c Author: Jassi Brar Date: Wed Jan 27 15:04:36 2010 +0900 ASoC: AC97: S3C2443: Remove unused driver Since, we have generic AC97 controller driver and all the machines have moved to that, there is no need for old s3c2443-ac97.c to exist. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c67d90ffd43a6cf18def21a0de7db56504d78295 Author: Jassi Brar Date: Wed Jan 27 15:02:04 2010 +0900 ASoC: AC97: LN2440SBC: Switch to s3c-ac97.c Switch to use s3c-ac97.c AC97 controller driver. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1ec2963a8cd5fbc5f49dfa20c94229f1b46d1968 Author: Jassi Brar Date: Wed Jan 27 15:01:03 2010 +0900 ASoC: AC97: SMDK2443: Switch to s3c-ac97.c Switch to use s3c-ac97.c AC97 controller driver. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ff6e64dabf66b8e4e7def21857320085fc68db6b Author: Jassi Brar Date: Wed Jan 27 14:59:19 2010 +0900 ASoC: AC97: SMDK: Add wm9713 machine driver This patch adds the common machine driver for SMDKs that have a WM9713 codec attched to the AC97 controller. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fc93ea2f9315eda2ec8645c2f8bcc30f75a6b88e Author: Jassi Brar Date: Wed Jan 27 14:59:08 2010 +0900 ASoC: AC97: S3C: Add controller driver Add the AC97 controller driver for Samsung SoCs that have one. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 54233261d5aa2926f080b67ac22f508c9f15e690 Author: John W. Linville Date: Wed Jan 27 09:44:48 2010 -0500 cfg80211: fix wext-compat for setting rate to 'auto' Signed-off-by: John W. Linville commit 22e16e55e36ab91148592c9bf0f2444bf766cd3c Author: Larry Finger Date: Tue Jan 26 17:45:28 2010 -0600 rtl8187: Add callback for get_tsf Signed-off-by: Larry Finger Acked-by: Hin-Tak Leung Signed-off-by: John W. Linville commit da8604757b1cdf79f24e118b156349543eb1b722 Author: Larry Finger Date: Tue Jan 26 16:42:02 2010 -0600 b43: N PHY: Fix compilation after removal of typdef b43_c32 In the conversion between typedef and struct, two places that needed a "struct" were missed. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d2bb8e02810cc5844fe2bd5a81d4058b8afe6de9 Author: John W. Linville Date: Tue Jan 26 16:22:20 2010 -0500 rtl8180: implement get_tsf op for mac80211 Signed-off-by: John W. Linville commit d3d5621abf6d2105700795fcbdf784b9cb46b495 Author: John W. Linville Date: Wed Jan 27 14:23:17 2010 -0500 libertas: add comment re: v10 firmware key handling Comment text suggested by Dan Williams in <1263952092.4481.2.camel@localhost.localdomain>. Signed-off-by: John W. Linville commit 47db3a677b533489d1a5a027282aa33f46dffa79 Author: Luca Verdesca Date: Tue Dec 22 18:10:01 2009 +0100 ath5k: adding LED support for AR5BXB63 cards With following patch, LED should now work with LiteOn AR5BXB63 mini pci-e cards. (Broken patch fixed-up by me...let's hope I did it right! -- JWL) Signed-off-by: Luca Verdesca Acked-by: Bob Copeland Signed-off-by: John W. Linville commit 7910b4a1db63fefc3d291853d33c34c5b6352e8e Author: Jaroslav Kysela Date: Wed Jan 27 18:10:13 2010 +0100 ALSA: pcm_native - fix runtime->boundary calculation The code in pcm_lib updating runtime->hw_ptr_interrupt expects that runtime->boundary is divisible with runtime->period_size. Thanks are going to Clemens Ladisch for the notice. Fix the runtime->boundary calculation using buffer_size * period_size as base and find a least common multiple for 32bit platforms when the expression might overflow. Signed-off-by: Jaroslav Kysela commit 7013109f52ff38ad9ea38952cedc144c8e8b9636 Author: Giuseppe CAVALLARO Date: Mon Jan 25 16:12:07 2010 +0100 sh: fixed cmpxchg gRB version This patch fixes a bug within the cmpxchg GRB version. A problem was notices while running some tests to stress the priority inheritance, for example pi_stress (http://rt.wiki.kernel.org/index.php/PI_Mutex_Test). Also, without this patch, after applying the latest work to consolidate atomic_cmpxchg() definitions (commit: 8c0b8139c87cfe8b95c6e763b4ca3190aa9b1ad0) the Kernel doesn't boot at all. Signed-off-by: Giuseppe Cavallaro Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 660e2acad81c19b404f7d7d06e57a6d5e6ce7426 Author: Chris Smith Date: Wed Jan 27 22:03:11 2010 +0900 sh: kmemleak support. Enables support for kmemleak on sh. Signed-off-by: Chris Smith Signed-off-by: Paul Mundt commit 08b36c4a02b5a9db609fc6d93b9c41d7fa75713c Author: Paul Mundt Date: Wed Jan 27 21:56:57 2010 +0900 sh: Optimize runtime disabling of trapped I/O. Presently trapped I/O is only registered if it's not explicitly disabled for the platforms that select it openly. From the fault path this runs through an address lookup before figuring out that nothing matches and falls back through the error path, but we can forego the lookup completely by testing if it's been explicitly disabled. This provides a measurable speedup for things like qemu that rely on runtime disabling. Signed-off-by: Paul Mundt commit 408f0d18ba6b9bb447f807f621b2c9663c5cf638 Author: Hitoshi Mitake Date: Fri Jan 22 22:45:29 2010 +0900 perf trace: Add -i option for choosing input file perf trace lacks -i option for choosing input file. This patch adds it to perf trace. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1264167929-6741-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 19fc2dedff448120a7aeaa3c136689c6b71777c6 Author: Arnaldo Carvalho de Melo Date: Fri Jan 22 14:35:02 2010 -0200 perf symbols: Use the right variable to check for kallsyms in the cache Probably this wasn't noticed when testing this on my parisc machine because I must have copied manually to its cache the vmlinux file used in the x86_64 machine, now that I tried looking on a x86-32 machine with a fresh cache, kernel symbols weren't being resolved even with the right kallsyms copy on its cache, duh. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264178102-4203-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit e1c7c6a40c8037478742ce134190c1a955853bfb Author: Arnaldo Carvalho de Melo Date: Fri Jan 22 14:35:01 2010 -0200 perf symbols: Fix inverted logic for showing kallsyms as the source of symbols Only if we parsed /proc/kallsyms (or a copy found in the buildid cache) we should set the dso long name to "[kernel.kallsyms]". Reported-by: Mike Galbraith Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264178102-4203-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 0f35cd4cea08a8893e3e2ea03cbdb65f5d2b0e7a Author: Arnaldo Carvalho de Melo Date: Thu Jan 21 13:04:44 2010 -0200 perf top: Handle PERF_RECORD_{FORK,EXIT} events As noticed by Mike, symbols in new tasks were not being processed as we weren't processing these events. Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264086284-1431-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 24bfef0f924b4ac4312614422a4982b5f4d9a4c7 Author: Arnaldo Carvalho de Melo Date: Thu Jan 21 13:04:43 2010 -0200 perf top: Fix sample counting Broken since "5b2bb75 perf top: Support userspace symbols too". Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264086284-1431-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 994dc4245d3f50329da4ead453a5dfcfbc716a0d Author: Barry Song <21cnbao@gmail.com> Date: Wed Jan 27 11:46:18 2010 +0800 ASoC: ad1938: use soc-cache framework for codec registers access Signed-off-by: Barry Song Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 63b62ab0d52c736b3274b294df962e0a4b7aae79 Author: Barry Song <21cnbao@gmail.com> Date: Wed Jan 27 11:46:17 2010 +0800 ASoC: ad1836: use soc-cache framework for codec registers access Signed-off-by: Barry Song Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 81317960466ebd37fd958aa07993e3fea461dbe4 Author: Kukjin Kim Date: Wed Jan 27 16:57:07 2010 +0900 ARM: S5P6440: Move common memory map definitions for S5P 1. Moved common memory map definitions for S5P such as S5P_VA_XXX into plat-s5p/include/mach/map-s5p.h from mach-s5p6440/include/mach. 2. Removed unnecessary definitions in the map.h and irq.c 3. Removed the unnecessary support for unaligned UART address 4. Renamed S5P_VA_VICx definitions as VA_VICx 5. Moved the definitons of VIC_BASE to plat-s5p/include/plat/irqs.h Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit abd50713944c8ea9e0af5b7bffa0aacae21cc91a Author: Peter Zijlstra Date: Tue Jan 26 18:50:16 2010 +0100 perf: Reimplement frequency driven sampling There was a bug in the old period code that caused intel_pmu_enable_all() or native_write_msr_safe() to show up quite high in the profiles. In staring at that code it made my head hurt, so I rewrote it in a hopefully simpler fashion. Its now fully symetric between tick and overflow driven adjustments and uses less data to boot. The only complication is that it basically wants to do a u128 division. The code approximates that in a rather simple truncate until it fits fashion, taking care to balance the terms while truncating. This version does not generate that sampling artefact. Signed-off-by: Peter Zijlstra LKML-Reference: Cc: Signed-off-by: Ingo Molnar commit b50c2ea72a8ed6bc2a954019b6feb6ca41fce07e Author: Joe Perches Date: Tue Jan 26 11:40:20 2010 +0000 net/atm: Cleanup dprint/ddprintk #defines and uses Move "mpoa:%s: ", __func__/__FILE__ to #defines Remove mpoa __func__/__FILE__ from dprintk uses Add and use #define dprint_cont where appropriate Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b4c84ec0fd9ec2297b796443051554d062007ba3 Author: Joe Perches Date: Tue Jan 26 11:40:19 2010 +0000 net/atm/lec.c: Add __lec_arp_check_expire and other cleanups Reduce indentation in lec_arp_check_expire Indent a case label Remove != NULL logical tests from while ((skb = foo())) assign and tests Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b7d9371befd6fa3eb0ad9d574860095642bf70ed Author: Joe Perches Date: Tue Jan 26 11:40:18 2010 +0000 net/atm/svc.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit 0ec96e656fcd4a8ea8cb0e92f90ab4bb6f79cada Author: Joe Perches Date: Tue Jan 26 11:40:17 2010 +0000 net/atm/signaling.c: checkpatch cleanups Mostly 80 column wrapped. Move embedded assigns out of tests Move trailing statements to new lines switch/case cleanups Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 07b54c9ad4804bdd546d3db0889b0db381c726e3 Author: Joe Perches Date: Tue Jan 26 11:40:16 2010 +0000 net/atm/resources.c: checkpatch cleanups Spacing cleanups Mostly 80 column wrapped. Move embedded assigns out of tests Move trailing statements to new lines switch/case cleanups Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit fa61f0cac8b91e671eb0ba27a4972c7e72a909a6 Author: Joe Perches Date: Tue Jan 26 11:40:15 2010 +0000 net/atm/raw.c: checkpatch cleanups Spacing cleanups Mostly 80 column wrapped. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6b6dd498f409463635c4f29a3a49585bc7e5d43e Author: Joe Perches Date: Tue Jan 26 11:40:14 2010 +0000 net/atm/pvc.c: checkpatch cleanups Spacing cleanups Mostly 80 column wrapped. Move trailing statements to new lines Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 07367adbe5f18b6b7a7476094181ff99cd90cb7e Author: Joe Perches Date: Tue Jan 26 11:40:13 2010 +0000 net/atm/proc.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit d81219db6add0a176c37d6fe4e1c050778de9d2f Author: Joe Perches Date: Tue Jan 26 11:40:12 2010 +0000 net/atm/pppoatm.c: checkpatch cleanups Move embedded assigns out of tests Move trailing statements to new lines Move labels to column 1 Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f1e100491e0e696b19f37f2b0cf728a5f2bc56e7 Author: Joe Perches Date: Tue Jan 26 11:40:11 2010 +0000 net/atm/mpoa_proc.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit bee67d34b2dd495feafb1a37b5ea2d6179b74178 Author: Joe Perches Date: Tue Jan 26 11:40:10 2010 +0000 net/atm/mpoa_caches.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit 5710044073ea734c0d7806d7fb9cd6308053704b Author: Joe Perches Date: Tue Jan 26 11:40:09 2010 +0000 net/atm/mpc.c: checkpatch cleanups Convert #include pr_info and pr_cont Moved labels to column 1 Move trailing statements to new lines switch/case cleanups remove unnecessary breaks after returns Remove unnecessary braces around single line statements Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c48192a7075fb218d92810fbe76ddd8732f2bbb8 Author: Joe Perches Date: Tue Jan 26 11:40:08 2010 +0000 net/atm/lec.c: checkpatch cleanups Convert #include Use print_hex_dump Move embedded assigns out of tests Move trailing statements to new lines Remove unnecessary braces around single line statements switch/case cleanups Removed paren around returns Use %pM Moved leading continuation logical tests to end of previous line Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 5ff7ef7911d100b6568c731b1d078f819da82d03 Author: Joe Perches Date: Tue Jan 26 11:40:07 2010 +0000 net/atm/ioctl.c: checkpatch cleanups Spacing cleanups Moved EXPORT_SYMBOL Mostly 80 column wrapped. switch/case cleanups Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a8147d737bd37bd51bb01737ac9c17a2cfc02a38 Author: Joe Perches Date: Tue Jan 26 11:40:06 2010 +0000 net/atm/common.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit e956ea1b7de1df5ae4d6dc3e7460ed9e140803cd Author: Joe Perches Date: Tue Jan 26 11:40:05 2010 +0000 net/atm/clip.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit 641d729eb6236db0ce33e2b07a7f93193e60ea5a Author: Joe Perches Date: Tue Jan 26 11:40:04 2010 +0000 net/atm/br2684.c: checkpatch cleanups Convert #include Signed-off-by: David S. Miller commit f0a6cb118d7f9e72799a9c0c13f75d1b236a6546 Author: Joe Perches Date: Tue Jan 26 11:40:03 2010 +0000 net/atm/atm_sysfs.c: checkpatch cleanups Add space after for Indent switch/case statements 80 column wrapping Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 3356b4d41605f9b0977b0963c65f466eee213fe9 Author: Joe Perches Date: Tue Jan 26 11:40:02 2010 +0000 net/atm/atm_misc.c: checkpatch cleanups Moved EXPORT_SYMBOL to follow definition Add space after commas Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c39f01d7883f944ae75961cc1a31d348c7970599 Author: Joe Perches Date: Tue Jan 26 11:40:01 2010 +0000 net/atm/addr.c: Convert include Signed-off-by: David S. Miller commit 99824461ea72ca0044cc6508f02c0e1cabf37ba5 Author: Joe Perches Date: Tue Jan 26 11:40:00 2010 +0000 net/atm: Convert printk to pr_ Add #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ Remove function names from output Use single line pr_debug instead of broken multiple uses without newline Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 734f69a773d8ff65111562116c18c987049ddac4 Author: Paul Walmsley Date: Tue Jan 26 20:13:06 2010 -0700 OMAP2xxx clock: move the DVFS virtual clock code into mach-omap2/clkt2xxx_virt_prcm_set.c Move the DVFS virtual clock functions from clock2xxx.c to mach-omap2/clkt2xxx_virt_prcm_set.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage the virt_prcm_set clock are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for the virt_prcm_set clock alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/ directory, rather than shared with other chip types that don't use this clock type. Thanks to Alexander Shishkin for his comments. Thanks also to Kevin Hilman for finding and fixing a bug with the CONFIG_CPU_FREQ portion of this patch. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Alexander Shishkin Cc: Kevin Hilman commit b1823d8616b11477e9e0967c727ed5325fb12403 Author: Paul Walmsley Date: Tue Jan 26 20:13:06 2010 -0700 OMAP2xxx clock: move the DPLL+CORE composite clock code into mach-omap2/clkt2xxx_dpllcore.c Move the DPLL+CORE composite clock functions from clock2xxx.c to mach-omap2/clkt2xxx_dpllcore.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage the OMAP2 DPLL+CORE clock are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for the DPLL+CORE clock alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be placed in the mach-omap2xxx/ directory, rather than shared with other chip types that don't use this clock type. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Alexander Shishkin commit 69ecefca514c318d0ce993c48ffa3bad009c7b9b Author: Paul Walmsley Date: Tue Jan 26 20:13:04 2010 -0700 OMAP2/3/4 clock: combine all omap2_clk_functions The struct clk_functions for OMAP2, 3, and 4 are all essentially the same, so combine them. This removes one multi-OMAP kernel impediment and saves memory on multi-OMAP builds. The stubs for omap2_clk_{init,exit}_cpufreq() code will removed once the OPP layer code that's currently in Kevin's PM branch is merged. Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 4b1f76ed4f8012929494261eb6923b3c98554a9a Author: Paul Walmsley Date: Tue Jan 26 20:13:04 2010 -0700 OMAP2 clock: move all static functions to the top of the file Move static functions to the top of the file and ensure that their names are prefixed with an underscore to conform with the practice in the newer OMAP clock code files. Signed-off-by: Paul Walmsley commit df791b3ebf181b3eece9c770565fcf0844bbd7cb Author: Paul Walmsley Date: Tue Jan 26 20:13:04 2010 -0700 OMAP2/3/4 clock: move clksel clock functions into mach-omap2/clkt_clksel.c Move all clksel-related clock functions from mach-omap2/clock.c to mach-omap2/clkt_clksel.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage clksel clocks are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for clksel clocks alon. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be moved to the plat-omap/ directory to be shared. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Alexander Shishkin commit 0b96af683026ab9ca4dd52f9005a1a4fc582e914 Author: Paul Walmsley Date: Tue Jan 26 20:13:03 2010 -0700 OMAP2/3/4 clock: move DPLL clock functions into mach-omap2/clkt_dpll.c Move all DPLL-related clock functions from mach-omap2/clock.c to mach-omap2/clkt_dpll.c. This is intended to make the clock code easier to understand, since all of the functions needed to manage DPLLs are now located in their own file, rather than being mixed with other, unrelated functions. Clock debugging is also now more finely-grained, since the DEBUG macro can now be defined for DPLLs alone. This should reduce unnecessary console noise when debugging. Also, if at some future point the mach-omap2/ directory is split into OMAP2/3/4 variants, this clkt file can be moved to the plat-omap/ directory to be shared. Thanks to Alexander Shishkin for his comments to improve the patch description. Signed-off-by: Paul Walmsley Cc: Alexander Shishkin commit 98c4545749234393ec918b703f48eb708658a23d Author: Paul Walmsley Date: Tue Jan 26 20:13:03 2010 -0700 OMAP3 clock: move OMAP3-specific DPLL functions to dpll3xxx.c Mark the OMAP3-specific DPLL functions as being OMAP3-specific by moving them from mach-omap2/dpll.c to mach-omap2/dpll3xxx.c. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 46273e6f37bdf3801363986e2228350ecad19059 Author: Kevin Hilman Date: Tue Jan 26 20:13:03 2010 -0700 OMAP: hwmod: add API for slave idlemode setting Some HW blocks have errata which requires specific slave idle mode under certain conditions. This patch adds an hwmod API to allow setting slave idlemode ensuring that any SYSCONFIG register updates go through hwmod. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 9799aca2032ad53418ff4bc0d1a6f2cb4f79b6c0 Author: Kevin Hilman Date: Tue Jan 26 20:13:02 2010 -0700 OMAP: omap_device: optionally auto-adjust device activate/deactivate latencies First, this patch adds new worst-case latency values to the omap_device_pm_latency struct. Here the worst-case measured latencies for the activate and deactivate hooks are stored. In addition, add an option to auto-adjust the latency values used for device activate/deactivate. By setting a new 'OMAP_DEVICE_LATENCY_AUTO_ADJUST' flag in the omap_device_pm_latency struct, the omap_device layer automatically adjusts the activate/deactivate latencies to the worst-case measured values. Anytime a new worst-case value is found, it is printed to the console. Here is an example log during boot using UART2 s an example. After boot, the OPP is manually changed to the 125MHz OPP: [...] Freeing init memory: 128K omap_device: serial8250.2: new worst case deactivate latency 0: 30517 omap_device: serial8250.2: new worst case activate latency 0: 30517 omap_device: serial8250.2: new worst case activate latency 0: 218139648 omap_device: serial8250.2: new worst case deactivate latency 0: 61035 omap_device: serial8250.2: new worst case activate latency 0: 278076171 omap_device: serial8250.2: new worst case activate latency 0: 298614501 omap_device: serial8250.2: new worst case activate latency 0: 327331542 / # echo 125000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed omap_device: serial8250.2: new worst case deactivate latency 0: 91552 Motivation: this can be used as a technique to automatically determine the worst case latency values. The current method of printing a warning on every violation is too noisy to actually interact the console in order to set low OPP to discover latencies. Another motivation for this patch is that the activate/deactivate latenices can vary depending on the idlemode of the device. While working on the UARTs, I noticed that when using no-idle, the activate latencies were as high as several hundred msecs as shown above. When the UARTs are in smart-idle, the max latency is well under 100 usecs. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit f0271d65f9ac511d2e3e1fdbcd7418a5a7df0769 Author: Paul Walmsley Date: Tue Jan 26 20:13:02 2010 -0700 OMAP clockdomain/powerdomain: improve documentation This patch only affects documentation; no functional changes are included. Clean up comments in the current clockdomain, powerdomain code and header files. This mostly involves conversion to kerneldoc format, although some clarifications are also included. Signed-off-by: Paul Walmsley commit 915aad89fcc57a03511c69915b3876f4e53074ee Author: Paul Walmsley Date: Tue Jan 26 20:13:02 2010 -0700 OMAP powerdomain: remove pwrdm_clk_state_switch Nothing calls pwrdm_clk_state_switch(), and the function that seems to be its ideal use case calls pwrdm_clkdm_state_switch(clk->clkdm), so remove it. Signed-off-by: Paul Walmsley Cc: Tero Kristo Cc: Kevin Hilman commit e0594b448a040473fdc283934df66811f497a275 Author: Paul Walmsley Date: Tue Jan 26 20:13:01 2010 -0700 OMAP powerdomain: rearrange struct powerdomain to save some memory This patch rearranges the order of structure members in struct powerdomain to avoid wasting memory due to alignment restrictions. Signed-off-by: Paul Walmsley commit cf57aa7c5453e786acd37edea8acdd9497c708d6 Author: Paul Walmsley Date: Tue Jan 26 20:13:01 2010 -0700 OMAP powerdomain/PM: use symbolic constants for the max number of power states Replace some bare constants with symbolic constants. Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 369d5614457384edcf62c5f39b03dd20be6ea1df Author: Paul Walmsley Date: Tue Jan 26 20:13:01 2010 -0700 OMAP clockdomains: add usecounting for wakeup and sleep dependencies Add usecounting for wakeup and sleep dependencies. In the current situation, if several functions add dependencies on the same clockdomains, when the first dependency removal function is called, the dependency will be incorrectly removed from the hardware. Add clkdm_clear_all_wkdeps() and clkdm_clear_all_sleepdeps(), which provide a fast and usecounting-consistent way to clear all hardware clockdomain dependencies, since accesses to these registers can be quite slow. pm{2,3}4xx.c has been updated to use these new functions. The original version of this patch did not touch these files, which previously wrote directly to the wkdep registers, and thus confused the usecounting code. This problem was found by Kevin Hilman . N.B.: This patch introduces one significant functional difference over the previous pm34xx.c code: sleepdeps are now cleared during clockdomain initialization, whereas previously they were left untouched. This has been tested by Kevin and confirmed to work. The original version of this patch also did not take into consideration that some clockdomains do not have sleep or wakeup dependency sources, which caused NULL pointer dereferences. This problem was debugged and fixed by Kevin Hilman . Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman Cc: Jouni Högander commit e909d62a8afda7a224a7e322cf2f387d69ca771f Author: Paul Walmsley Date: Tue Jan 26 20:13:00 2010 -0700 OMAP clockdomain/powerdomain: remove runtime register/unregister OMAP clockdomains and powerdomains are currently defined statically, only registered at boot, and never unregistered, so we can remove the unregister function and the locking. A variant of this was originally suggested a while ago by Dmitry Baryshkov . This version of this patch contains an additional fix from Kevin Hilman to address one of the pwrdm_for_each_nolock() users in mach-omap2/pm-debug.c. Thanks Kevin. Signed-off-by: Paul Walmsley Cc: Dmitry Baryshkov Cc: Kevin Hilman commit 3d309cdef37e238c108cade95a8192d5688bd56a Author: Paul Walmsley Date: Tue Jan 26 20:12:59 2010 -0700 OMAP2 clockdomain: modem clockdomain is only present on OMAP2430 For some reason, previously, we included the MDM clockdomain on all 24xx, but the stacked die-on-die modem configuration (chassis mode) is only available on OMAP2430. Signed-off-by: Paul Walmsley commit a26017002847eef09625a94f897a0fb1ff58da4b Author: Paul Walmsley Date: Tue Jan 26 20:12:59 2010 -0700 OMAP2/3 clockdomains: split shared structures so usecounting works Previously some of the clockdomain wakeup/sleep dependency structures were shared between several domains. For the subsequent wakeup and sleep dependency usecounting patch to work, these can no longer be shared. This patch splits the shared structures apart. Signed-off-by: Paul Walmsley commit 55ed96945b1f3d0f4ad21a27b32ce4bd99d8c268 Author: Paul Walmsley Date: Tue Jan 26 20:12:59 2010 -0700 OMAP2/3 clkdm/pwrdm: move wkdep/sleepdep handling from pwrdm to clkdm Move clockdomain wakeup dependency and sleep dependency data structures from the powerdomain layer to the clockdomain layer, where they belong. These dependencies were originally placed in the powerdomain layer due to unclear documentation; however, it is clear now that these dependencies are between clockdomains. For OMAP2/3, this is not such a big problem, but for OMAP4 this needs to be fixed. Thanks to Benoît Cousson for his advice on this patch. Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit 6b04e0d99d4113ede24e263e3df246a17f490339 Author: Abhijit Pagare Date: Tue Jan 26 20:12:58 2010 -0700 ARM: OMAP4 clock domains : Add the missing Clock Domain Structure One of the clock domains was missing from the auto-generated file. It has been added here. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley commit bf9854010692d7fbb4c21817c66270b40db55a3b Author: Abhijit Pagare Date: Tue Jan 26 20:12:58 2010 -0700 ARM: OMAP4 clock framework: Remove the checks preventing OMAP4 clockdomain validation The clockdomain related code being in place, it is not necessary to have some part of the clock code commented out. This would help the validation of the clockdomain functions using the clock level interfaces. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley commit 0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44 Author: Paul Walmsley Date: Tue Jan 26 20:12:57 2010 -0700 OMAP1 clock: convert armwdt_ck to use the fixed divisor recalc function The armwdt_ck clock uses a fixed divisor, so it can use the OMAP clock fixed divisor recalculation code, rather than a custom function. Signed-off-by: Paul Walmsley commit e9b98f6040f5a7a04d659759d83ea28d9c528800 Author: Paul Walmsley Date: Tue Jan 26 20:12:57 2010 -0700 OMAP clock: make the fixed divisor clock code available for all OMAPs One of the OMAP1 clocks can use the fixed divisor recalculation code introduced in the OMAP2 clock code, so rename the omap2_fixed_divisor_recalc() function to omap_fixed_divisor_recalc() and make it available to all OMAPs. A followup patch converts the OMAP1 clock. Signed-off-by: Paul Walmsley commit ced825293ac34d4f250775c40f13cc6330653309 Author: Ranjith Lohithakshan Date: Tue Jan 26 20:12:57 2010 -0700 AM35xx: Clock table updates for AM3505/17 AM3505/17 though a OMAP3530 derivative have the following main differences - Removal of the following OMAP3 modules - IVA - ISP/CAM - Modem and D2D components (MAD2D, SAD2D) - USIM - SSI - Mailboxes - USB OTG - ICR - MSPRO - SmartReflex - SDRC replaced with EMIF4 Controller in the SDRC subsystem thus adding support for DDR2 memory devices - Addition of the following new modules - Ethernet MAC (CPGMAC) - CAN Controller (HECC) - New USB OTG Controller with integrated Phy - Video Processing Front End (VPFE) - Additional UART (UART4) - All security accelerators disabled on GP devices and not to be accessed or configured This patch defines CPU flags for AM3505/17 and update the clock table. Clock support for new modules will be added by subsequent patches. Signed-off-by: Ranjith Lohithakshan [paul@pwsan.com: updated for 2.6.34 clock layout] Signed-off-by: Paul Walmsley commit 2c8a177eba6762ca828738c92efcdaed02d198bc Author: Paul Walmsley Date: Tue Jan 26 20:12:56 2010 -0700 OMAP3 clock: reorganize CK_* platform flags Add CK_* flags for the two new Sitara chips, AM3505 and AM3517, and the OMAP34xx die shrink, OMAP36xx/OMAP37xx. Introduce a new CK_* flag, CK_3XXX, that marks all clocks that are common to OMAP3 family chips. CK_343X now refers to clocks that are available only on OMAP34{1,2,3,4}0 (WTBU) and OMAP35{03,15,25,30} (any version). At some point, the RATE_IN_* flags should be updated also. While here, add some documentation describing the chip families covered by these clock flags. This patch is partially based on patches from Ranjith Lohithakshan and Vishwanath Sripathy . Signed-off-by: Paul Walmsley Cc: Ranjith Lohithakshan Cc: Vishwanath Sripathy commit 05842a32c7df9ad016cb55c66c9edb46aee1240b Author: Ranjith Lohithakshan Date: Tue Jan 26 20:12:56 2010 -0700 AM35xx: Add AM35xx specific control module registers AM3517/05 has a few additional control module registers defined mainly to control the new IP's. This patch adds support for those new registers. Signed-off-by: Ranjith Lohithakshan Signed-off-by: Paul Walmsley commit 8a3ddc759b33d3b3b3953d001c8d3d9107becbb9 Author: Abhijit Pagare Date: Tue Jan 26 20:12:54 2010 -0700 ARM: OMAP4: PM: Refine the APIs to support OMAP4 features. Port the APIs to support the OMAP4 clockdomain framework. Also take care of the compiling requirements for the same. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit 1a422724c6995004d0b9e95596ec4623e8ca1fc2 Author: Abhijit Pagare Date: Tue Jan 26 20:12:54 2010 -0700 ARM: OMAP4: PM: Adapt the existing OMAP2/3 Clock Domain Frameworks. The introduction of the OMAP4 Clock Domain framework requires some adaptaions to be done in the earlier files to place the common and uncommon data in the proper places where they belong. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit 30b8863d2aa9d3f4804302f98821732a6a8f1419 Author: Abhijit Pagare Date: Tue Jan 26 20:12:54 2010 -0700 ARM: OMAP4: PM: Add the Autogenerated OMAP4 specific clock domain framework. The Autogenerated OMAP4 clock domain specific file (mach-omap2/clockdomains44xx.h) is added here. This file is auto-generated using python scripting, and following is the lsit of the people involved: Benoit Cousson Abhijit Pagare Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Signed-off-by: Benoit Cousson Cc: Rajendra Nayak commit b099474aa4e7fbaf5dc3b5858bc83dee2f94c60f Author: Abhijit Pagare Date: Tue Jan 26 20:12:53 2010 -0700 ARM: OMAP4: PM: Modify Clock-domain interfaces for OMAP4 compatibility. Here the APIs are modified to use absolute addresses instead of module offsets. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit 84c0c39aec31a09571fc08a752a2f4da0fe9fcf2 Author: Abhijit Pagare Date: Tue Jan 26 20:12:53 2010 -0700 ARM: OMAP4: PM: Make OMAP3 Clock-domain framework compatible for OMAP4. Here the ".clkstctrl_reg" field is added to the clockdomain stucture as the module offsets for OMAP4 do not map one to one for powerdomains and clockdomains as it used to for OMAP3. Hence we need to use absolute addresses to access the control registers. Some of the clock domains have modules falling in the address space of PRM partition. Hence necessitating the use of absolute adresses. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit 3a759f09d7b9c6bbefffadd38fdc116125c49730 Author: Abhijit Pagare Date: Tue Jan 26 20:12:53 2010 -0700 ARM: OMAP4: PM: Refine the APIs to support OMAP4 features. The proper Macros have to be used for platform specific calls and some of the compiling requirements and init calls are taken care of. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit 38900c27fbbbe97e16f448b8bc9cafc05af03460 Author: Abhijit Pagare Date: Tue Jan 26 20:12:52 2010 -0700 ARM: OMAP4: PM: Adapt the existing OMAP2/3 and common Power Domain Frameworks. Taking care of the platform specific and common power domains with proper checks. Also refining some Macros according to the latest OMAP4 requirements. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit f37c6dfac99451b8babdd320d7aed4e03d51b94b Author: Abhijit Pagare Date: Tue Jan 26 20:12:52 2010 -0700 ARM: OMAP4: PM: Add the Autogenerated OMAP4 specific power domain framework. The Autogenerated OMAP4 power domain specific file (mach-omap2/powerdomains44xx.h) is added here. This file is auto-generated using python scripting and following is the list of the people involved: Paul Walmsley Benoit Cousson Abhijit Pagare Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Signed-off-by: Benoit Cousson Signed-off-by: Rajendra Nayak commit 3790300903e6a98ce5f5391f4d435959266f79e7 Author: Abhijit Pagare Date: Tue Jan 26 20:12:51 2010 -0700 ARM: OMAP4: PM: OMAP4 Power Domain Porting Related Clean-up. Module offsets were same for OMAP2 and OMAP3 while they differ for OMAP4. Hence we need different macros for identifying platform specific offsets. Signed-off-by: Abhijit Pagare Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rajendra Nayak commit c6a6e6e203ee9a34fa53f773272f21d48b4e3454 Author: Abhijit Pagare Date: Tue Jan 26 20:12:51 2010 -0700 ARM: OMAP4: PM: OMAP4 essential basic initialisations. Some of the OMAP4 specific chip level initialisations are taken care of. Signed-off-by: Abhijit Pagare Cc: Benoit Cousson Cc: Rajendra Nayak Cc: Tony Lindgren [paul@pwsan.com: updated to use '4430ES1' rather than simply '4430'; updated to apply after the intervening cpu.h/id.c patch; thanks also to Tony for catching a bug in my rewrite] Signed-off-by: Paul Walmsley commit e96b234b7e9d24e50528287b881ca229b7f094b8 Author: Kukjin Kim Date: Mon Jan 25 14:24:04 2010 +0900 ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to s5p6440 SoC based systems. So these files are being moved to the machine directory of s5p6440. And these files are renamed in the machine directory. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 68717908155a9dcd4161f4d730fea478712d9794 Author: Chuck Lever Date: Tue Jan 26 14:04:13 2010 -0500 SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found" write_ports() converts svc_create_xprt()'s ENOENT error return to EPROTONOSUPPORT so that rpc.nfsd (in user space) can report an error message that makes sense. It turns out that several of the other kernel APIs rpc.nfsd use can also return ENOENT from svc_create_xprt(), by way of lockd_up(). On the client side, an NFSv2 or NFSv3 mount request can also return the result of lockd_up(). This error may also be returned during an NFSv4 mount request, since the NFSv4 callback service uses svc_create_xprt() to create the callback listener. An ENOENT error return results in a confusing error message from the mount command. Let's have svc_create_xprt() return EPROTONOSUPPORT instead of ENOENT. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit d6783b2b6c4050df0ba0a84c6842cf5bc2212ef9 Author: Chuck Lever Date: Tue Jan 26 14:04:04 2010 -0500 SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt() Clean up: Bruce observed we have more or less common logic in each of svc_create_xprt()'s callers: the check to create an IPv6 RPC listener socket only if CONFIG_IPV6 is set. I'm about to add another case that does just the same. If we move the ifdefs into __svc_xpo_create(), then svc_create_xprt() call sites can get rid of the "#ifdef" ugliness, and can use the same logic with or without IPv6 support available in the kernel. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 205ba42308729f4f41f21d314a4435e7de5c9a2e Author: Aime Le Rouzic Date: Tue Jan 26 14:03:56 2010 -0500 NFSD: Support AF_INET6 in svc_addsock() function Relax the address family check at the top of svc_addsock() to allow AF_INET6 listener sockets to be specified via /proc/fs/nfsd/portlist. Signed-off-by: Aime Le Rouzic Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 07396051a5c6901693a97e35cb731a01b0b348e4 Author: Chuck Lever Date: Tue Jan 26 14:03:47 2010 -0500 SUNRPC: Use rpc_pton() in ip_map_parse() The existing logic in ip_map_parse() can not currently parse shorthanded IPv6 addresses (anything with a double colon), nor can it parse an IPv6 presentation address with a scope ID. An IPv6-enabled mountd can pass down both. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 8e2d39a1665e680c095545993aac2fcac6916eb9 Author: Tetsuo Handa Date: Tue Jan 26 20:45:27 2010 +0900 TOMOYO: Remove usage counter for temporary memory. TOMOYO was using own memory usage counter for detecting memory leak. But as kernel 2.6.31 introduced memory leak detection mechanism ( CONFIG_DEBUG_KMEMLEAK ), we no longer need to have own counter. We remove usage counter for memory used for permission checks, but we keep usage counter for memory used for policy so that we can apply quota. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 70c91a384918736afee13104eea059cc7c8728a1 Author: Vladimir Zapolskiy Date: Tue Jan 26 14:00:40 2010 +0300 ARM: IMX31: configure pins iomux for SDHC setup on litekit board. This patch adds SDHC support, and corrects current pins setup. Added irq handling on card removal. Signed-off-by: Vladimir Zapolskiy Cc: Daniel Mack Cc: Sascha Hauer Signed-off-by: Sascha Hauer commit 4e41db871e0ea46b08eb3cdf887153c853e3ee3d Author: Uwe Kleine-König Date: Mon Jan 25 18:23:04 2010 +0100 mx2/mx3: debug-macro.S needs deprecated symbols This fixes: arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists on mx3 and is fixed by this commit, too. These were introduced by aae7019382896cf1075a93acc564e42601bc44a2. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit d0d2c38e3963f4f86a9e62d74f45a371458f2787 Merge: cf944ee e763692 Author: Takashi Iwai Date: Tue Jan 26 18:13:04 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc commit 56007a028c51cbf800a6c969d6f6431d23443b99 Author: Johannes Berg Date: Tue Jan 26 14:19:52 2010 +0100 mac80211: wait for beacon before enabling powersave Because DTIM information is required for powersave but is only conveyed in beacons, wait for a beacon before enabling powersave, and change the way the information is conveyed to the driver accordingly. mwl8k doesn't currently seem to implement PS but requires the DTIM period in a different way; after talking to Lennert we agreed to just have mwl8k do the parsing itself in the finalize_join work. Signed-off-by: Johannes Berg Acked-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c21dbf9214bce129f92e1af05552553ff0e318ed Author: Johannes Berg Date: Tue Jan 26 14:15:46 2010 +0100 cfg80211: export cfg80211_find_ie This new function (previously a static function called just "find_ie" can be used to find a specific IE in a buffer of IEs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e7636925789b042ff9d98c51d48392e8c5549480 Author: Jaroslav Kysela Date: Tue Jan 26 17:08:24 2010 +0100 ALSA: pcm_lib - return back hw_ptr_interrupt Clemens Ladisch noted for hw_ptr_removal in "cleanup & merge hw_ptr update functions" commit: "It is possible for the status/delay ioctls to be called when the sound card's pointer register alreay shows a position at the beginning of the new period, but immediately before the interrupt is actually executed. (This happens regularly on a SMP machine with mplayer.) When that happens, the code thinks that the position must be at least one period ahead of the current position and drops an entire buffer of data." Return back the hw_ptr_interrupt variable. The last interrupt pointer is always computed from the latest hw_ptr instead of tracking it separately (in this case all hw_ptr checks and modifications might influence also hw_ptr_interrupt and it is difficult to keep it consistent). Signed-off-by: Jaroslav Kysela commit b747caf365b4121903b26d1cd65454c7bc607184 Author: David S. Miller Date: Tue Jan 26 05:17:00 2010 -0800 ariadne: Fix build. References removed HAVE_MULTICAST. Reporeted-by: Geert Uytterhoeven Signed-off-by: David S. Miller commit e473b847424bd215b686cbc1e781e82c904ee967 Author: Chaithrika U S Date: Wed Jan 20 17:06:33 2010 +0530 ASoC: DaVinci: Fix stream restart error Sometimes after a suspend-resume cycle, the ALSA application restarts the stream when resume fails and McASP fails to work as the clock is not enabled. This patch corrects this bug. Testes on TI DA850/OMAP-L138 EVM. Signed-off-by: Chaithrika U S Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ccc5df058da70d1c26c72cd1c24072a89998d735 Author: Wei Ni Date: Tue Jan 26 15:59:33 2010 +0800 ALSA: hda - Add support for more the 8 streams In azx_stream_start() and azx_stream_stop(), it use azx_readb/azx_writeb to read/write SIE, it just enable/disable 8 streams. But according to the HDA spec, it support 30 streams, and the new HDA controller will support more then 8 streams. So we should use azx_readl/azx_writel to read/write SIE. Signed-off-by: Wei Ni Signed-off-by: Takashi Iwai commit 159a3ddd6c0521b4ab81697b2cf06a903a854862 Merge: 50ee2d3 1725c67 Author: Ben Dooks Date: Tue Jan 26 18:21:40 2010 +0900 ARM: Merge next-smdk6410-defconfig Merge branch 'next-smdk6410-defconfig' into next-samsung commit 50ee2d35a592ead260527244af5160c7fa6189ea Author: Ben Dooks Date: Mon Jan 25 10:46:51 2010 +0900 ARM: SAMSUNG: Add error printing to s3c24xx_register_clocks Add an error print to s3c24xx_register_clocks to provide more useful information when failing to register the clock. I belive this was originally left out due to the possibility of a problem with low-level debugging code. However, if the low-level debug code is not functional by now there will be a whole other set of problems being presented to the system. Signed-off-by: Ben Dooks commit 8428d47a36a35c457a1147c3e8aa61c1be343604 Author: Ben Dooks Date: Mon Jan 25 10:44:10 2010 +0900 ARM: SAMSUNG: Add documentation to the clock registration calls. Add some kerneldoc documentation to the s3c24xx_register_clock and the s3c24xx_register_clocks() call. Signed-off-by: Ben Dooks commit cf944ee55cc318bdb1d4b2f3f5cce3257f7c07b3 Author: Florian Zumbiehl Date: Tue Jan 26 09:06:14 2010 +0100 ALSA: cs46xx: Fix cpu idling with resume Make sure that capture DMA doesn't stay enabled after system resume as that potentially prevents the processor from entering deep sleep states. Signed-off-by: Florian Zumbiehl Signed-off-by: Takashi Iwai commit 7d6a7bde52e449f21a0e86a7a4955b4e08a49d69 Author: Dave Chinner Date: Tue Jan 26 15:13:41 2010 +1100 xfs: Use delay write promotion for dquot flushing xfs_qm_dqflock_pushbuf_wait() does a very similar trick to item pushing used to do to flush out delayed write dquot buffers. Change it to use the new promotion method rather than an async flush. Also, xfs_qm_dqflock_pushbuf_wait() can return without the flush lock held, yet the callers make the assumption that after this call the flush lock is held. Always return with the flush lock held. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 089716aa1480b7197bcd678b8477774c379a2768 Author: Dave Chinner Date: Tue Jan 26 15:13:25 2010 +1100 xfs: Sort delayed write buffers before dispatch Currently when the xfsbufd writes delayed write buffers, it pushes them to disk in the order they come off the delayed write list. If there are lots of buffers ѕpread widely over the disk, this results in overwhelming the elevator sort queues in the block layer and we end up losing the posibility of merging adjacent buffers to minimise the number of IOs. Use the new generic list_sort function to sort the delwri dispatch queue before issue to ensure that the buffers are pushed in the most friendly order possible to the lower layers. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit d808f617ad00a413585b806de340feda5ad9a2da Author: Dave Chinner Date: Tue Feb 2 10:13:42 2010 +1100 xfs: Don't issue buffer IO direct from AIL push V2 All buffers logged into the AIL are marked as delayed write. When the AIL needs to push the buffer out, it issues an async write of the buffer. This means that IO patterns are dependent on the order of buffers in the AIL. Instead of flushing the buffer, promote the buffer in the delayed write list so that the next time the xfsbufd is run the buffer will be flushed by the xfsbufd. Return the state to the xfsaild that the buffer was promoted so that the xfsaild knows that it needs to cause the xfsbufd to run to flush the buffers that were promoted. Using the xfsbufd for issuing the IO allows us to dispatch all buffer IO from the one queue. This means that we can make much more enlightened decisions on what order to flush buffers to disk as we don't have multiple places issuing IO. Optimisations to xfsbufd will be in a future patch. Version 2 - kill XFS_ITEM_FLUSHING as it is now unused. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit c854363e80b49dd04a4de18ebc379eb8c8806674 Author: Dave Chinner Date: Sat Feb 6 12:39:36 2010 +1100 xfs: Use delayed write for inodes rather than async V2 We currently do background inode flush asynchronously, resulting in inodes being written in whatever order the background writeback issues them. Not only that, there are also blocking and non-blocking asynchronous inode flushes, depending on where the flush comes from. This patch completely removes asynchronous inode writeback. It removes all the strange writeback modes and replaces them with either a synchronous flush or a non-blocking delayed write flush. That is, inode flushes will only issue IO directly if they are synchronous, and background flushing may do nothing if the operation would block (e.g. on a pinned inode or buffer lock). Delayed write flushes will now result in the inode buffer sitting in the delwri queue of the buffer cache to be flushed by either an AIL push or by the xfsbufd timing out the buffer. This will allow accumulation of dirty inode buffers in memory and allow optimisation of inode cluster writeback at the xfsbufd level where we have much greater queue depths than the block layer elevators. We will also get adjacent inode cluster buffer IO merging for free when a later patch in the series allows sorting of the delayed write buffers before dispatch. This effectively means that any inode that is written back by background writeback will be seen as flush locked during AIL pushing, and will result in the buffers being pushed from there. This writeback path is currently non-optimal, but the next patch in the series will fix that problem. A side effect of this delayed write mechanism is that background inode reclaim will no longer directly flush inodes, nor can it wait on the flush lock. The result is that inode reclaim must leave the inode in the reclaimable state until it is clean. Hence attempts to reclaim a dirty inode in the background will simply skip the inode until it is clean and this allows other mechanisms (i.e. xfsbufd) to do more optimal writeback of the dirty buffers. As a result, the inode reclaim code has been rewritten so that it no longer relies on the ambiguous return values of xfs_iflush() to determine whether it is safe to reclaim an inode. Portions of this patch are derived from patches by Christoph Hellwig. Version 2: - cleanup reclaim code as suggested by Christoph - log background reclaim inode flush errors - just pass sync flags to xfs_iflush Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 777df5afdb26c71634edd60582be620ff94e87a0 Author: Dave Chinner Date: Sat Feb 6 12:37:26 2010 +1100 xfs: Make inode reclaim states explicit A.K.A.: don't rely on xfs_iflush() return value in reclaim We have gradually been moving checks out of the reclaim code because they are duplicated in xfs_iflush(). We've had a history of problems in this area, and many of them stem from the overloading of the return values from xfs_iflush() and interaction with inode flush locking to determine if the inode is safe to reclaim. With the desire to move to delayed write flushing of inodes and non-blocking inode tree reclaim walks, the overloading of the return value of xfs_iflush makes it very difficult to determine the correct thing to do next. This patch explicitly re-adds the checks to the inode reclaim code, removing the reliance on the return value of xfs_iflush() to determine what to do next. It also means that we can clearly document all the inode states that reclaim must handle and hence we can easily see that we handled all the necessary cases. This also removes the need for the xfs_inode_clean() check in xfs_iflush() as all callers now check this first (safely). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit d5db0f97fbbeff11c88dec1aaf1536a975afbaeb Author: Eric Sandeen Date: Fri Feb 5 22:59:53 2010 +0000 xfs: more reserved blocks fixups This mangles the reserved blocks counts a little more. 1) add a helper function for the default reserved count 2) add helper functions to save/restore counts on ro/rw 3) save/restore reserved blocks on freeze/thaw 4) disallow changing reserved count while readonly V2: changed field name to match Dave's changes Signed-off-by: Eric Sandeen Signed-off-by: Alex Elder commit 388f1f0c346b533b06d8bc792f7204ebc3e4b7da Author: Dave Chinner Date: Tue Jan 26 15:10:15 2010 +1100 xfs: turn off sign warnings Because they cause warnings in static inline functions conditionally compiled into XFS from the VFS (e.g. fsnotify). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit cbe132a8bdcff0f9afd9060948fb50597c7400b8 Author: Dave Chinner Date: Tue Jan 26 15:08:49 2010 +1100 xfs: don't hold onto reserved blocks on remount,ro If we hold onto reserved blocks when doing a remount,ro we end up writing the blocks used count to disk that includes the reserved blocks. Reserved blocks are not actually used, so this results in the values in the superblock being incorrect. Hence if we run xfs_check or xfs_repair -n while the filesystem is mounted remount,ro we end up with an inconsistent filesystem being reported. Also, running xfs_copy on the remount,ro filesystem will result in an inconsistent image being generated. To fix this, unreserve the blocks when doing the remount,ro, and reserved them again on remount,rw. This way a remount,ro filesystem will appear consistent on disk to all utilities. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 485773f3e401fca31c112c1ff24797e42ff87afd Author: Paul Mundt Date: Tue Jan 26 13:02:10 2010 +0900 sh: flag ctrl_in/outX as __deprecated. These routines are unsuitable for cross-platform use and no new code should be using them, flag them as deprecated in order to give drivers sufficient time to migrate over. Signed-off-by: Paul Mundt commit 9d56dd3b083a3bec56e9da35ce07baca81030b03 Author: Paul Mundt Date: Tue Jan 26 12:58:40 2010 +0900 sh: Mass ctrl_in/outX to __raw_read/writeX conversion. The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added. Signed-off-by: Paul Mundt commit 2f6c2ac1d945ffc2e343103bdcfccbdb2e2de805 Author: Ben Dooks Date: Tue Jan 26 10:38:52 2010 +0900 ARM: S3C64XX: Squash SDHCI setup into one file Squash the SDHCI setup for both the S3C6400 and S3C6410 into one file and make the S3C6410 case use the S3C6400 code. Signed-off-by: Ben Dooks commit 97ce9d6938d58e7846dc0365c720c13ebe64547e Author: Ben Dooks Date: Tue Jan 26 10:18:14 2010 +0900 ARM: S3C64XX: Remove useless IO descriptor from S3C6410 The iotable in arch/arm/mach-s3c64xx/s3c6410.c is currently empty and therefore can be removed from the build. Signed-off-by: Ben Dooks commit 431107ea5b680a24a4d01fbd3a178a3eb932f378 Author: Ben Dooks Date: Tue Jan 26 10:11:04 2010 +0900 ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410 As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx. Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches. Signed-off-by: Ben Dooks commit cd9ec30da58bcd8ab154eba9eb54d16c67e7ef3b Author: Johnathon Harris Date: Thu Jan 21 14:36:52 2010 +0000 HID: add support for Ortek WKB-2000 This patch adds a new USB HID driver for the Ortek WKB-2000, working around an incorrect LogicalMaximum value in the USB resource descriptor. Tracked by http://bugzilla.kernel.org/show_bug.cgi?id=14787 Bug originally reported by Ubuntu users: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/405390 Signed-off-by: Johnathon Harris Tested-by: Daniel J Blueman Signed-off-by: Jiri Kosina commit ab5d97db1c6ced3e95c00d097931471707032b1f Author: Ben Dooks Date: Mon Jan 25 10:39:23 2010 +0900 ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks() Functions should be marked __init, not __initdata. Signed-off-by: Ben Dooks commit f6b56704f78b2667fc8f61d2f398931fbc032b62 Author: Maurus Cuelenaere Date: Fri Jan 22 23:29:16 2010 +0100 ARM: SAMSUNG: Fix null pointer dereference in ADC driver ARM: SAMSUNG: Fix null pointer dereference in ADC driver Use struct adc_device instead of relying on client (which could be NULL) when checking for SoC type. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit d85127319cc36c38eb99615c52531c6ef2f11369 Author: Thomas Abraham Date: Fri Jan 22 10:50:42 2010 +0900 ARM: S5PV210: Add serial port support This patch adds UART serial port support for S5PV210. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 361be8601d78e488b5249032cc4e779b81d7928e Author: Sage Weil Date: Mon Jan 25 16:03:02 2010 -0800 ceph: precede encoded ceph_pg_pool struct with version Signed-off-by: Sage Weil commit 18c949070b57d2cbcc0b25c5cfa003ece204e468 Author: Johannes Berg Date: Mon Jan 25 19:07:39 2010 +0100 mac80211: fill jiffies/vif on filtered frames Filtered frames not only need their control information cleared to avoid wrong checks, but also need to have jiffies and vif assigned so they can be processed or expired. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f2982181e0531c0b12752336a1578626f99e7828 Author: Rafał Miłecki Date: Mon Jan 25 19:00:01 2010 +0100 b43: N-PHY: use cordic to generate samples Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6f98e62a9f1bdbd83d8d1be8c2ca6f58099846ef Author: Rafał Miłecki Date: Mon Jan 25 19:00:00 2010 +0100 b43: update cordic code to match current specs Signed-off-by: Rafał Miłecki Tested-by: Larry Finger Signed-off-by: John W. Linville commit 986504540306137dfc90a936f9f25086d15621c5 Author: Rafał Miłecki Date: Mon Jan 25 18:59:59 2010 +0100 b43: make cordic common (LP-PHY and N-PHY need it) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3ed0fac3b56504aaaa3d800e7891ed4a7068b85c Author: Rafał Miłecki Date: Mon Jan 25 18:59:58 2010 +0100 b43: N-PHY: fix one bit off in parsing RF Ctrl Override arguments Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 723bae7ee44fd79c1cd3c7531ed581d373920774 Author: Johannes Berg Date: Mon Jan 25 13:36:36 2010 +0100 mac80211: track work started through callbacks Currently, the remain_on_channel work callback needs to track in its own data structure whether the work was just started or not. By reordering some code this becomes unnecessary, the generic wk->started variable can still be 'false' on the first invocation and only be 'true' on actual timeout invocations, so that the extra variable can be removed. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 382b16559d599c4260aeb82a5ea5ba44459d1cd2 Author: Johannes Berg Date: Mon Jan 25 11:36:16 2010 +0100 mac80211: fix sw crypto What a stupid mistake. In commit 813d76694043d00b59475baa1fbfaf54a2eb7fad Author: Johannes Berg Date: Sun Jan 17 01:47:58 2010 +0100 mac80211: move control.hw_key assignment I inserted code testing the wrong flags field, which means that the test is almost always true (it's really testing for the peer's WMM support) and thus the later parts of the stack assume hw crypto will be done even if that's not true. Obviously, that broke software crypto. Maxim said so specifically, and Jochen probably uses some cipher that iwl3945 doesn't support in hardware, which might also explain that Maxim reports that even hw crypto is broken. Fix this to test the right flags field. Reported-by: Maxim Levitsky Reported-by: Jochen Friedrich Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1396b231b0369c4146988c2f42fb416ae19e2572 Author: Felix Fietkau Date: Sun Jan 24 20:44:35 2010 +0100 mac80211: fix WARN_ON in the new work code ieee80211_work_rx_mgmt currently enqueues various management frames, including deauth and disassoc frames, however the function ieee80211_work_rx_queued_mgmt does not handle these, as they should only occur if the AP is buggy. It does emit a WARN_ON when this happens though, and several users have reported such instances. Fix the WARN_ON by not queueing such frames in the first place. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit eb807fb23878bc319e029ed8ce3d835d239723a5 Author: Kalle Valo Date: Sun Jan 24 14:55:12 2010 +0200 mac80211: fix update_tkip_key() documentation about the context Johannes noticed that I had incorrectly documented the context of update_tkip_key() driver operation. It must be atomic because all RX code is run inside rcu critical section. Reported-by: Johannes Berg Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 96869a39399269a776a94812e9fff3d38b47d838 Author: Michael Buesch Date: Sun Jan 24 13:13:32 2010 +0100 b43: Workaround circular locking in hw-tkip key update callback The TKIP key update callback is called from the RX path, where the driver mutex is already locked. This results in a circular locking bug. Avoid this by removing the lock. Johannes noted that there is a separate bug: The callback still breaks on SDIO hardware, because SDIO hardware access needs to sleep, but we are not allowed to sleep in the callback due to mac80211's RCU locking. Signed-off-by: Michael Buesch Tested-by: Larry Finger Reported-by: kecsa@kutfo.hit.bme.hu Cc: Johannes Berg Cc: stable Signed-off-by: John W. Linville commit 658965107e2a45a1a4297cb494adc55797dd9ad1 Author: Felix Fietkau Date: Sun Jan 24 03:26:11 2010 +0100 ath9k: improve max rate retry handling ath9k currently forces hw->max_rate_tries to 4 to work around rate control inefficiencies. This has some negative side effects, such as rate_control_send_low also using a maximum of 4 tries, which could negatively affect reliability of unicast management frames. This patch pushes the retry limit to the rate control instead, and allows it to use more tries on the last stage to prevent unnecessary packet loss. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit ff27fabe62d288038b36f41ac6a2190ed7d15993 Author: Daniel Halperin Date: Fri Jan 22 14:22:58 2010 -0800 iwlwifi: fix throughput degradation in aggregation mode The following commit commit e4da8c37af626001ff704fb29ea14eb58f5f7208 Author: Johannes Berg Date: Wed Dec 23 13:15:43 2009 +0100 mac80211: make off-channel work generic triggered a bug in iwlwifi where HT parameters would not be correctly set in some mac80211 pathways. The aggregation (and possibly other) station flags were not being set, which limited the size of aggregation blocks and reduced throughput at high rates. >From Johannes: """ Due to Wey-Yi's patch to use the set-channel command when the channel changes while associated, we don't get a full new RXON. Therefore, we don't re-set the rxon-station either. However, under some circumstances that apparently have gotten more likely mac80211 will first set up the BSS info, then add the station and then switch to an HT channel type. Therefore, the check for "priv->current_ht_config.is_ht" in iwl_rxon_add_station() will hit false and not fill in the HT information. However, that check can just be removed, which is the easiest fix for all this, because the HT capa struct is always there, just could possibly have the ht_supported member set to false. """ A sample good link in my 3x3 network improves by approximately 25% TCP throughput. This fixes Bug 2144 (http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2144). Signed-off-by: Daniel Halperin Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 81963d68575d497d626ce13e42c84518a931cc12 Author: Reinette Chatre Date: Fri Jan 22 14:22:57 2010 -0800 iwlwifi: cleanup spectrum measurement command support In iwlagn the support for spectrum measurement command has been disabled since v2.6.29 without any requests for it. In addition to this when this command is indeed enabled it has been found to trigger firmware SYSASSERT on at least 4965 and 5100 hardware (see http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=1952 ). Since then this code has been bitrotting and cannot just be enabled without porting. Remove support for spectrum measurement command from iwlagn. It can be added back if there is a future need and the firmware problem it triggers has been fixed. Support for the spectrim measurement notification remains as it has been enabled all the time. In addition to this remove the 3945 spectrum measurement command Kconfig option and make this command always supported. The code added by this enabling is minimal and only run when user triggers a spectrum measurement request via sysfs. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 65baa90d92097ce9b7c080697e6b370d335c2efc Author: Johannes Berg Date: Fri Jan 22 14:22:56 2010 -0800 iwlwifi: check endianness annotations by default sparse won't check endianness annotations by default, but iwlwifi is and should be clean so we can make sparse check them on it. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 875295f183a8cb18e9fde0edae0ab88719debcbd Author: Johannes Berg Date: Fri Jan 22 14:22:55 2010 -0800 iwlwifi: fix sparse warning sparse correctly warns about symbol not being static, make static to shut it up. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 4c84a8f1679f754d6080e49892f5cae2c88c91a8 Author: Johannes Berg Date: Fri Jan 22 14:22:54 2010 -0800 iwlwifi: clean up debugfs code The debugfs code can be made a whole lot more efficient by using debugfs_remove_recursive(), the large chunk of variables can completely go away and by moving two variables we no longer need to allocate an extra chunk of memory. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 158bea07c6017fa67bc0c64815ce5c3a998083dc Author: Johannes Berg Date: Fri Jan 22 14:22:53 2010 -0800 iwlwifi: reorder device setup It is better to first notify cfg80211 about the hw rfkill state (so the rfkill device that will be registered won't have the wrong state while being registered), and the power/tt variable init can (and probably should) also be done first. Also rename iwl_setup_mac to iwl_mac_setup_register to better describe what it really does. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1d8c4ae9169ee8d8ca7fb84a7b6bb4c7a4d49397 Author: Johannes Berg Date: Fri Jan 22 14:22:52 2010 -0800 iwlwifi: is no longer experimental It really hasn't been for a long time, not sure why this stuck around. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 06702a735eacf8679e9ff0d49eb3c989bc6b96ce Author: Wey-Yi Guy Date: Fri Jan 22 14:22:51 2010 -0800 iwlwifi: module parameter to enable/disable bt co-exist Adding "bt_coex_active" module parameter for iwlcore to enable/disable BT coexist; if bt_coex_active is true (default), uCode will do kill/defer every time the priority line is asserted (BT is sending signals on the priority line in the PCIx). By disable the bt_coex_active, uCode will ignore the BT activity and perform the normal operation. Users might experience transmit issue on some platform due to this WiFi/BT co-exist problem. The possible symptoms are: NetworkManager and other similar programs can scan and find all the available APs, but will timeout and unable to associate with any of the APs; no out-going frames can be found with wireless sniffer tools. On those platforms, WiFi communication can be restored by set "bt_coex_active" module parameter to "false" Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit dab1c161fed18eb6b3472bdbfd827264caae097f Author: Wey-Yi Guy Date: Fri Jan 22 14:22:50 2010 -0800 iwlwifi: bit field description for BT Config command Give better bit filed define and description for flag parameter in REPLY_BT_CONFIG command: flags: bit 0 - 1: BT channel announcement enabled 0: disable bit 1 - 1: priority of BT device enabled 0: disable bit 2 - 1: BT 2 wire support enabled 0: disable Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3459ab5a1c92eaf8b76e9fa1b6ca529cf83066f3 Author: Reinette Chatre Date: Fri Jan 22 14:22:49 2010 -0800 iwlwifi: make broadcast station addition generic Add function pointer for broadcast station addition so that we can call it in from iwlcore at a later time. We only distinguish between iwlagn and iwl3945 broadcast station addition. For the iwl3945 station addition we add that function to iwlcore since that is where most station functionality resides, making it part of iwl3945 will require significant code reorganization that will dilute station management functionality. This seems to be an efficient solution. It may seem as though we are removing error checking when adding the 3945 broadcast station but this error checking was never really necessary since the function returns the station id and the broadcast station id is always set. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1fa97aaeb7fb5111f69abfdb8db656ce19e4951e Author: Reinette Chatre Date: Fri Jan 22 14:22:48 2010 -0800 iwlwifi: cleanup station adding code The work done when a station is added is very similar whether the station is added synchronously or asynchronously. Centralize this work. At the same time increase the status flags being checked for when the command returns with accompanying debug messages. Also increase checking when setting the "ucode active" state with accompanying debugging. This work is done in preparation for station notification support. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 07f33f92e8e1e6ed2ec9d4de048142e7a1d96856 Author: Abhijeet Kolekar Date: Fri Jan 22 14:22:47 2010 -0800 iwlwifi: enable DC calibration From: Abhijeet Kolekar For 6X50 DC calibration needs to be initialized else uCode will run an endless loop. Enbale DC calibration in hw config. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3e4fb5faefb57824f2e42305b3d5907845af978c Author: Trieu 'Andrew' Nguyen Date: Fri Jan 22 14:22:46 2010 -0800 iwlwifi: Tune radio to prevent unexpected behavior We have seen the throughput dropped due to external noisy environment and the radio is out of tune. There are lot of plcp errors indicating this condition. Eventually the station can get de-authenticated by the Access Point. By resetting and tuning the radio, the plcp errors are reduced or eliminated and the throughput starts to rise. To prevent unexpected behavior such as drop in throughput or deauthentication, - The change provides the driver feature to monitor and tune the radio base on the statistics notification from the uCode. - It also allows the setting of the plcp error rate threshold via the plcp_delta under debugfs interface. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d4d59e88cb746165c6fe33eacb6f582d525c6ef1 Author: Wey-Yi Guy Date: Fri Jan 22 14:22:45 2010 -0800 iwlwifi: Logic to control how frequent radio should be reset if needed Add additional logic for internal scan routine to control how frequent this function should be performed. The intent of this function is to reset/re-tune the radio and bring the RF/PHY back to normal state, it does not make sense calling it too frequent, if reset the radio can not bring it back to normal state, it indicate there are other reason to cause the radio not operate correctly. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 220575f78fb0b8d2a1c41cd28115d52ae8d132ee Author: Henry Zhangh Date: Fri Jan 22 14:22:44 2010 -0800 iwlwifi: Fix A band scanning when associated This patch allows A band to be scanned when driver is associated to AP. Scan mechanism is that mac80211/cfg80211 requests driver to scan G band first and then immediately to scan A band. Original code require driver to wait for 2 seconds after any scan before another scan will be performed. This caused driver to service G band scan request from mac80211/cfg80211 but deny the A band scan request. Signed-off-by: Henry Zhangh Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit afbdd69af0e6a0c40676d4d4b94a0a4414708eaa Author: Wey-Yi Guy Date: Fri Jan 22 14:22:43 2010 -0800 iwlwifi: add function to reset/tune radio if needed Adding "radio reset" function to help reset and stabilize the radio. During normal operation, sometime for unknown reason, radio encounter problem and can not recover by itself; the best way to recover from it is to reset and re-tune the radio. Currently, there is no RF reset command available, but since radio will get reset when switching channel, use internal hw scan request to force radio reset and get back to normal operation state. The internal hw scan will only perform passive scan on the first available channel (not the channel being used) in associated state. The request should be ignored if already performing scan operation or STA is not in associated state. Also include an "internal_scan" debugfs file to help trigger the internal scan from user mode. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit a13d276f1e49ae0bc4ad18ce8ea3c90656c9e8d4 Author: Wey-Yi Guy Date: Fri Jan 22 14:22:42 2010 -0800 iwlwifi: configure missed beacon threshold Add support to configure missed beacon threshold, by default, if receive "missed beacon" notification from uCode and has more than 5 consecutive beacon missed, then perform sensitivity calibration; with this change, allow user to adjust the missed beacon threshold from debugfs in case more sensitivity calibration required for better performance in noisy environment The default value (=5) should be good enough for the normal condition, but for very noisy environment, more sensitivity calibration could help improve the throughput, so by setting the missed beacon threshold to lower number, user might experience better performance result. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 32e7bfc41110bc8f29ec0f293c3bcee6645fef34 Author: Jiri Pirko Date: Mon Jan 25 13:36:10 2010 -0800 net: use helpers to access uc list V2 This patch introduces three macros to work with uc list from net drivers. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit a3662f6bbe09a3ce7cccd622654822c0d378be2e Author: Ryan Mallon Date: Fri Jan 22 01:42:02 2010 +0100 ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board Add support for the Simplemachines EP9307 based Sim.One board. Cc: Hartley Sweeten Cc: Sergio Sorrenti Signed-off-by: Ryan Mallon Acked-by: Hartley Sweeten Signed-off-by: Russell King commit 0d59ab81c3d3adf466c3fd37d7fb6d46b05d1fd4 Author: Yehuda Sadeh Date: Wed Jan 13 17:03:23 2010 -0800 ceph: keep reserved replies on the request structure This includes treating all the data preallocation and revokation at the same place, not having to have a special case for the reserved pages. Signed-off-by: Yehuda Sadeh commit 0547a9b30a5ac8680325752b61d3ffa9d4971b6e Author: Yehuda Sadeh Date: Mon Jan 11 14:47:13 2010 -0800 ceph: alloc message data pages and check if tid exists Now doing it in the same callback that is also responsible for allocating the 'front' part of the message. If we get a message that we haven't got a corresponding tid for, mark it for skipping. Moving the mutex unlock/lock from the osd alloc_msg callback to the calling function in the messenger. Signed-off-by: Yehuda Sadeh commit 9d7f0f139edfdce1a1539b100c617fd9182b0829 Author: Yehuda Sadeh Date: Mon Jan 11 10:32:02 2010 -0800 ceph: refactor messages data section allocation Signed-off-by: Yehuda Sadeh commit 2450418c47b7998ad55a73f23707b1e21c371eef Author: Yehuda Sadeh Date: Fri Jan 8 13:58:34 2010 -0800 ceph: allocate middle of message before stating to read Both front and middle parts of the message are now being allocated at the ceph_alloc_msg(). Signed-off-by: Yehuda Sadeh commit 5b1daecd59f95eb24dc629407ed80369c9929520 Author: Sage Weil Date: Mon Jan 25 11:33:08 2010 -0800 ceph: properly handle aborted mds requests Previously, if the MDS request was interrupted, we would unregister the request and ignore any reply. This could cause the caps or other cache state to become out of sync. (For instance, aborting dbench and doing rm -r on clients would complain about a non-empty directory because the client didn't realize it's aborted file create request completed.) Even we don't unregister, we still can't process the reply normally because we are no longer holding the caller's locks (like the dir i_mutex). So, mark aborted operations with r_aborted, and in the reply handler, be sure to process all the caps. Do not process the namespace changes, though, since we no longer will hold the dir i_mutex. The dentry lease state can also be ignored as it's more forgiving. Signed-off-by: Sage Weil commit 3ea25f9441fc0951ada649105f2c57a59536b539 Author: Sage Weil Date: Mon Jan 25 11:18:17 2010 -0800 ceph: mark MDS CREATE as a write op CEPH_MDS_OP_CREATE was not correctly marked as a write operation. Signed-off-by: Sage Weil commit ec7384ec23dc5a9ea8733e90438e16b6066bfe1b Author: Julia Lawall Date: Wed Jan 20 15:16:41 2010 -0800 ceph: remove duplicate variable initialization The variable client is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit 9df5f74194871ebd0e51ef5ad2eca5084acaaaba Author: James Bottomley Date: Mon Jan 25 11:42:20 2010 -0600 mm: add coherence API for DMA to vmalloc/vmap areas On Virtually Indexed architectures (which don't do automatic alias resolution in their caches), we have to flush via the correct virtual address to prepare pages for DMA. On some architectures (like arm) we cannot prevent the CPU from doing data movein along the alias (and thus giving stale read data), so we not only have to introduce a flush API to push dirty cache lines out, but also an invalidate API to kill inconsistent cache lines that may have moved in before DMA changed the data Signed-off-by: James Bottomley commit f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 Merge: 84549d2 40aa703 Author: Mark Brown Date: Mon Jan 25 14:52:48 2010 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 Author: Barry Song <21cnbao@gmail.com> Date: Mon Jan 25 16:42:25 2010 +0800 ASoC: ad1836: reset and restore clock control mode in suspend/resume entry tests show frequent suspend/resume(frequent poweroff/on ad1836 internal components) maybe make ad1836 clock mode wrong sometimes after wakeup. This patch reset/restore ad1836 clock mode while executing PM, then ad1836 can always resume to right clock status. Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 895d4509d069f0706427ca75fcf0929ed136d0d7 Author: Guennadi Liakhovetski Date: Fri Jan 22 19:09:03 2010 +0100 ASoC: add DAI and platform / DMA drivers for SH SIU Several SuperH platforms, including sh7722, sh7343, sh7354, sh7367 include a Sound Interface Unit (SIU). This patch adds DAI and platform / DMA drivers for this interface. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6c2fb6a8d8c43544e7665859f29373c98d17df75 Author: Guennadi Liakhovetski Date: Thu Jan 21 22:04:03 2010 +0100 ASoC: add helper macros to declare struct soc_enum instances Several shortcuts for popular uses of some of SOC_ENUM_* and SOC_VALUE_ENUM_* macros. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8484c63f4b363d79febe35f95328e38018b65026 Author: Guennadi Liakhovetski Date: Thu Jan 21 21:10:47 2010 +0100 ASoC: add simplified versions of widget macros Many macros from include/sound/soc-dapm.h take an array and a number of elements in it as arguments, whereas most users use static arrays and use "x, ARRAY_SIZE(x)" as arguments. This patch adds simplified versions of those macros, calling ARRAY_SIZE() internally. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0aea778efa0d632b62eb35122cbb3b9fae548c61 Author: Takashi Iwai Date: Mon Jan 25 15:44:11 2010 +0100 ALSA: hda - Remove the COEF setup for ALC267/ALC268 The COEF setup for model=auto seems problematic on some laptops, resulting in the silent speaker output. Better to disable it for now. Signed-off-by: Takashi Iwai commit 95f475f7a2e5d60fe9eeb7a2700753036a6ee6a0 Author: Takashi Iwai Date: Mon Jan 25 15:41:11 2010 +0100 ALSA: hda - Remove coef output in Realtek proc files The output of COEF index/value in the proc file for Realtek codecs is rather useless since the value varies together with the index. Let's get rid of it again. Signed-off-by: Takashi Iwai commit f710b4b96ba292dfed2153afc47e9063b0abfd89 Author: Theodore Ts'o Date: Mon Jan 25 03:31:32 2010 -0500 ext4: Reserve INCOMPAT_EA_INODE and INCOMPAT_DIRDATA feature codepoints Signed-off-by: "Theodore Ts'o" commit 121873059fbe3b4f1ddb4781b578a2128e78be4a Author: Benjamin Valentin Date: Thu Jan 21 20:19:06 2010 -0800 Input: xpad - add rumble support for original xbox controller Signed-off-by: Benjamin Valentin Signed-off-by: Dmitry Torokhov commit ce841b945b84bf7360aa32e60ddaa1e9ccae3e96 Author: Tobias Klauser Date: Thu Jan 21 23:52:37 2010 -0800 Input: xilinx_ps2 - use resource_size Use the resource_size inline function instead of manually calculating the resource size. Signed-off-by: Tobias Klauser Acked-by: John Linn Signed-off-by: Dmitry Torokhov commit 7d52a155e38d5a165759dbbee656455861bf7801 Author: KaiGai Kohei Date: Thu Jan 21 15:00:15 2010 +0900 selinux: remove dead code in type_attribute_bounds_av() This patch removes dead code in type_attribute_bounds_av(). Due to the historical reason, the type boundary feature is delivered from hierarchical types in libsepol, it has supported boundary features both of subject type (domain; in most cases) and target type. However, we don't have any actual use cases in bounded target types, and it tended to make conceptual confusion. So, this patch removes the dead code to apply boundary checks on the target types. I makes clear the TYPEBOUNDS restricts privileges of a certain domain bounded to any other domain. Signed-off-by: KaiGai Kohei Acked-by: Stephen Smalley -- security/selinux/ss/services.c | 43 +++------------------------------------ 1 files changed, 4 insertions(+), 39 deletions(-) Signed-off-by: James Morris commit 2f3e82d694d3d7a2db019db1bb63385fbc1066f3 Author: Stephen Smalley Date: Thu Jan 7 15:55:16 2010 -0500 selinux: convert range transition list to a hashtab Per https://bugzilla.redhat.com/show_bug.cgi?id=548145 there are sufficient range transition rules in modern (Fedora) policy to make mls_compute_sid a significant factor on the shmem file setup path due to the length of the range_tr list. Replace the simple range_tr list with a hashtab inside the security server to help mitigate this problem. Signed-off-by: Stephen D. Smalley Signed-off-by: James Morris commit 19f5fb7ad679bb361222c7916086435020c37cce Author: Theodore Ts'o Date: Sun Jan 24 14:34:07 2010 -0500 ext4: Use bitops to read/modify EXT4_I(inode)->i_state At several places we modify EXT4_I(inode)->i_state without holding i_mutex (ext4_release_file, ext4_bmap, ext4_journalled_writepage, ext4_do_update_inode, ...). These modifications are racy and we can lose updates to i_state. So convert handling of i_state to use bitops which are atomic. Cc: Jan Kara Signed-off-by: "Theodore Ts'o" commit a7eb169dc7292979d78f2d2f1655026ae3a9ff5f Author: Dominik Brodowski Date: Wed Jan 6 12:18:13 2010 +0100 pcmcia: m32r uses static socket resources m32r_cfc sets the socket capabilities to SS_CAP_STATIC_MAP and also sets io_offset != 0. This means no calls to &pccard_nonstatic_ops went through. Therfore, replace it with &pccard_static_ops which is exactly for this case. CC: Mamoru Sakugawa CC: Hirokazu Takata Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit f9c316f4a2d32e4d03497ecb24e1d2309361a5b8 Author: Dominik Brodowski Date: Wed Jan 6 11:32:22 2010 +0100 pcmcia: remove some rsrc_mgr indirections Remove rsrc_mgr indirections only used by pcmcia_resource.c Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 385ee871092a524869c71a8180888aadcd6ca36d Author: Dominik Brodowski Date: Wed Jan 6 11:23:58 2010 +0100 pcmcia: remove useless indirection As release_resoure_db() used to be called only from one place, and it's a two-line function, remove it. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e Author: Dominik Brodowski Date: Sat Jan 2 23:19:45 2010 +0100 pcmcia: do not lock socket driver module on card insert Do not lock the socket driver module on card insert, as the PCMCIA core can handle a socket module removal, at least if we add a call to socket_remove() on pccardd()'s shutdown. Signed-off-by: Dominik Brodowski commit 23d2df5b0db67fa90d3caf4b2d2f21ca33ec9c11 Author: Takashi Iwai Date: Sun Jan 24 11:19:27 2010 +0100 ALSA: hda - Change headphone pin control with master volume on cx5051 The HP pin (0x16) control has to be changed dynamically depending on the master volume switch as well as the speaker pin (0x1a). Otherwise the headphone still sounds with master off. Signed-off-by: Takashi Iwai commit ecda0cff9df77d3f7d388bd4966e61f1947d2c95 Author: Takashi Iwai Date: Sun Jan 24 11:14:36 2010 +0100 ALSA: hda - Fix SPDIF output widget for Cxt5051 codec Fixed the wrongly set up for SPDIF output on Conexant 5051 codec. It must point to the audio out widget instead of a pin. Signed-off-by: Takashi Iwai commit 6953e5524a2ee0dcf57a83d8a6728d1262c54c37 Author: Takashi Iwai Date: Sun Jan 24 11:00:27 2010 +0100 ALSA: hda - initialize mic port on cxt5051 codec dynamically Initialize the mic ports B & C on Conexant 5051 codec dynamically according to the mic jack detection, instead of static init arrays. Signed-off-by: Takashi Iwai commit 2c7a3fb3f81df7318c70d2b8ecbd87f008e28d52 Author: Takashi Iwai Date: Sun Jan 24 10:47:02 2010 +0100 ALSA: hda - Merge playback controls for Cx5051 codec models All cx5051 codec models have the same Master playback mixer definitions. Merge them together. Signed-off-by: Takashi Iwai commit faddaa5d1c0cd29629c9c7e7a9d41ecb3149a064 Author: Takashi Iwai Date: Sat Jan 23 22:31:36 2010 +0100 ALSA: hda - Add support for Toshiba Satellite M300 Added the support for Toshiba Satellite M300 with Conexant 5051 codec. Since the laptop has no port C connection and the pin reports always the jack sense true, we need to ignore port-C unsol event. Signed-off-by: Takashi Iwai commit 3b43a18743421cccd33902e29016fa49b2d52dbb Author: Kalle Valo Date: Sat Jan 23 20:27:14 2010 +0200 mac80211: fix tx select key null pointer crash with hostapd Pavel Roskin reported a crash in ieee80211_tx_h_select_key(): http://marc.info/?l=linux-wireless&m=126419655108528&w=2 This is a regression from patch "mac80211: move control.hw_key assignment". Fix it as suggested by Johannes, adding an else statement to make sure that tx->key is not accessed when it's null. Compile-tested only. Reported-by: Pavel Roskin Cc: Johannes Berg Signed-off-by: Kalle Valo Tested-by: Bob Copeland Signed-off-by: John W. Linville commit 4e4ac60030293cb3d1e4bacf7c8be9aebdb8df61 Author: Takashi Iwai Date: Sat Jan 23 22:29:54 2010 +0100 ALSA: hda - Fix HP dv6736 capture mixer name Use the standard "Capture" mixer name for HP dv6736 with Cxt5051 codec. Signed-off-by: Takashi Iwai commit 5f6c3de6a79820de124fa2bb1b77d43a09410e42 Author: Takashi Iwai Date: Sat Jan 23 22:19:29 2010 +0100 ALSA: hda - Minor fixes for Compaq Presario F700 quirk Minor fixes for HP Compaq Presario F700 quirks with Cxt5051 codec: - changed the capture mixer elements to the standard name. - fixed the quirk name string without a space - sorted the quirk list - updated the documentation Signed-off-by: Takashi Iwai commit 9010bc3364db56dd88a1851e0797e597e322ce08 Author: Jeff Kirsher Date: Sat Jan 23 02:06:26 2010 -0800 ixgbevf: Fix IPv6 GSO type checks Based on patch from Sridhar Samudrala The following patch fixes the check for IPv6 GSO packet in ixgbevf driver to use skb_is_gso_v6(). SKB_GSO_DODGY is also set when packets are forwarded from a guest. CC: Sridhar Samudrala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e9017b55189355e9e6569990a18919e83f35bccb Author: Shan Wei Date: Sat Jan 23 01:57:42 2010 -0800 IP: Send an ICMP "Fragment Reassembly Timeout" message when enabling connection track No matter whether connection track is enabled, an end host should send an ICMPv4 "Fragment Reassembly Timeout" message when defrag timeout. The reasons are following two points: 1. RFC 792 says: >>>> >> > > If a host reassembling a fragmented datagram cannot complete the >>>> >> > > reassembly due to missing fragments within its time limit it >>>> >> > > discards the datagram, and it may send a time exceeded message. >>>> >> > > >>>> >> > > If fragment zero is not available then no time exceeded need be >>>> >> > > sent at all. >>>> >> > > >>>> >> > > Read more: http://www.faqs.org/rfcs/rfc792.html#ixzz0aOXRD7Wp 2. Patrick McHardy also agrees with this opinion. :-) About the discussion of this opinion, refer to http://patchwork.ozlabs.org/patch/41649 The patch fixed the problem like this: When enabling connection track, fragments are received at PRE_ROUTING HOOK. If they are failed to reassemble, ip_expire() will be called. Before sending an ICMP "Fragment Reassembly Timeout" message, the patch searches router table to get the destination entry only for host type. The patch has been tested on both host type and route type. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit e754834e65220b2b674c55c3b6dfb2fb1a2804d0 Author: Alexey Dobriyan Date: Fri Jan 22 10:18:25 2010 +0000 icmp: move icmp_err_convert[] to .rodata Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 5833929cc2ad2b3064b4fac8c44e293972d240d8 Author: Alexey Dobriyan Date: Fri Jan 22 10:17:26 2010 +0000 net: constify MIB name tables Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 81c1ebfc4379f529b001e23164dd5c2282bdc0ec Author: Alexey Dobriyan Date: Fri Jan 22 10:16:05 2010 +0000 neigh: simplify seq_file code Simpily pass 'struct neigh_table' with seq_file private pointer, and save one dereference. Proc entry itself isn't interesting. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit a271623f871dda970319ca15dfad3a8c8c36249f Author: Alexey Dobriyan Date: Fri Jan 22 10:13:10 2010 +0000 netdev: remove certain HAVE_ macros After netdev_ops compat code HAVE_* macros aren't needed, in fact they _will_ result in compile breakage for out of tree drivers. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit da6b33306801af7ee6479c177051e70842974932 Author: Greg Rose Date: Fri Jan 22 22:47:37 2010 +0000 ixgbevf: Tell network stack to stop tx when the VF detects PF reset When the VF detects that the PF has reset turn off carrier and stop all tx queues. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c0456c231a8b2981128cc29e211b7bad1bd997df Author: Greg Rose Date: Fri Jan 22 22:47:18 2010 +0000 ixgbevf: Fix panics in the VF driver Fix panics in the VF driver that occur when you bring it down after having already brought the PF down. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a9ee25a2b87c8077042ce23d3231f67f026719b0 Author: Greg Rose Date: Fri Jan 22 22:47:00 2010 +0000 ixgbevf: Take action when the PF notifies the VF it is resetting. When the VF driver gets a control message from the PF that indicates the PF is about to reset or go down we schedule the watchdog timer so that it will detect the PF has gone offline and take appropriate action. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 767081adbd920ce93e3f1cbe797d0631637f92b3 Author: Greg Rose Date: Fri Jan 22 22:46:40 2010 +0000 ixgbe: Improve reset coordination between the PF and the VF Inadequate coordination between the PF driver and the VF driver results in tx hangs in the VF driver when you perform certain actions that will lead to a re-init of the PF. Add feature to notify active VFs when the PF is about to re-initialize so that the VFs can take appropriate action. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c9205697c7527173c8f8bfa9f8c9dabdbced3c49 Author: Greg Rose Date: Fri Jan 22 22:46:22 2010 +0000 ixgbe: Allow the VF driver to be loaded before the PF driver The PF Reset Done bit should not be set in the extended control register until the PF has actually completed the bring up process. It is a mis- interpretation of the purpose of this bit to assume it should be set when the physical reset of the device is done. Instead it should be used to indicate to the VFs when the PF is ready to provide them with required services. This is not until after the PF is finished coming up and ready to process mailbox events. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ef291b8c71ee934d077676b891494c50e17ccc28 Author: Greg Rose Date: Fri Jan 22 22:46:02 2010 +0000 ixgbe: Remove unused emulation MAC storage from the per VF data structure. This data storage for SW emulated MAC addresses is unlikely to ever be used so pull it. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1ada1b1b41b0e54291aca67eed4bd42e61e7e529 Author: Greg Rose Date: Fri Jan 22 22:45:43 2010 +0000 ixgbe: Set the correct pool when VLANs are added in SR-IOV mode. When VFs are allocated (as indicated by adapter->num_vfs is non-zero) then the PF pool is no longer zero. Instead it will be the same as the number of VFs allocated. When setting the VLVF entry for the PF we need to use the correct pool otherwise the PF will get VLAN packets from the wire because the packet will pass VFTA filtering and the PF has the default pool, but it will not get VLAN packets from the VFs because it has not set the correct pool bit in the VLVF entry. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 Merge: 4276e47 6be3257 Author: David S. Miller Date: Sat Jan 23 00:31:06 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 048a8774ca43488d78605031f11cc206d7a2682a Author: Borislav Petkov Date: Fri Jan 22 16:01:07 2010 +0100 x86, cacheinfo: Calculate L3 indices We need to know the valid L3 indices interval when disabling them over /sysfs. Do that when the core is brought online and add boundary checks to the sysfs .store attribute. Signed-off-by: Borislav Petkov LKML-Reference: <1264172467-25155-6-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit 897de50e08937663912c86fb12ad7f708af2386c Author: Borislav Petkov Date: Fri Jan 22 16:01:06 2010 +0100 x86, cacheinfo: Add cache index disable sysfs attrs only to L3 caches The cache_disable_[01] attribute in /sys/devices/system/cpu/cpu?/cache/index[0-3]/ is enabled on all cache levels although only L3 supports it. Add it only to the cache level that actually supports it. Signed-off-by: Borislav Petkov LKML-Reference: <1264172467-25155-5-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit dcf39daf3d6d97f8741e82f0b9fb7554704ed2d1 Author: Borislav Petkov Date: Fri Jan 22 16:01:05 2010 +0100 x86, cacheinfo: Fix disabling of L3 cache indices * Correct the masks used for writing the cache index disable indices. * Do not turn off L3 scrubber - it is not necessary. * Make sure wbinvd is executed on the same node where the L3 is. * Check for out-of-bounds values written to the registers. * Make show_cache_disable hex values unambiguous * Check for Erratum #388 Signed-off-by: Borislav Petkov LKML-Reference: <1264172467-25155-4-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit 48a719c238bcbb72d6da79de9c5b3b93ab472107 Author: Borislav Petkov Date: Fri Jan 22 16:01:04 2010 +0100 intel-agp: Switch to wbinvd_on_all_cpus Simplify if-statement while at it. [ hpa: we need to #include ] Cc: Dave Jones Cc: David Airlie Signed-off-by: Borislav Petkov LKML-Reference: <1264172467-25155-3-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit a7b480e7f30b3813353ec009f10f2ac7a6669f3b Author: Borislav Petkov Date: Fri Jan 22 16:01:03 2010 +0100 x86, lib: Add wbinvd smp helpers Add wbinvd_on_cpu and wbinvd_on_all_cpus stubs for executing wbinvd on a particular CPU. [ hpa: renamed lib/smp.c to lib/cache-smp.c ] [ hpa: wbinvd_on_all_cpus() returns int, but wbinvd() returns void. Thus, the former cannot be a macro for the latter, replace with an inline function. ] Signed-off-by: Borislav Petkov LKML-Reference: <1264172467-25155-2-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit f12553ebe045a8a40ab33fa500fb57d10706e226 Author: Johannes Berg Date: Fri Jan 22 22:07:59 2010 +0100 mac80211: add missing key check ieee80211_tx_h_select_key might decide that a frame need not be encrypted at all, in which case it will clear tx->key. In that case it may crash if a key was previously selected, e.g. as the default key. This is also due to my patch "mac80211: move control.hw_key assignment". Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 477781477a88f60c89003c852def4aedc6f78101 Author: Alexey Dobriyan Date: Fri Jan 22 22:21:18 2010 +0100 netfiltr: ipt_CLUSTERIP: simplify seq_file codeA Pass "struct clusterip_config" itself to seq_file iterators and save one dereference. Proc entry itself isn't interesting. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit b92f7d30830a319148df2943b7565989494e5ad1 Author: Christian Lamparter Date: Fri Jan 22 08:01:11 2010 +0100 p54pci: revise tx locking This patch continues the effort which began with: "[PATCH] p54pci: move tx cleanup into tasklet". Thanks to these changes, p54pci's interrupt & tx cleanup routines can be made lock-less. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 59af099b1956086b06c0d0f32ea99ce136b415b7 Author: Rafał Miłecki Date: Fri Jan 22 01:53:16 2010 +0100 b43: N-PHY: add TX tone Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 45ca697e60eb5d3cac4530ae3a88f96c297efb09 Author: Rafał Miłecki Date: Fri Jan 22 01:53:15 2010 +0100 b43: N-PHY: add setting power amplifier filters Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 10a798733e0f47923a1050231d8d39609c62be70 Author: Rafał Miłecki Date: Fri Jan 22 01:53:14 2010 +0100 b43: N-PHY: add running samples Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 75377b2476d85d90c0db07e780ee95741cff3a2d Author: Rafał Miłecki Date: Fri Jan 22 01:53:13 2010 +0100 b43: N-PHY: implement overriding RF control Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aa4c7b2a2547db95388f795f092ea286fbdd98a1 Author: Rafał Miłecki Date: Fri Jan 22 01:53:12 2010 +0100 b43: check band width Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4bb29f8c390fb7be207ec3f11b9d30ccdf1cb6ac Author: Felix Fietkau Date: Fri Jan 22 00:36:39 2010 +0100 mac80211: fix rx data handling for non-data frames on multiple vifs The loop that passes non-data frames to all relevant vifs inside the __ieee80211_rx_handle_packet keeps a pointer to the previous sdata to avoid having to make unnecessary copies of the frame it's handling. This led to a bug that caused it to apply the ieee80211_rx_data state to the wrong interface, thereby either missing the rx.sta pointer or having it assigned where it shouldn't be. This breaks (among other things) aggregation on some vifs, as action frame exchages are dropped to the cooked monitor interface due to rx->sta being NULL. Fix this by restructuring the loop so that it prepares the rx data just before making the skb copy and calling the rx handlers. Cc: stable@kernel.org Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 58da1318ee92ad3fe7917278d596768bbe441850 Author: Vasanthakumar Thiagarajan Date: Thu Jan 21 11:17:27 2010 +0530 ath9k: Fix wifi disconnection when collocated bt scan is active As all bt packets are priority traffic during bt scan, wifi will get disconnected when bt scan lasts for few seconds. Fix this by allocating 10% of bt period time (4.5ms) to wifi fully. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a951ae2176b982574ffa197455db6c89359fd5eb Author: Bob Copeland Date: Wed Jan 20 23:51:04 2010 -0500 ath5k: fix setup for CAB queue The beacon sent gating doesn't seem to work with any combination of flags. Thus, buffered frames tend to stay buffered forever, using up tx descriptors. Instead, use the DBA gating and hold transmission of the buffered frames until 80% of the beacon interval has elapsed using the ready time. This fixes the following error in AP mode: ath5k phy0: no further txbuf available, dropping packet Add a comment to acknowledge that this isn't the best solution. Signed-off-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 5d6ce628f986d1a3c523cbb0a5a52095c48cc332 Author: Bob Copeland Date: Wed Jan 20 23:51:03 2010 -0500 ath5k: dont use external sleep clock in AP mode When using the external sleep clock in AP mode, the TSF increments too quickly, causing beacon interval to be much lower than it is supposed to be, resulting in lots of beacon-not-ready interrupts. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=14802. Signed-off-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit d0dd2de0d055f0ffb1e2ecdc21380de9d12a85e2 Author: Andriy Tkachuk Date: Wed Jan 20 13:55:06 2010 +0200 mac80211: Account HT Control field in Data frame hdrlen according to 802.11n-2009 ieee80211_hdrlen() should account account new HT Control field in 802.11 data frame header introduced by IEEE 802.11n standard. According to 802.11n-2009 HT Control field is present in data frames when both of following are met: 1. It is QoS data frame. 2. Order bit is set in Frame Control field. The change might be totally compatible with legacy non-11n aware frames, because 802.11-2007 standard states that "all QoS STAs set this subfield to 0". Signed-off-by: Andriy V. Tkachuk Acked-by : Benoit Papillault Signed-off-by: John W. Linville commit ef15aac6073b27fd4f70007784d2d52ed394bf43 Author: Johannes Berg Date: Wed Jan 20 12:02:33 2010 +0100 cfg80211: export multiple MAC addresses in sysfs If a device has multiple MAC addresses, userspace will need to know about that. Similarly, if it allows the MAC addresses to vary by a bitmask. If a driver exports multiple addresses, it is assumed that it will be able to deal with that many different addresses, which need not necessarily match the ones programmed into the device; if a mask is set then the device should deal addresses within that mask based on an arbitrary "base address". To test it all and show how it is used, add support to hwsim even though it can't actually deal with addresses different from the default. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b3fbdcf49f940d0703c356441e0daf045e64e076 Author: Johannes Berg Date: Thu Jan 21 11:40:47 2010 +0100 mac80211: pass vif and station to update_tkip_key When a TKIP key is updated, we should pass the station pointer instead of just the address, since drivers can use that to store their own data. We also need to pass the virtual interface pointer. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e4fca007b06165900d0e44e8d5e251376819bf5d Author: John W. Linville Date: Fri Jan 22 12:33:09 2010 -0500 mac80211: avoid NULL ptr deref when using WEP "mac80211: move control.hw_key assignment" changed an if-else into two separate if statments, but the if-else is needed to prevent dereferencing a null info->control.hw_key. This fixes avoids a lock-up during association on my machine when using WEP. Signed-off-by: John W. Linville commit aea9c04bcc257caad9841c283b90ec1b28267fae Author: Bob Moore Date: Fri Jan 22 19:09:06 2010 +0800 ACPICA: Update version to 20100121. Version 20100121. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit a8f13b7083a10580eeed0723df4b414ed741e0d2 Author: Bob Moore Date: Thu Jan 21 10:09:43 2010 +0800 ACPICA: Remove unused uint32_struct type This type is not used in ACPICA and thus removed. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 758d49313d0bdea1c41aa1d91ab204ca47177aae Author: Bob Moore Date: Thu Jan 21 10:08:42 2010 +0800 ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object This field is no longer needed. The "Integer" field is 64 bit and is sufficient. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 5df7e6cb42da36c7d878239bebc81907b15f3943 Author: Bob Moore Date: Thu Jan 21 10:06:32 2010 +0800 ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type This type was introduced as the code was migrated from ACPI 1.0 (with 32-bit AML integers) to ACPI 2.0 (with 64-bit integers). It is now obsolete and this change removes it from the ACPICA code base, replaced by u64. The original typedef has been retained for now for compatibility with existing device driver code. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 091f4d718620a79698e1c8ca3e9acbf78eb62da3 Author: Bob Moore Date: Thu Jan 21 09:28:32 2010 +0800 ACPICA: Predefined name repair: fix NULL package elements For the predefined methods that return fixed-length packages (or subpackages), attempt repair for a NULL element. Create an Integer of value 0, a NULL String, or a zero-length buffer as appropriate. http://www.acpica.org/bugzilla/show_bug.cgi?id=818 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 5f8902acf87aa206ee4b3f633104456d82747ca6 Author: Lin Ming Date: Thu Jan 21 09:15:20 2010 +0800 ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls In the case where a specific _HID is requested, do not run _STA until a _HID match is found. This eliminates potentially dozens of _STA calls during a search for a particular device/HID. Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit a8357b0c95484b46944728712f8810d3b37bf588 Author: Bob Moore Date: Fri Jan 22 19:07:36 2010 +0800 ACPICA: Update all ACPICA copyrights and signons to 2010 Add 2010 copyright to all module headers and signons, including the Linux header. This affects virtually every file in the ACPICA core subsystem, iASL compiler, and all utilities. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 2147d3f00f85c9e993786863d8138694672da01b Author: Bob Moore Date: Thu Jan 21 09:08:31 2010 +0800 ACPICA: Update for new gcc-4 warning options Added several new options for the gcc-4 generation, and updated the source accordingly. This includes some code restructuring to eliminate unreachable code, elimination of some gotos, elimination of unused return values, and some additional casting. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 60db48cacb9b253d5607a5ff206112a59cd09e34 Author: Thomas Gleixner Date: Wed Jan 20 20:59:06 2010 +0000 sched: Queue a deboosted task to the head of the RT prio queue rtmutex_set_prio() is used to implement priority inheritance for futexes. When a task is deboosted it gets enqueued at the tail of its RT priority list. This is violating the POSIX scheduling semantics: rt priority list X contains two runnable tasks A and B task A runs with priority X and holds mutex M task C preempts A and is blocked on mutex M -> task A is boosted to priority of task C (Y) task A unlocks the mutex M and deboosts itself -> A is dequeued from rt priority list Y -> A is enqueued to the tail of rt priority list X task C schedules away task B runs This is wrong as task A did not schedule away and therefor violates the POSIX scheduling semantics. Enqueue the task to the head of the priority list instead. Reported-by: Mathias Weber Reported-by: Carsten Emde Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Tested-by: Carsten Emde Tested-by: Mathias Weber LKML-Reference: <20100120171629.809074113@linutronix.de> commit 37dad3fce97f01e5149d69de0833d8452c0e862e Author: Thomas Gleixner Date: Wed Jan 20 20:59:01 2010 +0000 sched: Implement head queueing for sched_rt The ability of enqueueing a task to the head of a SCHED_FIFO priority list is required to fix some violations of POSIX scheduling policy. Implement the functionality in sched_rt. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Tested-by: Carsten Emde Tested-by: Mathias Weber LKML-Reference: <20100120171629.772169931@linutronix.de> commit ea87bb7853168434f4a82426dd1ea8421f9e604d Author: Thomas Gleixner Date: Wed Jan 20 20:58:57 2010 +0000 sched: Extend enqueue_task to allow head queueing The ability of enqueueing a task to the head of a SCHED_FIFO priority list is required to fix some violations of POSIX scheduling policy. Extend the related functions with a "head" argument. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Tested-by: Carsten Emde Tested-by: Mathias Weber LKML-Reference: <20100120171629.734886007@linutronix.de> commit 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 Author: Jean-Hugues Deschenes Date: Fri Jan 22 10:08:31 2010 -0700 spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK dw_spi_mmio is dependent on the clock framework. This marks it as such in Kconfig. Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 91efd773c74bb26b5409c85ad755d536448e229c Author: Christoph Lameter Date: Thu Jan 21 17:43:35 2010 -0600 dma kmalloc handling fixes 1. We need kmalloc_percpu for all of the now extended kmalloc caches array not just for each shift value. 2. init_kmem_cache_nodes() must assume node 0 locality for statically allocated dma kmem_cache structures even after boot is complete. Reported-and-tested-by: Alex Chiang Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 7738dd9e8f2bc1c249e00c9c20e018448fac0084 Author: David Rientjes Date: Fri Jan 15 12:49:56 2010 -0800 slub: remove impossible condition `s' cannot be NULL if kmalloc_caches is not NULL. This conditional would trigger a NULL pointer on `s', anyway, since it is immediately derefernced if true. Acked-by: Christoph Lameter Signed-off-by: David Rientjes Signed-off-by: Pekka Enberg commit a602f0f2f04f150fa1f7312b9e601e8e1a5afe10 Author: Uwe Kleine-König Date: Thu Dec 17 12:43:29 2009 +0100 arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode These functions are called with irqs already off. This commit removes the calls to raw_local_irq_save and raw_local_irq_restore on platforms that don't have to use a shared interrupt for their timekeeping. Signed-off-by: Uwe Kleine-König commit 501d70383aa9ffc78b41aa7e74f6b0254c7c731c Author: Uwe Kleine-König Date: Mon Sep 21 09:30:09 2009 +0200 arm/at91: Don't disable irqs in set_next_event and set_mode callbacks on AT91 the timer irq is shared, so the handler might be entered without irqs being disabled. Though this should not happen as the timer irq is registered early, there have been some reports on the mailing list. To make debugging that problem easier next time it pops up a WARN_ON_ONCE is added to the handler if irqs are not off. Signed-off-by: Uwe Kleine-König commit 7755726fe90a8b253659756e6de68c1a55aa427f Merge: 3bf1276 92dcffb Author: Dmitry Torokhov Date: Thu Jan 21 23:55:25 2010 -0800 Merge commit 'v2.6.33-rc5' into next commit 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 Author: Sarveshwar Bandi Date: Tue Jan 19 05:15:36 2010 +0000 be2net: Add link test to list of ethtool self tests. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 8f47afe080df450eedda7b29873512c2a9a9adcb Author: Sarveshwar Bandi Date: Tue Jan 19 05:15:00 2010 +0000 be2net: ethtool self test reorganization. The ddr dma ethtool self test needs to be performed even when ETH_TEST_FL_OFFLINE is not set. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 9b00f30762fe9f914eb6e03057a616ed63a4e8ca Author: Christoph Hellwig Date: Thu Jan 21 11:17:20 2010 +0000 xfs: quota limit statvfs available blocks A "df" run on an NFS client of an exported XFS file system reports the wrong information for "available" blocks. When a block quota is enforced, the amount reported as free is limited by the quota, but the amount reported available is not (and should be). Reported-by: Guk-Bong, Kwon Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit bdfb04301fa5fdd95f219539a9a5b9663b1e5fc2 Author: Christoph Hellwig Date: Wed Jan 20 21:55:30 2010 +0000 xfs: replace KM_LARGE with explicit vmalloc use We use the KM_LARGE flag to make kmem_alloc and friends use vmalloc if necessary. As we only need this for a few boot/mount time allocations just switch to explicit vmalloc calls there. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit a14a348bff2f99471a28e5928eb6801224c053d8 Author: Christoph Hellwig Date: Tue Jan 19 09:56:46 2010 +0000 xfs: cleanup up xfs_log_force calling conventions Remove the XFS_LOG_FORCE argument which was always set, and the XFS_LOG_URGE define, which was never used. Split xfs_log_force into a two helpers - xfs_log_force which forces the whole log, and xfs_log_force_lsn which forces up to the specified LSN. The underlying implementations already were entirely separate, as were the users. Also re-indent the new _xfs_log_force/_xfs_log_force which previously had a weird coding style. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 4139b3b337cffd106744386c842b89dc86e31d4b Author: Christoph Hellwig Date: Tue Jan 19 09:56:45 2010 +0000 xfs: kill XLOG_VEC_SET_TYPE This macro only obsfucates the log item type assignments, so kill it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 0cadda1c5f194f98a05d252ff4385d86d2ed0862 Author: Christoph Hellwig Date: Tue Jan 19 09:56:44 2010 +0000 xfs: remove duplicate buffer flags Currently we define aliases for the buffer flags in various namespaces, which only adds confusion. Remove all but the XBF_ flags to clean this up a bit. Note that we still abuse XFS_B_ASYNC/XBF_ASYNC for some non-buffer uses, but I'll clean that up later. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit a210c1aa7f6c90b729cc3a72d03e789b13cb6c47 Author: Christoph Hellwig Date: Sun Jan 17 22:36:19 2010 +0000 xfs: implement quota warnings via netlink Wire up quota_send_warning to send quota warnings over netlink. This is used by various desktops to show user quota warnings. Tested by running the quota_nld daemon while running the xfstest quota tests and observing the warnings. I'll see how I can get a more formal testcase for it written. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 4d1f88d75b00c4d23f4c51305ab5b779a86ef74e Author: Christoph Hellwig Date: Wed Jan 13 22:05:49 2010 +0000 xfs: clean up error handling in xfs_trans_dqresv Move the error code selection after the goto label and fold the xfs_quota_error helper into it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 512dd1abd9539a474f2792eeaf6783c59ad7778a Author: Christoph Hellwig Date: Wed Jan 13 22:05:48 2010 +0000 xfs: kill XFS_QMOPT_ASYNC The option is unused and one of the few remaining users of xfs_bawrite, so let's get rid of it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 8ca8d15ade201b7723fa386eadcce2044463ff56 Author: Jean-Hugues Deschenes Date: Thu Jan 21 09:55:54 2010 -0700 spi/dw_spi: Allow dw_spi.c to be a module Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 0a4c1d7d446d3ed6179f907541d180e49b56d4f4 Author: Jean-Hugues Deschenes Date: Thu Jan 21 09:55:42 2010 -0700 spi/dw_spi: mmio code style fixups Minor code style cleanups following comments by Wolfram Sang Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit f7b6fd6d1d3833529f1626c761ba7e338586d35e Author: Jean-Hugues Deschenes Date: Thu Jan 21 07:46:42 2010 -0700 Memory-mapped dw_spi driver Adds a memory-mapped I/O dw_spi platform device. Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 6250b9ced23032789ca9739d6a53949637f9c836 Merge: 8b296c8 c32d977 Author: Takashi Iwai Date: Thu Jan 21 15:27:28 2010 +0100 Merge branch 'topic/noncached-mmap' into topic/misc commit 8bcb4a88c5834c6a0fc7140edea32186664fe360 Author: Feng Tang Date: Thu Jan 21 07:25:38 2010 -0700 spi/dw_spi: fix missing export of dw_spi_remove_host So that interface drivers could be built as modules Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 052dc7c45d8f685fb3720a08331ba3e91e87937e Author: George Shore Date: Thu Jan 21 11:40:52 2010 +0000 spi/dw_spi: conditional transfer mode changes This allows the switching between transfer modes between 'transmit only', 'receive only' and 'transmit and receive' modes. Due to the design of the SPI block, changing transfer modes requires that the block be disabled; in doing so the chipselect line is inherently deasserted and (usually) the attached device discards its state. Consequentially, switching modes requires that a platform-specific chipselect function has been defined so that the chipselect is not dropped during the change. Signed-off-by: George Shore Signed-off-by: Grant Likely commit f4aec798ae5a837a1f062e295f9a5f1b00962589 Author: George Shore Date: Thu Jan 21 11:40:51 2010 +0000 spi/dw_spi: remove conditional from 'poll_transfer'. The 'poll_transfer' function employs a conditional to test whether the transmit buffer is valid; in doing so, on a receive operation no data is clocked out, thus no data is clocked in and ultimately errors appear. This removes the conditional as the transmit function will be set to a null writer when the transmit buffer is invalid, allowing the driver to clock 0x00 out to the device to receive data from the device. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 426c0093d8da4d7b6b0e62cda917b1bae26db4c2 Author: George Shore Date: Thu Jan 21 11:40:50 2010 +0000 spi/dw_spi: fixed a spelling typo in a warning message. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 20a588fcc862df79d8fcafbc41950e3ae93dea09 Author: George Shore Date: Thu Jan 21 11:40:49 2010 +0000 spi/dw_spi: add return value to empty mrst_spi_debugfs_init() As per the function signature. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 83fe518a839e317480e50a138ef4acd73510d7ce Author: George Shore Date: Thu Jan 21 11:40:48 2010 +0000 spi/dw_spi: enable platform specific chipselect. The driver core allows for a platform-specific chipselect assert/deassert function, however the chipselect function in the core doesn't take advantage of this fact. This enables the use of a custom function, should it be defined. Signed-off-by: George Shore Signed-off-by: Grant Likely commit c587b6fa05106606053fc5e8e344f07cd34ace23 Author: Feng Tang Date: Thu Jan 21 10:41:10 2010 +0800 spi/dw_spi: add a FIFO depth detection FIFO depth is configurable for each implementation of DW core, so add a depth detection for those interface drivers who don't set the fifo_len explicitly Signed-off-by: Feng Tang Acked-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit fd0b092a7b14559e2ff17ef3aaefb5d8adc7e15f Author: Jaroslav Kysela Date: Thu Jan 21 14:54:38 2010 +0100 ALSA: hda - AD1988 codec - fix SPDIF-input mixer initialization (unmute) The SPDIF-input pin 0x1c is muted by default in hardware. Unmute appropriate pin to get captured samples instead zeros. Tested on Lenovo Thinkstation. Signed-off-by: Jaroslav Kysela commit 8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 Merge: 88501ce c91a988 Author: Takashi Iwai Date: Thu Jan 21 14:27:14 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc commit 7c9414385ebfdd87cc542d4e7e3bb0dbb2d3ce25 Author: Dhaval Giani Date: Wed Jan 20 13:26:18 2010 +0100 sched: Remove USER_SCHED Remove the USER_SCHED feature. It has been scheduled to be removed in 2.6.34 as per http://marc.info/?l=linux-kernel&m=125728479022976&w=2 Signed-off-by: Dhaval Giani Signed-off-by: Peter Zijlstra LKML-Reference: <1263990378.24844.3.camel@localhost> Signed-off-by: Ingo Molnar commit 871e35bc9733f273eaf5ceb69bbd0423b58e5285 Author: Gautham R Shenoy Date: Wed Jan 20 14:02:44 2010 -0600 sched: Fix the place where group powers are updated We want to update the sched_group_powers when balance_cpu == this_cpu. Currently the group powers are updated only if the balance_cpu is the first CPU in the local group. But balance_cpu = this_cpu could also be the first idle cpu in the group. Hence fix the place where the group powers are updated. Signed-off-by: Gautham R Shenoy Signed-off-by: Joel Schopp Signed-off-by: Peter Zijlstra LKML-Reference: <1264017764.5717.127.camel@jschopp-laptop> Signed-off-by: Ingo Molnar commit 8f190fb3f7a405682666d3723f6ec370b5afe4da Author: Peter Zijlstra Date: Thu Dec 24 14:18:21 2009 +0100 sched: Assume *balance is valid Since all load_balance() callers will have !NULL balance parameters we can now assume so and remove a few checks. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit f492e12ef050e02bf0185b6b57874992591b9be1 Author: Peter Zijlstra Date: Wed Dec 23 15:29:42 2009 +0100 sched: Remove load_balance_newidle() The two functions: load_balance{,_newidle}() are very similar, with the following differences: - rq->lock usage - sb->balance_interval updates - *balance check So remove the load_balance_newidle() call with load_balance(.idle = CPU_NEWLY_IDLE), explicitly unlock the rq->lock before calling (would be done by double_lock_balance() anyway), and ignore the other differences for now. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 1af3ed3ddf27499c3f57662c4c29871e2b95e5f9 Author: Peter Zijlstra Date: Wed Dec 23 15:10:31 2009 +0100 sched: Unify load_balance{,_newidle}() load_balance() and load_balance_newidle() look remarkably similar, one key point they differ in is the condition on when to active balance. So split out that logic into a separate function. One side effect is that previously load_balance_newidle() used to fail and return -1 under these conditions, whereas now it doesn't. I've not yet fully figured out the whole -1 return case for either load_balance{,_newidle}(). Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit baa8c1102f0cd86e69c1497d61d2ee177e663663 Author: Peter Zijlstra Date: Thu Dec 17 18:10:09 2009 +0100 sched: Add a lock break for PREEMPT=y Since load-balancing can hold rq->locks for quite a long while, allow breaking out early when there is lock contention. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 230059de77a4e0f6afba98073e73bc9fd471506e Author: Peter Zijlstra Date: Thu Dec 17 17:47:12 2009 +0100 sched: Remove from fwd decls Move code around to get rid of fwd declarations. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 897c395f4c94ae19302f92393a0b8304e414ee06 Author: Peter Zijlstra Date: Thu Dec 17 17:45:42 2009 +0100 sched: Remove rq_iterator from move_one_task Again, since we only iterate the fair class, remove the abstraction. Since this is the last user of the rq_iterator, remove all that too. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit ee00e66ffff250fb0d3a789e5565462f71c7c9a7 Author: Peter Zijlstra Date: Thu Dec 17 17:25:20 2009 +0100 sched: Remove rq_iterator usage from load_balance_fair Since we only ever iterate the fair class, do away with this abstraction. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 3d45fd804a95055ecab5b3eed81f5ab2dbb047a2 Author: Peter Zijlstra Date: Thu Dec 17 17:12:46 2009 +0100 sched: Remove the sched_class load_balance methods Take out the sched_class methods for load-balancing. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 1e3c88bdeb1260edc341e45c9fb8efd182a5c511 Author: Peter Zijlstra Date: Thu Dec 17 17:00:43 2009 +0100 sched: Move load balance code into sched_fair.c Straight fwd code movement. Since non of the load-balance abstractions are used anymore, do away with them and simplify the code some. In preparation move the code around. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 821dd91ec7838e1313d783384ea9ce43510d4013 Author: Mark Brown Date: Thu Jan 21 11:33:20 2010 +0000 ASoC: Use BIAS_OFF when idle for wm_hubs devices This provides a small power saving when audio is inactive. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a96ca3387382498ec8b501db5acef3ed9eb1bd36 Author: Mark Brown Date: Tue Jan 19 22:49:43 2010 +0000 ASoC: Support turning off bias when the CODEC is idle Currently ASoC always maintains the bias of the CODEC while the system is active. With older mobile CODECs this is required since the outputs are referenced to a non-zero voltage and enabling or disabling this voltage without audible pops or clicks in the output takes too long to do when starting or stopping audio. As a result of features such as ground referenced outputs and class D speaker drivers current generation devices are able to power on and off much more quickly without these system level issues so provide a new flag idle_bias_off in snd_soc_codec which will cause the core to turn off the CODEC bias. The distinction between STANDBY and OFF is still maintained. This is partly for consistency but also allows for potential future extensions such as per-machine overrides or deferring the bias removal. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b91b8fa02482a5a18f598ee5d2cd42970051731b Author: Mark Brown Date: Wed Jan 20 18:18:35 2010 +0000 ASoC: Remove console DAPM debug code The same information is now visible via debugfs and with large modern devices dumping everything to the console can be very resource intensive, causing more harm than good. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 09cb47a2c68f9596927bc05dab0453edb35cd32d Author: Julia Lawall Date: Thu Jan 21 02:43:20 2010 -0800 net/sctp: Eliminate useless code The variable newinet is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit 0647aee035245e0e5ea39ae17cf909b7099f988d Author: Ben Dooks Date: Wed Jan 20 15:09:40 2010 +0900 ARM: S5P6440: Add HSMMC and OTG base addresses to map.h Add the HSOTG and HSMMC block addresses to the map.h file. Signed-off-by: Ben Dooks commit c91a988dc6551c66418690e36b2a23cdb0255da8 Author: Jaroslav Kysela Date: Thu Jan 21 10:32:15 2010 +0100 ALSA: pcm_core: Fix wake_up() optimization This change fixes the "ALSA: pcm_lib - optimize wake_up() calls for PCM I/O" commit. New sleeping queue is introduced to separate user space and kernel space wake_ups. runtime->nowake is renamed to twake (transfer wake). Signed-off-by: Jaroslav Kysela commit 17660f81243e998f36257881ac3ae61685bf91c1 Author: Michael S. Tsirkin Date: Thu Jan 21 01:28:45 2010 -0800 vhost: fix TUN=m VHOST_NET=y drivers/built-in.o: In function `get_tun_socket': net.c:(.text+0x15436e): undefined reference to `tun_get_socket' If tun is a module, vhost must be a module, too. If tun is built-in or disabled, vhost can be built-in. Note: TUN || !TUN might look a bit strange until you realize that boolean logic rules do not apply for tristate variables. Reported-by: Randy Dunlap Signed-off-by: Michael S. Tsirkin Acked-by: Randy Dunlap Signed-off-by: David S. Miller commit 4b258461c0b31ded170a1a56b944b0fded1c887b Author: Krishna Kumar Date: Thu Jan 21 01:26:29 2010 -0800 net: Optimize non-gso test checks Avoid checking twice whether skb needs to be linearized, if one skb_linearize was already done. Signed-off-by: Krishna Kumar Signed-off-by: David S. Miller commit 5f8cbc13225eadd981c817f7d14b8deab61ebfaa Author: Liu Yu-B13201 Date: Wed Jan 13 22:13:19 2010 +0000 phy: add RTBI mode for m88e1111 Signed-off-by: Liu Yu Signed-off-by: David S. Miller commit 81abb43a243b6d74b6f7201a7a22aa5355cd3a8a Author: Liu Yu-B13201 Date: Wed Jan 13 22:13:18 2010 +0000 ucc_geth: update the tbi-phy setting Old method only set tbi-phy for eth0. Signed-off-by: Liu Yu Signed-off-by: David S. Miller commit c1fb8340d7a39346c08ec4b1db4fb432f02acd4c Author: Liu Yu-B13201 Date: Wed Jan 13 22:13:17 2010 +0000 mpc8569mds: Add bscr setting for rtbi mode Signed-off-by: Liu Yu Signed-off-by: David S. Miller commit d03e067778104911cc02cb92dd152df2f3b988a5 Author: Liu Yu-B13201 Date: Wed Jan 13 22:13:16 2010 +0000 dts/mpc8569mds: Cleanup tbi phy to support rtbi After these change, when need to work in rtbi mode, just change phy-connection-type to "rtbi". Also, this work can be done by u-boot. Signed-off-by: Liu Yu Signed-off-by: David S. Miller commit 3bf127637e22ddf95e67e10a23c339cee3d52429 Author: Magnus Damm Date: Thu Jan 21 00:02:36 2010 -0800 Input: sh_keysc - add mode 4 and mode 5 support Add Mode 4 and Mode 5 support to the SH_KEYSC driver. These modes allow slightly larger key pad matrixes. While at it, make use of resource_size(). Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit ef12a141306c90336a3a10d40213ecd98624d274 Author: Arnaldo Carvalho de Melo Date: Wed Jan 20 15:28:45 2010 -0200 perf buildid-cache: Add new command to manage build-id cache For now it just has operations to examine a given file, find its build-id and add or remove it to/from the cache. Useful, for instance, when adding binaries sent together with a perf.data file, so that we can add them to the cache and have the tools find it when resolving symbols. It'll also manage the size of the cache like 'ccache' does. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1264008525-29025-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit a077e91690fb32a1453423b2cf1df3492fd30c3a Author: Paul Mundt Date: Thu Jan 21 16:16:36 2010 +0900 sh: Conserve fixmap slots when IOREMAP_FIXED=n. Presently the IOREMAP_FIXED fixmaps are always defined, even if the platform isn't capable of supporting it. Since we already have an ifdef for it, ifdef the entries, too. Signed-off-by: Paul Mundt commit 2dc2f8e0c46864e2a3722c84eaa96513d4cf8b2f Author: Paul Mundt Date: Thu Jan 21 16:05:25 2010 +0900 sh: Kill off the special uncached section and fixmap. Now that cached_to_uncached works as advertized in 32-bit mode and we're never going to be able to map < 16MB anyways, there's no need for the special uncached section. Kill it off. Signed-off-by: Paul Mundt commit 3125ee72dca25fc2157dcddd07e2d740db921fc4 Author: Paul Mundt Date: Thu Jan 21 15:54:31 2010 +0900 sh: Track the uncached mapping size. This provides a variable for tracking the uncached mapping size, and uses it for pretty printing the uncached lowmem range. Beyond this, we'll also be building on top of this for figuring out from where the remainder of P2 becomes usable when constructing unrelated mappings. Signed-off-by: Paul Mundt commit 2023b843d7b62d99e7356b872e99abc7d6667e49 Author: Paul Mundt Date: Thu Jan 21 15:42:58 2010 +0900 sh: Rework P2 to only include kernel text. This effectively neutralizes P2 by getting rid of P1 identity mapping for all available memory and instead only establishes a single unbuffered PMB entry (16MB -- the smallest available) that covers the kernel. As using segmentation for abusing caching attributes in drivers is no longer supported (and there are no drivers that can be enabled in 32-bit mode that do this), this provides us with all of the uncached access needs by the kernel itself. Drivers and their ilk need to specify their caching attributes when remapping through page tables, as usual. Signed-off-by: Paul Mundt commit 1725c679a08902ce04419b274d22254155ce707c Author: Ben Dooks Date: Tue Jan 19 13:16:50 2010 +0900 ARM: S3C64XX: Update s3c6400_defconfig for current kernel Update the s3c6400_defconfig with one from the current kernel which has been build and run tested on an SMDK6410. Signed-off-by: Ben Dooks commit 3a3b585aa4ecad21ae91cfa9e5f387d64a15a312 Author: Ben Dooks Date: Tue Jan 19 11:34:58 2010 +0900 ARM: S3C6400: Update s3c6400_defconfig for bigger initrds for SMDK6410 The Samsung initrd for SMDK6410 is now bigger than the original initrds that where used. Increase the command-line size and the size of the ramdisk that it is unpacked into. Also change the default init to /linuxrc to avoid problems with the current SMDK ramdisk image failing to run /bin/bash. Signed-off-by: Ben Dooks commit 75497d96b2094d325594b46d5e5f12b2396c4d51 Author: Ben Dooks Date: Thu Jan 21 13:31:38 2010 +0900 ARM: S3C64XX: Tidy up common code in s3c64xx_spi_set_info() The s3c64xx_spi_set_info() sets one of two platform data structures depending on which controller is being specified. Change to taking a pointer to the relevant platform data structure and then having one set of code to place the data into the area being pointed to. Cc: Jassi Brar Signed-off-by: Ben Dooks commit 77c2019fc1b4495ce483ef2af9cb12bae23e353b Author: Paul Mundt Date: Thu Jan 21 14:19:41 2010 +0900 sh: initial PMB mapping iteration by helper macro. All of the cached/uncached mapping setup is duplicated for each size, and also misses out on the 16MB case. Rather than duplicating the same iter code for that we just consolidate it in to a helper macro that builds an iter for each size. The 16MB case is then trivially bolted on at the end. Signed-off-by: Paul Mundt commit bd548e5ef21ac2ff18b262a905543d7a2340fb87 Author: Maurus Cuelenaere Date: Thu Jan 21 01:37:28 2010 +0100 ARM: S3C64XX: Fix typo in s3c-hsotg platform data ARM: S3C64XX: Fix typo in s3c-hsotg platform data Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 46f2b478b21bdb5bb588317c971a77df13702660 Author: Mark Brown Date: Wed Jan 20 13:06:05 2010 +0000 ARM: SAMSUNG: Staticise gpiolib implementation functions They are not exported, they are referenced via vtables. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8dcdd6e6bb09ba1915668b45a0ee730e820d0de1 Author: Mark Brown Date: Wed Jan 20 13:06:04 2010 +0000 ARM: S3C64XX: Staticise audio platform data It's not exported. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1c24522c05f25b89cc4df5a875d8a005a774f570 Author: Mark Brown Date: Wed Jan 20 12:05:55 2010 +0000 ARM: S3C64XX: Fix dev-audio build As reported when the patch was posted commit 71269364 ("ARM: S3C64XX: Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 9fca878623378e7dd6da8e7135a561c17bc1112b Author: Mark Brown Date: Tue Jan 19 15:26:56 2010 +0000 ARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board The WM835x driver won't actually use this yet but it will in the future when the changes converting it to genirq are merged. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8005745d6eea79da8ee2e7fe978d14e412aa3353 Author: Ben Dooks Date: Wed Jan 20 12:29:25 2010 +0900 ARM: SAMSUNG: Move pm-check.c to plat-samsung Move the pm-check.c file to plat-samsung for all Samsung SoC users, and update Kconfig names to make them SAMSUNG_ instead of S3C2410_ Sed expresions used to make the change: s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g Signed-off-by: Ben Dooks commit 106cc6aa73f594015fc8b99f7c70d1b7cf23f19a Author: Ben Dooks Date: Wed Jan 20 12:22:24 2010 +0900 ARM: SAMSUNG: Move pmw.c to plat-samsung Move the PWM driver support to plat-samsung, as these PWM blocks are close enough across the current range to be supported by this driver. Signed-off-by: Ben Dooks commit 6890556c140469622497bea98cf49bf93f92f922 Author: Ben Dooks Date: Wed Jan 20 11:09:28 2010 +0900 ARM: SAMSUNG: Move more support into plat-samsung Move header files which are not likely to be touched in any further support addition out of plat-s3c's include directory into plat-samsung. Signed-off-by: Ben Dooks commit b0f752210c0aa5e3d9ece4cbfefdc43092a68b83 Author: Matt Carlson Date: Wed Jan 20 16:58:11 2010 +0000 tg3: Add 57765 phy ID and enable devices. This patch rounds out the 57765 asic rev support by adding the 57765 phy ID and entering the 57765 device IDs in the pci table. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 334355aa590c4b58750015c2f5710cd5074f45dd Author: Matt Carlson Date: Wed Jan 20 16:58:10 2010 +0000 tg3: Bypass power source switching for 57765 The 57765 repurposes all the GPIOs normally used to switch power sources when configured as a NIC device. This patch changes the code to avoid touching the GPIOs for this asic rev. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit cb4ed1fd8af963101a59c8c5fef97cbbf5f3fb88 Author: Matt Carlson Date: Wed Jan 20 16:58:09 2010 +0000 tg3: Turn off the debug UART for 57765 If the debug UART is left enabled, the LEDs will not work properly. This patch disables the debug UART. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit c2353a3214ff5813c4b719b3cdacbe939b1c63a0 Author: Matt Carlson Date: Wed Jan 20 16:58:08 2010 +0000 tg3: Fix tx mailbox initialization If a device supports MSI-X interrupts, the driver assumes TSS will be available. This is not true for the 57765. This patch changes the code so that only the default tx mailbox is initialized if TSS is not available. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 5fd68fbdaf75505a2400826c7f314a1f3121a5f7 Author: Matt Carlson Date: Wed Jan 20 16:58:07 2010 +0000 tg3: Supply a nicaddr for 57765 jumbo RCB The 57765 needs the driver to supply a nic address to the jumbo RCB, just like all other devices except the 5717. This patch changes the test to single out the 5717 rather than maintain a lengthy whitelist of asic revs. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 8b5a6c42e1f2277433aeefa9ee5a0c1a2473b7d8 Author: Matt Carlson Date: Wed Jan 20 16:58:06 2010 +0000 tg3: Fix 5717 and 57765 memory selftests Both the 5717 and the 57765 will fail 'ethtool -t' selftests at the memory selftest portion. The memory map for these two devices differs from the rest of the asic revs and each other. This patch adds a new memory map to use for memory selftests. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit ecf1410b9d70b3034e5955e92bb0c3e02ff21e9c Author: Matt Carlson Date: Wed Jan 20 16:58:05 2010 +0000 tg3: Abort phy init for 5717 serdes devices The 5717 serdes devices have a different phy register layout than all other previous serdes devices. This patch aborts the phy init sequence in tg3_phy_reset() if the device is a 5717 serdes. It also aborts the tg3_phy_toggle_apd() operation. Most other operations in the MII_SERDES path are O.K. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 9b952f51d019db37276bdb2924e776ca09132fc1 Author: Matt Carlson Date: Wed Jan 20 16:58:04 2010 +0000 tg3: Add 5717 serdes phy ID The serdes and copper phys of the 5717 asic rev have different phy IDs. This patch adds the serdes phy ID. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 666bc831cf820e16cbd0c2d5be780c512b1afe15 Author: Matt Carlson Date: Wed Jan 20 16:58:03 2010 +0000 tg3: Improve internal resource allocations The 5717 and the 57765 have more resources at their disposal internally. This patch tunes the driver to get better performance. The adjustments made here only apply to the 57765 and 5717 asic revs. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 614b05900ec3516b835cd06f848ef6bc915beeea Author: Matt Carlson Date: Wed Jan 20 16:58:02 2010 +0000 tg3: Enable PLL PD when CLKREQ disabled for 5717A0 PCIe PLL power down cannot be used if CLKREQ is enabled because data corruption will occur. If CLKREQ is disabled though, enabling PCIE P1 PLL power-down saves some power. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 73834d6f90f6833663f9effd4cf9b79b63bc36e1 Author: J. Bruce Fields Date: Wed Jan 20 17:17:04 2010 -0500 nfsd: 4.1 has an rfc number No need to refer to an internet draft; there's an RFC now. Signed-off-by: J. Bruce Fields commit dc3256782f88602953676c447b243dedb1be99ad Author: Phillip Lougher Date: Wed Oct 14 03:58:11 2009 +0100 Squashfs: add decompressor entries for lzma and lzo Add knowledge of lzma/lzo compression formats to the decompressor framework. For now these are added as unsupported. Without these entries lzma/lzo compressed filesystems will be flagged as having unknown compression which is undesirable. Signed-off-by: Phillip Lougher commit 4c0f0bb2351bee3de8dd7715ee199454a59f1230 Author: Phillip Lougher Date: Tue Oct 6 04:04:15 2009 +0100 Squashfs: add a decompressor framework This adds a decompressor framework which allows multiple compression algorithms to be cleanly supported. Also update zlib wrapper and other code to use the new framework. Signed-off-by: Phillip Lougher commit f1a40359f8d8ba073257ed31a513e492621bcbc5 Author: Phillip Lougher Date: Wed Sep 23 19:04:49 2009 +0100 Squashfs: factor out remaining zlib dependencies into separate wrapper file Move zlib buffer init/destroy code into separate wrapper file. Also make zlib z_stream field a void * removing the need to include zlib.h for most files. Signed-off-by: Phillip Lougher commit e6a6d3795565b8ccb957afc6ca0e50db40b2d899 Author: Phillip Lougher Date: Tue Sep 22 19:25:24 2009 +0100 Squashfs: move zlib decompression wrapper code into a separate file Signed-off-by: Phillip Lougher commit 99147b5c4167612a987860b661b9f8b79e66b81f Author: Grant Likely Date: Wed Jan 20 14:03:39 2010 -0700 spi/dw_spi: fix __init/__devinit section mismatch Section mismatch in reference from the function dw_spi_add_host() to the function init_queue() Signed-off-by: Grant Likely commit 9778214990af88ec6720bd771d7fc0fa1b140b02 Author: Paul Mundt Date: Wed Jan 20 13:49:45 2010 -0700 spi: xilinx_spi: Fix up I/O routine wrapping bogosity. xilinx_spi presently makes some fairly questionable assumptions about I/O routines, and attempts to assign ioread32/iowrite32 and friends directly to its own internal function pointers. On many platforms these I/O routines are macros or wrappers and not actual functions on their own, resulting in things like: ERROR: "ioread32be" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "iowrite32be" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "iowrite32" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "ioread32" [drivers/spi/xilinx_spi.ko] undefined! If xilinx_spi wants to do this sort of casting, it needs to provide its own wrappers for these, or change how it does accesses completely. I've opted for the first approach, and the attached silly patch does that. If someone with the hardware available wants to give the second option a try that's ok too. In any event, the current code is broken for at least: arm, avr32, blackfin, microblaze, mn10300, and sh. Signed-off-by: Paul Mundt Acked-by: Richard Röjfors Signed-off-by: Grant Likely commit f4d4ecfe788b4141d8c90cfc3ac2831f620f5c1b Author: Alberto Panizzo Date: Wed Jan 20 13:49:45 2010 -0700 spi/spi_imx: add device information by switching pr_debug() to dev_dbg() Useful when debugging multiple spi channels. Signed-off-by: Alberto Panizzo Acked-by: Uwe Kleine-König Signed-off-by: Grant Likely commit ac48eee064f743a198cb38e5a6a62c3f1082ebc1 Author: Magnus Damm Date: Wed Jan 20 13:49:45 2010 -0700 spi: update MSIOF includes Update the MSIOF driver to remove the architecture speficic spi header file and add err.h. This makes the driver compile on non-SH architectures. Signed-off-by: Magnus Damm Signed-off-by: Grant Likely commit 552e450929a7298cc8834fd2824a60b2e914f70e Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: refine the IRQ mode working flow Now dw_spi core fully supports 3 transfer modes: pure polling, DMA and IRQ mode. IRQ mode will use the FIFO half empty as the IRQ trigger, so each interface driver need set the fifo_len, so that core driver can handle it properly Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 51f921c1eb1124fb99ab0728c19e8e14c82c81be Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit b490e3704ccee12deb295f96029d68e0daf02feb Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: bug fix in wait_till_not_busy() Make the driver wait at least for 1 jiffie before issuing the warning, no matter what HZ is set to Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit fa0fcde66ac3360678360104b24492015e7b852b Author: Jassi Brar Date: Wed Jan 20 13:49:45 2010 -0700 spi/s3c64xx: Add new parameter to cs callback Since most of the chip-selects are simply going to be like gpio_set_value, it would do good to have the same callback type so that it could simply be made to point at gpio_set_value. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit e6b873c9666015484a01373a4eebc6cfa82e670d Author: Jassi Brar Date: Wed Jan 20 13:49:45 2010 -0700 spi/s3c64xx: Include moved header Header for platform specific stuff has been rename to include the SoC type. Include the new header instead. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ef6c680dc5a182a79b09567168d6713f46c85784 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Check before mem-region release Add precautionary check before releasing memory region. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit b0d5d6e55340348b0de75eb691b93d7e60dba879 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Move src_clk to local driver data The pointer to SPI rate source clock had better be the member of driver local data structure rather than platform specific. Also, remove definitions of variable 'sci' that are rendered useless as a consequence. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ee64a37732c23ab2bcef5fe7785fd237a7e38951 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Differentiate ip and rate clock The instance of SPI clock for controller and that used for generating signals ought to be independently handled. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ad7de729c60380a48844f885f37451158169c50d Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Rename s3c64xx_spi_cntrlr_info Rename 'struct s3c64xx_spi_cntrlr_info' to lesser wordy 'struct s3c64xx_spi_info' Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit e9a172f074ba85de144e63b0786c7c5c5ba93c3a Author: Uwe Kleine-König Date: Wed Jan 20 13:49:44 2010 -0700 spi/mpc8xxx: don't check platform_get_irq's return value against zero platform_get_irq returns -ENXIO on failure, so !irq was probably always true. Make irq a signed variable and compare irq <= 0. Note that a return value of zero is still handled as error even though this could mean irq0. This is a followup to 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0 that changed the return value of platform_get_irq from 0 to -ENXIO on error. Signed-off-by: Uwe Kleine-König Acked-by: Anton Vorontsov Signed-off-by: Grant Likely commit 34b8c66173666025020e3a6f8d4a5c238b19cde5 Author: Steven King Date: Wed Jan 20 13:49:44 2010 -0700 spi: Add Freescale/Motorola Coldfire QSPI driver Add support for the QSPI controller found some on Freescale/Motorola Coldfire MCUs. Full duplex, active high cs, spi modes 0-3 and word sizes 8-16 bits are supported. The hardware drives the MISO, MOSI and SCLK lines, but the chip selects are managed via GPIO and must be configured by the board code. The QSPI controller has an 80 byte buffer which allows us to transfer up to 16 words at a time. For transfers longer than 16 words, we split the buffer in half so we can update in one half while the controller is operating on the other half. Interrupt latencies then ultimately limits our sustained thru-put to something less than half the maximum speed supported by the part. Signed-off-by: Steven King Signed-off-by: Grant Likely commit 631e61b7ca12ef14c834f99f8948e410c539f585 Author: Márton Németh Date: Wed Jan 20 13:49:44 2010 -0700 spi: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Grant Likely commit 68ea2d82c3671d2eccb600e6871fcbec1cac7fca Author: Robert P. J. Day Date: Wed Jan 20 13:49:44 2010 -0700 spi: Fix reversed args to time_before() in Freescale stmp driver. Signed-off-by: Robert P. J. Day Signed-off-by: Grant Likely commit 358934a60d2180dcd1ed20691dbb66d4fb977ab2 Author: Sandeep Paulraj Date: Wed Dec 16 22:02:18 2009 +0000 spi: Add SPI master driver for DaVinci/DA8xx This patch adds support for a SPI master driver for the DaVinci series of SOCs Signed-off-by: Sandeep Paulraj Signed-off-by: Mark A. Greer Signed-off-by: Philby John Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman Signed-off-by: Grant Likely commit 5b8a2fb34f5670b1f07483bfa40de9ce539dbdb2 Author: Roel Kluin Date: Sun Jan 17 20:25:36 2010 +0100 msm_sdcc.c: missing brackets in msmsdcc_resume() Since the curly brackets were missing the test and enable_irq(), if true, occurred twice. Signed-off-by: Roel Kluin commit ed42acaef1a9d51631a31b55e9ed52d400430492 Author: Russell King Date: Fri Dec 18 16:31:38 2009 +0000 ARM: make_coherent: avoid recalculating the pfn for the modified page We already know the pfn for the page to be modified in make_coherent, so let's stop recalculating it unnecessarily. Signed-off-by: Russell King commit 56dd47098abe1fdde598a8d8b7c04d775506f456 Author: Russell King Date: Fri Dec 18 16:24:34 2009 +0000 ARM: make_coherent: fix problems with highpte, part 1 update_mmu_cache() is called with a page table already mapped. We call make_coherent(), which then calls adjust_pte() which wants to map other page tables. This causes kmap_atomic() to BUG() because the slot its trying to use is already taken. Since do_adjust_pte() modifies the page tables, we are also missing any form of locking, so we're risking corrupting the page tables. Fix this by using pte_offset_map_nested(), and taking the pte page table lock around do_adjust_pte(). Signed-off-by: Russell King commit f8a85f1164a33e3eb5b421b137ced793ed53ee33 Author: Russell King Date: Fri Dec 18 16:23:44 2009 +0000 ARM: make_coherent: convert adjust_pte() to use p*d_none_or_clear_bad() Signed-off-by: Russell King commit c26c20b823d48addbde9cb5709d80655c6fadf18 Author: Russell King Date: Fri Dec 18 16:21:35 2009 +0000 ARM: make_coherent: split adjust_pte() in two adjust_pte() walks the page tables, and do_adjust_pte() does the page table manipulation. Signed-off-by: Russell King commit c9a8fdd8b3ecdcfa3aa40e553c87c5787f5d70e4 Author: Andrew Victor Date: Tue Dec 15 22:00:18 2009 +0100 ARM: 5851/1: [AT91] AT572D940HF-EK board support Add support for the Atmel AT572D940HF-EK board (development board for the AT572D940HF processor). Signed-off-by: Antonio R. Costa Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 5e38efae9635436efa1e4952cf953085839a7121 Author: Andrew Victor Date: Tue Dec 15 21:57:27 2009 +0100 ARM: 5850/1: [AT91] AT572D940HF processor support Add support for the Atmel AT572D940HF processor (DIOPSIS range). This processor integrates an ARM926 core, a DSP and the SoC peripherals usually found on an AT91 processor (USART, SSC, SPI, TWI, CAN, etc) Signed-off-by: Antonio R. Costa Signed-off-by: Andrew Victor Signed-off-by: Russell King commit bb06b737143bd35939e65b05e073019c5c451be9 Author: Hartley Sweeten Date: Tue Jan 12 19:09:12 2010 +0100 ARM: 5881/1: vic.c: reorganize code This reorganizes the vic.c code in anticipation of a second patch to use struct vic_device as the data stored in set_irq_chip_data(). The code now has the following flow: 1) struct vic_device definition, static variables, and to_vic() moved to the start of the code. 2) common code (vic_init2) 3) vic power management callbacks 4) vic power management initialization/registration 5) irq_chip callbacks 6) vendor specific vic initialization 7) vic initialization In addition the typo vik_init_st is fixed (vic_init_st). There is no functional change with this patch. Tested-by: Linus Walleij Cc: Ben Dooks Cc: Alessandro Rubini Comments from Hartley Sweeten: Please change from Cc to: Tested-by: Alessandro Rubini Signed-off-by: H Hartley Sweeten Signed-off-by: Russell King commit 6aceabb459c07a3fb4873c8306de8143c56241b2 Author: Peter Ujfalusi Date: Wed Jan 20 09:39:36 2010 +0200 ASoC: tlv320dac33: Burst mode BCLK divider configuration Add possibility to configure the burst mode BCLK divider through platform data structure. The BCLK divider changes the actual speed of the serial bus in burst mode, which is faster than the sampling frequency of the running stream. In this way platforms can experiment with the optimal burst speed without the need to modify the codec driver itself. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6cd6cede8c33364d8e1abb5ea35adf627e3781b0 Author: Peter Ujfalusi Date: Wed Jan 20 09:39:35 2010 +0200 ASoC: tlv320dac33: BCLK divider fix The BCLK divider was not configured in case of mode7. This leads to unpredictable behavior when switching between FIFO modes. Configure the BCLK divider depending on the fifo_mode (FIFO is in use, or FIFO bypass). Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 35f99c0da17beb5004f06ba86a87d82c1a6467be Author: Paul Mundt Date: Wed Jan 20 18:48:17 2010 +0900 sh: pretty print virtual memory map on boot. This cribs the pretty printing from arch/x86/mm/init_32.c to dump the virtual memory layout on boot. This is primarily intended as a debugging aid, given that the newer CPUs have full control over their address space and as such have little to nothing in common with the legacy layout. Signed-off-by: Paul Mundt commit 7c070aa947d1a4105742378579c267f6e7fd08a1 Author: Shan Wei Date: Wed Jan 20 10:42:41 2010 +0100 IPv6: reassembly: replace magic number with macro definitions Use macro to define high/low thresh value, refer to IPV6_FRAG_TIMEOUT. Signed-off-by: Shan Wei Acked-by: David S. Miller Signed-off-by: Patrick McHardy commit b38f6eddeee510ce8178c2d2db54ed25f1d7cb63 Author: Shan Wei Date: Wed Jan 20 10:39:14 2010 +0100 netfilter: nf_conntrack_ipv6: delete the redundant macro definitions The following three macro definitions are never used, so delete them. Signed-off-by: Shan Wei Acked-by: David S. Miller Signed-off-by: Patrick McHardy commit d9116d07f60383cef134c43a0ba15ec4375310fc Author: Paul Mundt Date: Wed Jan 20 18:25:19 2010 +0900 sh: mach-sdk7786: Probe system FPGA area mapping. This implements dynamic probing for the system FPGA. The system reset controller contains a fixed magic read word in order to identify the FPGA. This just utilizes a simple loop that scans across all of the fixed physical areas (area 0 through area 6) to locate the FPGA. The FPGA also contains register information detailing the area mappings and chip select settings for all of the other blocks, so this needs to be done before we can set up anything else. Signed-off-by: Paul Mundt commit 920efaabcbd34e6b8dc05c5b777df3e936af5812 Author: Paul Mundt Date: Wed Jan 20 18:10:30 2010 +0900 sh: Correct iounmap fixmap teardown. iounmap_fixed() had a couple of bugs in it that caused it to effectively fail at life. The total number of pages to unmap factored in the mapping offset and aligned up to the next page boundary, which doesn't match the ioremap_fixed() behaviour. When ioremap_fixed() pegs a slot, the address in the mapping data already contains the offset displacement, and the size is recorded verbatim given that we're only interested in total number of pages required. As such, we need to calculate the total number from the original size in the unmap path as well. At the same time, there was also an off-by-1 problem in the fixmap index calculation which has also been corrected. Previously subsequent remaps of an identical fixmap index would trigger the pte_ERROR() in set_pte_phys(): arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). With this patch in place, the iounmap-driven fixmap teardown actually does what it's supposed to do. Signed-off-by: Paul Mundt commit 016ddd9b5b315fe52ac6ba3167521f50b3868d34 Author: Jiri Kosina Date: Mon Jan 18 17:05:40 2010 +0100 x86: Put 'nopat' in kernel-parameters Add missing 'nopat' boot option into Documentation/kernel-parameters.txt. Signed-off-by: Jiri Kosina LKML-Reference: Signed-off-by: Ingo Molnar commit dc8d6ab2b61a2d92b5d7438565ccd20b29724cb2 Author: Arnaldo Carvalho de Melo Date: Tue Jan 19 10:36:14 2010 -0200 perf symbols: Use only --vmlinux if specified Found while analysing a perf.data file collected on an ARM machine where an explicitely specified vmlinux was being disregarded. Reported-by: Jamie Iles Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263904574-30732-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f162f87ad6e98e8bfb2362955da46bed7b2514be Author: Arnaldo Carvalho de Melo Date: Tue Jan 19 10:36:13 2010 -0200 perf symbols: Set dso->kernel when handling the fake vmlinux MMAP event Because it may be possible that there was no buildid section, where we would set this to 1. Found while analysing a perf.data file collected on an ARM machine where an explicitely specified vmlinux was being disregarded. Reported-by: Jamie Iles Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263904574-30732-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d5526d8cb8e5aa3349c1ff4e409ad9b4cdac380c Author: Arnaldo Carvalho de Melo Date: Mon Jan 18 18:21:42 2010 -0200 perf archive: Fix installation steps in the Makefile Fix these warning: acme@parisc:~/git/linux-2.6-tip$ make -C tools/perf/ install make: Entering directory `/home/acme/git/linux-2.6-tip/tools/perf' Makefile:833: warning: overriding commands for target `perf-archive' Makefile:822: warning: ignoring old commands for target `perf-archive' Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263846102-24841-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit e8d433f335d44028d41af231ef5c52fd8a9b280b Author: Arnaldo Carvalho de Melo Date: Mon Jan 18 15:59:19 2010 -0200 perf archive: Add documentation This also makes it appear on the 'perf --help' output, i.e. util/generate-cmdlist.sh now takes it into account. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263837559-24168-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b51989b8afe9409ee68c67ce2a5de4390693bd2b Author: Paul Mundt Date: Wed Jan 20 16:53:11 2010 +0900 sh: mach-sdk7786: reset controller reboot support. This wires up the machine_ops reboot call to use the system reset controller. Signed-off-by: Paul Mundt commit fbb82b03653cdb7fd1863b911e7540011259d2ce Author: Paul Mundt Date: Wed Jan 20 16:42:52 2010 +0900 sh: machine_ops based reboot support. This provides a machine_ops-based reboot interface loosely cloned from x86, and converts the native sh32 and sh64 cases over to it. Necessary both for tying in SMP support and also enabling platforms like SDK7786 to add support for their microcontroller-based power managers. Signed-off-by: Paul Mundt commit 2efa53b269ec1e9289a108e1506f53f6f1de440b Author: Paul Mundt Date: Wed Jan 20 16:40:48 2010 +0900 sh: Make 29/32-bit mode check helper generally available. Presently __in_29bit_mode() is only defined for the PMB case, but it's also easily derived from the CONFIG_29BIT and CONFIG_32BIT && CONFIG_PMB=n cases. Signed-off-by: Paul Mundt commit 5f240718b475dcddee86b138b624f24c681dbb29 Author: Paul Mundt Date: Wed Jan 20 15:23:54 2010 +0900 sh: mach-sdk7786: Split out FPGA IRQ controller setup. This moves out the FPGA IRQ controller setup code to its own file, in preparation for switching off of IRL mode and having it provide its own irq_chip. Signed-off-by: Paul Mundt commit df3ab708b787a2b35de5101452bd51d4a8ae0ded Author: Motohiro KOSAKI Date: Mon Jan 18 21:35:12 2010 -0500 kprobetrace, doc: Add the explanation to remove probe points Latest kprobetrace can remove probe points selectively, thus the documentation should be updated too. Signed-off-by: KOSAKI Motohiro Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100119023512.31880.35535.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 580d9e00fdfb85e65c5097dcd739c6efcdbadc96 Author: Motohiro KOSAKI Date: Mon Jan 18 21:35:05 2010 -0500 kprobetrace, doc: Shell needs single quote to use $ character Shell interprets $val as shell variable, thus we need quote if we use the echo command. Signed-off-by: KOSAKI Motohiro Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE LKML-Reference: <20100119023505.31880.17367.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit efd590d57a5edddabaaf4cfaf532c0f674193b81 Author: Paul Mundt Date: Wed Jan 20 15:08:36 2010 +0900 sh: mach-sdk7786: FPGA updates. This does a bit of refactoring of the FPGA management code. The primary FPGA initialization is moved out to its own file in preparation for implementing some of the more complex capabilities, a complete set of register definitions is provided, and all of the existing users in the board code are moved over to use the new interface instead of setting up overlapping mappings. This also corrects the FPGA size, which previously was chomped off at the SDIF control register. Signed-off-by: Paul Mundt commit 587aa0feb74ffe3239b5e26ff5d017ba9f5daec9 Author: Dave Chinner Date: Wed Jan 20 12:04:53 2010 +1100 xfs: rearrange xfs_mod_sb() to avoid array subscript warning gcc warns of an array subscript out of bounds in xfs_mod_sb(). The code is written in such a way that if the array subscript is out of bounds, then it will assert fail. Rearrange the code to avoid the bounds check warning. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit f0a0eaa8da08ebc6519cacd731df05bbb4ca47ce Author: Dave Chinner Date: Wed Jan 20 10:50:06 2010 +1100 xfs: suppress spurious uninitialised var warning in xfs_bmapi() Initialise the xfs_bmalloca_t structure to zero to avoid uninitialised variable warnings. This is done by zeroing the arg structure rather than using the uninitialised_var() trick so we know for certain that the structure is correctly initialised as xfs_bmapi is a very complex function and it is difficult to prove warnings are spurious. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 58c75cfb51393a52b45262394c1fa81514b4d9bd Author: Dave Chinner Date: Wed Jan 20 10:49:18 2010 +1100 xfs: make compile warn about char sign mismatches again The -fno-unsigned-char directive has no effect anymore as the XFs build is clean. However, the kernel build hides pointer sign differences so turn that back on so that we can clean up all the mismatches prior to a userspace code resync. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 4a24cb71407dc25035d75dd3d118e0e55679e217 Author: Dave Chinner Date: Wed Jan 20 10:48:05 2010 +1100 xfs: clean up sign warnings in dir2 code We are now consistently using unsigned char strings for names so fix up the remaining warnings in the dir2 code to complete the cleanup. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a9273ca5c6814f393e18ed66645f817b2b71e9ad Author: Dave Chinner Date: Wed Jan 20 10:47:48 2010 +1100 xfs: convert attr to use unsigned names To be consistent with the directory code, the attr code should use unsigned names. Convert the names from the vfs at the highest level to unsigned, and ænsure they are consistenly used as unsigned down to disk. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit b9c48649577dfc4a8c263c106d518effa24ea54b Author: Dave Chinner Date: Wed Jan 20 10:47:39 2010 +1100 xfs: xfs_buf_iomove() doesn't care about signedness xfs_buf_iomove() uses xfs_caddr_t as it's parameter types, but it doesn't care about the signedness of the variables as it is just copying the data. Change the prototype to use void * so that we don't get sign warnings at call sites. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a3380ae39fa321282c407ba5e1835e14b64853d9 Author: Dave Chinner Date: Wed Jan 20 10:47:25 2010 +1100 xfs: make xfs_dir_cilookup_result use unsigned char For consistency with the result of the code. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 2bc754213d40d67c39ddd58cf240f2b948e1951e Author: Dave Chinner Date: Wed Jan 20 10:47:17 2010 +1100 xfs: convert dirnameops to unsigned char names To be consistent across the codebase, convert the dirnameops to pass the directory names by unsigned char strings. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 046ea753130fc51d885835458bf8c1d84765b9ac Author: Dave Chinner Date: Wed Jan 20 10:47:08 2010 +1100 xfs: convert DM ops to use unsigned char names dmops uses a signed char for it's namespace event. To be consistent with the rest of the code, convert them to unsigned char for the namespace string. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e2bcd936eb95d0019ca5e05f9fdd27e770ddded1 Author: Dave Chinner Date: Wed Jan 20 10:44:58 2010 +1100 xfs: directory names are unsigned Convert the struct xfs_name to use unsigned chars for the name strings to match both what is stored on disk (__uint8_t) and what the VFS expects (unsigned char). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 7981d6f6b280d28779343cff4a88029fe53d1b47 Author: Allan Stephens Date: Tue Jan 19 14:23:57 2010 -0800 tipc: Clean up configuration file This patch addresses a number of minor (mostly cosmetic) issues relating to the configuration of TIPC, including the following: - Corrects range limits for maximum number of ports per node - Adds missing range limits for size of log buffer - Removes configuration setting relating to unsupported slave node capability - Standardizes description and help text wording for configuration settings - Removes unneeded blank spaces Signed-off-by: Allan Stephens Signed-off-by: David S. Miller commit 64147c729732ba9c9e50966971bdfbd503c888bb Author: John W. Linville Date: Tue Jan 19 17:07:41 2010 -0500 libertas/assoc.c: rearrange some strange line breaks Signed-off-by: John W. Linville commit c9f6a6567f3e8dd69dd3f80a67e73d7d10884bea Author: Luis R. Rodriguez Date: Tue Jan 19 14:04:19 2010 -0500 ath9k: make tx power config changes take effect immediatley Users wishing to tweak tx power want it to happen immediately, try to respect that. This was tested by Lorenzo by measuring the received signal strength from an AP with ath9k and the patch. Changing the tx power on the AP produced these results: 1) iwconfig wlan0 txpower 20 ---> Rx power -37dbm 2) iwconfig wlan0 txpower 15 ---> Rx power -41dbm 3) iwconfig wlan0 txpower 10 ---> Rx power -45dbm 4) iwconfig wlan0 txpower 5 ---> Rx power -51dbm 5) iwconfig wlan0 txpower 0 ---> Rx power -37dbm The result with 0 is an anomoly and would need to be addressed through a separate patch. Signed-off-by: Luis R. Rodriguez Tested-by: Lorenzo Bianconi Signed-off-by: John W. Linville commit 27e310c91c3433ab9997b925b3fd65e660634c76 Author: Jouni Malinen Date: Tue Jan 19 10:53:30 2010 -0800 nl80211: Allow association to change channels during reassociation nl80211_associate() was rejecting (re)association attempts with EBUSY in some cases where we are currently associated with an AP that uses different channel from the destination AP. Fix this by passing the current wdev to rdev_fixed_channel() in the same way that was already done for join-IBSS and connect commands. This allows the fixedchan check to skipped for the current wdev and allows the reassociation to proceed. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 1625c148cde23a8b4180e171ed4a17e17521b995 Author: Samuel Ortiz Date: Tue Jan 19 00:19:21 2010 +0100 libertas: Set/clear WPA keys before the WEP ones With the v10 firmware running on 8688 HW, clearing WPA keys after setting the WEP key prevents us from being able to associate with WEP APs. Swapping the calling order for assoc_helper_wpa_keys() and assoc_helper_wep_keys fixes that issue. Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville commit de9a47f92795f697964f662415cb27816c2d9b76 Author: Rafał Miłecki Date: Mon Jan 18 00:21:49 2010 +0100 b43: N-PHY: silence warnings, add missing call Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 9145834e84805f5efcca4706edfd641047af1d55 Author: Rafał Miłecki Date: Mon Jan 18 00:21:35 2010 +0100 b43: N-PHY: implement and add multi-dimensional table reading Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c643a66ef5ccfd4d359327fb8afa9949f1abbfdd Author: Rafał Miłecki Date: Mon Jan 18 00:21:27 2010 +0100 b43: N-PHY: implement and add reading one element tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 11380a4b2d86fae9a6bce75c9373668cc323fe57 Author: David S. Miller Date: Tue Jan 19 13:46:10 2010 -0800 net: Unexport napi_gro_flush(). Nothing outside of net/core/dev.c uses it. Signed-off-by: David S. Miller commit 2581b1434ccba6960e0b671927d87c83b5152c9d Author: Rafał Miłecki Date: Mon Jan 18 00:21:21 2010 +0100 b43: N-PHY: implement and add multi-dimensional table writing Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d41a3552f96673480d7913c170cab31fa00b7697 Author: Rafał Miłecki Date: Mon Jan 18 00:21:17 2010 +0100 b43: N-PHY: add writing one element tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d713804c6032b95cd3035014e16fadebb9655c6f Author: Christian Lamparter Date: Sun Jan 17 23:19:25 2010 +0100 p54pci: move tx cleanup into tasklet This patch moves the tx cleanup routines out of the critical interrupt context and into the (previously known as rx) tasklet. The main goal of this operation is to remove the extensive usage of spin_lock_irqsaves in the generic p54common library. The next step would be to modify p54usb to do the rx processing inside a tasklet (just like usbnet). Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 288c8ce8047695fd8872dd5db3ef21a9679c402f Author: Christian Lamparter Date: Sun Jan 17 23:17:29 2010 +0100 p54pci: handle dma mapping errors This patch adds error-paths to handle pci_dma_mapping errors. Cc: Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit a98bfec2985221d8e0904a526cbe88590eaad2a6 Author: Benoit Papillault Date: Sun Jan 17 22:45:24 2010 +0100 mac80211: Fixed a bug in IBSS merge First, both beacons and probe responses can be used for IBSS merge. Next, sdata->u.ibss.bssid was always true (and thus IBSS merge was disabled). We should use sdata->u.ibss.fixed_bssid instead. Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit ce9058aedd75f14785400dcc49a2bc352ca38871 Author: Benoit Papillault Date: Sun Jan 17 22:45:23 2010 +0100 mac80211: removed useless code in IBSS management ieee82011_sta_find_ibss() and ieee80211_sta_merge_ibss() are always called with a defined state. So it's useless to check it or set it in those function. Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit 27032059677b98f33634ceb90488812db432cbc9 Author: Felix Fietkau Date: Sun Jan 17 21:08:50 2010 +0100 ath9k: fix RTS/CTS handling The Tx DMA descriptor has two kinds of flags that select RTS/CTS usage. The first one (global for the frame) selects whether RTS/CTS or CTS-to-self should be used, the second one enables RTS/CTS or CTS-to-self usage for an individual multi-rate-retry entry. Previously the code preparing the descriptor only enabled the global flag, if the first MRR series selected the local one. Fix this by enabling the global flag if any of the MRR entries need it. With this patch, rate control can properly select the use of RTS/CTS for all MRR entries except the first one, which is the default behavior. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5f2aa25e0e5b221a176ab3d1c51d51da265cb4a7 Author: Johannes Berg Date: Sun Jan 17 15:49:02 2010 +0100 cfg80211: rcu-ify rdev and wdev Future code will need to look up rdev and wdev within atomic sections, but currently we need to lock a mutex for such lookups. Change the list handling for both to be RCU-safe so that we can look them up in rcu sections instead in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c57199bc32ebcd914253496486d2e09b1c9a3de0 Author: Rafał Miłecki Date: Sun Jan 17 13:04:08 2010 +0100 b43: N-PHY: store seq mode for proper restoring (follow specs) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 67c0d6e2d1abb9cbff9235143a8faaef89119628 Author: Rafał Miłecki Date: Sun Jan 17 13:04:02 2010 +0100 b43: N-PHY: move RF sequence declarations top, add missing calls Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 97943390b043bcafca69f9163b86bbf627b75589 Author: Suresh Siddha Date: Tue Jan 19 12:20:54 2010 -0800 x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's Currently IRQ0..IRQ15 are assigned to IRQ0_VECTOR..IRQ15_VECTOR's on all the cpu's. If these IRQ's are handled by legacy pic controller, then the kernel handles them only on cpu 0. So there is no need to block this vector space on all cpu's. Similarly if these IRQ's are handled by IO-APIC, then the IRQ affinity will determine on which cpu's we need allocate the vector resource for that particular IRQ. This can be done dynamically and here also there is no need to block 16 vectors for IRQ0..IRQ15 on all cpu's. Fix this by initially assigning IRQ0..IRQ15 to IRQ0_VECTOR..IRQ15_VECTOR's only on cpu 0. If the legacy controllers like pic handles these irq's, then this configuration will be fixed. If more modern controllers like IO-APIC handle these IRQ's, then we start with this configuration and as IRQ's migrate, vectors (/and cpu's) associated with these IRQ's change dynamically. This will freeup the block of 16 vectors on other cpu's which don't handle IRQ0..IRQ15, which can now be used for other IRQ's that the particular cpu handle. [ hpa: this also an architectural cleanup for future legacy-PIC-free configurations. ] [ hpa: fixed typo NR_LEGACY_IRQS -> NR_IRQS_LEGACY ] Signed-off-by: Suresh Siddha LKML-Reference: <1263932453.2814.52.camel@sbs-t61.sc.intel.com> Signed-off-by: H. Peter Anvin commit 4f4ab6cd1486fcb0ab8d689d625ac7691198f36b Author: Rafał Miłecki Date: Sun Jan 17 13:03:55 2010 +0100 b43: N-PHY: implement chain selection Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 53ae8e8c92b2715f27c95e8e7169bca9a8909856 Author: Rafał Miłecki Date: Sun Jan 17 13:03:48 2010 +0100 b43: N-PHY: implement stopping playback Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ad9716e8e8bc39664a0d41ec94f9bffbf748b45b Author: Rafał Miłecki Date: Sun Jan 17 13:03:40 2010 +0100 b43: N-PHY: implement MIMO config update Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e53de67449bbcaf5551f54e506a4dff62fc6a49c Author: Rafał Miłecki Date: Sun Jan 17 13:03:32 2010 +0100 b43: N-PHY: implement TX PHY cleanup and setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 026816fce48390807859508cd5172e9c79901ef7 Author: Rafał Miłecki Date: Sun Jan 17 13:03:28 2010 +0100 b43: N-PHY: implement RX PHY cleanup and setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c6fcf6bcfc3cfc1c00cc7fd9610cfa2b1a18041f Author: Johannes Berg Date: Sun Jan 17 01:47:59 2010 +0100 mac80211: re-enable re-transmission of filtered frames In an earlier commit, mac80211: disable software retry for now Pavel Roskin reported a problem that seems to be due to software retry of already transmitted frames. It turns out that we've never done that correctly, but due to some recent changes it now crashes in the TX code. I've added a comment in the patch that explains the problem better and also points to possible solutions -- which I can't implement right now. I disabled software retry of failed/filtered frames because it was broken. With the work of the previous patches, it now becomes fairly easy to re-enable it by adding a flag indicating that the frame shouldn't be modified, but still running it through the transmit handlers to populate the control information. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 813d76694043d00b59475baa1fbfaf54a2eb7fad Author: Johannes Berg Date: Sun Jan 17 01:47:58 2010 +0100 mac80211: move control.hw_key assignment When mac80211 asks a driver to encrypt a frame, it must assign the control.hw_key pointer for it to know which key to use etc. Currently, mac80211 does this whenever it would software-encrypt a frame. Change the logic of this code to assign the hw_key pointer when selecting the key, and later check it when deciding whether to encrypt the frame or let it be encrypted by the hardware. This allows us to later simply skip the encryption function since it no longer modifies the TX control. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a6bae9e7ab19876a157c91019852395539e4f20e Author: Johannes Berg Date: Sun Jan 17 01:47:57 2010 +0100 mac80211: remove useless setting of IEEE80211_TX_INTFL_DONT_ENCRYPT There's no value in setting a flag that will never be checked after this point, this seems to be legacy code -- I think previously the flag was used to check whether to encrypt the frame or not. Now, however, the flag need not be set, and setting it actually interferes if the frame will be processed again later. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 697e6a0fb0c8783695d4b4a5d7131476b296d623 Author: Johannes Berg Date: Sun Jan 17 01:47:56 2010 +0100 mac80211: clear TX control on filtered frames When an skb survived a round-trip through the driver and needs to be re-used, its control information is definitely not valid any more, the driver will have overwritten it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit edc6ccb7b992bd9ea5db4555c8f0bf74c656f964 Author: Johannes Berg Date: Sun Jan 17 01:47:55 2010 +0100 mac80211: move and rename misc tx handler This TX handler is used only for assigning the station pointer in the control information, so give it a better name. Also move it before rate control. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8e9310c1790566ea2de2e8b6e1c04bacbbee648c Author: Bob Copeland Date: Sat Jan 16 14:36:53 2010 -0500 mac80211: pid: replace open-coded msecs_to_jiffies Code directly scaling by HZ and rounding can be more efficiently and clearly performed with msecs_to_jiffies. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 1f44780827c6bbbcd1f12d5c6b6ce84f49a96bc0 Author: Reinette Chatre Date: Fri Jan 15 13:43:41 2010 -0800 iwlwifi: update copyright year to 2010 Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 4e9772b0a94c7d3a5f7062ba94afdbb9e692275d Author: Wey-Yi Guy Date: Fri Jan 15 13:43:40 2010 -0800 iwlwifi: remove extra statistics request from debugfs When reading current ucode statistics information from debugfs, in current implementation, it will always send a new "statistics request" to uCode. In normal operation, uCode should report the statistics per beacon interval. Remove this extra request to reduce the additional command exchanges between driver and uCode. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1b3eb8236ad9369ae519216b61a3d22806370115 Author: Wey-Yi Guy Date: Fri Jan 15 13:43:39 2010 -0800 iwlwifi: display flowhandler register when sw error or on-demand Flowhandler handle the communication between driver and uCode, when any uCode error happen, we also like to know what is the status of the flowhandler; it can help to debug flowhandler related problem. Also adding debugfs file to dump current value of flowhandler registers. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 2a11df6ee58d1b1fc7e5ecd7593a04d7555dc522 Author: Wey-Yi Guy Date: Fri Jan 15 13:43:38 2010 -0800 iwlwifi: software w/a for h/w bug cause Rx bit get clear This is a w/a for a hardware bug. the h/w bug may cause the Rx bit (bit 15 before shifting it to 31) to clear when using interrupt coalescing. This does not mean frames are lost - their processing is just delayed until next interrupt arrives. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 2be76703a3afb281155894ac52d34f7f5d736633 Author: Wey-Yi Guy Date: Fri Jan 15 13:43:37 2010 -0800 iwlwifi: set interrupt coalescing timer range and default For interrupt coalescing timer, the CSR_INT_COALESCING is an 8 bit register in 32-usec unit, the range can go from 0x00 - 0xFF. set the range and default timeout value for both calibration mode and operation mode. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 937c397eb633b804d9a806d08c395ecfc42b1fec Author: Wey-Yi Guy Date: Fri Jan 15 13:43:36 2010 -0800 iwlwifi: correct return code for log_event When dumping event log in debugfs, iwl_dump_nic_event_log() should return the correct error code instead of let the calling function makes it own assumption. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 11fc524941248dc717f1af5dfa844eceb7c0217f Author: Wey-Yi Guy Date: Fri Jan 15 13:43:35 2010 -0800 iwlwifi: add num_of_sos_stats to statistics counter When uCode detects number of beacon missed consecutively above the internal missed beacon threshold (set by uCode), it will reset and re-tune the radio in order to get out of bad PHY state. This "num_of_sos_states" counter monitors number of time uCode encounters this bad condition and has to re-tune the radio. Signed-off-by: Wey-Yi Guy Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e3ef2164386a13a37714ec033e30811d052c7999 Author: Wey-Yi Guy Date: Fri Jan 15 13:43:34 2010 -0800 iwlwifi: format and show statistics counter from uCode To help debug uCode related problem, adding "delta" and "max" information in debugfs statistics counters display. Those information show the delta between two statistics report from uCode, user can monitor the counters for any "un-normal" behavior. Signed-off-by: Wey-Yi Guy Signed-off-by: Jay Sternberg Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 9ed333e0298c8f12cf7f3b4aec4258e81ef588a0 Author: Wey-Yi Guy Date: Fri Jan 15 13:43:33 2010 -0800 iwlwifi: fix clear statistics counter command When receive reply statistics command with "clear" mask, just reset the accumulated statistics counters, but not the current statistics counters, so the accumulated statistics counter can provide the correct information. Signed-off-by: Wey-Yi Guy Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 861a57cd01f97e984320b5aeeee019ede48c714d Author: Felix Fietkau Date: Tue Jan 12 04:08:26 2010 +0100 mac80211: fix WMM AC default for non-QoS data frames The WMM AC selection added to the monitor mode selection function accidentally assigns non-QoS data frames to the same AC as mgmt frames (VO). This is not serious, but should be fixed anyway. This patch assigns them to the BE AC instead. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 031cf0e94c9c8302a4592707939d6c2039f17f28 Merge: 730dd70 ad580db Author: John W. Linville Date: Tue Jan 19 15:58:41 2010 -0500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 6373464288cab09bc641be301d8d30fc9f64ba71 Merge: 6d95518 730dd70 Author: David S. Miller Date: Tue Jan 19 11:43:42 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h commit 3dabcfef3e668f6dd32147d810a29ccbd55dc963 Author: Bartlomiej Zolnierkiewicz Date: Tue Jan 19 11:30:09 2010 -0800 ide: ide_timing_compute() fixup XFER_SW_DMA_0 mode should be excluded from the extended cycle timing computations. [ This is just a documentation fix -- code inside the affected 'if' block already makes sure to accept only PIO modes. ] Noticed-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit bdc27300f5718626a3817e6478e339f6cca6b994 Author: Paul Mundt Date: Wed Jan 20 03:38:56 2010 +0900 sh: Handle SH-4 FPU variants with broken CVR values. Usually we can look to the CVR to work out whether we have an FPU or not. Unfortunately not all parts comply with this, so just set the flag manually for all SH-4 parts and clear it on the only SH-4 that doesn't have one (SH4-501). Signed-off-by: Paul Mundt commit 50dd3145a58b5cef03a95c1b98765bcc847a72d0 Author: Magnus Damm Date: Tue Jan 19 13:52:28 2010 +0000 sh: update PFC to allow any enum in MARK lists This patch updates the PFC code with some clarifying comments together with a functional change. The change allows function type of GPIO to select any type of enum in their MARK lists. Without this patch only function type of enums are allowed in MARK lists. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 70911b861bfbba1851cbb3497635030f34703c7a Author: Paul Mundt Date: Wed Jan 20 02:45:05 2010 +0900 sh: Shut up noisy IOREMAP_FIXED=n build. The ioremap_fixed() stub neglected to provide a return value, resulting in a fairly noisy build. Signed-off-by: Paul Mundt commit 9e4c84967ef027fe50a03cf48dd6da9519c8e60c Merge: d2f2fcd 3fb4a50 Author: Takashi Iwai Date: Tue Jan 19 15:53:43 2010 +0100 Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c commit 84740ac19a0aeb87d1dc21e9d7d517f11bd49748 Author: Guennadi Liakhovetski Date: Tue Jan 19 08:39:05 2010 +0100 ASoC: fix compile breakage - add a missing header include Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a5b5a0649a84db1a0cc1e19997572be8ef3b8c81 Author: Peter Ujfalusi Date: Tue Jan 19 11:15:45 2010 +0200 ASoC: tlv320dac33: Correct the prefill number of samples Set the prefill number of samples as the same as the lower threshold in mode7. In this way the codec will read the same amount of data on startup and during the running playback. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 31c3af503eb75488aafb7a3d292b9e00962f2cee Author: Guennadi Liakhovetski Date: Tue Jan 19 11:14:31 2010 +0000 sh: support SIU sourcing from external clock on sh7722 Implement .set_rate() for all SH "div4 clocks," .enable(), .disable(), and .set_parent() for those, that support them. This allows, among other uses, reparenting of SIU clocks to the external source, and enabling and disabling of the IrDA clock on sh7722. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 14965f16b4bb8f3e51b09c1d8f61b8e98f9d12db Author: Paul Mundt Date: Tue Jan 19 20:10:33 2010 +0900 sh: Fix up sdk7780 and urquell builds. These two got broken in the heartbeat private data conversion, fix them up. Signed-off-by: Paul Mundt commit dea3cf1c3935047a5b0d21b21d26718e09135f97 Author: Paul Mundt Date: Tue Jan 19 20:09:28 2010 +0900 sh: urquell: Handle EXTAL configuration here, too. urquell happens to use the same mode pins and EXTAL configuration as SDK7786, so just copy it over. Signed-off-by: Paul Mundt commit c8098218271d19e7123d8b9137b9a4b87e5ffec0 Author: Paul Mundt Date: Tue Jan 19 19:38:36 2010 +0900 sh: mach-sdk7786: Detect/configure/propagate EXTAL. This uses the mode pins exposed through the FPGA to work out whether we're driven from EXTAL or not and does the appropriate setup and propagation through the clock framework. This will also -EINVAL out for anyone adding in their own oscillators, forcing proper configuration with the clock framework instead of proceeding on with bogus clock values. Signed-off-by: Paul Mundt commit 43a1839cb1e0e0ed08b8ace0adb3716865fd0c4c Author: Paul Mundt Date: Tue Jan 19 19:37:14 2010 +0900 sh: SH7786 clock framework rewrite. This rewrites the SH7786 clock framework support completely. It's reworked to provide all of the DIV4 and MSTP function clocks. This brings it in line with the current clock framework code and lets us drop SH7786 from the list of CPUs that require legacy CPG handling. Signed-off-by: Paul Mundt commit 6d955180b2f9ccff444df06265160868cabb289a Author: Octavian Purdila Date: Mon Jan 18 12:58:44 2010 +0000 ipv4: allow warming up the ARP cache with request type gratuitous ARP If the per device ARP_ACCEPT option is enable, currently we only allow creating new ARP cache entries for response type gratuitous ARP. Allowing gratuitous ARP to create new ARP entries (not only to update existing ones) is useful when we want to avoid unnecessary delays for the first packet of a stream. This patch allows request type gratuitous ARP to create new ARP cache entries as well. This is useful when we want to populate the ARP cache entries for a large number of hosts on the same LAN. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit fa44a73cc766c7f3bac71a66d564e0049b800325 Author: Lennart Sorensen Date: Mon Jan 18 12:59:55 2010 +0000 ppp_generic.c severly whitespace damanged by 9c705260feea6ae329bc6b6d5f6d2ef0227eda0a I was just looking at ppp_generic, and noticed that it fairly recently (as in the last year) got rather mangled with many spaces turned into tabs in places they very much shouldn't have been. I tracked it down to commit 9c705260feea6ae329bc6b6d5f6d2ef0227eda0a (ppp: ppp_mp_explode() redesign). I am amazed if that patch passed the patch checking script. I have no idea what kind of weird editor setting did this, but it has to have been a weird editor setting or a very unfortunate search and replace gone wrong. I only found it trying to apply a patch I was playing with and wondering why it wouldn't apply. Then I found there were tabs in the middle of comments that used to be spaces. Well here is a patch that should fix it up as far as I can tell. Purely whitespace repair. No actual code changes. Signed-off-by: Len Sorensen Signed-off-by: David S. Miller commit 54b89177ac533dc7439491afd26baf59464b425c Merge: a0c814a af15194 Author: Ben Dooks Date: Tue Jan 19 18:53:46 2010 +0900 ARM: Merge next-samsung-s5p6440-iodec Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10 commit a0c814afcfc2c840698372bd402b669b659ee1c5 Author: Ben Dooks Date: Mon Nov 23 23:32:31 2009 +0000 ARM: SAMSUNG: Add initial documentation directory and overview Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing. Signed-off-by: Ben Dooks commit af1519408a0d40f312e8f103504cd292cc49d927 Author: Kukjin Kim Date: Tue Jan 19 11:21:39 2010 +0900 ARM: S5P6440: Add IO descriptor for ChipID block. This patch adds the IO descriptor for ChipID block in S5P6440. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 220c58bc6d1198c4c4e69a385d364602c38b6b1c Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:38 2010 +0000 ide: make ide_get_best_pio_mode() static Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit f0e5f62d92531b18c98feb6907bdb3d7b2f67ceb Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:30 2010 +0000 via82cxxx: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the current transfer speed of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 040f6b4f14adb2ca5babb84e9fb2ebc6661e0be2 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:23 2010 +0000 tx493xide: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit bb430611930c526ff9bca991f254b259fc58ed3c Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:16 2010 +0000 siimage: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 0716302eec10c3a4c3c5110e43a5ac05ac4b2445 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:09 2010 +0000 palm_bk3710: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit f657911d73f5165c4a32627adbbd7fcf98a85eae Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:22:02 2010 +0000 it821x: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 280d69b127f75e1928f583c90f659d49cec4d177 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:55 2010 +0000 cs5536: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit a298dc024c2b0b92d3889d61856117141d693b39 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:48 2010 +0000 cs5535: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 23d874054663efaf18340dc554df1b935820cbab Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:41 2010 +0000 cmd64x: fix handling of address setup timings Account for the requirements of the DMA mode currently used. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit f6d23c2e2e398dc96c58494be2934f0c11285e3a Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:33 2010 +0000 amd74xx: use ->pio_mode value to determine pair device speed Use the current PIO mode value instead of the current transfer speed of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit e4c7112b5686c70ba7be86dbc83c989c75aca802 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:26 2010 +0000 alim15x3: fix handling of UDMA enable bit Clear UDMA enable bit also for PIO modes. Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit a345c7856e52bf8b21a5ae6a24fb824bfedefbe9 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:19 2010 +0000 alim15x3: fix handling of DMA timings Stop depending on the BIOS setup. Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 5740345b877e2c8745cdf454674b45919679f231 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:12 2010 +0000 alim15x3: fix handling of command timings Stop depending on the BIOS setup. Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit cde727be967a86aee01042f35c8a861728272cf1 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:21:05 2010 +0000 alim15x3: fix handling of address setup timings Account for the requirements of the other device on the port. Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 8e714a074bc4da070807d019d4287dcd32af55f5 Author: Bartlomiej Zolnierkiewicz Date: Tue Jan 19 01:47:29 2010 -0800 ide-timings: use ->pio_mode value to determine fastest PIO speed Use the current PIO mode value instead of the physical maximum one to determine the fastest allowed PIO for shared PIO/DMA timings. Affected host drivers: amd74xx and via82cxxx. [ Update comment to match -DaveM ] Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit e856bb1f8dfcd924a973102a244b81920752648e Author: Ben Dooks Date: Tue Jan 19 17:14:46 2010 +0900 ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that it can be included by when needed. Eliminate all other empty gpio-core.h files and just include the as necessary. Signed-off-by: Ben Dooks commit 8776168ca2151850164af1de5565d01f7b8b2c53 Author: Bartlomiej Zolnierkiewicz Date: Tue Jan 19 01:45:29 2010 -0800 ide: change ->set_dma_mode method parameters Change ->set_dma_mode method parameters to match ->set_dmamode method used in struct ata_port_operations. Signed-off-by: Bartlomiej Zolnierkiewicz commit e085b3cae85af47eb0a3eda3186bd898310fb322 Author: Bartlomiej Zolnierkiewicz Date: Tue Jan 19 01:44:41 2010 -0800 ide: change ->set_pio_mode method parameters Change ->set_pio_mode method parameters to match ->set_piomode method used in struct ata_port_operations. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 3fccaa192b9501e79a57e02e62b6bf420d2b461e Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:35 2010 +0000 ide: add drive->dma_mode field Add dma_mode field to ide_drive_t matching dma_mode field used in struct ata_device. The validity of the field is restricted to ->dma_pio_mode method only currently in IDE subsystem. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit d2d4e780aff2fab46a792ebc89f80d1a6872b325 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:28 2010 +0000 ide: add drive->pio_mode field Add pio_mode field to ide_drive_t matching pio_mode field used in struct ata_device. The validity of the field is restricted to ->set_pio_mode method only currently in IDE subsystem. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 68d0a036162f12d8be07c9fc140507cc1c8c6120 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:21 2010 +0000 via82cxxx: fix UDMA settings programming * preserve 80-wire cable detection bit * don't clear UDMA settings when programming PIO/MWDMA modes Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit a354ae8747d0687093ce244e76b15b6174d2f098 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:14 2010 +0000 via82cxxx: add support for VT6415 PCIE PATA IDE Host Controller Based on commits 5955c7a and 7d948b1 for pata_via host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 5b6c82ea0fd130a9f0bb7f4d86f6dbbf2fdaaa04 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:07 2010 +0000 via82cxxx: add support for vt8261 and future chips Based on commit e4d866c for pata_via host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit f931a5d5785d7b7c44871bd7ad2762e29dfddf29 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:20:00 2010 +0000 via82cxxx: workaround h/w bugs Add custom struct ide_tp_ops instance to fix the internal bug of some VIA chipsets which will reset the device register after changing the nIEN bit in the device control register. Based on commit bfce5e0 for pata_via host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit a13e4865fac374f2edf2666b66f2f88e527db2b7 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:53 2010 +0000 via82cxxx: fix SATA cable detection Add VIA_SATA_PATA flag for cx700, vx800 and vx855 chipsets (the first port is SATA). Based on commits 7585eb1, bfce5e0 and e4d866c for pata_via host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 76937fa765bd65c052b87812e46d5b90094e57b8 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:44 2010 +0000 ide: add SATA cable detection support Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 16e2c7c59f0a4debcb110648025bef11958aa3cd Author: Ben Dooks Date: Mon Jan 18 18:00:55 2010 +0900 ARM: SAMSUNG: Move GPIO headers to plat-samsung Move the GPIO and GPIO configuration headers into arch/arm/plat-samsung as they are common to all the Samsung SoCs. Signed-off-by: Ben Dooks commit 4f2b617aff8147338faa0d5ed7b57636076671bf Author: Ben Dooks Date: Mon Jan 18 11:22:38 2010 +0900 ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung Move the gpio.c code containing the core gpiolib and GPIO support to plat-samsung from plat-s3c as it is used by all current Samsung SoCs. Note, we didn't move this to gpiolib.c as it contains code that is not strictly for gpiolib support and the 4bit code is already called gpiolib.c so make the change easier by not renaming both files in one go. Signed-off-by: Ben Dooks commit 67866fb38680d85cbd13c7bb468fb89f16e026d1 Author: Ben Dooks Date: Mon Jan 18 10:47:45 2010 +0900 ARM: SAMSUNG: Move pm-gpio into plat-samsung Move the pm-gpio code into plat-samsung. Note, this should be changed later to properly compile the 4bit code if the 4bit settings are enabled. Signed-off-by: Ben Dooks commit 42d828d46f526605c84ebdb5a987fd25fe09a3c9 Author: Kukjin Kim Date: Tue Jan 19 15:31:17 2010 +0900 ARM: S5P6440: Add S5P6440 GPIO support This patch adds Samsung's S5P6440 GPIO support. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1f323cfda5feee4e9c1fc09ededaee849f906468 Author: Kukjin Kim Date: Tue Jan 19 15:30:54 2010 +0900 ARM: SAMSUNG: Move GPIO common functions to plat-samsung This patch moves GPIO common functions (from plat-s3c64xx) into plat-samsung. and adds the config option to build the plat-samsung/gpiolib for Samsung SoCs. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9717453c40ba9ffbd8c40968df45498059bfec0e Merge: ea2de1d 51fe522 Author: Ben Dooks Date: Tue Jan 19 18:36:16 2010 +0900 ARM: Merge next-samsung-serial1 Merge branch 'next-samsung-serial1' into next-samsung-try7 commit ea2de1dc8b5872de21a03757dca9d1560b5c9a81 Merge: 668dfc7 f9e011b Author: Ben Dooks Date: Tue Jan 19 18:36:12 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try7 commit 668dfc7527eb755e1bf194bf19c0c281e9df6deb Merge: 9e15714 22c810a Author: Ben Dooks Date: Tue Jan 19 18:36:09 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try7 commit 9e157144afe81052f5abe122c2469e33a30d20a5 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 18:36:04 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try7 commit 42036c85a68c82389f011eceab594c64956d0c2d Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:37 2010 +0000 via82cxxx: vx855 is a single channel controller Based on commit e4d866c for pata_via host driver (PCI ID was later changed by commit 5993856). Update my credits while at it. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit cb06fc3f4c25d33c188d77e3f7e46112e7d71f38 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:30 2010 +0000 serverworks: add missing pci_dev_put() call Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit e7593af6e5c24e323217c12d011ad7e43742ca6f Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:22 2010 +0000 serverworks: cleanup svwks_udma_filter() * remove dead OSB4 UDMA support * remove unreachable code * make isa_dev local to ->init_chipset Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit a337c2272731d538827153b32f547ef7c131a4cb Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:14 2010 +0000 pdc202xx_old: add ->init_hwif method Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit fb7b0d5b4096ec2a0f76538a4461345af14e0781 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:19:06 2010 +0000 opti621: remove stale driver history Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit bd37f65a60c3bb5ec11b47d7e8b539beb87324a9 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:58 2010 +0000 cy82c693: remove stale driver history Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 4d6b328943e87258efdc30110335a681f52d8367 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:47 2010 +0000 cy82c693: fix PIO timings calculations Just use the standard ide_timing_compute() helper to calculate PIO timings. This fixes many issues with the open-coded version like using 16-bit timings when 8-bit ones should be used or not accounting for the enhanced cycle time specified by the device. Based on libata pata_cypress host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 22cabc2619a58d3e5f95bb8df823da535e103bf4 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:38 2010 +0000 cmd64x: remove superfluous checks from cmd64x_set_dma_mode() Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 60349ab99f2742a6f04da86724740498c7b1f885 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:26 2010 +0000 cmd64x: fix PIO and MWDMA timings calculations Just use the standard ide_timing_compute() helper to calculate PIO and MWDMA timings. This fixes some issues with the open-coded version like allowing faster MWDMA timings than the ones required by the current PIO mode or not accounting for the enhanced MWDMA cycle time specified by the device. Based on libata pata_cmd64x host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 31bbb668fbe71a207d38ecd1797f4cd5b8bd710b Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:17 2010 +0000 amd74xx: don't change UDMA settings when programming PIO timings Based on libata pata_amd host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit d23f33de3c7fdc4bcbdd7a75d3f7b7be32caf18e Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:18:07 2010 +0000 alim15x3: cleanup ali_cable_detect() Remove leftover local_irq_[save,restore]() and FIXME note. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 5f6bd68ef539402b25e25d5e3324c59004541d77 Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:17:59 2010 +0000 alim15x3: remove superfluous locking from ali_set_pio_mode() Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 293f18ad720f7c10f9f4b8a87827a1f0989e19ee Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:17:50 2010 +0000 alim15x3: add ali_fifo_control() helper Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 3c8cc8df5a67a539cd185026e6b6f49b576869ba Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:17:37 2010 +0000 alim15x3: fix PIO timings calculations Just use the standard ide_timing_compute() helper to calculate PIO timings. This fixes many issues with the open-coded version like potential recovery timings underclocking or not accounting for the enhanced cycle time specified by the device. Based on libata pata_ali host driver. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 2b7d03a5cdace237525643d48918e68fe24681ed Author: Bartlomiej Zolnierkiewicz Date: Mon Jan 18 07:17:29 2010 +0000 ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute() Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 51fe52229e3765dc56b8d2dd5df656fbf8a20500 Author: Thomas Abraham Date: Thu Jan 14 15:05:38 2010 +0900 ARM: SAMSUNG: serial: Modify console initialization. This patch modifies s3c24xx_serial_initconsole function to accept multiple platform UART information structures. This is required on platforms that have differences among the instances of UART ports. As an example, the FIFO sizes could be different for each UART instance and hence multiple platform UART information structures would be needed. This patch also modifies the s3c24xx_console_init macro since it wraps the call to the s3c24xx_serial_initconsole function. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit bb9b1c772727849051e485a877aa9a4b2d3ac1a1 Merge: c3e71c6 f9e011b Author: Ben Dooks Date: Tue Jan 19 17:49:59 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try5 commit c3e71c6d21a760c27b511e3dd9dbe46517c6f0f7 Merge: 645f0b0 22c810a Author: Ben Dooks Date: Tue Jan 19 17:48:35 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try5 commit 645f0b07fe0dd0fa697c5b327c2d8c005bd0b5c0 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 17:47:39 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try5 commit 44d6cef805c1b17218723279a2767484e43d6fac Merge: 8e2376a a4e9469 Author: Ben Dooks Date: Tue Jan 19 17:42:25 2010 +0900 ARM: Merge next-s3c6410-andygreen Merge branch 'next-s3c6410-andygreen' into next-samsung-try5 commit 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 Merge: 7126936 bcedfa9 Author: Ben Dooks Date: Tue Jan 19 17:42:02 2010 +0900 ARM: Merge next-samsung-mc-adc Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge) commit 5a9003db1faa34c0560561f66b263f288d623324 Author: Michael Hennerich Date: Tue Jan 19 00:28:44 2010 -0800 Input: ADP5588 - add support for ADP5587 devices The ADP5587 is quite similar to the ADP5588 but features a greater I/O voltage range and lacks the Dual Light Sensor Interface. This new part is also supported by this driver. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 22c810ab3e25d16e6f128384d107b933b6fd8fff Author: Ben Dooks Date: Mon Jan 18 16:24:22 2010 +0900 ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata(). Add a s3c24xx_mci_set_platdata() call for all the machine files that have platform data for the MCI driver. This brings the MCI device into line with the other devices with __initdata and a specific call to ensure the right structure type is being passed. Signed-off-by: Ben Dooks commit a4ae2b2b18d1766768987dc5de42dfa3c2a6d9f7 Author: Paul Mundt Date: Tue Jan 19 15:58:27 2010 +0900 sh64: Fixup build breakage from breakpoint handler rename. The breakpoint handler was renamed on sh32, but sh64 was overlooked in the conversion. Fix it up now. Signed-off-by: Paul Mundt commit d6db8888c8957fbdcd611e1321a6f6a0d6fb7e15 Author: Paul Mundt Date: Tue Jan 19 15:55:27 2010 +0900 sh64: Use the shared FPU state restorer. This kills off the sh64-specific state restorer and switches over to the generic one. Signed-off-by: Paul Mundt commit 88ea1a445a84fcfbedb810c01e84d6711352bd82 Author: Paul Mundt Date: Tue Jan 19 15:41:50 2010 +0900 sh64: Fix up PC casting in unaligned fixup notifier with 32bit ABI. Presently the build bails with the following: CC arch/sh/mm/alignment.o cc1: warnings being treated as errors arch/sh/mm/alignment.c: In function 'unaligned_fixups_notify': arch/sh/mm/alignment.c:69: warning: cast to pointer from integer of different size arch/sh/mm/alignment.c:74: warning: cast to pointer from integer of different size make[2]: *** [arch/sh/mm/alignment.o] Error 1 This is due to the fact that regs->pc is always 64-bit, while the pointer size depends on the ABI. Wrapping through instruction_pointer() takes care of the appropriate casting for both configurations. Signed-off-by: Paul Mundt commit 3ef2932b8c1fc89408ef1fd4b1e1c2caabc7f07d Author: Paul Mundt Date: Tue Jan 19 15:40:03 2010 +0900 sh64: Fix up the build for the thread_xstate changes. This updates the sh64 processor info with the sh32 changes in order to tie in to the generic task_xstate management code. Signed-off-by: Paul Mundt commit cb6d04468d16de5a6161167ec7e76a43be540a80 Author: Paul Mundt Date: Tue Jan 19 15:22:52 2010 +0900 sh: Kill off now bogus fixmap/page wiring documentation. The plans for _PAGE_WIRED were detailed in a comment with the fixmap code, but as it's now all taken care of, we no longer have any reason for keeping it around, particularly since it's no longer accurate. Kill it off. Signed-off-by: Paul Mundt commit bb29c677b366fdf4f6522cd82228a32567aa98c7 Author: Paul Mundt Date: Tue Jan 19 15:20:35 2010 +0900 sh: Split out MMUCR.URB based entry wiring in to shared helper. Presently this is duplicated between tlb-sh4 and tlb-pteaex. Split the helpers out in to a generic tlb-urb that can be used by any parts equipped with MMUCR.URB. At the same time, move the SH-5 code out-of-line, as we require single global state for DTLB entry wiring. Signed-off-by: Paul Mundt commit 046581f9623b53f551a93864bb74e15ad2514f0c Author: Paul Mundt Date: Tue Jan 19 14:23:39 2010 +0900 sh: Provide a dummy _PAGE_WIRED flag for non-X2TLB parts. This provides a dummy value for legacy parts which permits the entry wiring to be open-coded. The compiler takes care of optimizing the entry wiring away in these cases. Signed-off-by: Paul Mundt commit 6d63e73d520b690e4378cef3003eb5f01f7d128c Author: Paul Mundt Date: Tue Jan 19 14:00:14 2010 +0900 sh: Limit ioremap_prot() to 32bit pgprot parts. Presently ioremap_prot() uses an unsigned long to pass the pgprot value around. This results in the upper half of the pgprot being chomped when using 64-bit pgprots on a 32-bit ABI (X2TLB and SH-5). As the only users of ioremap_prot() are presently legacy parts, this doesn't cause too much of an issue. In the future when the interface is converted to use pgprot_t directly this can be re-enabled for the other parts, too. Signed-off-by: Paul Mundt commit f33609344acfdde1c1acedf6de3efe6b80af93a6 Author: Paul Mundt Date: Tue Jan 19 13:55:41 2010 +0900 sh: Convert p3_ioremap() users to ioremap_prot(). This kills off the ancient p3_ioremap(), converting over to the more generic ioremap_prot() instead. Signed-off-by: Paul Mundt commit acf2c9685fb8295cb62a623d7358a1cfde8b07ea Author: Paul Mundt Date: Tue Jan 19 13:49:19 2010 +0900 sh: Kill off duplicate address alignment in ioremap_fixed(). This is already taken care of in the top-level ioremap, and now that no one should be calling ioremap_fixed() directly we can simply throw the mapping displacement in as an additional argument. Signed-off-by: Paul Mundt commit d57d64080ddc0ff13fcffc898b6251074a482ba1 Author: Paul Mundt Date: Tue Jan 19 13:34:38 2010 +0900 sh: Prevent 64-bit pgprot clobbering across ioremap implementations. Presently 'flags' gets passed around a lot between the various ioremap helpers and implementations, which is only 32-bits. In the X2TLB case we use 64-bit pgprots which presently results in the upper 32bits being chopped off (which handily include our read/write/exec permissions). As such, we convert everything internally to using pgprot_t directly and simply convert over with pgprot_val() where needed. With this in place, transparent fixmap utilization for early ioremap works as expected. Signed-off-by: Paul Mundt commit 3cd2fff59fc924752611301f4ca7e8484f5744a5 Author: Ben Dooks Date: Fri Jan 15 15:09:20 2010 +0900 ARM: MINI2440: Remove commented out devices from device array There's no point in having these in until there is proper support for them, so remove as they only confuse the device changing script. Signed-off-by: Ben Dooks commit f126752043c67003de6d34b14160f87ba0323c98 Author: Ben Dooks Date: Wed Jan 13 14:59:46 2010 +0900 ARM: SAMSUNG: Add platform data registration for OHCI Add a platform data helper for the OHCI device Signed-off-by: Ben Dooks commit 0a6361316d6493b9dcbdda9a6a4586c3ccbfd008 Author: Ben Dooks Date: Tue Jan 12 15:15:28 2010 +0900 ARM: SAMSUNG: Make UART device code common Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a common entry in plat-samsung since they are the same in all the current implementations. Signed-off-by: Ben Dooks commit 8605c46c171f02859fb3a32655fa226ce446c6ec Author: George Kadianakis Date: Sun Jan 17 21:19:31 2010 +0200 [SCSI] lpfc: restore MSI-X/MSI support A Gentoo bug report [1] showed that as of 2.6.31 lpfc only uses INTx interrupts. This patch restores lpfc's ability to support MSI-X/MSI interrupts that the "Addition of SLI4 Interface - Base Support" patch [2] broke. It reestablishes MSI-X as the default interrupt method and in case MSI-X is not supported lpfc_sli{4,}_enable_intr fallbacks to MSI and then to INTx. [1]: http://bugs.gentoo.org/show_bug.cgi?id=296319 [2]: commit da0436e915a5c17ee79e72c1bf978a4ebb1cbf4d [James Smart: Background: Nothing Broke. This was intended. We had originally enabled MSI-X by default, but in qualification within the last 12 months, we encountered a major catch-22: There were at least 4 platforms, from 2 major OEMs, that : - Say they support MSI-X - platform routines work and act as if they do. - We enable it, generate a test interrupt to check they really do deliver it, and it works. - But shortly after attachment, the system hangs or loses interrupts, resulting in a bad system behavior. Given the distro's picking up the 2.6.32 kernel, we had to stick with a default of MSI-X off, with user-enabled MSI-X as these platforms couldn't get fixed. However, we're also now encountering platforms that require MSI-X and never INTx, so we must change. It's desired also for also for performance reasons. So - now (2.6.33) is the right time to re-enable MSI-X by default. ] [jejb: fix up comment on default values] Signed-off-by: George Kadianakis Acked-by: James Smart Signed-off-by: James Bottomley commit e8a392444d338d3ce77d157bcbe4975828536efa Author: Giridhar Malavali Date: Tue Jan 12 13:02:49 2010 -0800 [SCSI] qla2xxx: Update version number to 8.03.02-k0. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit f8ac60855ebfa239319a4a9945799995feda3b06 Author: Giridhar Malavali Date: Tue Jan 12 13:02:48 2010 -0800 [SCSI] qla2xxx: Remove firmware hint for 81xx parts. Firmware is loaded from flash for these ISP types. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 9a069e196767d7b87184fd8d8211d22bb5b9c0b8 Author: Giridhar Malavali Date: Tue Jan 12 13:02:47 2010 -0800 [SCSI] qla2xxx: Add BSG support for FC ELS/CT passthrough and vendor commands. [jejb: fixed printk casting issues] Signed-off-by: Sarang Radke Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 1838ef1d782f7527e6defe87e180598622d2d071 Author: H. Peter Anvin Date: Mon Jan 18 14:00:34 2010 -0800 x86-64, rwsem: 64-bit xadd rwsem implementation For x86-64, 32767 threads really is not enough. Change rwsem_count_t to a signed long, so that it is 64 bits on x86-64. This required the following changes to the assembly code: a) %z0 doesn't work on all versions of gcc! At least gcc 4.4.2 as shipped with Fedora 12 emits "ll" not "q" for 64 bits, even for integer operands. Newer gccs apparently do this correctly, but avoid this problem by using the _ASM_ macros instead of %z. b) 64 bits immediates are only allowed in "movq $imm,%reg" constructs... no others. Change some of the constraints to "e", and fix the one case where we would have had to use an invalid immediate -- in that case, we only care about the upper half anyway, so just access the upper half. Signed-off-by: H. Peter Anvin Cc: Linus Torvalds LKML-Reference: commit 6579b474572fd54c583ac074e8e7aaae926c62ef Author: Suresh Siddha Date: Wed Jan 13 16:19:11 2010 -0800 x86, irq: Use 0x20 for the IRQ_MOVE_CLEANUP_VECTOR instead of 0x1f After talking to some more folks inside intel (Peter Anvin, Asit Mallick), the safest option (for future compatibility etc) seen was to use vector 0x20 for IRQ_MOVE_CLEANUP_VECTOR instead of using vector 0x1f (which is documented as reserved vector in the Intel IA32 manuals). Also we don't need to reserve the entire privilege level (all 16 vectors in the priority bucket that IRQ_MOVE_CLEANUP_VECTOR falls into), as the x86 architecture (section 10.9.3 in SDM Vol3a) specifies that with in the priority level, the higher the vector number the higher the priority. And hence we don't need to reserve the complete priority level 0x20-0x2f for the IRQ migration cleanup logic. So change the IRQ_MOVE_CLEANUP_VECTOR to 0x20 and allow 0x21-0x2f to be used for device interrupts. 0x30-0x3f will be used for ISA interrupts (these also can be migrated in the context of IOAPIC and hence need to be at a higher priority level than IRQ_MOVE_CLEANUP_VECTOR). Signed-off-by: Suresh Siddha LKML-Reference: <20100114002118.521826763@sbs-t61.sc.intel.com> Cc: Yinghai Lu Cc: Eric W. Biederman Cc: Maciej W. Rozycki Signed-off-by: H. Peter Anvin commit 722b3654852e48b93367a63f8ada9ee1cd43f2d3 Author: Suresh Siddha Date: Wed Jan 13 16:19:10 2010 -0800 x86, vmi: Fix vmi_get_timer_vector() to use IRQ0_VECTOR FIRST_DEVICE_VECTOR is going away and it looks like a bad hack to steal FIRST_DEVICE_VECTOR / FIRST_EXTERNAL_VECTOR, when it looks like it needs IRQ0_VECTOR. Fix vmi_get_timer_vector() to use IRQ0_VECTOR. Signed-off-by: Suresh Siddha LKML-Reference: <20100114002118.436172066@sbs-t61.sc.intel.com> Cc: Alok N Kataria Cc: Zach Amsden Signed-off-by: H. Peter Anvin commit 88501ce18eaaf1273e024d26926134972f4644ea Merge: 408bffd d1db38c Author: Takashi Iwai Date: Mon Jan 18 18:23:23 2010 +0100 Merge remote branch 'alsa/devel' into topic/misc commit 90a86fc05ffefe48581c88106d0b9cc37f6e060c Author: Joe Carnuccio Date: Tue Jan 12 13:02:46 2010 -0800 [SCSI] qla2xxx: Enhance EEH support and enable AER support. qla2xxx: EEH added call to pci_restore_state. qla2xxx: EEH added delay in slot reset routine. qla2xxx: EEH moved call to pci_save_state(), see (1). qla2xxx: EEH additional changes for RHEL5.5. qla2xxx: EEH added function call, removed function call, see (2). (1) In qla2xxx_probe_one the call to pci_save_state() has been moved to after the call to qla2xxx_request_irqs(). (2) Add call to pci_disable_pcie_error_reporting() in remove_one. Delete call to pci_cleanup_aer_uncorrect_error_status() in pci_resume. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 9db0fb3aa4cc4e42241e194ef64931321fa72196 Author: Jayamohan Kallickal Date: Tue Jan 5 05:12:43 2010 +0530 [SCSI] be2iscsi: Enable TEXT req resp This patch enables TEXT Request / Response for the driver Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit aa874f0738ecac7e5ac13b4d808a1026dcb5367d Author: Jayamohan Kallickal Date: Tue Jan 5 05:12:03 2010 +0530 [SCSI] be2iscsi: Fixing initialization of can_queue This patch fixes can_queue being uninitiallized since it was done before beiscsi_get_params was called. Thanks to Mike Christie for identifying this Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit da7408c800e3ae293275f52497d0ef7a9b09c9e4 Author: Jayamohan Kallickal Date: Tue Jan 5 05:11:23 2010 +0530 [SCSI] be2iscsi: The session failure only when Link Goes down This fixes a situation where the sessions were being killed whenever LinkUP is notified rather than LinkDown Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 756d29c8c7ed8887ed7d752371ce2f6d12399267 Author: Jayamohan Kallickal Date: Tue Jan 5 05:10:46 2010 +0530 [SCSI] be2iscsi: Enable async mode for mcc rings This patches enables async mode for mcc rings so that multiple requests can be queued. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 51a462500fbed4a1e8110dc60a421a3f12b9580b Author: Jayamohan Kallickal Date: Tue Jan 5 05:10:01 2010 +0530 [SCSI] be2iscsi: No requirement for endianess change for data_count This patch removes the endianess change that was wrongly added for data_count Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 0ecb0b45f22df911c564070b64af21db36934f0f Author: Jayamohan Kallickal Date: Tue Jan 5 05:09:19 2010 +0530 [SCSI] be2iscsi: decide which requests need completion This patch decides whether ack based completion is required or not Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d7aea67b8a7665fe5e53cdf59ba76c9b8d67b751 Author: Jayamohan Kallickal Date: Tue Jan 5 05:08:39 2010 +0530 [SCSI] be2iscsi: Use of opcode in beiscsi_alloc_pdu This patch enables use of opcode that is passed in Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 2807afb7411b97834fc7338f3735f3d152443551 Author: Jayamohan Kallickal Date: Tue Jan 5 05:07:49 2010 +0530 [SCSI] be2iscsi:moved pci_set_drvdata to inside beiscsi_hba_alloc This patch moves pci_set_drvdata to inside beiscsi_hba_alloc Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 7bd6e25cdbee7d4f6bc4946dc914310220e637b8 Author: Jayamohan Kallickal Date: Tue Jan 5 05:07:02 2010 +0530 [SCSI] be2iscsi: Added opcode for LOGOUT_RSP, TEXT_RESP, TMFUNC_RSP This patch adds opcodes in thecompletion path that were missed out earlier Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d543148883f65c34e6cd54c5e9ed0592dfbb6acb Author: Jayamohan Kallickal Date: Tue Jan 5 05:06:21 2010 +0530 [SCSI] be2iscsi: Link Wrb with next Wrb This patch will link the current allocated wrb with the next wrb that will be allocated. This is a requirement from the chip. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit c24622886fb934313a2a43ea1f516cbf1ddd947b Author: Jayamohan Kallickal Date: Tue Jan 5 05:05:34 2010 +0530 [SCSI] be2iscsi: Move freeing of resources to stop_conn We need to hold on to ep resources untill invalidate and close connection are completed Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 7da5087971b1a187f92be4efb74a991ac9ccb0a3 Author: Jayamohan Kallickal Date: Tue Jan 5 05:04:12 2010 +0530 [SCSI] be2iscsi: Use start cid and number of cid and icd from FW This patch enablesi be2iscsi to use the start number and number of cids/icd provided by FW rather than hard coded values. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 1fe6dbf4d0afba52ad0249f398e6296a1433a004 Author: Dave Jones Date: Mon Jan 4 10:19:34 2010 -0500 [SCSI] gdth: Convert to use regular kernel types. converted using this script.. perl -p -i -e 's|ulong32|u32|g' drivers/scsi/gdth* perl -p -i -e 's|ulong64|u64|g' drivers/scsi/gdth* perl -p -i -e 's|ushort|u16|g' drivers/scsi/gdth* perl -p -i -e 's|unchar|u8|g' drivers/scsi/gdth* perl -p -i -e 's|ulong|unsigned long|g' drivers/scsi/gdth* perl -p -i -e 's|PACKED|__attribute__((packed))|g' drivers/scsi/gdth* sha1sum of the generated code was identical before and after. Signed-off-by: Dave Jones Signed-off-by: James Bottomley commit e7efe5932b1d3916c79326a4221693ea90a900e2 Author: Douglas Gilbert Date: Sun Jan 3 13:51:15 2010 -0500 [SCSI] skip sense logging for some ATA PASS-THROUGH cdbs Further to the lsml thread titled: "does scsi_io_completion need to dump sense data for ata pass through (ck_cond = 1) ?" This is a patch to skip logging when the sense data is associated with a SENSE_KEY of "RECOVERED_ERROR" and the additional sense code is "ATA PASS-THROUGH INFORMATION AVAILABLE". This only occurs with the SAT ATA PASS-THROUGH commands when CK_COND=1 (in the cdb). It indicates that the sense data contains ATA registers. Smartmontools uses such commands on ATA disks connected via SAT. Periodic checks such as those done by smartd cause nuisance entries into logs that are: - neither errors nor warnings - pointless unless the cdb that caused them are also logged Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 5d7ebb9c7a04d29efce1099024944dfd94d9f63c Author: Dan Carpenter Date: Mon Dec 28 20:08:39 2009 +0200 [SCSI] FlashPoint: fix off by one tests The check on MAX_SCSI_TAR should be >= instead of > or we could go past the end of the array. Joe Eykholt aslo correctly points out that the check on MAX_LUN should be >= as well. That matches with how it is used in the rest of the file. Signed-off-by: Dan Carpenter Signed-off-by: James Bottomley commit 0ed8570ef4d51bb46e2028b2e3c3ddd1f860e193 Author: Jiri Slaby Date: Mon Dec 21 16:27:55 2009 -0800 [SCSI] cxgbi3: remove unnecessary NULL test Stanse found that c3cn is poked many times around in cxgb3i_conn_pdu_ready, there is no need to check if it is NULL. Remove the test. Signed-off-by: Jiri Slaby Reviewed-by: Mike Christie Acked-by: Karen Xie Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3dbf6c0012d12473461b7485006db373e8192fa5 Author: Julia Lawall Date: Sat Dec 19 08:17:27 2009 +0100 [SCSI] pm8001: Use kzalloc for allocating only one thing Use kzalloc rather than kcalloc(1,...) The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - kcalloc(1, + kzalloc( ...) // Signed-off-by: Julia Lawall Acked-by:Jack Wang Signed-off-by: James Bottomley commit 4ffd005a4dedf536330756742595ec904f740f48 Author: Kashyap, Desai Date: Wed Dec 16 19:04:49 2009 +0530 [SCSI] mptfusion: Bump version 03.04.14 Version upgrade to 3.04.14. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit de81562f2f9852a1f2c609ede1e26c07ed457c60 Author: Kashyap, Desai Date: Wed Dec 16 19:02:59 2009 +0530 [SCSI] mptfusion: corrected if condition check for SCSIIO and PASSTHROUGH commands Modified the function type check to verify it is not MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH or MPI_FUNCTION_SCSI_IO_REQUEST. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 64e155adc250ab68255b761c1faa77799aa1e41a Author: Kashyap, Desai Date: Wed Dec 16 19:02:29 2009 +0530 [SCSI] mptfusion: block device when target is being removed by FW Add support to set the sdev state to SDEV_BLOCK during device removal to stop IOs comming to the deleting driver immediately. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit e0f553ab58f478321717100e44b28f765bd2a045 Author: Kashyap, Desai Date: Wed Dec 16 19:01:58 2009 +0530 [SCSI] mptfusion: Added sysfs expander manufacture information at the time of expander add. Added new function mptsas_exp_manufacture_info, which will obtain the REPORT_MANUFACTURING, and fill the details into the sas_expander_device object when the expander port is created. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 65f89c2396aa113a06fe7e2f6ba46f0712cb4806 Author: Kashyap, Desai Date: Wed Dec 16 19:01:13 2009 +0530 [SCSI] mptfusion: Added MPI_SCSIIO_CONTROL_HEADOFQ priority There is a 'ioprio' field in the BIO and the Request structure. check this priority field and set MPI_SCSIIO_CONTROL_HEADOFQ to pass down I/O priority. An enhancement to the LSI Disk Array Controller firmware is being developed to look at the Head Of Queue bit to allow I/Os with the HOQ bit set to be processed before I/Os which do not have the HOQ bit set. In order to set the HOQ bit, the mpt fusion driver needs to look at the 'ioprio' field in the request structure associated with the scsi command. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 02507a80b35edd720480540d917e9f92cc371009 Author: Finn Thain Date: Sat Dec 5 12:30:42 2009 +1100 [SCSI] mac_esp: fix PIO mode, take 2 The mac_esp PIO algorithm no longer works in 2.6.31 and crashes my Centris 660av. So here's a better one. Also, force async with esp_set_offset() rather than esp_slave_configure(). One of the SCSI drives I tested still doesn't like the PIO mode and fails with "esp: esp0: Reconnect IRQ2 timeout" (the same drive works fine in PDMA mode). This failure happens when esp_reconnect_with_tag() tries to read in two tag bytes but the chip only provides one (0x20). I don't know what causes this. I decided not to waste any more time trying to fix it because the best solution is to rip out the PIO mode altogether and use the DMA engine. Signed-off-by: Finn Thain Signed-off-by: James Bottomley commit f2818663c82b7297ff4aa38cbddb870dc02f7104 Author: Hannes Reinecke Date: Tue Dec 15 09:26:06 2009 +0100 [SCSI] scsi_transport_fc: Remove capping from dev_loss_tmo Currently dev_loss_tmo is capped by SCSI_DEVICE_BLOCK_MAX_TIMEOUT. This causes problem with multipathing when the 'no_path_retry' setting exceeds the dev_loss_tmo setting, as then the system might run into a deadlock when all paths have been removed temporarily for longer than dev_loss_tmo. The principal reasons for the capping has been that we should not allow a remote port to remain in status 'blocked' indefinitely, so the capping is there to ensure that the port status is being reset eventually. However, the fast_io_fail_tmo will also move the remote port out of the 'blocked' state, so for any HBA driver implementing both the capping should really be on the fast_io_fail_tmo, and not on the dev_loss_tmo. This patch implements just that, ie the fast_io_fail_tmo is capped to SCSI_DEVICE_BLOCK_TIMEOUT and the capping is removed from dev_loss_tmo when fast_io_fail_tmo is set. This allows us to synchronize the dev_loss_tmo setting to the 'no_path_retry' setting from multipathing thus avoiding the deadlock. Signed-off-by: Hannes Reinecke Acked-by: James Smart Signed-off-by: James Bottomley commit e47c11c7a402a054a85cb917a6ed020f6b5fae04 Author: Erik Ekman Date: Mon Dec 14 21:21:56 2009 +0100 [SCSI] fusion: fix warning when not using procfs Fixes the following warning: drivers/message/fusion/mptbase.c:129: warning: 'mpt_proc_root_dir' defined but not used also moves it from public data section since it is static. Signed-off-by: Erik Ekman Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley commit 340f052001d46aff9e7e853c492e0d3f5554d42f Author: Roel Kluin Date: Tue Dec 8 14:08:56 2009 -0800 [SCSI] ibmmca: fix buffer overflow Allows i == IM_MAX_HOSTS, which is out of range. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 4a02462af1f4c3498e6a330ffd5c063118309b31 Author: Roel Kluin Date: Tue Dec 8 14:08:59 2009 -0800 [SCSI] u14-34f: fix buffer overflow This allows i == MAX_INT_PARAM, which is out of range for ints[] Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 8fe79162a6807bf120140d64e96da54fc273b88b Author: Roel Kluin Date: Tue Dec 8 14:08:57 2009 -0800 [SCSI] eata: fix buffer overflow Allows i == MAX_INT_PARAM, which is out of range. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 9b7dac086bec7c71722d6e79464609e17f0996e7 Author: Bart Van Assche Date: Fri Dec 4 20:43:37 2009 +0100 [SCSI] ibmvscsi: fix a typo in a source code comment Signed-off-by: Bart Van Assche Acked-by: Brian King Signed-off-by: James Bottomley commit 40c4f3e4eaa7eda2b0a00abd4d69778808d26f77 Author: Bart Van Assche Date: Fri Dec 4 20:38:49 2009 +0100 [SCSI] libsrp: fix typo -- replace RDAM by RDMA Fixed a typo in libsrp.c: replaced two occurrences of 'RDAM' by 'RDMA'. Signed-off-by: Bart Van Assche Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit e3deec090558d5cb5ffdc574e5560f3ed9723394 Author: James Bottomley Date: Tue Nov 3 12:33:07 2009 -0600 [SCSI] eliminate potential kmalloc failure in scsi_get_vpd_page() The best way to fix this is to eliminate the intenal kmalloc() and make the caller allocate the required amount of storage. Signed-off-by: James Bottomley commit d1db38c015a392b0ea8c15ab95abb3ee768b8d47 Author: Clemens Ladisch Date: Mon Jan 18 15:44:04 2010 +0100 sound: virtuoso: add Xonar DS support Add experimental support for the Asus Xonar DS. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit a32f66746c635ebf2341d99b3d4c0cc1c11b2cbf Author: Clemens Ladisch Date: Mon Jan 18 15:40:56 2010 +0100 sound: seq_timer: simplify snd_seq_timer_set_tick_resolution() parameters As snd_seq_timer_set_tick_resolution() is always called with the same three fields of struct snd_seq_timer, it suffices to give that as the only parameter. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit c32d977b8157bf67cdf47729ce7dd054a26eb534 Author: Takashi Iwai Date: Mon Jan 18 14:58:57 2010 +0100 ALSA: pcm - Call pgprot_noncached() for vmalloc'ed buffers pgprot_noncached() can be set for vmalloc'ed buffers safely, and we'd need non-cached behavior more or less, even for the intermediate ring- buffers. Now snd_pcm_lib_mmap_vmalloc() is added as the common PCM mmap callback that is coupled with snd_pcm_lib_alloc_vmalloc_buffer() & co. Signed-off-by: Takashi Iwai commit 3e879d7bac705be4813a0ec9560cbe31db4b269f Author: Takashi Iwai Date: Mon Jan 18 14:49:50 2010 +0100 ALSA: pcm - Remove unneeded ifdef pgprot_noncached Signed-off-by: Takashi Iwai commit af1415314a4190b8ea06e53808d392fcf91555af Author: Paul Mundt Date: Mon Jan 18 21:45:00 2010 +0900 sh: Flag __ioremap_caller() __init_refok. The mem_init_done test makes sure that this path is only entered in __init cases, so leaving ioremap_fixed() as __init and flagging the caller __init_refok is sufficient. Signed-off-by: Paul Mundt commit 12b6b01cb47dc3eefbef866592193661dad7afb9 Author: Paul Mundt Date: Mon Jan 18 21:33:08 2010 +0900 sh: Handle unmapping of fixed slots transparently in iounmap(). iounmap() should balance whatever is done by ioremap(). Presently ioremap() can do any of fixed mappings, PMB mappings, or page table mappings. Presently only the latter two are handled through the standard unmap path, so tie in the fixed unmapping, too. Signed-off-by: Paul Mundt commit 4f744affc345f8b158615e0cdd01d1f4985837c3 Author: Paul Mundt Date: Mon Jan 18 21:30:29 2010 +0900 sh: Make iounmap_fixed() return success/failure for iounmap() path. This converts iounmap_fixed() to return success/error if it handled the unmap request or not. At the same time, drop the __init label, as this can be called in to later. Signed-off-by: Paul Mundt commit 0b59e38ffaf7b201ff6afe5b736365d16848c7e3 Author: Paul Mundt Date: Mon Jan 18 21:21:32 2010 +0900 sh: Merge _32/_64 ioremap implementations. There is nothing of interest in the _64 version anymore, so the _32 one can be renamed and used unconditionally. Signed-off-by: Paul Mundt commit edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5 Author: Paul Mundt Date: Mon Jan 18 21:20:13 2010 +0900 sh: Fixup the IOREMAP_FIXED=n build. Presently the fixed ioremap API is only defined when CONFIG_IOREMAP_FIXED is set. As we want to call in to it unconditionally, provide a stubbed out interface. Signed-off-by: Paul Mundt commit d9b9487af79955a8e8fcddc963f56697e020cfed Author: Paul Mundt Date: Mon Jan 18 21:08:32 2010 +0900 sh: Handle early ioremaps through fixed mappings. This adds in a mem_init_done to work out when a standard ioremap() is possible, falling back to the fixmap based ioremap otherwise. Signed-off-by: Paul Mundt commit 0c54de146ef4303ed3c5879b043894c8db637507 Merge: 8faba61 7dc9c48 Author: Paul Mundt Date: Mon Jan 18 20:47:37 2010 +0900 Merge branch 'sh/stable-updates' commit 8faba6121566248330e738d25a2c43d7500fb9f0 Merge: 4291b73 78bf04f Author: Paul Mundt Date: Mon Jan 18 20:42:39 2010 +0900 Merge branch 'sh/ioremap-fixed' commit 4291b730cd0f0cf98a90d946b6cabbd804397350 Author: Paul Mundt Date: Mon Jan 18 20:39:49 2010 +0900 sh: Need IRQs enabled for init_fpu(). This tosses in a local_irq_enable()/disable() pair around the init_fpu() callsite in the FPU state restore exception handler. Fixes up a slab BUG triggered by making a slab cache allocation that can sleep whilst irqs_disabled(). This follows the behaviour undertaken by the x86 implementation. Signed-off-by: Paul Mundt commit 3d467676abf5f01f5ee99056273a58486968e252 Author: Matt Fleming Date: Mon Jan 18 19:33:10 2010 +0900 sh: Setup early PMB mappings. More and more boards are going to start shipping that boot with the MMU in 32BIT mode by default. Previously we relied on the bootloader to setup PMB mappings for use by the kernel but we also need to cater for boards whose bootloaders don't set them up. If CONFIG_PMB_LEGACY is not enabled we have full control over our PMB mappings and can compress our address space. Usually, the distance between the the cached and uncached mappings of RAM is always 512MB, however we can compress the distance to be the amount of RAM on the board. pmb_init() now becomes much simpler. It no longer has to calculate any mappings, it just has to synchronise the software PMB table with the hardware. Tested on SDK7786 and SH7785LCR. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 6a2b4111643127a28944d673995810a82582c5a1 Author: Jassi Brar Date: Mon Jan 18 17:32:02 2010 +0900 ARM: S3C64XX: SPI: Define SPI controller devices Platform devices for SPI Controller of S3C64XX are defined and exported for machines to include. Also, controller setup helper functions are defined for machine code to set runtime configuration of the controller and the bus. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 398ccccb770e6ed3e138925404f0746cbe57c5a1 Author: Jassi Brar Date: Mon Jan 18 17:45:52 2010 +0900 ARM: S3C64XX: SPI: Header for passing platform data We need a way to pass controller specific information to the SPI driver. For that purpose new headers are made. SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs. Hence, that part is placed under plat-samsung to be shared across newer SoCs. SoC specific part - spi source clocks, will be placed under plat-/include/plat/ Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit a5d896adf019143adf72d08826fe5359b6a8762c Author: Eric Leblond Date: Mon Jan 18 09:44:39 2010 +0100 netfilter: nfnetlink_queue: simplify warning message This patch remove variable part from a debug message to have message concatenation from syslog. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy commit 2ae3111eafd797e24cc390bb5ce6a8fa0deacdb2 Author: Julia Lawall Date: Mon Jan 18 00:29:19 2010 -0800 drivers/net: Eliminate useless code The variable qdev is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 87315a802a8aab9d986858fcf2230726c1b5c598 Author: Jassi Brar Date: Mon Jan 18 16:15:08 2010 +0900 ARM: S3C64XX: SPI: Define SPI-48M clock sources Defined special 48MHz clock sources for SPI-0,1. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 10f9f743f661d200a7a0006e65688cf28c2f01d9 Author: Jassi Brar Date: Mon Jan 18 16:15:07 2010 +0900 ARM: S3C64XX: SPI: Add SPI controller register base Added SPI controller register base. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit e03bcb68629c7f0728c95f1afe06ce48565c7713 Author: Milton Miller Date: Mon Jan 18 13:00:51 2010 +1100 generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data The smp ipi data is passed around and given write access by other cpus and should be separated from per-cpu data consumed by this cpu. Looking for hot lines, I saw call_function_data shared with tick_cpu_sched. Signed-off-by: Milton Miller Acked-by: Anton Blanchard Acked-by: Jens Axboe Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: : Nick Piggin LKML-Reference: <20100118020051.GR12666@kryten> Signed-off-by: Ingo Molnar commit 00097c4fdf117d9845d772f571a987ae95523f8c Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:44:44 2010 -0200 x86, trivial: Fix grammo in tsc comment about Geode TSC reliability Signed-off-by: Thadeu Lima de Souza Cascardo Cc: marcelo@kvack.org Cc: dilinger@collabora.co.uk Cc: trivial@kernel.org LKML-Reference: <1263764685-9871-1-git-send-email-cascardo@holoscopio.com> Signed-off-by: Ingo Molnar commit f426a7e02918e2e992b28adeb02e5a0ab39a7a25 Merge: 231e36f 329c0e0 Author: Ingo Molnar Date: Mon Jan 18 08:56:41 2010 +0100 Merge branch 'perf/scheduling' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core commit e89fc3f1b06d9241f65e580b002789abaa6d11ac Author: Alexey Dobriyan Date: Mon Jan 18 08:33:28 2010 +0100 netfilter: xt_hashlimit: netns support Make hashtable per-netns. Make proc files per-netns. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 7d07d5632b672c892a65882c2a119345fd9596c9 Author: Alexey Dobriyan Date: Mon Jan 18 08:31:00 2010 +0100 netfilter: xt_recent: netns support Make recent table list per-netns. Make proc files per-netns. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit f54e9367f8499a9bf6b2afbc0dce63e1d53c525a Author: Alexey Dobriyan Date: Mon Jan 18 08:25:47 2010 +0100 netfilter: xtables: add struct xt_mtdtor_param::net Add ->net to match destructor list like ->net in constructor list. Make sure it's set in ebtables/iptables/ip6tables, this requires to propagate netns up to *_unregister_table(). Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit a83d8e8d099fc373a5ca7112ad08c553bb2c180f Author: Alexey Dobriyan Date: Mon Jan 18 08:21:13 2010 +0100 netfilter: xtables: add struct xt_mtchk_param::net Some complex match modules (like xt_hashlimit/xt_recent) want netns information at constructor and destructor time. We propably can play games at match destruction time, because netns can be passed in object, but I think it's cleaner to explicitly pass netns. Add ->net, make sure it's set from ebtables/iptables/ip6tables code. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit a1004d8e3d463012f231bab104325ecb15637f78 Author: Alexey Dobriyan Date: Mon Jan 18 08:14:50 2010 +0100 netfilter: xt_hashlimit: simplify seqfile code Simply pass hashtable to seqfile iterators, proc entry itself is not needed. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit e9d3897cc2205eec8b7afcc022e4730914b4f48c Author: Alexey Dobriyan Date: Mon Jan 18 08:08:37 2010 +0100 netfilter: netns: #ifdef ->iptable_security, ->ip6table_security 'security' tables depend on SECURITY, so ifdef them. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 83fc81024bd8572f31db784f8c0079e999a4fa44 Author: Alexey Dobriyan Date: Mon Jan 18 08:07:50 2010 +0100 netfilter: xt_connlimit: netns support Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit f9e011b6b305d38445bbd4a1e7a8814e056de37b Author: Ben Dooks Date: Mon Jan 18 15:57:42 2010 +0900 ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. The call has been assuming all clksrc-clks' divider size is 4 bits, but this may not be the case anymore. Use the reg_div.size parameter to calculate the maximum value it can take and check against that. Signed-off-by: Ben Dooks commit f3b464cca94c4a8f54fbc11ec5af8b143fd1750b Author: Ben Dooks Date: Mon Jan 18 15:37:25 2010 +0900 ARM: SAMSUNG: Fix clksrc-clk's checks for bad register settings The WARN_ON() was only checking the first clock in the array, instead of being executed for each clksrc clock being registered. Since this is an array of clocks, WARN_ON() does not provide a lot of useful information about the problem, so change to using printk(KERN_ERR) to report the problem to the console. As a note, we still try and register the clock even if these problems are present just in case and to avoid changing the behaviour of the registration process. Signed-off-by: Ben Dooks commit b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 Author: Thomas Abraham Date: Mon Jan 18 14:30:16 2010 +0900 ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock sources Adds a additional check in s3c_set_clksrc function to ensure that the clksrc_clk does have a choice of multiple clock sources. In addition to this, a check is added to ensure that a parent is assigned to the clksrc_clk in case it does not have a choice of parent clocks. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit a0de298a0eee7f9004a8e512c12c7b40d66c9934 Author: Ben Dooks Date: Mon Jan 18 13:24:01 2010 +0900 ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable The clk_hd0 and clk_pd0 where given a local dummy_enable call due to not being registered with the clock code, which they really should have been. Register these two clocks and remove the clk_dummy_enable as this is done by the default clock registration code. Signed-off-by: Ben Dooks commit 4126faf0ab7417fbc6eb99fb0fd407e01e9e9dfe Author: Linus Torvalds Date: Sun Jan 17 10:24:07 2010 -0800 x86: Fix breakage of UML from the changes in the rwsem system The patches 5d0b7235d83eefdafda300656e97d368afcafc9a and bafaecd11df15ad5b1e598adc7736afcd38ee13d broke the UML build: On Sun, 17 Jan 2010, Ingo Molnar wrote: > > FYI, -tip testing found that these changes break the UML build: > > kernel/built-in.o: In function `__up_read': > /home/mingo/tip/arch/x86/include/asm/rwsem.h:192: undefined reference to `call_rwsem_wake' > kernel/built-in.o: In function `__up_write': > /home/mingo/tip/arch/x86/include/asm/rwsem.h:210: undefined reference to `call_rwsem_wake' > kernel/built-in.o: In function `__downgrade_write': > /home/mingo/tip/arch/x86/include/asm/rwsem.h:228: undefined reference to `call_rwsem_downgrade_wake' > kernel/built-in.o: In function `__down_read': > /home/mingo/tip/arch/x86/include/asm/rwsem.h:112: undefined reference to `call_rwsem_down_read_failed' > kernel/built-in.o: In function `__down_write_nested': > /home/mingo/tip/arch/x86/include/asm/rwsem.h:154: undefined reference to `call_rwsem_down_write_failed' > collect2: ld returned 1 exit status Add lib/rwsem_64.o to the UML subarch objects to fix. LKML-Reference: Signed-off-by: H. Peter Anvin commit 354fcd7774a00809ebefdba75e747364cb22a940 Author: Michael Chan Date: Sun Jan 17 07:30:44 2010 +0000 bnx2: Save statistics during reset. MTU changes, ring size changes, etc cause the chip to be reset and the statisctics flushed. To keep track of the accumulated statistics, we add code to save the whole statistics block before reset. We also modify the macros and statistics functions to return the sum of the saved and current counters. Based on original patch by Breno Leitao Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a47430583dab67b23161b0e75226781deed50138 Author: Michael Chan Date: Sun Jan 17 07:30:43 2010 +0000 bnx2: Refine statistics code. Refine the statistics macros by passing in just the name of the counter field. This makes it a lot easier and cleaner to add counters saved before the last reset in the next patch. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2c8c1e7297e19bdef3c178c3ea41d898a7716e3e Author: Alexey Dobriyan Date: Sun Jan 17 03:35:32 2010 +0000 net: spread __net_init, __net_exit __net_init/__net_exit are apparently not going away, so use them to full extent. In some cases __net_init was removed, because it was called from __net_exit code. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 72659ecce68588b74f6c46862c2b4cec137d7a5a Author: Octavian Purdila Date: Sun Jan 17 19:09:39 2010 -0800 tcp: account SYN-ACK timeouts & retransmissions Currently we don't increment SYN-ACK timeouts & retransmissions although we do increment the same stats for SYN. We seem to have lost the SYN-ACK accounting with the introduction of tcp_syn_recv_timer (commit 2248761e in the netdev-vger-cvs tree). This patch fixes this issue. In the process we also rename the v4/v6 syn/ack retransmit functions for clarity. We also add a new request_socket operations (syn_ack_timeout) so we can keep code in inet_connection_sock.c protocol agnostic. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit a4e946947b966d018f3f712d5c7ca2932c2aadd2 Author: Andy Green Date: Tue Dec 29 14:40:43 2009 +0000 ARM: SMDK6410: Add comments on ethernet connectivity LAN9115 Ethernet only works on SMDK6410 if certain switches are set in specific ways. Document the requirement. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 810f613c03a1614c71a2b27859e91ae155bd659f Author: Andy Green Date: Tue Dec 29 14:40:30 2009 +0000 ARM: S3C64XX: Add virtual mapping for S3C64XX SROM area This adds the physical address of the SROM unit, and applies a virtual mapping for it to the S3C_VA_MEM slot. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit f01fdac005d44e6c36af5b5eb841c4804570f0ad Author: Andy Green Date: Tue Dec 29 14:40:36 2009 +0000 ARM: SMDK6410: Add nC1 chipselect SROM setup Since the mach-smdk6410.c file claims it can start up the smsc9115 ethernet device on the board, it should take care about configuring the necessary chip select nCS1 so it can see the chip. The select defaults to 8-bit mode so without config the Ethernet doesn't work. This patch uses the new SROM definitions to set nCS1 to the state found in the Samsung U-Boot port for 6410. It may be more conservative that it needs to be since those settings were marked as for CS8900A also using this chip select. But this change is enough to get the ethernet working when booted with Qi. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit a7c9194cdc9a858bbf5a4cdae289e28dea149aeb Author: Andy Green Date: Tue Dec 29 14:40:23 2009 +0000 ARM: S3C64XX: Add SROM register definitions This introduces a platform file for s3c64xx that defines the SROM unit registers that control chip select characteristics. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 0084f27a21d36ac846cd4366289c229a7cce511b Merge: bcedfa9 7126936 Author: Ben Dooks Date: Mon Jan 18 09:35:29 2010 +0900 ARM: Merge next-s3c64xx Merge branch 'next-s3c64xx' into next-samsung Conflicts: arch/arm/mach-s3c6400/include/mach/map.h ( ADC and RTC PA merge fixed) commit bcedfa98d97e02e95bb023ab93675dbe63c508ef Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:34 2010 +0100 ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver Add S3C64XX support to the generic Samsung ADC driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 3929e1e76d9116856a4c7a00fcce0539dd8507a0 Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:31 2010 +0100 ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsung Move S3C24XX ADC driver to plat-samsung Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e Author: Jassi Brar Date: Wed Jan 6 15:33:44 2010 +0900 ARM: S3C64XX: Add I2S resources in platform code Define resources needed by the I2S drivers in platform code. Audio cfg_gpio callback and IORESOURCE_DMA are added. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 206090913d0d6ad3506e3e2693a696fc1626993e Author: Maurus Cuelenaere Date: Tue Jan 12 01:40:14 2010 +0100 ARM: S3C64XX: Add S3C64XX RTC platform driver Add S3C64XX RTC platform driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 Merge: 19439d0 6ccf80e Author: James Morris Date: Mon Jan 18 09:56:22 2010 +1100 Merge branch 'master' into next commit 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc Author: Stephen Smalley Date: Thu Jan 14 17:28:10 2010 -0500 selinux: change the handling of unknown classes If allow_unknown==deny, SELinux treats an undefined kernel security class as an error condition rather than as a typical permission denial and thus does not allow permissions on undefined classes even when in permissive mode. Change the SELinux logic so that this case is handled as a typical permission denial, subject to the usual permissive mode and permissive domain handling. Also drop the 'requested' argument from security_compute_av() and helpers as it is a legacy of the original security server interface and is unused. Changes: - Handle permissive domains consistently by moving up the test for a permissive domain. - Make security_compute_av_user() consistent with security_compute_av(); the only difference now is that security_compute_av() performs mapping between the kernel-private class and permission indices and the policy values. In the userspace case, this mapping is handled by libselinux. - Moved avd_init inside the policy lock. Based in part on a patch by Paul Moore . Reported-by: Andrew Worsley Signed-off-by: Stephen D. Smalley Reviewed-by: Paul Moore Signed-off-by: James Morris commit 8b0e58a70a7a41443c779de074288035b014cb94 Author: Stephane Chatty Date: Wed Jan 13 21:52:34 2010 +0100 HID: let hid-input accept digitizers Extended IS_INPUT_APPLICATION to accept digitzers that are actual input devices (touchscreens, light pens, touch pads, white boards) Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit 593f010bc0d8f7fde2ce948cac3f77f6a3d9db2b Author: Dominik Brodowski Date: Sat Jan 2 22:59:15 2010 +0100 pcmcia: do not lock socket driver module in pcmcia_get_socket() Do not lock the socket driver module in pcmcia_get_socket(), as the PCMCIA core can handle a socket module removal: In pcmcia_unregister_socket(), we explicitely wait for the last put_device() to succeed. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 3f32b3c093eddc03ed477ae0d7a6938db6b94a05 Author: Dominik Brodowski Date: Sat Jan 2 22:22:50 2010 +0100 pcmcia: rsrc_nonstatic io memory probe improvements Add a lot of documentation to the rsrc_nonstatic io memory probe functions. Also, add a first memory probe call -- just checking whether request_resource() succeeds -- upon adding of resources. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 180c33ee409eb3ed605d4ad9884e4a526a7655ff Author: Dominik Brodowski Date: Sat Jan 2 17:34:09 2010 +0100 pcmcia: call CIS cleanup from ds.c As ds.c is the only real user of CIS access functions, call the cleanup functions from ds.c, too. Signed-off-by: Dominik Brodowski commit 57197b9b7712eb19f5344c466e8aefbac1adbe55 Author: Dominik Brodowski Date: Sat Jan 2 17:27:33 2010 +0100 pcmcia: CardBus doesn't need CIS access At least no in-kernel CardBus-capable PCI driver makes use of the CIS access functions. Therefore, it seems sensible to remove this unused code, and cleanup cardbus.c a lot. CC: Jesse Barnes CC: Linus Torvalds Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 88b060d6c03fcb9e4d2018b4349954c4242a5c7f Author: Dominik Brodowski Date: Sat Jan 2 14:14:23 2010 +0100 pcmcia: improve check for same card in slot after resume During a suspend/resume cycle, an user may change the card in the PCMCIA/CardBus slot. The pcmcia_core can at least look at the socket state to check whether it is the same. For PCMCIA devices, move the detection and handling of such a change to ds.c. For CardBus devices, the PCI hotplug interface doesn't offer a "rescan" facility which also _removes_ devices no longer to be found behind a bridge. Therefore, remove and re-add all devices unconditionally. CC: Jesse Barnes CC: Linus Torvalds Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit f131ddc4bd1713385c70606555d4d63bed5ec3fd Author: Dominik Brodowski Date: Sat Jan 2 12:58:10 2010 +0100 pcmcia: cleanup pccard_validate_cis() Cleanup pccard_validate_cis() and make it return an error code on all failures, not merely on some failures. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 904e377744bfdcea276c27167fa6a609929f39dc Author: Dominik Brodowski Date: Sat Jan 2 12:28:04 2010 +0100 pcmcia: validate CIS, not CIS cache. In pccard_validate_cis(), validate the card CIS, not the CIS cache. Also, destroy the CIS cache if pccard_validate_cis fails. Furthermore, do not remove the fake CIS in destroy_cis_cache() but do so explicitely in the code paths where it makes sense. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit fa0b3bc504ff813cc05988bb30bbb6c6a0263eb4 Author: Dominik Brodowski Date: Sat Jan 2 12:08:22 2010 +0100 pcmcia: do not meddle with already assigned resources Do not release any iomem resources already in use. Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit cd2e18fe785082b132d960063df83a02acc9a4f2 Author: Dominik Brodowski Date: Fri Jan 1 17:43:08 2010 +0100 pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Komuro pointed out correctly that I missed one IRQ_FIRST_SHARED parameter in smc91c92_cs.c, and that another line could be writter more beautifully. CC: netdev@vger.kernel.org CC: Komuro Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 933a838aa1aae8388438bb002fbdaf6fca519a5c Author: Dominik Brodowski Date: Tue Dec 29 18:21:39 2009 +0100 pcmcia: make use of pcmcia_dev_resume() return value In runtime_resume(), do not throw away the return value of pcmcia_dev_resume(), for we can use it (at least) in pcmcia_store_pm_state(). This also fixes the pointless assignment previosly seen there, as noted by Dan Carpenter. CC: Dan Carpenter Tested-by: Wolfram Sang Signed-off-by: Dominik Brodowski commit 9135f6db09aa9d186f05d41e9c516ec8e3550d78 Merge: a421296 b05f5c1 Author: Mark Brown Date: Sun Jan 17 16:47:32 2010 +0000 Merge branch 'mxc-audio' into for-2.6.34 Conflicts: arch/arm/plat-mxc/Makefile (dual add) sound/soc/imx/mx27vis_wm8974.c (API updates & removal) commit b05f5c13d5bc2fa9945c9534f8881396555290a9 Author: Mark Brown Date: Sun Jan 17 16:45:06 2010 +0000 ASoC: Mark new i.MX drivers as BROKEN until arch/arm merged Currently they don't build due to cross tree dependencies, they will be reenabled once the arch/arm side has merged. Signed-off-by: Mark Brown commit 329c0e012b99fa2325a0be205c052e4aba690f16 Author: Frederic Weisbecker Date: Sun Jan 17 12:56:05 2010 +0100 perf: Better order flexible and pinned scheduling When a task gets scheduled in. We don't touch the cpu bound events so the priority order becomes: cpu pinned, cpu flexible, task pinned, task flexible. So schedule out cpu flexibles when a new task context gets in and correctly order the groups to schedule in: task pinned, cpu flexible, task flexible. Cpu pinned groups don't need to be touched at this time. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 7defb0f879bbcfe29e3c6f29d685d4f29b7a0700 Author: Frederic Weisbecker Date: Sun Jan 17 12:15:31 2010 +0100 perf: Don't schedule out/in pinned events on task tick We don't need to schedule in/out pinned events on task tick, now that pinned and flexible groups can be scheduled separately. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 5b0311e1f2464547fc6f17a82d7ea2538c8c7a70 Author: Frederic Weisbecker Date: Sun Jan 17 11:59:13 2010 +0100 perf: Allow pinned and flexible groups to be scheduled separately Tune the scheduling helpers so that we can choose to schedule either pinned and/or flexible groups from a context. And while at it, refactor a bit the naming of these helpers to make these more consistent and flexible. There is no (intended) change in scheduling behaviour in this patch. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 42cce92f4ddfa41e2dfe26fdcad4887943c032f2 Author: Frederic Weisbecker Date: Sun Jan 17 10:36:08 2010 +0100 perf: Make __perf_event_sched_out static __perf_event_sched_out doesn't need to be globally available, make it static. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit e919c24b6422a095bed3929074bd74ae1dbf251f Author: Mark Brown Date: Sun Jan 17 11:08:38 2010 +0000 ASoC: Remove old i.MX driver code This has been superceeded by Sascha's new driver but was not removed in the patch series due to cutdowns for review. Signed-off-by: Mark Brown commit d08a68bfca5a6464eb9167be0659bf0676f02555 Author: Mark Brown Date: Mon Jan 11 16:56:19 2010 +0000 ASoC: i.MX SSI driver does not yet support master mode The clocks for the SSI block need handling before this can work. Signed-off-by: Mark Brown commit 48dbc41988d07c7a9ba83afd31543d8ecb2beecc Author: Mark Brown Date: Wed Jan 6 17:56:52 2010 +0000 ASoC: Convert new i.MX SSI driver to use static DAI array While dynamically allocated DAIs are the way forward the core doesn't yet support anything except matching with a pointer to the actual DAI so convert to doing that so that machine drivers don't have to jump through hoops to register themselves. Signed-off-by: Mark Brown Acked-by: Javier Martin commit 157a777c8e809bd0c703e3f7617b3539df30feff Author: Mark Brown Date: Wed Jan 6 17:50:29 2010 +0000 ASoC: Fix i.MX audio build for i.MX3x Don't unconditionally include the i.MX2x DMA driver, the arch/arm functions it uses aren't available for i.MX3x. Signed-off-by: Mark Brown Acked-by: Javier Martin commit 8380222ec9458d38a4e0cc3cb688ad7fff311df4 Author: Sascha Hauer Date: Wed Nov 25 16:41:04 2009 +0100 ASoC: Add a new imx-ssi sound driver The old driver has the number of SSI units in the system hardcoded, does not make use of the device model and works only on i.MX21/27. This driver replaces it. It works in DMA mode on i.MX21/27 and using an FIQ handler on other systems. It also supports AC97 mode of the SSI units. Signed-off-by: Sascha Hauer Acked-by: Javier Martin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7d6f75eb21b84cdc5dfb09789974f02b42a89058 Author: Max Vozeler Date: Sun Jan 17 21:55:31 2010 +1100 crypto: md5 - Add export support This patch adds export/import support to md5. The exported type is defined by struct md5_state. This is modeled after the equivalent change to sha1_generic. Signed-off-by: Max Vozeler Signed-off-by: Herbert Xu commit 6c3f975a4cafaf4dcc9795385da6d42caa37ddeb Author: Márton Németh Date: Sun Jan 17 21:54:01 2010 +1100 crypto: Make Open Firmware device id constant From: Márton Németh The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Herbert Xu commit 73c89c15b959adf06366722c4be8d2eddec0a529 Author: Tobias Brunner Date: Sun Jan 17 21:52:11 2010 +1100 crypto: gcm - Add RFC4543 wrapper for GCM This patch adds the RFC4543 (GMAC) wrapper for GCM similar to the existing RFC4106 wrapper. The main differences between GCM and GMAC are the contents of the AAD and that the plaintext is empty for the latter. Signed-off-by: Tobias Brunner Signed-off-by: Herbert Xu commit 231e36f4d2e63dd770db80b9f5113310c2bcfcfd Author: Masami Hiramatsu Date: Thu Jan 14 00:12:12 2010 -0500 tracing/kprobe: Update kprobe tracing self test for new syntax Update kprobe tracing self test for new syntax (it supports deleting individual probes, and drops $argN support) and behavior change (new probes are disabled in default). This selftest includes the following checks: - Adding function-entry probe and return probe with arguments. - Enabling these probes. - Deleting it individually. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <20100114051211.7814.29436.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 6d686f4564f3fc7c6e678852919e48ad331d276b Author: H Hartley Sweeten Date: Wed Jan 13 20:21:52 2010 -0700 sched: Don't expose local functions kernel/sched: don't expose local functions The get_rr_interval_* functions are all class methods of struct sched_class. They are not exported so make them static. Signed-off-by: H Hartley Sweeten Cc: Peter Zijlstra LKML-Reference: <201001132021.53253.hartleys@visionengravers.com> Signed-off-by: Ingo Molnar commit 24a53652e361321b09df5040711e69387344ce09 Author: Frederic Weisbecker Date: Thu Jan 14 08:23:15 2010 +0100 tracing: Drop the tr check from the graph tracing path Each time we save a function entry from the function graph tracer, we check if the trace array is set, which is wasteful because it is set anyway before we start the tracer. All we need is to ensure we have good read and write orderings. When we set the trace array, we just need to guarantee it to be visible before starting tracing. Signed-off-by: Frederic Weisbecker Acked-by: Steven Rostedt Cc: Lai Jiangshan Cc: Paul E. McKenney LKML-Reference: <1263453795-7496-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 0eda7385db1f30271ade830a231006938a76fb53 Author: Hitoshi Mitake Date: Sat Jan 16 21:31:16 2010 +0900 perf probe: Fix build error of builtin-probe.c I got this build error when building tip tree: | cc1: warnings being treated as errors | builtin-probe.c:123: error: 'opt_show_lines' defined but not used This error is caused by: | #ifndef NO_LIBDWARF | OPT_CALLBACK('L', "line", NULL, | "FUNC[:RLN[+NUM|:RLN2]]|SRC:ALN[+NUM|:ALN2]", | "Show source code lines.", opt_show_lines), | #endif My environment defines NO_LIBDWARF, so gcc treated opt_show_lines() as garbage. So I moved opt_show_lines() into #ifndef NO_LIBDWARF ... #endif block. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Masami Hiramatsu Cc: Mike Galbraith LKML-Reference: <1263645076-9993-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 69e3f52d1b1a3ed4390bb8a09bb1324265af7fbf Author: Frederic Weisbecker Date: Sat Jan 16 14:21:15 2010 +0100 perf: Fix implicit declaration of getline in util.c getline() is considered as undeclared in util/util.c because it includes string.h, that in turn includes stdio.h, without having defined _GNU_SOURCE. But util.c also includes util.h that handles the _GNU_SOURCE and all the needed inclusions already. Let's include only util.h and sys/mman.h which is the only one header not handled by util.h This fixes the following build error: util/util.c: In function 'slow_copyfile': util/util.c:49: erreur: implicit declaration of function 'getline' util/util.c:49: erreur: nested extern declaration of 'getline' Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras LKML-Reference: <1263648075-3858-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 78bf04fc96f509474c6b443b515d6b79bb7bf584 Author: Paul Mundt Date: Sun Jan 17 01:45:26 2010 +0900 sh: Tidy up non-translatable checks in iounmap path. This tidies up the iounmap path with consolidated checks for nontranslatable mappings. This is in preparation of unifying the implementations. Signed-off-by: Paul Mundt commit 597fe76ec36e782aa45b8dac5e12e4dbb0588967 Author: Matt Fleming Date: Thu Nov 5 20:49:05 2009 +0000 sh: Use ioremap_fixed() to implement SH-5 ioremap() Use the fixmap-based memory mapping implementation for SH-5's ioremap() functions and delete the old static allocator that was borrowed from sparc. Signed-off-by: Matt Fleming commit 6f82b6ebb1dcc0c3c23820a70a5d79a60c4f5e84 Author: Matt Fleming Date: Thu Nov 5 08:01:10 2009 +0000 sh: Use ioremap_fixmed to map the SM501 DRAM config register We need to write to the DRAM config register very early and at such an early stage ioremap() is not available. So use ioremap_fixed() to map the register. The reason that we are avoiding using the legacy P2 mapping is that there will come a day when the legacy P2 mappings no longer exist. Signed-off-by: Matt Fleming commit 4d35b93a66e9b87df20784fcf130d2e8760be53f Author: Matt Fleming Date: Thu Nov 5 07:54:17 2009 +0000 sh: Add fixed ioremap support Some devices need to be ioremap'd and accessed very early in the boot process. It is not possible to use the standard ioremap() function in this case because that requires kmalloc()'ing some virtual address space and kmalloc() may not be available so early in boot. This patch provides fixmap mappings that allow physical address ranges to be remapped into the kernel address space during the early boot stages. Signed-off-by: Matt Fleming commit 07cad4dc1bfdaefd20c6329e9d8179ad1c600e92 Author: Matt Fleming Date: Tue Nov 17 22:03:41 2009 +0000 sh: Generalise the pte handling code for the fixmap path Generalise the code for setting and clearing pte's and allow TLB entries to be pinned and unpinned if the _PAGE_WIRED flag is present. Signed-off-by: Matt Fleming commit 24ef7fc4dcc57afa0c33166c25bfe7676ffd4296 Author: Matt Fleming Date: Thu Nov 19 21:11:05 2009 +0000 sh: Acquire some more page flags for SH-5. We need some more page flags to hook up _PAGE_WIRED (and eventually other things). So use the unused PTE bits above the PPN field as no implementations use these for anything currently. Now that we have _PAGE_WIRED let's provide the SH-5 functions for wiring up TLB entries. Signed-off-by: Matt Fleming commit 8eda55142080f0373b1f0268fe6d6807f193e713 Author: Matt Fleming Date: Tue Nov 17 21:05:31 2009 +0000 sh: New extended page flag to wire/unwire TLB entries Provide a new extended page flag, _PAGE_WIRED and an SH4 implementation for wiring TLB entries and use it in the fixmap code path so that we can wire the fixmap TLB entry. Signed-off-by: Matt Fleming commit d6f962b57bfaab62891c7abbf1469212a56d6103 Author: Frederic Weisbecker Date: Sun Jan 10 01:25:51 2010 +0100 perf: Export software-only event group characteristic as a flag Before scheduling an event group, we first check if a group can go on. We first check if the group is made of software only events first, in which case it is enough to know if the group can be scheduled in. For that purpose, we iterate through the whole group, which is wasteful as we could do this check when we add/delete an event to a group. So we create a group_flags field in perf event that can host characteristics from a group of events, starting with a first PERF_GROUP_SOFTWARE flag that reduces the check on the fast path. Signed-off-by: Frederic Weisbecker Acked-by: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit e286417378b4f9ce6e473b556193465ab22e12ab Author: Frederic Weisbecker Date: Sat Jan 9 21:05:28 2010 +0100 perf: Round robin flexible groups of events using list_rotate_left() This is more proper that doing it through a list_for_each_entry() that breaks after the first entry. v2: Don't rotate pinned groups as its not needed to time share them. Signed-off-by: Frederic Weisbecker Acked-by: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 5908cdc85eb30f8d07f2cb11d4a62334d7229048 Author: Frederic Weisbecker Date: Sat Jan 9 20:53:14 2010 +0100 list: Introduce list_rotate_left() Bring a new list_rotate_left() helper that rotates a list to the left. This is useful for codes that need to round roubin elements which queue priority increases from tail to head. Signed-off-by: Frederic Weisbecker Acked-by: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 889ff0150661512d79484219612b7e2e024b6c07 Author: Frederic Weisbecker Date: Sat Jan 9 20:04:47 2010 +0100 perf/core: Split context's event group list into pinned and non-pinned lists Split-up struct perf_event_context::group_list into pinned_groups and flexible_groups (non-pinned). This first appears to be useless as it duplicates various loops around the group list handlings. But it scales better in the fast-path in perf_sched_in(). We don't anymore iterate twice through the entire list to separate pinned and non-pinned scheduling. Instead we interate through two distinct lists. The another desired effect is that it makes easier to define distinct scheduling rules on both. Changes in v2: - Respectively rename pinned_grp_list and volatile_grp_list into pinned_groups and flexible_groups as per Ingo suggestion. - Various cleanups Signed-off-by: Frederic Weisbecker Acked-by: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo commit 881516eb828a3f7276c378bcef96b7788fc99016 Author: Arnaldo Carvalho de Melo Date: Fri Jan 15 18:08:27 2010 -0200 perf symbols: Accept an alias when looking for "_text" As it is in PARISC64: parisc:~# uname -a Linux parisc 2.6.33-rc4-tip+ #1 SMP Thu Jan 14 13:33:34 BRST 2010 parisc64 GNU/Linux parisc:~# grep -w _text /proc/kallsyms 0000000040100000 A _text parisc:~# grep 0000000040100000 /proc/kallsyms 0000000040100000 T stext 0000000040100000 T _stext 0000000040100000 A _text parisc:~# Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263586107-1756-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f5a2c3dce03621b55f84496f58adc2d1a87ca16f Author: Arnaldo Carvalho de Melo Date: Fri Jan 15 18:08:26 2010 -0200 perf record: Intercept all events The event interception we need to do in 'perf record' to create a list of all DSOs in PERF_RECORD_MMAP events wasn't seeing all events, make sure that happens by checking size agains event_t->header.size. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263586107-1756-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 2c5851747bcf751908c02e253cb7582d342b4612 Author: Arnaldo Carvalho de Melo Date: Fri Jan 15 13:17:52 2010 -0200 perf archive: Add helper script to package files needed to do analysis It uses 'perf buildid-list --with-hits' to create a tarball with what is needed to have in the destination machine ~/.debug hierarchy to properly decode the perf.data file specified. Here is an example where a perf.data file collected on a x86-64 machine running Fedora 12 is used and then the data is packaged, transferred and decoded on a PARISC64 machine running Debian Testing, 32-bit userspace: [root@doppio linux-2.6-tip]# uname -a Linux doppio.ghostprotocols.net 2.6.33-rc4-tip+ #3 SMP Wed Jan 13 11:58:15 BRST 2010 x86_64 x86_64 x86_64 GNU/Linux [root@doppio linux-2.6-tip]# perf archive [root@doppio linux-2.6-tip]# ls -la perf.data* -rw------- 1 root root 737696 2010-01-14 23:36 perf.data -rw-r--r-- 1 root root 8840025 2010-01-15 12:27 perf.data.tar.bz2 [root@doppio linux-2.6-tip]# scp perf.data.* parisc64:. Password: perf.data.tar.bz2 100% 8633KB 1.4MB/s 00:06 [root@doppio linux-2.6-tip]# ssh parisc64 Password: Linux parisc 2.6.19-g2bbf29ac-dirty #1 Sun Dec 3 17:24:04 BRST 2006 parisc64 The programs included with the Debian GNU/Linux system are free software; the exact distribution terms for each program are described in the individual files in /usr/share/doc/*/copyright. Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law. Last login: Thu Jan 14 11:23:24 2010 from d parisc:~# uname -a Linux parisc 2.6.19-g2bbf29ac-dirty #1 Sun Dec 3 17:24:04 BRST 2006 parisc64 GNU/Linux parisc:~# mkdir .debug parisc:~# tar xvf perf.data.tar.bz2 -C ~/.debug tar: Record size = 8 blocks .build-id/74/f9930ee94475b6b3238caf3725a50d59cb994b [kernel.kallsyms]/74f9930ee94475b6b3238caf3725a50d59cb994b .build-id/9f/fdcac0a7935922d1f04b6cc9029dfef0f066ef lib/modules/2.6.33-rc4-tip+/kernel/arch/x86/crypto/aes-x86_64.ko/9ffdcac0a7935922d1f04b6cc9029dfef0f066ef .build-id/3a/af89c32ebfc438ff546c93597d41788e3e65f3 lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko/3aaf89c32ebfc438ff546c93597d41788e3e65f3 .build-id/19/f46033f73e1ec612937189bb118c5daba5a0c8 lib/modules/2.6.33-rc4-tip+/kernel/net/mac80211/mac80211.ko/19f46033f73e1ec612937189bb118c5daba5a0c8 .build-id/17/72f014a7a7272859655acb0c64a20ab20b75ee lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/e1000e/e1000e.ko/1772f014a7a7272859655acb0c64a20ab20b75ee .build-id/eb/4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 lib64/libc-2.10.2.so/eb4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 .build-id/5c/68f7afeb33309c78037e374b0deee84dd441f6 lib64/libpthread-2.10.2.so/5c68f7afeb33309c78037e374b0deee84dd441f6 .build-id/e9/c9ad5c138ef882e4507d2605645b597da43873 bin/dbus-daemon/e9c9ad5c138ef882e4507d2605645b597da43873 .build-id/bc/da7d09eb6c9ee380dae0ed3d591d4311decc31 lib64/libdbus-1.so.3.4.0/bcda7d09eb6c9ee380dae0ed3d591d4311decc31 .build-id/7c/c449a77f48b85d6088114000e970ced613bed8 usr/lib64/libcrypto.so.0.9.8k/7cc449a77f48b85d6088114000e970ced613bed8 .build-id/fd/d1ccd1ff7917ab020653147ab3bacf0a85b5b9 lib64/libglib-2.0.so.0.2000.5/fdd1ccd1ff7917ab020653147ab3bacf0a85b5b9 .build-id/e4/417ebb8762e5f2eee93c8011a71115ff5edad8 lib64/libgobject-2.0.so.0.2000.5/e4417ebb8762e5f2eee93c8011a71115ff5edad8 .build-id/93/1e49461f6df99104f0febcc52f6fed5e2efce6 usr/sbin/sshd/931e49461f6df99104f0febcc52f6fed5e2efce6 .build-id/da/b5f724c088f89fbd8304da553ed6cb30bbec96 usr/lib64/libgdk-x11-2.0.so.0.1600.6/dab5f724c088f89fbd8304da553ed6cb30bbec96 .build-id/f2/037a091ef36b591187a858d75e203690ea9409 usr/sbin/openvpn/f2037a091ef36b591187a858d75e203690ea9409 .build-id/a8/e4f743b40fb1fd8b85e2f9b88d93b661472b8f bin/find/a8e4f743b40fb1fd8b85e2f9b88d93b661472b8f .build-id/81/120aada06e68b1e85882925a0fc6d7345ef59a home/acme/bin/perf/81120aada06e68b1e85882925a0fc6d7345ef59a parisc:~# perf report 2> /dev/null | head -25 9.07% find find [.] 0x0000000000fb0e 3.29% perf libc-2.10.2.so [.] __GI_strcmp 3.19% find [kernel.kallsyms] [k] _raw_spin_unlock_irqrestore 2.70% find libc-2.10.2.so [.] __GI_memmove 2.62% perf [kernel.kallsyms] [k] vsnprintf 2.03% find libc-2.10.2.so [.] _int_malloc 2.02% perf [kernel.kallsyms] [k] format_decode 1.70% find [kernel.kallsyms] [k] n_tty_write 1.70% find [kernel.kallsyms] [k] half_md4_transform 1.67% find libc-2.10.2.so [.] _IO_vfprintf_internal 1.66% perf [kernel.kallsyms] [k] audit_free_aux 1.62% swapper [kernel.kallsyms] [k] mwait_idle_with_hints 1.58% find [kernel.kallsyms] [k] __kmalloc 1.35% find [kernel.kallsyms] [k] sched_clock_local 1.35% find [kernel.kallsyms] [k] ext4_check_dir_entry 1.35% find [kernel.kallsyms] [k] ext4_htree_store_dirent 1.35% find [kernel.kallsyms] [k] sys_write 1.35% find [e1000e] [k] e1000_clean 1.35% find [kernel.kallsyms] [k] _atomic_dec_and_lock 1.34% find [kernel.kallsyms] [k] __d_lookup parisc:~# Probably the next step is to have 'perf report' notice that there is a perf.data.tar.bz2 file in the same directory and look if it was already added to ~/.debug/. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263568672-30323-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 460848fceffc91652b2d36d19db4ac40d12fb607 Author: Arnaldo Carvalho de Melo Date: Fri Jan 15 13:17:51 2010 -0200 perf symbols: The synthesized kernel modules MMAP must use the pathnames Since we use ->long_name in dsos__find now. Now 'perf buildid_list' is not duplicating those and managing to show the proper build-ids for the DSOs with hits: [root@doppio linux-2.6-tip]# perf buildid-list -H 74f9930ee94475b6b3238caf3725a50d59cb994b [kernel.kallsyms] 9ffdcac0a7935922d1f04b6cc9029dfef0f066ef /lib/modules/2.6.33-rc4-tip+/kernel/arch/x86/crypto/aes-x86_64.ko 3aaf89c32ebfc438ff546c93597d41788e3e65f3 /lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko 19f46033f73e1ec612937189bb118c5daba5a0c8 /lib/modules/2.6.33-rc4-tip+/kernel/net/mac80211/mac80211.ko 1772f014a7a7272859655acb0c64a20ab20b75ee /lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/e1000e/e1000e.ko eb4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 /lib64/libc-2.10.2.so 5c68f7afeb33309c78037e374b0deee84dd441f6 /lib64/libpthread-2.10.2.so e9c9ad5c138ef882e4507d2605645b597da43873 /bin/dbus-daemon bcda7d09eb6c9ee380dae0ed3d591d4311decc31 /lib64/libdbus-1.so.3.4.0 7cc449a77f48b85d6088114000e970ced613bed8 /usr/lib64/libcrypto.so.0.9.8k fdd1ccd1ff7917ab020653147ab3bacf0a85b5b9 /lib64/libglib-2.0.so.0.2000.5 e4417ebb8762e5f2eee93c8011a71115ff5edad8 /lib64/libgobject-2.0.so.0.2000.5 931e49461f6df99104f0febcc52f6fed5e2efce6 /usr/sbin/sshd dab5f724c088f89fbd8304da553ed6cb30bbec96 /usr/lib64/libgdk-x11-2.0.so.0.1600.6 f2037a091ef36b591187a858d75e203690ea9409 /usr/sbin/openvpn a8e4f743b40fb1fd8b85e2f9b88d93b661472b8f /bin/find 81120aada06e68b1e85882925a0fc6d7345ef59a /home/acme/bin/perf [root@doppio linux-2.6-tip]# Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263568672-30323-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 88d3d9b7c843a42cb73c55a2d13cd1041da31fb9 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 23:45:30 2010 -0200 perf buildid-list: Introduce --with-hits option Using this option 'perf buildid-list' will process all samples, marking the DSOs that had some hits to list just them. This in turn will be used by a new porcelain, 'perf archive', that will be just a shell script to create a tarball from the 'perf buildid-list --with-hits' output and the files cached by 'perf record' in ~/.debug. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263519930-22803-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 59ee68ecd1561a233fb6ad351980bea8402533e7 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 23:45:29 2010 -0200 perf symbols: Create thread__find_addr_map from thread__find_addr_location Because some tools will only want to know with maps had hits, not needing the full symbol resolution done by thread__find_addr_location. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263519930-22803-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 18c3daa4961b9fa1f2db0711d93c0acf0c39fd12 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 23:45:28 2010 -0200 perf record: Encode the domain while synthesizing MMAP events In the past 'perf record' had to process only userspace MMAP events, the ones generated in the kernel, but after we reused the MMAP events to encode the module mapings we ended up adding them first to the list of userspace DSOs (dsos__user) and to the kernel one (dsos__kernel). Fix this by encoding the header.misc field and then using it, like other parts to decide the right DSOs list to insert/find. The gotcha here is that since the kernel puts zero in .misc, which isn't PERF_RECORD_MISC_KERNEL (1 << 1), to differentiate, we put 1 in .misc. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263519930-22803-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cf4e5b0838e822dd404638ad00d35b63fffe8191 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 23:45:27 2010 -0200 perf symbols: Use dso->long_name in dsos__find() If not we end up duplicating the module DSOs because first we insert them using the short name found in /proc/modules, then, when processing synthesized MMAP events we add them again. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263519930-22803-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 9e201442de7c954f03710ac76f28c1927d07550c Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 18:30:06 2010 -0200 perf symbols: Cache /proc/kallsyms files by build-id So that when we don't have a vmlinux handy we can store the kallsyms for later use by 'perf report'. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263501006-14185-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8d0591f6ad9edf66697ce29de176fb6f3213b9e3 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 18:30:05 2010 -0200 perf symbols: Don't try to load kallsyms if doesn't match the record build-id Now a perf.data file collected on a x86_64 fedora 12 machine gets properly parsed on a Debian testing PARISC64 machine with 32-bit userland: acme@parisc:~/git/linux-2.6-tip$ perf report 2> /dev/null | head -15 # Samples: 293085637 # # Overhead Command Shared Object Symbol # ........ ............... ................................. ...... # 35.11% find [kernel.kallsyms] [k] 0xffffffff81002b5a 18.25% perf [kernel.kallsyms] [k] 0xffffffff8102235f 9.07% find find [.] 0x0000000000fb0e 5.80% swapper [kernel.kallsyms] [k] 0xffffffff8102235f 3.29% perf libc-2.10.2.so [.] __GI_strcmp 2.70% find libc-2.10.2.so [.] __GI_memmove 2.33% init [kernel.kallsyms] [k] 0xffffffff810091b9 2.03% find libc-2.10.2.so [.] _int_malloc 1.67% find libc-2.10.2.so [.] _IO_vfprintf_internal 1.65% sshd libcrypto.so.0.9.8k [.] 0x00000000105440 acme@parisc:~/git/linux-2.6-tip$ Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263501006-14185-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 1b75962e92d48a41019d4b440e221638aa2a7238 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 18:30:04 2010 -0200 perf tools: Convert getpagesize() uses to sysconf(_SC_GETPAGESIZE) Using the more portable and equivalent sysconf call. Reported-by: Aristeu Rozanski Reported-by: Ulrich Drepper Signed-off-by: Arnaldo Carvalho de Melo Cc: Aristeu Rozanski Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ulrich Drepper LKML-Reference: <1263501006-14185-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ba21594cddee0a3af582971656702b1c4509d8f5 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 12:23:10 2010 -0200 perf tools: Cross platform perf.data analysis support There are still some problems related to loading vmlinux files, but those are unrelated to the feature implemented in this patch, so will get fixed in the next patches, but here are some results: 1. collect perf.data file on a Fedora 12 machine, x86_64, 64-bit userland 2. transfer it to a Debian Testing machine, PARISC64, 32-bit userland acme@parisc:~/git/linux-2.6-tip$ perf buildid-list | head -5 74f9930ee94475b6b3238caf3725a50d59cb994b [kernel.kallsyms] 55fdd56670453ea66c011158c4b9d30179c1d049 /lib/modules/2.6.33-rc4-tip+/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko 41adff63c730890480980d5d8ba513f1c216a858 /lib/modules/2.6.33-rc4-tip+/kernel/net/ipv4/netfilter/iptable_nat.ko 90a33def1077bb8e97b8a78546dc96c2de62df46 /lib/modules/2.6.33-rc4-tip+/kernel/net/ipv4/netfilter/nf_nat.ko 984c7bea90ce1376d5c8e7ef43a781801286e62d /lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/tun.ko acme@parisc:~/git/linux-2.6-tip$ perf buildid-list | tail -5 22492f3753c6a67de5c7ccbd6b863390c92c0723 /usr/lib64/libXt.so.6.0.0 353802bb7e1b895ba43507cc678f951e778e4c6f /usr/lib64/libMagickCore.so.2.0.0 d10c2897558595efe7be8b0584cf7e6398bc776c /usr/lib64/libfprint.so.0.0.0 a83ecfb519a788774a84d5ddde633c9ba56c03ab /home/acme/bin/perf d3ca765a8ecf257d263801d7ad8c49c189082317 /usr/lib64/libdwarf.so.0.0 acme@parisc:~/git/linux-2.6-tip$ acme@parisc:~/git/linux-2.6-tip$ perf report --sort comm The file [kernel.kallsyms] cannot be used, trying to use /proc/kallsyms... ^^^^ The problem related to vmlinux handling, it shouldn't be trying this ^^^^ rather alien /proc/kallsyms at all... /lib64/libpthread-2.10.2.so with build id 5c68f7afeb33309c78037e374b0deee84dd441f6 not found, continuing without symbols /lib64/libc-2.10.2.so with build id eb4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 not found, continuing without symbols /home/acme/bin/perf with build id a83ecfb519a788774a84d5ddde633c9ba56c03ab not found, continuing without symbols /usr/sbin/openvpn with build id f2037a091ef36b591187a858d75e203690ea9409 not found, continuing without symbols Failed to open /lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/e1000e/e1000e.ko, continuing without symbols Failed to open /lib/modules/2.6.33-rc4-tip+/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko, continuing without symbols # Samples: 293085637 # # Overhead Command # ........ ............... # 61.70% find 23.50% perf 5.86% swapper 3.12% sshd 2.39% init 0.87% bash 0.86% sleep 0.59% dbus-daemon 0.25% hald 0.24% NetworkManager 0.19% hald-addon-rfki 0.15% openvpn 0.07% phy0 0.07% events/0 0.05% iwl3945 0.05% events/1 0.03% kondemand/0 acme@parisc:~/git/linux-2.6-tip$ Which matches what we get when running the same command for the same perf.data file on the F12, x86_64, source machine: [root@doppio linux-2.6-tip]# perf report --sort comm # Samples: 293085637 # # Overhead Command # ........ ............... # 61.70% find 23.50% perf 5.86% swapper 3.12% sshd 2.39% init 0.87% bash 0.86% sleep 0.59% dbus-daemon 0.25% hald 0.24% NetworkManager 0.19% hald-addon-rfki 0.15% openvpn 0.07% phy0 0.07% events/0 0.05% iwl3945 0.05% events/1 0.03% kondemand/0 [root@doppio linux-2.6-tip]# The other modes work as well, modulo the problem with vmlinux: acme@parisc:~/git/linux-2.6-tip$ perf report --sort comm,dso 2> /dev/null | head -15 # Samples: 293085637 # # Overhead Command Shared Object # ........ ............... ................................. # 35.11% find ffffffff81002b5a 18.25% perf ffffffff8102235f 16.17% find libc-2.10.2.so 9.07% find find 5.80% swapper ffffffff8102235f 3.95% perf libc-2.10.2.so 2.33% init ffffffff810091b9 1.65% sshd libcrypto.so.0.9.8k 1.35% find [e1000e] 0.68% sleep libc-2.10.2.so acme@parisc:~/git/linux-2.6-tip$ And the lack of the right buildids: acme@parisc:~/git/linux-2.6-tip$ perf report --sort comm,dso,symbol 2> /dev/null | head -15 # Samples: 293085637 # # Overhead Command Shared Object Symbol # ........ ............... ................................. ...... # 35.11% find ffffffff81002b5a [k] 0xffffffff81002b5a 18.25% perf ffffffff8102235f [k] 0xffffffff8102235f 16.17% find libc-2.10.2.so [.] 0x00000000045782 9.07% find find [.] 0x0000000000fb0e 5.80% swapper ffffffff8102235f [k] 0xffffffff8102235f 3.95% perf libc-2.10.2.so [.] 0x0000000007f398 2.33% init ffffffff810091b9 [k] 0xffffffff810091b9 1.65% sshd libcrypto.so.0.9.8k [.] 0x00000000105440 1.35% find [e1000e] [k] 0x00000000010948 0.68% sleep libc-2.10.2.so [.] 0x0000000011ad5b acme@parisc:~/git/linux-2.6-tip$ But if we: acme@parisc:~/git/linux-2.6-tip$ ls ~/.debug ls: cannot access /home/acme/.debug: No such file or directory acme@parisc:~/git/linux-2.6-tip$ mkdir -p ~/.debug/lib64/libc-2.10.2.so/ acme@parisc:~/git/linux-2.6-tip$ scp doppio:.debug/lib64/libc-2.10.2.so/* ~/.debug/lib64/libc-2.10.2.so/ acme@doppio's password: eb4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 100% 1783KB 714.7KB/s 00:02 acme@parisc:~/git/linux-2.6-tip$ mkdir -p ~/.debug/.build-id/eb acme@parisc:~/git/linux-2.6-tip$ ln -s ../../lib64/libc-2.10.2.so/eb4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 ~/.debug/.build-id/eb/4ec8fa8b2a5eb18cad173c92f27ed8887ed1c1 acme@parisc:~/git/linux-2.6-tip$ perf report --dsos libc-2.10.2.so 2> /dev/null # dso: libc-2.10.2.so # Samples: 64281170 # # Overhead Command Symbol # ........ ............... ...... # 14.98% perf [.] __GI_strcmp 12.30% find [.] __GI_memmove 9.25% find [.] _int_malloc 7.60% find [.] _IO_vfprintf_internal 6.10% find [.] _IO_new_file_xsputn 6.02% find [.] __GI_close 3.08% find [.] _IO_file_overflow_internal 3.08% find [.] malloc_consolidate 3.08% find [.] _int_free 3.08% find [.] __strchrnul 3.08% find [.] __getdents64 3.08% find [.] __write_nocancel 3.08% sleep [.] __GI__dl_addr 3.08% sshd [.] __libc_select 3.08% find [.] _IO_new_file_write 3.07% find [.] _IO_new_do_write 3.06% find [.] __GI___errno_location 3.05% find [.] __GI___libc_malloc 3.04% perf [.] __GI_memcpy 1.71% find [.] __fprintf_chk 1.29% bash [.] __gconv_transform_utf8_internal 0.79% dbus-daemon [.] __GI_strlen # # (For a higher level overview, try: perf report --sort comm,dso) # acme@parisc:~/git/linux-2.6-tip$ Which matches what we get on the source, F12, x86_64 machine: [root@doppio linux-2.6-tip]# perf report --dsos libc-2.10.2.so # dso: libc-2.10.2.so # Samples: 64281170 # # Overhead Command Symbol # ........ ............... ...... # 14.98% perf [.] __GI_strcmp 12.30% find [.] __GI_memmove 9.25% find [.] _int_malloc 7.60% find [.] _IO_vfprintf_internal 6.10% find [.] _IO_new_file_xsputn 6.02% find [.] __GI_close 3.08% find [.] _IO_file_overflow_internal 3.08% find [.] malloc_consolidate 3.08% find [.] _int_free 3.08% find [.] __strchrnul 3.08% find [.] __getdents64 3.08% find [.] __write_nocancel 3.08% sleep [.] __GI__dl_addr 3.08% sshd [.] __libc_select 3.08% find [.] _IO_new_file_write 3.07% find [.] _IO_new_do_write 3.06% find [.] __GI___errno_location 3.05% find [.] __GI___libc_malloc 3.04% perf [.] __GI_memcpy 1.71% find [.] __fprintf_chk 1.29% bash [.] __gconv_transform_utf8_internal 0.79% dbus-daemon [.] __GI_strlen # # (For a higher level overview, try: perf report --sort comm,dso) # [root@doppio linux-2.6-tip]# So I think this is really, really nice in that it demonstrates the portability of perf.data files and the use of build-ids accross such aliens worlds :-) There are some things to fix tho, like the bitmap on the header, but things are looking good. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263478990-8200-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 0d755034dbd01e240eadf2d31f4f75d3088ccd21 Author: Arnaldo Carvalho de Melo Date: Thu Jan 14 12:23:09 2010 -0200 perf tools: Don't cast RIP to pointers Since they can come from another architecture with bigger pointers, i.e. processing a 64-bit perf.data on a 32-bit arch. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263478990-8200-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 017c426138122c8e9b9f5057fbd0567c37b35247 Author: Paul E. McKenney Date: Thu Jan 14 16:10:58 2010 -0800 rcu: Fix sparse warnings Rename local variable "i" in rcu_init() to avoid conflict with RCU_INIT_FLAVOR(), restrict the scope of RCU_TREE_NONCORE, and make __synchronize_srcu() static. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12635142581560-git-send-email-> Signed-off-by: Ingo Molnar commit 4c54005ca438a8b46dd542b497d4f0dc2ca375e8 Author: Paul E. McKenney Date: Thu Jan 14 16:10:57 2010 -0800 rcu: 1Q2010 update for RCU documentation Add expedited functions. Review documentation and update obsolete verbiage. Also fix the advice for the RCU CPU-stall kernel configuration parameter, and document RCU CPU-stall warnings. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12635142581866-git-send-email-> Signed-off-by: Ingo Molnar commit 0ec00f0392b807d57a2281576a96552d7694b6bb Author: Amit Kumar Salecha Date: Wed Jan 13 00:37:26 2010 +0000 NET: Add Qlogic ethernet driver for CNA devices o Separate Ethernet driver for Qlogic CNA devices Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit af19b49152bdb68fda894183e88096d6d1aa5c3d Author: Amit Kumar Salecha Date: Wed Jan 13 00:37:25 2010 +0000 qlcnic: Qlogic ethernet driver for CNA devices o 1G/10G Ethernet Driver for Qlgic QLE8240 and QLE8242 CNA devices. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6eb3a8553345ba2b4efd5390709e158289b9ece4 Author: Patrick Mullaney Date: Sat Jan 16 01:05:38 2010 -0800 macvlan: add GRO bit to features mask Allow macvlan devices to support GRO. Signed-off-by: Patrick Mullaney Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit d5c1da56afb8a6b232393fb3fdef4909389d05fe Author: Ron Mercer Date: Fri Jan 15 13:31:34 2010 +0000 qlge: Add module param to force firmware core dump. Default setting is 'off', don't allow force firmware dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit a2f982328427157eaa819c02986a65b9b168733a Author: Ron Mercer Date: Fri Jan 15 13:31:33 2010 +0000 qlge: Add xgmac reg blocks to firwmare dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit a48c86fdb1253f36167bab1fc30a51211d49a901 Author: Ron Mercer Date: Fri Jan 15 13:31:32 2010 +0000 qlge: Add serdes reg blocks dump to firmware dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 24bb55b480f16f4cd8d64c2d46e28f0c82df0409 Author: Ron Mercer Date: Fri Jan 15 13:31:31 2010 +0000 qlge: Add alternate function's reg dump to fw dump. Get the 2nd (other) nic function register values. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 2c1f73c3ddfd526750b003bc49a255641ac1f0ca Author: Ron Mercer Date: Fri Jan 15 13:31:30 2010 +0000 qlge: Add RAM dump to firmware dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit c89ec8b9de887cda0879d27036fce8d2a2fd6400 Author: Ron Mercer Date: Fri Jan 15 13:31:29 2010 +0000 qlge: Add probe regs to firmware dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 8aae2600030f54494f9061d2cde141802d774be9 Author: Ron Mercer Date: Fri Jan 15 13:31:28 2010 +0000 qlge: Add basic firmware dump. Adding the infrstructure and basic data for the firmware core dump. The firmware coredump is turned OFF by default. There will be no memory allocations for data dumps to the log. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit b87babeb40aaf879d20268792390ce831805a557 Author: Ron Mercer Date: Fri Jan 15 13:31:27 2010 +0000 qlge: Add data for firmware dump. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 730dd70549e0ec755dd55615ba5cfc38a482a947 Author: Rafał Miłecki Date: Fri Jan 15 16:38:07 2010 +0100 b43: N-PHY: drop unused definition, uncomment needed call Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6dcd9d911cace479ff5612dab3896c8fceb60773 Author: Rafał Miłecki Date: Fri Jan 15 16:24:57 2010 +0100 b43: N-PHY: implement TX power control coef setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 15931e318b27e85ea06f44d53abc3d3e6a3fc9ff Author: Rafał Miłecki Date: Fri Jan 15 16:20:56 2010 +0100 b43: N-PHY: add RX IQ calibrationi for rev < 3 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit fb43b8e23519f853f142202bb341c21382f39070 Author: Rafał Miłecki Date: Fri Jan 15 16:10:48 2010 +0100 b43: N-PHY: add huge calculating TX IQ LO Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e9762492f5c7176660ed030e9dd816b3208def12 Author: Rafał Miłecki Date: Fri Jan 15 16:08:25 2010 +0100 b43: N-PHY: implement calculating IQ gain params Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit de7ed0c6245276eaa62523ffb36512d88bf1efb3 Author: Rafał Miłecki Date: Fri Jan 15 16:06:35 2010 +0100 b43: N-PHY: update TX calibration ladder Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c4a92003b0d02367bb1be94867a79651897e91ed Author: Rafał Miłecki Date: Fri Jan 15 15:55:18 2010 +0100 b43: N-PHY: add RX radio cores calibration Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit fe3e46e881daad2c7e3886e767bda90871d5f4d6 Author: Rafał Miłecki Date: Fri Jan 15 15:51:55 2010 +0100 b43: N-PHY: add TX LP FBW (TX filter 40 related) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b0022e15cc39abebd997fefa18cf3b6e141f76bd Author: Rafał Miłecki Date: Fri Jan 15 15:40:50 2010 +0100 b43: N-PHY: implement getting TX gains Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 34a56f2cae865224829d3fa7b8d7ddeee139191f Author: Rafał Miłecki Date: Fri Jan 15 15:29:05 2010 +0100 b43: N-PHY: implement calculating RX IQ comp Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2faa6b832fb44b1910fe668a4ae127a69e998936 Author: Rafał Miłecki Date: Fri Jan 15 15:26:12 2010 +0100 b43: N-PHY: implement RX IQ estimation Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2f258b74d13c200944ef018c71ed9d9a7d4da0b0 Author: Rafał Miłecki Date: Fri Jan 15 15:18:35 2010 +0100 b43: N-PHY: implement restoring general configuration Signed-off-by: Rafał Miłecki a Signed-off-by: John W. Linville commit 0914640072570f5867818884b8b78c0468b9747f Author: Rafał Miłecki Date: Fri Jan 15 15:17:10 2010 +0100 b43: N-PHY: implement workaround for TX IQ Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a67162ab00d5f0d28f58a62ccd48e6a9cab07645 Author: Rafał Miłecki Date: Fri Jan 15 15:16:25 2010 +0100 b43: N-PHY: implement RX IQ coeffs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5c1a140afbd3abeec92b74c91ad495cf69af4de3 Author: Rafał Miłecki Date: Fri Jan 15 15:10:54 2010 +0100 b43: N-PHY: add function than forces (not) staying in carrier search Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 42e1547e5199ebfd41e3fb63db69dac8c4ed8d1c Author: Rafał Miłecki Date: Fri Jan 15 15:06:47 2010 +0100 b43: N-PHY: add RSSI calibration restore Signed-off-by: Rafał Miłecki ` Signed-off-by: John W. Linville commit e50cbcf6741684753da401722f337efacfa4a98f Author: Rafał Miłecki Date: Fri Jan 15 15:02:38 2010 +0100 b43: N-PHY: implement PA overriding (RF control related) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 90b9738d85395d46ffdc961e1a0c80a17e8f4d32 Author: Rafał Miłecki Date: Fri Jan 15 14:48:21 2010 +0100 b43: N-PHY: RSSI calibration for rev < 3 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit dfb4aa5dd0a9b61a6eaa64e9209b2f8839c0a256 Author: Rafał Miłecki Date: Fri Jan 15 14:45:13 2010 +0100 b43: N-PHY: add RSSI polling and setting 2055 (radio) VCM Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3c95627d404e1094313f2dcb87424e2ae462e814 Author: Rafał Miłecki Date: Fri Jan 15 14:38:32 2010 +0100 b43: N-PHY: implement RSSI selection and offset scaling Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bbec398c1b7baa1dbde1e49446d1cbf4c6c20fa1 Author: Rafał Miłecki Date: Fri Jan 15 14:31:39 2010 +0100 b43: N-PHY: add clip detection reading/writing and some classifier function Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4cb9977516d0f52a779d12a430ccf263d35802fc Author: Rafał Miłecki Date: Fri Jan 15 13:40:58 2010 +0100 b43: N-PHY: split RSSI calibration into 2 functions (rev2, rev3) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4a933c8566da3e2b164ea74b1632bf2f43c8ee9b Author: Rafał Miłecki Date: Fri Jan 15 13:36:43 2010 +0100 b43: N-PHY: update CCA reset Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 0988a7a1a98300e90a6613b33738e07cdf8ce786 Author: Rafał Miłecki Date: Fri Jan 15 13:27:29 2010 +0100 b43: N-PHY: update init code to match current specs Previous init path was based on old specs from old driver. Update it as much as possible leaving some TODOs for not implemented functions. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 088e56b44a52bbd58a790627148cf75ed71ae34b Author: Rafał Miłecki Date: Fri Jan 15 13:02:45 2010 +0100 b43: N-PHY: add various tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2a448bfc70f4fd4a54996d1c7a371ba28ec0568f Author: Rafał Miłecki Date: Fri Jan 15 12:54:30 2010 +0100 b43: N-PHY: add global variables to b43_phy_n struct Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5b0ade3377b91da14410612b2051d66d26d31069 Author: Rafał Miłecki Date: Fri Jan 15 12:40:03 2010 +0100 b43: N-PHY: add missing register definitions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f8187b5b9780a9ac3c12c70413615a0fdf321cd5 Author: Rafał Miłecki Date: Fri Jan 15 12:34:21 2010 +0100 b43: N-PHY: add needed struct definitions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 76a4db303d06066792bbc0e886def2cf99b232ef Author: Rafał Miłecki Date: Fri Jan 15 12:27:46 2010 +0100 b43: N-PHY: add shared memory offsets definitions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4772ae107c42cdce1d3864d8d540ea0401eb09d6 Author: Rafał Miłecki Date: Fri Jan 15 12:18:21 2010 +0100 b43: N-PHY: clean table init, check PHY rev Move table init to tables_nphy.c, detect newer PHY which use different init. We don't init newer PHYs yet but this at least shows what more is needed. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 003d6d2792bebb2b66966ce5f1da11849e855180 Author: Rafał Miłecki Date: Fri Jan 15 12:10:53 2010 +0100 b43: add new SSB's core id for BCM4328 Following line shows my BCM4328 detected on SSB. We didn't include 0x0C rev. ssb: Core 1 found: IEEE 802.11 (cc 0x812, rev 0x0C, vendor 0x4243) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 857c0fc490d8474d1a232d9b6568a4b229634bcd Author: Rafał Miłecki Date: Fri Jan 15 12:01:49 2010 +0100 b43: use standard fls for finding the most significant bit Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c67fcd670b55e89e0c129fbf7fae854bd1f8bfa6 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:44 2009 +0400 ACPI: Battery: Add support for _BIX extended info method Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit e239d8591843945630521ec85edca08289f1a751 Author: Felix Fietkau Date: Fri Jan 15 02:34:58 2010 +0100 ath9k: implement coverage class support Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0005baf4a31efe6de6f922f73ccbd3762a110062 Author: Felix Fietkau Date: Fri Jan 15 02:33:40 2010 +0100 ath9k: cleanup slot time and ack/cts timeout handling Previously ath9k left the initialization of slot timing and ACK/CTS timeout to the mode specific initvals. This does not handle short vs long slot in 2.4 GHz and uses a rather strange value for the 2.4 GHz ACK timeout (64 usec). This patch uses the proper ath9k_hw functions for setting slot time and timeouts and also implements the switch between short and long slot time in 2.4 GHz Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 145b6d1a56f224d15c61aa7ecfda9a1171b47b6a Author: Ming Lei Date: Fri Jan 15 21:44:21 2010 +0800 mac80211: fix memory leak in ieee80211_send_probe_req This patch fixes memory leak in ieee80211_send_probe_req, which is introduced in 7c12ce8b854df346388ea56d684784e3484012cf: mac80211: use Probe Request template when sending a direct scan The patch is against the latest wireless-test tree. Signed-off-by: Ming Lei Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 43d3534344bbdcfa9c61a6b38490cd4cbb2f6bb6 Author: Felix Fietkau Date: Fri Jan 15 03:00:48 2010 +0100 mac80211: force use_short_slot=true for 5GHz Normally 5GHz does not have a concept of long vs short slot time, however the slot time that it ends up using is the same as for 2.4 GHZ and use_short_slot == true Because of that, it makes more sense to force use_short_slot = true whenever 5 GHz is being used, so that this particular check does not have to be in every single driver that uses this flag. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 84920e3e47f654a22b540606fb8c1ab90b870942 Author: Luis R. Rodriguez Date: Thu Jan 14 20:08:20 2010 -0500 cfg80211: make regulatory_hint_11d() band specific In practice APs do not send country IE channel triplets for channels the AP is not operating on and if they were to do so they would have to use the regulatory extension which we currently do not process. No AP has been seen in practice that does this though so just drop those country IEs. Additionally it has been noted the first series of country IE channels triplets are specific to the band the AP sends. Propagate the band on which the country IE was found on reject the country IE then if the triplets are ever oustide of the band. Although we now won't process country IE information with multiple band information we leave the intersection work as is as it is technically possible for someone to want to eventually process these type of country IEs with regulatory extensions. Cc: Jouni Malinen Cc: Johannes Berg Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 16698857fba1b10af4890055272975adf5686e83 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:37 2009 +0400 ACPI: SBS: Export cycle_count Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit c955fe8e0bdd7be7a6bc2d49245d570a816f7cc5 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:30 2009 +0400 POWER: Add support for cycle_count Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 93895757df4ebe22c98b9128b98ebf8cec972c60 Author: Benoit Papillault Date: Thu Jan 14 23:20:31 2010 +0100 mac80211: Fixed netif_tx_wake_all_queues in IBSS mode When ieee80211_offchannel_return is called, it needs to re-enabled TX queues that have been stopped in ieee80211_offchannel_stop_beaconing or ieee80211_offchannel_stop_station. It happens if we are doing a scan with an IBSS interface. In this case, the interface stopped transmitting. Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit 7b3bcc4a1a7cd2d53b403ca29d06ceb5fa617eb7 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:24 2009 +0400 ACPI: Battery: Add bit flags Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 4e23471a3f3aba885ea70100db47ccacb5f069f6 Author: Christoph Hellwig Date: Wed Jan 13 22:17:56 2010 +0000 xfs: move more buffer helpers into xfs_buf.c Move xfsbdstrat and xfs_bdstrat_cb from xfs_lrw.c and xfs_bioerror and xfs_bioerror_relse from xfs_rw.c into xfs_buf.c. This also means xfs_bioerror and xfs_bioerror_relse can be marked static now. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 64e0bc7d2a6609ad265757a600e2a0d93c8adb47 Author: Christoph Hellwig Date: Wed Jan 13 22:17:58 2010 +0000 xfs: clean up xfs_bwrite Fold XFS_bwrite into it's only caller, xfs_bwrite and move it into xfs_buf.c instead of leaving it as a fairly large inline function. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 873ff5501d8cd1a21045d6c1da34f0c3876bc235 Author: Christoph Hellwig Date: Wed Jan 13 22:17:57 2010 +0000 xfs: clean up log buffer writes Don't bother using XFS_bwrite as it doesn't provide much code for our use case. Instead opencode it and fold xlog_bdstrat_cb into the new xlog_bdstrat helper. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit e57336ff7fc7520bec7b3a7741043bdebaf622ea Author: Dave Chinner Date: Mon Jan 11 11:47:49 2010 +0000 xfs: embed the pagb_list array in the perag structure Now that the perag structure is allocated memory rather than held in an array, we don't need to have the busy extent array external to the structure. Embed it into the perag structure to avoid needing an extra allocation when setting up. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8b26c5825e023b1bccac7afd174ebe55b8905cb1 Author: Dave Chinner Date: Mon Jan 11 11:47:48 2010 +0000 xfs: handle ENOMEM correctly during initialisation of perag structures Add proper error handling in case an error occurs while initializing new perag structures for a mount point. The mount structure is restored to its previous state by deleting and freeing any perag structures added during the call. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit b657fc82a3ca6d7ad16a59e81765f0fb0e86cdbb Author: Dave Chinner Date: Mon Jan 11 11:47:47 2010 +0000 xfs: Kill filestreams cache flush The filestreams cache flush is not needed in the sync code as it does not affect data writeback, and it is now not used by the growfs code, either, so kill it. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 0fa800fbd549736dfdc1d7761f87e33dc8cd973b Author: Dave Chinner Date: Mon Jan 11 11:47:46 2010 +0000 xfs: Add trace points for per-ag refcount debugging. Uninline xfs_perag_{get,put} so that tracepoints can be inserted into them to speed debugging of reference count problems. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit aed3bb90abaf0b42e8c8747e192f7bb97f445279 Author: Dave Chinner Date: Mon Jan 11 11:47:45 2010 +0000 xfs: Reference count per-ag structures Reference count the per-ag structures to ensure that we keep get/put pairs balanced. Assert that the reference counts are zero at unmount time to catch leaks. In future, reference counts will enable us to safely remove perag structures by allowing us to detect when they are no longer in use. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 1c1c6ebcf5284aee4910f3b906ac90c20e510c82 Author: Dave Chinner Date: Mon Jan 11 11:47:44 2010 +0000 xfs: Replace per-ag array with a radix tree The use of an array for the per-ag structures requires reallocation of the array when growing the filesystem. This requires locking access to the array to avoid use after free situations, and the locking is difficult to get right. To avoid needing to reallocate an array, change the per-ag structures to an allocated object per ag and index them using a tree structure. The AGs are always densely indexed (hence the use of an array), but the number supported is 2^32 and lookups tend to be random and hence indexing needs to scale. A simple choice is a radix tree - it works well with this sort of index. This change also removes another large contiguous allocation from the mount/growfs path in XFS. The growing process now needs to change to only initialise the new AGs required for the extra space, and as such only needs to exclusively lock the tree for inserts. The rest of the code only needs to lock the tree while doing lookups, and hence this will remove all the deadlocks that currently occur on the m_perag_lock as it is now an innermost lock. The lock is also changed to a spinlock from a read/write lock as the hold time is now extremely short. To complete the picture, the per-ag structures will need to be reference counted to ensure that we don't free/modify them while they are still in use. This will be done in subsequent patch. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 44b56e0a1aed522a10051645e85d300e10926fd3 Author: Dave Chinner Date: Mon Jan 11 11:47:43 2010 +0000 xfs: convert remaining direct references to m_perag Convert the remaining direct lookups of the per ag structures to use get/put accesses. Ensure that the loops across AGs and prior users of the interface balance gets and puts correctly. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 4196ac08c023c6dab90c3fa460d9c06deaa304c4 Author: Dave Chinner Date: Mon Jan 11 11:47:42 2010 +0000 xfs: Convert filestreams code to use per-ag get/put routines Use xfs_perag_get() and xfs_perag_put() in the filestreams code. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit a862e0fdcb8862aab2538ec2fc2f0dc07a625c59 Author: Dave Chinner Date: Mon Jan 11 11:47:41 2010 +0000 xfs: Don't directly reference m_perag in allocation code Start abstracting the perag references so that the indexing of the structures is not directly coded into all the places that uses the perag structures. This will allow us to separate the use of the perag structure and the way it is indexed and hence avoid the known deadlocks related to growing a busy filesystem. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 5017e97d52628fb8ae56e434e86ac2e72ddaac2b Author: Dave Chinner Date: Mon Jan 11 11:47:40 2010 +0000 xfs: rename xfs_get_perag xfs_get_perag is really getting the perag that an inode belongs to based on it's inode number. Convert the use of this function to just get the perag from a provided ag number. Use this new function to obtain the per-ag structure when traversing the per AG inode trees for sync and reclaim. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit c9c129714e71c890bed1bd5b61697a896c3c2d54 Author: Dave Chinner Date: Mon Jan 11 11:49:59 2010 +0000 xfs: Don't wake xfsbufd when idle The xfsbufd wakes every xfsbufd_centisecs (once per second by default) for each filesystem even when the filesystem is idle. If the xfsbufd has nothing to do, put it into a long term sleep and only wake it up when there is work pending (i.e. dirty buffers to flush soon). This will make laptop power misers happy. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 453eac8a9aa417878a38bdfbccafd5f7ce4e8e4e Author: Dave Chinner Date: Mon Jan 11 11:49:58 2010 +0000 xfs: Don't wake the aild once per second Now that the AIL push algorithm is traversal safe, we don't need a watchdog function in the xfsaild to catch pushes that fail to make progress. Remove the watchdog timeout and make pushes purely driven by demand. This will remove the once-per-second wakeup that is seen when the filesystem is idle and make laptop power misers happy. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit f0a7695380efa31cd281730917f7e907a724d5cb Author: Dave Chinner Date: Mon Jan 11 11:49:57 2010 +0000 xfs: Use list_heads for log recovery item lists Remove the roll-your-own linked list operations. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 5d77c0dc0c05c2c65aee16149fae06831a118730 Author: Eric Sandeen Date: Thu Nov 19 15:52:00 2009 +0000 xfs: make several more functions static Just minor housekeeping, a lot more functions can be trivially made static; others could if we reordered things a bit... Signed-off-by: Eric Sandeen Signed-off-by: Alex Elder commit 6bded0f383fd7971b76ad6c194dda7d5b814b871 Author: Dave Chinner Date: Thu Jan 14 01:33:56 2010 +0000 xfs: clean up inconsistent variable naming in xfs_swap_extent The swap extent ioctl passes in a target inode and a temporary inode which are clearly named in the ioctl structure. The code then assigns temp to target and vice versa, making it extremely difficult to work out which inode is which later in the code. Make this consistent throughout the code. Also make xfs_swap_extent static as there are no external users of the function. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 3a85cd96d3ab3c6dcf88b81fc6eaddb84e565a43 Author: Dave Chinner Date: Thu Jan 14 01:33:55 2010 +0000 xfs: add tracing to xfs_swap_extents To be able to diagnose whether the swap extents function is detecting compatible inode data fork configurations for swapping extents, add tracing points to the code to allow us to see the format of the inode forks before and after the swap. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit a421296840379aee7d00ec4a28ecfe7e697a0a44 Author: Daniel Mack Date: Fri Jan 15 17:36:49 2010 +0100 ASoC: support more sample rates on raumfeld devices Add support for sample rates other than 44100Khz on raumfeld audio devices. At startup time, call snd_soc_dai_set_sysclk() with 0 as 'freq' argument so it offers all the sample rates. Later, the function is called again to give proper constraints. Use the external audio clock generator to provide double data rate clocks as the PXA's internal baud generator does anything but what's described in the datasheets. Signed-off-by: Daniel Mack Cc: Mark Brown Cc: Timur Tabi Signed-off-by: Mark Brown commit 6aababdf20bb8892023bb8df136514d7679e4959 Author: Daniel Mack Date: Fri Jan 15 17:36:48 2010 +0100 ASoC: cs4270: allow passing freq=0 in set_dai_sysclk() For setups with variable MCLKs, the current logic of limiting the available sampling rates at startup time is not sufficient. We need to be able to change the setting at a later point, and so the codec must offer all possible rates until the hw_params are given. This patches allows that by passing 0 as 'freq' argument to cs4270_set_dai_sysclk(). Signed-off-by: Daniel Mack Acked-by: Timur Tabi Signed-off-by: Mark Brown commit 62e62da856dba2edb897b672cbd05a69edd4485c Author: H Hartley Sweeten Date: Thu Jan 14 19:10:07 2010 -0700 HID: hid-debug.c: make local symbols static hid-debug.c: make local symbols static The symbols hid_resolv_event and hid_dump_input_mapping are only used locally in this file. Make them static to prevent the following sparse warnings: warning: symbol 'hid_resolv_event' was not declared. Should it be static? warning: symbol 'hid_dump_input_mapping' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten Signed-off-by: Jiri Kosina commit 0f61628e37e121b7786bff2653fc25a321e82ec4 Author: Ben Dooks Date: Sun Nov 29 14:34:56 2009 +0000 ARM: S3C2412: Fixup commented out device in SMDK2413 The SMDK2413 has a commented out device that does not have any setup data for it, so remove it for now. Signed-off-by: Ben Dooks commit b813248c614b07642adbf1d7b577d0466003b339 Author: Ben Dooks Date: Mon Nov 23 00:13:39 2009 +0000 ARM: S3C: Rename s3c_device_usb to s3c_device_ohci Prepare for the forthcoming device changes by renaming s3c_device_usb to s3c_device_ohci as this is what the device represents. Signed-off-by: Ben Dooks commit 501dae90b3ae4dd3d8efdacfcb072c3d65eb5a33 Author: Kukjin Kim Date: Thu Jan 14 08:23:53 2010 +0900 ARM: S5P6440: Add serial port support This patch adds UART serial port support for S5P6440 CPU. Most of the serial support of Samsung's 6400 CPU is reused for 6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 62a6156e88b2e89eafed30aefc97ff4979393c1c Author: Kukjin Kim Date: Thu Jan 14 08:23:04 2010 +0900 ARM: S5P6440: Add configuration file This patch adds Samsung's S5P6440 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d25168ea9308e19c7000f0c997eedec87c5d6298 Author: Kukjin Kim Date: Thu Jan 14 08:22:00 2010 +0900 ARM: S5P6440: Add Board support file This patch adds Samsung's SMDK6440 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit c4ffccddd54b669cc9683f2c69e31035e916a1a0 Author: Kukjin Kim Date: Thu Jan 14 08:19:36 2010 +0900 ARM: S5P6440: Add new Kconfig and Makefiles This patch adds the Kconfig and Makefile for the new S5P6440 machine and platform directories. It also updates arch/arm Kconfig and Makefiles to include the support for the new S5P6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f3545f64a44b2b2dac34141dba23d18cdf40a92 Author: Kukjin Kim Date: Thu Jan 14 08:15:39 2010 +0900 ARM: S5P6440: Add Timer support This patch adds timer support for S5P6440 CPU. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b7db51be43bc8f9943324a00b80e5d034de0a733 Author: Kukjin Kim Date: Thu Jan 14 08:14:40 2010 +0900 ARM: S5P6440: Add IRQ support This patch adds IRQ support for S5P6440 CPU. Signed-off-by: Adityapratap Sharma Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1a0e8a52ad56075663d8e120e2468fc96fb6fa6c Author: Kukjin Kim Date: Thu Jan 14 08:13:37 2010 +0900 ARM: S5P6440: Add Clock and PLL support This patch adds clock and pll support for S5P6440. This patch are based on Harald Welte's patches and Ben's plat-samsung. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 209fecd1b8e65b8046efbbc8314d449e53c4c6b6 Author: Kukjin Kim Date: Thu Jan 14 15:29:17 2010 +0900 ARM: S5P6440: Add new CPU initialization support This patch adds Samsung's S5P6440 CPU support. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7dcaa8e8e67b2cfbe0097c9bb52e23aed5443b8b Author: Paul Mundt Date: Fri Jan 15 19:13:56 2010 +0900 sh: Generalize SH7786 PCIe support. Previously this was only built in for Urquell boards, but the same approach can be used on SDK7786 now that the mode pin reading is supported, so make it generic to SH7786. Signed-off-by: Paul Mundt commit d86458471aadffe93b741024b5a879ea5dc8df35 Author: Tobias Klauser Date: Fri Jan 15 01:48:22 2010 -0800 ethoc: Use resource_size Use the resource_size function instead of manually calculating the resource size. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit c5bab5e94d148aee2c852450374143c89aa56511 Author: Wolfgang Grandegger Date: Thu Jan 14 01:05:48 2010 +0000 can: mscan-mpc5xxx: fix broken support for the MPC5200 Due to an invalid "#ifdef CONFIG_PPC_MPC5200", the real clock setup function was not called for the MPC5200. Signed-off-by: Wolfgang Grandegger Acked-by: Wolfram Sang Signed-off-by: David S. Miller commit 3a4d5c94e959359ece6d6b55045c3f046677f55c Author: Michael S. Tsirkin Date: Thu Jan 14 06:17:27 2010 +0000 vhost_net: a kernel-level virtio server What it is: vhost net is a character device that can be used to reduce the number of system calls involved in virtio networking. Existing virtio net code is used in the guest without modification. There's similarity with vringfd, with some differences and reduced scope - uses eventfd for signalling - structures can be moved around in memory at any time (good for migration, bug work-arounds in userspace) - write logging is supported (good for migration) - support memory table and not just an offset (needed for kvm) common virtio related code has been put in a separate file vhost.c and can be made into a separate module if/when more backends appear. I used Rusty's lguest.c as the source for developing this part : this supplied me with witty comments I wouldn't be able to write myself. What it is not: vhost net is not a bus, and not a generic new system call. No assumptions are made on how guest performs hypercalls. Userspace hypervisors are supported as well as kvm. How it works: Basically, we connect virtio frontend (configured by userspace) to a backend. The backend could be a network device, or a tap device. Backend is also configured by userspace, including vlan/mac etc. Status: This works for me, and I haven't see any crashes. Compared to userspace, people reported improved latency (as I save up to 4 system calls per packet), as well as better bandwidth and CPU utilization. Features that I plan to look at in the future: - mergeable buffers - zero copy - scalability tuning: figure out the best threading model to use Note on RCU usage (this is also documented in vhost.h, near private_pointer which is the value protected by this variant of RCU): what is happening is that the rcu_dereference() is being used in a workqueue item. The role of rcu_read_lock() is taken on by the start of execution of the workqueue item, of rcu_read_unlock() by the end of execution of the workqueue item, and of synchronize_rcu() by flush_workqueue()/flush_work(). In the future we might need to apply some gcc attribute or sparse annotation to the function passed to INIT_WORK(). Paul's ack below is for this RCU usage. (Includes fixes by Alan Cox , David L Stevens , Chris Wright ) Acked-by: Rusty Russell Acked-by: Arnd Bergmann Acked-by: "Paul E. McKenney" Signed-off-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit 5da779c34ccff5e1e617892b6c8bd8260fb1f04c Author: Michael S. Tsirkin Date: Thu Jan 14 06:17:18 2010 +0000 mm: export use_mm/unuse_mm to modules vhost net module wants to do copy to/from user from a kernel thread, which needs use_mm. Export it to modules. Acked-by: Andrea Arcangeli Acked-by: Andrew Morton Signed-off-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit 05c2828c72c4eabf62376adfe27bd24797621f62 Author: Michael S. Tsirkin Date: Thu Jan 14 06:17:09 2010 +0000 tun: export underlying socket Tun device looks similar to a packet socket in that both pass complete frames from/to userspace. This patch fills in enough fields in the socket underlying tun driver to support sendmsg/recvmsg operations, and message flags MSG_TRUNC and MSG_DONTWAIT, and exports access to this socket to modules. Regular read/write behaviour is unchanged. This way, code using raw sockets to inject packets into a physical device, can support injecting packets into host network stack almost without modification. First user of this interface will be vhost virtualization accelerator. Signed-off-by: Michael S. Tsirkin Acked-by: Herbert Xu Acked-by: David S. Miller Signed-off-by: David S. Miller commit ad72c347e56bf3a0231b9d686e17764157d2961c Author: Christian Pellegrin Date: Thu Jan 14 07:08:34 2010 +0000 can: Proper ctrlmode handling for CAN devices This patch adds error checking of ctrlmode values for CAN devices. As an example all availabe bits are implemented in the mcp251x driver. Signed-off-by: Christian Pellegrin Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 1954dc11776ef8c06263ba4cd21bf4d25c79a19c Author: Amit Kumar Salecha Date: Thu Jan 14 01:53:24 2010 +0000 netxen: fix sparse warning Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 4d21fef426c5cbbdf6da607de4c0adcaa3d4bbb0 Author: Amit Kumar Salecha Date: Thu Jan 14 01:53:23 2010 +0000 netxen: fix license header GNU General Public License is in file "COPYING". Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit c070395009e1e153395837cd256dffc931dd6f98 Author: Amit Kumar Salecha Date: Thu Jan 14 01:53:22 2010 +0000 netxen: fix endianness intr coalesce Before sending Interrupt coalesce parameters to device, convert them in little endian. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit a03d2451998e09e87eb573a9e04cc41fde2bb77f Author: Amit Kumar Salecha Date: Thu Jan 14 01:53:21 2010 +0000 netxen: fix endianness read mac address In netxen_read_mac_addr, mac_addr should be declared u64 instead of __le64, used by host only. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit d4ae5415c6f2dd8f14e027c24f09d708f11a8d60 Author: Wolfram Sang Date: Fri Jan 15 01:33:08 2010 -0800 ide/ide-cs: fix order of releasing resources ide_detach() called first ide_release() and then release_region(). This produced the following warnings: Trying to free nonexistent resource <000000000000c10e-000000000000c10e> Trying to free nonexistent resource <000000000000c100-000000000000c107> This is true, because the callchain inside ide_release() is: ide_release -> pcmcia_disable_device -> pcmcia_release_io So, the whole io-block is already gone for release_region(). To fix this, just swap the order of releasing (and remove the now obsolete shadowing). bzolnier: - release resources in ide_release() to fix ordering of events - remove stale FIXME note while at it Signed-off-by: Wolfram Sang Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 71fceff0ea36d5a6cffecb272b8b3970535fe905 Author: David S. Miller Date: Fri Jan 15 01:16:40 2010 -0800 ipv4: Use less conflicting local var name in change_nexthops() loop macro. As noticed by H Hartley Sweeten, since change_nexthops() uses 'nh' as it's iterator variable, it can conflict with other existing local vars. Use "nexthop_nh" to avoid the conflict and make it easier to figure out where this magic variable comes from. Signed-off-by: David S. Miller commit 4d0392be21d4710121f855c0caf57d32ffd1ced0 Author: H Hartley Sweeten Date: Fri Jan 15 01:08:58 2010 -0800 net/core/sock.c: quiet sparse noise In sock_getsockopt the symbol 'lv' is declared as an unsigned int type, probably due to sizeof returning a size_t which is really an unsigned int. This produces a sparse warning for SO_PEERNAME due to the sock->ops->getname() call: warning: incorrect type in argument 3 (different signedness) expected int *sockaddr_len got unsigned int * Quiet the warning by changing the type of 'lv' to an int. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit be97162d47b2e067f9d21097650f2f0405dacc9f Author: Ben Dooks Date: Tue Jan 12 14:13:58 2010 +0900 ARM: S5PC1XX: Use common UART IRQ handling code Use the common UART IRQ handling code for the S5PC100 system. Signed-off-by: Ben Dooks commit 47101ec73901183520de724fb5f9062c014236bb Author: Ben Dooks Date: Thu Jan 7 14:41:38 2010 +0900 ARM: S5PC1XX: Move to using standard timer IRQ handling code Move to using the standard VIC/Timer IRQ handling code added previously to avoid duplicating code. Thanks to Marek Szyprowski for pointing out dual Kconfig change. Signed-off-by: Ben Dooks commit 35accd2f6639a9245488f2f389e3c6372c7641e4 Author: Ben Dooks Date: Tue Jan 12 13:10:59 2010 +0900 ARM: S5PC1XX: Remove definitions deleted by previous clksrc changes Remove the definitions we've deleted in the previous updates to the clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h. Added comments about the removal to the clock header since we only need these defines in one place (and they've now been removed there) we get rid of them from the header. Signed-off-by: Ben Dooks commit 37872bb9efddf9518cc77c43f9fa8fc6bfd3d727 Author: Ben Dooks Date: Tue Jan 12 12:52:43 2010 +0900 ARM: SAMSUNG: Add script to change old clksrc_clk to new register defs This script is used to change the old style clksrc_clk as originally found in plat-s3c64xx to the new style. It is here for reference if needed for future code merges. Signed-off-by: Ben Dooks commit c837e88cf9e18c311332cc1c8c488993a201d568 Author: Ben Dooks Date: Tue Jan 12 12:49:17 2010 +0900 ARM: S5PC1XX: Change clksrc_clks to use array of clocks Remove the individual 'struct clksrc_clks' and place them into an array so that we can simply use s3c_register_clksrcs to register tham all in one go. Since the spdif clock relies on the audio clock, move the audio clocks into their own arrary. Thanks to Marek Szyprowski for testing and pointing out the four clocks what where missed from the clock list. Signed-off-by: Ben Dooks commit 1d026d9b1671bcb05e7b00f545f1d62476e9063c Author: Ben Dooks Date: Tue Jan 12 12:39:58 2010 +0900 ARM: S5PC1XX: Move clock definitions around ready to turn into clksrc arrays Move the clock definitions around ready to turn the clocks into an array of clocks and register them in one go. Signed-off-by: Ben Dooks commit 45426468148d77e8c5eaece21d2a16e063066567 Author: Ben Dooks Date: Tue Jan 12 12:19:28 2010 +0900 ARM: S5PC1XX: Move to using generic clksrc_clk for clock code Remove the copy of the old s3c64xx struct clksrc_clk and use the new one in plat-samsung. This eliminates a bug in the set_parent() call where it failed to set the clk->parent after sucesfully updating the clock. The script that was used to automate much of the process will be supplied seperately. Signed-off-by: Ben Dooks commit 85841bcedd6048dd37cab58a504e5317192324c6 Author: Kukjin Kim Date: Mon Jan 11 12:21:51 2010 +0900 ARM: SAMSUNG: Add config option for number of additional GPIO pins. This patch adds a configuration option for specifing the number of additional GPIO pins to be used in addition to the GPIO pins supported onchip. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5b39be4637bb795b2133dbee0eadbcc08bdd4134 Author: Ben Dooks Date: Thu Jan 7 08:59:26 2010 +0900 ARM: Add common entry code for system with two VICs Add a common entry-macro-vic2.S for systems where there are two VICs so that the machine or platform directories just need to setup the correct information before including into their own entry-macro.S file. Since this code is from the S3C64XX project, we update the S3C64XX machine entry code to use this new header. Signed-off-by: Ben Dooks commit 51022cf6591ae2945960d034788bdeffa28cde13 Author: Ben Dooks Date: Wed Jan 6 11:18:44 2010 +0900 ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung Move the handling for the UART interrupts out of the s3c64xx specific code and into plat-samsung so that it can be used by all implementations that need it. Signed-off-by: Ben Dooks commit 7162ba03729e0a47aaab44448ce2453f07a9664d Author: Ben Dooks Date: Wed Jan 6 10:14:51 2010 +0900 ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files Move the VIC based timer interrupt handling out of plat-s3c64xx and into plat-samsung to be re-used for other systems. This also reduces the code size as we now have a common init routine and use the irq_desc to store the interrupt number of the timer. Signed-off-by: Ben Dooks commit 4f830db9629e413e7c5523085ab009b0de5ae6d0 Author: Ben Dooks Date: Wed Jan 6 02:28:20 2010 +0900 ARM: SAMSUNG: Move gpio-config.c into plat-samsung The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung SoCs, so move it to arch/arm/plat-samsung Signed-off-by: Ben Dooks commit b6a604137bb978d9f65b1228cf0bb691ece45cba Author: Ben Dooks Date: Wed Jan 6 02:45:09 2010 +0900 ARM: SAMSUNG: Move device definitions in plat-samsung Move all the platform device definitions from plat-s3c into plat-samsung Signed-off-by: Ben Dooks commit 9745626b65b856bf58e70feb4eee1e5471db699e Author: Ben Dooks Date: Wed Jan 6 02:39:28 2010 +0900 ARM: SAMSUNG: Move pwm-clock code into plat-samsung Move the code for the pwm-clock into plat-samsung, as it is common to all Samsung SoCs. Signed-off-by: Ben Dooks commit ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6 Author: Kukjin Kim Date: Thu Jan 14 12:50:23 2010 +0900 ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible This patch makes clk_default_setrate and clk_ops_def_setrate available to code outside plat-samsung clock code. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 14235696d401e62f8f5740ca2fb917ab42b9fd18 Author: Ben Dooks Date: Wed Jan 6 01:53:25 2010 +0900 ARM: SAMSUNG: Do not register set_parent call if no source If there is no source register defined, do not register a clksrc clock with a valid .set_parent in the ops. Signed-off-by: Ben Dooks commit 1d9f13c49ed750260f40317629bdd66160a3ac16 Author: Ben Dooks Date: Wed Jan 6 01:21:38 2010 +0900 ARM: SAMSUNG: Add call to register array of clocks Add s3c_register_clocks() to register an array of clocks, printing an error message if there is a problem. Replace all points in the code where this could be used. Signed-off-by: Ben Dooks commit fb6e76cd2309c76d2120e013ff34ff6ab27aad88 Author: Ben Dooks Date: Wed Jan 6 01:07:57 2010 +0900 ARM: SAMSUNG: Do not allow get/set/round rate calls with no divider If the reg_div field is not set, then do not register clk_ops with the get/set/round rate calls as these will fail to work. Signed-off-by: Ben Dooks commit 2c2f69b15d5420291a941ace10149e76f0af7ab0 Author: Ben Dooks Date: Wed Dec 23 18:43:48 2009 +0000 ARM: SAMSUNG: Move clock.c to arch/arm/plat-samsung This is the core implementation of the clock code for all Samsung based SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already been moved). Since the file is built for every Samsung SoC, no changes are needed to the Kconfig system. Signed-off-by: Ben Dooks commit 682e2b7d45878586ce84f6993da0b8a2981a399d Author: Ben Dooks Date: Wed Dec 9 00:08:35 2009 +0000 ARM: S3C64XX: Avoid announcing clksrc clocks twice The new code calls the clock setup code on registration which can be before the clock system has been fully initialised. The following code re-does this setup at the end of the clock registration and thus we get two printings. Update the calls to only print on the last pass or when doing the necessary resume work. Signed-off-by: Ben Dooks commit f3e0b724cc70ef5ee2a6e0d9dfafa2328c294ab3 Author: Ben Dooks Date: Tue Dec 8 01:26:07 2009 +0000 ARM: S3C64XX: Fixup .reg_src and .reg_div with named initialisers Change these two fields to have named initialisers as per the review comments from Kyungmin Park. sed used: s@\.reg_src\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_src\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g s@\.reg_div\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_div\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g Signed-off-by: Ben Dooks commit b3bf41be06634d69959a68a2b53e1ffc92f0d103 Author: Ben Dooks Date: Tue Dec 1 01:24:37 2009 +0000 ARM: SAMSUNG: Reduce size of struct clk. Reduce the size of struct clk by 12 bytes and make defining clocks with common implementation functions easier by moving the set_rate, get_rate, round_rate and set_parent calls into a new structure called 'struct clk_ops' and using that instead. This change does make a few clocks larger as they need their own clk_ops, but this is outweighed by the number of clocks with either no ops or having a common set of ops. Update all the users of this. Signed-off-by: Ben Dooks commit 13bbd88504bfa0d205fa4121322869d8d7e083d0 Author: Harald Welte Date: Tue Dec 1 01:24:36 2009 +0000 ARM: S3C64XX: Remove unused clock definitions from clock header Clean out the definitions we are no longer using after the new clock code updates. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from initial patch provided] Signed-off-by: Ben Dooks commit 399cae747426a6acdba8e347edef241a05a08b09 Author: Ben Dooks Date: Tue Dec 1 01:24:35 2009 +0000 ARM: S3C64XX: Use new clock-clksrc.c code for clocks. Move the s3c6400-clock.c implementation over to use the new common plat-samsung based clock-clksrc.c. Note, this does not delete the clocks definitions that are now unused in the regs-clock.h to reduce the quantity of change in this commit. Based on original patches by Harald Welte. Signed-off-by: Ben Dooks commit aa9ad6ad9c16e1daff41792c485f46e601a5af33 Author: Harald Welte Date: Tue Dec 1 01:24:34 2009 +0000 ARM: SAMSUNG: Add core clock implementation for clksrc based clocks Add a core for the clksrc clock implementation, which is found in many of the newer Samsung SoCs into plat-samsung. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from original patch to make change smaller] [ben-linux@fluff.org: split clk and clksrc changes] [ben-linux@fluff.org: moved to plat-samsung from plat-s3c] [ben-linux@fluff.org: re-wrote headers after splits] [ben-linux@fluff.org: added better documentation to headers] Signed-off-by: Ben Dooks commit 8360493c4ae4c116339cd1cf4da100c3547f23af Author: Ben Dooks Date: Mon Nov 30 01:31:32 2009 +0000 ARM: S3C64XX: Compress s3c6400-clock.c code The individually named clocks are all static to the code and thus can be compressed into a single array and then the array can be referenced. This removes the need for a seperate array of pointers to clocks. Fix a minor problem of re-initialising the pointers in s3c6400_set_clksrc() as this is also called by the cpufreq code. Move these initialisations to the code that does the registration. Based on Harald Welte's original clock changes patch. Signed-off-by: Ben Dooks commit f9c4f1e4ddf40103dcf85e23d00230ab8ece2a89 Author: Ben Dooks Date: Mon Nov 30 01:10:57 2009 +0000 ARM: S3C64XX: Cleanup common init code in s3c6400-clock.c Remove the four fields from clksrc_clk.clk which are always the same and init them when the clock is registered. This helps remove the amount of repeated code. This is a re-work of Harald Welte's clock changes for the latest kernel. Signed-off-by: Ben Dooks commit 70792bcfad5f4817fc067b7fdb0541d8b13b5502 Author: Ben Dooks Date: Mon Nov 30 00:40:47 2009 +0000 ARM: SAMSUNG: Move to plat-samsung Move the header to plat-samsung where it can be used by all the platforms, and readies it for the next round of clock updates where the clock code will be amalgamated. Signed-off-by: Ben Dooks commit 6f832e8aab8c4c6d28629e970e4a85e74a8d0be6 Author: Paul Mundt Date: Fri Jan 15 16:31:04 2010 +0900 sh: mach-sdk7786: mode pins support. This wires up the mode pins support on the SDK7786. The pins are standard SH7786 pins, and all are fixed in software. Needed for the clock framework, PCIe, and so forth. Signed-off-by: Paul Mundt commit f0cb77372c3cf8c0cb17bbfb30a62506ea119286 Author: Paul Mundt Date: Fri Jan 15 15:13:48 2010 +0900 sh: Fix up the secondary CPU entry point for 32bit mode. Presently the secondary CPU entry point is only aimed at 29bit phys mode, causing it to point to a stray virtual address in 32bit mode. Fix it up after consulting with our shiny new __in_29bit_mode(). Signed-off-by: Paul Mundt commit a6198a238baceae9d4e0ce3915f6d239c89b5c08 Author: Paul Mundt Date: Fri Jan 15 14:21:37 2010 +0900 sh: Guard against early IPIs in flush_cache_all(). flush_cache_all() gets called in to when we do some early ioremapping. Unfortunately on SDK7786 the interrupt controller itself requires ioremapping, leading to a bit of a chicken and egg scenario. For now, don't bother with IPI crosscalls if there aren't any other CPUs online. Signed-off-by: Paul Mundt commit a09d2831b3457a92a58d67bddfed370516acfe28 Author: Paul Mundt Date: Fri Jan 15 12:24:34 2010 +0900 sh: heartbeat: Update boards for access size hinting. This updates the existing boards that specify the register width through platform data to use the resource flags instead. This eliminates platform data completely in most cases, and permits further improvement in the heartbeat driver as well as shrinking the overall private data size. Signed-off-by: Paul Mundt commit 2267c7875b3a3a41b7a8cc9659d75ec934c98ffd Author: Paul Mundt Date: Fri Jan 15 12:11:30 2010 +0900 sh: mach-sdk7786: heartbeat support. Hand off the user LEDs to the heartbeat driver. Signed-off-by: Paul Mundt commit 10ab92d8c336c25af1fce46113ed85856e02e95d Author: Paul Mundt Date: Fri Jan 15 12:08:31 2010 +0900 sh: heartbeat: Support access size specification via resource flags. This permits the resource access size to be handed off through the resource flags, which saves platforms from having to establish platform data only to specify the register width. Signed-off-by: Paul Mundt commit b6b1ac69372da996f40863358df41ca77075b249 Author: Larry Finger Date: Thu Jan 14 13:13:47 2010 -0600 Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr to include/linux/ieee80211.h. This definition collides with one that is in the r8187se driver in staging. The conflict is resolved by changing r8187se to use the definition from include/linuc/ieee80211.h. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit a0f2e0fca1e72c1de07e834be05b61d33842253e Author: Luis R. Rodriguez Date: Thu Jan 14 13:27:46 2010 -0500 cfg80211: Ingore country IEs with a zero set of number of channels Previous to this and the last patch, titled, "cfg80211: Fix 2 GHz subband calculation for country IEs" we would end up treating these IEs as single channel units. These are in fact just bogus IE triplets so ignore the entire IE if these are found. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c99445b14054e0c4ed4715df1dad1fc608cbab46 Author: Kalle Valo Date: Thu Jan 14 13:09:21 2010 +0200 mac80211: improve powersave documentation There has been some confusion how drivers should implement powersave support. Improve the documentation a bit to make it more clear what drivers need to do. Also mention about U-APSD. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 9d173fc5dfa8c1b4578b331ac7ff3ce8af27006e Author: Kalle Valo Date: Thu Jan 14 13:09:14 2010 +0200 mac80211: fix mac80211.h documentation warnings There were some warnings about missing documentation and a missing reference. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 5e4ea1f0ed256382d6d839fbd7a5c7f1b99b6cb0 Author: Sujith Date: Thu Jan 14 10:20:57 2010 +0530 ath9k: Fix panic on driver load The device has to be marked as invalid before registering the ISR. HW initialization takes place after the ISR has been registered, and the invalid flag is eventually cleared in the ->stop() callback. Reported-by: Pavel Roskin Signed-off-by: Sujith Signed-off-by: John W. Linville commit 2f1f00fc9b477481ad5c63976385c345851fee3d Author: Christoph Egger Date: Wed Jan 13 14:36:24 2010 +0100 Remove config option B43_LEGACY_RFKILL completely In f41f3f373dd72344c65d801d6381fe83ef3a2c54 the B43 driver was ported to use the cfg80211 API for rfkill and consequently the config option was dropped (RFKILL is now unconditionally enabled). However in the Kernel Info the feature is still checked and reported missing. This patch just removes the conditional and the relevant code blocks while still reporting that feature unconditionally would be another option (it's always there). Signed-off-by: Christoph Egger Signed-off-by: John W. Linville commit ececeecee8c60be96368bcc416057f38822012df Author: Luis R. Rodriguez Date: Tue Jan 12 18:23:04 2010 -0500 wl1271: remove unused flags These are unused and as with a previous patch 5ef5da for wl1251 this removes some other unused flags. the IRQ_MASK specifically conflicts with include/pcmcia/cs.h when using compat-wireless. Cc: Kalle Valo Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c2f4f527edab37f2f2130bd7813cd41db907ab6b Author: Tim Gardner Date: Tue Jan 12 12:58:17 2010 -0600 b43legacy: Declare all possible ucodeX.fw files Enhance module information with the names of the firmware files that could be used by this driver. This helps tools like Jockey to correctly detect and/or install the firmware files relevant to this driver. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit e99c7cd57b2481ee36b2338040e3ce1cd17e0763 Author: Luis R. Rodriguez Date: Thu Jan 7 17:24:55 2010 -0500 cfg80211: fix 2 GHz subband calculation for country IEs Country IEs triplets are getting an extra channel with the current count. This does not affect regulatory because we always took the intersection between what the AP gave and what CRDA believed is correct. This however does fix processing some Country IEs with multiple sequential 2 GHz triplets. Since our parser and the spec mandates all channels be monitonically increasing we would drop the IE after noticing the second triplet begins on a channel already processed. APs that send these type of country IEs seems rare though. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 6021e08db47386507108a475e6c820a7006a4632 Author: Tim Gardner Date: Thu Jan 7 11:10:38 2010 -0700 b43: Declare at least one real firmware file using MODULE_FIRMWARE. BugLink: http://bugs.launchpad.net/bugs/488636 Enhances module information with the names of the firmware files that could be used by this driver. This helps tools like Jockey to correctly detect and/or install the firmware files relevant to this driver. Signed-off-by: Tim Gardner Signed-off-by: John W. Linville commit 46c4e5daea3d5df06e27bf5a49a0c42274db6725 Author: Matt Fleming Date: Fri Jan 15 08:00:45 2010 +0900 sh: Fix CONFIG_PMB=n build. The last commit introduced the following breakage arch/sh/include/asm/mmu.h: In function 'pmb_remap': arch/sh/include/asm/mmu.h:79: error: expected ';' before '}' token and... arch/sh/include/asm/mmu.h:78: error: 'EINVAL' undeclared (first use in this function) arch/sh/include/asm/mmu.h:78: error: (Each undeclared identifier is reported only once arch/sh/include/asm/mmu.h:78: error: for each function it appears in.) arch/sh/include/asm/mmu.h: In function 'pmb_init': arch/sh/include/asm/mmu.h:87: error: 'ENODEV' undeclared (first use in this function) Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 79b6a5110abf6fd4454ba34e0960783a4a2c801a Author: John W. Linville Date: Thu Jan 14 17:00:54 2010 -0500 Revert "iwmc3200wifi: fix array out-of-boundary access" This reverts commit 6c853da3f30c93eae847ecbcd9fdf10ba0da04c2. From Message-ID: <1262663293.551.117.camel@debian> On Sat, 2010-01-02 at 22:09 +0800, Dan Carpenter wrote: > It don't think 6c853da3f30c93 is right. That's the patch > titled "iwmc3200wifi: fix array out-of-boundary access" > > Allocate priv->rx_packets[IWM_RX_ID_HASH + 1] because the max array > index is IWM_RX_ID_HASH according to IWM_RX_ID_GET_HASH(). > > In 2.6.33-rc2 IWM_RX_ID_GET_HASH() doesn't go as high as IWM_RX_ID_HASH > and I don't see any array out-of-bounds. > > #define IWM_RX_ID_GET_HASH(id) ((id) % IWM_RX_ID_HASH) Ah, you are right. I took '%' for '&'. John, would you revert it? Sorry for the false alarm. Thanks, -yi Reported-by: Dan Carpenter Reviewed-by: Zhu Yi Signed-off-by: John W. Linville commit 8d9525048c74786205b99f3fcd05a839721edfb7 Author: James Morris Date: Thu Jan 14 09:33:28 2010 +1100 security: correct error returns for get/set security with private inodes Currently, the getsecurity and setsecurity operations return zero for kernel private inodes, where xattrs are not available directly to userspace. This confuses some applications, and does not conform to the man page for getxattr(2) etc., which state that these syscalls should return ENOTSUP if xattrs are not supported or disabled. Note that in the listsecurity case, we still need to return zero as we don't know which other xattr handlers may be active. For discussion of userland confusion, see: http://www.mail-archive.com/bug-coreutils@gnu.org/msg17988.html This patch corrects the error returns so that ENOTSUP is reported to userspace as required. Signed-off-by: James Morris Acked-by: Stephen Smalley Acked-by: Serge Hallyn commit 7740a42f816790583bd8a9079337772d511af3a3 Author: Sage Weil Date: Fri Jan 8 15:58:25 2010 -0800 ceph: display pgid in debugfs osd request dump Signed-off-by: Sage Weil commit 103e2d3ae57d38d18aaac1b327266c1407499ac1 Author: Sage Weil Date: Thu Jan 7 16:12:36 2010 -0800 ceph: remove unused erank field The ceph_entity_addr erank field is obsolete; remove it. Get rid of trivial addr comparison helpers while we're at it. Signed-off-by: Sage Weil commit 4baa75ef0ed29adae03fcbbaa9aca1511a5a8cc9 Author: Yehuda Sadeh Date: Thu Jan 7 15:36:32 2010 -0800 ceph: change dentry offset and position after splice_dentry This fixes a bug, where we had the parent list have dentries with offsets that are not monotonically increasing, which caused the ceph dcache_readdir to skip entries. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 8b8aae4009349397fffe7bd38a8fa200c9a5bcad Author: Ricardo Labiaga Date: Fri Dec 11 19:10:48 2009 -0800 nfsd41: Create the recovery entry for the NFSv4.1 client Signed-off-by: Ricardo Labiaga Signed-off-by: J. Bruce Fields commit 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 Author: Ben Hutchings Date: Wed Jan 13 23:41:50 2010 +0000 uwb: declare MODULE_FIRMWARE() in i1480 DFU driver Signed-off-by: Ben Hutchings Signed-off-by: David Vrabel commit 34446d05dd255b34518c76d2b8760161e63fe0c1 Author: Márton Németh Date: Tue Jan 12 08:49:14 2010 +0100 uwb: make USB device id table constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. Signed-off-by: Márton Németh Signed-off-by: David Vrabel commit 02bf6cc72cc2a6258411ddf1649f33a65fc9a06e Author: Paul Mundt Date: Thu Jan 14 20:58:58 2010 +0900 sh: Preliminary SDK7786 board support. This stubs in some preliminary board support for the RTE SDK7786. This is quite stunted at the moment, and primarily builds on top of the system FPGA. FPGA IRQs are handled via CPU IRL masking for simplicity, with initial peripheral support restricted to the debug ethernet. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 9a58a80a701bdb2d220cdab4914218df5b48d781 Author: Alexey Dobriyan Date: Thu Jan 14 03:10:54 2010 -0800 proc_fops: convert drivers/isdn/ to seq_file Convert code away from ->read_proc/->write_proc interfaces. Switch to proc_create()/proc_create_data() which make addition of proc entries reliable wrt NULL ->proc_fops, NULL ->data and so on. Problem with ->read_proc et al is described here commit 786d7e1612f0b0adb6046f19b906609e4fe8b1ba "Fix rmmod/read/write races in /proc entries" [akpm@linux-foundation.org: CONFIG_PROC_FS=n build fix] Signed-off-by: Alexey Dobriyan Signed-off-by: Tilman Schmidt Signed-off-by: Karsten Keil Signed-off-by: David S. Miller commit 738ada47cf60830d37bb70ffb0b0281d19fc4c7f Author: Thomas Weber Date: Tue Jan 12 17:07:18 2010 +0100 ASoC: TWL4030: Fix typo in comment in header file Signed-off-by: Thomas Weber Acked-by: Peter Ujfalusi Signed-off-by: Mark Brown commit b97235dfa1aba54786b19fc53ba026e47be86ac6 Author: Baruch Siach Date: Thu Jan 14 11:24:15 2010 +0200 mx25pdk: add NAND device support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 27f590258954ea0d22b43e33dd356bc76a8dfe7a Author: Baruch Siach Date: Thu Jan 14 11:24:14 2010 +0200 mx25: add NAND support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit b6d0c1bda9038354ff2f0c77da23fd32e0f11a1f Author: Baruch Siach Date: Thu Jan 14 11:24:13 2010 +0200 mtd: mxc_nand: add MX25 to Kconfig Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e Merge: becc670 a8dfb64 Author: Sascha Hauer Date: Thu Jan 14 10:58:10 2010 +0100 Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 408bffd01cfcda2907b07fb86b3666e3db86fd82 Author: Takashi Iwai Date: Thu Jan 14 09:19:46 2010 +0100 ALSA: ctxfi - Add subsystem option Added a new option "subsystem" to override the PCI SSID for identifying the card type. Signed-off-by: Takashi Iwai commit d1458279bf9c575a52fd22818ca19c463f380aba Author: Takashi Iwai Date: Thu Jan 14 09:16:52 2010 +0100 ALSA: Add snd_pci_quirk_lookup_id() Added a new function to look up a quirk entry with the given PCI SSID instead of a pci device pointer. This can be used when the searched ID is overridden for debugging or such a purpose. Signed-off-by: Takashi Iwai commit bafaecd11df15ad5b1e598adc7736afcd38ee13d Author: Linus Torvalds Date: Tue Jan 12 18:16:42 2010 -0800 x86-64: support native xadd rwsem implementation This one is much faster than the spinlock based fallback rwsem code, with certain artifical benchmarks having shown 300%+ improvement on threaded page faults etc. Again, note the 32767-thread limit here. So this really does need that whole "make rwsem_count_t be 64-bit and fix the BIAS values to match" extension on top of it, but that is conceptually a totally independent issue. NOT TESTED! The original patch that this all was based on were tested by KAMEZAWA Hiroyuki, but maybe I screwed up something when I created the cleaned-up series, so caveat emptor.. Also note that it _may_ be a good idea to mark some more registers clobbered on x86-64 in the inline asms instead of saving/restoring them. They are inline functions, but they are only used in places where there are not a lot of live registers _anyway_, so doing for example the clobbers of %r8-%r11 in the asm wouldn't make the fast-path code any worse, and would make the slow-path code smaller. (Not that the slow-path really matters to that degree. Saving a few unnecessary registers is the _least_ of our problems when we hit the slow path. The instruction/cycle counting really only matters in the fast path). Signed-off-by: Linus Torvalds LKML-Reference: Signed-off-by: H. Peter Anvin commit 5d0b7235d83eefdafda300656e97d368afcafc9a Author: Linus Torvalds Date: Tue Jan 12 17:57:35 2010 -0800 x86: clean up rwsem type system The fast version of the rwsems (the code that uses xadd) has traditionally only worked on x86-32, and as a result it mixes different kinds of types wildly - they just all happen to be 32-bit. We have "long", we have "__s32", and we have "int". To make it work on x86-64, the types suddenly matter a lot more. It can be either a 32-bit or 64-bit signed type, and both work (with the caveat that a 32-bit counter will only have 15 bits of effective write counters, so it's limited to 32767 users). But whatever type you choose, it needs to be used consistently. This makes a new 'rwsem_counter_t', that is a 32-bit signed type. For a 64-bit type, you'd need to also update the BIAS values. Signed-off-by: Linus Torvalds LKML-Reference: Signed-off-by: H. Peter Anvin commit 508e14b4a4fb1a824a14f2c5b8d7df67b313f8e4 Author: Daniel Borkmann Date: Tue Jan 12 14:27:30 2010 +0000 netpoll: allow execution of multiple rx_hooks per interface Signed-off-by: Daniel Borkmann Signed-off-by: David S. Miller commit e1d5a010729a7a495a8a8de85727f3f0d62f06a0 Author: Samir Bellabes Date: Thu Jan 7 22:10:56 2010 +0000 genetlink: optimize ctrl_dumpfamily() there is a unnecessary test which can be replaced by a good initialization in the 'for' statement Noticed by Serge E. Hallyn Signed-off-by: Samir Bellabes Signed-off-by: David S. Miller commit 37fce430dd66a6251bde6ef0004a1da69b26c028 Author: Joe Perches Date: Tue Jan 12 20:59:13 2010 +0000 drivers/net/tlan: Remove TRUE/FALSE defines, use bool Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a60389abaab92213c79790e074ff6bc36ac0ebe5 Author: Einar Lueck Date: Mon Jan 11 02:50:52 2010 +0000 qeth: default BLKT values for new OSA/3 hardware Set default BLKT values for new OSA/3 hardware. Signed-off-by: Einar Lueck Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 84b66683dba002f4cce2aaf78bf45debfaf22795 Author: Ursula Braun Date: Mon Jan 11 02:50:51 2010 +0000 qeth: avoid recovery during device online setting If a qeth device is set online, several initialisation steps are performed. If a failure in one of these steps occurs, the qeth device is reset into DOWN state. If due to the failure a qeth recovery is scheduled and started in another thread, this might cause all kinds of conflicts, even a kernel panic. The patch forbids scheduling of a qeth recovery while online processing is performed till the card is in state SOFTSETUP. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 76b11f8e270f04851774ff64b16e29e5a43d3a1a Author: Ursula Braun Date: Mon Jan 11 02:50:50 2010 +0000 qeth: HiperSockets Network Traffic Analyzer New feature to trace HiperSockets network traffic for debugging purposes. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit ab8932f3e8e07df92d6ce3fa41f5af0dda865429 Author: Bruce Allan Date: Wed Jan 13 02:05:38 2010 +0000 e1000e: genericize the update multicast address list Make updating the multicast address list generic for all families and enforce the requirement to update the entire multicast table array all at once instead of piecemeal which causes problems on some parts. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23 Author: Bruce Allan Date: Wed Jan 13 02:05:18 2010 +0000 e1000e: provide MAC-family-specific function to set LAN ID Provide MAC-specific function pointer to determine the LAN ID (PCI func). The LAN ID is used internally by the driver to determine which h/w lock to use to protect accessing the PHY on ESB2 as well as help to determine the alternate MAC address on some parts. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 608f8a0d014db6cd18d4f535934d4b5d556e3013 Author: Bruce Allan Date: Wed Jan 13 02:04:58 2010 +0000 e1000e: use alternate MAC address on ESB2 if available Similar to 82571/2/3 parts that already do this, if ESB2/80003es2lan parts have an alternate MAC address provided in the EEPROM use it instead of the default MAC address. This patch makes the the actual code that does this generic so that it can be better used by both MAC families. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0159f24ee764927bf44c1a25473bd4517febd21c Author: Joe Perches Date: Wed Jan 13 20:23:30 2010 -0800 lib/vsprintf.c: Add IPV4 options %pI4[hnbl] for host, network, big and little endian This should allow the removal of the #defines and uses of NIPQUAD and NIPQUAD_FMT Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 3bef444797f7624f8fbd27f4e0334ce96a108725 Author: Brian Gerst Date: Wed Jan 13 10:45:55 2010 -0500 x86: Merge show_regs() Using kernel_stack_pointer() allows 32-bit and 64-bit versions to be merged. This is more correct for 64-bit, since the old %rsp is always saved on the stack. Signed-off-by: Brian Gerst LKML-Reference: <1263397555-27695-1-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 66aeb6d5cb701aedd508187e08612bfd1e108e2e Author: Kirill Smelkov Date: Wed Jan 13 13:22:19 2010 -0200 perf top: Fix code typo in prompt_symbol() sym_filter is what was (if ever) passed with -s option. What was typed by user, and what we were looking for, is in buf. Signed-off-by: Kirill Smelkov Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1263396139-4798-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 0895cf0a823e03ea6d79736611e90186006c805e Author: Kirill Smelkov Date: Wed Jan 13 13:22:18 2010 -0200 perf: Fix few typos + cosmetics Signed-off-by: Kirill Smelkov Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1263396139-4798-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b7cece76783c68fb391f9882235b4b0c9c300c46 Author: Arnaldo Carvalho de Melo Date: Wed Jan 13 13:22:17 2010 -0200 perf tools: Encode kernel module mappings in perf.data We were always looking at the running machine /proc/modules, even when processing a perf.data file, which only makes sense when we're doing 'perf record' and 'perf report' on the same machine, and in close sucession, or if we don't use modules at all, right Peter? ;-) Now, at 'perf record' time we read /proc/modules, find the long path for modules, and put them as PERF_MMAP events, just like we did to encode the reloc reference symbol for vmlinux. Talking about that now it is encoded in .pgoff, so that we can use .{start,len} to store the address boundaries for the kernel so that when we reconstruct the kmaps tree we can do lookups right away, without having to fixup the end of the kernel maps like we did in the past (and now only in perf record). One more step in the 'perf archive' direction when we'll finally be able to collect data in one machine and analyse in another. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1263396139-4798-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit fb4635932a4e19c2f55383f968a0e9b64da37354 Author: Dave Jones Date: Thu Jan 7 15:26:22 2010 -0500 [CPUFREQ] Fix cast warning in pcc driver. arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c:458: warning: cast from pointer to integer of different size Signed-off-by: Dave Jones commit 0f1d683fb35d6c6f49ef696c95757f3970682a0e Author: Naga Chumbalkar Date: Thu Dec 17 20:18:27 2009 +0000 [CPUFREQ] Processor Clocking Control interface driver Processor Clocking Control (PCC) is an interface between the BIOS and OSPM. Based on the server workload, OSPM can request what frequency it expects from a logical CPU, and the BIOS will achieve that frequency transparently. This patch introduces driver support for PCC. OSPM uses the PCC driver to communicate with the BIOS via the PCC interface. There is a Documentation file that provides a link to the PCC Specification, and also provides a summary of the PCC interface. Currently, certain HP ProLiant platforms implement the PCC interface. However, any platform whose BIOS implements the PCC Specification, can utilize this driver. V2 --> V1 changes (based on Dominik's suggestions): - Removed the dependency on CPU_FREQ_TABLE - "cpufreq_stats" will no longer PANIC. Actually, it will not load anymore because it is not applicable. - Removed the sanity check for target frequency in the ->target routine. NOTE: A patch to sanitize the target frequency requested by "ondemand" is needed to ensure that the target freq < policy->min. Can this driver be queued up for the 2.6.33 tree? Signed-off-by: Naga Chumbalkar Signed-off-by: Matthew Garrett Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 9592a5c01e79dbc59eb56fa26b124e94ffcd0962 Author: Alexey Dobriyan Date: Wed Jan 13 16:04:18 2010 +0100 netfilter: ctnetlink: netns support Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit cd8c20b650f49354722b8cc1f03320b004815a0a Author: Alexey Dobriyan Date: Wed Jan 13 16:02:14 2010 +0100 netfilter: nfnetlink: netns support Make nfnl socket per-petns. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 6a68f89ee1f2d177af4a5410fa7a45734c975fd6 Author: Christoph Hellwig Date: Fri Dec 25 17:45:13 2009 +0100 nfsd: use vfs_fsync for non-directories Instead of opencoding the fsync calling sequence use vfs_fsync. This also gets rid of the useless i_mutex over the data writeout. Consolidate the remaining special code for syncing directories and document it's quirks. Signed-off-by: Christoph Hellwig Signed-off-by: J. Bruce Fields commit de3cab793c6a5c8505d66bee111edcc7098380ba Author: Ricardo Labiaga Date: Fri Dec 11 20:03:27 2009 -0800 nfsd4: Use FIRST_NFS4_OP in nfsd4_decode_compound() Since we're checking for LAST_NFS4_OP, use FIRST_NFS4_OP to be consistent. Signed-off-by: Ricardo Labiaga Signed-off-by: J. Bruce Fields commit c551866e649bac66a5145d100f34086d6edb581e Author: Ricardo Labiaga Date: Fri Dec 11 19:10:49 2009 -0800 nfsd41: nfsd4_decode_compound() does not recognize all ops The server incorrectly assumes that the operations in the array start with value 0. The first operation (OP_ACCESS) has a value of 3, causing the check in nfsd4_decode_compound to be off. Instead of comparing that the operation number is less than the number of elements in the array, the server should verify that it is less than the maximum valid operation number defined by LAST_NFS4_OP. Signed-off-by: Ricardo Labiaga Signed-off-by: J. Bruce Fields commit 617b14c50eb95b36360b2b3232c6cf20b910e2f8 Author: Daniel Mack Date: Wed Jan 13 11:25:05 2010 +0100 ASoC: ak4104: allow more sample rates The transmitter supports all sample rates up to 192KHz, so the driver should not give a limit. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit fd63df2264f2518fa67dca596d493a330537494d Author: Peter Ujfalusi Date: Wed Jan 13 12:37:49 2010 +0200 ASoC: TWL4030: Replace comma with semicolon in probe function The codec structure initialization statements should be separated by semicolons. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 4bb9508bbbb06f10bc3e249dd34375b4a4d6bfc0 Author: Jiri Kosina Date: Wed Dec 23 14:13:46 2009 +0100 HID: remove TENX iBuddy from blacklist There were multiple reports which indicate that vendor messed up horribly and the same VID/PID combination is used for completely different devices, some of them requiring the blacklist entry and other not. Remove the blacklist entry for this combination of VID/PID completely, and let the user decide and unbind the driver via sysfs eventually, if needed. Proper fix would be fixing the vendor. References: http://lkml.org/lkml/2009/2/10/434 http://bugzilla.kernel.org/show_bug.cgi?id=13411 Signed-off-by: Jiri Kosina commit e44d6c4010a4c84369013932eea4721d16cbc08d Author: Paul Mundt Date: Wed Jan 13 19:18:39 2010 +0900 sh: Rename split-level pgtable headers. These were originally named _nopmd and _pmd to follow their asm-generic counterparts, but we rename them to -2level and -3level for general consistency. Signed-off-by: Paul Mundt commit 599faa0e264fe2e7f563f87b4aad8c83e9dc46d1 Author: Mark Brown Date: Tue Jan 5 13:29:58 2010 +0000 genirq: Fix documentation of default chip disable() The documentation says that by default disable() will be chip->mask but in fact default_disable() is a noop. Signed-off-by: Mark Brown LKML-Reference: <1262698198-30392-1-git-send-email-broonie@opensource.wolfsonmicro.com> Signed-off-by: Ingo Molnar commit 782bb5a532f883540bf403afb19f735a4eefd95b Author: Paul Mundt Date: Wed Jan 13 19:11:14 2010 +0900 sh: default to extended TLB support. All SH-X2 and SH-X3 parts support an extended TLB mode, which has been left as experimental since support was originally merged. Now that it's had some time to stabilize and get some exposure to various platforms, we can drop it as an option and default enable it across the board. This is also good future proofing for newer parts that will drop support for the legacy TLB mode completely. This will also force 3-level page tables for all newer parts, which is necessary both for the varying page sizes and larger memories. Signed-off-by: Paul Mundt commit ff314d3903c2843de65c2148f66f277f2440ed26 Author: Wenji Huang Date: Wed Jan 13 17:01:38 2010 +0800 perf: Make cmd_to_page() function more compact Remove branch for is_perf_command. Signed-off-by: Wenji Huang Cc: fweisbec@gmail.com Cc: jkacur@redhat.com Cc: acme@redhat.com LKML-Reference: <1263373298-13282-1-git-send-email-wenji.huang@oracle.com> Signed-off-by: Ingo Molnar commit 9ca94d7c016130f9ed77f142424ace9c19742809 Author: John Kacur Date: Mon Jan 11 21:21:06 2010 +0100 plist: Fix grammar mistake, and c-style mistake Signed-off-by: John Kacur Acked-by: Peter Zijlstra LKML-Reference: <1263241267-25204-2-git-send-email-jkacur@redhat.com> Signed-off-by: Ingo Molnar commit 206582c3161f165f5bf49ececa962c5f95fdf0a3 Author: Paul Mundt Date: Wed Jan 13 18:45:12 2010 +0900 sh: Make all PxSEGADDR() calls fatal for non-legacy configs. This stubs out all of the PxSEGADDR() wrappers for non-legacy code. 29-bit will continue to work with these, while 32-bit code will now blow up on compile rather than at runtime. The vast majority of the in-tree offenders are gone, with the only remaining culprits being unable to support 32-bit mode. Hopefully this will prevent anyone from ever using these again. Signed-off-by: Paul Mundt commit 8381f65d097dad90416808314737dd7d3ae38ea9 Author: Jamie Iles Date: Fri Jan 8 15:27:33 2010 +0000 sched/perf: Make sure irqs are disabled for perf_event_task_sched_in() perf_event_task_sched_in() expects interrupts to be disabled, but on architectures with __ARCH_WANT_INTERRUPTS_ON_CTXSW defined, this isn't true. If this is defined, disable irqs around the call in finish_task_switch(). Signed-off-by: Jamie Iles Acked-by: Peter Zijlstra Cc: Russell King - ARM Linux LKML-Reference: <1262964453-27370-1-git-send-email-jamie.iles@picochip.com> Signed-off-by: Ingo Molnar commit 88f73d22853cb080432e91d68759323477a8b835 Author: Paul Mundt Date: Wed Jan 13 18:37:19 2010 +0900 sh: Fix up L2 cache comment typo. Valid sizes include 256kB, not 258kB. Signed-off-by: Paul Mundt commit a0ab36689a36e583b6e736f1c99ac8c9aebdad59 Author: Paul Mundt Date: Wed Jan 13 18:31:48 2010 +0900 sh: fixed PMB mode refactoring. This introduces some much overdue chainsawing of the fixed PMB support. fixed PMB was introduced initially to work around the fact that dynamic PMB mode was relatively broken, though they were never intended to converge. The main areas where there are differences are whether the system is booted in 29-bit mode or 32-bit mode, and whether legacy mappings are to be preserved. Any system booting in true 32-bit mode will not care about legacy mappings, so these are roughly decoupled. Regardless of the entry point, PMB and 32BIT are directly related as far as the kernel is concerned, so we also switch back to having one select the other. With legacy mappings iterated through and applied in the initialization path it's now possible to finally merge the two implementations and permit dynamic remapping overtop of remaining entries regardless of whether boot mappings are crafted by hand or inherited from the boot loader. Signed-off-by: Paul Mundt commit cf5531148ff34938840d6da775c0a4ace442d573 Author: Arnaldo Carvalho de Melo Date: Thu Jan 7 19:59:40 2010 -0200 perf tools: Create typedef for common event synthesizing callback Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262901583-8074-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit a89e5abe3efcc7facc666d3985769278937f86b0 Author: Arnaldo Carvalho de Melo Date: Thu Jan 7 19:59:39 2010 -0200 perf symbols: Record the domain of DSOs in HEADER_BUILD_ID header table So that we can restore them to the right DSO list (either dsos__kernel or dsos__user). We do that just like the kernel does for the other events, encoding PERF_RECORD_MISC_{KERNEL,USER} in perf_event_header. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262901583-8074-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit fed5af61dc0d9402d26e7fb8fb9731a60a8e05ca Author: Arnaldo Carvalho de Melo Date: Thu Jan 7 19:59:38 2010 -0200 perf buildid-list: No need to process the header sections again As it is already processed by: perf_session__new perf_session__open perf_session__read This was harmless, because we use dsos__findnew, that would already find it, but is unnecessary work and removing it makes builtin-buildid-list.c even shorter. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262901583-8074-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8d9e503928638fc95317be42c416fb7907322aff Author: Alexander Beregalov Date: Thu Jan 7 19:40:47 2010 +0300 perf: Fix memory leak: counterwidth Signed-off-by: Alexander Beregalov Cc: a.p.zijlstra@chello.nl Cc: paulus@samba.org LKML-Reference: <1262882447-23776-2-git-send-email-a.beregalov@gmail.com> Signed-off-by: Ingo Molnar commit 631c9def804b2c92b5cca04fb9ff7b5df9e35094 Author: Masami Hiramatsu Date: Wed Jan 6 09:45:34 2010 -0500 perf probe: Support --line option to show probable source-code lines Add --line option to support showing probable source-code lines. perf probe --line SRC:LN[-LN|+NUM] or perf probe --line FUNC[:LN[-LN|+NUM]] This option shows source-code with line number if the line can be probed. Lines without line number (and blue color) means that the line can not be probed, because debuginfo doesn't have the information of those lines. The argument specifies the range of lines, "source.c:100-120" shows lines between 100th to l20th in source.c file. And "func:10+20" shows 20 lines from 10th line of func function. e.g. # ./perf probe --line kernel/sched.c:1080 * * called with rq->lock held and irqs disabled */ static void hrtick_start(struct rq *rq, u64 delay) { struct hrtimer *timer = &rq->hrtick_timer; 1086 ktime_t time = ktime_add_ns(timer->base->get_time(), delay); hrtimer_set_expires(timer, time); 1090 if (rq == this_rq()) { 1091 hrtimer_restart(timer); 1092 } else if (!rq->hrtick_csd_pending) { 1093 __smp_call_function_single(cpu_of(rq), &rq->hrtick_csd, 1094 rq->hrtick_csd_pending = 1; If you specifying function name, this shows function-relative line number. # ./perf probe --line schedule asmlinkage void __sched schedule(void) 1 { struct task_struct *prev, *next; unsigned long *switch_count; struct rq *rq; int cpu; need_resched: preempt_disable(); 9 cpu = smp_processor_id(); 10 rq = cpu_rq(cpu); 11 rcu_sched_qs(cpu); 12 prev = rq->curr; 13 switch_count = &prev->nivcsw; Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20100106144534.27218.77939.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 6964cd2c8efe6e048401f1fe3952a06c563c34c1 Author: Masami Hiramatsu Date: Tue Jan 5 17:47:24 2010 -0500 perf tools: Enhance glob string matching Enhance strglobmatch() for supporting character classes([CHARS], complementation and ranges are also supported) and escaped special characters (\*, \? etc). Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20100105224724.19431.56271.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit fb1d2edf7ee25a26ad0b238d0ee335a3b28b7aa3 Author: Masami Hiramatsu Date: Tue Jan 5 17:47:17 2010 -0500 perf tools: Support tracepoint glob matching Support glob wildcard when selecting tracepoint events by -e option. Without this patch, perf-tools supports 'GROUP:*:record' syntax for selecting all tracepoints under GROUP group. With this patch, user can choose tracepoints more flexibly by using partial wildcards, e.g. 'block:*bio*:record'. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20100105224717.19431.68972.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 72041334b8c75ae7e1da2f17ba2b7afee8f2abd7 Author: Masami Hiramatsu Date: Tue Jan 5 17:47:10 2010 -0500 perf probe: Show probe list in pager Show probe list in pager, because the list can be longer than a page. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20100105224710.19431.61542.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit bbaa46fac6d1c652bfa6282420d36a44bdc53b64 Author: Masami Hiramatsu Date: Tue Jan 5 17:47:03 2010 -0500 perf probe: Remove newline from die() Remove newline from die(), because it is automatically added. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20100105224703.19431.42475.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit aa5add93e92019018e905146f8c3d3f8e3c08300 Author: Masami Hiramatsu Date: Tue Jan 5 17:46:56 2010 -0500 x86/ptrace: Remove unused regs_get_argument_nth API Because of dropping function argument syntax from kprobe-tracer, we don't need this API anymore. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Roland McGrath Cc: Oleg Nesterov Cc: Mahesh Salgaonkar Cc: Benjamin Herrenschmidt Cc: Michael Neuling Cc: Steven Rostedt Cc: linuxppc-dev@ozlabs.org LKML-Reference: <20100105224656.19431.92588.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 14640106f243a3b29944d7198569090fa6546f2d Author: Masami Hiramatsu Date: Tue Jan 5 17:46:48 2010 -0500 tracing/kprobe: Drop function argument access syntax Drop function argument access syntax, because the function arguments depend on not only architecture but also compile-options and function API. And now, we have perf-probe for finding register/memory assigned to each argument. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Roland McGrath Cc: Oleg Nesterov Cc: Mahesh Salgaonkar Cc: Benjamin Herrenschmidt Cc: Michael Neuling Cc: linuxppc-dev@ozlabs.org LKML-Reference: <20100105224648.19431.52309.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit ec3a9039601af210fca4650d229621fe5a21df0b Author: Masami Hiramatsu Date: Tue Jan 5 17:46:41 2010 -0500 tracing/kprobe: Update example output in documentation Update example output in documentation according to current implementation. Signed-off-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: systemtap Cc: DLE Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <20100105224641.19431.34967.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar commit 56b03f3c4d641dbdbce2e52a2969712e85b0e030 Author: Arnaldo Carvalho de Melo Date: Tue Jan 5 16:50:31 2010 -0200 perf tools: Handle relocatable kernels DSOs don't have this problem because the kernel emits a PERF_MMAP for each new executable mapping it performs on monitored threads. To fix the kernel case we simulate the same behaviour, by having 'perf record' to synthesize a PERF_MMAP for the kernel, encoded like this: [root@doppio ~]# perf record -a -f sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.344 MB perf.data (~15038 samples) ] [root@doppio ~]# perf report -D | head -10 0xd0 [0x40]: event: 1 . . ... raw event: size 64 bytes . 0000: 01 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 ......@........ . 0010: 00 00 00 81 ff ff ff ff 00 00 00 00 00 00 00 00 ............... . 0020: 00 00 00 00 00 00 00 00 5b 6b 65 72 6e 65 6c 2e ........ [kernel . 0030: 6b 61 6c 6c 73 79 6d 73 2e 5f 74 65 78 74 5d 00 kallsyms._text] . 0xd0 [0x40]: PERF_RECORD_MMAP 0/0: [0xffffffff81000000((nil)) @ (nil)]: [kernel.kallsyms._text] I.e. we identify such event as having: .pid = 0 .filename = [kernel.kallsyms.REFNAME] .start = REFNAME addr in /proc/kallsyms at 'perf record' time and use now a hardcoded value of '.text' for REFNAME. Then, later, in 'perf report', if there are any kernel hits and thus we need to resolve kernel symbols, we search for REFNAME and if its address changed, relocation happened and we thus must change the kernel mapping routines to one that uses .pgoff as the relocation to apply. This way we use the same mechanism used for the other DSOs and don't have to do a two pass in all the kernel symbols. Reported-by: Xiao Guangrong Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: "H. Peter Anvin" Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Xiao Guangrong LKML-Reference: <1262717431-1246-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b9a63b9b56d6910a25e3d4905525aef150420a9b Author: Arnaldo Carvalho de Melo Date: Tue Jan 5 11:54:45 2010 -0200 perf report: Fix --no-call-chain option handling To avoid the funny: [root@doppio ~]# perf record -a -f sleep 2s [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.334 MB perf.data (~14572 samples) ] [root@doppio ~]# perf report --no-call-graph selected -g but no callchain data. Did you call perf record without -g? And fix the bug reported by peterz when we do indeed record with callchains and then ask for a report without: [root@doppio ~]# perf record -a -g -f sleep 2s [root@doppio ~]# perf report --no-call-graph Segmentation fault [root@doppio ~]# Reported-by: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262699685-27820-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit de1764892a61a3ed212973cc028c80dd083179dd Author: Arnaldo Carvalho de Melo Date: Mon Jan 4 16:19:29 2010 -0200 perf session: Keep pointers to the vmlinux maps So that tools such as 'perf probe' don't have to lookup '[kernel.kallsyms]' but instead access them directly after perf_session__create_kernel_maps or map_groups__create_kernel_maps. Signed-off-by: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262629169-22797-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f92cb24c78a7c853435e46a20d1bd5c894378132 Author: Arnaldo Carvalho de Melo Date: Mon Jan 4 16:19:28 2010 -0200 perf tools: Create write_padded routine out of __dsos__write_buildid_table Will be used by other options where padding is needed. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262629169-22797-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 36a3e6461a0dac8e84b8c94877365324010c151b Author: Arnaldo Carvalho de Melo Date: Mon Jan 4 16:19:27 2010 -0200 perf symbols: Export symbol_type__is_a Will be needed by the new HEADER_DSO_INFO feature that will be a HEADER_BUILD_ID superset, replacing it. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262629169-22797-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 682b335a5bccf9e5b7e74380784aa2f145d04444 Author: Arnaldo Carvalho de Melo Date: Mon Jan 4 16:19:26 2010 -0200 perf symbols: Generalise the kallsyms parsing routine Will be used to find an specific symbol by name on 'perf record' to support relocation reference symbols to support relocatable kernels. Still have to conver the perf trace tools to use it instead of their current reimplementation. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262629169-22797-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 60666c630bdb33983a894b050b588b663f38f368 Author: Liming Wang Date: Thu Dec 31 16:05:50 2009 +0800 perf tools: Fix --pid option for stat current pid option doesn't work for perf stat. Change it to what perf record --pid acts as. Signed-off-by: Liming Wang Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1262246750-2191-1-git-send-email-liming.wang@windriver.com> Signed-off-by: Ingo Molnar commit 0fb8ee48d9dfff6a0913ceb0be2068d8be203763 Author: Frederic Weisbecker Date: Thu Dec 31 05:53:03 2009 +0100 perf: Drop useless check for ignored frame The check that ignores the debug and nmi stack frames is useless now that we have a frame pointer that makes us start at the right place. We don't anymore have to deal with these. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras LKML-Reference: <1262235183-5320-2-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 61405fea92c42d072d9b8bd189689f1502a838af Merge: 9c443df 1703f2c Author: Ingo Molnar Date: Wed Jan 13 09:58:37 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: queue up dependent patch, update to -rc4 Signed-off-by: Ingo Molnar commit a5abd95cc0b35034186a9f76b0f2b83458425f47 Author: H Hartley Sweeten Date: Wed Jan 13 00:34:12 2010 -0800 Input: ep93xx_keypad - cleanup and use matrix_keypad helpers Use struct matrix_keymap_data to supply the keymap from the platform code and matrix_keypad_build_keymap() to initialize the keymap. Signed-off-by: H Hartley Sweeten Signed-off-by: Dmitry Torokhov commit 3920ab0ae729e73bbcb5b3d0358c048ff9163629 Author: Tai-hwa Liang Date: Wed Jan 13 00:22:29 2010 -0800 Input: update Sentelic protocol documentation iSigned-off-by: Tai-hwa Liang Signed-off-by: Dmitry Torokhov commit b6407e863934965cdc66cbc244d811ceeb6f4d77 Author: Paul E. McKenney Date: Mon Jan 4 16:04:02 2010 -0800 rcu: Give different levels of the rcu_node hierarchy distinct lockdep names Previously, each level of the rcu_node hierarchy had the same rather unimaginative name: "&rcu_node_class[i]". This makes lockdep diagnostics involving these lockdep classes less helpful than would be nice. This patch fixes this by giving each level of the rcu_node hierarchy a distinct name: "rcu_node_level_0", "rcu_node_level_1", and so on. This version of the patch includes improved diagnostics suggested by Josh Triplett and Peter Zijlstra. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626498421830-git-send-email-> Signed-off-by: Ingo Molnar commit cba8244a0f1c277b6b1e48ed6504fa434119e24d Author: Paul E. McKenney Date: Mon Jan 4 16:04:01 2010 -0800 rcu: Add debug check for too many rcu_read_unlock() TREE_PREEMPT_RCU maintains an rcu_read_lock_nesting counter in the task structure, which happens to be a signed int. So this patch adds a check for this counter being negative at the end of __rcu_read_unlock(). This check is under CONFIG_PROVE_LOCKING, so can be thought of as being part of lockdep. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626498423064-git-send-email-> Signed-off-by: Ingo Molnar commit f9094d8e5587cf21091a9516628147c0b55e4264 Author: Paul E. McKenney Date: Mon Jan 4 16:04:00 2010 -0800 rcu: Make MAINTAINERS file match new RCU reality Both rcutorture and RCU are supported. Also, update the files to match the new layout. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626498422334-git-send-email-> Signed-off-by: Ingo Molnar commit bf66f18e79e34c421bbd8f6511e2c556b779df2f Author: Paul E. McKenney Date: Mon Jan 4 15:09:10 2010 -0800 rcu: Add force_quiescent_state() testing to rcutorture Add force_quiescent_state() testing to rcutorture, with a separate thread that repeatedly invokes force_quiescent_state() in bursts. This can greatly increase the probability of encountering certain types of race conditions. Suggested-by: Josh Triplett Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1262646551116-git-send-email-> Signed-off-by: Ingo Molnar commit 46a1e34eda805501a8b32f26394faa435149f6d1 Author: Paul E. McKenney Date: Mon Jan 4 15:09:09 2010 -0800 rcu: Make force_quiescent_state() start grace period if needed Grace periods cannot be started while force_quiescent_state() is active. This is OK in that the affected CPUs will try again later, but it does induce needless grace-period delays. This patch causes rcu_start_gp() to record a failed attempt to start a grace period. When force_quiescent_state() prepares to return, it then starts the grace period if there was such a failed attempt. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465501854-git-send-email-> Signed-off-by: Ingo Molnar commit 45f014c52eef022873b19d6a20eb0ec9668f2b09 Author: Paul E. McKenney Date: Mon Jan 4 15:09:08 2010 -0800 rcu: Remove redundant grace-period check The rcu_process_dyntick() function checks twice for the end of the current grace period. However, it holds the current rcu_node structure's ->lock field throughout, and doesn't get to the second call to rcu_gp_in_progress() unless there is at least one CPU corresponding to this rcu_node structure that has not yet checked in for the current grace period, which would prevent the current grace period from ending. So the current grace period cannot have ended, and the second check is redundant, so remove it. Also, given that this function is used even with !CONFIG_NO_HZ, its name is quite misleading. Change from rcu_process_dyntick() to force_qs_rnp(). Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1262646550562-git-send-email-> Signed-off-by: Ingo Molnar commit ee47eb9f4da6f44af965d6d049e77ee8c8a4b822 Author: Paul E. McKenney Date: Mon Jan 4 15:09:07 2010 -0800 rcu: Remove leg of force_quiescent_state() switch statement The comparisons of rsp->gpnum nad rsp->completed in rcu_process_dyntick() and force_quiescent_state() can be replaced by the much more clear rcu_gp_in_progress() predicate function. After doing this, it becomes clear that the RCU_SAVE_COMPLETED leg of the force_quiescent_state() function's switch statement is almost completely a no-op. A small change to the RCU_SAVE_DYNTICK leg renders it a complete no-op, after which it can be removed. Doing so also eliminates the forcenow local variable from force_quiescent_state(). Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465501781-git-send-email-> Signed-off-by: Ingo Molnar commit 0f10dc826646134dce3e5751512b87d30f3903e4 Author: Paul E. McKenney Date: Mon Jan 4 15:09:06 2010 -0800 rcu: Eliminate rcu_process_dyntick() return value Because a new grace period cannot start while we are executing within the force_quiescent_state() function's switch statement, if any test within that switch statement or within any function called from that switch statement shows that the current grace period has ended, we can safely re-do that test any time before we leave the switch statement. This means that we no longer need a return value from rcu_process_dyntick(), as we can simply invoke rcu_gp_in_progress() to check whether the old grace period has finished -- there is no longer any need to worry about whether or not a new grace period has been started. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465501857-git-send-email-> Signed-off-by: Ingo Molnar commit eb1ba45f1e7f6e626fefc063b340c7cbec9bd8c7 Author: Paul E. McKenney Date: Mon Jan 4 15:09:05 2010 -0800 rcu: Eliminate second argument of rcu_process_dyntick() At this point, the second argument to all calls to rcu_process_dyntick() is a function of the same field of the structure passed in as the first argument, namely, rsp->gpnum-1. So propagate rsp->gpnum-1 to all uses of the second argument within rcu_process_dyntick() and then eliminate the second argument. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465503786-git-send-email-> Signed-off-by: Ingo Molnar commit 39c0bbfc07c6e28db7346d0e11106f2d045d3035 Author: Paul E. McKenney Date: Mon Jan 4 15:09:04 2010 -0800 rcu: Eliminate local variable lastcomp from force_quiescent_state() Because rsp->fqs_active is set to 1 across force_quiescent_state()'s switch statement, rcu_start_gp() will refrain from starting a new grace period during this time. Therefore, rsp->gpnum is constant, and can be propagated to all uses of lastcomp, eliminating this local variable. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465502985-git-send-email-> Signed-off-by: Ingo Molnar commit f3a8b5c6aa543bd87764418d63632eb65b80e2f6 Author: Paul E. McKenney Date: Mon Jan 4 15:09:03 2010 -0800 rcu: Eliminate local variable signaled from force_quiescent_state() Because the root rcu_node lock is held across entry to the switch statement in force_quiescent_state(), it is no longer necessary to snapshot rsp->signaled to a local variable. Eliminate both the snapshotting and the local variable. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1262646550602-git-send-email-> Signed-off-by: Ingo Molnar commit 07079d5357a4d53c2b13126c4a38fb40e6e04966 Author: Paul E. McKenney Date: Mon Jan 4 15:09:02 2010 -0800 rcu: Prohibit starting new grace periods while forcing quiescent states Reduce the number and variety of race conditions by prohibiting the start of a new grace period while force_quiescent_state() is active. A new fqs_active flag in the rcu_state structure is used to trace whether or not force_quiescent_state() is active, and this new flag is tested by rcu_start_gp(). If the CPU that closed out the last grace period needs another grace period, this new grace period may be delayed up to one scheduling-clock tick, but it will eventually get started. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <126264655052-git-send-email-> Signed-off-by: Ingo Molnar commit 559569acf94f538b56bd6eead80b439d6a78cdff Author: Paul E. McKenney Date: Mon Jan 4 15:09:01 2010 -0800 rcu: Adjust force_quiescent_state() locking, step 2 This patch releases rnp->lock after the end of force_quiescent_state()'s switch statement. This is a second step towards prohibiting starting grace periods while force_quiescent_state() is executing, which will reduce the number and complexity of races that force_quiescent_state() is involved in. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465501994-git-send-email-> Signed-off-by: Ingo Molnar commit f96e9232e04856c781d4f71923a46dd3f7b429fa Author: Paul E. McKenney Date: Mon Jan 4 15:09:00 2010 -0800 rcu: Adjust force_quiescent_state() locking, step 1 This causes rnp->lock to be held on entry to force_quiescent_state()'s switch statement. This is a first step towards prohibiting starting grace periods while force_quiescent_state() is executing, which will reduce the number and complexity of races that force_quiescent_state() is involved in. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12626465501455-git-send-email-> Signed-off-by: Ingo Molnar commit 2ca49b2fcf5813571663c3c4c894b78148c43690 Author: Dave Jones Date: Mon Jan 4 09:47:35 2010 -0500 x86: Macroise x86 cache descriptors Use a macro to define the cache sizes when cachesize > 1 MB. This is less typing, and less prone to introducing bugs like we saw in e02e0e1a130b9ca37c5186d38ad4b3aaf58bb149, and means we don't have to do maths when adding new non-power-of-2 updates like those seen recently. Signed-off-by: Dave Jones LKML-Reference: <20100104144735.GA18390@redhat.com> Signed-off-by: Ingo Molnar commit 7f33306ee57bce9c79825e89c457a91025aa5aad Author: Matt Fleming Date: Wed Jan 13 16:35:58 2010 +0900 sh: PVR detection for 2nd cut SH7786. The mass produced cuts use an updated PVR value, add them to the list. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 Author: Seth Heasley Date: Tue Jan 12 17:03:35 2010 -0800 ALSA: hda_intel: ALSA HD Audio patch for Intel Cougar Point DeviceIDs This patch adds the Intel Cougar Point (PCH) HD Audio Controller DeviceIDs. Signed-off-by: Seth Heasley Signed-off-by: Takashi Iwai commit 47e91348459901c30cc1bb4897e62ced21ca243a Merge: 6b98515 ed69c6a Author: Takashi Iwai Date: Wed Jan 13 08:32:53 2010 +0100 Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc commit eca50f14b88315bd31183a17c89e53534f2ed2fa Author: Paul Mundt Date: Wed Jan 13 16:28:47 2010 +0900 sh: Add a vmlinux.bin target. This makes vmlinux.bin generation an explicit make target, as opposed to just a dependency for some of the other targets. Signed-off-by: Paul Mundt commit ed69c6a8eef679f2783848ed624897a937a434ac Author: Jaroslav Kysela Date: Wed Jan 13 08:12:31 2010 +0100 ALSA: pcm_lib - fix wrong delta print for jiffies check The previous jiffies delta was 0 in all cases. Use hw_ptr variable to store and print original value. Signed-off-by: Jaroslav Kysela commit 59c33fa7791e9948ba467c2b83e307a0d087ab49 Author: Linus Torvalds Date: Tue Jan 12 16:21:09 2010 -0800 x86-32: clean up rwsem inline asm statements This makes gcc use the right register names and instruction operand sizes automatically for the rwsem inline asm statements. So instead of using "(%%eax)" to specify the memory address that is the semaphore, we use "(%1)" or similar. And instead of forcing the operation to always be 32-bit, we use "%z0", taking the size from the actual semaphore data structure itself. This doesn't actually matter on x86-32, but if we want to use the same inline asm for x86-64, we'll need to have the compiler generate the proper 64-bit names for the registers (%rax instead of %eax), and if we want to use a 64-bit counter too (in order to avoid the 15-bit limit on the write counter that limits concurrent users to 32767 threads), we'll need to be able to generate instructions with "q" accesses rather than "l". Since this header currently isn't enabled on x86-64, none of that matters, but we do want to use the xadd version of the semaphores rather than have to take spinlocks to do a rwsem. The mm->mmap_sem can be heavily contended when you have lots of threads all taking page faults, and the fallback rwsem code that uses a spinlock performs abysmally badly in that case. [ hpa: modified the patch to skip size suffixes entirely when they are redundant due to register operands. ] Signed-off-by: Linus Torvalds LKML-Reference: Signed-off-by: H. Peter Anvin commit c7b16efb7d0c7fce218b2cdafa2432c5fbf57314 Author: Paul Mundt Date: Wed Jan 13 13:29:19 2010 +0900 sh: Add support for LZO-compressed kernels. Plugs in LZO along with the others. Signed-off-by: Paul Mundt commit 644755e7867710a23e6243dcc69cfc071985f560 Merge: 6430a59 0ea820c fa94dde 066000d Author: Paul Mundt Date: Wed Jan 13 13:02:55 2010 +0900 Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates' commit 6430a5987f8bb9a7c5187b343956aa8ef404d571 Author: Matt Fleming Date: Wed Jan 13 12:59:24 2010 +0900 sh: Don't perform an icbi on a P2 address The legacy P2 area may not always be mapped (for example when using PMB). So perform an icbi on an address that we know will always be mapped. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 0ea820cf9bf58f735ed40ec67947159c4f170012 Author: Paul Mundt Date: Wed Jan 13 12:51:40 2010 +0900 sh: Move over to dynamically allocated FPU context. This follows the x86 xstate changes and implements a task_xstate slab cache that is dynamically sized to match one of hard FP/soft FP/FPU-less. This also tidies up and consolidates some of the SH-2A/SH-4 FPU fragmentation. Now fpu state restorers are commonly defined, with the init_fpu()/fpu_init() mess reworked to follow the x86 convention. The fpu_init() register initialization has been replaced by xstate setup followed by writing out to hardware via the standard restore path. As init_fpu() now performs a slab allocation a secondary lighterweight restorer is also introduced for the context switch. In the future the DSP state will be rolled in here, too. More work remains for math emulation and the SH-5 FPU, which presently uses its own special (UP-only) interfaces. Signed-off-by: Paul Mundt commit 49e4739a0cf681cbfe08c72232c1dcc130b66dde Author: Stephane Chatty Date: Wed Jan 13 00:29:16 2010 +0100 HID: add support for Acer T230H multitouch Add support for the Quanta Optical Touch dual-touch panel, present in the Acer T230H monitor, HP L2105tm, and Packard-Bell Video 200t. Signed-off-by: Stephane Chatty Tested-by: Jerome Vidal Tested-by: Cedric Berthier Acked-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 74f292ca8c7a2b9370f80d97a49e48174f4c7635 Author: Gary Stein Date: Wed Jan 13 00:25:58 2010 +0100 HID: add driver for the Logitech Flight System G940 Implements a new USB-HID for Force Feedback based on the normal Logitech Force Feedback code and FF-Memless. Currently only supports the FF_CONSTANT effect although the joystick appears to support additional non-standard ones. Signed-off-by: Gary Stein Signed-off-by: Jiri Kosina commit a5fb297d634ba20bd53a7d6fecd611bbfd342e78 Author: Lennert Buytenhek Date: Tue Jan 12 13:51:38 2010 +0100 mwl8k: update version number (to 0.12) and copyright Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit ee0ddf1865954f44ee929d963e2c968eb377f447 Author: Lennert Buytenhek Date: Tue Jan 12 13:51:30 2010 +0100 mwl8k: enable multi-BSS AP operation As follows: - GET_HW_SPEC is now responsible for setting priv->{ap,sta}_macids_supported, which are bitmasks of supported macids for AP and STA mode. (Typically, STA firmware images will support only one macid, #0, in STA mode, and AP firmware images will support macids #0-7, in AP mode.) - Our wiphy ->interfaces_modes is now set based on the non-zero-ness of these two bitmasks. - We main priv->macids_used, a bitmask of which macids are currently in use. ->add_interface() will assign the lowest free macid for this interface type as it is created, or bail out if there are no more free macids to assign. ->delete_interface() will mark the macid as being free again. This enables the multi-BSS code added in the previous commits. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit aa21d0f69a5ca28d33f584b8952cca154115fd26 Author: Lennert Buytenhek Date: Tue Jan 12 13:50:36 2010 +0100 mwl8k: post per-vif firmware commands as per-vif commands SET_BEACON, SET_MAC_ADDR, BSS_START and SET_NEW_STN are the currently supported firmware commands that are actually per-vif commands. Use mwl8k_post_pervif_cmd() for these commands, so that the macid of the vif they operate on gets passed down into the firmware. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit f57ca9c1af3c1e30a40ad99d75940176d8c3ff3a Author: Lennert Buytenhek Date: Tue Jan 12 13:50:14 2010 +0100 mwl8k: prepare for posting per-vif firmware commands One of the bytes in the mwl8k firmware command header is the 'macid' byte, which for per-vif commands indicates which of the BSSes this command is intended for. (For commands that are not per-vif commands, this byte can just be 0.) This patch adds mwl8k_post_pervif_cmd(), which will take the macid assigned to this interface (to be done in ->add_interface()), copy it into the command packet macid field, and post the command as usual. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit f5bb87cfba5ae9dd3724b846ac2fa7e033425c1c Author: Lennert Buytenhek Date: Tue Jan 12 13:49:51 2010 +0100 mwl8k: convert the priv->vif pointer to a list of vifs To prepare for adding multi-BSS support. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 06953235f48c696b22c5ed45570680fb070f7277 Author: Lennert Buytenhek Date: Tue Jan 12 13:49:41 2010 +0100 mwl8k: use firmware capability field to decide which bands to register Make the decision about whether to register the 2.4 and 5 GHz bands with mac80211 by looking at the capability field in GET_HW_SPEC (STA firmware only for now). This enables 5 GHz STA operation. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 42574ea2274ec0a2a9c58ab01be91b65e60a2291 Author: Lennert Buytenhek Date: Tue Jan 12 13:49:18 2010 +0100 mwl8k: allow selecting 5 GHz channels Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 8707d0262585423cdc053bf8db0912e53915e5e4 Author: Lennert Buytenhek Date: Tue Jan 12 13:49:15 2010 +0100 mwl8k: handle 5 GHz legacy rate bitmaps in firmware commands Whenever mac80211 gives us a legacy rate bitmap in the context of the 5 GHz band, we need to remember to shift the bitmap left by 5 positions before giving it to the firmware, as the firmware follows the bitmap bit assignment of the 2.4 GHz rate table even if we're on the 5 GHz band, and the 2.4 GHz rate table includes five non-OFDM rates at the start that are not valid in the 5 GHz band. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 854783444bab0024556c0aefdb0a860f2f1da286 Author: Lennert Buytenhek Date: Tue Jan 12 13:48:56 2010 +0100 mwl8k: properly set receive status rate index on 5 GHz receive The mwl8k firmware uses indices into the 2.4 GHz band rate table for the receive descriptor channel field even if the packet was received on a 5 GHz channel, while mac80211 expects an index into the 5 GHz band rate table when packets are received on the 5 GHz band, which presents a mismatch as the 5 GHz band rate table lacks the five non-OFDM rates that the 2.4 GHz rate table starts with. To handle this properly, we need to substract 5 from the rate index field if the packet was received on a 5 GHz channel (and was not received at an MCS rate). Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 4eae9edd38c0a9ce34e39100ccc69ff520bc1224 Author: Lennert Buytenhek Date: Tue Jan 12 13:48:32 2010 +0100 mwl8k: add 5 GHz band channels and rates Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 1349ad2f06f86f41415cf7ffa9e068fd4f89be87 Author: Lennert Buytenhek Date: Tue Jan 12 13:48:17 2010 +0100 mwl8k: move responsibility for initialising wiphy bands to GET_HW_SPEC So that we can make 2.4 GHz and 5 GHz band registration conditional on the capability bitmask returned by the firmware. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 777ad375d5960e0d2a945a34032b182eb2952d45 Author: Lennert Buytenhek Date: Tue Jan 12 13:48:04 2010 +0100 mwl8k: rename 2.4 GHz band/channels/rates related variables from FOO to FOO_24 To prepare for adding 5 GHz band/channels/rates. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit ca66527c60385dcec878ebd90749d1fdc43bc870 Author: Lennert Buytenhek Date: Tue Jan 12 13:47:53 2010 +0100 mwl8k: add another 88w8366 PCI ID 0x2a43 is a single-band (2.4GHz only) 88w8366 mini-PCIe card. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 657232b625890f202867ede0ed67ecf15827ff80 Author: Lennert Buytenhek Date: Tue Jan 12 13:47:47 2010 +0100 mwl8k: simplify sequence number assignment By storing the sequence counter in << 4 format, like other drivers do. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c97470dd253831e880c72ea5d022ed7f3aee45c3 Author: Lennert Buytenhek Date: Tue Jan 12 13:47:37 2010 +0100 mwl8k: don't call SET_AID if we're not associated Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 9189c10087a738c764046fa27651d332594cd8e6 Author: Lennert Buytenhek Date: Tue Jan 12 13:47:32 2010 +0100 mwl8k: remove (mostly) write-only variable priv->current_channel Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c92d4edecf489dbcbb2e5dd3c513790e57e2ea0e Author: Lennert Buytenhek Date: Tue Jan 12 13:47:22 2010 +0100 mwl8k: update MODULE_FIRMWARE tags Add MODULE_FIRMWARE tags for the mwl8k firmware images that don't have them yet, and move them to where the firmware image names are declared. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 4ff6ffa107ba1c6ba9a1cc75a1f304eaa79e8bf4 Author: Kalle Valo Date: Tue Jan 12 10:43:15 2010 +0200 wl1251: add U-APSD support wl1251 firmware supports U-APSD just with a simple queue configuration change so enable it. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 8f8ff91652fcf62b9fced5387956b4b269fde634 Author: Kalle Valo Date: Tue Jan 12 10:43:07 2010 +0200 wl1251: create qos null data template The qos null data template is needed for U-APSD. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 558a6669d7cb407fbb0b5aec184b5c3b9a893d30 Author: Kalle Valo Date: Tue Jan 12 10:43:00 2010 +0200 ieee80211: add struct ieee80211_hdr_qos The header can be used to create qos nullfunc frames, for example. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 0c74211d19d83729c209ddcd4dc026c2aedeb29e Author: Kalle Valo Date: Tue Jan 12 10:42:53 2010 +0200 mac80211: check uapsd state for dynamic power save To make U-APSD client mode effective, we must not wake up from dynamic power save when transmitting frames. So if dynamic power save is enabled, it needs check the queue the transmitted packet is in and decide if we need to wake up or not. In a perfect world, where all packets would have correct QoS tags, U-APSD enabled queues should not trigger wakeup from power save. But in the real world, where very few packets have correct QoS tags, this won't work. For example, if only voip class has U-APSD enabled and we send a packet in voip class, but the packets we receive are in best effort class, we would receive the packets with the legacy power save method. And that would increase latencies too much from a voip application point of view. The workaround is to enable U-APSD for all qeueus and still use dynamic ps wakeup for all other queues except voip. That way we can still save power with a voip application and not sacrifice latency. Normal traffic (in background, best effort or video class) would still trigger wakeup from dynamic power save. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 5c1b98a52c3af1044c2d3842af8bae9a89502ca9 Author: Kalle Valo Date: Tue Jan 12 10:42:46 2010 +0200 mac80211: create tx handler for dynamic ps Currently dynamic ps check is in ieee80211_xmit(), but it's cleaner to have a separate tx handler for this. Also this is a prerequisite for U-APSD client mode which needs to know the queue frame is in. Also need_dynamic_ps() function is embedded to the tx handler. No functional changes expect that the code is run in a later phase than originally. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 50ae0cf15c3da2f6a8e4558de5010923e84736b2 Author: Kalle Valo Date: Tue Jan 12 10:42:39 2010 +0200 mac80211: add debugfs interface for U-APSD queue configuration Because it's not yet decided how to configure which queues are U-APSD enabled, add a debugfs interface for testing purposes. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit ab13315af97919fae0e014748105fdc2e30afb2d Author: Kalle Valo Date: Tue Jan 12 10:42:31 2010 +0200 mac80211: add U-APSD client support Add Unscheduled Automatic Power-Save Delivery (U-APSD) client support. The idea is that the data frames from the client trigger AP to send the buffered frames with ACs which have U-APSD enabled. This decreases latency and makes it possible to save even more power. Driver needs to use IEEE80211_HW_UAPSD to enable the feature. The current implementation assumes that firmware takes care of the wakeup and hardware needing IEEE80211_HW_PS_NULLFUNC_STACK is not yet supported. Tested with wl1251 on a Nokia N900 and Cisco Aironet 1231G AP and running various test traffic with ping. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 2d46d7c121436f1dafe91b0a8d9b99e534cfa5f8 Author: Johannes Berg Date: Sun Jan 10 17:12:41 2010 +0100 mac80211: remove unused type argument The type argument to DEBUGFS_ADD() isn't used and can be removed, it's around from before the conversion to debugfs_remove_recursive(). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 678f415fdc534c0a806fce992e4c62df0eff19d2 Author: Lennert Buytenhek Date: Sun Jan 10 14:07:53 2010 +0100 mac80211: flush workqueue before calling driver ->stop() method Since commit "mwl8k: handle station database update for AP's sta entry via ->sta_notify()", mwl8k every now and then gets a command timeout when ifconfig'ing a STA interface down. This turns out to be due to mwl8k_stop() being called while the work queue item that was scheduled by mwl8k_sta_notify() to remove the STA entry for the associated AP is still queued, and the former disables interrupts so that when the latter eventually runs, a command completion interrupt is never seen. Fix this by changing ieee80211_stop_device() so that the workqueue is flushed before drv_stop() is called, instead of doing it the other way around as is done now. (As ->stop() is allowed to sleep, there isn't any reason for drivers to queue work from within it.) Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 5e124bd5e00fcf54df555b368c2dafe6886f1df2 Author: Joe Perches Date: Fri Jan 8 22:33:38 2010 -0800 net/mac80211/mlme.c: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 28f63a4bb744ea81030219aba2337fddb10b380b Author: H Hartley Sweeten Date: Fri Jan 8 16:14:10 2010 -0700 iwl-debugfs.c: remove unnecessary casts of void * void pointers do not need to be cast to other pointer types. Signed-off-by: H Hartley Sweeten Acked-by: Zhu Yi Cc: Reinette Chatre Signed-off-by: John W. Linville commit 8ce1ef4a914aef8b9b90a2a2c670494168a2cca9 Author: Wey-Yi Guy Date: Fri Jan 8 10:04:44 2010 -0800 iwlwifi: fix bug in tx byte count table When setting invalid byte count in txq byte count table, read pointer should be used instead of write pointer. Reported-by: Guo, Chaohong Signed-off-by: Wey-Yi Guy Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c15867f15f98e5ecbdbee5993db7f6f4b7100481 Author: Wey-Yi Guy Date: Fri Jan 8 10:04:43 2010 -0800 iwlwifi: remove obsoleted host command "RADAR_NOTIFICATION" host command is not used and not supported by uCode, remove it from driver code. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f0118a4575d45ce3074c830660de938bc6e17bda Author: Wey-Yi Guy Date: Fri Jan 8 10:04:42 2010 -0800 iwlwifi: ucode statistics data structure update Update data structure to match latest statistics report from uCode. Signed-off-by: Wey-Yi Guy Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f05279711b9a59ac10e0b6e5f3a7447886c72704 Author: Wey-Yi Guy Date: Fri Jan 8 10:04:41 2010 -0800 iwlwifi: add IEEE80211_AMPDU_TX_OPERATIONAL mac80211 do not check the return code now, what if mac80211 does start using the return code? IEEE80211_AMPDU_TX_OPERATIONAL is a valid action, just iwlwifi driver do not need to take any action for it; so instead of return "-EINVAL", it is a good program practice to return "-EOPNOTSUPP" to make sure mac80211 will not get wrong impression. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 90be561b119a9e5439733f09cc70bd4ce9ec8022 Author: Johannes Berg Date: Fri Jan 8 19:01:07 2010 +0100 mac80211: fix return from ieee80211_assoc_success sparse pointed out that I made a mistake converting the return value of ieee80211_assoc_success to bool, this place should return false instead of one of the enum values (which would be true). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 67e2eb27958cae758ccbc86443c360ec285acc3e Author: Lennert Buytenhek Date: Fri Jan 8 18:32:18 2010 +0100 mwl8k: move receive processing to tasklet Like how TX reclaim is done in a tasklet, move receive processing to tasklet context as well. This can have nice benefits for CPU utilisation and throughput, especially at 3-stream rates. (Use the same CLEAR_SEL trick as the TX reclaim tasklet does, to avoid having to touch the interrupt mask registers.) Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 1e9f9de3b17db3aa358f39d6932662324178350d Author: Lennert Buytenhek Date: Fri Jan 8 18:32:01 2010 +0100 mwl8k: keep TX_DONE interrupt masked while transmit reclaim is running By making use of the CLEAR_SEL feature of the mwl8k host interface interrupt controller, we can keep the TX_DONE interrupt source masked while the transmit reclaim tasklet is running (NAPI style) without having to touch the interrupt controller's interrupt mask register when entering or exiting polling mode, and without having to do any more register reads/writes than we do now. When CLEAR_SEL is enabled on the TX_DONE interrupt source, reading the interrupt status register will clear the TX_DONE status bit if it was set, allowing it to be set again if a new TX_DONE event arrives while we are running the TX reclaim tasklet, but such a new event will then not trigger another PCI interrupt until a zero is written to the TX_DONE interrupt status register bit. I.e., if we write a zero to the TX_DONE interrupt source bit in the interrupt status register when the TX reclaim tasklet thinks it's done, a PCI interrupt will be triggered if a new TX_DONE event arrived from the hardware between us deciding that there is no more work to do and re-enabling the TX_DONE interrupt source, thereby avoiding the classic NAPI poll mode exit race that would otherwise occur. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit efb7c49a68cf206f35793d7799608e1d69a209f9 Author: Lennert Buytenhek Date: Fri Jan 8 18:31:47 2010 +0100 mwl8k: allow limiting the amount of transmit reclaim done Add a limit argument to mwl8k_txq_reclaim(), to allow limiting the number of packets that it will reclaim, and make it return the number of packets that it reclaimed. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit b64fe619e371fc17d8d686d6d44aef1b41317880 Author: Lennert Buytenhek Date: Fri Jan 8 18:31:39 2010 +0100 mwl8k: basic AP interface support Add support for creating AP interfaces, and enabling beaconing. This allows running a basic AP (11b/g mode only for now). Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit a9e00b151ec2121b7ae09d84a2b5a68b6461e98a Author: Lennert Buytenhek Date: Fri Jan 8 18:31:30 2010 +0100 mwl8k: correctly set the mac_type field for AP SET_MAC_ADDR Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 3f5610ff560aeaccf051a6f93f25535c219599a0 Author: Lennert Buytenhek Date: Fri Jan 8 18:30:58 2010 +0100 mwl8k: implement AP firmware station database maintenance STA firmware uses UPDATE_STADB to manipulate the hardware station database, whereas AP firmware uses SET_NEW_STN -- this implements the latter, and hooks it into mwl8k_sta_notify(), to be used if we're running on AP firmware. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 088aab8b62666a002907c912cd346ae6dc9f42b7 Author: Lennert Buytenhek Date: Fri Jan 8 18:30:36 2010 +0100 mwl8k: add the AP version of USE_FIXED_RATE As with the STA version, unicast will use auto rate adaptation, but the AP version allows setting the rates to be used for management and multicast transmissions, which can be set based on the BSS basic rate set. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit b71ed2c6ce8b5c3782ed70d67dc9adbd7ed07684 Author: Lennert Buytenhek Date: Fri Jan 8 18:30:16 2010 +0100 mwl8k: simplify mwl8k_cmd_use_fixed_rate() As we always use the auto rate adaptation feature and never pass in a rate table, USE_FIXED_RATE can be simplified somewhat. While we're at it, rename it to *_sta, as this is the STA version of the command. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 62abd3cfb2f1a0ab1963ac4c4087c477da6b1f2a Author: Lennert Buytenhek Date: Fri Jan 8 18:28:34 2010 +0100 mwl8k: bump the transmit wait timeout to 5 seconds While it is reasonable to expect that at least one transmit ring entry will be processed per second while we are waiting for the transmit rings to drain, the firmware can end up doing batching of transmit ring status writeback, which means that the transmit rings can appear stuck for more than a second at a time. Bump the TX drain wait timeout up from 1 to 5 seconds to account for this. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit b569e924a9ea7c6f03dcf9b8a98d78d341925b87 Author: Lennert Buytenhek Date: Fri Jan 8 18:28:14 2010 +0100 mwl8k: undo transmit queue 0/1 swapping in mwl8k_cmd_set_edca_params() The comment and code in mwl8k_cmd_set_edca_params() suggest that the mapping between SET_EDCA_PARAMS queue numbers and transmit rings isn't actually 1:1, while tests show that the mapping is in fact 1:1. So, get rid of the transmit queue 0/1 swapping. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c2c2b12a8b6cd23d4abbc086642647c656bf406c Author: Lennert Buytenhek Date: Fri Jan 8 18:27:59 2010 +0100 mwl8k: minor cleanups Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 3f0e0b220f80075ce15483b20458192c0ac27426 Author: Felix Fietkau Date: Fri Jan 8 18:15:13 2010 +0100 mac80211: do not transmit frames on unconfigured 4-addr vlan interfaces If frames are transmitted on 4-addr ap vlan interfaces with no station, they end up being transmitted unencrypted, even if the ap interface uses WPA. This patch add some sanity checking to make sure that this does not happen. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 0e5ded5a87c097760abd68521b86f1025dedc7d7 Author: Felix Fietkau Date: Fri Jan 8 18:10:58 2010 +0100 mac80211: allow station updates on ap interfaces for vlan stations Since the per-vif station changes, sta_info_get on the ap sdata no longer returns entries for stations on ap vlans. This causes issues with hostapd, which currently always passes the ap interface name to nl80211 calls. This patch provides bug compatibility with the earlier versions until hostapd is fixed. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit d524215f6cad245249df8def19125ae6fd0bcc9b Author: Felix Fietkau Date: Fri Jan 8 18:06:26 2010 +0100 mac80211: use nullfunc frames for 4-addr sta detection To detect incoming 4-addr stations, hostapd needs to receive a 4-addr data frame from the remote station, so that it can create the AP VLAN for it. With this patch, the mlme code emits a 4-addr nullfunc frame immediately after assoc. On the AP side it also drops 4-addr nullfunc frames to the cooked monitor mode interface, if the interface hasn't been fully set up to receive 4-addr data frames yet. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 199afd9d89b18e8b530734ed73788518e19bed9b Author: Sujith Date: Fri Jan 8 10:36:13 2010 +0530 ath9k: Fix monitor mode handling mac80211 passes appropriate flags indicating whether monitor mode is being used. Use this to set the HW opmode. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1395d3f00a4164caae168b041855d48e0fa9ea4c Author: Sujith Date: Fri Jan 8 10:36:11 2010 +0530 ath9k: Add debugfs file for RX errors This file can be used to track frame reception errors. PHY error counts are also added. Location: ath9k/phy#/recv Signed-off-by: Sujith Signed-off-by: John W. Linville commit cc9c378aa57817003a094e4bb9a953337ebf035a Author: Sujith Date: Fri Jan 8 10:36:09 2010 +0530 ath9k: Fix queue handling The TX queues have to be stopped during an internal reset. Not handling this would result in packet loss - fix this. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 285f2ddae03ca207877262f5a9dbd9cddd8b3913 Author: Sujith Date: Fri Jan 8 10:36:07 2010 +0530 ath9k: Cleanup init/deinit routines The device initialization and termination functions were messy and convoluted. Introduce helper functions to clarify init_softc() and simplify things in general. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1b04b9308ebc7f6accb319cf51c9b8ec29f79707 Author: Sujith Date: Fri Jan 8 10:36:05 2010 +0530 ath9k: Cleanup Powersave flags sc_flags has slowly become a kitchen sink over time. Move powersave related flags to a separate variable. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 556242049cc3992d0ee625e9f15c4b00ea4baac8 Author: Sujith Date: Fri Jan 8 10:36:02 2010 +0530 ath9k: Add new file init.c Move initialization/de-initialization related code to this file. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0fca65c1c0569d6a143e978b6f4974c519033e63 Author: Sujith Date: Fri Jan 8 10:36:00 2010 +0530 ath9k: Add a new file for GPIO Move all LED/RFKILL/BTCOEX related code to gpio.c Signed-off-by: Sujith Signed-off-by: John W. Linville commit cc5d8a3772ee4e2ed29558ba548b4747959ba971 Author: Luis R. Rodriguez Date: Thu Jan 7 17:24:57 2010 -0500 cfg80211: Fix country IE parsing for single channel triplets This enhances the way we parse country IEs to minimize the number of regulatory rules that we create. It also fixes our current implementation which treated country IE triplets with only one channel as one independed regulatory rule even though adjecent rules were also being provided. Without this patch APs which send country IE information with a channel triplet for each individual channel will force cfg80211 to deny HT40 operation as a regulatory rule would have been created independently for each channel and as such configured only for 20 MHz operation. Although 802.11n APs which send country IEs triplets in this fassion are likely rare Benoit reports this against the Ubiquity NanoStation M5, with Country "FR" and HT40 enabled. Since we now have a helper which parses the triplets in intermediate steps we now take care extra care to process padding. Reported-by: Benoit PAPILLAULT Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 08030db6e5275dda19ea1b3ab8a41c992799db4a Author: Luis R. Rodriguez Date: Thu Jan 7 17:24:56 2010 -0500 cfg80211: process the max power on a country IE The max power from each country IE triplet was being ignored. This fix isn't critical as CRDA was always being used for the lower limit, but we should process it in case the AP still wants to decrease power output even more for whatever reason. Reported-by: Benoit PAPILLAULT Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b74d12e116528fadc35f305eb6e9525a3a2b62b1 Author: Luis R. Rodriguez Date: Thu Jan 7 17:24:54 2010 -0500 cfg80211: add debug print when we drop a bogus country IE Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 81f14df0b3909875902b0253d7059e8a73dd0c7f Author: Rafał Miłecki Date: Thu Jan 7 14:09:27 2010 +0100 b43: LP-PHY: note and explain specs inconsistency Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 81ac3462d346ee7aaf037a35156b0a7a354e98cf Author: Johannes Berg Date: Wed Jan 6 15:30:58 2010 +0100 mac80211: fix a few work bugs Kalle and Lennert reported problems with the new work code, and at least Kalle's problem I was able to trace to a missing jiffies initialisation. I also ran into a problem where occasionally I couldn't connect, which seems fixed with kicking the work items after scanning. Finally, also add some sanity checking code to verify that we're not adding work items while an interface is down -- that case could lead to something similar to what Lennert was seeing. There still seems to be a race condition that we're trying to figure out separately. Signed-off-by: Johannes Berg Tested-by: Lennert Buytenhek Tested-by: Kalle Valo Signed-off-by: John W. Linville commit 34a6eddbabd704b3c7dae9362234552267573be2 Author: Jouni Malinen Date: Wed Jan 6 16:19:24 2010 +0200 cfg80211: Store IEs from both Beacon and Probe Response frames Store information elements from Beacon and Probe Response frames in separate buffers to allow both sets to be made available through nl80211. This allows user space applications to get access to IEs from Beacon frames even if we have received Probe Response frames from the BSS. Previously, the IEs from Probe Response frames would have overridden the IEs from Beacon frames. This feature is of somewhat limited use since most protocols include the same (or extended) information in Probe Response frames. However, there are couple of exceptions where the IEs from Beacon frames could be of some use: TIM IE is only included in Beacon frames (and it would be needed to figure out the DTIM period used in the BSS) and at least some implementations of Wireless Provisioning Services seem to include the full IE only in Beacon frames). The new BSS attribute for scan results is added to allow both the IE sets to be delivered. This is done in a way that maintains the previously used behavior for applications that are not aware of the new NL80211_BSS_BEACON_IES attribute. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 80a112ffe8dbada25f3780ecc4beebf23451d755 Author: Kalle Valo Date: Tue Jan 5 20:17:10 2010 +0200 wl1251: fix sleep related error paths in wl1251_op_bss_info_changed() In various cases wl1251_op_bss_info_changed() did not call elp_sleep() after an error was noticed. Fix it by using correct goto label. The bug was a theoretical one, in practise it doesn't matter because if commands start returning errors there will be lots of other problems. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit dc52f0a8e50303eb67ff8856cd8d1b461462ceec Author: Kalle Valo Date: Tue Jan 5 20:17:03 2010 +0200 wl1251: use mac80211 provided channel parameters in scanning The number of channels to be used in scan was hard coded in wl1251. The proper way is to use the channels array provided by mac80211. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit e477c56e852c4c6db1f7665c642c9f45f76616a9 Author: Kalle Valo Date: Tue Jan 5 20:16:57 2010 +0200 wl1251: get probe request template from mac80211 Instead of creating the template in driver, get it from mac80211 instead. Thanks to this, three functions can be now removed. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275 Author: Kalle Valo Date: Tue Jan 5 20:16:51 2010 +0200 wl1251: cleanup scanning code The current scanning code wasn't following the preferred style. Move code related to scan and trigger scan to commans to wl1251_cmd.c. Because there's now less code in wl1251_hw_scan(), the function can be now merged with wl1251_op_hw_scan(). Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 7c12ce8b854df346388ea56d684784e3484012cf Author: Kalle Valo Date: Tue Jan 5 20:16:44 2010 +0200 mac80211: use Probe Request template when sending a direct scan As mac80211 now has a separate function for creating Probe Request templates, better to use it when sending direct Probe Requests to an AP. Only the bssid needs to be updated in the template before sending it. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 05e54ea6cce400ac34528d705179b45244f61074 Author: Kalle Valo Date: Tue Jan 5 20:16:38 2010 +0200 mac80211: create Probe Request template Certain type of hardware, for example wl1251 and wl1271, need a template for the Probe Request. Create a function ieee80211_probereq_get() which creates the template and drivers send it to hardware. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit f7f70579340dba1e551c0e52349fde0370592174 Author: Kalle Valo Date: Tue Jan 5 20:16:32 2010 +0200 wl1251: get PS Poll and Nullfunc templates from mac80211 Now that mac80211 creates templates for PS Poll and Nullfunc frames, use them instead of creating our own. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit d8cd189e9b1e050629f545e76b21a321f62c29bf Author: Kalle Valo Date: Tue Jan 5 20:16:26 2010 +0200 mac80211: use PS Poll and Nullfunc templates when sending such frames To avoid duplicate code, use ieee80211_[pspoll|nullfunc]_get() to get templates for PS Poll and Nullfunc frames in mlme.c. Compile-tested only. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 7044cc565b45a898c140fb185174a66f2d68a163 Author: Kalle Valo Date: Tue Jan 5 20:16:19 2010 +0200 mac80211: add functions to create PS Poll and Nullfunc templates Some hardware, for example wl1251 and wl1271, handle the transmission of power save related frames in hardware, but the driver is responsible for creating the templates. It's better to create the templates in mac80211, that way all drivers can benefit from this. Add two new functions, ieee80211_pspoll_get() and ieee80211_nullfunc_get() which drivers need to call to get the frame. Drivers are also responsible for updating the templates after each association. Also new struct ieee80211_hdr_3addr is added to ieee80211.h to make it easy to calculate length of the Nullfunc frame. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit b3579d6adcf7b24464274967a96d12467cfb11a7 Author: Gertjan van Wingerde Date: Wed Dec 30 11:36:34 2009 +0100 rt2x00: Make rt2800_init_led static and don't export it. It is only used within the rt2800lib module itself. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 67a4c1e24d58e0d88ed88539641631f6fc8a0cfd Author: Gertjan van Wingerde Date: Wed Dec 30 11:36:32 2009 +0100 rt2x00: Unify rt2800 WPDMA ready waiting functions. The rt2800pci_wait_wpdma_ready and rt2800usb_wait_wpdma_ready functions are exactly the same, so unify them into rt200lib. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6c0fe26581406bff3d15fd6051453e80cfe70fd6 Author: Gertjan van Wingerde Date: Wed Dec 30 11:36:31 2009 +0100 rt2x00: RF3052 is a valid RF chipset for USB devices as well. The RF3052 chipset is now also being integrated onto USB devices, so allow the RF chipset and don't treat it as PCI/SOC only. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 13ae75b103e07304a34ab40c9136e9f53e06475c Author: Jouni Malinen Date: Tue Dec 29 12:59:45 2009 +0200 nl80211: New command for setting TX rate mask for rate control Add a new NL80211_CMD_SET_TX_BITRATE_MASK command and related attributes to provide support for setting TX rate mask for rate control. This uses the existing cfg80211 set_bitrate_mask operation that was previously used only with WEXT compat code (SIOCSIWRATE). The nl80211 command allows more generic configuration of allowed rates as a mask instead of fixed/max rate. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 37eb0b164cf9fa9f70c8500926f5cde7c652f48e Author: Jouni Malinen Date: Wed Jan 6 13:09:08 2010 +0200 cfg80211/mac80211: Use more generic bitrate mask for rate control Extend struct cfg80211_bitrate_mask to actually use a bitfield mask instead of just a single fixed or maximum rate index. This change itself does not modify the behavior (except for debugfs files), but it prepares cfg80211 and mac80211 for a new nl80211 command for setting which rates can be used in TX rate control. Since frames are now going through the rate control algorithm unconditionally, the internal IEEE80211_TX_INTFL_RCALGO flag can now be removed. The RC implementations can use the rate_idx_mask value to optimize their behavior if only a single rate is enabled. The old max_rate_idx in struct ieee80211_tx_rate_control is maintained (but commented as deprecated) for backwards compatibility with existing RC implementations. Once these implementations have been updated to use the more generic rate_idx_mask, the max_rate_idx value can be removed. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e00cfce0cb2a397859607bf515c6de9ce064b64a Author: Jouni Malinen Date: Tue Dec 29 12:59:19 2009 +0200 mac80211: Select lowest rate based on basic rate set in AP mode If the basic rate set is configured to not include the lowest rate (e.g., basic rate set = 6, 12, 24 Mbps in IEEE 802.11g mode), the AP should not send out broadcast frames at 1 Mbps. This type of configuration can be used to optimize channel usage in cases where there is no need for backwards compatibility with IEEE 802.11b-only devices. In AP mode, mac80211 was unconditionally using the lowest rate for Beacon frames and similarly, with all rate control algorithms that use rate_control_send_low(), the lowest rate ended up being used for all broadcast frames (and all unicast frames that are sent before association). Change this to take into account the basic rate configuration in AP mode, i.e., use the lowest rate in the basic rate set instead of the lowest supported rate when selecting the rate. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 3dc1de0bf23816ed557ac8addf680cd5ee57e805 Author: Zhu Yi Date: Mon Dec 28 16:57:15 2009 +0800 mac80211: quit addba_resp_timer if Tx BA session is torn down Make addba_resp_timer aware the HT_AGG_STATE_REQ_STOP_BA_MSK mask so that when ___ieee80211_stop_tx_ba_session() is issued the timer will quit. Otherwise when suspend happens before the timer expired, the timer handler will be called immediately after resume and messes up driver status. Signed-off-by: Zhu Yi Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 6e08d228b6d8e93d7b25b3573c6da7da179c2ae1 Author: Lukáš Turek <8an@praha12.net> Date: Mon Dec 21 22:50:51 2009 +0100 ath5k: Implement mac80211 callback set_coverage_class The callback sets slot time as specified in IEEE 802.11-2007 section 17.3.8.6 (for 20MHz channels only for now) and raises ACK and CTS timeouts accordingly. The values are persistent, they are restored after device reset. Signed-off-by: Lukas Turek <8an@praha12.net> Signed-off-by: John W. Linville commit 3578e6ebb305e6bf7519f6e86741772892f4d51a Author: Lukáš Turek <8an@praha12.net> Date: Mon Dec 21 22:50:50 2009 +0100 ath5k: Reimplement clock rate to usec conversion The original code was correct in 802.11a mode only, 802.11b/g uses different clock rates. The new code uses values taken from FreeBSD HAL and should be correct for all modes including turbo modes. The former rate calculation was used by slope coefficient calculation function ath5k_hw_write_ofdm_timings. However, this function requires the 802.11a values even in 802.11g mode. Thus the use of ath5k_hw_htoclock was replaced by hardcoded values. Possibly the slope coefficient calculation is not related to clock rate at all. Signed-off-by: Lukas Turek <8an@praha12.net> Signed-off-by: John W. Linville commit e1aa369ec8fb981ef78bc5be3b3c58de7c5ff769 Author: Lukáš Turek <8an@praha12.net> Date: Mon Dec 21 22:50:49 2009 +0100 ath5k: Fix functions for getting/setting slot time Functions ath5k_hw_get_slot_time and ath5k_hw_set_slot_time were converting microseconds to clocks only for AR5210, although it's needed for all supported devices. The conversion was moved outside the hardware-specific branches. The original code also limited minimum slot time to 9, while turbo modes use 6, this was fixed too. Signed-off-by: Lukas Turek <8an@praha12.net> Signed-off-by: John W. Linville commit 310bc676e314e92c18257bfc916951879451ee32 Author: Lukáš Turek <8an@praha12.net> Date: Mon Dec 21 22:50:48 2009 +0100 mac80211: Add new callback set_coverage_class Mac80211 callback to driver set_coverage_class() sets slot time and ACK timeout for given IEEE 802.11 coverage class. The callback is optional, but it's essential for long distance links. Signed-off-by: Lukas Turek <8an@praha12.net> Signed-off-by: John W. Linville commit 81077e82c3f591578625805dd6464a27a9ff56ec Author: Lukáš Turek <8an@praha12.net> Date: Mon Dec 21 22:50:47 2009 +0100 nl80211: Add new WIPHY attribute COVERAGE_CLASS The new attribute NL80211_ATTR_WIPHY_COVERAGE_CLASS sets IEEE 802.11 Coverage Class, which depends on maximum distance of nodes in a wireless network. It's required for long distance links (more than a few hundred meters). The attribute is now ignored by two non-mac80211 drivers, rndis and iwmc3200wifi, together with WIPHY_PARAM_RETRY_SHORT and WIPHY_PARAM_RETRY_LONG. If it turns out to be a problem, we could split set_wiphy_params callback or add new capability bits. Signed-off-by: Lukas Turek <8an@praha12.net> Signed-off-by: John W. Linville commit 14acdde6e527950f66c084dbf19bad6fbfcaeedc Author: Luis R. Rodriguez Date: Fri Dec 18 11:26:04 2009 -0500 ath9k: re-enable ps by default for new single chip families The newer single chip hardware family of chipsets have not been experiencing issues with power saving set by default with recent fixes merged (even into stable). The remaining issues are only reported with AR5416 and since enabling PS by default can increase power savings considerably best to take advantage of that feature as this has been tested properly. For more details on this issue see the bug report: http://bugzilla.kernel.org/show_bug.cgi?id=14267 We leave AR5416 with PS disabled by default, that seems to require some more work. Cc: stable@kernel.org Cc: Peter Stuge Cc: Justin P. Mattock Cc: Kristoffer Ericson Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 735fe4cfbc3cedea41bd0ed31955054dae6beb46 Author: Mark Brown Date: Tue Jan 12 14:13:00 2010 +0000 ASoC: Add missing __devexit and __devinit annotations Signed-off-by: Mark Brown commit 03e7a35c0ef7a462385fb6a301dfc1b287cac6de Author: Mark Brown Date: Tue Jan 12 14:01:19 2010 +0000 Revert "ASoC: ad1836: reset and restore clock control mode in suspend/resume entry" This reverts commit afe1c2cd71eb4e0fade720b5709722e7124f29c0 since it doesn't build. commit d67dec5b2cc208215de21dc7806945bf6a6e85d0 Author: Márton Németh Date: Sun Jan 10 17:59:22 2010 +0100 HID: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jiri Kosina commit 163849ea9b4c5d50fbd324692461983d18faadad Merge: 2138301 5ee518e Author: Mark Brown Date: Tue Jan 12 12:59:05 2010 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit 346e34abb2c56695ee4bd6af924141c97a0babfb Author: Hartley Sweeten Date: Mon Jan 11 21:41:29 2010 +0100 ARM: 5879/1: ep93xx: define magic numbers for pll1 and pll2 Add defines for the pll register magic numbers that determine if the pll's are bypassed and if pll2 is enabled. Rename the clock set registers to more closely match the datasheet. Also, remove the unnecessary braces since each conditional statement is a single statement. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 1fbd972ad0f97253ebfbb04881dc4ad95541153c Author: Hartley Sweeten Date: Mon Jan 11 21:38:00 2010 +0100 ARM: 5878/1: ep93xx: register the pwm devices on the edb93xx dev boards Add the platform init code to register the pwm devices that exist on the various edb93xx development boards. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 64d6882d02b0e5f74dd5572039e88517e40edb50 Author: Hartley Sweeten Date: Mon Jan 11 19:33:16 2010 +0100 ARM: 5877/1: ep93xx: use pr_fmt in core.c Use pr_fmt to prefix kernel output with the module name. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit f3f1882ca7bc6b26bcf66ef206eec0c66d823ed3 Author: Hartley Sweeten Date: Mon Jan 11 18:36:02 2010 +0100 ARM: 5876/1: ep93xx: use pr_fmt in dma-m2p.c Use pr_fmt to prefix kernel output with the module name. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 99acbb90c2440155d6b978e654ea875c8282d67b Author: Hartley Sweeten Date: Mon Jan 11 18:30:41 2010 +0100 ARM: 5875/1: ep93xx: use pr_fmt in clock.c Use pr_fmt to prefix kernel output with the module name and change all printk messages to pr_ format. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit a3705799e2cc5fb69d88ad6a7f317a8f5597f18d Author: Paul Mundt Date: Tue Jan 12 19:10:06 2010 +0900 sh: Use SLAB_PANIC for thread_info slab cache. Presently this has a BUG_ON() for failure cases, as powerpc does. Switch this over to a SLAB_PANIC instead. Signed-off-by: Paul Mundt commit cbf6b1ba7ae12b3f7cb6b0d060b88d44649f9eda Author: Paul Mundt Date: Tue Jan 12 19:01:11 2010 +0900 sh: Always provide thread_info allocators. Presently the thread_info allocators are special cased, depending on THREAD_SHIFT < PAGE_SHIFT. This provides a sensible definition for them regardless of configuration, in preparation for extended CPU state. Signed-off-by: Paul Mundt commit 3ccd4c6167d3b39d52631767ebbf8b5677c5855d Author: Oliver Hartkopp Date: Tue Jan 12 02:00:46 2010 -0800 can: Unify droping of invalid tx skbs and netdev stats To prevent the CAN drivers to operate on invalid socketbuffers the skbs are now checked and silently dropped at the xmit-function consistently. Also the netdev stats are consistently using the CAN data length code (dlc) for [rx|tx]_bytes now. Signed-off-by: Oliver Hartkopp Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 05227adff206c7290e8bbf1c28be771c2cbfa0ee Author: Alan Cox Date: Mon Jan 4 06:24:00 2010 +0000 ide_tape: kill off use of the ->ioctl operation Ready to get everything using unlocked_ioctl() For ide_tape we just push down as this is legacy code anyway Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit c3be57b6f35ef96a980ce84e59d6a5a8ca6184ad Author: Russell King Date: Sun Jan 3 12:35:42 2010 +0000 ide: Fix Promise UDMA33 IDE driver (pdc202xx_old) On Sun, Jan 03, 2010 at 12:23:14AM +0000, Russell King wrote: > - with IDE > - locks the interrupt line, and makes the machine extremely painful - > about an hour to get to the point of being able to unload the > pdc202xx_old module. Having manually bisected kernel versions, I've narrowed it down to some change between 2.6.30 and 2.6.31. There's not much which has changed between the two kernels, but one change stands out like a sore thumb: +static int pdc202xx_test_irq(ide_hwif_t *hwif) +{ + struct pci_dev *dev = to_pci_dev(hwif->dev); + unsigned long high_16 = pci_resource_start(dev, 4); + u8 sc1d = inb(high_16 + 0x1d); + + if (hwif->channel) { + /* + * bit 7: error, bit 6: interrupting, + * bit 5: FIFO full, bit 4: FIFO empty + */ + return ((sc1d & 0x50) == 0x40) ? 1 : 0; + } else { + /* + * bit 3: error, bit 2: interrupting, + * bit 1: FIFO full, bit 0: FIFO empty + */ + return ((sc1d & 0x05) == 0x04) ? 1 : 0; + } +} Reading the (documented as a 32-bit) system control register when the interface is idle gives: 0x01da110c So, the byte at 0x1d is 0x11, which is documented as meaning that the primary and secondary FIFOs are empty. The code above, which is trying to see whether an IRQ is pending, checks for the IRQ bit to be one, and the FIFO bit to be zero - or in English, to be non-empty. Since during a BM-DMA read, the FIFOs will naturally be drained to the PCI bus, the chance of us getting to the interface before this happens are extremely small - and if we don't, it means we decide not to service the interrupt. Hence, the screaming interrupt problem with drivers/ide. Fix this by only indicating an interrupt is ready if both the interrupt and FIFO empty bits are at '1'. This bug only affects PDC20246/PDC20247 (Promise Ultra33) based cards, and has been tested on 2.6.31 and 2.6.33-rc2. Signed-off-by: Russell King Tested-by: Russell King Signed-off-by: David S. Miller commit 70e068eef97d05c97c3512f82352f39fdadfa8cb Author: Paul Mundt Date: Tue Jan 12 18:52:00 2010 +0900 sh: Move start_thread() out of line. start_thread() will become a bit heavier with the xstate freeing to be added in, so move it out-of-line in preparation. Signed-off-by: Paul Mundt commit f75d4a238770d83d3a0475ce7f34e3fa37de161e Author: Bartlomiej Zolnierkiewicz Date: Tue Jan 5 07:07:27 2010 +0000 icside: bring back ->maskproc method Bring back ->maskproc method since it is still needed for proper operation, as noticed by Russell King: > This change is bogus. > > writeb(0, base + ICS_ARCIN_V6_INTROFFSET_1); > readb(base + ICS_ARCIN_V6_INTROFFSET_2); > > writeb(0, base + ICS_ARCIN_V6_INTROFFSET_2); > readb(base + ICS_ARCIN_V6_INTROFFSET_1); > > This sequence of code does: > > 1. enable interrupt 1 > 2. disable interrupt 2 > 3. enable interrupt 2 > 4. disable interrupt 1 > > which results in the interrupt for the second channel being enabled - > leaving channel 1 blocked. > > Firstly, icside shares its two IDE channels with one DMA engine - so it's > a simplex interface. IDE supports those (or did when the code was written) > serializing requests between the two interfaces. libata does not. > > Secondly, the interrupt lines on icside float when there's no drive connected > or when the drive has its NIEN bit set, which means that you get spurious > screaming interrupts which can kill off all expansion card interrupts on > the machine unless you disable the channel interrupt on the card. > > Since libata can not serialize the operation of the two channels like IDE > can, the libata version of the icside driver does not contain the interrupt > stearing logic. Instead, it looks at the status after reset, and if > nothing was found on that channel, it masks the interrupt from that > channel. This patch reverts changes done in commit dff8817 (I became confused due to non-standard & undocumented ->maskproc method, anyway sorry about that). Noticed-by: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 94cd049522136c2f3bbe063d2e98b2b8d4286fd3 Author: Paul Mundt Date: Tue Jan 12 18:42:52 2010 +0900 sh: sh_bios detection. This adds some VBR sanity checks in the sh_bios code to ensure that the BIOS VBR is in range before blindly trapping in to it. This permits boards with varying boot loader configurations to always leave support for sh-bios enabled and it will just be disabled at run-time if not found. Signed-off-by: Paul Mundt commit 6b98515a620592636d2f8e0d3e2942d1cb4847ec Author: Alan Cox Date: Mon Jan 4 16:22:59 2010 +0000 sound_oss: remove use of old BKL ioctl path Signed-off-by: Alan Cox Signed-off-by: Takashi Iwai commit a29fb94ff48cba620e1ac1317f5eef5920ead3ff Merge: 52a7a58 dd3533e Author: Takashi Iwai Date: Tue Jan 12 09:40:08 2010 +0100 Merge commit alsa/devel into topic/misc Conflicts: include/sound/version.h commit a99eae5417a09e0be66bf574a9a79a2a7388c967 Author: Paul Mundt Date: Tue Jan 12 16:12:25 2010 +0900 sh: Split out the unaligned counters and user bits. This splits out the unaligned access counters and userspace bits in to their own generic interface, which will allow them to be wired up on sh64 too. Signed-off-by: Paul Mundt commit 776258df925acd0563f471ee4b3f19bbffb3c04f Author: Paul Mundt Date: Tue Jan 12 15:31:20 2010 +0900 sh: Consolidate the sh_bios earlyprintk code. Now that the sh-sci earlyprintk is taken care of by the sh-sci driver directly, there's no longer any reason for having a split-out early_printk framework. sh_bios is the only other thing that uses it, so we just migrate the leftovers in to there. As it's possible to have multiple early_param()'s for the same string, there's not much point in having this split out anymore anyways, particularly since the sh_bios dependencies are still special-cased within sh-sci itself. Signed-off-by: Paul Mundt commit b9303a79567d4a45b015dff7e71dd24923332d8d Author: Paul Mundt Date: Tue Jan 12 15:26:11 2010 +0900 sh: Kill off more unused sh_bios callbacks. sh_bios_char_out() is not used by anything in-tree these days, so just get rid of it. Signed-off-by: Paul Mundt commit 65fedbbef8404be5e1dbd18bdad252616b49a24b Author: Paul Mundt Date: Tue Jan 12 15:22:26 2010 +0900 sh64: Fix up early serial fixmap. This was conditionalized on CONFIG_EARLY_PRINTK, which has subsequently gone away. Now that the serial driver always supports the early console, make sure we always establish the mapping. Signed-off-by: Paul Mundt commit 191d0d24b632eb69767705acded5cbf7449ad457 Author: Paul Mundt Date: Tue Jan 12 14:50:43 2010 +0900 sh: Tidy up the sh bios VBR handling. This moves the VBR handling out of the main trap handling code and in to the sh-bios helper code. A couple of accessors are added in order to permit other kernel code to get at the VBR value for state save/restore paths. Signed-off-by: Paul Mundt commit ee2760ea58d81fc00bcc2137232ed9bc28202aec Author: Paul Mundt Date: Tue Jan 12 13:48:27 2010 +0900 sh: default to sparseirq. As SH has a very sparse IRQ map by default, all new CPUs and boards benefit from using sparseirq by default. Despite this, there are still a few stragglers (mostly due to using a fixed IRQ range for their FPGA IRQ mappings), and these still need to be converted over one by one. As these are now in the minority, and we do not want to encourage this sort of brain-damage in newer board ports, we force sparseirq on. Signed-off-by: Paul Mundt commit 53e6d8e0060fe2bb9b11238f8250fdfbb0589425 Author: Paul Mundt Date: Tue Jan 12 13:37:04 2010 +0900 sh: mach-se: Convert SE7343 FPGA to dynamic IRQ allocation. This gets rid of the arbitrary set of vectors used by the SE7722 FPGA interrupt controller and switches over to a completely dynamic set. No assumptions regarding a contiguous range are made, and the platform resources themselves need to be filled in lazily. Signed-off-by: Paul Mundt commit d218d11133d888f9745802146a50255a4781d37a Author: Stephen Hemminger Date: Mon Jan 11 16:28:01 2010 -0800 tcp: Generalized TTL Security Mechanism This patch adds the kernel portions needed to implement RFC 5082 Generalized TTL Security Mechanism (GTSM). It is a lightweight security measure against forged packets causing DoS attacks (for BGP). This is already implemented the same way in BSD kernels. For the necessary Quagga patch http://www.gossamer-threads.com/lists/quagga/dev/17389 Description from Cisco http://www.cisco.com/en/US/docs/ios/12_3t/12_3t7/feature/guide/gt_btsh.html It does add one byte to each socket structure, but I did a little rearrangement to reuse a hole (on 64 bit), but it does grow the structure on 32 bit This should be documented on ip(4) man page and the Glibc in.h file also needs update. IPV6_MINHOPLIMIT should also be added (although BSD doesn't support that). Only TCP is supported, but could also be added to UDP, DCCP, SCTP if desired. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8045e2985012bdb95d832dfbcceae1815880a6ed Author: OGAWA Hirofumi Date: Tue Jan 12 03:32:24 2010 +0900 fat: Fix vfat_lookup() After d_find_alias(), vfat_lookup() checks !(->d_flags & DCACHE_DISCONNECTED) without IS_ROOT(). This means it hits non-anonymous but disconnected dentry. (NOTE: d_splice_alias() doesn't clear DCACHE_DISCONNECTED) But, vfat_lookup() has interest to alias if it was non-anonymous. So, this adds vfat_d_anon_disconn() helper to check it correctly. Another bug is refcnt leak. It needs dput() for uninterested alias. Signed-off-by: OGAWA Hirofumi commit 2138301e1687bd4f22aa2b4df4829b6ffdae19bc Author: Ilkka Koskinen Date: Fri Jan 8 17:48:31 2010 +0200 ASoC: tpa6130a2: Support for tpa6140's regulators tpa6140a2 uses different names for the regulators. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Signed-off-by: Mark Brown commit f3186a9c51eabe75b2780153ed7f07778d78b16e Author: Haicheng Li Date: Wed Jan 6 15:25:23 2010 +0800 slab: initialize unused alien cache entry as NULL at alloc_alien_cache(). Comparing with existing code, it's a simpler way to use kzalloc_node() to ensure that each unused alien cache entry is NULL. CC: Eric Dumazet Acked-by: Andi Kleen Acked-by: Christoph Lameter Acked-by: Matt Mackall Signed-off-by: Haicheng Li Signed-off-by: Pekka Enberg commit 145434bee45bd353f9a93e9b411f7aa7cc677c08 Author: David Vrabel Date: Mon Jan 11 13:46:31 2010 +0000 uwb: wlp: refactor wlp_get_() macros Refactor the wlp_get_() macros to call a common function. This save over 4k of space and remove a spurious uninitialized variable warning with some versions of gcc. Signed-off-by: David Vrabel commit 47483e25205f1f8d79784f0f7c733941bc080ec0 Author: Márton Németh Date: Sun Jan 10 13:40:02 2010 +0100 block: make virtio device id constant The id_table field of the struct virtio_driver is constant in so it is worth to make id_table also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jens Axboe commit ec9c42ec793d428e99fdd219867b31932034b138 Author: Márton Németh Date: Sun Jan 10 13:39:52 2010 +0100 block: make xenbus device id constant The ids field of the struct xenbus_device_id is constant in so it is worth to make blkfront_ids also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jens Axboe commit 5cccfd9b3a9ca06b6245ea2c4af052b7db0105a3 Author: Márton Németh Date: Sun Jan 10 13:39:46 2010 +0100 block: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make ace_of_match also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jens Axboe commit 577cdf0cf5afa5f350fbaddf77bbacdb9f76d2f8 Author: Márton Németh Date: Sun Jan 10 13:39:39 2010 +0100 block: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make ub_usb_ids also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jens Axboe commit 3d447ec0e30043a2acd52704f5ed1da07a6f2d6e Author: Márton Németh Date: Sun Jan 10 13:39:29 2010 +0100 block: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jens Axboe commit e03a72e13648ac6277bf2bab6b8324d51f89c0fa Author: Martin K. Petersen Date: Mon Jan 11 03:21:51 2010 -0500 block: Stop using byte offsets All callers of the stacking functions use 512-byte sector units rather than byte offsets. Simplify the code so the stacking functions take sectors when specifying data offsets. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 7f635d0d1bf84ad7a0032cbce9d902b9384c48b7 Author: Joe Perches Date: Mon Jan 11 11:55:36 2010 +0100 netfilter: xt_osf: change %pi4 to %pI4 commit 8a27f7c90ffcb791eed7574922b51fb60b08fc89 changed the output style of %pi4 to use fixed width leading zero IP addresses "001.002.003.004". It's useful when printing multiple lines of addresses, but was a change in output style for some existing uses. Using %pI4 restores the previous output style. Signed-off-by: Joe Perches Signed-off-by: Patrick McHardy commit a79e7ac4ad77e1833e8f69e99113204d03018255 Author: Joe Perches Date: Mon Jan 11 11:53:31 2010 +0100 ipvs: use standardized format in sprintf Use the same format string as net/ipv4/netfilter/nf_nat_ftp.c to encode an ipv4 address and port. Both uses should be a single common function. Signed-off-by: Joe Perches Acked-by: Simon Horman Signed-off-by: Patrick McHardy commit c299bd53aa2616e6afc304b4f848186af3b3a881 Author: Joe Perches Date: Mon Jan 11 11:49:51 2010 +0100 netfilter: nf_nat_ftp: remove (*mangle[]) array and functions, use %pI4 These functions merely exist to format a buffer and call nf_nat_mangle_tcp_packet. Format the buffer and perform the call in nf_nat_ftp instead. Use %pI4 for the IP address. Saves ~600 bytes of text old: $ size net/ipv4/netfilter/nf_nat_ftp.o text data bss dec hex filename 2187 160 408 2755 ac3 net/ipv4/netfilter/nf_nat_ftp.o new: $ size net/ipv4/netfilter/nf_nat_ftp.o text data bss dec hex filename 1532 112 288 1932 78c net/ipv4/netfilter/nf_nat_ftp.o Signed-off-by: Joe Perches Signed-off-by: Patrick McHardy commit c8e000604bce02a87742240a9b716a0f1b680c0b Author: Joe Perches Date: Mon Jan 11 00:44:14 2010 -0800 lib: Kill bit-reversed FDDI MAC output case, it's bogus. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9cb3ce52ca45d089d5be90d2f34005296fc5a34e Author: Márton Németh Date: Sun Jan 10 23:59:05 2010 -0800 Input: make USB device ids constant The id_table field of the struct usb_device_id is constant in so it makes sense to mark the initialization data also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit d4a66e752d0b19934dd208884f8605fe385aaaa9 Merge: bdbec4b fa15e99 Author: David S. Miller Date: Sun Jan 10 22:55:03 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/benet/be_cmds.h include/linux/sysctl.h commit cd7bec6ad80188394a8ea857ff1aa3512fc2282a Author: Tetsuo Handa Date: Tue Jan 5 06:39:37 2010 +0900 TOMOYO: Remove memory pool for list elements. Currently, TOMOYO allocates memory for list elements from memory pool allocated by kmalloc(PAGE_SIZE). But that makes it difficult to kfree() when garbage collector is added. Thus, remove memory pool and use kmalloc(sizeof()). Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit e41035a996356c257183e53a70abfb46fa84908b Author: Tetsuo Handa Date: Tue Jan 5 06:39:00 2010 +0900 TOMOYO: Remove memory pool for string data. Currently, TOMOYO allocates memory for string data from memory pool allocated by kmalloc(PAGE_SIZE). But that makes it difficult to kfree() when garbage collector is added. Thus, remove memory pool and use kmalloc(strlen()). Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 0ed731859e24cd6e3ec058cf2b49b2a0df80e86b Author: Tetsuo Handa Date: Wed Jan 6 09:23:54 2010 +0900 LSM: Update comment on security_sock_rcv_skb It is not permitted to do sleeping operation inside security_sock_rcv_skb(). Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn -- Signed-off-by: James Morris commit bdbec4b86ee99b020e159f9bd604003a3ae3b0ab Author: Greg Rose Date: Sat Jan 9 02:27:05 2010 +0000 ixgbe: Fix ethtool diag test for VT mode operation Skip MAC loopback test when the adapter is set to a VT mode such as SR-IOV or VMDq Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1cdd1ec8784399eef55a60887a45f3f46a1c240a Author: Greg Rose Date: Sat Jan 9 02:26:46 2010 +0000 ixgbe: Add SR-IOV features to main module Adds SR-IOV features supported by the 82599 controller to the main driver module. If the CONFIG_PCI_IOV kernel option is selected then the SR-IOV features are enabled. Use the max_vfs module option to allocate up to 63 virtual functions per physical port. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 096a58fdec72335d9cbee94bd10b312c5f14f8af Author: Greg Rose Date: Sat Jan 9 02:26:26 2010 +0000 ixgbe: Add SR-IOV feature enablement code Adds code to the core 82599 module to support SR-IOV features of the 82599 network controller Signed-off-by: Greg Rose Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 92ed72d536445334829af65c63516557fd50f554 Author: Greg Rose Date: Sat Jan 9 02:26:07 2010 +0000 ixgbe: Add SR-IOV specific modules to driver Makefile Add the mailbox and SR-IOV feature modules to the ixgbe driver Makefile. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 17367270b1d7f529f5d72e8f2cf76672829eb335 Author: Greg Rose Date: Sat Jan 9 02:25:48 2010 +0000 ixgbe: Add SR-IOV specific features This module and header file add functions to support SR-IOV features of the 82599 10Gbe controller. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7f870475c8f102469df44a86387a03cb23e79b90 Author: Greg Rose Date: Sat Jan 9 02:25:29 2010 +0000 ixgbe: Add SR-IOV register, structure and bit defines This patch adds register definitions, bit definitions and structures used by the driver to support SR-IOV features of the 82599 controller. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 10ca132c41ecc1b55bc22667493ab75c4f6eec0d Author: Greg Rose Date: Sat Jan 9 02:25:10 2010 +0000 ixgbe: Mailbox header and code module The 82599 virtual function device and the master 82599 physical function device implement a mailbox utility for communication between the devices using some SRAM scratch memory and a doorbell/answering mechanism enabled via interrupt and/or polling. This C module and accompanying header file implement the base functions for use of this feature. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ecc6703cbb2bb648c7345c652a704f7af56322b8 Author: Greg Rose Date: Sat Jan 9 02:24:50 2010 +0000 ixgbevf: Kconfig, Makefile and Documentation Modifications for the Kconfig and network device Makefile to add the ixgbevf driver module to the kernel plus basic driver documentation. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0d3592fa28965a3083d670b430bb59c19efb6abe Author: Greg Rose Date: Sat Jan 9 02:24:31 2010 +0000 ixgbevf: Driver Makefile 82599 Virtual Function Device Driver Makefile Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 92915f71201b43762fbe05dbfb1a1a0de9c8adb9 Author: Greg Rose Date: Sat Jan 9 02:24:10 2010 +0000 ixgbevf: Driver main and ethool interface module and main header These modules and header contain the Linux OS network interface code and core interrupt and network send/receive handlers. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cbf698dbba25741ee1b2e734a6dd4f3070a1706f Author: Greg Rose Date: Sat Jan 9 02:23:50 2010 +0000 ixgbevf: Mailbox communication The 82599 virtual function device and the master 82599 physical function device implement a mailbox utility for communication between the devices using some SRAM scratch memory and a doorbell/answering mechanism enabled via interrupt and/or polling. This C module and accompanying header file implement the base functions for use of this feature. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3047f90bd515b38e62094eff90b299f379ab7243 Author: Greg Rose Date: Sat Jan 9 02:23:31 2010 +0000 ixgbevf: 82599 Virtual Function core functions and header This module and header file contain the core functions for the 82599 virtual function device. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 50d9c84ee522ce6f61cd6a7dfce1b82a260edd3c Author: Greg Rose Date: Sat Jan 9 02:23:11 2010 +0000 ixgbevf: Macros, data structures, useful defines and registers These two headers define the commonly used macros, data structures, register bits and register offsets used by the ixgbevf driver on the 82599 virtual function device Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c026ca581f22497c42cbe7a2004fa0d5f1bd6c42 Author: Jiri Slaby Date: Sun Jan 10 01:17:34 2010 +0000 NET: irda, remove unnecessary checks Stanse found a potential null dereference in ircomm_tty_close and ircomm_tty_hangup. There is a check for tty being NULL, but it is dereferenced earlier. But it is bogus, the tty cannot be NULL, so remove the !tty checks. Signed-off-by: Jiri Slaby Cc: Samuel Ortiz Cc: "David S. Miller" Cc: Alan Cox Cc: Greg Kroah-Hartman Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller commit c3f6c21d6e60e39c81c27f18ebad9c7615eff545 Author: Jiri Slaby Date: Sun Jan 10 00:43:03 2010 +0000 NET: ipv6, remove unnecessary check Stanse found a potential null dereference in snmp6_unregister_dev. There is a check for idev being NULL, but it is dereferenced earlier. But idev cannot be NULL when passed to snmp6_unregister_dev, so remove the test. Signed-off-by: Jiri Slaby Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller commit f737d95ddfea4df68a36ffc9231db4bf34b06d13 Author: Tetsuo Handa Date: Sun Jan 3 21:16:32 2010 +0900 TOMOYO: Replace rw_semaphore by mutex. Since readers no longer use down_read(), writers no longer need to use rw_semaphore. Replace individual rw_semaphore by single mutex. Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit e55d1936f207f81c4e225d6c513e0fa487e544c5 Merge: 74d2e4f e7cc894 Author: Russell King Date: Sun Jan 10 17:33:56 2010 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit a67483d2be12dfc5563c09e6169bec9a88f434b0 Author: Németh Márton Date: Sun Jan 10 13:14:26 2010 +0100 firewire: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make pci_table also constant. Found with Coccinelle. Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Stefan Richter stefanr@s5r6.in-berlin.de> (changelog) commit c6d5709384090de541158a6bba8d4ae50242ff94 Author: Márton Németh Date: Sat Jan 9 23:25:44 2010 -0800 Input: xen-kbdfront - make xenbus device ids constant The ids field of the struct xenbus_device_id is constant in so it makes sense to mark xenkbd_ids also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit 35c4b918a696f20cb775f1a65955c8ed0fe7c052 Author: Márton Németh Date: Sat Jan 9 23:24:48 2010 -0800 Input: ns558 - make pnp device ids constant The id_table field of the struct pnp_driver is constant in so it makes sense to mark pnp_devids also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit a9844b18502bde376284e4ad83b04fa20eb5afa5 Author: Márton Németh Date: Sat Jan 9 23:23:58 2010 -0800 Input: make PCI device ids constant The id_table field of the struct pci_driver is constant in so it makes sense to mark initialization data also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit ef9a16f15dccba6630d8860a964a4adef1a4ab98 Author: Márton Németh Date: Sat Jan 9 23:23:02 2010 -0800 Input: xilinx_ps2 - make Open Firmware device ids constant The match_table field of the struct of_device_id is constant in so it makes sense to mark xps2_of_match also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit ce7b39a181571ed5a87f3ca62d4cffe4835c6ae9 Author: Márton Németh Date: Sat Jan 9 23:23:02 2010 -0800 Input: make i2c device ids constant The id_table field of the struct i2c_driver is defined as constant in so it makes sense to mark the initialization data also constant. Signed-off-by: Márton Németh Signed-off-by: Dmitry Torokhov commit 51f5300682f5925a11edfddfd47ed47376871974 Author: Geert Uytterhoeven Date: Sat Jan 9 23:00:32 2010 -0800 mac8390: Fix build breakage commit 18c0019102228875cb0f6f252dad5148491e96b2 ("drivers/net/mac8390.c: Convert printk(KERN_ to pr_(") broke the build: | drivers/net/mac8390.c:306: error: expected ')' before 'version' as "version" is not a string literal, but a variable. Signed-off-by: Geert Uytterhoeven Signed-off-by: David S. Miller commit a8dfb6462a033984b99fee4122fe0799a31f5bb4 Author: Uwe Kleine-König Date: Thu Jan 7 11:27:17 2010 +0100 imx: define functions to configure chip selects in the WEIM This has the addional effect that the macros CSCR_U, CSCR_L and CSCR_A are not used anymore in mach-pcm038.c and mach-qong.c. These still use the deprecated IO_ADDRESS macro and shouldn't be used in new code. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 3cdd54417d0f821825a353f7273d356399112f56 Author: Uwe Kleine-König Date: Fri Jan 8 16:02:30 2010 +0100 imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion Some headers have used (now) wrong names or havn't had protection at all. This is needed before adding static inline functions to the headers. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Magnus Lilja Cc: Holger Schurig Cc: Jiri Kosina Cc: Daniel Mack commit 4631166124d928d3e9372a57b1477ce6335332c5 Author: Uwe Kleine-König Date: Fri Jan 8 12:29:11 2010 +0100 imx: remove unneeded include of mach/hardware.h This include isn't needed and hurts when defining static inline functions in mach/hardware.h (or files included by mach/hardware.h). The reason is that the consumers of mach/uncompress.h are compiled using -Dstatic= so the code for all inline function is included in e.g. arch/arm/boot/compressed/misc.o. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jörg Knobloch Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Dmitriy Taychenachev commit d13ab097ae9671be6765c7a8f1946641db5a7dac Author: Uwe Kleine-König Date: Tue Jan 5 11:27:42 2010 +0100 imx: remove mx1ads defconfig For some time now the defconfig for mx1ads produces a kernel for a versatile board. As CONFIG_ARCH_MX1ADS is included in the mx1 defconfig just get rid of mx1ads_defconfig. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer commit aae7019382896cf1075a93acc564e42601bc44a2 Author: Uwe Kleine-König Date: Thu Dec 17 17:17:54 2009 +0100 imx: only define deprecated symbols conditionally Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ... All files that still depend on the old definitions get -DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler. When all remaining users are fixed this allows including the soc specific headers unconditionally. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Alberto Panizzo Cc: Ilya Yanok Cc: Holger Schurig Cc: Jiri Kosina Cc: Magnus Lilja commit a9b7a2dd217bd43e122b604ec99b63e0211c38aa Author: Uwe Kleine-König Date: Thu Dec 17 11:56:43 2009 +0100 imx: mangle addresses after adding the offset don't use IO_ADDRESS($base) + $offset but IO_ADDRESS($base + $offset) Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: "Agustín Ferrín Pozuelo" Cc: Javier Martin Cc: Valentin Longchamp Cc: Daniel Mack Cc: Dmitriy Taychenachev commit 59e2608169bf4199f9f9e08a8abe80132e9416f5 Author: Uwe Kleine-König Date: Wed Dec 16 19:08:09 2009 +0100 mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 6ef9af6871e3f220c6c7facf90babe6931d972bd Author: Uwe Kleine-König Date: Wed Dec 16 19:07:20 2009 +0100 imx35: define and use MX35_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jürgen Beisert Cc: Rabin Vincent Cc: Valentin Longchamp commit df9375fad4f99b28f5a500d9aa2cbb04e065ac97 Author: Uwe Kleine-König Date: Wed Dec 16 19:07:04 2009 +0100 imx25: redefine MX25_IO_ADDRESS using IMX_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 1273e7686f0c122bf58592c57387471c7f4eaa1b Author: Uwe Kleine-König Date: Wed Dec 16 19:06:12 2009 +0100 imx31: define and use MX31_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Greg Kroah-Hartman Cc: Mark Brown Cc: Magnus Lilja commit bc9ea6c7f5352f8857525b054bc3df784be1b8d5 Author: Uwe Kleine-König Date: Wed Dec 16 17:30:27 2009 +0100 imx27: define and use MX27_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Holger Schurig commit a3f5ac7838a93977f71288310336a725eb6e62db Author: Uwe Kleine-König Date: Wed Dec 16 17:29:39 2009 +0100 imx21: define and use MX21_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: Agustín Ferrín Pozuelo commit 1f2ddd64da6e53365102d831aa9e0446b78f0300 Author: Uwe Kleine-König Date: Wed Dec 16 19:05:04 2009 +0100 imx: provide helper macro to define IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 321ed164369bb5e4888eb24d70ebc64c232ffc31 Author: Uwe Kleine-König Date: Thu Dec 10 10:41:26 2009 +0100 imx/mx3: rename files defining a machine to mach-$mach.c While at it remove some superfluous parenthesis. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit 7f081d405adb5f905db11c6449319ab7c670722e Author: Alexander Duyck Date: Thu Jan 7 17:41:00 2010 +0000 igb: add support for device reset interrupt This patch adds support for the global device reset interrupt. Without this change the drivers will report tx hangs on all ports when a global device reset occurs. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 959d20bfe8b90023c862dec3956054027a5a0912 Author: Wolfgang Grandegger Date: Thu Jan 7 09:43:08 2010 +0000 powerpc/mpc5xxx: add OF platform binding doc for FSL MSCAN devices This patch adds documentation for the MSCAN OF device bindings for the MPC512x and moves the one for the MPC5200 to the new common file "Documentation/powerpc/dts-bindings/fsl/can.txt". Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: David S. Miller commit bf3af54732bea5894ccc2cbde3ab566f0af7da56 Author: Wolfgang Grandegger Date: Thu Jan 7 09:43:07 2010 +0000 can: mscan-mpc5xxx: add support for the MPC512x processor The main differences compared to the MSCAN on the MPC5200 are: - More flexibility in choosing the CAN source clock and frequency: Three different clock sources can be selected: "ip", "ref" or "sys". For the latter two, a clock divider can be defined as well. If the clock source is not specified by the device tree, we first try to find an optimal CAN source clock based on the system clock. If that is not possible, the reference clock will be used. - The behavior of bus-off recovery is configurable: To comply with the usual handling of Socket-CAN bus-off recovery, "recovery on request" is selected (instead of automatic recovery). Note that only MPC5121 Rev. 2 and later is supported. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: David S. Miller commit 2d4b6faf7d1818e9a52ae9f068ab4ffd9c3be923 Author: Wolfgang Grandegger Date: Thu Jan 7 09:43:06 2010 +0000 can: mscan: fix improper return if dlc < 8 in start_xmit function The start_xmit function of the MSCAN Driver did return improperly if the CAN dlc check failed (skb not freed and invalid return code). This patch adds a proper check of the frame lenght and data size and returns now correctly. The invalid skb packets are dropped silently as suggested by David Miller in the thread "[RFC] ndo_validate_skb: Let the netdev check a valid skb content" on the netdev mailing list. Furthermore, a typo has been fixed. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: David S. Miller commit 5856b606e69d3e4dc2d718b475e216eb30ee2006 Author: Joe Perches Date: Fri Jan 8 00:59:52 2010 -0800 net/ipv6/tcp_ipv6.c: Use compressed IPv6 address Use "[compressed ipv6]:port" form suggested by: http://tools.ietf.org/id/draft-ietf-6man-text-addr-representation-03.txt Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit df2f7ec8c09ce879245c3309d859218188123ef1 Author: H Hartley Sweeten Date: Fri Jan 8 00:53:03 2010 -0800 ep93xx_eth.c general cleanup General cleanup of the ep93xx_eth driver. 1) Use pr_fmt() to prefix the module name and __func__ to the error messages. 2) instead of 3) instead of and 4) Move the ep93xx_mdio_read (and ep93xx_mdio_write) function to eliminate the function prototype. 5) Change all the printk( messages to pr_ and remove the __func__ argument. 6) Use platform_get_{resource/irq} to get the platform resources and add an error check. 7) Use resource_size() for request_mem_region() and ioremap(). 8) Use %pM to print the MAC address at the end of the probe. 9) Use dev->dev_addr not data->dev_addr for the MAC argument because a random address could be used if the platform does not supply one. The message at the end of the probe is left as a printk since it displays cleaner without the function name that would be displayed with pr_info(). Signed-off-by: H Hartley Sweeten Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit e2eb8e38592f28d8be4a518f44d3385272dedddb Author: Benjamin Li Date: Fri Jan 8 00:51:21 2010 -0800 bnx2: Flush the register writes which setup the MSI-X table The MSI-X table size needs to be properly set before pci_enable_msix() is called. But on certain machines, the writes are delayed and the MSI-X table size is incorrectly read. By reading the BNX2_PCI_MSIX_CONTROL register, the writes are flushed and now ensure that the MSI-X table is set correctly before MSI-X is enable on the device. This patch was originally diagnosed and authored by Kalyan Ram Chintalapati . Signed-off-by: Benjamin Li Signed-off-by: Kalyan Ram Chintalapati Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c4cfe66c4c2d5a91b3734ffb4e2bad0badd5c874 Author: Daniel Drake Date: Thu Jan 7 13:47:04 2010 +0100 ALSA: hda - support OLPC XO-1.5 DC input The XO's audio hardware is wired up to allow DC sensors (e.g. light sensors, thermistors, etc) to be plugged in through the microphone jack. Add sound mixer controls to allow this mode to be enabled and tweaked. Signed-off-by: Daniel Drake Signed-off-by: Jaroslav Kysela commit 75f8991d0e6969407d51501d5a0537f104075c99 Author: Daniel Drake Date: Thu Jan 7 13:46:25 2010 +0100 ALSA: hda - Configure XO-1.5 microphones at capture time The XO-1.5 has a microphone LED designed to indicate to the user when something is being recorded. This light is controlled by the microphone bias voltage and it is currently coming on all the time. This patch defers the microphone port configuration until when recording is actually taking place, fixing the behaviour of the LED. Signed-off-by: Daniel Drake Signed-off-by: Jaroslav Kysela commit a4ad68d57e4dc4138304df23d1817eb094149389 Merge: cd9d95a c97259d Author: Jaroslav Kysela Date: Fri Jan 8 09:11:18 2010 +0100 Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel commit 4cd7d9247ffa2a27508c69563b66713519c196f5 Author: Bartlomiej Zolnierkiewicz Date: Fri Jan 8 00:11:01 2010 -0800 scc_pata: fix module unloading scc_pata host driver predated module unloading support for IDE host drivers so even though it supports PCI hot-unplug and implements PCI device ->remove method it doesn't allow module removal. Fix it. Add missing __init/__exit tags to module_init/module_exit functions while at it (from Peter Huewe). Noticed-by: Jiri Kosina Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit cd9d95a55550555da8e587ead9cbba5f98a371a3 Author: Ken Prox Date: Fri Jan 8 09:01:47 2010 +0100 ALSA: hda - conexant - Fixed microphone mixer for HP Compaq Presario F700 Added patch for Hewlett-Packard Company Device Subsystem id - 103c:30ea. Signed-off-by: Ken Prox Signed-off-by: Jaroslav Kysela commit 368c0ca2f0a69b0818fbc1796d8e21ff02a61b4c Author: Sarveshwar Bandi Date: Fri Jan 8 00:07:27 2010 -0800 be2net: implements ethtool function to read eeprom data. The patch implements a firmware command to fetch the eeprom data. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 8c0b8139c87cfe8b95c6e763b4ca3190aa9b1ad0 Author: Paul Mundt Date: Fri Jan 8 17:02:17 2010 +0900 sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions. The LL/SC and IRQ versions were using generic stubs while the GRB version was just reimplementing what it already had for the standard cmpxchg() code. As we have optimized cmpxchg() implementations that are decoupled from the atomic code, simply falling back on the generic wrapper does the right thing. With this in place the GRB case is unaffected while the LL/SC case gets to use its optimized cmpxchg(). Signed-off-by: Paul Mundt commit a3aa18842a5303fc28fcc4d57dbd16618bd830a0 Author: Alexey Dobriyan Date: Thu Jan 7 11:58:11 2010 +0000 drivers/net/: use DEFINE_PCI_DEVICE_TABLE() Use DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section in every case. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit dd3533eca859a6debb1565503ec03e68354e08e0 Author: Krzysztof Helt Date: Fri Jan 1 19:05:43 2010 +0100 ALSA: ac97_codec: merge WM9703 and WM9705 ops The WM9705 and WM9703 ops are the same actually so use the same code for both. Signed-off-by: Krzysztof Helt Signed-off-by: Jaroslav Kysela commit 7b3a177b0d4f92b3431b8dca777313a07533a710 Author: Jaroslav Kysela Date: Fri Jan 8 08:43:01 2010 +0100 ALSA: pcm_lib: fix "something must be really wrong" condition When runtime->periods == 1 or when pointer crosses end of ring buffer, the delta might be greater than buffer_size. Signed-off-by: Jaroslav Kysela commit faad98f29606d9d3c6bddae7c88693be37d2fb43 Author: Roel Kluin Date: Fri Jan 8 14:19:21 2010 +1100 crypto: geode-aes - access .cip instead of .blk in cipher mode The fallback code in cipher mode touch the union fallback.blk instead of fallback.cip. This is wrong because we use the cipher and not the blockcipher. This did not show any side effects yet because both types / structs contain the same element right now. Signed-off-by: Roel Kluin Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Herbert Xu commit d7ac769068df87ca8c7f72d99cf67ead16739f18 Author: Roel Kluin Date: Fri Jan 8 14:18:34 2010 +1100 crypto: aes_s390 - access .cip instead of .blk in cipher mode The fallback code in cipher mode touch the union fallback.blk instead of fallback.cip. This is wrong because we use the cipher and not the blockcipher. This did not show any side effects yet because both types / structs contain the same element right now. Signed-off-by: Roel Kluin Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Herbert Xu commit 108316c1bd0a75ba855ce4a6540c530e1562bfb0 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:23 2010 +0000 stmmac: update the driver's module version Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 7187c1ad1a2a005fa24aa14fa5b0e4c8322c0cd2 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:22 2010 +0000 stmmac: improve Kconfig help Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 5e33c791233b7da47b5403344a915c1b7edaaad8 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:21 2010 +0000 stmmac: include netdevice.h into the common.h header Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 21d437cc66dcfd0119a4905214fbbe19f3e276dc Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:20 2010 +0000 stmmac: rename the gmac as dwmac1000 and split core and dma parts Use dwmac1000 naming instead of gmac. The patch also splits the gmac.c file in two new ones: dwmac1000_core.c and dwmac1000_dma.c. This could actually help on some architectures where different DMA engines are used. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 7e848ae113ca7442ba6b44168fa2238224f37e8a Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:19 2010 +0000 stmmac: rename mac100 as dwmac100 and fix spare coding style This patch renames the mac100.[ch] as dwmac100.[ch]; this looks more specific and appropriate for these chip series. The patch also fixes some spare coding style issues. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit aec7ff278145280c2c78377aeb98feed02c8b636 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:18 2010 +0000 stmmac: move the dma out from the main This patch moves the dma related functions (interrupt, start, stop etc.) out from the main driver code. This will help to support new DMA engines. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit db98a0b001df79ffcdd4f231c3516411786a1113 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:17 2010 +0000 stmmac: reorganise class operations. This patch reorganises the internal stmmac ops structure. The stmmac_ops has been splitted into other three structures named: stmmac_ops stmmac_dma_ops stmmac_desc_ops This makes the code more clear and also helps the next work to make the driver more generic. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 65818fa744e70a58d230083dda1f1cd8e5c5e2ee Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:16 2010 +0000 stmmac: do not call fix_mac_speed if NULL On some platforms, fix_mac_speed is used for configuring some sysconf registers according to the working speed. This patch fixes the fix_mac_speed invocation that cannot be done if it is a NULL pointer. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit ca5f12c1a82cf72ce73617dfc8ef56faf6fec30a Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:15 2010 +0000 stmmac: perform hw bus configuration On some platforms it can be required a different configuration of the bus. This can be done by invoking the bus_setup. It is defined for all the platforms that needs this kind of configuration. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit ee7946a77858f417227cf57cd647729d0dd75761 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:14 2010 +0000 stmmac: rewiew platform data This patch rewiews and reorganises all the data come from the platform removing any dependency from the stm code. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 3c9732c06879d85f2fdf7ec69198c1d78da42a98 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:13 2010 +0000 stmmac: add the new Header file for stmmac platform data Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 609634799eba48bb9e80ce56dfd87930f17bf6fa Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:12 2010 +0000 stmmac: convert unicast addr list to list_head This patch converts unicast address list to standard list_head using previously introduced struct netdev_hw_addr. Note: this patch also removes a debug printk used for displaying the mac addresses. Indeed, it's is possible to dump the registers with ethtool. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 109cdd66485b639b2fbfcbf59ae7ef1286520705 Author: Giuseppe CAVALLARO Date: Wed Jan 6 23:07:11 2010 +0000 stmmac: use MII_BUS_ID_SIZE instead of BUS_ID_SIZE Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 596a530bb3af746d33ea2910a0569b9825279979 Author: hartleys Date: Thu Jan 7 13:27:46 2010 +0000 drivers/net/skfp/skfddi.c: use %pMF to show MAC address Use the %pMF kernel extension to display the MAC address. The address will still be displayed in the FDDI Canonical format. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 69d279eaf8f23c7d7cfc0e879c629a92bfc3e3e0 Author: hartleys Date: Thu Jan 7 13:24:19 2010 +0000 drivers/net/defxx.c: use %pMF to show MAC address Use the %pMF kernel extension to display the MAC address. The address will still be displayed in the FDDI Canonical format. Signed-off-by: H Hartley Sweeten Cc: Maciej W. Rozycki Cc: David S. Miller Signed-off-by: David S. Miller commit bc7259a2ce764ea16200eb9e53f6e136e918d065 Author: Joe Perches Date: Thu Jan 7 11:43:50 2010 +0000 lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses On Mon, 2010-01-04 at 23:43 +0000, Maciej W. Rozycki wrote: > The example below shows an address, and the sequence of bits or symbols > that would be transmitted when the address is used in the Source Address > or Destination Address fields on the MAC header. The transmission line > shows the address bits in the order transmitted, from left to right. For > IEEE 802 LANs these correspond to actual bits on the medium. The FDDI > symbols line shows how the FDDI PHY sends the address bits as encoded > symbols. > > MSB: 35:7B:12:00:00:01 > Canonical: AC-DE-48-00-00-80 > Transmission: 00110101 01111011 00010010 00000000 00000000 00000001 > FDDI Symbols: 35 7B 12 00 00 01" > > Please note that this address has its group bit clear. > > This notation is also defined in the "FDDI MEDIA ACCESS CONTROL-2 > (MAC-2)" (X3T9/92-120) document although that book does not have a need > to use the MSB form and it's skipped. Adds 6 bytes to object size for x86 New: $ size lib/vsprintf.o text data bss dec hex filename 8664 0 2 8666 21da lib/vsprintf.o $ size lib/vsprintf.o text data bss dec hex filename 8658 0 2 8660 21d4 lib/vsprintf.o Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 99659a929d653d0c9ce458091870544768add871 Author: Roel Kluin Date: Thu Jan 7 15:35:42 2010 +0100 x86, uv: Remove recursion in uv_heartbeat_enable() The recursion is not needed and does not improve readability. Signed-off-by: Roel Kluin LKML-Reference: <4B45F13E.3040202@gmail.com> Signed-off-by: H. Peter Anvin commit e1e0138d7d10fd447c71cc70f367eac514bd3ce4 Author: Jack Steiner Date: Thu Jan 7 10:12:40 2010 -0600 x86, uv: uv_global_gru_mmr_address() macro fix Fix bug in uv_global_gru_mmr_address macro. Macro failed to cast an int value to a long prior to a left shift > 32. Signed-off-by: Jack Steiner LKML-Reference: <20100107161240.GA2610@sgi.com> Cc: Signed-off-by: H. Peter Anvin commit 5abbbbf0b0cd4abf5898136d0c345dc99b859c8c Author: Brian Gerst Date: Thu Jan 7 11:53:35 2010 -0500 x86: Merge asm/atomic_{32,64}.h Merge the now identical code from asm/atomic_32.h and asm/atomic_64.h into asm/atomic.h. Signed-off-by: Brian Gerst LKML-Reference: <1262883215-4034-4-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 3ce59bb8352e1c53446bef1ead1c63956dfef64a Author: Brian Gerst Date: Thu Jan 7 11:53:34 2010 -0500 x86: Sync asm/atomic_32.h and asm/atomic_64.h Prepare for merging into asm/atomic.h. Signed-off-by: Brian Gerst LKML-Reference: <1262883215-4034-3-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 1a3b1d89eded68d64e5ea409ad37827310059441 Author: Brian Gerst Date: Thu Jan 7 11:53:33 2010 -0500 x86: Split atomic64_t functions into seperate headers Split atomic64_t functions out into separate headers, since they will not be practical to merge between 32 and 64 bits. Signed-off-by: Brian Gerst LKML-Reference: <1262883215-4034-2-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 1250932e48d3b698415b1f04775433cf1da688d6 Author: Jaroslav Kysela Date: Thu Jan 7 15:36:31 2010 +0100 ALSA: pcm_lib - optimize wake_up() calls for PCM I/O As noted by pl bossart , the PCM I/O routines (snd_pcm_lib_write1, snd_pcm_lib_read1) should block wake_up() calls until all samples are not processed. Signed-off-by: Jaroslav Kysela commit f240406babfe1526998e10583ea5eccc2676a433 Author: Jaroslav Kysela Date: Tue Jan 5 17:19:34 2010 +0100 ALSA: pcm_lib - cleanup & merge hw_ptr update functions Do general cleanup in snd_pcm_update_hw_ptr*() routines and merge them. The main change is hw_ptr_interrupt variable removal to simplify code logic. This variable can be computed directly from hw_ptr. Ensure that updated hw_ptr is not lower than previous one (it was possible with old code in some obscure situations when interrupt was delayed or the lowlevel driver returns wrong ring buffer position value). Signed-off-by: Jaroslav Kysela commit 4d96eb255c53ab5e39b37fd4d484ea3dc39ab456 Author: Jaroslav Kysela Date: Sun Dec 20 11:47:57 2009 +0100 ALSA: pcm_lib - add possibility to log last 10 DMA ring buffer positions In some debug cases, it might be usefull to see previous ring buffer positions to determine position problems from the lowlevel drivers. Signed-off-by: Jaroslav Kysela commit 741b20cfb9109760937f403d18d731bfde31f56f Author: Jaroslav Kysela Date: Thu Dec 17 17:34:39 2009 +0100 ALSA: pcm_lib.c - convert second xrun_debug() parameter to use defines To increase code readability, convert send xrun_debug() argument to use defines. Signed-off-by: Jaroslav Kysela commit cf30273bea4a9d368a31869ccc6ad618e4413b66 Author: H Hartley Sweeten Date: Thu Jan 7 01:18:23 2010 -0800 drivers/message/i2o/i2o_proc.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit eacc4d6a7dc447ec4fc219af129e0fe50d21d8f7 Author: H Hartley Sweeten Date: Thu Jan 7 01:17:27 2010 -0800 drivers/infiniband/hw/cxgb3/iwch_cm.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. The only difference in the output is that the MAC address is shown in the usual colon-separated hex notation. Signed-off-by: H Hartley Sweeten Acked-by: Steve Wise Signed-off-by: David S. Miller commit 4754b3de93f893e85d811031ff742fc7a4f53db4 Author: hartleys Date: Tue Jan 5 07:00:57 2010 +0000 drivers/net/wimax/i2400m/driver.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit fcb635e8c6d68bf06531603a1caa6e59ba7e356d Author: hartleys Date: Tue Jan 5 06:58:12 2010 +0000 drivers/net/qlge/qlge_main.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 1b8e664d34f2f551fd6c2d40033d29c13551292c Author: hartleys Date: Tue Jan 5 06:55:40 2010 +0000 drivers/net/atl1e/atl1e_main.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. The only difference in the output is that the MAC address is shown in the usual colon-separated hex notation. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 595acf270e098ee3af92890253c5db41bc85de88 Author: hartleys Date: Tue Jan 5 07:01:54 2010 +0000 drivers/net/wimax/i2400m/fw.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 829911725f4bb72c30480aab756704d588c7cd1e Author: hartleys Date: Tue Jan 5 06:54:01 2010 +0000 drivers/net/atl1c/atl1c_main.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. The only difference in the output is that the MAC address is shown in the usual colon-separated hex notation. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit bf54e73691158a634ff72ebc139f38c4fa7b83f0 Author: hartleys Date: Tue Jan 5 06:59:23 2010 +0000 drivers/net/vxge/vxge-main.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 0e05a613f40a1210a050ebd1ecfd5434420ae5b2 Author: hartleys Date: Tue Jan 5 06:45:21 2010 +0000 drivers/media/dvb/dvb-core/dvb_net.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address and mask. The only difference in the output is that the output is shown in the usual colon-separated hex notation. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 8d9ded23b3259c7f6883e97284e949af7afd4e40 Author: hartleys Date: Tue Jan 5 06:26:49 2010 +0000 drivers/atm/lanai.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 3008ab36e23623cbe7a53bff2d495eca5426a9ce Author: hartleys Date: Tue Jan 5 06:22:20 2010 +0000 drivers/atm/fore200e.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 2c35294853b2e977bdfc9e401b7b6d881fcaa69b Author: hartleys Date: Tue Jan 5 06:37:43 2010 +0000 drivers/firmware/iscsi_ibft.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Also, remove the 'mac' variable and use nic->mac directly. Signed-off-by: H Hartley Sweeten Acked-by: Peter Jones Cc: David S. Miller Signed-off-by: David S. Miller commit aaa09ee7287d31f57f4dc8b4acca5cd59c1595f5 Author: hartleys Date: Tue Jan 5 06:24:23 2010 +0000 drivers/atm/idt77252.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit ce7194d889996fb8f724148bc85a0c2c79da7b8e Author: hartleys Date: Tue Jan 5 06:56:52 2010 +0000 drivers/net/ixgbe/ixgbe_common.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. The only difference in the output is that the MAC address is shown in the usual colon-separated hex notation. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 1154b299e7924f2ae8bb3ca479a6942e1edd78fc Author: hartleys Date: Tue Jan 5 06:28:08 2010 +0000 drivers/atm/nicstar.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: David S. Miller Signed-off-by: David S. Miller commit 2d13bafeba24f732e89b818b8c66b07893457570 Author: Jesper Dangaard Brouer Date: Tue Jan 5 05:50:52 2010 +0000 net: Make it easier to parse /proc/net/dev contents. The contents of /proc/net/dev is annoying to parse, because it changes whether there is a space after the "ethX:" or not. It depends upon the size of the "Receive bytes" counter, if the number is below 7 digits, then there is whitespaces else if the number is 8 digits or above there is no space between the ":" and the number. This patch changes the output to assure there is always a space between the ":" and the number. Given that all existing userspace application already need to handle the whitespaces, I see no breakage of existing tools. Signed-off-by: Jesper Dangaard Brouer Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 65324144b50bc7022cc9b6ca8f4a536a957019e3 Author: Jesper Dangaard Brouer Date: Tue Jan 5 05:50:47 2010 +0000 net: RFC3069, private VLAN proxy arp support This is to be used together with switch technologies, like RFC3069, that where the individual ports are not allowed to communicate with each other, but they are allowed to talk to the upstream router. As described in RFC 3069, it is possible to allow these hosts to communicate through the upstream router by proxy_arp'ing. This patch basically allow proxy arp replies back to the same interface (from which the ARP request/solicitation was received). Tunable per device via proc "proxy_arp_pvlan": /proc/sys/net/ipv4/conf/*/proxy_arp_pvlan This switch technology is known by different vendor names: - In RFC 3069 it is called VLAN Aggregation. - Cisco and Allied Telesyn call it Private VLAN. - Hewlett-Packard call it Source-Port filtering or port-isolation. - Ericsson call it MAC-Forced Forwarding (RFC Draft). Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit ca8d9ea30bc79b2965a1d169dcb2f48f02af4d2d Author: Andy Gospodarek Date: Wed Jan 6 12:56:37 2010 +0000 fix bonding: allow arp_ip_targets on separate vlans to use arp validation On Wed, Jan 06, 2010 at 10:10:03PM +0100, Eric Dumazet wrote: > Le 06/01/2010 19:38, Eric Dumazet a écrit : > > > > (net-next-2.6 doesnt work well on my bond/vlan setup, I suspect I need a bisection) > > David, I had to revert 1f3c8804acba841b5573b953f5560d2683d2db0d > (bonding: allow arp_ip_targets on separate vlans to use arp validation) > > Or else, my vlan devices dont work (unfortunatly I dont have much time > these days to debug the thing) > > My config : > > +---------+ > vlan.103 -----+ bond0 +--- eth1 (bnx2) > | + > vlan.825 -----+ +--- eth2 (tg3) > +---------+ > > $ cat /proc/net/bonding/bond0 > Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009) > > Bonding Mode: fault-tolerance (active-backup) > Primary Slave: None > Currently Active Slave: eth2 > MII Status: up > MII Polling Interval (ms): 100 > Up Delay (ms): 0 > Down Delay (ms): 0 > > Slave Interface: eth1 (bnx2) > MII Status: down > Link Failure Count: 1 > Permanent HW addr: 00:1e:0b:ec:d3:d2 > > Slave Interface: eth2 (tg3) > MII Status: up > Link Failure Count: 0 > Permanent HW addr: 00:1e:0b:92:78:50 > This patch fixes up a problem with found with commit 1f3c8804acba841b5573b953f5560d2683d2db0d. The original change overloaded null_or_orig, but doing that prevented any packet handlers that were not tied to a specific device (i.e. ptype->dev == NULL) from ever receiving any frames. The null_or_orig variable cannot be overloaded, and must be kept as NULL to prevent the frame from being ignored by packet handlers designed to accept frames on any interface. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit d160439e7753aa19092bb12d8f4c6c918f8267e0 Author: Márton Németh Date: Mon Jan 4 13:03:02 2010 +0000 8139too: make PCI device ids constant The id_table field of the struct pci_driver is constant in so it is worth to make pci_device_id also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: David S. Miller commit 82ecbcb9c6b5257929968d5b0ed536772a9b4ac5 Author: Rémi Denis-Courmont Date: Mon Jan 4 02:02:49 2010 +0000 Phonet: reject unsupported sendmsg/recvmsg flags Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit fea93ecef619b5779ca6984568517b1685079b05 Author: Rémi Denis-Courmont Date: Mon Jan 4 02:02:48 2010 +0000 Phonet: zero-copy GPRS TX Send aligned pipe payload if requested to do so. Then, the socket buffer needs not be fragmented anymore. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit fc6a110754476362f9f4fa3199a637f2331c5993 Author: Rémi Denis-Courmont Date: Mon Jan 4 02:02:47 2010 +0000 Phonet: zero-copy aligned GPRS RX Newer Nokia cellular modems can use aligned payload for their GPRS pipe. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 8cab9ba10493cea164ac8bbbc733c21a528e6fe5 Author: Dmitry Torokhov Date: Wed Jan 6 23:52:12 2010 -0800 Input: elo - switch to using dev_xxx() when printing messages Also fix formatting of "switch" statements. Signed-off-by: Dmitry Torokhov commit a9a1f9c315c27fe7a260cd453167981cd680dae8 Author: Dmitry Torokhov Date: Wed Jan 6 23:51:47 2010 -0800 Input: atkbd - switch to dev_err() and friends dev_err(), dev_warn() and dev_dbg() ensure consistency in driver messages. Also switch to using bool where appropriate and fix some formatting issues. Signed-off-by: Dmitry Torokhov commit 5068c7a883d1694f0fb3631b664827644153cd08 Author: Steffen Klassert Date: Thu Jan 7 15:57:19 2010 +1100 crypto: pcrypt - Add pcrypt crypto parallelization wrapper This patch adds a parallel crypto template that takes a crypto algorithm and converts it to process the crypto transforms in parallel. For the moment only aead algorithms are supported. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit f6de7acc42de909ccc7f00916ddb4d2064f42b67 Author: Joe Perches Date: Mon Jan 4 11:53:03 2010 +0000 drivers/net/mac8390.c: Add mac8390_init function Reduce indentation, make code a little neater. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 8e4d9696b45d966c7af5b2aeb6f98ff687c58964 Author: Joe Perches Date: Mon Jan 4 11:53:02 2010 +0000 drivers/net/mac8390.c: Checkpatch cleanups Use #include Signed-off-by: David S. Miller commit 18c0019102228875cb0f6f252dad5148491e96b2 Author: Joe Perches Date: Mon Jan 4 11:53:01 2010 +0000 drivers/net/mac8390.c: Convert printk(KERN_ to pr_( Use printk_once Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Convert printks without KERN_ to pr_info and pr_cont Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 5c7fffd0e3b57cb63f50bbd710868f012d67654f Author: Joe Perches Date: Mon Jan 4 11:53:00 2010 +0000 drivers/net/mac8390.c: Remove useless memcpy casting Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 35076402a9936fa8a73b57a1f97fecbeceeec34a Author: Joe Perches Date: Mon Jan 4 11:52:59 2010 +0000 drivers/net/mac8390.c: Indent case labels Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 698244ace8b63896565022143ab19f141bc48993 Author: Giuseppe Cavallaro Date: Wed Jan 6 20:35:14 2010 -0800 phy: SMSC device Energy Detect power-down mode SMSC Ethernet Transceivers (LAN88710, LAN8710, LAN8720, LAN8187, LAN8700, LAN83C185) provide a mechanism to conserve power when the device is not connected to an active link partner (Energy Detect Mode). So this patch enables the Energy Detect power-down mode for these Transceivers. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 635267130855e91f4681df5e4d26ca9ce908447f Author: Ron Mercer Date: Sat Jan 2 10:37:44 2010 +0000 qlge: Add napi gro frags interface. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 4f848c0a9c265cb3457fbf842dbffd28e82a44fd Author: Ron Mercer Date: Sat Jan 2 10:37:43 2010 +0000 qlge: Add RX frame handlers for non-split frames. New handlers are added here to handle: 1) Small frames (<256 bytes) in a single small buffer. Allocate a new skb and copy the frame. 2) Large frame (>256 bytes) in a page chunk. Allocate an skb, tack it on frags, post to napi_gro_receive(). Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 572c526fb19a9a24098de814ab0601c1ce1bac82 Author: Ron Mercer Date: Sat Jan 2 10:37:42 2010 +0000 qlge: Turn on RX header split based on platform. Using 4-byte aligned headers is problematic for some architectures. Since qlge uses 4-byte aligned rx buffers we split headers for these architectures into a separate buffer and then recopy to align on 2-byte boundary. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit c36531b9b2e00d9715c3a0f5788ac5311435e078 Author: Mike McCormack Date: Thu Dec 31 00:55:31 2009 +0000 sky2: Lock transmit queue while disabling device netif_device_detach() does not take the tx_lock, so it's possible that a call to sky2_xmit_frame is still in progress after netif_device_detach() is complete. Take netif_tx_lock() to make sure all transmits have stopped while we're disabling the devices and that no other CPU is still transmitting a frame after we've disabling the device. Proposed fix for "sky2 panic under load" reported by Berck E. Nash. Signed-off-by: Mike McCormack Signed-off-by: David S. Miller commit c32bbff81c04096c7888aed3946ee90fdbfbc3a3 Author: Mike McCormack Date: Thu Dec 31 00:49:43 2009 +0000 sky2: Refactor sky2_get_regs into two functions Separate code deciding which registers can be accessed out of sky2_get_regs in preparation for adding more conditions into it. Signed-off-by: Mike McCormack Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6a4ef48103a78a46b80e07fcd8ac4edda0c7128f Author: Yehuda Sadeh Date: Thu Dec 31 12:04:58 2009 -0800 ceph: fix copy_user_to_page_vector() The function was broken in the case where there was more than one page involved, broke the ceph sync_write case. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit d931369b74b3d6f2044f595af6f3dd074f65d9cf Author: Steven Rostedt Date: Wed Jan 6 17:27:11 2010 -0500 tracing: Add stack dump to trace_printk if stacktrace option is set If the ftrace stacktrace option is set, then add the stack dumps to trace_printk. Requested-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit dfaa9e2c5707b2c217c0121aac796e0fa3051482 Author: Wolfram Sang Date: Tue Jan 5 21:41:22 2010 +0100 tracing: Use appropriate perl constructs in recordmcount.pl Modified recordmcount.pl to use perl constructs that are still understandable by C hackers that are not perl programmers. Signed-off-by: Wolfram Sang LKML-Reference: <1262724082-9517-1-git-send-email-w.sang@pengutronix.de> Signed-off-by: Steven Rostedt commit 13d7e9385644d376a0816ad663ba3dfc45359f2f Author: Steven Rostedt Date: Wed Jan 6 17:56:12 2010 -0500 kconfig: Check for if conditions in Kconfig for localmodconfig The streamline_config.pl misses the if conditions for checking dependencies. For Kconfigs with the following construct: if MEDIA_SUPPORT config VIDEO_DEV [...] If VIDEO_DEV was enabled, the script will miss the fact that MEDIA_SUPPORT is also needed. This patch changes streamline_config.pl to include if conditions into the dependencies of configs. Reported-by: Anton Blanchard Tested-by: Anton Blanchard Signed-off-by: Steven Rostedt commit cfa6cb2048beb35ae7f1d2fa19160aab240557d1 Merge: 8271195 8a5b33f Author: John W. Linville Date: Wed Jan 6 17:22:54 2010 -0500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: net/mac80211/scan.c net/mac80211/wme.c commit 17263baf958b7ab1d8c60445f412a1080362c88c Author: Steven Rostedt Date: Wed Jan 6 16:43:08 2010 -0500 kconfig: Create include/generated for localmodconfig If someone downloads a brand new kernel and runs localmodconfig or localyesconfig, the ending result will report: *** Error during update of the kernel configuration. This is because localmodconfig and localyesconfig must create the include/generated directory to place the autoconf.h file. Signed-off-by: Steven Rostedt commit dc4f8845ee2ca39fe054a2d911729ffd269b4b66 Author: Wolfram Sang Date: Tue Jan 5 19:27:51 2010 +0100 tracing: optimize recordmcount.pl for offsets-handling - move check for open file in front of the writing loop - use perl-constructs to access the array Signed-off-by: Wolfram Sang LKML-Reference: <1262716072-14414-2-git-send-email-w.sang@pengutronix.de> Signed-off-by: Steven Rostedt commit 7e53bd42d14c75192b99674c40fcc359392da59d Author: Lai Jiangshan Date: Wed Jan 6 20:08:50 2010 +0800 tracing: Consolidate protection of reader access to the ring buffer At the beginning, access to the ring buffer was fully serialized by trace_types_lock. Patch d7350c3f4569 gives more freedom to readers, and patch b04cc6b1f6 adds code to protect trace_pipe and cpu#/trace_pipe. But actually it is not enough, ring buffer readers are not always read-only, they may consume data. This patch makes accesses to trace, trace_pipe, trace_pipe_raw cpu#/trace, cpu#/trace_pipe and cpu#/trace_pipe_raw serialized. And removes tracing_reader_cpumask which is used to protect trace_pipe. Details: Ring buffer serializes readers, but it is low level protection. The validity of the events (which returns by ring_buffer_peek() ..etc) are not protected by ring buffer. The content of events may become garbage if we allow another process to consume these events concurrently: A) the page of the consumed events may become a normal page (not reader page) in ring buffer, and this page will be rewritten by the events producer. B) The page of the consumed events may become a page for splice_read, and this page will be returned to system. This patch adds trace_access_lock() and trace_access_unlock() primitives. These primitives allow multi process access to different cpu ring buffers concurrently. These primitives don't distinguish read-only and read-consume access. Multi read-only access is also serialized. And we don't use these primitives when we open files, we only use them when we read files. Signed-off-by: Lai Jiangshan LKML-Reference: <4B447D52.1050602@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 0fa0edaf32b9a78b9854f1da98d4511a501089b0 Author: Lai Jiangshan Date: Tue Dec 15 15:39:57 2009 +0800 tracing: Remove show_format and related macros from TRACE_EVENT The previous patches added the use of print_fmt string and changes the trace_define_field() function to also create the fields and format output for the event format files. text data bss dec hex filename 5857201 1355780 9336808 16549789 fc879d vmlinux 5884589 1351684 9337896 16574169 fce6d9 vmlinux-orig The above shows the size of the vmlinux after this patch set compared to the vmlinux-orig which is before the patch set. This saves us 27k on text, 1k on bss and adds just 4k of data. The total savings of 24k in size. Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D4D.40604@cn.fujitsu.com> Acked-by: Masami Hiramatsu Signed-off-by: Steven Rostedt commit 5a65e956220efc2421e21ee56d6153fd5c533a95 Author: Lai Jiangshan Date: Tue Dec 15 15:39:53 2009 +0800 tracing: Use defined fields and print_fmt to print formats The calls ftrace_format_##call() and ftrace_define_fields_##call() are almost duplicate in functionality. With the addition of the print_fmt in previous patches, these two functions can be merged into one. The trace_define_field() defines the fields and links them into the struct ftrace_event_call. The previous patches introduced the print_fmt field and this can now be used with the trace_define_field() to create the event format file fields and print_fmt field. The struct ftrace_event_call->fields are used to print the fields The struct ftrace_event_call->print_fmt is used to print the "print fmt: XXXXXXXXXXX" line. Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D49.5000006@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit c7ef3a9004201bca90626db246a19dadd2c29c9b Author: Steven Rostedt Date: Mon Dec 28 21:13:59 2009 -0500 tracing: Have syscall tracing call its own init function In the clean up of having all events call one specific function, the syscall event init was changed to call this helper function. With the new print_fmt updates, the syscalls need to do special initializations. This patch converts the syscall events to call its own init function again. Cc: Lai Jiangshan Cc: Li Zefan Signed-off-by: Steven Rostedt commit a342a0280b981c130e32dbb94dbd3a57959c4d04 Author: Lai Jiangshan Date: Tue Dec 15 15:39:49 2009 +0800 tracing/kprobes: Init print_fmt for kprobe events This is part of a patch set that removes the show_format method in the ftrace event macros. Add the print_fmt initialization to the kprobe events. The print_fmt is still not used, but will be in the follow up patches. Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D45.3080100@cn.fujitsu.com> Acked-by: Masami Hiramatsu Signed-off-by: Steven Rostedt commit 50307a45f8515f6244e3b08e6b19824b9fbfe293 Author: Lai Jiangshan Date: Tue Dec 15 15:39:45 2009 +0800 tracing/syscalls: Init print_fmt for syscall events This is part of a patch set that removes the show_format method in the ftrace event macros. Add the print_fmt initialization to the syscall events. The print_fmt is still not used, but will be in the follow up patches. Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D41.609@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 509e760cd91c831983097ae174cb6c0b8c6c8e6b Author: Lai Jiangshan Date: Tue Dec 15 15:39:42 2009 +0800 tracing: Add print_fmt field This is part of a patch set that removes the show_format method in the ftrace event macros. The print_fmt field is added to hold the string that shows the print_fmt in the event format files. This patch only adds the field but it is currently not used. Later patches will use this field to enable us to remove the show_format field and function. Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D3E.2000704@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 809826a389040e0ad9d646b587bccc0e34691afd Author: Lai Jiangshan Date: Tue Dec 15 15:39:34 2009 +0800 tracing: Have __dynamic_array() define a field This is part of a patch set that removes the show_format method in the ftrace event macros. This patch set requires that all fields are added to the ftrace_event_call->fields. This patch changes __dynamic_array() to call trace_define_field() to include fields that use __dynamic_array(). Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D36.8090100@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 54a6593d65e638ad7e1e8cc986159d76054dab4b Author: Stefan Glasenhardt Date: Tue Jan 5 23:30:30 2010 +0100 HID: allow disabling hard-coded ISO-layout for Apple keyboards This patch adds a new option named "iso_layout" to the driver "hid-apple.ko", to allow disabling of the hard-coded ISO-layout. Disabling the hard-coded layout solves the problem that the kernel-module only works perfectly for the english/american version of the Apple aluminum keyboard. Other versions have swapped keys, e.g. the "<"-key is swapped with "^"-key on the german keyboard. There is a very long bug-entry on Launchpad to this problem: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/214786 Signed-off-by: Stefan Glasenhardt Signed-off-by: Jiri Kosina commit 16295bec6398a3eedc9377e1af6ff4c71b98c300 Author: Steffen Klassert Date: Wed Jan 6 19:47:10 2010 +1100 padata: Generic parallelization/serialization interface This patch introduces an interface to process data objects in parallel. The parallelized objects return after serialization in the same order as they were before the parallelization. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 3032458e38b583c92842818871e85c0f936b8645 Author: Dmitry Torokhov Date: Wed Jan 6 00:33:07 2010 -0800 Input: psmouse - remove unused 'autocal' parameter from hgpk protocol Signed-off-by: Dmitry Torokhov commit 92a3a58788790645c6143b5353ef065fd26110bb Author: Dmitry Torokhov Date: Tue Jan 5 17:56:01 2010 -0800 Input: cleanse capabilities bits before registering device To avoid showing garbage in capability bits, zero out bitmasks absent from dev->evbit in case driver inadvertently leaves some garbage there. Signed-off-by: Dmitry Torokhov commit 4f93df40859cf471774f6ef3ec7f2870c2e8e260 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:00 2010 -0800 Input: automatically reset KEY_RESERVED bit for all input devices KEY_RESERVED is not supposed to be reported to userspace but rather to mark unused entries in keymaps. Acked-by: Henrique de Moraes Holschuh Signed-off-by: Dmitry Torokhov commit fc99ec6f4b6116305bca56a781b8b3b2ac054d27 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:03 2010 -0800 Input: gameport - switch to using pr_xxx() and dev_xxx() pr_xxx() and dev_xxx() helpers ensure that all messages emitted by the module have consistent prefixes, so let's use them. Also fix some formatting issues. Signed-off-by: Dmitry Torokhov commit d621af473079851caac873adc5431a05c9d78dfd Author: Dmitry Torokhov Date: Tue Jan 5 17:56:03 2010 -0800 Input: gameport - make use of list_first_entry() helper Signed-off-by: Dmitry Torokhov commit 361b7b5b032338361ea88412f1fc45479fdd5859 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:03 2010 -0800 Input: gameport - let device core tell us if device was registered No need to keep track of it by ourselves. Signed-off-by: Dmitry Torokhov commit cac9169bf75ea8cbaab75be9dbe5eb79a2bad6f5 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:04 2010 -0800 Input: serio - use pr_xxx() and dev_xxx() helpers pr_xxx() and dev_xxx() helpers ensure that all messages emitted by the module have consistent prefixes, so let's use them. Also fix some formatting issues. Signed-off-by: Dmitry Torokhov commit 4516c8183213b59c3645d810ccb04b70c2606743 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:04 2010 -0800 Input: serio - use list_first_entry() helper Signed-off-by: Dmitry Torokhov commit ddf1ffbd40c92ff1e58c45fa96d309788f7beb60 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:04 2010 -0800 Input: serio - let device core tell us if device was registered No need to keep track of it by ourselves. Signed-off-by: Dmitry Torokhov commit 386d8772980be01b94bd463ea1e745732d7eb502 Author: Dmitry Torokhov Date: Tue Jan 5 17:56:03 2010 -0800 Input: serio - use device core to create 'id' attribute group Instead of creating 'id' sysfs attribute group by ourselves rely on device core to do that for us. Signed-off-by: Dmitry Torokhov commit fa94ddea2b29fdda7640672c8a933dbd901f0278 Merge: 6fbfe8d 56d45b6 Author: Paul Mundt Date: Wed Jan 6 15:49:08 2010 +0900 Merge branch 'master' into sh/hw-breakpoints commit 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 Author: Paul Mundt Date: Wed Jan 6 15:46:53 2010 +0900 sh: select HAVE_HW_BREAKPOINT for all SUPERH32 CPUs. All SH CPUs (with the exception of sh64) support the UBC, so select HW_BREAKPOINT support by default. This fixes up the build for non-SH4A targets. Signed-off-by: Paul Mundt commit 56d45b62ce622a003da972428fdbba2b42102efb Author: Paul Mundt Date: Wed Jan 6 14:45:14 2010 +0900 sh: Fix up nommu build for out-of-line pgtable changes. pgtable_cache_init() has been moved out-of-line, so we also need a dummy definition for it on nommu to fix up the build. Signed-off-by: Paul Mundt commit 8271195e38d01f3551bb10b1c7de856cd8507882 Author: John W. Linville Date: Tue Jan 5 17:57:20 2010 -0500 wireless: fix build breakage when CONFIG_CFG80211_REG_DEBUG not set Bad macro definition in "cfg80211: add a regulatory debug print"... Signed-off-by: John W. Linville commit 4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a Merge: f3f66b6 7a4a77b Author: John W. Linville Date: Tue Jan 5 17:18:59 2010 -0500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: net/mac80211/iface.c commit f3f66b69c8ff08b46975d9e99c7ecb92a8b12eda Author: Christian Lamparter Date: Mon Jan 4 00:52:56 2010 +0100 mac80211: fix ampdu_action tx_start ssn The start_seq_num is taken from the station's tid_seq[tid]. This is fine, except tid_seq sequence counter is shifted by 4 bits to accommodate for frame fragmentation. Both (iwlagn & ath9k) were unaffected by this minor glitch, because they don't read the *ssn for the AMPDU_TX_START action. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 341c97918ab7e84a155ea8b18759425304d213b6 Author: Lennert Buytenhek Date: Mon Jan 4 21:58:40 2010 +0100 mwl8k: pass GET_HW_SPEC capability bitmask up the stack This enables HT association and AMPDU in the receive direction for STA firmware images on hardware that supports it. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit a2292d83b5dcb7f378956a124854d2b17fa53aa3 Author: Lennert Buytenhek Date: Mon Jan 4 21:58:12 2010 +0100 mwl8k: trivial rx-only ampdu implementation AMPDU receive doesn't need any special handling, so let's enable this before tackling the transmit side. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 13935e2cf39b124c9a2ff0349b294e0b1e2e3aef Author: Lennert Buytenhek Date: Mon Jan 4 21:57:59 2010 +0100 mwl8k: pass in HT capabilities and rates when associating Pass the AP's MCS rate mask to SET_RATE when associating, and make UPDATE_STADB pass in the peer's HT caps and rates when adding a new hardware station database entry. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 610677d2f0415570a7590790e8be376a946cd08b Author: Lennert Buytenhek Date: Mon Jan 4 21:56:46 2010 +0100 mwl8k: allow setting HT channels Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 9e1b17ead81e72d3db37b4cf15cde1f613603822 Author: Lennert Buytenhek Date: Mon Jan 4 21:56:19 2010 +0100 mwl8k: add support for 88w8363 in STA mode Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c3cbbe8a5cd2886e13e9c93e059d9761f3715665 Author: Lennert Buytenhek Date: Mon Jan 4 21:56:07 2010 +0100 mwl8k: fix changed flags handling in mwl8k_bss_info_changed() Previously, mwl8k_bss_info_changed() would refuse to do anything if the 'changed' argument indicated that the association status hadn't changed. Fix this up so that it will allow changing things like the preamble type, the slot time and the CTS-to-self protection method without having to reassociate. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit c6e9601071173fed2a77f9c435c41f3b33d1018f Author: Lennert Buytenhek Date: Mon Jan 4 21:55:52 2010 +0100 mwl8k: honor peer rate set When calling SET_RATE, SET_AID, or when creating a station database entry for our AP, pass in the AP's rate set instead of just blindly enabling all legacy rates, so as to end up doing the right thing when talking to 11b-only APs. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit a680400e8ac32adda81b5e2d7f23dfac63e064fe Author: Lennert Buytenhek Date: Mon Jan 4 21:55:42 2010 +0100 mwl8k: move ->peer_id from mwl8k_vif to mwl8k_sta For STA firmware, move the per-peer hardware station ID to the driver-private part of struct ieee80211_sta, where it belongs. (Since issuing a hardware station database maintenance command sleeps, we can't hold a reference to the ieee80211_sta * across the command, and since we won't know the station ID until after the command completes, we need to re-lookup the sta when the command is done to write the returned station ID back to its driver-private part.) Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 0a11dfc36604d9b24deda17461b7ea69851846aa Author: Lennert Buytenhek Date: Mon Jan 4 21:55:21 2010 +0100 mwl8k: remove mwl8k_vif::bssid, which is now useless Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit bbfd9128d3b4a80bea017ebdd47b31a80dc7eadf Author: Lennert Buytenhek Date: Mon Jan 4 21:55:12 2010 +0100 mwl8k: handle station database update for AP's sta entry via ->sta_notify() Inserting and removing a hardware station database entry for the AP when we are in managed mode is currently done in ->bss_info_changed(). To prepare for adding AP mode support, implement the ->sta_notify() driver method, and let that handle inserting and removing the hardware station database entry for our AP instead. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 25d81b1e1a0cca41a71a08468a7d3a4c751c8565 Author: Lennert Buytenhek Date: Mon Jan 4 21:54:41 2010 +0100 mwl8k: move struct peer_capability_info to its only user Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 9a2303b93039d0f3dd578cd75fe20ebaf075f1cb Author: Lennert Buytenhek Date: Mon Jan 4 21:54:25 2010 +0100 mwl8k: make the tx ring drain status messages somewhat more friendly Old: > phy0: timeout waiting for tx rings to drain (9 -> 5 pkts), retrying > phy0: timeout waiting for tx rings to drain (5 -> 2 pkts), retrying > phy0: tx rings drained New: > phy0: waiting for tx rings to drain (9 -> 5 pkts) > phy0: waiting for tx rings to drain (5 -> 2 pkts) > phy0: tx rings drained Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 153458ff7ed5949cd5b07a2355a34aad9891ad98 Author: Lennert Buytenhek Date: Mon Jan 4 21:54:08 2010 +0100 mwl8k: prevent freeing free IRQ if ieee80211_register_hw() fails Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 91942230689c1758685499e82e53769d5e7f32eb Author: Lennert Buytenhek Date: Mon Jan 4 21:53:54 2010 +0100 mwl8k: bail out if there is no AP firmware image support for this chip Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 4113f75187bfebccc54bf13c0ed09593023b53ca Author: Luis R. Rodriguez Date: Mon Jan 4 11:50:11 2010 -0500 cfg80211: add a regulatory debug print Instead of sprinkling code with ifdef's define REG_DBG_PRINT() instead. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 6976b665fc2b19900659b964bba3b55de08f264f Author: Lennert Buytenhek Date: Sat Jan 2 10:31:50 2010 +0100 mwl8k: update version number to 0.11 Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit fc5f75773c0b3c5b44785e4efcc54c5f496211a9 Author: Kalle Valo Date: Wed Dec 30 15:54:03 2009 +0200 mac80211: fix ieee80211_change_mac() to use struct sockaddr Setting the mac address from user space was buggy. For example, when executing this command: ip link set wlan0 address 00:1f:df:88:cd:55 mac80211 used the address 01:00:00:1f:df:88 instead. It was shifted two bytes. The reason was that the addr (type of void *) provided to ieee80211_change_mac() is actually of type struct sockaddr, not just the mac address array. Also the call to eth_mac_addr() expects the address to be struct sockaddr. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 1990ca6113399be9249433d5ab377a2a444f1dd8 Author: Kalle Valo Date: Wed Dec 30 14:42:20 2009 +0200 mac80211: fix a warning related to pointer conversion to u64 cookie On a 32 bit system (in this case an omap 3430 system) gcc warned about pointer conversion: net/mac80211/work.c: In function 'ieee80211_remain_on_channel_timeout': net/mac80211/work.c:534: warning: cast from pointer to integer of different size net/mac80211/work.c: In function 'ieee80211_remain_done': net/mac80211/work.c:1030: warning: cast from pointer to integer of different size net/mac80211/work.c: In function 'ieee80211_wk_remain_on_channel': net/mac80211/work.c:1056: warning: cast from pointer to integer of different size net/mac80211/work.c: In function 'ieee80211_wk_cancel_remain_on_channel': net/mac80211/work.c:1072: warning: cast from pointer to integer of different size Fix it by casting the pointers to unsigned long instead. This makes the compiler happy again. Compile-tested only. Cc: Johannes Berg Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 29401f6630c02ce996561bf2667d84ecdfacb823 Author: Jouni Malinen Date: Tue Dec 29 12:43:58 2009 +0200 mac80211: No need to include WEXT headers here Remove the forgotten linux/wireless.h inclusion from mac80211. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 61b91c1ea31d0d3ae5f848f7f7eab53dd691f8d0 Author: Zhu Yi Date: Thu Dec 24 15:31:10 2009 +0800 iwlwifi: remove linux/utsrelease.h dependency Commit 250cce26d5d03337aec4ff8405121f026adb4a89 uses UTS_RELEASE as the the in-tree iwlwifi driver version. However the inclusion of generated/utsrelease.h makes it a unpleasant behaviour to recompile the driver everytime when utsrelease.h is updated. In fact, the driver module is already built with the UTS_RELEASE information via vermagic of modinfo. Mark the in-tree driver with the version string "in-tree" to distinguish with those old out-of-tree drivers. Reported-by: David Miller Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit becc670a1bda8f240a93e45d9794f9f79713ffdb Author: Mark Brown Date: Mon Jan 4 18:24:50 2010 +0000 mx31ads: Allow enable/disable of switchable supplies They will be automatically powered off at startup so users will need to enable them for use. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit edc34a90613bbb393c019882f85b74f24066ca19 Author: Mark Brown Date: Mon Jan 4 18:24:49 2010 +0000 mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices This means we don't need to go running round working out struct devices at runtime. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit 722612cd51cf1b574c89dff57cc5dbedf1f645bb Author: Jiri Kosina Date: Tue Jan 5 11:45:52 2010 +0100 HID: fix parsing of local delimiter with size 0 Acording to HID standard 1.11, value 0 allows for size being 0. Local delimiter tag has has 0 one of the possible values. Therefore we need to handle this case properly, to be fully compliant with the specification. Reported-by: Marcin Tolysz Signed-off-by: Jiri Kosina commit 9fae4fb3ce38cc657ff0aba570ae875aae2806d4 Author: Paul Mundt Date: Tue Jan 5 19:30:18 2010 +0900 sh: Reclaim TIF_DEBUG. This was used by the old hw-breakpoints API, but now there is nothing is using it anymore, so just kill it off. Signed-off-by: Paul Mundt commit 7025bec9125b0a02edcaf22c2dce753bf2c95480 Author: Paul Mundt Date: Tue Jan 5 19:16:35 2010 +0900 sh: Kill off dead UBC headers. Nothing is using these now, so kill them all off. Signed-off-by: Paul Mundt commit 4352fc1b12fae4c753a063a2f162ddf9277af774 Author: Paul Mundt Date: Tue Jan 5 19:06:45 2010 +0900 sh: Abstracted SH-4A UBC support on hw-breakpoint core. This is the next big chunk of hw_breakpoint support. This decouples the SH-4A support from the core and moves it out in to its own stub, following many of the conventions established with the perf events layering. In addition to extending SH-4A support to encapsulate the remainder of the UBC channels, clock framework support for handling the UBC interface clock is added as well, allowing for dynamic clock gating. This also fixes up a regression introduced by the SIGTRAP handling that broke the ksym_tracer, to the extent that the current support works well with all of the ksym_tracer/ptrace/kgdb. The kprobes singlestep code will follow in turn. With this in place, the remaining UBC variants (SH-2A and SH-4) can now be trivially plugged in. Signed-off-by: Paul Mundt commit 386c5cf7a9a1d6856f17bde43174f751fac1bc0b Author: Uwe Kleine-König Date: Thu Dec 10 10:34:04 2009 +0100 imx/mx2: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard commit f747f935431c796749752037b8cf7d3f76e96b47 Author: Uwe Kleine-König Date: Thu Dec 10 10:25:07 2009 +0100 imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform" Not using MACH_IMX27LITE makes machine_is_imx27lite always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Schaeffer commit bc727390f0a7d7069a39cd97451fa890caa0010e Author: Uwe Kleine-König Date: Thu Dec 10 10:19:43 2009 +0100 imx: rename Kconfig symbol for "Eukrea CPUIMX27 module" Not using MACH_CPUIMX27 makes machine_is_cpuimx27 always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jean Delvare Cc: Eric Benard commit 95c00464dda726c49ac8c45228bee8bf395ffa97 Author: Uwe Kleine-König Date: Wed Dec 9 20:12:07 2009 +0100 imx/mx1: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 5c4c62bcb27cf9200553edeaecac1ab8cc2add91 Author: Uwe Kleine-König Date: Wed Dec 9 20:09:35 2009 +0100 imx/mx1: add newline at end of Makefile Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 60d644cae9d96e13547c69fbac22e800790e6054 Author: Uwe Kleine-König Date: Wed Dec 9 19:52:57 2009 +0100 imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c These files are only used on imx31. This makes the name consistent with the imx35 files. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit f568dd7f5805bfa9e99f6df866300498b55eb8f4 Author: Uwe Kleine-König Date: Wed Dec 9 11:57:21 2009 +0100 imx/mach-mx3: use constants namespaced by the corresponding SOC (easy part) This just leaves cpu.c, devices.c and mm.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Alberto Panizzo Cc: Valentin Longchamp Cc: Daniel Mack Cc: Guennadi Liakhovetski Cc: Yoichi Yuasa Cc: Mark Brown Cc: Magnus Lilja Cc: Fabio Estevam Cc: Sascha Hauer Cc: Harro Haan Cc: Jean Delvare Cc: Luotao Fu Cc: Ilya Yanok commit 3f35d1f5e4507ea4eb7ff5feaf624737c1b47631 Author: Uwe Kleine-König Date: Wed Dec 9 11:32:11 2009 +0100 imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part) This just leaves devices.c, generic.c and serial.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Holger Schurig Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Jean Delvare Cc: Eric Benard Cc: Ivo Clarysse Cc: Vladimir Barinov Cc: Daniel Schaeffer Cc: Simon POLETTE Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Luotao Fu commit b70564686a3a3eac7c2da09722091dcf5b07d5a4 Author: Uwe Kleine-König Date: Fri Dec 11 09:57:27 2009 +0100 imx/clock-imx27: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp commit 318859fdff2caf4455749ff0097efb8f3e9b6879 Author: Uwe Kleine-König Date: Fri Dec 11 11:04:06 2009 +0100 imx/clock-imx21: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit 5113f81520278ba17c64031fa01aeafc9a83f9d1 Author: Uwe Kleine-König Date: Fri Dec 11 10:07:15 2009 +0100 imx/mx2: fold crm_regs.h into its only consumer Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit dbfc196a3cc1a2514ad0737a82f764de23bd65e6 Author: Christoph Lameter Date: Mon Jan 4 16:34:46 2010 -0600 local_t: Remove leftover local.h Somehow the local.h was not removed when taking out the local_t usage during the 2.6.32 merge. CC: David Miller Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit ad596925eaf9a48ed61bc9210088828f1f8e0552 Author: Christoph Lameter Date: Tue Jan 5 15:34:51 2010 +0900 this_cpu: Remove pageset_notifier Remove the pageset notifier since it only marks that a processor exists on a specific node. Move that code into the vmstat notifier. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 99dcc3e5a94ed491fbef402831d8c0bbb267f995 Author: Christoph Lameter Date: Tue Jan 5 15:34:51 2010 +0900 this_cpu: Page allocator conversion Use the per cpu allocator functionality to avoid per cpu arrays in struct zone. This drastically reduces the size of struct zone for systems with large amounts of processors and allows placement of critical variables of struct zone in one cacheline even on very large systems. Another effect is that the pagesets of one processor are placed near one another. If multiple pagesets from different zones fit into one cacheline then additional cacheline fetches can be avoided on the hot paths when allocating memory from multiple zones. Bootstrap becomes simpler if we use the same scheme for UP, SMP, NUMA. #ifdefs are reduced and we can drop the zone_pcp macro. Hotplug handling is also simplified since cpu alloc can bring up and shut down cpu areas for a specific cpu as a whole. So there is no need to allocate or free individual pagesets. V7-V8: - Explain chicken egg dilemmna with percpu allocator. V4-V5: - Fix up cases where per_cpu_ptr is called before irq disable - Integrate the bootstrap logic that was separate before. tj: Build failure in pageset_cpuup_callback() due to missing ret variable fixed. Reviewed-by: Mel Gorman Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 5917dae83cb02dfe74c9167b79e86e6d65183fa3 Author: Christoph Lameter Date: Tue Jan 5 15:34:50 2010 +0900 percpu, x86: Generic inc / dec percpu instructions Optimize code generated for percpu access by checking for increment and decrements. tj: fix incorrect usage of __builtin_constant_p() and restructure percpu_add_op() macro. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 79615760f380ec86cd58204744e774c33fab9211 Author: Christoph Lameter Date: Tue Jan 5 15:34:50 2010 +0900 local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c ringbuffer*.c are the last users of local.h. Remove the include from modules.h and add it to ringbuffer files. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit e1783a240f491fb233f04edc042e16b18a7a79ba Author: Christoph Lameter Date: Tue Jan 5 15:34:50 2010 +0900 module: Use this_cpu_xx to dynamically allocate counters Use cpu ops to deal with the per cpu data instead of a local_t. Reduces memory requirements, cache footprint and decreases cycle counts. The this_cpu_xx operations are also used for !SMP mode. Otherwise we could not drop the use of __module_ref_addr() which would make per cpu data handling complicated. this_cpu_xx operations have their own fallback for !SMP. V8-V9: - Leave include asm/module.h since ringbuffer.c depends on it. Nothing else does though. Another patch will deal with that. - Remove spurious free. Signed-off-by: Christoph Lameter Acked-by: Rusty Russell Signed-off-by: Tejun Heo commit 38b7827fcdd660f591d645bd3ae6644456a4773c Author: Christoph Lameter Date: Tue Jan 5 15:34:49 2010 +0900 local_t: Remove cpu_local_xx macros These macros have not been used for awhile now. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit ea94396629a3e0cb9a3a9c75335b1de255b30426 Author: H. Peter Anvin Date: Mon Jan 4 21:14:41 2010 -0800 x86, apic: Don't waste a vector to improve vector spread We want to use a vector-assignment sequence that avoids stumbling onto 0x80 earlier in the sequence, in order to improve the spread of vectors across priority levels on machines with a small number of interrupt sources. Right now, this is done by simply making the first vector (0x31 or 0x41) completely unusable. This is unnecessary; all we need is to start assignment at a +1 offset, we don't actually need to prohibit the usage of this vector once we have wrapped around. Signed-off-by: H. Peter Anvin LKML-Reference: <4B426550.6000209@kernel.org> commit 99d113b17e8ca5a8b68a9d3f7691e2f552dd6a06 Author: H. Peter Anvin Date: Mon Jan 4 16:16:06 2010 -0800 x86, apic: Reclaim IDT vectors 0x20-0x2f Reclaim 16 IDT vectors and make them available for general allocation. Reclaim vectors 0x20-0x2f by reallocating the IRQ_MOVE_CLEANUP_VECTOR to vector 0x1f. This is in the range of vector numbers that is officially reserved for the CPU (for exceptions), however, the use of the APIC to generate any vector 0x10 or above is documented, and the CPU internally can receive any vector number (the legacy BIOS uses INT 0x08-0x0f for interrupts, as messed up as that is.) Since IRQ_MOVE_CLEANUP_VECTOR has to be alone in the lowest-numbered priority level (block of 16), this effectively enables us to reclaim an otherwise-unusable APIC priority level and put it to use. Since this is a transient kernel-only allocation we can change it at any time, and if/when there is an exception at vector 0x1f this assignment needs to be changed as part of OS enabling that new feature. Signed-off-by: Yinghai Lu LKML-Reference: <4B4284C6.9030107@kernel.org> Signed-off-by: H. Peter Anvin commit 6f7edb4881bf51300060e89915926e070ace8c4d Author: Catalin(ux) M. BOIE Date: Tue Jan 5 05:50:24 2010 +0100 IPVS: Allow boot time change of hash size I was very frustrated about the fact that I have to recompile the kernel to change the hash size. So, I created this patch. If IPVS is built-in you can append ip_vs.conn_tab_bits=?? to kernel command line, or, if you built IPVS as modules, you can add options ip_vs conn_tab_bits=??. To keep everything backward compatible, you still can select the size at compile time, and that will be used as default. It has been about a year since this patch was originally posted and subsequently dropped on the basis of insufficient test data. Mark Bergsma has provided the following test results which seem to strongly support the need for larger hash table sizes: We do however run into the same problem with the default setting (212 = 4096 entries), as most of our LVS balancers handle around a million connections/SLAB entries at any point in time (around 100-150 kpps load). With only 4096 hash table entries this implies that each entry consists of a linked list of 256 connections *on average*. To provide some statistics, I did an oprofile run on an 2.6.31 kernel, with both the default 4096 table size, and the same kernel recompiled with IP_VS_CONN_TAB_BITS set to 18 (218 = 262144 entries). I built a quick test setup with a part of Wikimedia/Wikipedia's live traffic mirrored by the switch to the test host. With the default setting, at ~ 120 kpps packet load we saw a typical %si CPU usage of around 30-35%, and oprofile reported a hot spot in ip_vs_conn_in_get: samples % image name app name symbol name 1719761 42.3741 ip_vs.ko ip_vs.ko ip_vs_conn_in_get 302577 7.4554 bnx2 bnx2 /bnx2 181984 4.4840 vmlinux vmlinux __ticket_spin_lock 128636 3.1695 vmlinux vmlinux ip_route_input 74345 1.8318 ip_vs.ko ip_vs.ko ip_vs_conn_out_get 68482 1.6874 vmlinux vmlinux mwait_idle After loading the recompiled kernel with 218 entries, %si CPU usage dropped in half to around 12-18%, and oprofile looks much healthier, with only 7% spent in ip_vs_conn_in_get: samples % image name app name symbol name 265641 14.4616 bnx2 bnx2 /bnx2 143251 7.7986 vmlinux vmlinux __ticket_spin_lock 140661 7.6576 ip_vs.ko ip_vs.ko ip_vs_conn_in_get 94364 5.1372 vmlinux vmlinux mwait_idle 86267 4.6964 vmlinux vmlinux ip_route_input [ horms@verge.net.au: trivial up-port and minor style fixes ] Signed-off-by: Catalin(ux) M. BOIE Cc: Mark Bergsma Signed-off-by: Simon Horman Signed-off-by: Patrick McHardy commit c4761815ab49feca904776dec464046bc7138d3a Author: Paul Mundt Date: Tue Jan 5 12:44:02 2010 +0900 sh: Fix up breakpoint trap handler patching on SH-2A. SH-2A was referencing the old handler that no longer exists, fix it up. Signed-off-by: Paul Mundt commit 0176bd3dab4fe522bfb6ceab9e3c441fe0305738 Author: Paul Mundt Date: Tue Jan 5 12:35:00 2010 +0900 sh: Drop down to a single quicklist. We previously had 2 quicklists, one for the PGD case and one for PTEs. Now that the PGD/PMD cases are handled through slab caches due to the multi-level configurability, only the PTE quicklist remains. As such, reduce NR_QUICK to its appropriate size and bump down the PTE quicklist index. Signed-off-by: Paul Mundt commit a7595fe7e8a93a73ce6199dace75a0caca7024c1 Merge: 921a220 2a5eacc Author: Paul Mundt Date: Tue Jan 5 12:27:46 2010 +0900 Merge branch 'sh/pgtable' of git://github.com/mfleming/linux-2.6 commit 32032df6c2f6c9c6b2ada2ce42322231824f70c2 Merge: 22b737f c5974b8 Author: Tejun Heo Date: Tue Jan 5 09:17:33 2010 +0900 Merge branch 'master' into percpu Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h commit 53242c68333570631a15a69842851b458eca3d99 Author: Mark Brown Date: Sat Jan 2 13:15:56 2010 +0000 ASoC: Implement suspend and resume for WM8993 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 10505634bfa74871118a21eef8617acad00e4019 Author: Mark Brown Date: Sat Jan 2 13:14:45 2010 +0000 ASoC: Only restore non-default registers for WM8961 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e0fb28e079b50f891b6c9db1c2bb25fef3268cf4 Author: Mark Brown Date: Sat Jan 2 13:14:23 2010 +0000 ASoC: Only restore non-default registers for WM8776 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d11c5ab186310389b8e573be00279bab0a565d30 Author: Mark Brown Date: Sat Jan 2 13:14:07 2010 +0000 ASoC: Only restore non-default registers for WM8731 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5baf831541c61546c00e8d6f294cb10ed5d25e7d Author: Mark Brown Date: Sat Jan 2 13:13:42 2010 +0000 ASoC: Fix variable shadowing warning in TLV320AIC3x Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e5eb8bd9429ebd04cf906156d1fe40b52f88e82f Author: John W. Linville Date: Mon Jan 4 15:58:03 2010 -0500 mac80211: fix typo added by "mac80211: fix propagation of failed..." 'Typo: it's "Hardware", not "Harware". Hmm, sometimes it's hairware :-)"' -- Holger Schurig Reported-by: Holger Schurig Signed-off-by: John W. Linville commit 51633632ef614ef045f25d76fc7f0133d7cc60c6 Author: Juha Leppanen Date: Mon Jan 4 15:52:50 2010 -0500 wl1271: fix timeout in wl1271_top_reg_read I noticed a timeout bug in /drivers/net/wireless/wl12xx/wl1271_spi.c In the current code you cannot tell why you exited the "poll for data ready" do-while loop if exiting was done after the last possible loop. Then timeout==0 regardless of (val & OCP_READY_MASK) or !(val & OCP_READY_MASK), leading to possible false timeout... Simple correction could be decreasing timeout after checking for !(val & OCP_READY_MASK), not before (Manually converted from email to an actual patch by me. -- JWL) Reported-by: "Juha Leppanen" Signed-off-by: "Juha Leppanen" Signed-off-by: John W. Linville commit a126fd5691e6cd680758b72e6ea288bb83b9deb6 Author: Ilkka Koskinen Date: Mon Jan 4 14:30:03 2010 +0200 ASoc: tpa6130a2: Remove unnecessary variable Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 294188ae32f984a072c64c959354b2f6f52f80a7 Author: Jan Engelhardt Date: Mon Jan 4 16:28:38 2010 +0100 netfilter: xtables: obtain random bytes earlier, in checkentry We can initialize the random hash bytes on checkentry. This is preferable since it is outside the hot path. Reference: http://bugzilla.netfilter.org/show_bug.cgi?id=621 Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 5191d50192ec1281e51cbcb5248cb2667ff4d896 Author: Jan Engelhardt Date: Mon Jan 4 16:27:25 2010 +0100 netfilter: xtables: do not grab random bytes at __init "It is deliberately not done in the init function, since we might not have sufficient random while booting." Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 89bc7a0f64de7bed2e0bc68a23d75699a610cd37 Author: Jan Engelhardt Date: Mon Jan 4 16:26:03 2010 +0100 netfilter: xt_recent: save 8 bytes per htable Moving rnd_inited into the hole after the uint8 lets go of the uint32 rnd_inited was using, plus the padding that would follow the int group. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 71c3ebfdb27b50dcaef38b6f70da82b9142c5fb6 Author: Julia Lawall Date: Mon Jan 4 15:21:31 2010 +0100 netfilter: SNMP NAT: correct the size argument to kzalloc obj has type struct snmp_object **, not struct snmp_object *. But indeed it is not even clear why kmalloc is needed. The memory is freed by the end of the function, so the local variable of pointer type should be sufficient. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @disable sizeof_type_expr@ type T; T **x; @@ x = <+...sizeof( - T + *x )...+> // Signed-off-by: Julia Lawall Signed-off-by: Patrick McHardy commit cf2f765f1896064e34c6f0f2ef896ff058dd5c06 Author: Jiri Kosina Date: Mon Jan 4 12:20:56 2010 +0100 HID: handle joysticks with large number of buttons Current HID code doesn't properly handle HID joysticks which have larger number of buttons than what fits into current range reserved for BTN_JOYSTICK. One such joystick reported to not work properly is Saitek X52 Pro Flight System. We can't extend the range to fit more buttons in, because of backwards compatibility reasons. Therefore this patch introduces a new BTN_TRIGGER_HAPPY range, and uses these to map the buttons which are over BTN_JOYSTICK limit. Acked-by: Dmitry Torokhov [for the input.h part] Signed-off-by: Jiri Kosina commit 92688c0c3c1c9e2daf705d307e8fda1b5a180d26 Author: Jiri Kosina Date: Mon Jan 4 12:04:59 2010 +0100 HID: make Stantum driver standalone config option Analogically to commit "HID: make 3M PCT touchscreen driver standalone config option", remove the dependency of Stantum driver on CONFIG_EMBEDDED, as it is a standalone driver rather than device quirk. Signed-off-by: Jiri Kosina commit d3fb5454a8474d5d22c8f8fe4d043b05732d91d5 Author: Stephane Chatty Date: Mon Jan 4 12:04:08 2010 +0100 HID: add support for Stantum multitouch panel Added support for the Stantum multitouch panel. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit 921a220857cdd3c553cde7c114f9f6757ac80cd5 Merge: 17eb9d6 2f48912 Author: Paul Mundt Date: Mon Jan 4 16:45:56 2010 +0900 Merge branch 'sh/stable-updates' commit ceba0b29e002e6151b6b5ead8db9c664b58d8d21 Author: Ken Kawasaki Date: Mon Dec 28 15:17:24 2009 +0000 axnet_cs: remove unnecessary spin_unlock_irqrestore axnet_cs: remove unnecessary spin_unlock_irqrestore,spin_lock_irqsave. Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit ee983ac76865797a5553597a9412c835c2710f51 Author: Amerigo Wang Date: Thu Dec 24 17:26:48 2009 +0000 tipc: use kconfig to limit numeric ranges We can rely on kconfig to limit these numbers, no need to limit them at compile time/run time. Users who modify these numbers manually should be responsible for themself. :) Signed-off-by: WANG Cong Cc: Per Liden Cc: Jon Maloy Cc: Allan Stephens Cc: David S. Miller Signed-off-by: David S. Miller commit c1c5523dd1517250cac8b15a4acbc237c24a67d4 Author: Marc Kleine-Budde Date: Wed Dec 23 01:27:48 2009 +0000 can/netlink: add CAN_CTRLMODE_ONE_SHOT This patch adds the flag CAN_CTRLMODE_ONE_SHOT. It is used as mask or flag in the "struct can_ctrlmode". It allows userspace via netlink to set a CAN controller into the special "one-shot" mode. In this mode, if supported by the CAN controller, it tries only once to deliver a CAN frame and aborts it if an error (e.g.: arbitration lost) happens. Signed-off-by: Marc Kleine-Budde Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 20dd3850bcf860561496827b711fa10fecf6e787 Author: Oliver Hartkopp Date: Fri Dec 25 06:47:47 2009 +0000 can: Speed up CAN frame receiption by using ml_priv this patch removes the hlist that contains the CAN receiver filter lists. It uses the 'midlayer private' pointer ml_priv and links the filters directly to the CAN netdevice, which allows to omit the walk through the complete CAN devices hlist for each received CAN frame. This patch is tested and does not remove any locking. Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 75ed0a897208c3273fd8dc0f71e1417dba5a049b Author: Julia Lawall Date: Fri Dec 18 21:16:52 2009 +0000 drivers/net/cxgb3: Use kzalloc for allocating only one thing Use kzalloc rather than kcalloc(1,...) The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - kcalloc(1, + kzalloc( ...) // Signed-off-by: Julia Lawall Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 1f3c8804acba841b5573b953f5560d2683d2db0d Author: Andy Gospodarek Date: Mon Dec 14 10:48:58 2009 +0000 bonding: allow arp_ip_targets on separate vlans to use arp validation This allows a bond device to specify an arp_ip_target as a host that is not on the same vlan as the base bond device and still use arp validation. A configuration like this, now works: BONDING_OPTS="mode=active-backup arp_interval=1000 arp_ip_target=10.0.100.1 arp_validate=3" 1: lo: mtu 16436 qdisc noqueue link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 inet 127.0.0.1/8 scope host lo inet6 ::1/128 scope host valid_lft forever preferred_lft forever 2: eth1: mtu 1500 qdisc pfifo_fast master bond0 qlen 1000 link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff 3: eth0: mtu 1500 qdisc pfifo_fast master bond0 qlen 1000 link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff 8: bond0: mtu 1500 qdisc noqueue link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff inet6 fe80::213:21ff:febe:33e9/64 scope link valid_lft forever preferred_lft forever 9: bond0.100@bond0: mtu 1500 qdisc noqueue link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100 inet6 fe80::213:21ff:febe:33e9/64 scope link valid_lft forever preferred_lft forever Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009) Bonding Mode: fault-tolerance (active-backup) Primary Slave: None Currently Active Slave: eth1 MII Status: up MII Polling Interval (ms): 0 Up Delay (ms): 0 Down Delay (ms): 0 ARP Polling Interval (ms): 1000 ARP IP target/s (n.n.n.n form): 10.0.100.1 Slave Interface: eth1 MII Status: up Link Failure Count: 1 Permanent HW addr: 00:40:05:30:ff:30 Slave Interface: eth0 MII Status: up Link Failure Count: 0 Permanent HW addr: 00:13:21:be:33:e9 Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 2a5eacca85d39d8b6dffae821d7d260f05584dc7 Author: Matt Fleming Date: Thu Dec 31 12:19:24 2009 +0000 sh: Move page table allocation out of line We also switched away from quicklists and instead moved to slab caches. After benchmarking both implementations the difference is negligible. The slab caches suit us better though because the size of a pgd table is just 4 entries when we're using a 3-level page table layout and quicklists always deal with pages. Signed-off-by: Matt Fleming commit b4c892762373c5e59c7e8db35f5f9a7658602bda Author: Matt Fleming Date: Thu Dec 24 22:17:35 2009 +0000 sh: Optimise flush_dcache_page() on SH4 If the page is not mapped into any process's address space then aliases cannot exist in the cache. So reduce the amount of flushing we perform. Signed-off-by: Matt Fleming commit 3f5ab768164df9a44721660b96e0accb92eb2c24 Author: Matt Fleming Date: Thu Dec 24 20:38:45 2009 +0000 sh: Correct the PTRS_PER_PMD and PMD_SHIFT values The previous expressions were wrong which made free_pmd_range() explode when using anything other than 4KB pages (which is why 8KB and 64KB pages were disabled with the 3-level page table layout). The problem was that pmd_offset() was returning an index of non-zero when it should have been returning 0. This non-zero offset was used to calculate the address of the pmd table to free in free_pmd_range(), which ended up trying to free an object that was not aligned on a page boundary. Now 3-level page tables should work with 4KB, 8KB and 64KB pages. Signed-off-by: Matt Fleming commit e591a517230a97e93f5edd19e7bef7ec8d22ac2b Author: Matt Fleming Date: Sun Dec 13 22:18:09 2009 +0000 sh: Remove unused functions Apply some TLC to the SH64 header files and remove some functions that are not used anymore. Signed-off-by: Matt Fleming commit 40ca114265a281d51b261771df551a373fc8ff3c Author: Mark Brown Date: Thu Dec 24 13:44:28 2009 +0000 ASoC: Use snprintf() when generating stream names Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 633154d3a7bbd542465b905392bf76b780f00b4f Author: Mark Brown Date: Thu Dec 24 13:42:43 2009 +0000 ASoC: Remove unneeded suspend checks from CODEC drivers Better integration of the core with the device model means that we now no longer get the ASoC suspend and resume callbacks without the card having been set up. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit adcb8bc02d86259c117a03b54e9918e5ad3121af Author: Peter Ujfalusi Date: Thu Dec 31 10:30:23 2009 +0200 ASoC: tlv320dac33: Safety check for codec slave mode The currently available FIFO modes (mode1 and mode7) require master mode from the codec. Do not allow the slave configuration when the FIFO is in use. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 28e05d987028023b09652bfe3ac597de6dba5e60 Author: Peter Ujfalusi Date: Thu Dec 31 10:30:22 2009 +0200 ASoC: tlv320dac33: Add new FIFO mode: mode 7 Mode 7 of tlv320dac33 operates in the following way: The codec is in master mode. Host configures upper and lower thresholds in tlv320dac33 During playback the codec will clock in the data until the upper threshold is reached in FIFO. At this point the codec stops the colocks on the serial bus. When the FIFO fill is reaching the lower threshold limit the codec will enable the clocks on the serial bus, and clocks in data till the upper threshold is reached. In this mode, we can also request interrupts for threshold events (upper, lower and alarm), which could be used for power management. At this point the interrupts are not enabled for this mode, but it can be taken into use in the future, when the surrounding code makes it possible to use it. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit aec242dc3719e19bd7c1561f8a56a4eb37bb3987 Author: Peter Ujfalusi Date: Thu Dec 31 10:30:21 2009 +0200 ASoC: tlv320dac33: Clean up the hardware configuration code Use switch instead of if statements to configure FIFO bypass and mode1. With this change adding new FIFO mode is going to be easier, and cleaner. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d4f102d437c069a64f3a4c7a6cd50360e034541f Author: Peter Ujfalusi Date: Thu Dec 31 10:30:20 2009 +0200 ASoC: tlv320dac33: Introduce prefill and playback state handlers Ensure that the code is going to be readable, when new FIFO modes are introduced later. Move the prefill and playback state handling to inlined functions. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7427b4b9a63fd7e051d642ff0f12ef8337c08bb3 Author: Peter Ujfalusi Date: Thu Dec 31 10:30:19 2009 +0200 ASoC: tlv320dac33: Change nsample switch to FIFO mode enum In order to have support for more FIFO modes supported by tlv320dac33, the switch for enabling/disabling the FIFO use has to be replaced with an enum. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8998c89907f84f7e25536c1c670a134c831e682f Author: Barry Song <21cnbao@gmail.com> Date: Thu Dec 31 10:30:34 2009 +0800 ASoC: soc-cache: cleanup training whitespace and coding style Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8 Merge: 6cd9b49 891dc5e Author: David S. Miller Date: Wed Dec 30 13:51:29 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 891dc5e73783eeabd2a704a9425e2a199b39c9f9 Merge: e1781ed 55afc80 Author: John W. Linville Date: Wed Dec 30 15:25:08 2009 -0500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/libertas/scan.c commit 59c3b003ddd3c815de1aa015920710a9e4bf195b Author: Kuninori Morimoto Date: Mon Dec 28 14:09:16 2009 +0900 ASoC: fsi: Add over/under run error settlement Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 142e8174b3c493f40469d3ecee0e404645e9c483 Author: Kuninori Morimoto Date: Mon Dec 28 14:09:11 2009 +0900 ASoC: fsi: Add fsi_get_dai to get snd_soc_dai Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1c418d1f623438147a485db987de296ab372e0f3 Author: Kuninori Morimoto Date: Mon Dec 28 14:09:05 2009 +0900 ASoC: fsi: Add over_period flag to prevent the misunderstanding Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5b61735534193ab357636d5b56c098f0bbe8bac8 Author: Barry Song <21cnbao@gmail.com> Date: Fri Dec 25 14:10:08 2009 +0800 ASoC: ad1938: let soc-core dapm handle PLL power PM architecture of ad1938 is simple, we don't need a bundle of functions like ad1938_pll_powerctrl, ad1938_set_bias_level for only PLL. A dapm supply will handle on/off of PLL. Since soc-core can poweron/off PLL on-demand, we don't need to poweron/off PLL in suspend/resume entries too. Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 08ba864e2789a94c259b8d0aee13a5a183edd46e Author: Barry Song <21cnbao@gmail.com> Date: Fri Dec 25 14:10:07 2009 +0800 ASoC: ad1938: fix typo, rename mask to rx_mask for ad1938_set_tdm_slot Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit afe1c2cd71eb4e0fade720b5709722e7124f29c0 Author: Barry Song <21cnbao@gmail.com> Date: Fri Dec 25 14:10:06 2009 +0800 ASoC: ad1836: reset and restore clock control mode in suspend/resume entry Tests show frequent suspend/resume(frequent poweroff/on ad1836 internal components) maybe make ad1836 clock mode wrong sometimes after wakeup. This patch reset/restore ad1836 clock mode while executing PM, then ad1836 can always resume to right clock status. Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b Author: Arnaldo Carvalho de Melo Date: Mon Dec 28 22:48:36 2009 -0200 perf diff: Fix support for all --sort combinations When we finish creating the hist_entries we _already_ have them sorted "by name", in fact by what is in --sort, that is exactly how we can find the pairs in perf_session__match_hists as 'comm', 'dso' & 'symbol' all are strings we need to find the matches in the baseline session. So only do the sort by hits followed by a resort by --sort if we need to find the position for shwowing the --displacement of hist entries. Now all these modes work correctly: Example is a simple 'perf record -f find / > /dev/null' ran twice then followed by the following commands: $ perf diff -f --sort comm # Baseline Delta Command # ........ .......... ....... # 0.00% +100.00% find $ perf diff -f --sort dso # Baseline Delta Shared Object # ........ .......... .................. # 59.97% -0.44% [kernel] 21.17% +0.28% libc-2.5.so 18.49% +0.16% [ext3] 0.37% find $ perf diff -f --sort symbol | head -8 # Baseline Delta Symbol # ........ .......... ...... # 6.21% +0.36% [k] ext3fs_dirhash 3.43% +0.41% [.] __GI_strlen 3.53% +0.16% [k] __kmalloc 3.17% +0.49% [k] system_call 3.06% +0.37% [k] ext3_htree_store_dirent $ perf diff -f --sort dso,symbol | head -8 # Baseline Delta Shared Object Symbol # ........ .......... .................. ...... # 6.21% +0.36% [ext3] [k] ext3fs_dirhash 3.43% +0.41% libc-2.5.so [.] __GI_strlen 3.53% +0.16% [kernel] [k] __kmalloc 3.17% +0.49% [kernel] [k] system_call 3.06% +0.37% [ext3] [k] ext3_htree_store_dirent $ And we don't have to do two expensive resorts in the common, non --displacement case. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262047716-23171-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cdbae31408cf39372402076cf2e189ec693daa71 Author: Arnaldo Carvalho de Melo Date: Mon Dec 28 22:48:35 2009 -0200 perf diff: Don't add the period for unresolved symbols Since we don't add histograms buckets for them, this way the sum of baselines should be 100%. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262047716-23171-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 71289be7630fb97f2de6bb2e18a50289dc869f9d Author: Arnaldo Carvalho de Melo Date: Mon Dec 28 22:48:34 2009 -0200 perf report: Add --hide-unresolved/-U command line option Useful to match the 'overhead' column in 'perf report' with the 'baseline' one in 'perf diff'. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262047716-23171-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ae99fb2c335ef018520950ddc9692faacab39cf2 Author: Arnaldo Carvalho de Melo Date: Mon Dec 28 22:48:33 2009 -0200 perf header: perf_header__push_event() shouldn't die Just propagate eventual errors. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262047716-23171-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 769885f372300a7fcfb9e54e4e2990718d40b529 Author: Arnaldo Carvalho de Melo Date: Mon Dec 28 22:48:32 2009 -0200 perf header: Do_read shouldn't die Propagate the errors instead, its callers already propagate other errors. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1262047716-23171-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 63bbd5e2d539c9290b229c832f62d42aac23db94 Author: Liming Wang Date: Tue Dec 29 16:37:09 2009 +0800 perf probe: Change CONFIG_KPROBE_TRACER to CONFIG_KPROBE_EVENT make the config name consistent Signed-off-by: Liming Wang Acked-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1262075829-16257-3-git-send-email-liming.wang@windriver.com> Signed-off-by: Ingo Molnar commit 41bdcb23dab22bf27361c5f2d89fe895d8904915 Author: Liming Wang Date: Tue Dec 29 16:37:07 2009 +0800 perf tools: Unify event type description make event type description to a unified array and the array index consistent to perf_type_id. Signed-off-by: Liming Wang Cc: Frederic Weisbecker Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1262075829-16257-1-git-send-email-liming.wang@windriver.com> Signed-off-by: Ingo Molnar commit 7269e8812a59f74fb1ce134465d0bcf5683b93a1 Author: Jan Beulich Date: Fri Dec 18 16:16:03 2009 +0000 x86-64: Modify memcpy()/memset() alternatives mechanism In order to avoid unnecessary chains of branches, rather than implementing memcpy()/memset()'s access to their alternative implementations via a jump, patch the (larger) original function directly. The memcpy() part of this is slightly subtle: while alternative instruction patching does itself use memcpy(), with the replacement block being less than 64-bytes in size the main loop of the original function doesn't get used for copying memcpy_c() over memcpy(), and hence we can safely write over its beginning. Also note that the CFI annotations are fine for both variants of each of the functions. Signed-off-by: Jan Beulich Cc: Nick Piggin Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <4B2BB8D30200007800026AF2@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 1b1d9258181bae199dc940f4bd0298126b9a73d9 Author: Jan Beulich Date: Fri Dec 18 16:12:56 2009 +0000 x86-64: Modify copy_user_generic() alternatives mechanism In order to avoid unnecessary chains of branches, rather than implementing copy_user_generic() as a function consisting of just a single (possibly patched) branch, instead properly deal with patching call instructions in the alternative instructions framework, and move the patching into the callers. As a follow-on, one could also introduce something like __EXPORT_SYMBOL_ALT() to avoid patching call sites in modules. Signed-off-by: Jan Beulich Cc: Nick Piggin Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <4B2BB8180200007800026AE7@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 499a5f1efa0b0ac56ec5d060412aed84ae68e63e Author: Jan Beulich Date: Fri Dec 18 16:05:51 2009 +0000 x86: Lift restriction on the location of FIX_BTMAP_* The early ioremap fixmap entries cover half (or for 32-bit non-PAE, a quarter) of a page table, yet they got uncondtitionally aligned so far to a 256-entry boundary. This is not necessary if the range of page table entries anyway falls into a single page table. This buys back, for (theoretically) 50% of all configurations (25% of all non-PAE ones), at least some of the lowmem necessarily lost with commit e621bd18958ef5dbace3129ebe17a0a475e127d9. Signed-off-by: Jan Beulich Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <4B2BB66F0200007800026AD6@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 9959c888a38b0f25b0e81a480f537d6489348442 Author: Yinghai Lu Date: Mon Dec 28 21:08:29 2009 -0800 x86: Increase NR_IRQS and nr_irqs I have a system with lots of igb and ixgbe, when iov/vf are enabled for them, we hit the limit of 3064. when system has 20 pcie installed, and one card has 2 functions, and one function needs 64 msi-x, may need 20 * 2 * 64 = 2560 for msi-x but if iov and vf are enabled may need 20 * 2 * 64 * 3 = 7680 for msi-x assume system with 5 ioapic, nr_irqs_gsi will be 120. NR_CPUS = 512, and nr_cpu_ids = 128 will have NR_IRQS = 256 + 512 * 64 = 33024 will have nr_irqs = 120 + 8 * 128 + 120 * 64 = 8824 When SPARSE_IRQ is not set, there is no increase with kernel data size. when NR_CPUS=128, and SPARSE_IRQ is set: text data bss dec hex filename 21837444 4216564 12480736 38534744 24bfe58 vmlinux.before 21837442 4216580 12480736 38534758 24bfe66 vmlinux.after when NR_CPUS=4096, and SPARSE_IRQ is set text data bss dec hex filename 21878619 5610244 13415392 40904255 270263f vmlinux.before 21878617 5610244 13415392 40904253 270263d vmlinux.after Signed-off-by: Yinghai Lu Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <4B398ECD.1080506@kernel.org> Signed-off-by: Ingo Molnar commit b45d44e7e00c1726dac9437b66c05d3d27acb3f0 Author: Nicolas Léveillé Date: Tue Dec 29 20:39:05 2009 -0800 Input: xpad - allow using triggers as buttons rather than axes Certain devices implement triggers as buttons rather than axes. In particular, arcade sticks such as the HORI Real Arcade Pro.EX do not have analog buttons. These devices are now setup to present buttons rather than axes for triggers. User-space applications often also have problems with axes-as-buttons. Activating MAP_TRIGGERS_TO_BUTTONS for a device removes the artificial difference between buttons and triggers. Signed-off-by: Nicolas Léveillé Signed-off-by: Dmitry Torokhov commit 6cd9b49d7328c4656bfc17fcb47fb814955d40d2 Author: H Hartley Sweeten Date: Tue Dec 29 20:10:35 2009 -0800 Subject: drivers/net/sh_eth.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 30a6ae8d477dc90254eb785d8ccff6dfe7d9082e Author: H Hartley Sweeten Date: Tue Dec 29 20:10:01 2009 -0800 drivers/net/r8169.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit e583482091d207265953f501564056bd2c90b985 Author: H Hartley Sweeten Date: Tue Dec 29 20:09:07 2009 -0800 drivers/net/octeon/octeon_mgmt.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit fa876b474aa15cd1448790502a5a13f81f923446 Author: H Hartley Sweeten Date: Tue Dec 29 20:08:09 2009 -0800 drivers/net/smc911x.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit b18fe4777f1cf7095fbe78652b72c076e300eaee Author: H Hartley Sweeten Date: Tue Dec 29 20:07:27 2009 -0800 drivers/net/sunvnet.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 3b8dff3622a813d093a8601dc90fb6f12183f87c Author: H Hartley Sweeten Date: Tue Dec 29 20:06:45 2009 -0800 drivers/net/usb/catc.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit d998ab0bd737fad9c8e3c88eb6f52c43e90fda9a Author: H Hartley Sweeten Date: Tue Dec 29 20:05:37 2009 -0800 drivers/s390/net/qeth_l2_main.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 5491f3a5623129f3d4e0c62e691c2a5e56c75d41 Author: H Hartley Sweeten Date: Tue Dec 29 20:04:53 2009 -0800 drivers/net/xilinx_emaclite.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit aa7c68a5f75cf04e79348e8baca67c7393d8f7e4 Author: H Hartley Sweeten Date: Tue Dec 29 20:04:14 2009 -0800 drivers/net/via-velocity.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit d649a2844e49ece6309cf28cb941ef64eb69228f Author: H Hartley Sweeten Date: Tue Dec 29 20:03:28 2009 -0800 drivers/net/usb/rtl8150.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 753cdc3304f0612766a81cddab9d8af01fcf8218 Author: H Hartley Sweeten Date: Tue Dec 29 20:02:29 2009 -0800 drivers/net/igbvf/netdev.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 557b0bbd62389ab438424e9f895197607666ea4d Author: H Hartley Sweeten Date: Tue Dec 29 20:01:46 2009 -0800 drivers/net/lib82596.c: use %pM to shown MAC address Use the %pM kernel extension to display the MAC address. The only difference in the output is that the MAC address is shown in the usual colon-separated hex notation instead of space-separated. Signed-off-by: H Hartley Sweeten Signed-off-by: David S. Miller commit 13b302d0a217580c0129b0641b0ca8b592e437b0 Author: Stefan Richter Date: Sat Dec 26 01:44:10 2009 +0100 firewire: qualify config ROM cache pointers as const pointers Several config ROM related functions only peek at the ROM cache; mark their arguments as const pointers. Ditto fw_device.config_rom and fw_unit.directory, as the memory behind them is meant to be write-once. Signed-off-by: Stefan Richter commit 3c2c58cb33b3b15a2c4871babeec8fe1456e1db6 Author: Stefan Richter Date: Sat Dec 26 01:43:21 2009 +0100 firewire: core: fw_csr_string addendum Witespace and comment changes, and a different way to say i + 1 < end. Signed-off-by: Stefan Richter commit 1f8fef7b3388b5a976e80839679b5bae581a1091 Author: Clemens Ladisch Date: Thu Dec 24 11:59:57 2009 +0100 firewire: add fw_csr_string() helper function The core (sysfs attributes), the firedtv driver, and possible future drivers all read strings from some configuration ROM directory. Factor out the generic code from show_text_leaf() into a new helper function, modified slightly to handle arbitrary buffer sizes. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 0c99c5288eb9b1bbc9684b0ec0fd7efc578749b3 Author: Zhang Rui Date: Thu Dec 17 16:02:08 2009 +0800 ACPI: Disable explicit power state retrieval on fans If the ACPI power state can be got both directly and indirectly, we prefer to get it indirectly. https://bugzilla.redhat.com/show_bug.cgi?id=531916 describes a system with a _PSC method for the fan that always returns "on". There's no benefit in us always requesting the state of the fan when performing transitions - we want to do everything we can to ensure that the fan turns on when it should do, not risk hardware damage by believing the hardware when it tells us the fan is already on. Given that the Leading Other OS(tm) works fine on this machine, it seems likely that it behaves in much this way. inspired-by: Matthew Garrett Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit e1781ed33a8809c58ad6c3b6d432d656446efa43 Author: Kalle Valo Date: Wed Dec 23 13:15:47 2009 +0100 mac80211: annotate sleeping driver ops To make it easier to notice cases of calling sleeping ops in atomic context, annotate driver-ops.h with appropiate might_sleep() calls. At the same time, also document in mac80211.h the op functions with missing contexts. mac80211 doesn't seem to use get_tx_stats anywhere currently. Just to be on the safe side, I documented it to be atomic, but hopefully the op can be removed in the future. Compile-tested only. Signed-off-by: Kalle Valo Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 095d5ef608b58ece49f4131925700d27314ecdd8 Author: Johannes Berg Date: Wed Dec 23 13:15:46 2009 +0100 mac80211: remove requeue from work There's no need to be requeueing the work struct since we check for the scan after removing items due to possible timeouts. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1ed32e4fc8cfc9656cc1101e7f9617d485fcbe7b Author: Johannes Berg Date: Wed Dec 23 13:15:45 2009 +0100 mac80211: remove struct ieee80211_if_init_conf All its members (vif, mac_addr, type) are now available in the vif struct directly, so we can pass that instead of the conf struct. I generated this patch (except the mac80211 and header file changes) with this semantic patch: @@ identifier conf, fn, hw; type tp; @@ tp fn(struct ieee80211_hw *hw, -struct ieee80211_if_init_conf *conf) +struct ieee80211_vif *vif) { <... ( -conf->type +vif->type | -conf->mac_addr +vif->addr | -conf->vif +vif ) ...> } Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 98b6218388e345064c3f2d3c161383a18274c638 Author: Johannes Berg Date: Wed Dec 23 13:15:44 2009 +0100 mac80211/cfg80211: add station events When, for instance, a new IBSS peer is found, userspace wants to be notified. Add events for all new stations that mac80211 learns about. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e4da8c37af626001ff704fb29ea14eb58f5f7208 Author: Johannes Berg Date: Wed Dec 23 13:15:43 2009 +0100 mac80211: make off-channel work generic This changes mac80211 to allow being off-channel for any type of work, not just the 'remain-on-channel' work. This also helps fast transition to a BSS on a different channel. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b8bc4b0aa9bfba755c64b11b8f60e6cfab25dc9d Author: Johannes Berg Date: Wed Dec 23 13:15:42 2009 +0100 mac80211: support remain-on-channel command This implements the new remain-on-channel cfg80211 command in mac80211, extending the work interface. Also change the work purge code to be able to clean up events properly (pretending they timed out.) Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9588bbd5529461a3dacd435bf239c84c3508f569 Author: Jouni Malinen Date: Wed Dec 23 13:15:41 2009 +0100 cfg80211: add remain-on-channel command Add new commands for requesting the driver to remain awake on a specified channel for the specified amount of time (and another command to cancel such an operation). This can be used to implement userspace-controlled off-channel operations, like Public Action frame exchange on another channel than the operation channel. The off-channel operation should behave similarly to scan, i.e. the local station (if associated) moves into power save mode to request the AP to buffer frames for it and then moves to the other channel to allow the off-channel operation to be completed. The duration parameter can be used to request enough time to receive a response from the target station. Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b203ffc3a447eb8d9e6120b783ddee081b143061 Author: Jouni Malinen Date: Wed Dec 23 13:15:40 2009 +0100 mac80211: Generalize off-channel operation helpers from scan code The off-channel operations for going into power save mode (station mode) or stop beaconing (AP/IBSS) are not limited to scanning. Move these into a separate file and allow them to be used for other purposes, too. Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 0c1ad2cac1cb54db38fd4cc1822965071ee83f6e Author: Johannes Berg Date: Wed Dec 23 13:15:39 2009 +0100 mac80211: proper bss private data handling cfg80211 offers private data for each BSS struct, which mac80211 uses. However, mac80211 uses internal and external (cfg80211) BSS pointers interchangeably and has a hack to put the cfg80211 bss struct into the private struct. Remove this hack, properly converting between the pointers wherever necessary. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8e664fb3fd2b04e3ac5fad7f046000ba54e0e275 Author: Johannes Berg Date: Wed Dec 23 13:15:38 2009 +0100 mac80211: split up and insert custom IEs correctly Currently, we insert all user-specified IEs before the HT IE for association, and after the HT IE for probe requests. For association, that's correct only if the user-specified IEs are RSN only, incorrect in all other cases including WPA. Change this to split apart the user-specified IEs in two places for association: before the HT IE (e.g. RSN), after the HT IE (generally empty right now I think?) and after WMM (all other vendor-specific IEs). For probes, split the IEs in different places to be correct according to the spec. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 77c8144ad3ee7fae834e13cb7e83f5b7c8c5329e Author: Johannes Berg Date: Wed Dec 23 13:15:37 2009 +0100 mac80211: refactor association Refactor the code to reserve an skb of the right size (instead of hoping 200 bytes are enough forever), and also put HT IE generation into an own function. Additionally, put the HT IE before the vendor-specific WMM IE. This still leaves things not quite ordered correctly, due to user-specified IEs, add a note about that for now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7d3a1c3b03c3a571a2c8c393b75558a5f4a7532a Author: Johannes Berg Date: Wed Dec 23 13:15:36 2009 +0100 mac80211: rewrite a few work messages The station we're authenticating/associating with may not always be an AP in the sense that word is mostly understood, so print only the MAC address of the peer instead. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit af6b63741cc4e4dfd575d06beb333b11a8a6e0c0 Author: Johannes Berg Date: Wed Dec 23 13:15:35 2009 +0100 mac80211: generalise work handling In order to use auth/assoc for different purposes other than MLME, it needs to be split up. For other purposes, a generic work handling (potentially on another channel) will be useful. To achieve that, this patch moves much of the MLME work handling out of mlme into a new work API. The API can currently handle probing a specific AP, authentication and association. The MLME previously handled probe/authentication as one step and will continue to do so, but they are separate in the new work handling. Work items are RCU-managed to be able to check for existence of an item for a specific frame in the RX path, but they can be re-used which the MLME right now will do for its combined probe/auth step. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f679f65d417c3ea3f91b4bbfb68e3951c9eb8f04 Author: Johannes Berg Date: Wed Dec 23 13:15:34 2009 +0100 mac80211: generalise management work a bit As a first step of generalising management work, this renames a few things and puts more information directly into the struct so that auth/assoc need not access the BSS pointer as often -- in fact it can be removed from auth completely. Also since the previous patch made sure a new work item is used for association, we can make the different data a union. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 63f170e0c80a131cdd549fab7afb5036009944fc Author: Johannes Berg Date: Wed Dec 23 13:15:33 2009 +0100 mac80211: let cfg80211 manage auth state mac80211 currently hangs on to the auth state by keeping it on the work list. That can lead to confusing behaviour like rejecting scans while authenticated to any AP (but not yet associated.) It also means that it needs to keep track of the work struct while associated for when it gets disassociated (or disassociates.) Change this to free the work struct after the authentication completed successfully and allocate a new one for associating, thereby letting cfg80211 manage the auth state. Another change necessary for this is to tell cfg80211 about all unicast deauth frames sent to mac80211 since now it can no longer check the auth state, but that check was racy anyway. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a80f7c0b088187c8471b441d461e937991870661 Author: Johannes Berg Date: Wed Dec 23 13:15:32 2009 +0100 mac80211: introduce flush operation We've long lacked a good confirmation that frames have really gone out, e.g. before going off-channel for a scan. Add a flush() operation that drivers can implement to provide that confirmation, and use it in a few places: * before scanning sends the nullfunc frames * after scanning sends the nullfunc frames, if any * when going idle, to send any pending frames Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9607e6b66a0d25ca63b70d54a4283fa13d8f7c9d Author: Johannes Berg Date: Wed Dec 23 13:15:31 2009 +0100 mac80211: add ieee80211_sdata_running Instead of always using netif_running(sdata->dev) use ieee80211_sdata_running(sdata) now which is just an inline containing netif_running() for now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d30506e0357e5448c7d38bb3739c451dbe4c174e Author: John W. Linville Date: Tue Dec 22 18:13:05 2009 -0500 rtl8187: remove priv->mode It is checked in add_interface, but there it is easily replaced with a check of priv->vif. If that information should become necessary, it is available in vif->type anyway. It is also checked in led_turn_on and led_turn_off, where I made the substitutions as described above. Of course, these checks seem to have been incorrect since the driver was using NL80211_IFTYPE_MONITOR to indicate no interface rather than NL80211_IFTYPE_UNSPECIFIED. Anyway, I think these checks may be extraneous...? Signed-off-by: John W. Linville commit 643aab6733799586c798a7b54b85c34d587b25e3 Author: John W. Linville Date: Tue Dec 22 18:13:04 2009 -0500 rtl8180: remove priv->mode It is only checked in add_interface, and there it is easily replaced with a check of priv->vif. If that information should become necessary, it is available in vif->type anyway. Signed-off-by: John W. Linville commit 5122d8986232ef2a761f5cf70c31666c4d65c3e4 Author: Gertjan van Wingerde Date: Wed Dec 23 00:03:25 2009 +0100 rt2x00: Cleanup chip handling helper functions. Let each of them take a struct rt2x00_dev pointer as argument instead of a mixture of struct rt2x00_chip and struct rt2x00_dev pointers. Preparation for further clean ups in the rt2x00 chip handling, especially for rt2800 devices. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 73a2f1259ebb49f9768aa12eee2a1071345eb7f2 Author: Gertjan van Wingerde Date: Wed Dec 23 00:03:24 2009 +0100 rt2x00: convert RT2800PCI_PCI and RT2800PCI_SOC Kconfig symbols to booleans. There is no need for Kconfig symbols RT2800PCI_PCI and RT2800PCI_SOC to be tristates, as they are only used to check whether RT2800 PCI or SOC support is to be compiled in. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit ac394917f5138f9bb2774718312dec179164f3dc Author: Gertjan van Wingerde Date: Wed Dec 23 00:03:23 2009 +0100 rt2x00: Let rt2800lib check CONFIG_RT2X00_LIB_USB instead of CONFIG_RT2800USB rt2800lib currently checks whether RT2800USB is enabled in the configuration. Strictly speaking this is not necessary, it only needs to know whether the generic rt2x00usb library functions are available. Therefore check for RT2X00_LIB_USB instead. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 00e23ce219a9ac6c5f764342ca13f8ac1bab0382 Author: Gertjan van Wingerde Date: Wed Dec 23 00:03:22 2009 +0100 rt2x00: Fix checks for rt2800 SOC support. Fix checking for SOC support in rt2800pci. The wrong config (an unexisting one) was checked. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit baeb66fe2306783e3b9a492b03882f2e249b2eeb Author: John W. Linville Date: Fri Dec 18 17:59:02 2009 -0500 wireless: remove CONFIG_WIRELESS_OLD_REGULATORY This is no longer needed with the availability of CONFIG_CFG80211_INTERNAL_REGDB. Signed-off-by: John W. Linville commit 8f648c00039a42e67a9dff034c77d41502dab1f3 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:10 2009 +0200 wl1271: Prevent performing "join" before association There is a minor bug in the code causing a "join" to be performed before there is an intention to associate. Fix this. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 04477bf095afd008b73717f7a4ea1fdf18b1b5e2 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:09 2009 +0200 wl1271: Check vif for NULL when indicating beacon-loss Because the interface is started and the vif are created and destroyed separately, there is a slim possibility beacon-loss indications occur while there is no vif - causing a kernel-oops unless checked. Add checking for the vif. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 38ad2d87d42ba847c100ef132e8e363513982c8b Author: Juuso Oikarinen Date: Fri Dec 11 15:41:08 2009 +0200 wl1271: Add support for acx_pm_config This acx configures host clock parameters in correspondence with the clock request line - the settling time of the clock, and whether fast wake-up is supported. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 71449f8d7059b69e6e45063997d225d8202221a2 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:07 2009 +0200 wl1271: Change booleans in struct wl1271 into a flags bitmask For cleaner implementation, change the bunch of booleans in the struct wl1271 structure into a flags bitmask. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 830fb67b8e37fb03cf703b4e1217fe30ce32d579 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:06 2009 +0200 wl1271: Fix supported rate management Previously, only basic rates were used for data transmission - resulting in reduced transfer rates. This patch takes enables the firmware to take advantage of the full set of data rates supported by the AP. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit ec078d943b89c03e55ac9c8b28f39256d4d4045e Author: Juuso Oikarinen Date: Fri Dec 11 15:41:05 2009 +0200 wl1271: Change rates configured for templates Previously a "firmware chooses" value was used for the rates of all control message templates set to the firmware. This resulted in a too high rate to be chosen to transmit those messages. Change this by configuring a fixed low rate for the templates. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit e0d8bbf0d23e6b82f13b29f39593d5d13d923b2b Author: Juuso Oikarinen Date: Fri Dec 11 15:41:04 2009 +0200 wl1271: Add rudimentary ad-hoc support This patch adds rudimentary a-hoc support for the driver. It will allow setting up ad-hoc, and for other devices to scan and join. The beacon and probe response template setting is slightly dirty, and need to be properly implemented with support from mac80211. Also, the SSID is not configured to the firmware - the FW will not be able to respond to probe requests autonomously. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 26a63f6af58144818d4979cce1cbb8e49329f732 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:03 2009 +0200 wl1271: Remove beacon-loss-ind from PSM entry failure handling Remove the beacon-loss indication to stack from PSM entry failure handling - this will cause more problems than it will solve due to the design of the mac80211. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 01ac17ecb6292ceab9bfc498145491b78552b239 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:02 2009 +0200 wl1271: Add pre-power-on sleep This patch adds a short delay before powering on the wl1271. Normally, it is not needed, but if the wl1271 has been powered off shortly before, for reliable firmware-booting this small stabilization delay is required. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 9ccd921792e5b6719ff9e561438e095cba757727 Author: Juuso Oikarinen Date: Fri Dec 11 15:41:01 2009 +0200 wl1271: Implement chipset boot retry The wl1271 has a hardware bug which causes it to randomly (very infrequently) to fail powering up properly. This patch implements retry for the chipset boot sequence, to work around the hardware problem. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit af5e084b3200ab6e3033068a34fe16fd139be17b Author: Juuso Oikarinen Date: Fri Dec 11 15:41:00 2009 +0200 wl1271: prevent power save entry while not associated The mac80211 sometimes requests power save entry while not associated - this will cause problems, so prevent it if not associated. Go to powersave once association is complete. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 13f2dc52c69bcca074cd12d4806953b2af45c386 Author: Juuso Oikarinen Date: Fri Dec 11 15:40:59 2009 +0200 wl1271: Fix event acknowledging functionality In reference source, events are acknowledged separately - fix the driver to do the same. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a6fe231361e35e3d068a63bbfd2318fa4e961ec5 Author: Juuso Oikarinen Date: Fri Dec 11 15:40:58 2009 +0200 wl1271: Use slow rates for association messages While not associated, default the data rates to 1 and 2mbps, so that only those rates will be used for association related message transfer. Once associated, configure the full rate-set supported by the AP. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 018b171c40b613da867e054f9b6b258ae9298133 Author: Juuso Oikarinen Date: Fri Dec 11 15:40:57 2009 +0200 wl1271: Remove smart reflex ACX Remove the smart-reflex ACX - the associated parameters are now configured in the radio parameters config. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 149e38789f3fea74b581f8ebb7eb947d3c6d8a4e Author: Juuso Oikarinen Date: Fri Dec 11 15:40:56 2009 +0200 wl1271: Configure smart-reflex paramter values. Configure correct values to be used with the smart-reflex configuration of the firmware. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 94210897e2b7df8446fdecd360342149e5b4a400 Author: Luciano Coelho Date: Fri Dec 11 15:40:55 2009 +0200 wl1271: use channel 1 when configuring the data path In the data path configuration, one of the parameters is the channel. We have been setting it to wl->channel, which is not correct in this case. This channel has nothing to do with the channel we're currently tuned to, since it is only used for calibration during this phase. Hardcoded the channel to 1, according to the reference driver. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 3ed8f2c61466f10d99585365fd2aaafaf2d4c949 Author: Luciano Coelho Date: Fri Dec 11 15:40:54 2009 +0200 wl1271: some new configuration values according to new reference In the new reference driver, some of the firmware configuration values have been changed. This patch changes them in the wl1271 driver accordingly. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 8cf5e8e509950237fa0982235a703348d8b6e670 Author: Luciano Coelho Date: Fri Dec 11 15:40:53 2009 +0200 wl1271: upload only the first 468 bytes from the NVS file We were uploading the whole NVS file, but that is wrong, because the same file also contains the initialization values. For the latest firmwares, we should upload only the initial 468 bytes from the file. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 98b2a68473ae975bc4abdeb66cd719ccfdad9d4a Author: Luciano Coelho Date: Fri Dec 11 15:40:52 2009 +0200 wl1271: add gpio_power file in debugfs to power the chip on and off Some debugging tools require the chip to be powered on before they can work. With these tools, we shouldn't upload the firmware nor boot the firmware ourselves, so this debufs file is provided. It always contains the gpio power setting (0 = off, 1 = on). To change the power setting, just write 0 or 1 to the file. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 1b38ea8858fd169064683e27add43511308e521a Author: Luciano Coelho Date: Fri Dec 11 15:40:51 2009 +0200 wl1271: fix one typo in the rx_rssi_and_proc_compens values There was a typo in one of the values in the rx_rssi_and_proc_compens elemt of the Radio Parameters struct. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 6e92b416b0aa6a59629cc32ee2b27129d73b98b8 Author: Luciano Coelho Date: Fri Dec 11 15:40:50 2009 +0200 wl1271: implement dco itrim parameters setting Newer firmwares require the dco itrim parameters to be set during initialization. This patch implements the new ACX function and calls it. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit ac9b40fac6983ab30e8b5019a5d2abda200c89d5 Author: Luciano Coelho Date: Fri Dec 11 15:40:49 2009 +0200 wl1271: use the correct macro when setting the basic rates We were using CONF_TX_RATE_MASK_ALL when calling wl1271_acx_rate_policies() during init. We should use WL1271_DEFAULT_BASIC_RATE_SET instead. The values are the same, but the latter is just the correct macro to use. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit bdcbbb947be9778f740797a2bfc69c44a0d54776 Author: Luciano Coelho Date: Fri Dec 11 15:40:48 2009 +0200 wl1271: set null data template when BSSID is known The call to wl1271_cmd_build_null_data() was missing when we got associated, this was causing PS to fail. This patch adds the call and now PS seems to work. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit cd264769f7a571fc2a61765757ed85c56f02e9d3 Author: Luciano Coelho Date: Fri Dec 11 15:40:47 2009 +0200 wl1271: check result code from the join command We were not checking the return value from the call to wl1271_cmd_join(). Added a check to make things more reliable. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit a2d0e3f13037fa7dc4094c47e0378800a064ee26 Author: Luciano Coelho Date: Fri Dec 11 15:40:46 2009 +0200 wl1271: limit TX power to 25dBm for every channel The wl1271 firmware supports maximun 25.5dBm, so the driver was returning -EINVALID to anything above that. This patch uses the channel max_power option to limit the TX power to 25dBm. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 9cf25fed6a3b1c0792cbab3e934a4e2b6736d284 Author: Luciano Coelho Date: Fri Dec 11 15:40:45 2009 +0200 wl1271: remove workaround for disconnection Now we're using a the idle information coming from mac80211 to decide when to disconnect. If we have joined (ie. we're listening to a channel), whenever the interface goes to idle, we will issue a disconnect command. So the workaround to send a disconnect command before joining is not needed anymore. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit c7f43e451ba40e66a89d51e63bc21a57824592f2 Author: Luciano Coelho Date: Fri Dec 11 15:40:44 2009 +0200 wl1271: use join command with dummy BSSID When we need to change the channel before association, we have to send a join command with a valid BSSID. With this patch we use 0baddeadbeef as the BSSID. There are ongoing discussions with TI to get this done in a cleaner way. When we go back to idle, we issue a CMD_DISCONNECT to make sure the firmware stops listening to the channel and cleans things up internally. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit cf18be4467b5aca1ccf3b5a72b67fc33a0b30c59 Author: Luciano Coelho Date: Fri Dec 11 15:40:43 2009 +0200 wl1271: added radio parameters configuration values newer firmwares Add new radio parameters for new structures based on firmware revision 6.1.0.0.288. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit a3e84847b042f10262f8ef66db66a0e527a00cff Author: Luciano Coelho Date: Fri Dec 11 15:40:42 2009 +0200 wl1271: update radio and general parameters values There were some changes in the values we have to use for these settings. This patches updates them. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 76c0f8d396bd306111d349cfe770e1c4fcf70248 Author: Luciano Coelho Date: Fri Dec 11 15:40:41 2009 +0200 wl1271: updated general parameters structure for newer firmwares In revision 6.1.0.0.288 the general parameters structure has changed. This patch updates the driver code accordingly. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 937a67e75a93b63f0b5d33612901906b8eb2a688 Author: Luciano Coelho Date: Fri Dec 11 15:40:40 2009 +0200 wl1271: updated radio parameters structure for newer firmwares In revision 6.1.0.0.288 the radio parameters structure has changed. This patch updates the driver code accordingly. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit b02914af4d7020828ce921a572589dd793517c09 Author: Larry Finger Date: Thu Dec 10 17:35:01 2009 -0600 b43: Allow PIO mode to be selected at module load If userencounter the "Fatal DMA Problem" with a BCM43XX device, and still wish to use b43 as the driver, their only option is to rebuild the kernel with CONFIG_B43_FORCE_PIO. This patch removes this option and allows PIO mode to be selected with a load-time parameter for the module. Note that the configuration variable CONFIG_B43_PIO is also removed. Once the DMA problem with the BCM4312 devices is solved, this patch will likely be reverted. Signed-off-by: Larry Finger Tested-by: John Daiker Signed-off-by: John W. Linville commit 7dc6a7a7635365b140af969e972900866d0bf34b Author: Lennert Buytenhek Date: Mon Nov 30 18:33:09 2009 +0100 mwl8k: remove duplicate local per-vif copy of ieee80211_bss_conf Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 97474782959af87f5dc8049fca3bd3b25eb68308 Author: Lennert Buytenhek Date: Mon Nov 30 18:33:04 2009 +0100 mwl8k: remove unused mwl8k_vif::priv Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 89a91f4f4cdae92daf3693d4852ae4958abb6c58 Author: Lennert Buytenhek Date: Mon Nov 30 18:32:54 2009 +0100 mwl8k: fix up AP vs. STA firmware image receive descriptor handling The receive descriptor ops that are currently marked as being for 8687 only are actually used for all STA firmware images, whereas the receive descriptor ops marked as 8366 are only used on 8366 when an AP firmware image is in use. Rename the receive descriptor ops to reflect this, use the STA ops unconditionally if the firmware image loaded reported the STA ready code, and rename the mwl8k_device_info::rxd_ops member to ap_rxd_ops to indicate that it should only be used if we are running on AP firmware. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit be695fc4f0a7ff9c9f91d59536b029b781cfea62 Author: Lennert Buytenhek Date: Mon Nov 30 18:32:46 2009 +0100 mwl8k: do rx/tx ring initialisation after loading firmware Whether the firmware we have loaded is AP or STA firmware decides which receive descriptor format we have to use. Therefore, move rx/tx ring initialisation to be after firmware loading. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 22be40d9c53faa10d03a679160e0854ad115b610 Author: Lennert Buytenhek Date: Mon Nov 30 18:32:38 2009 +0100 mwl8k: get rid of the struct mwl8k_firmware abstraction Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 647ca6b01a5289948e970ea7c1f656f9d90b0a27 Author: Lennert Buytenhek Date: Mon Nov 30 18:32:20 2009 +0100 mwl8k: add 2.4GHz channels 12, 13 and 14 Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 49eb691c8f48a29adfdfbdeb82433f1f8cb6524d Author: Lennert Buytenhek Date: Mon Nov 30 18:32:13 2009 +0100 mwl8k: initialize the mwl8k_info_tbl table using the MWL* enums Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit e0493a8dd6351a114b53790dda6bd855ae73a85c Author: Lennert Buytenhek Date: Mon Nov 30 18:32:00 2009 +0100 mwl8k: inline qos field manipulation functions Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 74726e729291131ac2b9ab7e0bd2e18b7b03970d Author: Lennert Buytenhek Date: Mon Nov 30 18:31:52 2009 +0100 mwl8k: get rid of the AMSDU check in the transmit path Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 99200a992e365a73dc67a6570524e5f3af4386dd Author: Lennert Buytenhek Date: Mon Nov 30 18:31:40 2009 +0100 mwl8k: hw is never NULL in mwl8k_set_radio_preamble() Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 55489b6ed6801a42636fc3d4594b77dda9c409f2 Author: Lennert Buytenhek Date: Mon Nov 30 18:31:33 2009 +0100 mwl8k: firmware command code cleanup Sort firmware commands by command code, get rid of the 802_11 substring in all command names, and make sure that the command functions match the firmware command names. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit ea1e4b842049fcc4741096538114871a74859314 Merge: b6ce5c3 92c6f8d Author: John W. Linville Date: Mon Dec 28 15:09:11 2009 -0500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 4757968dbff3d43f373f08de973014a9bd41ef0a Author: Jaroslav Kysela Date: Mon Dec 28 16:15:03 2009 +0100 ALSA: Release v1.0.22.1 Signed-off-by: Jaroslav Kysela commit 52a7a5835173af61b9f6c3038212370d9717526f Author: John S. Gruber Date: Sun Dec 27 12:19:59 2009 -0500 ALSA: usb-audio: use usbquirk.h for detection of HVR-950Q/850 Detect the HVR-950Q HVR-850 urb data alignment quirk using usbquirk.h rather than using a case statement in snd_usb_audio_probe. Signed-off-by: John S. Gruber Signed-off-by: Takashi Iwai commit 98e89f606c38a310a20342f90e0c453e6afadf18 Author: John S. Gruber Date: Sun Dec 27 12:19:58 2009 -0500 ALSA: usb-audio: relax urb data align. restriction HVR-950Q and HVR-850 only Addressing audio quality problem. In sound/usb/usbaudio.c, for the Hauppage HVR-950Q and HVR-850 only, change retire_capture_urb to allow transfers on audio sub-slot boundaries rather than audio slots boundaries. With these devices the left and right channel samples can be split between two different urbs. Throwing away extra channel samples causes a sound quality problem for stereo streams as the left and right channels are swapped repeatedly, perhaps many times per second. Urbs unaligned on sub-slot boundaries are still truncated to the next lowest stride (audio slot) to retain synchronization on samples even though left/right channel synchronization may be lost in this case. Detect the quirk using a case statement in snd_usb_audio_probe. BugLink: https://bugs.launchpad.net/ubuntu/+bug/495745 Signed-off-by: John S. Gruber Signed-off-by: Takashi Iwai commit adc8d31326c32a2a1e145ab80accbc3c6570b117 Author: Clemens Ladisch Date: Sun Dec 27 12:19:57 2009 -0500 ALSA: usb-audio: make buffer pointer based on bytes instead on frames Since there are devices that do not align the size of their data packets to frame boundaries, the driver needs to be able to keep track of partial frames. This patch prepares for support for such devices by changing the hwptr_done variable from a frame counter to a byte counter. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7d2b451e65d255427c108e990507964ac39c13ee Author: Sergiy Kovalchuk Date: Sun Dec 27 09:13:41 2009 -0800 ALSA: usb-audio - Added functionality for E-mu 0404USB/0202USB/TrackerPre Added functionality: 1) Extension Units support (all XU settings now available at alsamixer, kmix, etc): - "AnalogueIn soft limiter" switch; - "Sample rate" selector (values 0,1,2,3,4,5 corresponds to 44.1 48 ... 192 kHz); - "DigitalIn CLK source" selector (internal/external) (**); - "DigitalOut format SPDIF/AC3" switch (**); (**)E-mu-0404usb only. 2) Automatic device sample rate adjustment depending on substream samplerate for both capture and playback substream. [minor coding-style fixes by tiwai] Signed-off-by: Sergiy Kovalchuk Signed-off-by: Takashi Iwai commit c97259df3f2e163c72f4d0685c61fb2e026dc989 Author: Daniel T Chen Date: Sun Dec 27 18:52:08 2009 -0500 ALSA: hda: Refactor powerdown for Realtek HDA codecs This patch converts the alc889 Aspire-specific powerdown to a generic one. Like the previous effort, it currently only handles Front and PCM but can be easily extended to cover other nids. The existing hook for alc889 Aspire-specific remains enabled. Upon further testing, I've added its use for ALC861_AUTO as well. Following patches will enable them for other quirks. Tested-by: Dr. David Alan Gilbert Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit ea52bf260ecbb175339af3178c15788df21b7516 Author: Daniel T Chen Date: Sun Dec 27 18:48:29 2009 -0500 ALSA: hda: Add powerdown for Analog Devices HDA codecs This patch ports powerdown fixes to AD198x. Currently we only turn off Front and HP for suspend, but this is easily extended for additional nids. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit d894837f23f491aa7ed167aae767fc07cfe6e6e6 Author: Simon Kagstrom Date: Wed Dec 23 11:08:18 2009 +0100 sched: might_sleep(): Make file parameter const char * Fixes a warning when building with g++: warning: deprecated conversion from string constant to 'char*' And the file parameter use is constant, so mark it as such. Signed-off-by: Simon Kagstrom Cc: peterz@infradead.org LKML-Reference: <20091223110818.442d848e@marrow.netinsight.se> Signed-off-by: Ingo Molnar commit 39d997b514e12d5aff0dca206eb8996b3957927e Author: Akinobu Mita Date: Mon Dec 21 16:20:16 2009 -0800 x86, core: Optimize hweight32() Optimize hweight32 by using the same technique in hweight64. The proof of this technique can be found in the commit log for f9b4192923fa6e38331e88214b1fe5fc21583fcc ("bitops: hweight() speedup"). The userspace benchmark on x86_32 showed 20% speedup with bitmap_weight() which uses hweight32 to count bits for each unsigned long on 32bit architectures. int main(void) { #define SZ (1024 * 1024 * 512) static DECLARE_BITMAP(bitmap, SZ) = { [0 ... 100] = 1, }; return bitmap_weight(bitmap, SZ); } Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Cc: Linus Torvalds LKML-Reference: <1258603932-4590-1-git-send-email-akinobu.mita@gmail.com> [ only x86 sets ARCH_HAS_FAST_MULTIPLIER so we do this via the x86 tree] Signed-off-by: Ingo Molnar commit 9967411e5b324a908e344d6ce66b77bd5d372c3e Author: Xiao Guangrong Date: Mon Dec 28 16:49:38 2009 +0800 perf trace: Fix forgotten close of file/dir Signed-off-by: Xiao Guangrong Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Clark Williams Cc: John Kacur LKML-Reference: <4B387122.7090801@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 61be3e59ba7a6dbd39f92fd1f107285a0caeb008 Author: Xiao Guangrong Date: Mon Dec 28 16:48:30 2009 +0800 perf trace: Clean up find_debugfs() Remove redundant code for 'perf trace' Signed-off-by: Xiao Guangrong Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Clark Williams Cc: John Kacur LKML-Reference: <4B3870DE.7090500@cn.fujitsu.com> [ v2: resolved conflicts with recent changes ] Signed-off-by: Ingo Molnar commit 29c52aa2300173dd45df04dae1f5acc81a2c93b1 Author: Xiao Guangrong Date: Mon Dec 28 16:47:12 2009 +0800 perf tools: Mount debugfs automatically Mount debugfs filesystem under '/sys/kernel/debug', if it's not mounted. Signed-off-by: Xiao Guangrong Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Clark Williams Cc: John Kacur LKML-Reference: <4B387090.7080407@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 07b139c8c81b97bbe55c68daf0cbeca8b1c609ca Author: Li Zefan Date: Mon Dec 21 14:27:35 2009 +0800 perf events: Remove CONFIG_EVENT_PROFILE Quoted from Ingo: | This reminds me - i think we should eliminate CONFIG_EVENT_PROFILE - | it's an unnecessary Kconfig complication. If both PERF_EVENTS and | EVENT_TRACING is enabled we should expose generic tracepoints. | | Nor is it limited to event 'profiling', so it has become a misnomer as | well. Signed-off-by: Li Zefan Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <4B2F1557.2050705@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 659d8cfbb225f1fa5a4f8671a847ef3ab5a89660 Author: Ulrich Drepper Date: Sat Dec 19 16:40:28 2009 -0500 perf tools: Do a few more directory handling optimizations A few more optimizations for perf when dealing with directories. Some of them significantly cut down the work which has to be done. d_type should always be set; otherwise fix the kernel code. And there are functions available to parse fstab-like files, so use them. Signed-off-by: Ulrich Drepper Acked-by: Pekka Enberg Cc: a.p.zijlstra@chello.nl Cc: acme@redhat.com Cc: eranian@google.com Cc: fweisbec@gmail.com Cc: lizf@cn.fujitsu.com Cc: paulus@samba.org Cc: xiaoguangrong@cn.fujitsu.com LKML-Reference: <200912192140.nBJLeSfA028905@hs20-bc2-1.build.redhat.com> [ v2: two small stylistic fixlets ] Signed-off-by: Ingo Molnar commit 34d0b5af50a063cded842716633501b38ff815fb Author: Paul Mundt Date: Mon Dec 28 17:53:47 2009 +0900 sh: Convert ptrace to hw_breakpoint API. This is the initial step for converting singlestep handling via ptrace over to hw_breakpoints. Signed-off-by: Paul Mundt commit fd2a50a0240f5f5b59070474eabd83a85720a406 Author: Naga Chumbalkar Date: Thu Dec 24 01:54:47 2009 +0000 x86, perfctr: Remove unused func avail_to_resrv_perfctr_nmi() avail_to_resrv_perfctr_nmi() is neither EXPORT'd, nor used in the file. So remove it. Signed-off-by: Naga Chumbalkar Acked-by: Cyrill Gorcunov Cc: oprofile-list@lists.sf.net LKML-Reference: <20091224015441.6005.4408.sendpatchset@localhost.localdomain> Signed-off-by: Ingo Molnar commit 49f474331e563a6ecf3b1e87ec27ec5482b3e4f1 Author: Peter Zijlstra Date: Sun Dec 27 11:51:52 2009 +0100 perf events: Remove arg from perf sched hooks Since we only ever schedule the local cpu, there is no need to pass the cpu number to the perf sched hooks. This micro-optimizes things a bit. Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 4cf40131a5cf4918e83b3756e58a1fc9e984f8ef Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:06 2009 -0200 perf record: Introduce a symtab cache Now a cache will be created in a ~/.debug debuginfo like hierarchy, so that at the end of a 'perf record' session all the binaries (with build-ids) involved get collected and indexed by their build-ids, so that perf report can find them. This is interesting when developing software where you want to do a 'perf diff' with the previous build and opens avenues for lots more interesting tools, like a 'perf diff --graph' that takes more than two binaries into account. Tunables for collecting just the symtabs can be added if one doesn't want to have the full binary, but having the full binary allows things like 'perf rerecord' or other tools that can re-run the tests by having access to the exact binary in some perf.data file, so it may well be interesting to keep the full binary there. Space consumption is minimised by trying to use hard links, a 'perf cache' tool to manage the space used, a la ccache is required to purge older entries. With this in place it will be possible also to introduce new commands, 'perf archive' and 'perf restore' (or some more suitable and future proof names) to create a cpio/tar file with the perf data and the files in the cache that _had_ perf hits of interest. There are more aspects to polish, like finding the right vmlinux file to cache, etc, but this is enough for a first step. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-10-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 55aa640f54280da25046acd2075842d464f451e6 Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:05 2009 -0200 perf session: Remove redundant prefix & suffix from perf_event_ops Since now all that we have are perf event handlers, leave just the name of the event. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-9-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f7d87444e6ee6f4a19634e5412664c1c529a2370 Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:04 2009 -0200 perf session: Move full_paths config to symbol_conf Now perf_event_ops has just that, event handlers. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-8-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 31d337c4ee3152b7271897eae576251643f5a3b5 Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:03 2009 -0200 perf session: Move total_unknown to perf_session->unknown events As this is a session property, not belonging to perf_event_ops, that can be shared by many perf_session instances. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-7-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d549c7690190d9739005e19604faad6da4b802ac Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:02 2009 -0200 perf session: Remove sample_type_check from event_ops This is really something tools need to do before asking for the events to be processed, leaving perf_session__process_events to do just that, process events. Also add a msg parameter to perf_session__has_traces() so that the right message can be printed, fixing a regression added by me in the previous cset (right timechart message) and also fixing 'perf kmem', that was not asking if 'perf kmem record' was ran. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 27295592c22e71bbd38110c302da8dbb43912a60 Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:01 2009 -0200 perf session: Share the common trace sample_check routine as perf_session__has_traces Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 4a58e61161074776aa34187ea369414ce4852394 Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:37:00 2009 -0200 perf tools: Move the map class definition to a separate header And this resulted in the need for adding some missing includes in some places that were getting the definitions needed out of sheer luck. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 06aae590033d1ae3c35b2920ef950cfc603e2a2d Author: Arnaldo Carvalho de Melo Date: Sun Dec 27 21:36:59 2009 -0200 perf session: Move the event processing routines to session.c No need for an extra "data_map" file since the routines there operate mainly on a perf_session instance. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1261957026-15580-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 3912f2abc942a002ef611fc973add5e5eadb3432 Author: Amerigo Wang Date: Mon Dec 14 03:23:56 2009 -0500 perf: Use format string of printf to align strings Instead of filling whitespaces to do alignment, use printf's format string. This simplifies the code a bit. Signed-off-by: WANG Cong Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <20091214082700.4224.57640.sendpatchset@localhost.localdomain> Signed-off-by: Ingo Molnar commit 014c41fce1bd5cec381e70fc6f58fdfc96cdaf69 Author: Takashi Iwai Date: Sun Dec 27 13:53:24 2009 +0100 ALSA: hda - Use strict_strtoul() Rewrite the codes to use strict_strtoul() instead of simple_strtoul(). Signed-off-by: Takashi Iwai commit b82855a0d76ebda1cc14c00040560d77bfa042ce Author: Takashi Iwai Date: Sun Dec 27 11:24:56 2009 +0100 ALSA: hda - Add sanity check for storing the user-defined pin configs Check whether the given NID is a pin widget before storing the user-defined pin configs. Signed-off-by: Takashi Iwai commit a4e09aa3cf592d9f084ff4ceb216be40c4c265dc Author: Takashi Iwai Date: Sun Dec 27 11:22:24 2009 +0100 ALSA: hda - Fix click noises at suspend/free with Realtek codecs Call snd_hda_shutup_pins() at suspend and free for avoiding click noises. Signed-off-by: Takashi Iwai commit 92ee6162c48fab24f0676969f0f147fc12f8f21c Author: Takashi Iwai Date: Sun Dec 27 11:18:59 2009 +0100 ALSA: hda - Add snd_hda_shutup_pins() helper function Add a common helper function for clearing pin controls before suspend. Use the pincfg array instead of looking through all widget tree. Signed-off-by: Takashi Iwai commit 3100aa9d74db9c6d8d9a3b6421721fc1aef4728f Author: Octavian Purdila Date: Sat Dec 26 11:51:08 2009 +0000 llc: fix SAP reference counting w.r.t. socket handling The SAP ref counter gets decremented twice when deleting a socket, although for all but the first socket of a SAP the SAP ref counter was incremented only once. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 8beb9ab6c2df203e8d68cb1f48cf42604a6bed86 Author: Octavian Purdila Date: Sat Dec 26 11:51:06 2009 +0000 llc: convert llc_sap_list to RCU Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 52d58aef5ee460fedd7f250f05e79081019f2c79 Author: Octavian Purdila Date: Sat Dec 26 11:51:05 2009 +0000 llc: replace the socket list with a local address based hash For the cases where a lot of interfaces are used in conjunction with a lot of LLC sockets bound to the same SAP, the iteration of the socket list becomes prohibitively expensive. Replacing the list with a a local address based hash significantly improves the bind and listener lookup operations as well as the datagram delivery. Connected sockets delivery is also improved, but this patch does not address the case where we have lots of sockets with the same local address connected to different remote addresses. In order to keep the socket sanity checks alive and fast a socket counter was added to the SAP structure. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 6d2e3ea284463d5ab34e9cf2a41d0b8627b95d02 Author: Octavian Purdila Date: Sat Dec 26 11:51:04 2009 +0000 llc: use a device based hash table to speed up multicast delivery This patch adds a per SAP device based hash table to solve the multicast delivery scalability issue when we have large number of interfaces and a large number of sockets bound to the same SAP. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 0f7b67dd9e1192976f5e5a78934c7a339ff7c45f Author: Octavian Purdila Date: Sat Dec 26 11:51:03 2009 +0000 llc: optimize multicast delivery Optimize multicast delivery by doing the actual delivery without holding the lock. Based on the same approach used in UDP code. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit b76f5a8427ac2928c07fa4ff2144bb8db072c240 Author: Octavian Purdila Date: Sat Dec 26 11:51:02 2009 +0000 llc: convert the socket list to RCU locking For the reclamation phase we use the SLAB_DESTROY_BY_RCU mechanism, which require some extra checks in the lookup code: a) If the current socket was released, reallocated & inserted in another list it will short circuit the iteration for the current list, thus we need to restart the lookup. b) If the current socket was released, reallocated & inserted in the same list we just need to recheck it matches the look-up criteria and if not we can skip to the next element. In this case there is no need to restart the lookup, since sockets are inserted at the start of the list and the worst that will happen is that we will iterate throught some of the list elements more then once. Note that the /proc and multicast delivery was not yet converted to RCU, it still uses spinlocks for protection. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit abf9d537fea225af60762640361af7fb233b3103 Author: Octavian Purdila Date: Sat Dec 26 11:51:01 2009 +0000 llc: add support for SO_BINDTODEVICE Using bind(MAC address) with LLC sockets has O(n) complexity, where n is the number of interfaces. To overcome this, we add support for SO_BINDTODEVICE which drops the complexity to O(1). Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit e5cd6fe391aa8c93560bb7ffdfe334cf4d0a02e4 Author: Octavian Purdila Date: Sat Dec 26 11:51:00 2009 +0000 llc: add support for LLC_OPT_PKTINFO Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit bf9ae5386bca8836c16e69ab8fdbe46767d7452a Author: Octavian Purdila Date: Sat Dec 26 11:50:59 2009 +0000 llc: use dev_hard_header Using dev_hard_header allows us to use LLC with VLANs and potentially other Ethernet/TokernRing specific encapsulations. It also removes code duplication between LLC and Ethernet/TokenRing core code. Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 043958e602ac2cbf918c0dab1e4e2a7f9751ebf6 Author: Takashi Iwai Date: Sat Dec 26 10:36:12 2009 +0100 ALSA: hda - Add more hints for GPIO setup of IDT/STAC codecs gpio_led, gpio_led_polarity and gpio_mute are added now. Signed-off-by: Takashi Iwai commit f83d664eef180478c2dc0a0099e9d7bc1c8177ff Author: John W. Linville Date: Fri Dec 25 16:35:43 2009 -0800 wireless: fix comments in genregdb.awk Apparently some awk versions choke on C-style comments -- who knew? :-) Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit d346f49d0badd80aa9fc699fa9c6d5b23e778eb6 Merge: d87fd25 b6ce5c3 Author: David S. Miller Date: Fri Dec 25 16:34:56 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 15e7f8b92aed71819411025279cd3df37f8c636b Merge: 21949f0 ef18bed Author: Takashi Iwai Date: Fri Dec 25 14:17:48 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 44eba3e82b35ae796826a65d8040001582adc10a Author: Krzysztof Helt Date: Wed Dec 23 18:02:41 2009 +0100 ALSA: jazz16: refine dma and irq selection Narrow the dma and irq selection after the DOS driver. Add ALSA configuration description as well. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 52e04ea89da57274f0313d2bd73ba02f686cfdeb Merge: 41116e9 8b90ca0 Author: Takashi Iwai Date: Fri Dec 25 14:15:31 2009 +0100 Merge branch 'fix/misc' into topic/misc commit cffdde993a016bedbc2f5eb60d00c3a766ffb612 Author: Dmitry Torokhov Date: Thu Dec 24 00:02:30 2009 -0800 sony-laptop - switch from workqueue to a timer The function that is executing in workqueue context does not need to sleep so let's switch to a timer which is more lightweight. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit c45bc9d62c39202b401d1bf7bb2812abb88798a1 Author: Dmitry Torokhov Date: Thu Dec 24 00:02:23 2009 -0800 sony-laptop - simplify keymap initialization Also use input_set_capability() helper instead of manipulating bits directly. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 9593bd07ec8eaaa30aba4281b2b3273282fc344f Author: Dmitry Torokhov Date: Thu Dec 24 00:02:16 2009 -0800 sony-laptop - remove private workqueue, use keventd instead If we reschedule work instead of having work function sleep for 10 msecs between reads from kfifo we can safely use the main workqueue (keventd) and not bother with creating driver-private one. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 17eb9d62828c3688f41f31ac00d7fee6da9675bf Merge: 76e7461 f34548c Author: Paul Mundt Date: Thu Dec 24 15:16:41 2009 +0900 Merge branches 'sh/g3-prep' and 'sh/stable-updates' commit d87fd25d5ac4cd044e21b749a8f6cac90f093c71 Author: Scott Feldman Date: Wed Dec 23 13:27:59 2009 +0000 enic: whitespace cleanup; #define cleanup; more verbose err msg Some misc changes to cleanup whitespace issues and fix/remove some #define HW defintions. 1) fix some whitespace issues 2) more verbose err msg when resources aren't available to configure vnic 3) remove unused #define 4) fix RSS #define rss hash types Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 7c8445991172cc17eaca9f7de0a300c02caaa49d Author: Scott Feldman Date: Wed Dec 23 13:27:54 2009 +0000 enic: feature add: add ethtool -c/C support Only rx_usec and tx_usec options for ethtool -C are settable as those are the only settings that make sense to HW. Adds driver reporting of intr coalescing timer value in usec units rather than HW units. Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit bd2496229e702b2eb50eab5589858a3cdb7847b2 Author: Scott Feldman Date: Wed Dec 23 13:27:48 2009 +0000 enic: Bug fix: align desc ring sizes to 32 descs Previous driver was aligning ring sizes to 16 descs, but hardware actually wants desc ring sizes to be aligned to 32 descs. Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 9959a18556c73ebf2936b8df183ea7b41f38d933 Author: Scott Feldman Date: Wed Dec 23 13:27:43 2009 +0000 enic: minimize pkt filter updates to firmware In set_multicast(), only push pkt filter changes down to firmware if pkt filter actually changes. Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 2d6ddced5c99cf79c06b9b6ec1366ab63b970ea9 Author: Scott Feldman Date: Wed Dec 23 13:27:38 2009 +0000 enic: Bug fix: try harder to fill Rx ring on skb allocation failures During dev->open(), make sure we get at least one skb on the Rx ring. Otherwise abort the interface load. Also, if we get skb allocation failures in NAPI poll while trying to replenish the ring, try again later so we don't end up starving out the Rx ring completely. Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit b3d18d191bb805f3effdfc083c4ce79789470b46 Author: Scott Feldman Date: Wed Dec 23 13:27:30 2009 +0000 enic: Bug fix: use safe queue shutdown in dev->stop Fix dev->stop shutdown bug where driver was stopping xmit queue and then disabling intrs. Fix is to disable intrs first and then stop the xmit queue, otherwise an interrupt could cause the queue to be rewoken. Also, no need to explicitly do queue servicing because queues are cleaned and reset back to initial state at end of dev->stop. Servicing queues also had the side-effect of also rewakening the xmit queue, which is not what we want. Signed-off-by: Vasanthy Kolluri Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit fe45332ed289d91e57eca11bfd1ca75d6e420ab4 Author: Tomas Winkler Date: Wed Dec 16 04:26:26 2009 +0000 iwmc3200top: simplify imwct_tx 1. remove address argument since we use same address IWMC_SDIO_DATA_ADDR in all cases 2. add __iwmct_tx - non locking tx function for already locked contexts Signed-off-by: Tomas Winkler Signed-off-by: David S. Miller commit 0df828f670b1fd8c469f3d60472ddca0d0f51fcf Author: Tomas Winkler Date: Wed Dec 16 04:26:25 2009 +0000 iwmc3200top: cleanup log messages 1. add TRACE level 2. use TRACE where needed to reduce the noise 3 don't INFOEX from driver 4. add DUMP level for packets dumps 5. use correct context for the log messages Signed-off-by: Tomas Winkler Signed-off-by: David S. Miller commit 9fa4d67c6e4d678271798f006ca1d945e8b2bd5c Author: Tomas Winkler Date: Wed Dec 16 04:26:24 2009 +0000 iwmc3200top: clean up fw_download 1. removed redundant NULL-pointers checks in iwmct_fw_load as release_firmware and kfree are NULL pointer friendly 2. remove redundant memset of the parser since the structure is fully initialized in iwmct_fw_parser_init function Signed-off-by: Tomas Winkler Signed-off-by: David S. Miller commit 31d12926e37291970dd4f6e9940df3897766a81d Author: laurent chavey Date: Tue Dec 15 11:15:28 2009 +0000 net: Add rtnetlink init_rcvwnd to set the TCP initial receive window Add rtnetlink init_rcvwnd to set the TCP initial receive window size advertised by passive and active TCP connections. The current Linux TCP implementation limits the advertised TCP initial receive window to the one prescribed by slow start. For short lived TCP connections used for transaction type of traffic (i.e. http requests), bounding the advertised TCP initial receive window results in increased latency to complete the transaction. Support for setting initial congestion window is already supported using rtnetlink init_cwnd, but the feature is useless without the ability to set a larger TCP initial receive window. The rtnetlink init_rcvwnd allows increasing the TCP initial receive window, allowing TCP connection to advertise larger TCP receive window than the ones bounded by slow start. Signed-off-by: Laurent Chavey Signed-off-by: David S. Miller commit 068a2de57ddf4f472e32e7af868613c574ad1d88 Author: Krishna Kumar Date: Wed Dec 9 20:59:58 2009 +0000 net: release dst entry while cache-hot for GSO case too Non-GSO code drops dst entry for performance reasons, but the same is missing for GSO code. Drop dst while cache-hot for GSO case too. Signed-off-by: Krishna Kumar Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit def87cf42069a6d4fd42a2ede8f19c620a292568 Author: Krishna Kumar Date: Thu Dec 10 07:16:59 2009 +0000 tcp: Slightly optimize tcp_sendmsg Slightly optimize tcp_sendmsg since NETIF_F_SG is used many times iteratively in the loop. The only other modification is to change: } else if (i == MAX_SKB_FRAGS || (!i && !(sk->sk_route_caps & NETIF_F_SG))) { to: } else if (i == MAX_SKB_FRAGS || !sg) { The reason why this change is correct: this code (other than the MAX_SKB_FRAGS case) executes only due to the else part of: "if (skb_tailroom(skb) > 0) {" - i.e. there was no space in the skb to put the data inline. Hence SG is false is a sufficient condition, and there is no way a fragment can be added to the skb. Changelog: - Added the above explanation for the change Signed-off-by: Krishna Kumar Acked-by: Ilpo Järvinen Signed-off-by: David S. Miller commit afeca340c078e17ca233b3c68c3c3a70c56bfe1d Author: Krishna Kumar Date: Thu Dec 10 07:16:52 2009 +0000 tcp: Remove unrequired operations in tcp_push() Remove unrequired operations in tcp_push() Changelog: Removed a temporary skb variable from tcp_push() Signed-off-by: Krishna Kumar Acked-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 12d50c46dc0f7fd2e625c4befaa5fa5740a7a594 Author: Krishna Kumar Date: Tue Dec 8 22:26:13 2009 +0000 tcp: Remove check in __tcp_push_pending_frames tcp_push checks tcp_send_head and calls __tcp_push_pending_frames, which again checks tcp_send_head, and this unnecessary check is done for every other caller of __tcp_push_pending_frames. Remove tcp_send_head check in __tcp_push_pending_frames and add the check to tcp_push_pending_frames. Other functions call __tcp_push_pending_frames only when tcp_send_head would evaluate to true. Signed-off-by: Krishna Kumar Acked-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7ef8a2127a64d131c4dbe5b843e5708f6e75552b Author: Amit Kumar Salecha Date: Tue Dec 8 20:40:57 2009 +0000 netxen: fix unified fw size check o Unified firmware image size can be < 1 MB Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e87ad5539343366e7c634c940a930157b6fa2aae Author: Amit Kumar Salecha Date: Tue Dec 8 20:40:56 2009 +0000 netxen: support pci error handlers o Support pci error detection and recovery. o Refactor suspend and resume code, to share with io_error_detected, and slot_reset callbacks o NX_NEED_AER device state added, to synchronize with firmware recovery. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21 Author: Amit Kumar Salecha Date: Tue Dec 8 20:40:55 2009 +0000 netxen: fix tx timeout recovery o In case of tx timeout, firmare may be healthy, but some pci-func may see no response from it. Force firmware reset, if some pci-func explicitly requests so. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit bc86fcbac0a86a93ee65cc31769c4e83e6ff2295 Author: Amit Kumar Salecha Date: Tue Dec 8 20:40:54 2009 +0000 netxen: minor suspend resume fixes o pci device should be disable at the end and it should be enable first. o Interface should be attached(netif_device_attach()) irrespective of its state. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b4de921ae6f7bb211868be4f7d56e80ac6da676c Merge: 17a3be3 ed4b201 Author: David S. Miller Date: Wed Dec 23 14:09:17 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 93cea5bebf91319095db866163a7e35c3e77d8f2 Author: Sage Weil Date: Wed Dec 23 12:21:51 2009 -0800 ceph: use ceph_pagelist for mds reconnect message; change encoding (protocol change) Use the ceph_pagelist to encode the MDS reconnect message. We change the message encoding (protocol change!) at the same time to make our life easier (we don't know how many snaprealms we have when we start encoding). An empty message implies the session is closed/does not exist. Signed-off-by: Sage Weil commit 58bb3b374b07a2a43315213f00a48a5ffd6d0915 Author: Sage Weil Date: Wed Dec 23 12:12:31 2009 -0800 ceph: support ceph_pagelist for message payload The ceph_pagelist is a simple list of whole pages, strung together via their lru list_head. It facilitates encoding to a "buffer" of unknown size. Allow its use in place of the ceph_msg page vector. This will be used to fix the huge buffer preallocation woes of MDS reconnection. Signed-off-by: Sage Weil commit 04a419f908b5291ff7e8ffd7aa351fa0ac0c08af Author: Sage Weil Date: Wed Dec 23 09:30:21 2009 -0800 ceph: add feature bits to connection handshake (protocol change) Define supported and required feature set. Fail connection if the server requires features we do not support (TAG_FEATURES), or if the server does not support features we require. Signed-off-by: Sage Weil commit 6df058c025ce343052c5516b1d8a9a7e73cddd64 Author: Sage Weil Date: Tue Dec 22 11:24:33 2009 -0800 ceph: include transaction id in ceph_msg_header (protocol change) Many (most?) message types include a transaction id. By including it in the fixed size header, we always have it available even when we are unable to allocate memory for the (larger, variable sized) message body. This will allow us to error out the appropriate request instead of (silently) dropping the reply. Signed-off-by: Sage Weil commit 0cf90ab5b075821940873e73cdbfeb8edc3dabe8 Author: Sage Weil Date: Tue Dec 22 10:45:18 2009 -0800 ceph: more informative msgpool errors Signed-off-by: Sage Weil commit 350b1c32ea58d29e25d63fc25e92dd48f9339546 Author: Sage Weil Date: Tue Dec 22 10:45:45 2009 -0800 ceph: control access to page vector for incoming data When we issue an OSD read, we specify a vector of pages that the data is to be read into. The request may be sent multiple times, to multiple OSDs, if the osdmap changes, which means we can get more than one reply. Only read data into the page vector if the reply is coming from the OSD we last sent the request to. Keep track of which connection is using the vector by taking a reference. If another connection was already using the vector before and a new reply comes in on the right connection, revoke the pages from the other connection. Signed-off-by: Sage Weil commit ec302645f4a9bd9ec757c30d185557e1c0972c1a Author: Sage Weil Date: Tue Dec 22 10:43:42 2009 -0800 ceph: use connection mutex to protect read and write stages Use a single mutex (previously out_mutex) to protect both read and write activity from concurrent ceph_con_* calls. Drop the mutex when doing callbacks to avoid nested locking (the callback may need to call something like ceph_con_close). Signed-off-by: Sage Weil commit 529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4 Author: Sage Weil Date: Tue Dec 22 10:29:39 2009 -0800 ceph: unregister canceled/timed out osd requests Canceled or timed out osd requests were getting left in the request list and never deallocated (until umount). Unregister if they are canceled (control-c) or time out. Signed-off-by: Sage Weil commit e0e3271074e1ebd0b80a912a457ce03c971bcd66 Author: Sage Weil Date: Mon Dec 21 21:04:26 2009 -0800 ceph: only unregister registered bdi Signed-off-by: Sage Weil commit 5dacf09121ffb2e5fc7d15b78cae0b77042a1935 Author: Sage Weil Date: Mon Dec 21 20:40:34 2009 -0800 ceph: do not touch_caps while iterating over caps list Avoid confusing iterate_session_caps(), flag the session while we are iterating so that __touch_cap does not rearrange items on the list. All other modifiers of session->s_caps do so under the protection of s_mutex. Signed-off-by: Sage Weil commit 4b186f72033611c2b526c7341534e71ee4afd222 Author: Jiri Kosina Date: Wed Dec 23 13:12:32 2009 +0100 HID: make 3M PCT touchscreen driver standalone config option The point behind 'default !EMBEDDED' for certain HID drivers that simple and straightforward quirks for HID devices (which are implemented as drivers on HID bus) wouldn't have to be enabled separately, if the device is otherwise more-or-less HID standard compliant. But this driver is rather standalone driver, so we'd want to have it normally selectable. Signed-off-by: Jiri Kosina commit 863b557a88f8c033f7419fabafef4712a5055f85 Author: Youquan, Song Date: Wed Dec 23 19:45:20 2009 +0800 crypto: testmgr - Fix complain about lack test for internal used algorithm When load aesni-intel and ghash_clmulni-intel driver,kernel will complain no test for some internal used algorithm. The strange information as following: alg: No test for __aes-aesni (__driver-aes-aesni) alg: No test for __ecb-aes-aesni (__driver-ecb-aes-aesni) alg: No test for __cbc-aes-aesni (__driver-cbc-aes-aesni) alg: No test for __ecb-aes-aesni (cryptd(__driver-ecb-aes-aesni) alg: No test for __ghash (__ghash-pclmulqdqni) alg: No test for __ghash (cryptd(__ghash-pclmulqdqni)) This patch add NULL test entries for these algorithm and driver. Signed-off-by: Youquan, Song Signed-off-by: Ying, Huang Signed-off-by: Herbert Xu commit 21949f00a022e090a7e8bc9a01dfca88273c6146 Author: Takashi Iwai Date: Wed Dec 23 08:31:59 2009 +0100 ALSA: hda - Fix NID association for capture mixers Fix the wrong implementation of NID <-> kctl mapping for capture mixers introduced by the ocmmit 5b0cb1d850c26893b1468b3a519433a1b7a176be. So far, the driver returns an error at probe. Signed-off-by: Takashi Iwai commit 524027916e5763a0c9a7da80aa8dd013a14a0440 Merge: 75d1aeb 9dc8398 Author: Takashi Iwai Date: Wed Dec 23 08:38:23 2009 +0100 Merge branch 'fix/hda' into topic/hda commit b6353f4f36f03a12edaf3fa5365b475a28106035 Author: Stephane Chatty Date: Tue Dec 22 23:04:17 2009 +0100 HID: Support for 3M multitouch panel Add support for 3M multitouch panels. Signed-off-by: Stephane Chatty [jkosina@suse.cz: fix build failure because of inconsistent 3M/MMM defines] Signed-off-by: Jiri Kosina commit b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 Author: Sujith Date: Mon Dec 14 14:57:06 2009 +0530 ath9k: Fix TX poll routine Disable the TX hang monitoring routine when doing a scan. Monitoring for a hung situation is not really necessary during a scan run. Cc: stable@kernel.org Signed-off-by: Sujith Signed-off-by: John W. Linville commit 05c78d6d3ec5a8325398b3866e7e6bb88940d4fd Author: Sujith Date: Mon Dec 14 14:57:04 2009 +0530 ath9k: Remove ANI lock Cancel/restart the ANI timer directly. With this patch, the ANI lock can be removed. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0ce024cbcd5837596bc82861f1d3074d53e956f6 Author: Sujith Date: Mon Dec 14 14:57:00 2009 +0530 ath9k: Clarify Interrupt mitigation ath9k currently supports only RX interrupt mitigation. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 45d5d805988f1f3c0b24dac59fbba771b1f106a8 Author: Emese Revfy Date: Mon Dec 14 00:59:53 2009 +0100 iwlwifi: Constify struct iwl_ops Signed-off-by: Emese Revfy Signed-off-by: John W. Linville commit ba37a3d0395a66b3c9164c4f4d1318317da32e96 Author: Johannes Berg Date: Thu Dec 10 14:37:27 2009 -0800 iwlwifi: use new mac80211 SMPS Instead of hard-coding the SM PS mode per hardware, this makes iwlwifi support the new mac80211 API for controlling the SM PS mode. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 11466f1342a3400dd5e03da3d8c45aa4149c62d4 Author: Stefan Seyfried Date: Tue Dec 8 15:21:35 2009 +0100 zd1211rw: improve ejecting of fake CDROM The zd1211rw always assumed that the storage device is at endpoint 1, but there are devices (Spairon Homelink 1202) that are at endpoint 0. Try both, starting with 1 to make sure to not break existing setups. Signed-off-by: Stefan Seyfried Signed-off-by: John W. Linville commit 5b6e2f12edd6c46e87a2775321f1912d19be4b35 Author: Stefan Seyfried Date: Tue Dec 8 15:21:34 2009 +0100 ar9170usb: add Sphairon Homelink 1202 USB ID Signed-off-by: Stefan Seyfried Signed-off-by: John W. Linville commit 9da3e068142ec7856b2f13261dcf0660fad32b61 Author: Luis R. Rodriguez Date: Mon Dec 7 15:57:50 2009 -0500 mac80211: only bother printing highest data rate on debugfs if its set IEEE-802.11n spec says the RX highest data rate field does not specify the highest supported RX data rate if its not set. Ignore it if not set then. Refer to section 7.3.56.4 Cc: johannes@sipsolutions.net Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7db94e210351e8578d4a98fed3edd4df5f10ae9d Author: Luis R. Rodriguez Date: Mon Dec 7 14:54:45 2009 -0500 mac80211: parse the HT capabilities info through debugfs When debugging you want to be lazy and not have to parse bits yourself so let mac80211 debugfs do the parsing for you. This is what I get against my WRT610N: root@tux:~# cat /sys/kernel/debug/ieee80211/phy0/stations/00\:22\:6b\:aa\:bb\:01/ht_capa ht supported cap: 0x000e HT20/HT40 SM Power Save disabled No RX STBC Max AMSDU length: 7935 bytes No DSSS/CCK HT40 ampdu factor/density: 2/6 MCS mask: ff ff 00 00 00 00 00 00 00 00 MCS rx highest: 0 MCS tx params: 0 Cc: johannes@sipsolutions.net Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit cb136f54ee11f9ead716b5ad0b10fa1c1b05271d Author: Luis R. Rodriguez Date: Mon Dec 7 14:01:28 2009 -0500 mac80211: make debugfs mcs set entry reflect 16 bits The MCS set is 16 bits so when debugging ensure the full 16 bits are represented. Current reading would make you think its only 8 bits. Cc: johannes@sipsolutions.net Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c755ad34ab233afaaacd3d67190a8b74186f9fe8 Author: Luis R. Rodriguez Date: Mon Dec 7 12:38:41 2009 -0500 ath9k: add MCS rate index back to debufs rcstat Speaking of 802.11n rates in terms of Mbps doesn't really developers and is just useful for users. To aid debugging add the MCS index back and an HT20/HT40 mode. New screenshot: HT MCS Rate Success Retries XRetries PER 6.0: 0 0 0 0 9.0: 0 0 0 0 12.0: 26 260 0 49 18.0: 80 804 2 58 24.0: 0 0 0 0 36.0: 0 0 0 0 48.0: 0 0 0 0 54.0: 0 0 0 0 HT20 0 6.5: 1368 13660 0 48 HT20 1 13.0: 0 0 0 0 HT20 2 19.5: 0 0 0 0 HT20 3 26.0: 0 0 0 0 HT20 4 39.0: 0 0 0 0 HT20 5 52.0: 55 578 14 43 HT20 6 58.5: 29 306 8 69 HT20 7 65.0: 21 210 0 67 HT20 8 13.0: 21 210 0 56 HT20 9 26.0: 0 0 0 0 HT20 10 39.0: 0 0 0 0 HT20 11 52.0: 0 0 0 0 HT20 12 78.0: 0 0 0 0 HT20 13 104.0: 0 0 0 0 HT20 14 117.0: 0 0 0 0 HT20 15 130.0: 27 290 10 55 HT40 0 13.5: 79 687 16 17 HT40 1 27.5: 60 409 10 17 HT40 2 40.5: 56 381 21 25 HT40 3 54.0: 44 302 21 18 HT40 4 81.5: 19 171 2 14 HT40 5 108.0: 0 0 0 0 HT40 6 121.5: 0 0 0 0 HT40 7 135.0: 0 0 0 0 HT40 7 150.0: 0 0 0 0 HT40 8 27.0: 0 0 0 0 HT40 9 54.0: 0 0 0 0 HT40 10 81.0: 0 0 0 0 HT40 11 108.0: 11 100 0 18 HT40 12 162.0: 23 200 0 22 HT40 13 216.0: 61 580 0 35 HT40 14 243.0: 37 271 0 66 HT40 15 270.0: 65 217 2 73 HT40 15 300.0: 0 0 0 0 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 265dc7f0964e4df95ab57a9d1618689301d39a55 Author: Jouni Malinen Date: Fri Dec 4 19:10:34 2009 +0200 mac80211_hwsim: Check all local addresses for TX Ack status Since mac80211_hwsim supports multiple virtual interfaces, we need to iterate through all active interfaces when figuring out whether there is a match during TX Ack status checking. This fixes TX status reporting for cases where secondary interfaces are used. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 2c7e6bc9ac7cb518cf037495932d80f71a1596f2 Author: Johannes Berg Date: Fri Dec 4 09:26:38 2009 +0100 mac80211: disallow fixing bitrates with hw rate control When hw rate control is used, these parameters have no meaning because the hardware cannot get at them right now, so disallow setting them. Also clean up the function a bit. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d80050c4c321a74cea28c6ef9695d8427a928417 Author: Joe Perches Date: Wed Dec 2 20:56:11 2009 -0800 iwmc3200wifi: Avoid an offset calculation for each management frame. Determine the offset at compile time. Signed-off-by: Joe Perches Acked-by: Zhu Yi Signed-off-by: John W. Linville commit 48631de9218a4563a6632e105676f42db3849c57 Author: Holger Schurig Date: Wed Dec 2 15:26:04 2009 +0100 libertas: remove priv->ratebitmap Used to be a write-only-variable :-) Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 0e78ff8fcc6dabeda313719deb751afbd20bea41 Author: Holger Schurig Date: Wed Dec 2 15:26:03 2009 +0100 libertas: remove priv->capability This variable was once set to WLAN_CAPABILITY_SHORT_PREAMBLE and there's no code that could change the variable to something else. Therefore it seems this is not necessary :-) Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 4143a23de096910e3ceb0939f41de6ffb8c59475 Author: Holger Schurig Date: Wed Dec 2 15:26:02 2009 +0100 libertas: make mesh configurable Mostly for the embedded people that know beforehand that they don't need MESH at all and want to save some bytes, but also helpful for the upcoming cfg80211 transition. text data bss dec hex filename 114264 2308 140 116712 1c7e8 libertas.ko with mesh 105026 2000 140 107166 1a29e libertas.ko without mesh -------------------------------------------------- -9238 -308 -9546 Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 602114ae595af6c89eab149cf9f939e3f7ef4a34 Author: Holger Schurig Date: Wed Dec 2 15:26:01 2009 +0100 libertas: add access functions for mesh open/connect status Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit e4da1a81a967c05dfde6f0498cff1f6fe6683f52 Author: Holger Schurig Date: Wed Dec 2 15:26:00 2009 +0100 libertas: move mesh SSID initialization into mesh.c Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit cd74468b8c56c1a809d9b7f913f11d8181c3a0b2 Author: Holger Schurig Date: Wed Dec 2 15:25:59 2009 +0100 libertas: decouple mesh and rtap While it's might be technically true that only MESH-enabled firmwares are also RTAP-enabled, I like to have this decoupled. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 55e1ff924414111a6afbfde00375a1302aef9353 Author: Holger Schurig Date: Wed Dec 2 15:25:58 2009 +0100 libertas: move mesh-related definitions into mesh.h Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit d6ede678c138061f5202b519f8f8d6372e2cb5bb Author: Holger Schurig Date: Wed Dec 2 15:25:57 2009 +0100 libertas: remove mesh_autostart_enabled and sync_channel mesh_autostart_enabled was nowhere set. Rumor is that this is used in the OLPC tree, but they never did submit their code upstream. After removing this code, it turned out that the sync_channel stuff is now also unused, so get rid of that as well. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit c24ef46e6b1597e54f185e0b48eb9073ef155a8c Author: Holger Schurig Date: Wed Dec 2 15:25:56 2009 +0100 libertas: use priv->mesh_tlv instead of priv->mesh_fw_ver Both variables contained the same information (no mesh, old mesh, new mesh). So we can get rid of one variable. Also move the mesh-version test from cmd.c into mesh.c. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 5d1ec85f00e999dba61bdcbd959d62439d418e56 Author: Johannes Berg Date: Wed Dec 2 12:43:43 2009 +0100 mac80211: dont try to use existing sta for AP Clean out some cruft that could use an already existing sta_info struct -- that case cannot happen. Also, there's a bug there -- if allocation/insertion fails then it is possible that we are left in a lingering state where mac80211 waits for the AP, cfg80211 waits for mac80211, but the AP has already replied. Since there's no way to indicate an internal error, pretend there was a timeout, i.e. that the AP never responded. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 5fba4af32ceeb935b3926714df9a64a33c2c9cf5 Author: Johannes Berg Date: Wed Dec 2 12:43:42 2009 +0100 cfg80211: avoid sending spurious deauth to userspace Before commit ca9034592823e8179511e48a78731f95bfdd766c Author: Holger Schurig Date: Tue Oct 13 13:45:28 2009 +0200 cfg80211: remove warning in deauth case we assumed that drivers never give us spurious deauth frames because they filter them out based on the auth state they keep track of. This turned out to be racy, because userspace might deauth while the AP is also sending a deauth frame, so the warning was removed. However, in that case we should not tell userspace about the AP's frame if it requested deauth "first", where "first" means it came to cfg80211 first. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f38fd12fa7b7b98e158a9b31d388da34eef25c22 Author: Johannes Berg Date: Tue Dec 1 18:29:42 2009 +0100 mac80211: allow disabling 40MHz on 2.4GHz In some situations it is required that a system be configured with no support for 40 MHz channels in the 2.4 GHz band. Rather than imposing any such restrictions on everybody, allow configuration a system like that with a module parameter. It is writable at runtime but only takes effect at the time of the next association. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8b73d13a21ae889e747cac180ff27c5a0a88e6a4 Author: Johannes Berg Date: Tue Dec 1 14:24:24 2009 +0100 mac80211_hwsim: implement ampdu action Not that we actually ever aggregate anything, but it could potentially be useful anyhow to simulate aggregation sessions. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 0f78231bffb868a30e8533aace142213266bb811 Author: Johannes Berg Date: Tue Dec 1 13:37:02 2009 +0100 mac80211: enable spatial multiplexing powersave Enable spatial multiplexing in mac80211 by telling the driver what to do and, where necessary, sending action frames to the AP to update the requested SMPS mode. Also includes a trivial implementation for hwsim that just logs the requested mode. For now, the userspace interface is in debugfs only, and let you toggle the requested mode at any time. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 18974b5b0b5e758d416c550553b143e5c8038281 Author: Zhu Yi Date: Tue Dec 1 10:18:38 2009 +0800 iwmc3200wifi: rx aggregation support When the device receives an A-MSDU frame (indicated by flag IWM_RX_TICKET_AMSDU_MSK), use ieee80211_amsdu_to_8023s to convert it to a list of 802.3 frames and handled them to upper layer. Cc: Johannes Berg Acked-by: Samuel Ortiz Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit eaf85ca7fecb218fc41ff57c1642ca73b097aabb Author: Zhu Yi Date: Tue Dec 1 10:18:37 2009 +0800 wireless: add ieee80211_amsdu_to_8023s Move the A-MSDU handling code from mac80211 to cfg80211 so that more drivers can use it. The new created function ieee80211_amsdu_to_8023s converts an A-MSDU frame to a list of 802.3 frames. Cc: Johannes Berg Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ca99861d5421c91f5a8fd3a77acb4b7be14f119d Author: gregor kowski Date: Wed Dec 9 23:25:05 2009 +0100 mac80211 : fix a race with update_tkip_key The mac80211 tkip code won't call update_tkip_key, if rx packets are received without KEY_FLAG_UPLOADED_TO_HARDWARE. This can happen on first packet because the hardware key stuff is called asynchronously with todo workqueue. This patch workaround that by tracking if we sent the key to the driver. Signed-off-by: Gregor Kowski Signed-off-by: John W. Linville commit 75d1aeb9d6899b10420d10284e8ea894b2794224 Author: Takashi Iwai Date: Tue Dec 22 11:56:32 2009 +0100 ALSA: hda - Add Bass Speaker switch for HP dv7 The bass speaker is controlled via GPIO5. Tested-by: Wael Nasreddine Signed-off-by: Takashi Iwai commit 41116e926cb92292fa4fcbe888ae8133fa0038e6 Author: Takashi Iwai Date: Tue Dec 22 09:00:14 2009 +0100 ALSA: cs46xx - Fix suspend/resume with new DSP Fix the basic suspend/resume of snd-cs46xx drivers with new DSP. References: https://bugzilla.redhat.com/show_bug.cgi?id=498287 https://bugzilla.redhat.com/show_bug.cgi?id=160751 Tested-by: Florian Zumbiehl Signed-off-by: Takashi Iwai commit 8374e24c23448cabf6e78db2c83841c56c5df1e1 Author: Krzysztof Helt Date: Mon Dec 21 17:07:08 2009 +0100 ALSA: refine rate selection in snd_interval_ratnum() Refine the rate selection by choosing the rate closer to the requested one in case of selecting single frequency. Previously, the higher rate was always selected. Also, fix problem with the best_diff unsigned int value wrapping (turning negative). Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit cb3b04debbb70de7b266f75777ac2b9ff567c460 Merge: ee7c343 db8cf33 Author: Takashi Iwai Date: Tue Dec 22 07:57:54 2009 +0100 Merge branch 'fix/misc' into topic/misc commit 22648735405f73299b717bb5933767e9a9c335ca Author: Paul Mundt Date: Tue Dec 22 12:44:14 2009 +0900 sh: kgdb: Rework breakpoint handling on top of notifier chain. This kills off kgdb's breakpoint handler and ties in to the notifier chain instead. Signed-off-by: Paul Mundt commit b74ab703b1326aafadb5604ff6200da62c61df49 Author: Paul Mundt Date: Tue Dec 22 12:40:38 2009 +0900 sh: Don't NOTIFY_STOP for non-UBC breakpoint traps. Presently the hw_breakpoint code is the primary notifier dispatch for breakpoint traps, although it's only UBC traps that are of particular interest there. This patches in a check to allow non-UBC generated breakpoints to pass through down the remainder of the notifier chain, giving things like kgdb a chance at getting notified. Signed-off-by: Paul Mundt commit 7067f797b8409f1e10ec95ac2c1e17a200173d13 Author: Sage Weil Date: Mon Dec 21 16:02:37 2009 -0800 ceph: fix incremental osdmap pg_temp decoding bug An incremental pg_temp wasn't being decoded properly (wrong bound on for loop). Also remove unused local variable, while we're at it. Signed-off-by: Sage Weil commit 30dc6381bbac213987be6fe0b0fb89868ff1f2c0 Author: Sage Weil Date: Mon Dec 21 14:49:37 2009 -0800 ceph: fix error paths for corrupt osdmap messages Both osdmap_decode() and osdmap_apply_incremental() should never return NULL. Signed-off-by: Sage Weil commit 5de7bf8afa87f75af5ef3d6f9fce3e171cac834c Author: Sage Weil Date: Mon Dec 21 11:48:44 2009 -0800 ceph: do not drop lease during revalidate We need to hold session s_mutex for __ceph_mdsc_drop_dentry_lease(), which we don't, so skip it. It was purely an optimization. Signed-off-by: Sage Weil commit c4a29f26d50bea65809ca670992108a33aa2efa6 Author: Sage Weil Date: Mon Dec 21 11:42:18 2009 -0800 ceph: ensure rename target dentry fails revalidation This works around a bug in vfs_rename_dir() that rehashes the target dentry. Ensure such dentries always fail revalidation by timing out the dentry lease and kicking it out of the current directory lease gen. This can be reverted when the vfs bug is fixed. Signed-off-by: Sage Weil commit 2baba25019ec564cd247af74013873d69a0b8190 Author: Yehuda Sadeh Date: Fri Dec 18 13:51:57 2009 -0800 ceph: writeback congestion control Set bdi congestion bit when amount of write data in flight exceeds adjustable threshold. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit dbd646a851713bec5bfff40ecf624b2e78518fe5 Author: Yehuda Sadeh Date: Wed Dec 16 14:51:06 2009 -0800 ceph: writepage grabs and releases inode Fixes a deadlock that is triggered due to kswapd, while the page was locked and the iput couldn't tear down the address space. Signed-off-by: Yehuda Sadeh commit 169e16ce816ca417286daf1db25de424a9d65a0c Author: Yehuda Sadeh Date: Wed Dec 16 14:22:17 2009 -0800 ceph: remove unaccessible code Signed-off-by: Yehuda Sadeh commit 06edf046dd68ccbc7cf5f70f957a31702d0e7596 Author: Sage Weil Date: Tue Dec 15 14:44:32 2009 -0800 ceph: include link to bdi in debugfs Signed-off-by: Sage Weil commit e2885f06ce31d82b556be021acfa2eba160f29cc Author: Sage Weil Date: Tue Dec 15 10:27:48 2009 -0800 ceph: make mds ops interruptible Signed-off-by: Sage Weil commit cf3e5c409b5d66ec66207092a3f7e3e2c42c0f3f Author: Sage Weil Date: Fri Dec 11 09:48:05 2009 -0800 ceph: plug leak of incoming message during connection fault/close If we explicitly close a connection, or there is a socket error, we need to drop any partially received message. Signed-off-by: Sage Weil commit 9ec7cab14e6de732d4e7c355fe67c5810c32c758 Author: Sage Weil Date: Mon Dec 14 15:13:47 2009 -0800 ceph: hex dump corrupt server data to KERN_DEBUG Also, print fsid using standard format, NOT hex dump. Signed-off-by: Sage Weil commit 93c20d98c29ccefa039c3843ccc37122caaf3d31 Author: Yehuda Sadeh Date: Tue Dec 15 09:50:36 2009 -0800 ceph: fix msgpool reservation leak Signed-off-by: Yehuda Sadeh commit b3d1dbbdd5670d8a9fb01f7dfb1cac522ff6795a Author: Sage Weil Date: Mon Dec 14 14:58:11 2009 -0800 ceph: don't save sent messages on lossy connections For lossy connections we drop all state on socket errors, so there is no reason to keep sent ceph_msg's around. Signed-off-by: Sage Weil commit 92ac41d0a4ab26fb68d3f841332e5d1f15d79123 Author: Sage Weil Date: Mon Dec 14 14:56:56 2009 -0800 ceph: detect lossy state of connection The server indicates whether a connection is lossy; set our LOSSYTX bit appropriately. Do not set lossy bit on outgoing connections. Signed-off-by: Sage Weil commit 5e095e8b40b0402ad3bcadc5b8d84c38b26c30b2 Author: Sage Weil Date: Mon Dec 14 14:30:34 2009 -0800 ceph: plug msg leak in con_fault Signed-off-by: Sage Weil commit c86a2930ccbd90d77c54d04b5c2bbec95b989e40 Author: Sage Weil Date: Mon Dec 14 14:04:30 2009 -0800 ceph: carry explicit msg reference for currently sending message Carry a ceph_msg reference for connection->out_msg. This will allow us to make out_sent optional. Signed-off-by: Sage Weil commit e54be4e7356c0612b48407d3b0647a29cb82e254 Author: Gertjan van Wingerde Date: Fri Dec 4 23:47:07 2009 +0100 rt2x00: Fix trimming of L2 padded frames. Ensure that frames without payload are properly trimmed in rt2x00queue_insert_l2pad. This should fix the bug reported by Benoit Papillault in: http://marc.info/?l=linux-wireless&m=125974773006734&w=2 Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 5de42f9eeafa7d54ffb833e0526d4828e194fddb Author: Benoit Papillault Date: Fri Dec 4 23:47:06 2009 +0100 rt2x00: Fix rt2800usb RX frame format and as such L2PAD According to Ralink source code, the RX frame format is RXINFO + RXWI + 802.11 frame + RXD, including various padding. Before this patch, we were using RXD + RXWI + 802.11 frame, so RXD was not correct. Doing this, we fix the L2PAD bit which is now correctly set on received frames. Signed-off-by: Benoit Papillault Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9c8427d9deca1c0c2415c8da0e731e13fc89d111 Author: Benoit PAPILLAULT Date: Fri Dec 4 23:47:05 2009 +0100 rt2x00: Disable RX aggregation for rt2800usb RX aggregation is a way to receive multiple 802.11 frames in one RX buffer. However, we don't know yet how to handle this case in rt2800usb_fill_rxdone and this has probably no impact on RX performance as well, so we disable it Signed-off-by: Benoit Papillault Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit b734083349d1f1aab1edc810cef02e8046251b48 Author: Gertjan van Wingerde Date: Fri Dec 4 23:47:04 2009 +0100 rt2x00: Only remove L2 padding in received frames if there is payload. L2 padding will only be present when there is actual payload present. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2e331462fcb3d897921d8a0af4fca1b08c1b7269 Author: Gertjan van Wingerde Date: Fri Dec 4 23:47:03 2009 +0100 rt2x00: Reorganize L2 padding inserting function. Simplify the rt2x00queue_insert_l2pad function by handling the alignment operations one by one. Do not special case special circumstances. Basically first perform header alignment, and then perform payload alignment (if any payload does exist). This results in a properly aligned skb. The end result is better readable code, with better results, as now L2 padding is inserted only when a payload is actually present in the frame. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 354e39dbb19f29ef28a9c2db9e55ff2a7435b35a Author: Gertjan van Wingerde Date: Fri Dec 4 23:47:02 2009 +0100 rt2x00: Remove SKBDESC_L2_PADDED flag. With the improved L2 padding code, this flag is no longer necessary, as the rt2x00queue_remove_l2pad is capable of detecting by itself if L2 padding is applied. For received frames the RX descriptor flag is still being checked. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 77e73d1849c860d22ebba8826ad162ccfda4c535 Author: Gertjan van Wingerde Date: Fri Dec 4 23:47:01 2009 +0100 rt2x00: Further L2 padding fixes. Fix a couple of more bugs in the L2 padding code: 1. Compute the amount of L2 padding correctly (in 3 places). 2. Trim the skb correctly when the L2 padding has been applied. Also introduce a central macro the compute the L2 padding size. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 1398d4580eff2656f3a808ec24744ce5a842db35 Author: Alban Browaeys Date: Fri Dec 4 23:47:00 2009 +0100 rt2x00 : trim the skb after having the l2pad removed. Otherwise we end up truncating the skb before removing the l2pad thus we might have the truncated part become garbage while getting it back in remove_l2pad. For the same issue: remove the skb_trim from the rt2800 fill_rxdone (it is done after l2pad removal in rt2x00lib_rxdone). Signed-off-by: Alban Browaeys Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit e81e0aef32bfa7f593b14479b9c7eaa7196798ac Author: Alban Browaeys Date: Fri Dec 4 23:46:59 2009 +0100 rt2x00 : avoid timestamp for monitor injected frame. Do not include timestamp for a frame that has been injected through a monitor interface. Signed-off-by: Benoit PAPILLAULT Signed-off-by: Alban Browaeys Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6a325d856bc4509f29164fe42501b6909cf57dcf Author: Alban Browaeys Date: Fri Dec 4 23:46:58 2009 +0100 rt2x00 : modify padding location. The padding is to be added between header and payload for the only header need padding case. Signed-off-by: Benoit PAPILLAULT Signed-off-by: Alban Browaeys Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit c70762f9acad654002704f1e53436a0ba3356c31 Author: Alban Browaeys Date: Fri Dec 4 23:46:57 2009 +0100 rt2x00 : bail out of regbusy_read if device is removed. platform rfkill is async thus we may try to read while the device is already off. Signed-off-by: Alban Browaeys Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 050e8a47dc8b056c880f380ffd01055669f8fe68 Author: Kenichi HORIO Date: Fri Dec 4 23:46:56 2009 +0100 rt73usb: add WLI-U2-H54HP Signed-off-by: Kenichi HORIO Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 4309af2735825115a982acf4c2c868b5c5671e7f Author: Wey-Yi Guy Date: Mon Dec 14 14:12:21 2009 -0800 iwlwifi: remove extra error msg on sensitivity calibration Do not need to log error when fail the sensitivity command, driver will send sensitivity write command to uCode after each sensitivity calibration if station is associated with AP. It is a normal case when user unload the module or shutdown the system while still associated with the AP, since uCode already on the way down, it will not reply the sensitivity write request; report error in this case will give misleading information, remove the error checking here to provide a clean shutdown if no other error detected. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit b03d7d0fd3d23b7cf130fa702f4ae3b1bc827d4b Author: Wey-Yi Guy Date: Mon Dec 14 14:12:20 2009 -0800 iwlwifi: on-screen event log dump This feature enables the on-screen uCode event log dump. The original method will append the event log to syslog; with this capability, we also enable the user to write script to capture the events which provide additional flexibility to help uCode debugging Method 1) change to debugfs directory (sys/kernel/debug/phyX/iwlagn/data) 2) #cat log_event Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit a9e1cb6a78ea8a74c49bf76726a2942f636a833b Author: Wey-Yi Guy Date: Thu Dec 10 14:37:26 2009 -0800 iwlwifi: add continuous uCode event log capability In order to help uCode debugging, adding the capability to provide continuous uCode event logging function. uCode events is located in round-robin event queue and filled by uCode, by enable continuous event logging, driver check the write pointer and log the newly added events in iwl_bg_ucode_trace() timer function. There is still possibility of missing events if event queue being wrapped before next event dump; but with this capability, we can have much better understanding of the uCode behavior during runtime; it can help to debug the uCode related issues. Methods to enable/disable the continuous event log: step 1: enable ucode trace timer "echo 1 > /sys/kernel/debug/ieee80211/phyX/iwlagn/debug/ucode_tracing" step 2: start ftrace sudo ./trace-cmd record -e iwlwifi_ucode:* sleep 1d step 3: stop ftrace sudo ./trace-cmd report trace.dat step 4: disable ucode trace timer "echo 0 > /sys/kernel/debug/ieee80211/phyX/iwlagn/debug/ucode_tracing" use "ucode_tracing" debugfs file to display number of event queue wrapped when driver attempt the continuous event logging. If event queue being wrapped more than once when driver has opportunity to log the event; it indicated there are events missing in the event log trace. This continuous event log function only available for 4965 and newer NICs. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 696bdee3ba216186e21997d20a839b76158346e6 Author: Wey-Yi Guy Date: Thu Dec 10 14:37:25 2009 -0800 iwlwifi: dump "Control and Status Register" when detect uCode HW/SW error When uCode HW/SW error detected, dumping important CSR (Control and Status Registers) values. Also add "csr" debugfs file to dump the current values of CSR defined in CSR table to syslog. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3a41bbd515d449604f3488c5f8dd62802f09d19b Author: Wey-Yi Guy Date: Thu Dec 10 14:37:24 2009 -0800 iwlwifi: log CT_CARD_DISABLED flag Change name from RF_CARD_DISABLED to CT_CARD_DISABLED to match the indication from uCode, also log the debug message when the condition detected in iwl_rx_card_state_notif() Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3b377ea9d4efc94dc52fe41b4dfdb463635ab298 Author: John W. Linville Date: Fri Dec 18 17:59:01 2009 -0500 wireless: support internal statically compiled regulatory database This patch provides infrastructure for machine translation of the regulatory rules database used by CRDA into a C data structure. It includes code for searching that database as an alternative to dynamic regulatory rules updates via CRDA. Most people should use CRDA instead of this infrastructure, but it provides a better alternative than the WIRELESS_OLD_REGULATORY infrastructure (which can now be removed). Signed-off-by: John W. Linville commit 59d9cb071d6209f2e8df2d16228cfdc7bab1f2d1 Author: Kalle Valo Date: Thu Dec 17 13:54:57 2009 +0100 mac80211: remove payload alignment warning The payload alignment warning enabled by MAC80211_DEBUG_PACKET_ALIGNMENT is difficult. To fix it, a firmware change is needed but in most cases that's very difficult. So the benefit from the warning is low and most probably it just creates more confusion for people who just enable all warnings (like it did for me). Remove the unaligned IP payload warning and the kconfig option. But leave the unaligned packet warning, it will be enabled with MAC80211_VERBOSE_DEBUG. Signed-off-by: Kalle Valo Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 4a40ccf8140d6b973d8b02dd5467b1fd876c0654 Author: Larry Finger Date: Sat Dec 12 18:04:46 2009 -0600 rtl8180: Remove usage of deprecated 'qual' When building rtl8180, the following warning occurs: CC [M] drivers/net/wireless/rtl818x/rtl8180_dev.o drivers/net/wireless/rtl818x/rtl8180_dev.c: In function ‘rtl8180_handle_rx’: drivers/net/wireless/rtl818x/rtl8180_dev.c:135: warning: ‘qual’ is deprecated (declared at include/net/mac80211.h:562) Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 6e850af58f93be8f1b4b79eb9c79d06788f38e78 Author: Jussi Kivilinna Date: Mon Nov 30 21:50:13 2009 +0200 rndis_wlan: copy module parameters for bcm4320a devices too rndis_wlan didn't copy module parameters for bcm4320a to private structure. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit cef6e91280b724e93b0fb8a9fd3e6bf072f54c81 Author: Jussi Kivilinna Date: Mon Nov 30 21:50:07 2009 +0200 rndis_wlan: move copy of module parameters to separate function Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit da2fb4e9c215b8f0f8954818691549f8a34135be Author: Kalle Valo Date: Mon Nov 30 10:18:47 2009 +0200 wl1251: enable WMM Everything is ready now and we can enable WMM in mac80211. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 46cb35f5e761306b031029af2061ea263359a764 Author: Kalle Valo Date: Mon Nov 30 10:18:40 2009 +0200 wl1251: update tx_hdr when aliging skb in tx Before transmission when aligning the buffer to 4-byte bounday, tx_hdr needs to be updated. Otherwise debug logs print false data. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 49e1b9faed736b20ad9a785638919341b567a595 Author: Kalle Valo Date: Mon Nov 30 10:18:33 2009 +0200 wl1251: implement WMM Now that necessary commands for WMM are implemented, implement queue handling for WMM. But WMM is not enabled yet, only one queue is used. Signed-off-by: Kalle Valo Reviewed-by: Janne Ylalehto Signed-off-by: John W. Linville commit 27336f1c0cd68fb9ae45493321f0d6980144230e Author: Kalle Valo Date: Mon Nov 30 10:18:27 2009 +0200 wl1251: implement wl1251_acx_tid_cfg() Needed for WMM. Signed-off-by: Kalle Valo Reviewed-by: Janne Ylalehto Signed-off-by: John W. Linville commit 86dff7a7955f1e14c1f2c142312462fae70ea7e4 Author: Kalle Valo Date: Mon Nov 30 10:18:19 2009 +0200 wl1251: implement acx_ac_cfg to configure hardware queues Needed for WMM. Signed-off-by: Kalle Valo Reviewed-by: Janne Ylalehto Signed-off-by: John W. Linville commit cdd1e9a91ea55594cbcc9847dbb9392e341cbefd Author: Kalle Valo Date: Mon Nov 30 10:18:12 2009 +0200 wl1251: use __dev_alloc_skb() on RX RX is handled in a workqueue therefore allocating for GFP_ATOMIC is overkill and not required. Based on a patch for wl1271 by Luis R. Rodriguez. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 7fa6282a1775bd41508220e65ba0cb92235b67d4 Author: Kalle Valo Date: Mon Nov 30 10:18:06 2009 +0200 wl1251: simplify ELP wakeup time calculation The wakeup time calculation was too complicated, simplify it. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit b5a167942cb388cc5f1a6085cb3506d5bf47517d Author: Kalle Valo Date: Mon Nov 30 10:17:59 2009 +0200 wl1251: reduce ELP wakeup timeout The original TI driver uses 100 ms timeout ELP wakeup timeout, better to use the same. Otherwise problems with wakeup might get unnoticed. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 478fdf2bcef73747eb99bc6dd3565f093942647a Author: Kalle Valo Date: Mon Nov 30 10:17:52 2009 +0200 wl1251: fix error handling in wl1251_op_config() Not all return values were checked and one exit from function didn't put firmware sleep after the error. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit d67e261829d405ed19a6c2e648f224e352012f52 Author: Kalle Valo Date: Mon Nov 30 10:17:45 2009 +0200 wl1251: print a debug message when tx_queue is full This debug message was missing and caused incomplete log messages. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit b7339b1de0f7b6b8c95a6df87ea2221521328d11 Author: Kalle Valo Date: Mon Nov 30 10:17:38 2009 +0200 wl1251: add tx queue status to debugfs Sometimes when debugging the state is good info. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 7dffb55b8a73228499ee65a3439f82112f4391c7 Author: Christian Lamparter Date: Sun Nov 29 01:01:14 2009 +0100 ar9170: fix AC_VIDEO txop parameter This patch fixes a rather embarrassing typo. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 07bc54575b413688d1586407a73793df8f68d115 Author: Christian Lamparter Date: Sun Nov 29 00:59:48 2009 +0100 ar9170: small misc changes This patch aggregates a bunch of small random changes that won't fit really anywhere else properly. 1. move tid-locating macro into a separate function. 2. remove redundant NULL check. 3. add modulation mask definition Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 15b098bbf79f06a09d3a15b911eb43295979deed Author: Christian Lamparter Date: Sun Nov 29 00:56:55 2009 +0100 ar9170: remove redundant frame flags The flags in question were once useful for debugging. Time has passed and now they do nothing more than duplicating txinfo->flags. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 53a76b58b66e77164c4a79c38da49b808d67477e Author: Christian Lamparter Date: Sun Nov 29 00:52:51 2009 +0100 ar9170: improve network latency AR9170 has the bad habit of choking when traffic builds up. Tests have shown that this can partially be attributed to a huge buildup of backlogged frames. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 5e0ec316522e0372b633407c903b88f58859303f Author: Christian Lamparter Date: Sun Nov 29 00:51:54 2009 +0100 ar9170: remove dead definitions This patch removes dead infrastructure which was meant for an out-of-tree rate control algorithm. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 411132628f95dd3d51b84e0e2d8ff8f4f2d09cdb Author: Luis R. Rodriguez Date: Wed Nov 25 21:00:30 2009 -0500 ath9k_hw: remove unused ath9k_hw_devname() and ath9k_hw_probe() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 12375ef933fa8271396ed0c1e318cb1bd2e2689d Author: Johannes Berg Date: Wed Nov 25 20:30:31 2009 +0100 mac80211: trace interface name It's not all that useful to have the vif/sdata pointer, we'd rather refer to the interfaces by their name. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 47846c9b0c10808d9337d2e7d09361f3e0a0a71a Author: Johannes Berg Date: Wed Nov 25 17:46:19 2009 +0100 mac80211: reduce reliance on netdev For bluetooth 3, we will most likely not have a netdev for a virtual interface (sdata), so prepare for that by reducing the reliance on having a netdev. This patch moves the name and address fields into the sdata struct and uses them from there all over. Some work is needed to keep them sync'ed, but that's not a lot of work and in slow paths anyway. In doing so, this also reduces the number of pointer dereferences in many places, because of things like sdata->dev->dev_addr becoming sdata->vif.addr. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit abe60632f311d515b082b450504ee24006023951 Author: Johannes Berg Date: Wed Nov 25 17:46:18 2009 +0100 mac80211: make station management completely depend on vif The station management currently uses the virtual interface, but you cannot add the same station to multiple virtual interfaces if you're communicating with it in multiple ways. This restriction should be lifted so that in the future we can, for instance, support bluetooth 3 with an access point that mac80211 is already associated to. We can do that by requiring all sta_info_get users to provide the virtual interface and making the RX code aware that an address may match more than one station struct. Thanks to the previous patches this one isn't all that large and except for the RX and TX status paths changes has low complexity. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 15920d8afc87861672e16fa95ae2764b065d6dd3 Author: Colin Ian King Date: Sun Aug 30 20:18:41 2009 -0600 wireless: hostap, fix oops due to early probing interrupt BugLink: https://bugs.launchpad.net/ubuntu/+bug/254837 Spurious shared interrupts or early probing interrupts can cause the hostap interrupt handler to oops before the driver has fully configured the IO base port addresses. In some cases the oops can be because the hardware shares an interrupt line, on other cases it is due to a race condition between probing for the hardware and configuring the IO base port. The latter occurs because the probing is required to determin the hardware port address which is only determined when the probe can interrupt the hardware (catch 22). This patch catches this pre-configured condition to avoid the oops. Signed-off-by: Colin Ian King Signed-off-by: Stefan Bader Acked-by: Tim Gardner Acked-by: Stefan Bader Signed-off-by: John W. Linville commit 254416aae70ab2e6b57fd79782c8a67196234d02 Author: John W. Linville Date: Wed Dec 9 16:43:52 2009 -0500 wireless: report reasonable bitrate for MCS rates through wext Previously, cfg80211 had reported "0" for MCS (i.e. 802.11n) bitrates through the wireless extensions interface. However, nl80211 was converting MCS rates into a reasonable bitrate number. This patch moves the nl80211 code to cfg80211 where it is now shared between both the nl80211 interface and the wireless extensions interface. Signed-off-by: John W. Linville commit ee7c343c0134bf126b4235e65c407711b77174da Author: Takashi Iwai Date: Mon Dec 21 12:41:37 2009 +0100 ALSA: pcm - Add missing inclusion of linux/vmalloc.h Signed-off-by: Takashi Iwai commit ad8decb7f5dfd556e4a8400e37b127cd20d8e4c5 Author: Krzysztof Helt Date: Sun Dec 20 19:01:50 2009 +0100 ALSA: jazz16: Add support for Media Vision Jazz16 chipset This is one of Sound Blaster Pro compatible chipsets which is supported by Linux OSS driver and was missing native supoort for ALSA. The Jazz16 audio codec is Crystal CS4216 which is capable of playback and recording up to 48 kHz stereo. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 6c0ee6a4bba0e21eb0fb4de5bdac03c11b74242d Author: Paul Mundt Date: Mon Dec 21 17:35:00 2009 +0900 sh: hw-breakpoint support requires perf events. This follows the x86 change to select perf events when hw_breakpoint support is enabled. This fixes up build issues where perf events can otherwise be disabled on their own. Signed-off-by: Paul Mundt commit a28b460ec7968f430a2d6ea2809b249ee9fe1d28 Author: Paul Mundt Date: Mon Dec 21 15:56:24 2009 +0900 sh: Fix up hw-breakpoints build for API changes. The event callback handling has been removed in favour of going through a generic event handler to handle overflows. Follows the x86 change. Signed-off-by: Paul Mundt commit 4b4f887fb2780e39383c1f202b72f5a2780b2d4c Merge: 6424db5 76e7461 Author: Paul Mundt Date: Mon Dec 21 15:44:34 2009 +0900 Merge branch 'master' into sh/hw-breakpoints commit 76e7461a21dfe13565b2a323b53c8cc963541126 Merge: d0b873f dd59f6c Author: Paul Mundt Date: Mon Dec 21 11:59:55 2009 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit d0b873fc73b793277c8a0824ce986b5bfeaef157 Merge: 5d9b4b1 73a38b8 Author: Paul Mundt Date: Mon Dec 21 11:58:17 2009 +0900 Merge branch 'sh/stable-updates' commit 84e554e6865c4f4ae84d38800cf270b9a67901cc Author: Christoph Lameter Date: Fri Dec 18 16:26:23 2009 -0600 SLUB: Make slub statistics use this_cpu_inc this_cpu_inc() translates into a single instruction on x86 and does not need any register. So use it in stat(). We also want to avoid the calculation of the per cpu kmem_cache_cpu structure pointer. So pass a kmem_cache pointer instead of a kmem_cache_cpu pointer. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit ff12059ed14b0773d7bbef86f98218ada6c20770 Author: Christoph Lameter Date: Fri Dec 18 16:26:22 2009 -0600 SLUB: this_cpu: Remove slub kmem_cache fields Remove the fields in struct kmem_cache_cpu that were used to cache data from struct kmem_cache when they were in different cachelines. The cacheline that holds the per cpu array pointer now also holds these values. We can cut down the struct kmem_cache_cpu size to almost half. The get_freepointer() and set_freepointer() functions that used to be only intended for the slow path now are also useful for the hot path since access to the size field does not require accessing an additional cacheline anymore. This results in consistent use of functions for setting the freepointer of objects throughout SLUB. Also we initialize all possible kmem_cache_cpu structures when a slab is created. No need to initialize them when a processor or node comes online. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 756dee75872a2a764b478e18076360b8a4ec9045 Author: Christoph Lameter Date: Fri Dec 18 16:26:21 2009 -0600 SLUB: Get rid of dynamic DMA kmalloc cache allocation Dynamic DMA kmalloc cache allocation is troublesome since the new percpu allocator does not support allocations in atomic contexts. Reserve some statically allocated kmalloc_cpu structures instead. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 Author: Christoph Lameter Date: Fri Dec 18 16:26:20 2009 -0600 SLUB: Use this_cpu operations in slub Using per cpu allocations removes the needs for the per cpu arrays in the kmem_cache struct. These could get quite big if we have to support systems with thousands of cpus. The use of this_cpu_xx operations results in: 1. The size of kmem_cache for SMP configuration shrinks since we will only need 1 pointer instead of NR_CPUS. The same pointer can be used by all processors. Reduces cache footprint of the allocator. 2. We can dynamically size kmem_cache according to the actual nodes in the system meaning less memory overhead for configurations that may potentially support up to 1k NUMA nodes / 4k cpus. 3. We can remove the diddle widdle with allocating and releasing of kmem_cache_cpu structures when bringing up and shutting down cpus. The cpu alloc logic will do it all for us. Removes some portions of the cpu hotplug functionality. 4. Fastpath performance increases since per cpu pointer lookups and address calculations are avoided. V7-V8 - Convert missed get_cpu_slab() under CONFIG_SLUB_STATS Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit d2392ba06a477cf1876ce3d505b7cd77e295cfd4 Author: Alessandro Rubini Date: Sat Dec 19 19:46:33 2009 +0800 hwrng: nomadik - Add platform device for rng in cpu-8815 Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit bc85b25e5de17d714e8001cb3dc0feb66eac2750 Author: Alessandro Rubini Date: Sat Dec 19 19:45:43 2009 +0800 hwrng: nomadik - Add hardware RNG driver The hardware random number generator by ST is used in both the Nomadik 8815 SoC and the U8500. It returns 16 bits every 400ns with automatic delay if a read is issued too early. It depends on PLAT_NOMADIK. Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit 0c2fd1bf4c6cb6095d8b3088d285167e66c12147 Author: Takashi Iwai Date: Fri Dec 18 16:41:39 2009 +0100 ALSA: hda - Check class to identify Nvidia controller chips Instead of listing all individual PCI IDs, check the matching with the PCI class together with the vendor id for Nvidia. This simplifies the pci id entries. Signed-off-by: Takashi Iwai commit 18240b67c8ca5efbbb2e8bb11942cc3db033fb16 Author: Mark Brown Date: Fri Dec 18 14:20:35 2009 +0000 ASoC: Host clock2 read up in WM8904 FLL configuration Avoids skipping over the read for disable cases. Signed-off-by: Mark Brown commit a17accb7ae9291ef5a0ad609f92aa43263735855 Merge: 56927eb 48c03ce Author: Mark Brown Date: Fri Dec 18 13:31:40 2009 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit 56927eb054abd2c7371c769f359cc49a04ab488e Author: Mark Brown Date: Fri Dec 18 13:11:12 2009 +0000 ASoC: Set AIF word length for WM8904 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b35a28af0a64a1e8e389bc009b76253256d8fe7b Author: Mark Brown Date: Fri Dec 18 12:00:22 2009 +0000 ASoC: Add initial WM8955 CODEC driver The WM8955 is a low power, high quality stereo DAC with integrated headphone and loudspeaker amplifiers, designed to reduce external component requirements in portable digital audio applications. This is an initial driver implementing support for the majority of the functionality in the device, currently OUT3 is not supported. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5b4b2a41a1a80f5560364b7ef001486cd8fb5230 Author: Clemens Ladisch Date: Fri Dec 18 09:32:00 2009 +0100 sound: ua101: use vmalloc buffer helper functions Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the equivalent core functions instead. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit c55675e348d9630c1ca69a190529bed1108c649d Author: Clemens Ladisch Date: Fri Dec 18 09:31:31 2009 +0100 sound: usb-audio: use vmalloc buffer helper functions Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the equivalent core functions instead. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 149feef54bf543448dd4ec5820ef8ae178021c3a Author: Clemens Ladisch Date: Fri Dec 18 09:30:55 2009 +0100 sound: vx: use vmalloc buffer helper functions Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the equivalent core functions instead. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 6cedf8696d6a01bba391bdae06231243cfe2f48a Author: Clemens Ladisch Date: Fri Dec 18 09:30:24 2009 +0100 sound: sgio2audio: use vmalloc buffer helper functions Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the equivalent core functions instead. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d20fb5dc076a4cf0fdd00ab5a4e752ea3611e484 Author: Clemens Ladisch Date: Fri Dec 18 09:29:49 2009 +0100 sound: pdaudiocf: use vmalloc buffer helper functions Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the equivalent core functions instead. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 681b84e17747e1c208e8e1acc54cc5e612da84d1 Author: Clemens Ladisch Date: Fri Dec 18 09:29:00 2009 +0100 sound: pcm: add vmalloc buffer helper functions There are now five copies of the code to allocate a PCM buffer using vmalloc(). Add a sixth in the core so that the others can be removed. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 14d44e2c2cb2ef3c88c5090a2d419772e15e7a16 Merge: 67cbf8a 3e85fd6 Author: Takashi Iwai Date: Fri Dec 18 12:53:45 2009 +0100 Merge branch 'fix/misc' into topic/misc commit e7cc894120bb809738cebcd87b5ed3057bbe51fe Author: Uwe Kleine-König Date: Thu Dec 17 14:56:57 2009 +0100 [ARM] pxa/ttc_dkb: remove duplicate macro definition ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is already included. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Bin Yang Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit e863c884cd18dca9533c352655af73d921f4a311 Author: Daniel Mack Date: Fri Nov 27 13:47:11 2009 +0100 [ARM] pxa/raumfeld: add defconfig Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 550ee52d823845f882ddadcd032b33169866a739 Author: Daniel Mack Date: Fri Nov 27 13:47:09 2009 +0100 [ARM] pxa/raumfeld: add platform support This adds support for Raumfeld's 'Controller', 'Connector', 'Speaker S' and 'Speaker M' devices. They're all based on PXA303 SoCs. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit b76365a18f7593c9df32a74bf2b4a39741b67bc6 Author: Russ Anderson Date: Thu Dec 17 10:53:25 2009 -0600 x86, uv: Add serial number parameter to uv_bios_get_sn_info() Add system_serial_number to the information returned by uv_bios_get_sn_info() UV BIOS call. Signed-off-by: Russ Anderson LKML-Reference: <20091217165323.GA30774@sgi.com> Cc: Jack Steiner Signed-off-by: H. Peter Anvin commit d1409ae4cecb4af260759bdfdf88fafca23a9940 Author: Takashi Iwai Date: Thu Dec 17 15:01:31 2009 +0100 ALSA: hda - Fix NULL dereference in kctl-NID mapping in patch_realtek.c capsrc_nids can be NULL, and adc_nids should be taken as fallback. Signed-off-by: Takashi Iwai commit 9e671deb8547638f6504c5f20126b14f5563690d Merge: 7093505 ebb83ee Author: Takashi Iwai Date: Thu Dec 17 12:27:39 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 67cbf8a216259dceefe570f6dc14746f43b2e627 Merge: 6c941c8 2fbe74b Author: Takashi Iwai Date: Thu Dec 17 12:27:22 2009 +0100 Merge branch 'fix/misc' into topic/misc commit 6c941c8556dd9269be621cd8159fc60e955a91b3 Author: Jaroslav Kysela Date: Wed Dec 16 16:15:00 2009 +0100 ALSA: Release v1.0.22 Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 5d9b4b19f118abfb75e352841f7bf74580d7e427 Author: Matt Fleming Date: Sun Dec 13 14:38:50 2009 +0000 sh: Definitions for 3-level page table layout If using 64-bit PTEs and 4K pages then each page table has 512 entries (as opposed to 1024 entries with 32-bit PTEs). Unlike MIPS, SH follows the convention that all structures in the page table (pgd_t, pmd_t, pgprot_t, etc) must be the same size. Therefore, 64-bit PTEs require 64-bit PGD entries, etc. Using 2-levels of page tables and 64-bit PTEs it is only possible to map 1GB of virtual address space. In order to map all 4GB of virtual address space we need to adopt a 3-level page table layout. This actually works out better for CONFIG_SUPERH32 because we only waste 2 PGD entries on the P1 and P2 areas (which are untranslated) instead of 256. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit b73c806341cfc7492ede6a2ce713cb579547d0ab Author: Matt Fleming Date: Wed Nov 25 22:00:08 2009 +0000 sh: Abstract the number of page table levels Keep the dimensions of the page tables in a separate header file in preparation for allowing a three level page table structure. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit c2151433847e88ba05c6bb539d9397ea90d755e6 Author: Mark Brown Date: Wed Dec 16 20:36:37 2009 +0000 ASoC: Fix build of DA7210 DAC_VOICE_EN was not defined - looks to have been overly enthusiastically deleted from a previous revision of the patch, pull the value from v1. Signed-off-by: Mark Brown commit 255173b40db448ce063a2caa680a552fb637ad20 Author: Peter Meerwald Date: Mon Dec 14 14:44:56 2009 +0100 ASoC: PLL computation in TLV320AIC3x SoC driver fix precision of PLL computation for TLV320AIC3x SoC driver, test results are at http://pmeerw.net/clk Signed-off-by: Peter Meerwald Acked-by: Vladimir Barinov Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3497b91946a3df42830c826939424d98251a3b0d Author: Mark Brown Date: Tue Dec 15 20:58:56 2009 +0000 ASoC: Fix sorting of codecs Makefile entries Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 038494059f795849012a96adba2ab73e65b94ba5 Author: Kuninori Morimoto Date: Mon Dec 14 13:22:00 2009 +0900 ASoC: Add FSI-DA7210 sound support for SuperH Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 98615454f66175e923f239ab1d1bd85cd618363e Author: Kuninori Morimoto Date: Mon Dec 14 13:21:56 2009 +0900 ASoC: Add DA7210 codec device support for ALSA This original driver was created by Dialog Semiconductor, and cleanuped by Kuninori Morimoto. Special thanks to David Chen. This became very simple ASoC codec driver, and it is tested by EcoVec24 board. Signed-off-by: David Chen Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7c4e6492205b677a5786b85bcf72ce7c8f4adf15 Author: Ilkka Koskinen Date: Wed Dec 9 12:05:50 2009 +0200 ASoC: tpa6130a2: Add support for regulator framework Take the regulator framework in use for managing the power sources Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Eduardo Valentin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0fe692292a26f57b6522fe859cc8b2549ec0cd97 Author: Jassi Brar Date: Wed Dec 9 13:29:25 2009 +0900 ASoC: S3C64XX: Compress and generalize the CPU driver The driver can be 'generalized' a bit by not hardcoding '2'(the number of I2Sv3 controllers that the driver can handle) at many places, instead we define a macro for it. That makes it easier to increase number of controllers by changing the parameter at just one place, this will be useful when there is support for newer SoCs, which have the same controller, only more in number. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 168db50d967e09133feda8247d4dcb3c73437766 Author: Jassi Brar Date: Wed Dec 9 13:29:20 2009 +0900 ASoC: S3C64XX: Remove unnecessary header includes Removed redundant header includes which make no difference to compilation. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit cce2e9db718d823f33ac846c019763cdc84e8658 Author: Mark Brown Date: Tue Dec 8 21:50:01 2009 +0000 ASoC: Register the CODEC in WM8727 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d207c68dd92455a3d618c37b5a9f0dc598723fd6 Author: Mark Brown Date: Mon Dec 7 17:13:55 2009 +0000 ASoC: Sort DAPM sequences by CODEC as well In preparation for multiple device support. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 283375cefbf4f91ce51d93d010634c48d0d39044 Author: Mark Brown Date: Mon Dec 7 18:09:03 2009 +0000 ASoC: Push registers out of mixer power decision No need for the mixers to know about this, and it allows for virtual controls. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 926a01ce1ef5e27281af0270e4476979c0522954 Author: Jaroslav Kysela Date: Wed Dec 16 16:15:00 2009 +0100 ALSA: Release v1.0.22 Signed-off-by: Jaroslav Kysela commit 709350506567029021b8a38ee7e65bc246fceabc Merge: a9e0605 5e26dfd Author: Takashi Iwai Date: Tue Dec 15 10:45:10 2009 +0100 Merge remote branch 'alsa/devel' into topic/hda commit 5e26dfd0615868872cb44842f1e1428c7b414ab0 Author: Jaroslav Kysela Date: Thu Dec 10 13:57:01 2009 +0100 ALSA: hda - simplify usage of HDA_SUBDEV_AMP_FLAG The HDA_SUBDEV_NID_FLAG is duplicate for amplifier control elements. Move get_amp_nid_() call to the snd_hda_ctl_add() function. Signed-off-by: Jaroslav Kysela commit 9e3fd8719f624a43575b56a4777b1552399a8be8 Author: Jaroslav Kysela Date: Tue Dec 8 17:45:25 2009 +0100 ALSA: hda - introduce HDA_SUBDEV_AMP_FLAG (ControlAmp in proc) The purpose of this changeset is to show information about amplifier setting in the codec proc file. Something like: Control: name="Front Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Front Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Signed-off-by: Jaroslav Kysela commit 5b0cb1d850c26893b1468b3a519433a1b7a176be Author: Jaroslav Kysela Date: Tue Dec 8 16:13:32 2009 +0100 ALSA: hda - add more NID->Control mapping This set of changes add missing NID values to some static control elemenents. Also, it handles all "Capture Source" or "Input Source" controls. Signed-off-by: Jaroslav Kysela commit fdb8ebb729bbb640e64028a4f579a02ebc405727 Author: Tetsuo Handa Date: Tue Dec 8 09:34:43 2009 +0900 TOMOYO: Use RCU primitives for list operation Replace list operation with RCU primitives and replace down_read()/up_read() with srcu_read_lock()/srcu_read_unlock(). Signed-off-by: Tetsuo Handa Acked-by: Serge Hallyn Signed-off-by: James Morris commit b89371621e5bedc84498ced2c5c33976bd1b2f64 Merge: 63978ab 74c2b45 Author: Takashi Iwai Date: Mon Dec 14 18:01:56 2009 +0100 Merge branch 'next/isa' into topic/misc commit 63978ab3e3e963db28093b53bb4598f2702e1ad7 Author: Clemens Ladisch Date: Mon Dec 14 12:48:35 2009 +0100 sound: add Edirol UA-101 support Add experimental support for the Edirol UA-101 audio/MIDI interface. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 2ef7f3dbd7a70a48c3f09b498df528cb00ea03a4 Author: Russell King Date: Thu Nov 5 13:29:36 2009 +0000 ARM: Fix ptrace accesses Signed-off-by: Russell King commit 74c2b45b714e49b427584b4bd8f44f1a24d82d9c Author: Krzysztof Helt Date: Sun Dec 13 21:13:44 2009 +0100 ALSA: sb_mixer: convert pointer tables to mixer control tables Convert table of pointers to mixer controls into tables of the mixer controls. It saves about 20% of the snd-sb-common module size reported by lsmod. The als4000 uses part of sb16's control table. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 1c8a375185935f8106a45221bd187b7b272f97c2 Author: Thadeu Lima de Souza Cascardo Date: Sun Dec 13 20:41:53 2009 -0800 ide: doc: remove compilation options section from ide-cd documentation This section pointed out to compilation options which no longer exist. VERBOSE_IDE_CD_ERRORS has been replace by config option CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS. STANDARD_ATAPI is no longer needed, since the non-standard drivers, which required bcd2bin are now detected, and there's a flag for them. NO_DOOR_LOCKING is now a sysctl parameter for cdrom drivers. CDROM_NBLOCKS_BUFFER is not used anymore. The READAUDIO is now in cdrom.c and it allocates as much as user space has requested to read, backing off if it fails. TEST is not there anymore or in cdrom either. ide allows to send ATA commands through ioctl, although it may be helpful to send MMC packets through the cdrom layer directly. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: David S. Miller commit e9d0a803c127e2e30afb0df780ccb3af4e2adb28 Author: Krzysztof Helt Date: Sat Dec 12 09:51:03 2009 +0100 ALSA: opti93x: use dB scale for mixer controls Add dB scale for mixer controls. Fix dB scale for Master Volume control. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit d4a780ce8821a37dd135f15b6150a5bfc5604f29 Author: Sage Weil Date: Fri Dec 11 08:55:23 2009 -0800 ceph: fix leak of monc mutex Fix leak of monc mutex on ENOMEM or bad fsid when receiving new mon map. Audited all other users. Signed-off-by: Sage Weil commit b2e8d7dab9d82be3851b8cbcc1ab64b1b2575844 Author: Krzysztof Helt Date: Thu Dec 10 20:40:18 2009 +0100 ALSA: opti93x: move controls definitions to opti93x driver Move OPTi93x controls definitions to the opti93x driver from the common wss-lib library module. These controls are used only by the opti93x driver. Also, fix capture source names. They are the same as opl3sa2 names. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 14ff3e78304e3f7fe18f950c3aa0686e6800b3fb Author: Krzysztof Helt Date: Thu Dec 10 20:39:28 2009 +0100 ALSA: dt019x: merge into the als100 driver The als100 driver is so similar to the dt019x/als007 driver that one driver's source can be used for both drivers with only few changes. Merge the dt019x driver into the als100. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 86e032213424958b45564d0cc96b3316641a49d3 Author: Grant Likely Date: Thu Dec 10 23:42:21 2009 -0700 of/flattree: merge early_init_dt_scan_chosen() Merge common code between PowerPC and Microblaze. This patch splits the arch-specific stuff out into a new function, early_init_dt_scan_chosen_arch(). Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 0f0b56c3f2df4a083fc9e934266e5bab1710e286 Author: Grant Likely Date: Thu Dec 10 23:42:17 2009 -0700 of/flattree: eliminate cell_t typedef A cell is firmly established as a u32. No need to do an ugly typedef to redefine it to cell_t. Eliminate the unnecessary typedef so that it doesn't have to be added to the of_fdt header file Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 83f7a06eb479e2aeb83536e77a2cb14cc2285e32 Author: Grant Likely Date: Tue Nov 24 03:37:56 2009 -0700 of/flattree: merge dt_mem_next_cell Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Tested-by: Wolfram Sang commit f00abd94918c9780f9d2d961fc0e419c11457922 Author: Grant Likely Date: Tue Nov 24 03:27:10 2009 -0700 of/flattree: Merge earlyinit_dt_scan_root() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Tested-by: Wolfram Sang commit f7b3a8355ba6cad251297844a0bdd08898ea36e0 Author: Grant Likely Date: Tue Nov 24 03:26:58 2009 -0700 of/flattree: Merge early_init_dt_check_for_initrd() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 767ea5c33a360ce88da24e296e802dace5821799 Author: Sage Weil Date: Wed Dec 9 12:34:01 2009 -0800 ceph: do not feed bad device ids to crush Do not feed bad (large) device ids to CRUSH. Signed-off-by: Sage Weil commit 86fc80f16e8a2449d5827bf1a9838b7fd9f70097 Author: Thomas Gleixner Date: Wed Dec 9 17:13:31 2009 +0100 capabilities: Use RCU to protect task lookup in sys_capget cap_get_target_pid() protects the task lookup with tasklist_lock. security_capget() is called under tasklist_lock as well but tasklist_lock does not protect anything there. The capabilities are protected by RCU already. So tasklist_lock only protects the lookup and prevents the task going away, which can be done with rcu_read_lock() as well. Signed-off-by: Thomas Gleixner Signed-off-by: James Morris commit f409adf5b1db55ece7e80b67a944f9c0d3fe93e9 Author: Thomas Gleixner Date: Tue Dec 1 14:02:00 2009 +0100 futex: Protect pid lookup in compat code with RCU find_task_by_vpid() in compat_sys_get_robust_list() does not require tasklist_lock. It can be protected with rcu_read_lock as done in sys_get_robust_list() already. Signed-off-by: Thomas Gleixner Cc: Darren Hart Cc: Peter Zijlstra commit 67fa4880c5e059428392ca6f7c2f9c38e8546fea Author: Tetsuo Handa Date: Wed Dec 9 15:36:04 2009 +0900 TOMOYO: Compare filesystem by magic number rather than by name. Please apply below one after merging 1557d33007f63dd96e5d15f33af389378e5f2e54 (Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6). ---------- [PATCH for 2.6.33] TOMOYO: Compare filesystem by magic number rather than by name. We can use magic number for checking whether the filesystem is procfs or not. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 1ad1f10cd915744bbe52b19423653b38287d827d Merge: 08e3daf 2b876f9 Author: James Morris Date: Wed Dec 9 19:01:03 2009 +1100 Merge branch 'master' into next commit 6424db52e24e8cdf89917fa3c10395116440160e Merge: 09a0729 6a5a0b9 Author: Paul Mundt Date: Tue Dec 8 15:47:12 2009 +0900 Merge branch 'master' into sh/hw-breakpoints Conflict between FPU thread flag migration and debug thread flag addition. Conflicts: arch/sh/include/asm/thread_info.h arch/sh/include/asm/ubc.h arch/sh/kernel/process_32.c commit 09a072947791088b88ae15111cf68fc5aaaf758d Author: Paul Mundt Date: Mon Nov 9 16:27:40 2009 +0900 sh: hw-breakpoints: Add preliminary support for SH-4A UBC. This adds preliminary support for the SH-4A UBC to the hw-breakpoints API. Presently only a single channel is implemented, and the ptrace interface still needs to be converted. This is the first step to cleaning up the long-standing UBC mess, making the UBC more generally accessible, and finally making it SMP safe. An additional abstraction will be layered on top of this as with the perf events code to permit the various CPU families to wire up support for their own specific UBCs, as many variations exist. Signed-off-by: Paul Mundt commit 08e3daff217059c84c360cc71212686e0a7995af Author: Amerigo Wang Date: Thu Dec 3 03:48:28 2009 -0500 selinux: remove a useless return The last return is unreachable, remove the 'return' in default, let it fall through. Signed-off-by: WANG Cong Acked-by: Eric Paris Signed-off-by: James Morris commit 937bf6133b21b16965f75223085f4314ae32b8eb Author: Tetsuo Handa Date: Wed Dec 2 21:09:48 2009 +0900 TOMOYO: Add rest of file operation restrictions. LSM hooks for chmod()/chown()/chroot() are now ready. This patch utilizes these hooks. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 5d0901a3a0c39c97ca504f73d24030f63cfc9fa2 Author: Tetsuo Handa Date: Thu Nov 26 15:24:49 2009 +0900 LSM: Rename security_path_ functions argument names. include/linux/security.h and security/capability.c are using "struct path *dir" but security/security.c was using "struct path *path" by error. This patch renames "struct path *path" to "struct path *dir". Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 9f59f90bf57cff8be07faddc608c400b6e7c5d05 Author: Julia Lawall Date: Sun Dec 6 10:16:51 2009 +0100 security/selinux/ss: correct size computation The size argument to kcalloc should be the size of desired structure, not the pointer to it. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @expression@ expression *x; @@ x = <+... -sizeof(x) +sizeof(*x) ...+>// Signed-off-by: Julia Lawall Acked-by: Eric Paris Signed-off-by: James Morris commit 22b737f4c75197372d64afc6ed1bccd58c00e549 Author: WANG Cong Date: Tue Dec 1 23:28:10 2009 +0900 percpu: refactor the code in pcpu_[de]populate_chunk() Using break statement at the end of a for loop is confusing, refactor it by replacing the for loop. Signed-off-by: WANG Cong Signed-off-by: Tejun Heo commit 85438592f179c126ad4cb9a280046d4f0a501e6d Author: Tejun Heo Date: Wed Nov 18 17:53:21 2009 +0900 percpu: remove compile warnings caused by __verify_pcpu_ptr() If percpu pointer is const, __verify_pcpu_ptr() triggers warnings like the following. drivers/net/loopback.c: In function 'loopback_get_stats': drivers/net/loopback.c:109: warning: initialization discards qualifiers from pointer target type Fix it by adding const to the verification target pointer used in __verify_pcpu_ptr(). Signed-off-by: Tejun Heo Reported-by: Stephen Rothwell commit c2e552e76e2c6907ca50cd9a4b747a2e2e8c615e Author: Sage Weil Date: Mon Dec 7 15:55:05 2009 -0800 ceph: use kref for ceph_msg Signed-off-by: Sage Weil commit 415e49a9c4faf1a1480b1497da2037608e5aa2c5 Author: Sage Weil Date: Mon Dec 7 13:37:03 2009 -0800 ceph: use kref for ceph_osd_request Signed-off-by: Sage Weil commit 153c8e6bf7ffee561e046e60b26ef6486c6fc9f2 Author: Sage Weil Date: Mon Dec 7 12:31:09 2009 -0800 ceph: use kref for struct ceph_mds_request Signed-off-by: Sage Weil commit b6c1d5b81ea0841ae9d3ce2cda319ab986b081cf Author: Sage Weil Date: Mon Dec 7 12:17:17 2009 -0800 ceph: simplify ceph_buffer interface We never allocate the ceph_buffer and buffer separtely, so use a single constructor. Disallow put on NULL buffer; make the caller check. Signed-off-by: Sage Weil commit dd26d857a7bf1b5b734a23180c19eac3e46db944 Author: Sage Weil Date: Sat Dec 5 10:13:33 2009 -0800 ceph: use kref for ceph_buffer Signed-off-by: Sage Weil commit d2eecb03936878ec574ade5532fa83df7d75dde7 Author: Theodore Ts'o Date: Mon Dec 7 10:36:20 2009 -0500 ext4: Use slab allocator for sub-page sized allocations Now that the SLUB seems to be fixed so that it respects the requested alignment, use kmem_cache_alloc() to allocator if the block size of the buffer heads to be allocated is less than the page size. Previously, we were using 16k page on a Power system for each buffer, even when the file system was using 1k or 4k block size. Signed-off-by: "Theodore Ts'o" commit f8ec9d6837241865cf99bed97bb99f4399fd5a03 Author: Theodore Ts'o Date: Fri Jan 1 01:00:21 2010 -0500 ext4: Add new tracepoints to debug delayed allocation space functions Add tracepoints for ext4_da_reserve_space(), ext4_da_update_reserve_space(), and ext4_da_release_space(). Signed-off-by: "Theodore Ts'o" commit 71f2be213a0009098819e5c04f75ff19f84f2122 Author: Theodore Ts'o Date: Wed Dec 23 07:45:44 2009 -0500 ext4: Add new tracepoint for jbd2_cleanup_journal_tail Signed-off-by: "Theodore Ts'o" commit 1f2acb6017d8528135ec3b01ab7cd2be6ea0630b Author: Theodore Ts'o Date: Fri Jan 22 17:40:42 2010 -0500 ext4: Add block validity check when truncating indirect block mapped inodes Add checks to ext4_free_branches() to make sure a block number found in an indirect block are valid before trying to free it. If a bad block number is found, stop freeing the indirect block immediately, since the file system is corrupt and we will need to run fsck anyway. This also avoids spamming the logs, and specifically avoids driver-level "attempt to access beyond end of device" errors obscure what is really going on. If you get *really*, *really*, *really* unlucky, without this patch, a supposed indirect block containing garbage might contain a reference to a primary block group descriptor, in which case ext4_free_branches() could end up zero'ing out a block group descriptor block, and if then one of the block bitmaps for a block group described by that bg descriptor block is not in memory, and is read in by ext4_read_block_bitmap(). This function calls ext4_valid_block_bitmap(), which assumes that bg_inode_table() was validated at mount time and hasn't been modified since. Since this assumption is no longer valid, it's possible for the value (ext4_inode_table(sb, desc) - group_first_block) to go negative, which will cause ext4_find_next_zero_bit() to trigger a kernel GPF. Addresses-Google-Bug: #2220436 Signed-off-by: "Theodore Ts'o" commit 15121c18a22ae483279f76dc9e554334b800d0f7 Author: Eric Sandeen Date: Mon Feb 15 20:17:55 2010 -0500 ext4: Fix optional-arg mount options We have 2 mount options, "barrier" and "auto_da_alloc" which may or may not take a 1/0 argument. This causes the ext4 superblock mount code to subtract uninitialized pointers and pass the result to kmalloc, which results in very noisy failures. Per Ted's suggestion, initialize the args struct so that we know whether match_token() found an argument for the option, and skip match_int() if not. Also, return error (0) from parse_options if we thought we found an argument, but match_int() Fails. Reported-by: Michael S. Tsirkin Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit a1de02dccf906faba2ee2d99cac56799bda3b96a Author: Eric Sandeen Date: Thu Feb 4 23:58:38 2010 -0500 ext4: fix async i/o writes beyond 4GB to a sparse file The "offset" member in ext4_io_end holds bytes, not blocks, so ext4_lblk_t is wrong - and too small (u32). This caused the async i/o writes to sparse files beyond 4GB to fail when they wrapped around to 0. Also fix up the type of arguments to ext4_convert_unwritten_extents(), it gets ssize_t from ext4_end_aio_dio_nolock() and ext4_ext_direct_IO(). Reported-by: Giel de Nijs Signed-off-by: Eric Sandeen commit ffbfd336f9eac361e1630cfcb17a70607551daf2 Author: Daniel Mack Date: Mon Nov 30 17:56:11 2009 +0100 ASoC: Add regulator support to CS4270 codec driver Signed-off-by: Daniel Mack Acked-by: Timur Tabi Cc: Liam Girdwood Signed-off-by: Mark Brown commit 5c564c2a04d4bb6ba79eeb83bd06de584479f362 Author: Joern Engel Date: Mon Dec 7 12:34:43 2009 +0100 [LogFS] Silence gcc Andrew Morton sayeth: fs/logfs/journal.c: In function 'logfs_init_journal': fs/logfs/journal.c:266: warning: 'last_len' may be used uninitialized in this function Can this be squished please? commit 2f2ffd35822688a3650e503197b8724f47312748 Author: Sage Weil Date: Fri Dec 4 10:27:17 2009 -0800 ceph: mark v0.18 release Signed-off-by: Sage Weil commit a91eb199e4dc8a2ab3fb7a53f1a23ce82b29fc04 Author: Mark Brown Date: Thu Nov 26 11:56:07 2009 +0000 ASoC: Initial WM8904 CODEC driver The WM8904 is a high performance ultra-low power stereo CODEC optimised for portable audio applications, with features including a class W amplifier, FLL with free running mode, Mobile ReTune and ground referenced headphone and line outputs. Support for some features, most particularly the digital microphone interface, is not yet present. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d033c36ae5cec22c893c710cd026fb732c4086b9 Author: Mark Brown Date: Fri Dec 4 15:25:56 2009 +0000 ASoC: Display the power register in DAPM widget debugfs Make it a bit easier to tie DAPM widgets in with the register map without referring to the source by including the register location controlled by the widget. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit dd1b3d53c2e5b9cccec9001fc0b63f6b686a4ac9 Author: Mark Brown Date: Fri Dec 4 14:22:03 2009 +0000 ASoC: Export snd_soc_update_bits_unlocked() Allows custom controls to use it. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3a7aaed714bbe3c071000d720f0cce186d1897a4 Author: Ilkka Koskinen Date: Fri Dec 4 13:49:10 2009 +0200 ASoC: tlv320dac33: Add support for regulator framework Take the regulator framework in use for managing the power sources. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f1608cca9dd80231004e468b57a7a8eef80a9cd7 Merge: a47979b 43f0de8 Author: Mark Brown Date: Fri Dec 4 10:50:02 2009 +0000 Merge branch 'for-2.6.33' into for-2.6.34 commit a47979b5aa2117848b742828c98abe7eea42a9ff Author: Chaithrika U S Date: Thu Dec 3 18:56:56 2009 +0530 ASoC: DaVinci: Update suspend/resume support for McASP driver Add clock enable and disable calls to resume and suspend respectively. Also add a member to the audio device data structure which tracks the clock status. Tested on DA850/OMAP-L138 EVM. For the purpose of testing, the patches[1] which add suspend-to-RAM support to DA850/OMAP-L138 SoC were applied. [1] http://linux.davincidsp.com/pipermail/davinci-linux-open-source/ 2009-November/016958.html Signed-off-by: Chaithrika U S Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fb99f8810965b7e5a00e9754bd7bf556b00ba0c2 Author: Sage Weil Date: Thu Dec 3 15:04:08 2009 -0800 ceph: update MAINTAINERS entry with correct git URL Signed-off-by: Sage Weil commit 33d4909ccc094b8262667bccdd52e01458bee0df Author: Sage Weil Date: Wed Dec 2 14:42:39 2009 -0800 ceph: allow preferred osd to be get/set via layout ioctl There is certainly no reason not to report this. The only real downside to allowing the user to set it is that you don't get default values by zeroing the layout struct (the default is -1). Signed-off-by: Sage Weil commit 1d1de9160e0d8aff0d67a21137b62e63ffd6f184 Author: Sage Weil Date: Wed Dec 2 11:54:25 2009 -0800 ceph: hide /.ceph from readdir results We need to skip /.ceph in (cached) readdir results, and exclude "/.ceph" from the cached ENOENT lookup check. Signed-off-by: Sage Weil commit 50b885b96c903e420a1eac54dd27626244704a06 Author: Sage Weil Date: Tue Dec 1 14:12:07 2009 -0800 ceph: whitespace cleanup Signed-off-by: Sage Weil commit 71f6e0645be42f93c0f90dfcc93b9d2d277c2ee6 Author: Kuninori Morimoto Date: Wed Dec 2 15:11:08 2009 +0900 ASoC: sh_fsi: avoid using global variable Current FSI driver use global variable to access device data. But this style will be broken if SuperH come with multiple FSI blocks in future. To solve this problem, this patch use cpu_dai->private_data. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 34b43a56b9b103a7a820032177131532d9dbdbe8 Author: Sage Weil Date: Tue Dec 1 12:23:54 2009 -0800 ceph: plug leak of request_mutex Fix leak of osd client request_mutex on receiving dup ack. Signed-off-by: Sage Weil commit 30835cd074381048b0ea5d53e27725bbd0bdf5b7 Author: Joern Engel Date: Sat Nov 28 13:14:08 2009 +0100 [LogFS] Prevent 64bit divisions in hash_index Randy Dunlap caught this built error on i386: fs/built-in.o: In function `hash_index': dir.c:(.text+0x6c1f2): undefined reference to `__umoddi3' commit 2be09cb993826b52c9fc1d44747c20dd43a50038 Author: Grant Likely Date: Mon Nov 23 20:16:46 2009 -0700 of: remove special case definition of of_read_ulong() Special case of of_read_ulong() was defined for PPC32 to toss away all but the last 32 bits when a large number value was read, and the 'normal' version for ppc64 just #defined of_read_ulong to of_read_number which causes compiler warnings on MicroBlaze and other 32 bit architectures because it returns a u64 instead of a ulong. This patch fixes the problem by defining a common implementation of of_read_ulong() that works everywhere. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 02af11b03fce3ddb264d7873d7a2e295e697938c Author: Grant Likely Date: Mon Nov 23 20:16:45 2009 -0700 of: merge prom_{add,remove,modify}_property Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 41f880091c15b039ffcc8b3d831656b81517a6d3 Author: Grant Likely Date: Mon Nov 23 20:07:01 2009 -0700 of/flattree: Merge unflatten_device_tree Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit bbd33931a08362f78266a4016211a35947b91041 Author: Grant Likely Date: Mon Nov 23 20:07:00 2009 -0700 of/flattree: Merge unflatten_dt_node Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 00e38efd90f27518ec96b37b1c7773e3ac529966 Author: Grant Likely Date: Mon Nov 23 20:07:00 2009 -0700 of/flattree: Merge of_flat_dt_is_compatible Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit ca900cfa2944448bdb76e1246f282e59bc65f472 Author: Grant Likely Date: Mon Nov 23 20:06:59 2009 -0700 of/flattree: merge of_get_flat_dt_prop Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 31a6a87dfc34fbf02aef9a160adf558ec56d3ccd Author: Grant Likely Date: Mon Nov 23 19:49:38 2009 -0700 of/flattree: remove __init annotations from the header file __init annotation belongs in the .c file, not the header. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 819d2819303654c6829d572e698e2d0021c08599 Author: Grant Likely Date: Mon Nov 23 19:44:23 2009 -0700 of/flattree: merge of_get_flat_dt_root Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit c8cb7a59842c0b512b44f6f818cdb0b5a3ddc89e Author: Grant Likely Date: Mon Nov 23 18:54:23 2009 -0700 of/flattree: merge of_scan_flat_dt Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit e169cfbef46d62e042614ffafa8880eed1d894bb Author: Grant Likely Date: Mon Nov 23 14:53:09 2009 -0700 of/flattree: merge find_flat_dt_string and initial_boot_params Merge common code between Microblaze and PowerPC. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 2cfcadde83b308240690ff1c18f117d8bc7a08b0 Merge: e91edcf 648f4e3 Author: Grant Likely Date: Mon Nov 23 14:49:36 2009 -0700 Merge commit 'v2.6.32-rc8' commit ddfd1f04b7bc557c1fe9b110e99cebb2e19d4993 Author: Joern Engel Date: Mon Nov 23 14:29:12 2009 +0100 [LogFS] Plug memory leak on error paths Spotted by Dan Carpenter. commit 75eb3592811028e5b01835126483d115532a3aa1 Author: Sage Weil Date: Sat Nov 21 13:08:14 2009 -0800 ceph: remove useless IS_ERR checks ceph_lookup_snap_realm either returns a valid pointer or NULL; there is no need to check IS_ERR(result). Reported-by: Julia Lawall Signed-off-by: Sage Weil commit 32c895e776a0dd2cb701d60fbd6440280c09ce35 Author: Julia Lawall Date: Sat Nov 21 16:53:16 2009 +0100 fs/ceph: Move a dereference below a NULL test If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/). // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit 60d877334f7d9f5f2417ea4a83c1def769286102 Author: Julia Lawall Date: Sat Nov 21 12:53:08 2009 +0100 fs/ceph: introduce missing kfree Error handling code following a kmalloc should free the allocated data. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit b19a29af74c09553b9fef95cdf6e9af3df65f544 Author: Sage Weil Date: Fri Nov 20 14:44:18 2009 -0800 ceph: remove dead code Left over from mount/auth protocol changes. Signed-off-by: Sage Weil commit 03c677e1d189ff62891d9f278c55bb798a418b81 Author: Sage Weil Date: Fri Nov 20 15:14:15 2009 -0800 ceph: reset msgr backoff during open, not after successful handshake Reset the backoff delay when we reopen the connection, so that the delays for any initial connection problems are reasonable. We were resetting only after a successful handshake, which was of limited utility. Signed-off-by: Sage Weil commit 0dc2570fab222affe7739b88b5ed04c511d433dc Author: Sage Weil Date: Fri Nov 20 13:43:45 2009 -0800 ceph: reset requested max_size after mds reconnect The max_size increase request to the MDS can get lost during an MDS restart and reconnect. Reset our requested value after the MDS recovers, so that any blocked writes will re-request a larger max_size upon waking. Also, explicit wake session caps after the reconnect. Normally the cap renewal catches this, but not in the cases where the caps didn't go stale in the first place, which would leave writers waiting on max_size asleep. Signed-off-by: Sage Weil commit dc14657c9c946f25b84a98e9ffa41b812a70699e Author: Yehuda Sadeh Date: Fri Nov 20 13:59:13 2009 -0800 ceph: mount fails immediately on error Signed-off-by: Yehuda Sadeh commit 94045e115ee72aee3b17295791da07078f2f778c Author: Sage Weil Date: Thu Nov 19 15:31:50 2009 -0800 ceph: decode updated mdsmap format The mds map now uses the global_id as the 'key' (instead of the addr, which was a poor choice). This is protocol change. Signed-off-by: Sage Weil commit 0743304d871559cb4c7c066357de2caa60e94c2f Author: Sage Weil Date: Wed Nov 18 16:50:41 2009 -0800 ceph: fix debugfs entry, simplify fsid checks We may first learn our fsid from any of the mon, osd, or mds maps (whichever the monitor sends first). Consolidate checks in a single helper. Initialize the client debugfs entry then, since we need the fsid (and global_id) for the directory name. Also remove dead mount code. Signed-off-by: Sage Weil commit cfea1cf42b614583c02727d5bffd5a2384e92bda Author: Sage Weil Date: Wed Nov 18 16:50:55 2009 -0800 ceph: small cleanup in hash function Signed-off-by: Sage Weil commit ef6ada3de49074a913fb72f163657158be2c0e98 Author: Joern Engel Date: Fri Nov 20 22:17:12 2009 +0100 [LogFS] Add MAINTAINERS entry commit 5db53f3e80dee2d9dff5e534f9e9fe1db17c9936 Author: Joern Engel Date: Fri Nov 20 20:13:39 2009 +0100 [LogFS] add new flash file system This is a new flash file system. See Documentation/filesystems/logfs.txt Signed-off-by: Joern Engel commit d8fe989e7368a26e4baf9acb55524c71e5c3a117 Author: Thomas Gleixner Date: Thu Nov 19 13:13:41 2009 +0100 cris: Fixup last users of irq_chip->typename The typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers. Signed-off-by: Thomas Gleixner Cc: Mikael Starvik Cc: linux-cris-kernel@axis.com Signed-off-by: Jesper Nilsson commit b9bfb93ce2b1ef668254f0b9e16fcc5246d65d8e Author: Sage Weil Date: Wed Nov 18 15:08:44 2009 -0800 ceph: move mempool creation to ceph_create_client Signed-off-by: Sage Weil commit 4e7a5dcd1bbab6560fbc8ada29a840e7a20ed7bc Author: Sage Weil Date: Wed Nov 18 16:19:57 2009 -0800 ceph: negotiate authentication protocol; implement AUTH_NONE protocol When we open a monitor session, we send an initial AUTH message listing the auth protocols we support, our entity name, and (possibly) a previously assigned global_id. The monitor chooses a protocol and responds with an initial message. Initially implement AUTH_NONE, a dummy protocol that provides no security, but works within the new framework. It generates 'authorizers' that are used when connecting to (mds, osd) services that simply state our entity name and global_id. This is a wire protocol change. Signed-off-by: Sage Weil commit 5f44f142601bf94c448e2d463f0f18fd159da164 Author: Sage Weil Date: Wed Nov 18 14:52:18 2009 -0800 ceph: handle errors during osd client init Unwind initializing if we get ENOMEM during client initialization. Signed-off-by: Sage Weil commit 71ececdacae24be333c534869cb1b06357f0e215 Author: Sage Weil Date: Wed Nov 18 11:27:06 2009 -0800 ceph: remove unnecessary ceph_con_shutdown We require that ceph_con_close be called before we drop the connection, so this is unneeded. Just BUG if con->sock != NULL. Signed-off-by: Sage Weil commit 42ce56e50d948fc7c1c8c3a749ee5a21a7e134f6 Author: Sage Weil Date: Wed Nov 18 11:22:36 2009 -0800 ceph: remove bad calls to ceph_con_shutdown We want to ceph_con_close when we're done with the connection, before the ref count reaches 0. Once it does, do not call ceph_con_shutdown, as that takes the con mutex and may sleep, and besides that is unnecessary. Signed-off-by: Sage Weil commit 11ea8eda064aa4dc6e44a6dade1891b69ebd5255 Author: Sage Weil Date: Thu Nov 12 15:07:24 2009 -0800 ceph: fix page invalidation deadlock We occasionally want to make a best-effort attempt to invalidate cache pages without fear of blocking. If this fails, we fall back to an async invalidate in another thread. Use invalidate_mapping_pages instead of invalidate_inode_page2, as that will skip locked pages, and not deadlock. Signed-off-by: Sage Weil commit 039934b895c89c2bb40aa5132efe00e60b70efca Author: Sage Weil Date: Thu Nov 12 15:05:52 2009 -0800 ceph: build cleanly without CONFIG_DEBUG_FS Signed-off-by: Sage Weil commit fef320ff8887c702cde7ca6b8dbfff3a341d49fe Author: Sage Weil Date: Wed Nov 11 15:50:12 2009 -0800 ceph: pr_info when mds reconnect completes This helps the user know what's going on during the (involved) reconnect process. They already see when the mds fails and reconnect starts. Signed-off-by: Sage Weil commit b377ff13b31778c19203f3089d14080beb40a692 Author: Sage Weil Date: Wed Nov 11 15:22:37 2009 -0800 ceph: initialize i_size/i_rbytes on snapdir Signed-off-by: Sage Weil commit 09b8a7d2af83ae96dc052f9708e50140d06a9b6c Author: Sage Weil Date: Wed Nov 11 15:21:27 2009 -0800 ceph: exclude snapdir from readdir results It was hidden from sync readdir, but not the cached dcache version. Signed-off-by: Sage Weil commit cdac830313fa6bf2831693af80fefe4aaac11b7d Author: Sage Weil Date: Tue Nov 10 16:02:23 2009 -0800 ceph: remove recon_gen logic We don't get an explicit affirmative confirmation that our caps reconnect, nor do we necessarily want to pay that cost. So, take all this code out for now. Signed-off-by: Sage Weil commit eed0ef2caf928327332da54d23579debe629d5bc Author: Sage Weil Date: Tue Nov 10 14:34:36 2009 -0800 ceph: separate banner and connect during handshake into distinct stages We need to make sure we only swab the address during the banner once. So break process_banner out of process_connect, and clean up the surrounding code so that these are distinct phases of the handshake. Signed-off-by: Sage Weil commit 685f9a5d14194fc35db73e5e7370740ccc14b64a Author: Sage Weil Date: Mon Nov 9 12:05:48 2009 -0800 ceph: do not confuse stale and dead (unreconnected) caps We were using the cap_gen to track both stale caps (caps that timed out due to temporarily losing touch with the mds) and dead caps that did not reconnect after an MDS failure. Introduce a recon_gen counter to track reconnections to restarted MDSs and kill dead caps based on that instead. Rename gen to cap_gen while we're at it to make it more clear which is which. Signed-off-by: Sage Weil commit fb690390e305ea51e1883b105c7d3c52d7100ba5 Author: Sage Weil Date: Sat Nov 7 20:18:22 2009 -0800 ceph: make CRUSH hash function a bucket property Make the integer hash function a property of the bucket it is used on. This allows us to gracefully add support for new hash functions without starting from scatch. Signed-off-by: Sage Weil commit 1654dd0cf5ee1827322aca156af7d96d757201c7 Author: Sage Weil Date: Fri Nov 6 21:55:25 2009 -0800 ceph: make object hash a pg_pool property The object will be hashed to a placement seed (ps) based on the pg_pool's hash function. This allows new hashes to be introduced into an existing object store, or selection of a hash appropriate to the objects that will be stored in a particular pool. Signed-off-by: Sage Weil commit cfbbcd24a6bfd794295ee7ad76dfbff40ad6b934 Author: Sage Weil Date: Fri Nov 6 16:44:05 2009 -0800 ceph: use strong hash function for mapping objects to pgs We were using the (weak) dcache hash function, but it was leaving lower bits consecutive for consecutive (inode) objects. We really want to make the object to pg mapping random and uniform, so use a proper hash function here. This is Robert Jenkin's public domain hash function (with some minor cleanup): http://burtleburtle.net/bob/hash/evahash.html This is a protocol revision. Signed-off-by: Sage Weil commit c6cf726316abd613cfb7c325d950f3629f964ec6 Author: Sage Weil Date: Fri Nov 6 16:39:26 2009 -0800 ceph: make CRUSH hash functions non-inline These are way to big to be inline. I missed crush/* when doing the inline audit for akpm's review. Signed-off-by: Sage Weil commit 1bdb70e59026838a79f77c440f8fe480a66e65e8 Author: Sage Weil Date: Fri Nov 6 13:57:49 2009 -0800 ceph: clean up 'osd%d down' console msg No ceph prefix. Signed-off-by: Sage Weil commit f28bcfbe660a3246621a367020054d4f1a179cd9 Author: Sage Weil Date: Wed Nov 4 11:46:35 2009 -0800 ceph: convert port endianness The port is informational only, but we should make it correct. Signed-off-by: Sage Weil commit 6a18be16f7513ea8a4923c161ce073987932cbdb Author: Sage Weil Date: Wed Nov 4 11:40:05 2009 -0800 ceph: fix sparse endian warning Use the __le macro, even though for -1 it doesn't matter. Signed-off-by: Sage Weil commit 51042122d4f85e0f8ee577a4230f172fcc57c456 Author: Sage Weil Date: Wed Nov 4 11:39:12 2009 -0800 ceph: fix endian conversions for ceph_pg The endian conversions don't quite work with the old union ceph_pg. Just make it a regular struct, and make each field __le. This is simpler and it has the added bonus of actually working. Signed-off-by: Sage Weil commit 63f2d211954b790fea0a9caeae605c7956535af6 Author: Sage Weil Date: Tue Nov 3 15:17:56 2009 -0800 ceph: use fixed endian encoding for ceph_entity_addr We exchange struct ceph_entity_addr over the wire and store it on disk. The sockaddr_storage.ss_family field, however, is host endianness. So, fix ss_family endianness to big endian when sending/receiving over the wire. Signed-off-by: Sage Weil commit f25234f1c21ad9878bd38719381e13f4ef1990ce Author: Roel Kluin Date: Sun Nov 1 14:46:26 2009 +0100 CRIS v32: Should index be positive? `port' is used as index for writing to pins during allocation/deallocation. It should be positive. Signed-off-by: Roel Kluin Signed-off-by: Jesper Nilsson commit 859e7b149362475672e2a996f29b8f45cbb34d82 Author: Sage Weil Date: Mon Nov 2 09:32:47 2009 -0800 ceph: init/destroy bdi in client create/destroy helpers This keeps bdi setup/teardown in line with client life cycle. Signed-off-by: Sage Weil commit 33aa96e7430d215e2ee779f65cdad0f6d4571fe1 Author: Sage Weil Date: Sun Nov 1 17:53:24 2009 -0800 crush: always return a value from crush_bucket_choose Even when we encounter a corrupt bucket. We still BUG(). This fixes the warning fs/ceph/crush/mapper.c: In function 'crush_choose': fs/ceph/crush/mapper.c:352: warning: control may reach end of non-void function 'crush_bucket_choose' being inlined Signed-off-by: Sage Weil commit 63ff78b25c4b204075b5b98afcac6ad3639d43fe Author: Sage Weil Date: Sun Nov 1 17:51:15 2009 -0800 ceph: fix uninitialized err variable Fixes warning fs/ceph/xattr.c: In function '__build_xattrs': fs/ceph/xattr.c:353: warning: 'err' may be used uninitialized in this function Signed-off-by: Sage Weil commit ff1d1f7179363209b7f1493ea39b666f50d05cf4 Author: Noah Watkins Date: Fri Oct 30 12:57:30 2009 -0700 ceph: fix intra strip unit length calculation Commit 645a102581b3639836b17d147c35d574fd6e8267 fixes calculation of object offset for layouts with multiple stripes per object. This updates the calculation of the length written to take into account multiple stripes per object. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit 545695fb41da117928ab946067a42d9e15fd009d Author: Tejun Heo Date: Thu Oct 29 22:34:15 2009 +0900 percpu: make accessors check for percpu pointer in sparse The previous patch made sparse warn about percpu variables being used directly without going through percpu accessors. This patch implements the other half - checking whether non percpu variable is passed into percpu accessors. Signed-off-by: Tejun Heo Cc: Rusty Russell Cc: Al Viro commit e0fdb0e050eae331046385643618f12452aa7e73 Author: Rusty Russell Date: Thu Oct 29 22:34:15 2009 +0900 percpu: add __percpu for sparse. We have to make __kernel "__attribute__((address_space(0)))" so we can cast to it. tj: * put_cpu_var() update. * Annotations added to dynamic allocator interface. Signed-off-by: Rusty Russell Cc: Al Viro Signed-off-by: Tejun Heo commit f7b64fe806029e0a0454df132eec3c5ab576102c Author: Tejun Heo Date: Thu Oct 29 22:34:15 2009 +0900 percpu: make access macros universal Now that per_cpu__ prefix is gone, there's no distinction between static and dynamic percpu variables. Make get_cpu_var() take dynamic percpu variables and ensure that all macros have parentheses around the parameter evaluation and evaluate the variable parameter only once such that any expression which evaluates to percpu address can be used safely. Signed-off-by: Tejun Heo commit dd17c8f72993f9461e9c19250e3f155d6d99df22 Author: Rusty Russell Date: Thu Oct 29 22:34:15 2009 +0900 percpu: remove per_cpu__ prefix. Now that the return from alloc_percpu is compatible with the address of per-cpu vars, it makes sense to hand around the address of per-cpu variables. To make this sane, we remove the per_cpu__ prefix we used created to stop people accidentally using these vars directly. Now we have sparse, we can use that (next patch). tj: * Updated to convert stuff which were missed by or added after the original patch. * Kill per_cpu_var() macro. Signed-off-by: Rusty Russell Signed-off-by: Tejun Heo Reviewed-by: Christoph Lameter commit 645a102581b3639836b17d147c35d574fd6e8267 Author: Sage Weil Date: Wed Oct 28 15:15:05 2009 -0700 ceph: fix object striping calculation for non-default striping schemes We were incorrectly calculationing of object offset. If we have multiple stripe units per object, we need to shift to the start of the current su in addition to the offset within the su. Also rename bno to ono (object number) to avoid some variable naming confusion. Signed-off-by: Sage Weil commit 5600f5ebd318f7af6f4b19a29f08d18bb85264e5 Author: Sage Weil Date: Wed Oct 28 14:57:25 2009 -0700 ceph: correct comment to match striping calculation The object extent offset is the file offset _modulo_ the stripe unit. The code was correct, the comment was wrong. Reported-by: Noah Watkins Signed-off-by: Sage Weil commit 35e054a66e07f508aa7cfabc7db1757379093689 Author: Noah Watkins Date: Wed Oct 28 14:04:48 2009 -0700 ceph: remove redundant use of le32_to_cpu Using stripe unit size calculated and saved on the stack to avoid a redundant call to le32_to_cpu. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit fbbccec9c6218cbc9ff47c6d88bfc6b52079e3ea Author: Noah Watkins Date: Wed Oct 28 11:54:49 2009 -0700 ceph: replace list_entry with container_of Usage of non-list.h list_entry function for container_of functionality replaced with direct use of container_of. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit 6b8051855d983db8480ff1ea1b02ef2b49203c22 Author: Sage Weil Date: Tue Oct 27 11:50:50 2009 -0700 ceph: allocate and parse mount args before client instance This simplifies much of the error handling during mount. It also means that we have the mount args before client creation, and we can initialize based on those options. Signed-off-by: Sage Weil commit e53c2fe075feda1fd4f009956ac026dc24c3a199 Author: Sage Weil Date: Tue Oct 27 10:19:28 2009 -0700 ceph: fix, clean up string mount arg parsing Clearly demark int and string argument options, and do not try to convert string arguments to ints. Signed-off-by: Sage Weil commit 6ca874e92d5e50beb8e351dfd8121947bafc79ec Author: Sage Weil Date: Mon Oct 26 22:06:22 2009 -0700 ceph: silence uninitialized variable warning Signed-off-by: Sage Weil commit 7b813c46021e8f4909772a5bbfb5212bd140764c Author: Sage Weil Date: Mon Oct 26 22:07:53 2009 -0700 ceph: reduce parse_mount_args stack usage Since we've increased the max mon count, we shouldn't put the addr array on the parse_mount_args stack. Put it on the heap instead. Signed-off-by: Sage Weil commit ecb19c4649d7396737eb0d91a475661fe9d7c028 Author: Sage Weil Date: Thu Oct 22 10:53:02 2009 -0700 ceph: remove small mon addr limit; use CEPH_MAX_MON where appropriate Get rid of separate max mon limit; use the system limit instead. This allows mounts when there are lots of mon addrs provided by mount.ceph (as with a host with lots of A/AAAA records). Signed-off-by: Sage Weil commit 232d4b01319767b3ffa5d08962a81c805962be49 Author: Sage Weil Date: Wed Oct 21 11:21:49 2009 -0700 ceph: move directory size logic to ceph_getattr We can't fill i_size with rbytes at the fill_file_size stage without adding additional checks for directories. Notably, we want st_blocks to remain 0 on directories so that 'du' still works. Fill in i_blocks, i_size specially in ceph_getattr instead. Signed-off-by: Sage Weil commit bb097ffaf833a40335b6dd5e4fa6f5ed0b223bdc Author: Sage Weil Date: Mon Oct 19 16:17:31 2009 -0700 ceph: v0.17 of client Signed-off-by: Sage Weil commit ee7fdfaff7702bd209e3a013b2fc4643233f5465 Author: Sage Weil Date: Mon Oct 19 11:41:51 2009 -0700 ceph: include preferred osd in placement seed Mix the preferred osd (if any) into the placement seed that is fed into the CRUSH object placement calculation. This prevents all the placement pgs from peering with the same osds. Rev the osd client protocol with this change. Signed-off-by: Sage Weil commit 8fa9765576875200a7412a5300b5f0537211f038 Author: Sage Weil Date: Fri Oct 16 14:44:35 2009 -0700 ceph: enable readahead Initialized bdi->ra_pages to enable readahead. Use 512KB default. Signed-off-by: Sage Weil commit 76e3b390d41db9d69e254a09dd1aedd3e6aac25f Author: Sage Weil Date: Thu Oct 15 18:13:53 2009 -0700 ceph: move dirty caps code around Cleanup only. Signed-off-by: Sage Weil commit 8f3bc053c610826a657714649ea596f07875db2e Author: Sage Weil Date: Wed Oct 14 17:36:07 2009 -0700 ceph: warn on allocation from msgpool with larger front_len Pass the front_len we need when pulling a message off a msgpool, and WARN if it is greater than the pool's size. Then try to allocate a new message (to continue without failing). Signed-off-by: Sage Weil commit 07bd10fb9853a41a7f0bb271721cca97d15eccae Author: Sage Weil Date: Wed Oct 14 17:26:40 2009 -0700 ceph: correct subscribe_ack msgpool payload size Defined a struct for the SUBSCRIBE_ACK, and use that to size the msgpool. Signed-off-by: Sage Weil commit afcdaea3f2a78ce4873bd7e98a6d603bda23d167 Author: Sage Weil Date: Wed Oct 14 14:27:38 2009 -0700 ceph: flush dirty caps via the cap_dirty list Previously we were flushing dirty caps by passing an extra flag when traversing the delayed caps list. Besides being a bit ugly, that can also miss caps that are dirty but didn't result in a cap requeue: notably, mark_caps_dirty(). Separate the flushing into a separate helper, and traverse the cap_dirty list. This also brings i_dirty_item in line with i_dirty_caps: we are on the list IFF caps != 0. We carry an inode ref IFF dirty_caps|flushing_caps != 0. Lose the unused return value from __ceph_mark_caps_dirty(). Signed-off-by: Sage Weil commit cdc35f96277314bbfeefd0505410cabd69aebd8d Author: Sage Weil Date: Wed Oct 14 14:24:19 2009 -0700 ceph: move generic flushing code into helper Both callers of __mark_caps_flushing() do the same work; move it into the helper. Signed-off-by: Sage Weil commit f2cf418cec8d61df0651a0140a92a8c75246e14f Author: Sage Weil Date: Wed Oct 14 14:09:07 2009 -0700 ceph: initialize sb->s_bdi, bdi_unregister after kill_anon_super Writeback doesn't work without the bdi set, and writeback on umount doesn't work if we unregister the bdi too early. Signed-off-by: Sage Weil commit c89136ea4253c73e89e97f5138bb22d97ad9f564 Author: Sage Weil Date: Wed Oct 14 09:59:09 2009 -0700 ceph: convert encode/decode macros to inlines This avoids the fugly pass by reference and makes the code a bit easier to read. Signed-off-by: Sage Weil commit 83cb16727085b18191f45eb0ede6bf1f97d67a7a Author: Ingo Molnar Date: Wed Oct 14 17:48:38 2009 +0200 nvram: Drop the BKL from nvram_open() It's safe to remove the BKL from nvram_open(): there's no open() versus read() races: nvram_init() is very simple and race-free, it registers the device then puts it into /proc - there's no state init to race with. Cc: Wim Van Sebroeck Cc: Al Viro Cc: Frederic Weisbecker Cc: Thomas Gleixner LKML-Reference: <1255116426-7270-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 535bbb530764b1b2b3b732837f0e61e1baae7109 Author: Sage Weil Date: Tue Oct 13 12:55:26 2009 -0700 ceph: add version field to message header This makes it easier for individual message types to indicate their particular encoding, and make future changes backward compatible. Signed-off-by: Sage Weil commit 572033069dbc2cff8d4a2d2b34c576e1813fda70 Author: Sage Weil Date: Fri Oct 9 21:52:34 2009 -0700 ceph: remove unused CEPH_MSG_{OSD,MDS}_GETMAP Signed-off-by: Sage Weil commit 8fc57da4d32767cc6096ecaed24636dabefd1dbc Author: Sage Weil Date: Mon Oct 12 10:28:13 2009 -0700 ceph: ignore trailing data in monamp This lets us extend the format more easily. Signed-off-by: Sage Weil commit 752727a1b21a462d6ef634d552f180ae692f8947 Author: Sage Weil Date: Fri Oct 9 16:38:45 2009 -0700 ceph: add file layout validation This tracks updates to code shared with userspace. Signed-off-by: Sage Weil commit 13e38c8ae771d73bf6d1f0f98e35f99c0f0d48ff Author: Sage Weil Date: Fri Oct 9 16:36:34 2009 -0700 ceph: update to mon client protocol v15 The mon request headers now include session_mon information that must be properly initialized. Signed-off-by: Sage Weil commit 266673db423e6ab247170d6c6d72ec36e530a911 Author: Sage Weil Date: Fri Oct 9 10:31:32 2009 -0700 ceph: cancel osd requests before resending them This ensures we don't submit the same request twice if we are kicking a specific osd (as with an osd_reset), or when we hit a transient error and resend. Signed-off-by: Sage Weil commit 81b024e70fed635a2cf5a4bf911db1649bb005f5 Author: Sage Weil Date: Fri Oct 9 10:29:18 2009 -0700 ceph: reset osd session on fault, not peer_reset The peer_reset just takes longer (until we reconnect and discover the osd dropped the session... which it will). Signed-off-by: Sage Weil commit 991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e Author: Sage Weil Date: Thu Oct 8 22:22:37 2009 -0700 ceph: fail gracefully on corrupt osdmap (bad pg_temp mapping) Return an error and report a corrupt map instead of crying BUG(). Signed-off-by: Sage Weil commit 0ba6478df7c6bef0f4b2625554545f941f89fb97 Author: Sage Weil Date: Thu Oct 8 16:57:16 2009 -0700 ceph: revoke osd request message on request completion If an osd has failed or returned and a request has been sent twice, it's possible to get a reply and unregister the request while the request message is queued for delivery. Since the message references the caller's page vector, we need to revoke it before completing. Signed-off-by: Sage Weil commit c1ea8823be69ebebaface912142190e910711984 Author: Sage Weil Date: Thu Oct 8 16:55:47 2009 -0700 ceph: fix osd request submission race The osd request submission path registers the request, drops and retakes the request_mutex, then sends it to the OSD. A racing kick_requests could sent it during that interval, causing the same msg to be sent twice and BUGing in the msgr. Fix by only sending the message if it hasn't been touched by other threads. Signed-off-by: Sage Weil commit 0656d11ba6ffa3dee0e8916a1903f96185651217 Author: Sage Weil Date: Thu Oct 8 10:25:46 2009 -0700 ceph: renew mon subscription before it expires Be conservative: renew subscription once half the interval has expired. Do not reuse sub expiration to control hunting. Signed-off-by: Sage Weil commit e251e288082d5e89604eee1fef0c31bed1fe8f02 Author: Sage Weil Date: Wed Oct 7 16:38:19 2009 -0700 ceph: fix mdsmap decoding when multiple mds's are present A misplaced sizeof() around namelen was throwing things off. Signed-off-by: Sage Weil commit b28813a61d6ffe05ad353a86965607bb7a7fd60f Author: Sage Weil Date: Wed Oct 7 10:59:34 2009 -0700 ceph: gracefully avoid empty crush buckets This avoids a divide by zero when the input and/or map are malformed. Signed-off-by: Sage Weil commit b195befd9acb514dd2afb722e63fdd880ed63217 Author: Sage Weil Date: Wed Oct 7 10:59:30 2009 -0700 ceph: include preferred_osd in file layout virtual xattr Signed-off-by: Sage Weil commit fa0b72e9e2900ee87886aaf8bc4c4701be1e081d Author: Sage Weil Date: Wed Oct 7 10:59:10 2009 -0700 ceph: show meaningful version on module load Kill the old git revision; print the ceph version and protocol versions instead. Signed-off-by: Sage Weil commit 7b76bfc86757ca5e7b0a62f50003752da77c115b Author: Dick Streefland Date: Tue Oct 6 22:35:40 2009 +0200 kconfig: simplification of scripts/extract-ikconfig I've rewritten the extract-ikconfig script to extract the kernel configuration from a kernel compiled with CONFIG_IKCONFIG. The main motivation for the rewrite was to remove the dependency on the external C program binoffset.c, which is compiled on the initial run. The binoffset executable is invoked with a relative path, which means that the old script can only be run from the top of the kernel tree, and only when you have write permission in the scripts directory. The new script uses tr/grep/tail/zcat only, and can be invoked from anywhere. The binoffset.c program has been removed. This script requires GNU grep 2.5 (released 2002-03-13) or higher, because the -o option was introduced in that version. Signed-off-by: Dick Streefland LKML-Reference: <20091006203540.GA14634@streefland.net> Tested-by: Steven Rostedt Cc: Sam Ravnborg Signed-off-by: Steven Rostedt commit e324b8f991679a43e09dd13500bf1988c0bfc0ea Author: Sage Weil Date: Tue Oct 6 12:20:56 2009 -0700 ceph: document shared files in README Document files shared between kernel and user code trees. Signed-off-by: Sage Weil commit 9030aaf9bf0a1eee47a154c316c789e959638b0f Author: Sage Weil Date: Tue Oct 6 11:31:15 2009 -0700 ceph: Kconfig, Makefile Kconfig options and Makefile. Signed-off-by: Sage Weil commit 76aa844d5b2fb8c839180d3f5874e333b297e5fd Author: Sage Weil Date: Tue Oct 6 11:31:14 2009 -0700 ceph: debugfs Basic state information is available via /sys/kernel/debug/ceph, including instances of the client, fsids, current monitor, mds and osd maps, outstanding server requests, and hooks to adjust debug levels. Signed-off-by: Sage Weil commit 8f4e91dee2a245e4be6942f4a8d83a769e13a47d Author: Sage Weil Date: Tue Oct 6 11:31:14 2009 -0700 ceph: ioctls A few Ceph ioctls for getting and setting file layout (striping) parameters, and learning the identity and network address of the OSD a given region of a file is stored on. Signed-off-by: Sage Weil commit a8e63b7d51cce4557ee7bcd8f51be5cae8547d20 Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: nfs re-export support Basic NFS re-export support is included. This mostly works. However, Ceph's MDS design precludes the ability to generate a (small) filehandle that will be valid forever, so this is of limited utility. Signed-off-by: Sage Weil commit 8fc91fd85950d106883852c6d215614ec28cc92d Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: message pools The msgpool is a basic mempool_t-like structure to preallocate messages we expect to receive over the wire. This ensures we have the necessary memory preallocated to process replies to requests, or to process unsolicited messages from various servers. Signed-off-by: Sage Weil commit 31b8006e1d79e127a776c9414e3e0b5f9508047e Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: messenger library A generic message passing library is used to communicate with all other components in the Ceph file system. The messenger library provides ordered, reliable delivery of messages between two nodes in the system. This implementation is based on TCP. Signed-off-by: Sage Weil commit 963b61eb041e8850807d95f8d7a4c6a454c45000 Author: Sage Weil Date: Tue Oct 6 11:31:12 2009 -0700 ceph: snapshot management Ceph snapshots rely on client cooperation in determining which operations apply to which snapshots, and appropriately flushing snapshotted data and metadata back to the OSD and MDS clusters. Because snapshots apply to subtrees of the file hierarchy and can be created at any time, there is a fair bit of bookkeeping required to make this work. Portions of the hierarchy that belong to the same set of snapshots are described by a single 'snap realm.' A 'snap context' describes the set of snapshots that exist for a given file or directory. Signed-off-by: Sage Weil commit a8599bd821d084d04a3290fffae1071624ec00ea Author: Sage Weil Date: Tue Oct 6 11:31:12 2009 -0700 ceph: capability management The Ceph metadata servers control client access to inode metadata and file data by issuing capabilities, granting clients permission to read and/or write both inode field and file data to OSDs (storage nodes). Each capability consists of a set of bits indicating which operations are allowed. If the client holds a *_SHARED cap, the client has a coherent value that can be safely read from the cached inode. In the case of a *_EXCL (exclusive) or FILE_WR capabilities, the client is allowed to change inode attributes (e.g., file size, mtime), note its dirty state in the ceph_cap, and asynchronously flush that metadata change to the MDS. In the event of a conflicting operation (perhaps by another client), the MDS will revoke the conflicting client capabilities. In order for a client to cache an inode, it must hold a capability with at least one MDS server. When inodes are released, release notifications are batched and periodically sent en masse to the MDS cluster to release server state. Signed-off-by: Sage Weil commit ba75bb98cfb93b62c54af25bf67ff90857264bbe Author: Sage Weil Date: Tue Oct 6 11:31:11 2009 -0700 ceph: monitor client The monitor cluster is responsible for managing cluster membership and state. The monitor client handles what minimal interaction the Ceph client has with it: checking for updated versions of the MDS and OSD maps, getting statfs() information, and unmounting. Signed-off-by: Sage Weil commit 5ecc0a0f8128b1876e8614638deaed49cc8b174c Author: Sage Weil Date: Tue Oct 6 11:31:11 2009 -0700 ceph: CRUSH mapping algorithm CRUSH is a pseudorandom data distribution function designed to map inputs onto a dynamic hierarchy of devices, while minimizing the extent to which inputs are remapped when the devices are added or removed. It includes some features that are specifically useful for storage, most notably the ability to map each input onto a set of N devices that are separated across administrator-defined failure domains. CRUSH is used to distribute data across the cluster of Ceph storage nodes. More information about CRUSH can be found in this paper: http://www.ssrc.ucsc.edu/Papers/weil-sc06.pdf Signed-off-by: Sage Weil commit f24e9980eb860d8600cbe5ef3d2fd9295320d229 Author: Sage Weil Date: Tue Oct 6 11:31:10 2009 -0700 ceph: OSD client The OSD client is responsible for reading and writing data from/to the object storage pool. This includes determining where objects are stored in the cluster, and ensuring that requests are retried or redirected in the event of a node failure or data migration. If an OSD does not respond before a timeout expires, keepalive messages are sent across the lossless, ordered communications channel to ensure that any break in the TCP is discovered. If the session does reset, a reconnection is attempted and affected requests are resent (by the message transport layer). Signed-off-by: Sage Weil commit 2f2dc053404febedc9c273452d9d518fb31fde72 Author: Sage Weil Date: Tue Oct 6 11:31:09 2009 -0700 ceph: MDS client The MDS (metadata server) client is responsible for submitting requests to the MDS cluster and parsing the response. We decide which MDS to submit each request to based on cached information about the current partition of the directory hierarchy across the cluster. A stateful session is opened with each MDS before we submit requests to it, and a mutex is used to control the ordering of messages within each session. An MDS request may generate two responses. The first indicates the operation was a success and returns any result. A second reply is sent when the operation commits to disk. Note that locking on the MDS ensures that the results of updates are visible only to the updating client before the operation commits. Requests are linked to the containing directory so that an fsync will wait for them to commit. If an MDS fails and/or recovers, we resubmit requests as needed. We also reconnect existing capabilities to a recovering MDS to reestablish that shared session state. Old dentry leases are invalidated. Signed-off-by: Sage Weil commit 1d3576fd10f0d7a104204267b81cf84a07028dad Author: Sage Weil Date: Tue Oct 6 11:31:09 2009 -0700 ceph: address space operations The ceph address space methods are concerned primarily with managing the dirty page accounting in the inode, which (among other things) must keep track of which snapshot context each page was dirtied in, and ensure that dirty data is written out to the OSDs in snapshort order. A writepage() on a page that is not currently writeable due to snapshot writeback ordering constraints is ignored (it was presumably called from kswapd). Signed-off-by: Sage Weil commit 124e68e74099090e28da5518f73fda878e7e8232 Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: file operations File open and close operations, and read and write methods that ensure we have obtained the proper capabilities from the MDS cluster before performing IO on a file. We take references on held capabilities for the duration of the read/write to avoid prematurely releasing them back to the MDS. We implement two main paths for read and write: one that is buffered (and uses generic_aio_{read,write}), and one that is fully synchronous and blocking (operating either on a __user pointer or, if O_DIRECT, directly on user pages). Signed-off-by: Sage Weil commit 2817b000b02c5f0c05af67c01fb2684e1381d6ef Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: directory operations Directory operations, including lookup, are defined here. We take advantage of lookup intents when possible. For the most part, we just need to build the proper requests for the metadata server(s) and pass things off to the mds_client. The results of most operations are normally incorporated into the client's cache when the reply is parsed by ceph_fill_trace(). However, if the MDS replies without a trace (e.g., when retrying an update after an MDS failure recovery), some operation-specific cleanup may be needed. We can validate cached dentries in two ways. A per-dentry lease may be issued by the MDS, or a per-directory cap may be issued that acts as a lease on the entire directory. In the latter case, a 'gen' value is used to determine which dentries belong to the currently leased directory contents. We normally prepopulate the dcache and icache with readdir results. This makes subsequent lookups and getattrs avoid any server interaction. It also lets us satisfy readdir operation by peeking at the dcache IFF we hold the per-directory cap/lease, previously performed a readdir, and haven't dropped any of the resulting dentries. Signed-off-by: Sage Weil commit 355da1eb7a1f91c276b991764e951bbcd8047599 Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: inode operations Inode cache and inode operations. We also include routines to incorporate metadata structures returned by the MDS into the client cache, and some helpers to deal with file capabilities and metadata leases. The bulk of that work is done by fill_inode() and fill_trace(). Signed-off-by: Sage Weil commit 16725b9d2a2e3d0fd2b0034482e2eb0a2d78050f Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: super.c Mount option parsing, client setup and teardown, and a few odds and ends (e.g., statfs). Signed-off-by: Sage Weil commit c30dbb9cc7fc75ab1d0ee6fb084ba4684f7a665d Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: ref counted buffer struct ceph_buffer is a simple ref-counted buffer. We transparently choose between kmalloc for small buffers and vmalloc for large ones. This is currently used only for allocating memory for xattr data. Signed-off-by: Sage Weil commit de57606c23afded22202825b3db8a5d61859f198 Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: client types We first define constants, types, and prototypes for the kernel client proper. A few subsystems are defined separately later: the MDS, OSD, and monitor clients, and the messaging layer. Signed-off-by: Sage Weil commit 0dee3c28af2fbe22ca62739a7f57da5435d35793 Author: Sage Weil Date: Tue Oct 6 11:31:06 2009 -0700 ceph: on-wire types These headers describe the types used to exchange messages between the Ceph client and various servers. All types are little-endian and packed. These headers are shared between the kernel and userspace, so all types are in terms of e.g. __u32. Additionally, we define a few magic values to identify the current version of the protocol(s) in use, so that discrepancies to be detected on mount. Signed-off-by: Sage Weil commit 7ad920b504a980adcab4d3f6b85695526e6fd7bb Author: Sage Weil Date: Tue Oct 6 11:31:05 2009 -0700 ceph: documentation Mount options, syntax. Signed-off-by: Sage Weil commit 2725898fc9bb2121ac0fb1b5e4faf4fc09014729 Author: Russell King Date: Mon Oct 5 15:34:22 2009 +0100 ARM: Flush user mapping on VIVT processors when copying a page Steven Walter writes: > I've been tracking down an instance of userspace data corruption, > and I believe I have found a window during fork where data can be > lost. The corruption is occurring on an ARMv5 system with VIVT > caches. Here's the scenario in question. Thread A is forking, > Thread B is running in userspace: > > Thread A: flush_cache_mm() (dup_mmap) > Thread B: writes to a page in the above mm > Thread A: pte_wrprotect() the above page (copy_one_pte) > Thread B: writes to the same page again > > During thread B's second write, he'll take a fault and enter the > do_wp_page() case. We'll end up calling copy_page(), which notably > uses the kernel virtual addresses for the old and new pages. This > means that the new page does not necessarily have the data from the > first write. Now there are two conflicting copies of the same > cache-line in dcache. If the userspace cache-line flushes before > the kernel cache-line, we lose the changes made during the first > write. do_wp_page does call flush_dcache_page on the newly-copied > page, but there's still a window where the CPU could flush the > userspace cache-line before then. Resolve this by flushing the user mapping before copying the page on processors with a writeback VIVT cache. Note: this does have a performance impact, and so needs further consideration before being merged - can we optimize out some of the cache flushes if, eg, we know that the page isn't yet mapped? Thread: Signed-off-by: Russell King commit f00a75c094c340c4e7435665816c3273c870e849 Author: Russell King Date: Mon Oct 5 15:17:45 2009 +0100 ARM: Pass VMA to copy_user_highpage() implementations Our copy_user_highpage() implementations may require cache maintainence. Ensure that implementations have all necessary details to perform this maintainence. Signed-off-by: Russell King