commit 7dcca30a32aadb0520417521b0c44f42d09fe05c Author: Linus Torvalds Date: Sun Jul 8 16:32:17 2007 -0700 Linux 2.6.22 Woo-hoo. I'm sure somebody will report a "this doesn't compile, and I have a new root exploit" five minutes after release, but it still feels good ;) Signed-off-by: Linus Torvalds commit 1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c Author: Linus Torvalds Date: Sun Jul 8 12:02:55 2007 -0700 Fix permission checking for the new utimensat() system call Commit 1c710c896eb461895d3c399e15bb5f20b39c9073 added the utimensat() system call, but didn't handle the case of checking for the writability of the target right, when the target was a file descriptor, not a filename. We cannot use vfs_permission(MAY_WRITE) for that case, and need to simply check whether the file descriptor is writable. The oops from using the wrong function was noticed and narrowed down by Markus Trippelsdorf. Cc: Ulrich Drepper Cc: Markus Trippelsdorf Cc: Andrew Morton Acked-by: Al Viro Signed-off-by: Linus Torvalds commit 4e99325b462ba18075768582621af74a6b79d2a5 Author: Peter Zijlstra Date: Sun Jul 8 01:13:06 2007 -0700 mm: double mark_page_accessed() in read_cache_page_async() Fix a post-2.6.21 regression. read_cache_page_async() has two invocations of mark_page_accessed() which will launch pages right onto the active list. Remove the first one, keeping the latter one. This avoids marking unwanted pages active (in the retry loop). Signed-off-by: Peter Zijlstra Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4660897e6c2daa198fc8e3f47ae2a4aef69c80b0 Author: Bartlomiej Zolnierkiewicz Date: Sun Jul 8 15:21:58 2007 +0200 qd65xx: fix PIO mode selection PIO4 is a maximum PIO mode supported by a driver. Using "255" as a max_mode argument to ide_get_best_pio_mode() could result in wrong timings being used by a driver (for "pio" equal to 5) or OOPS (for "pio" values > 5 && < 255). Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov Reviewed-by: Alan Cox commit 4c6c914e4c2e0f91775ce4051b5a800c55175462 Author: Uwe Koziolek Date: Sun Jul 8 15:21:58 2007 +0200 sis5513: adding PCI-ID The SiS966 has one additional PCI-ID 1180. If the chipset is using this PCI-ID, the primary channel is connected to the first PATA-port. The secondary channel is connected to SATA-ports in IDE emulation mode. The legacy IO-ports are used. The including of the PCI-ID into pata_sis is not sufficient, because the legacy driver in drivers/ide is initialized before pata_sis. Signed-off-by: Uwe Koziolek Signed-off-by: Bartlomiej Zolnierkiewicz commit 95511ad4342cd094e62c807f6631b9a19cc6b129 Author: Adrian Bunk Date: Sat Jul 7 06:14:02 2007 +0200 DLM must depend on SYSFS The dependency of DLM on SYSFS got lost in commit 6ed7257b46709e87d79ac2b6b819b7e0c9184998 resulting in the following compile error with CONFIG_DLM=y, CONFIG_SYSFS=n: <-- snip --> ... LD .tmp_vmlinux1 fs/built-in.o: In function `dlm_lockspace_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/dlm/lockspace.c:231: undefined reference to `kernel_subsys' fs/built-in.o: In function `configfs_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/configfs/mount.c:143: undefined reference to `kernel_subsys' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 38377be88ab878f44c687dbd704d4d044b000c97 Author: Dave Jones Date: Fri Jul 6 14:59:43 2007 -0400 Clean up E7520/7320/7525 quirk printk. The printk level in this printk is bogus, as the previous printk didn't have a terminating \n resulting in .. Intel E7520/7320/7525 detected.<6>Disabling irq balancing and affinity It also never printed a \n at all in the case where we didn't do the quirk. Change it to only make noise if it actually does something useful. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 40e48eed84e65f909f5ac3d7a39547b70aacf90f Author: Adrian Bunk Date: Sat Jul 7 00:54:09 2007 +0200 include/linux/kallsyms.h must #include This patch fixes the following 2.6.22 regression with CONFIG_KALLSYMS=n: <-- snip --> ... CC arch/m32r/kernel/traps.o In file included from /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/arch/m32r/kernel/traps.c:14: /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h: In function 'lookup_symbol_name': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: 'ERANGE' undeclared (first use in this function) /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: (Each undeclared identifier is reported only once /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: for each function it appears in.) /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h: In function 'lookup_symbol_attrs': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:71: error: 'ERANGE' undeclared (first use in this function) make[2]: *** [arch/m32r/kernel/traps.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 1c39858b5dd46004b12c5acd26d8df346bef8a10 Author: David Woodhouse Date: Sat Jul 7 14:58:39 2007 -0400 Fix use-after-free oops in Bluetooth HID. When cleaning up HIDP sessions, we currently close the ACL connection before deregistering the input device. Closing the ACL connection schedules a workqueue to remove the associated objects from sysfs, but the input device still refers to them -- and if the workqueue happens to run before the input device removal, the kernel will oops when trying to look up PHYSDEVPATH for the removed input device. Fix this by deregistering the input device before closing the connections. Signed-off-by: David Woodhouse Acked-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit d23cf676d0e9d1fdc066d2dcb7f8bc0e2d4c75bd Author: Christoph Lameter Date: Fri Jul 6 11:17:32 2007 -0700 slub: remove useless EXPORT_SYMBOL kmem_cache_open is static. EXPORT_SYMBOL was leftover from some earlier time period where kmem_cache_open was usable outside of slub. (Fixes powerpc build error) Signed-off-by: Chrsitoph Lameter Cc: Johannes Berg Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3000e031cf6a1f58228357d7c317f66e670627f Author: maximilian attems Date: Fri Jul 6 11:17:32 2007 -0700 MAINTAINERS new kernel janitors ml davem kindly moved the list from osdl to vger. Signed-of-by: maximilian attems Cc: Alexey Dobriyan Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95069f89e80bb49ecc1b135bf85747e8dc6681f9 Author: Andres Salomon Date: Fri Jul 6 11:17:30 2007 -0700 GEODE: reboot fixup for geode machines with CS5536 boards Writing to MSR 0x51400017 forces a hard reset on CS5536-based machines, this has the reboot fixup do just that if such a board is detected. Acked-by: Jordan Crouse Signed-off-by: Andres Salomon Cc: Alan Cox Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23c1fb52961bc24bd3a8078eefc49eed533b2b38 Author: Peter Zijlstra Date: Fri Jul 6 13:35:34 2007 +0200 mm: fixup /proc/vmstat output Line up the vmstat_text with zone_stat_item enum zone_stat_item { /* First 128 byte cacheline (assuming 64 bit words) */ NR_FREE_PAGES, NR_INACTIVE, NR_ACTIVE, We current have nr_active and nr_inactive reversed. [ "OK with patch, though using initializers canbe handy to prevent such things in future: static const char * const vmstat_text[] = { [NR_FREE_PAGES] = "nr_free_pages", ..." - Alexey ] Signed-off-by: Peter Zijlstra Acked-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 0da2f0f164f098bb4447c714b552ac1681b2d6e8 Author: Yoann Padioleau Date: Fri Jul 6 02:39:56 2007 -0700 potential compiler error, irqfunc caller sites update In 7d12e780e003f93433d49ce78cfedf4b4c52adc5 David Howells performed this evolution: "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers" He correctly updated many of the function definitions that were using this extra regs pointer parameter but forgot to update some caller sites of those functions. The reason the modifications was not properly done on all drivers is that some drivers were rarely compiled because they are for AMIGA, or that some code sites were inside #ifdefs where the option is not set or inside #if 0. Here is the semantic patch that found the occurences and fixed the problem. @ rule1 @ identifier fn; identifier irq, dev_id; typedef irqreturn_t; @@ static irqreturn_t fn(int irq, void *dev_id) { ... } @@ identifier rule1.fn; expression E1, E2, E3; @@ fn(E1, E2 - ,E3 ) Signed-off-by: Yoann Padioleau Cc: "David S. Miller" Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 071922c08cef62e194d83db1cc4fa75892c69651 Author: Vivek Goyal Date: Fri Jul 6 02:39:55 2007 -0700 i386: es7000 build breakage fix o Commit 1833d6bc72893265f22addd79cf52e6987496e0f broke the build if compiled with CONFIG_ES7000=y and CONFIG_X86_GENERICARCH=n arch/i386/kernel/built-in.o(.init.text+0x4fa9): In function `acpi_parse_madt': : undefined reference to `acpi_madt_oem_check' arch/i386/kernel/built-in.o(.init.text+0x7406): In function `smp_read_mpc': : undefined reference to `mps_oem_check' arch/i386/kernel/built-in.o(.init.text+0x8990): In function `connect_bsp_APIC': : undefined reference to `enable_apic_mode' make: *** [.tmp_vmlinux1] Error 1 o Fix the build issue. Provided the definitions of missing functions. o Don't have ES7000 machine. Only compile tested. Cc: Len Brown Cc: Natalie Protasevich Cc: Roland Dreier Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a5311465b9de6d18e78b733a2c6e1b33e89be8 Author: Bjorn Helgaas Date: Fri Jul 6 02:39:54 2007 -0700 PNP SMCf010 quirk: work around Toshiba Portege 4000 ACPI issues When we enable the SMCf010 IR device, the Toshiba Portege 4000 BIOS claims the device is working, but it really isn't configured correctly. The BIOS *will* configure it, but only if we call _SRS after (1) reversing the order of the SIR and FIR I/O port regions and (2) changing the IRQ from active-high to active-low. This patch addresses the 2.6.22 regression: "no irda0 interface (2.6.21 was OK), smsc does not find chip" I tested this on a Portege 4000. The smsc-ircc2 driver correctly detects the device, and "irattach irda0 -s && irdadump" shows transmitted and received packets. Signed-off-by: Bjorn Helgaas Cc: Andrey Borzenkov Cc: Samuel Ortiz Cc: "Linus Walleij (LD/EAB)" Cc: Michal Piotrowski Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d57d973101e87b2e30ccfa899fe36c4b2e32d217 Author: Alexander Graf Date: Fri Jul 6 02:39:53 2007 -0700 fix logic error in ipc compat semctl() When calling a semctl(IPC_STAT) without IPC_64 the check if the memory is unevaluated. This patch fixes this. Signed-off-by: Alexander Graf Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0db19c412ce260a293b06b4bab66550b84411bfc Author: David Woodhouse Date: Fri Jul 6 02:39:52 2007 -0700 x86_64: fix headers_install A bug in headers_install for ARCH=x86_64 yields an asm/ directory full of files all of which are using the same #ifdef guard, "__ASM_STUB_" with no postfix. So the second and later asm files #included in the same C file (often through standard headers like ioctl.h) yields no symbols. Strangeness with the Ubuntu 'tell me if I support something that's not explcitly mentioned in POSIX, and I'll strip it out' shell, I believe. We don't need the 'export' but we do need a semicolon at the end of the FNAME line: Signed-off-by: David Woodhouse Signed-off-by: Rob Landley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d25c1ba2fa1a9a1a4f68bef8edb0efefd79f0012 Author: Loic Prylli Date: Fri Jul 6 02:39:52 2007 -0700 MTRR: Fix race causing set_mtrr to go into infinite loop Processors synchronization in set_mtrr requires the .gate field to be set after .count field is properly initialized. Without an explicit barrier, the compiler was reordering those memory stores. That was sometimes causing a processor (in ipi_handler) to see the .gate change and decrement .count before the latter is set by set_mtrr() (which then hangs in a infinite loop with irqs disabled). Signed-off-by: Loic Prylli Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e2e99f0e4aa6363e8515ed17011c210c8f1b52a Author: Jason Wessel Date: Fri Jul 6 02:39:50 2007 -0700 i386: fix regression, endless loop in ptrace singlestep over an int80 The commit 635cf99a80f4ebee59d70eb64bb85ce829e4591f introduced a regression. Executing a ptrace single step after certain int80 accesses will infinitely loop and never advance the PC. The TIF_SINGLESTEP check should be done on the return from the syscall and not before it. I loops on each single step on the pop right after the int80 which writes out to the console. At that point you can issue as many single steps as you want and it will not advance any further. The test case is below: /* Test whether singlestep through an int80 syscall works. */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include static int child, status; static struct user_regs_struct regs; static void do_child() { char str[80] = "child: int80 test\n"; ptrace(PTRACE_TRACEME, 0, 0, 0); kill(getpid(), SIGUSR1); write(fileno(stdout),str,strlen(str)); asm ("int $0x80" : : "a" (20)); /* getpid */ } static void do_parent() { unsigned long eip, expected = 0; again: waitpid(child, &status, 0); if (WIFEXITED(status) || WIFSIGNALED(status)) return; if (WIFSTOPPED(status)) { ptrace(PTRACE_GETREGS, child, 0, ®s); eip = regs.eip; if (expected) fprintf(stderr, "child stop @ %08lx, expected %08lx %s\n", eip, expected, eip == expected ? "" : " <== ERROR"); if (*(unsigned short *)eip == 0x80cd) { fprintf(stderr, "int 0x80 at %08x\n", (unsigned int)eip); expected = eip + 2; } else expected = 0; ptrace(PTRACE_SINGLESTEP, child, NULL, NULL); } goto again; } int main(int argc, char * const argv[]) { child = fork(); if (child) do_parent(); else do_child(); return 0; } Signed-off-by: Jason Wessel Cc: Jeremy Fitzhardinge Cc: Cc: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef7320edb1dd2cf6c969d1dcef4a9499a42f24da Author: Michael Ellerman Date: Fri Jul 6 02:39:49 2007 -0700 Fix elf_core_dump() when writing arch specific notes (spu coredumps) elf_core_dump() supports dumping arch specific ELF notes, via the #define ELF_CORE_WRITE_EXTRA_NOTES. Currently the only user of this is the powerpc spu coredump code. There is a bug in the handling of foffset WRT the arch notes, which causes us to erroneously increment foffset by the size of the arch notes, leaving a block of zeroes in the file, and causing all subsequent data in the file to be at + . eg: LOAD 0x050000 0x00100000 0x00000000 0x20000 0x20000 R E 0x10000 Tells us we should have a chunk of data at 0x50000. The truth is the data is at 0x90dbc = 0x50000 + 0x40dbc (the size of the arch notes). This bug prevents gdb from reading the core file correctly. The simplest fix is to simply remember the size of the arch notes, and add it to foffset after we've written the arch notes. The only drawback is that if the arch code doesn't write as many bytes as it said it would, we end up with a broken core dump again. For now I think that's a reasonable requirement. Tested on a Cell blade, gdb no longer complains about the core file being bogus. While I'm here I should point out that the spu coredump code does not work if we're dumping to a pipe - we'll have to wait for 23 to fix that. Signed-off-by: Michael Ellerman Acked-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b3e975e4a06f1710693c5aa51b8f98facfa9863 Author: Ralf Baechle Date: Thu Jun 21 00:22:34 2007 +0100 [MIPS] Fix scheduling latency issue on 24K, 34K and 74K cores The idle loop goes to sleep using the WAIT instruction if !need_resched(). This has is suffering from from a race condition that if if just after need_resched has returned 0 an interrupt might set TIF_NEED_RESCHED but we've just completed the test so go to sleep anyway. This would be trivial to fix by just disabling interrupts during that sequence as in: local_irq_disable(); if (!need_resched()) __asm__("wait"); local_irq_enable(); but the processor architecture leaves it undefined if a processor calling WAIT with interrupts disabled will ever restart its pipeline and indeed some processors have made use of the freedom provided by the architecture definition. This has been resolved and the Config7.WII bit indicates that the use of WAIT is safe on 24K, 24KE and 34K cores. It also is safe on 74K starting revision 2.1.0 so enable the use of WAIT with interrupts disabled for 74K based on a c0_prid of at least that. Signed-off-by: Ralf Baechle commit fde97822a295da9dffa4af643b49a58ffc4516ad Author: Ralf Baechle Date: Fri Jul 6 14:40:05 2007 +0100 [MIPS] Add macros to encode processor revisions. Older processors used to encode processor version and revision in two 4-bit bitfields, the 4K seems to simply count up and even newer MTI cores have switched to use the 8-bits as 3:3:2 bitfield with the last field as the patch number. Signed-off-by: Ralf Baechle commit 075c733e19ce7530b53b78151cc4d303c8f64548 Author: Ralf Baechle Date: Thu Jul 5 08:14:21 2007 +0100 [MIPS] RM7000: Enable ICACHE_REFILLS_WORKAROUND_WAR. The RM7000 processors and the E9000 cores have a bug (though PMC-Sierra opposes it being called that) where invalid instructions in the same I-cache line worth of instructions being fetched may case spurious exceptions. The workaround for this was only enabled for E9000 cores; enable it also for all RM7000-based platforms. Signed-off-by: Ralf Baechle commit 9349075a15a876f8e82f433ec84f99d19d3e77f9 Author: Ralf Baechle Date: Thu Jul 5 17:39:48 2007 +0100 [MIPS] SMTC: Fix cut'n'paste bug in Kconfig.debug This effectivly turned the SMTC_IDLE_HOOK_DEBUG debug option into a no-op. Signed-off-by: Ralf Baechle commit f7c2778151f32581ea9ec567d01d5d85209fcfe6 Author: Ralf Baechle Date: Tue Jun 26 20:19:00 2007 +0200 [MIPS] Change libgcc-style functions from lib-y to obj-y Reported by Eugene Surovegin . If only modules were users of these functions they did not get linked into the kernel proper, so later module loads would fail as well. Signed-off-by: Ralf Baechle commit c3e838a2cbb0f14af4d718160933523ac4c37adf Author: Chris Dearman Date: Thu Jun 21 12:59:57 2007 +0100 [MIPS] Fix timer/performance interrupt detection Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 6fb88ce04f545ca7da15a7b447783bb7a4615511 Author: Ralf Baechle Date: Thu Jun 7 08:44:32 2007 +0100 [MIPS] AP/SP: Avoid triggering the 34K E125 performance issue C0_status doesn't need to be initialized at this point anyway; the register will be initialized later. Signed-off-by: Ralf Baechle commit 5a1970959053143f6674f6d98c259452763a2f22 Author: Andrew Sharp Date: Fri Mar 23 12:15:18 2007 -0700 [MIPS] 64-bit TO_PHYS_MASK macro for RM9000 processors Signed-off-by: Andrew Sharp Signed-off-by: Ralf Baechle commit 25442cafb8cc3d979418caccabc91260707a0947 Author: Jarek Poplawski Date: Thu Jul 5 17:42:44 2007 -0700 [NETPOLL]: Fixups for 'fix soft lockup when removing module' >From my recent patch: > > #1 > > Until kernel ver. 2.6.21 (including) cancel_rearming_delayed_work() > > required a work function should always (unconditionally) rearm with > > delay > 0 - otherwise it would endlessly loop. This patch replaces > > this function with cancel_delayed_work(). Later kernel versions don't > > require this, so here it's only for uniformity. But Oleg Nesterov found: > But 2.6.22 doesn't need this change, why it was merged? > > In fact, I suspect this change adds a race, ... His description was right (thanks), so this patch reverts #1. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 94b83419e5b56a87410fd9c9939f0081fc155d65 Author: Adrian Bunk Date: Thu Jul 5 17:06:21 2007 -0700 [NET]: net/core/netevent.c should #include Every file should include the headers containing the prototypes for its global functions. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 25845b5155b55cd77e42655ec24161ba3feffa47 Author: Jing Min Zhao Date: Thu Jul 5 17:05:01 2007 -0700 [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values Choices' index values may be out of range while still encoded in the fixed length bit-field. This bug may cause access to undefined types (NULL pointers) and thus crashes (Reported by Zhongling Wen). This patch also adds checking of decode flag when decoding SEQUENCEs. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2cd052e44329dd2b42eb958f8f346b053de6e2cd Author: Johannes Berg Date: Thu Jul 5 17:03:09 2007 -0700 [NET] skbuff: remove export of static symbol skb_clone_fraglist is static so it shouldn't be exported. Signed-off-by: Johannes Berg Signed-off-by: David S. Miller commit 1669d857a25d62c6d0a6d9216e01c21287a7c844 Author: Vlad Yasevich Date: Tue Jul 3 14:29:23 2007 -0400 SCTP: Add scope_id validation for link-local binds SCTP currently permits users to bind to link-local addresses, but doesn't verify that the scope id specified at bind matches the interface that the address is configured on. It was report that this can hang a system. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit f50f95cab735ebe2993e8d1549f0615bad05f3f2 Author: Vlad Yasevich Date: Tue Jul 3 12:47:40 2007 -0400 SCTP: Check to make sure file is valid before setting timeout In-kernel sockets created with sock_create_kern don't usually have a file and file descriptor allocated to them. As a result, when SCTP tries to check the non-blocking flag, we Oops when dereferencing a NULL file pointer. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 3663c306609a9322a484fba28b3da66142c50ee9 Author: Vlad Yasevich Date: Tue Jul 3 12:43:12 2007 -0400 SCTP: Fix thinko in sctp_copy_laddrs() Correctly dereference bytes_copied in sctp_copy_laddrs(). I totally must have spaced when doing this. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 87a927c715789853cc8331d76039a2fd657a832a Author: David Woodhouse Date: Wed Jul 4 21:26:44 2007 -0400 Fix slab redzone alignment Commit b46b8f19c9cd435ecac4d9d12b39d78c137ecd66 fixed a couple of bugs by switching the redzone to 64 bits. Unfortunately, it neglected to ensure that the _second_ redzone, after the slab object, is aligned correctly. This caused illegal instruction faults on sparc32, which for some reason not entirely clear to me are not trapped and fixed up. Two things need to be done to fix this: - increase the object size, rounding up to alignof(long long) so that the second redzone can be aligned correctly. - If SLAB_STORE_USER is set but alignof(long long)==8, allow a full 64 bits of space for the user word at the end of the buffer, even though we may not _use_ the whole 64 bits. This patch should be a no-op on any 64-bit architecture or any 32-bit architecture where alignof(long long) == 4. Of the others, it's tested on ppc32 by myself and a very similar patch was tested on sparc32 by Mark Fortescue, who reported the new problem. Also, fix the conditions for FORCED_DEBUG, which hadn't been adjusted to the new sizes. Again noticed by Mark. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit 082f47a79bfc8a526b9a3e14a0ae9504fc09cc12 Author: Russell King Date: Thu Jul 5 19:59:51 2007 +0100 [ARM] always allow dump_stack() to produce a backtrace Don't make this dependent on CONFIG_DEBUG_KERNEL - if we hit a WARN_ON we need the stack trace to work out how we got to that point. Signed-off-by: Russell King commit 2bcb1b7de9eeea969a25d5f2b4511195cca9f2a2 Author: Linus Torvalds Date: Wed Jul 4 15:24:39 2007 -0700 Remove the blink driver Yeah, we could have just disabled it, but there's work on a new one that isn't as fundamentally broken, so there really doesn't seem to be any point in keeping it around. The recent timer cleanup broke the only valid use, and when I say "valid", I obviously mean "totally broken". So it's not like it works, or really even can work in the current format that uses the unsafe "panic" LED blinking routines.. Signed-off-by: Linus Torvalds commit 7b9c7b4d07fd8981193a2c4ecb650566f42d1219 Author: Russell King Date: Wed Jul 4 21:16:33 2007 +0100 [ARM] Fix non-page aligned boot time mappings AT91SAM9260 stopped booting with the recent changes to MM initialisation - it was asking for a non-aligned virtual address which caused loops to be non-terminal. Fix this by rounding virtual addresses down, but remember to include the offset in the length, and round the length up to the following page. This means that asking for a mapping of 4K starting at 2K into a page maps two pages as one would expect. Signed-off-by: Russell King commit 8c976e34516c9e134488babbb95af182340370c8 Author: Ralf Baechle Date: Tue Jul 3 18:25:58 2007 +0200 [MIPS] VSMP: Fix initialization ordering bug. Signed-off-by: Ralf Baechle commit 83d0f2332edb3001617e6a292c4412ae5f2bf659 Author: Atsushi Nemoto Date: Tue May 29 23:30:04 2007 +0900 [MIPS] Add whitelists for checksyscalls.sh Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit eaf2b8dca47cc1d4ca7fd83f37604e0f5478b33a Author: Maciej W. Rozycki Date: Tue May 29 15:03:56 2007 +0100 [MIPS] die(): Properly declare as non-returning This marks the declaration of die() correctly, removing "control reaches end of non-void function" warnings from non-void functions that die() at the end. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit ab012ebf9ebb5f3392e74c1666e7473b8567aeb0 Author: Kumba Date: Fri May 25 02:26:47 2007 -0400 [MIPS] Fix include wrapper symbol definitions in IP32 code. Some IP35 defines snuck into some IP32-specific code during the DMA re-write. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit e2baf4ed168589af8224d51f0ac50e65bcdee3f6 Author: David Woodhouse Date: Tue Jul 3 16:51:19 2007 -0400 [JFFS2] Fix readinode failure when read_dnode() detects CRC failure. We should have stopped returning 1 from read_dnode() to indicate failure. We can just mark the damn thing obsolete immediately. But I missed a case where we don't. Signed-off-by: David Woodhouse commit ba609a9d97ba231c3d94443c50579ceb5fc33867 Author: Linus Torvalds Date: Tue Jul 3 18:27:53 2007 -0700 Remove some unused variables When Andi reverted the HPET resource reservation (in commit 0f8dc2f06560e2ca126d1670a24126ba08357d38), he didn't remove the now unused variables, which just causes gcc to be noisy. Signed-off-by: Linus Torvalds commit fcb82f8835c1d71b4fe5de1d9894f45370f80dab Author: Zach Brown Date: Tue Jul 3 15:28:55 2007 -0700 dio: remove bogus refcounting BUG_ON Badari Pulavarty reported a case of this BUG_ON is triggering during testing. It's completely bogus and should be removed. It's trying to notice if we left references to the dio hanging around in the sync case. They should have been dropped as IO completed while this path was in dio_await_completion(). This condition will also be checked, via some twisty logic, by the BUG_ON(ret != -EIOCBQUEUED) a few lines lower. So to start this BUG_ON() is redundant. More fatally, it's dereferencing dio-> after having dropped its reference. It's only safe to dereference the dio after releasing the lock if the final reference was just dropped. Another CPU might free the dio in bio completion and reuse the memory after this path drops the dio lock but before the BUG_ON() is evaluated. This patch passed aio+dio regression unit tests and aio-stress on ext3. Signed-off-by: Zach Brown Cc: Badari Pulavarty Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 5dcccd8d7eae870d85c3f175fd0823d3da07d0e3 Author: Andi Kleen Date: Wed Jul 4 01:38:13 2007 +0200 Revert perfctr reservation to 2.6.21 state With this change it works again when the nmi watchdog is disabled. Signed-off-by: Andi Kleen Cc: Björn Steinbrink Cc: Stephane Eranian Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 0f8dc2f06560e2ca126d1670a24126ba08357d38 Author: Andi Kleen Date: Fri Jun 29 16:16:36 2007 +0200 Revert HPET resource reservation Matthias Lenk reports that the PCI subsystem would move the HPET on SB400/SB600-based systems, where the HPET is in BAR1 of the SMbus controller. The reason? The ACPI layer registered the PCI MMIO range as being busy too early, before PCI enumeration had happened, causing the PCI layer to decide that it should relocate the resources somewhere else. Firmware resources should be marked busy _after_ the PCI enumeration and probing has happened, not before. Remove the too-early reservation, we'll fix it up to do it properly later. In the meantime, this solves the regression. Tested-by: Matthias Lenk Cc: Aaron Durbin Cc: Andrew Morton Signed-off-by: Linus Torvalds commit dbc55faa64c12f4c9fab6e2bd131d771bc026ed1 Author: Christoph Lameter Date: Tue Jul 3 09:31:04 2007 -0700 SLUB: Make lockdep happy by not calling add_partial with interrupts enabled during bootstrap If we move the local_irq_enable() to the end of the function then add_partial() in early_kmem_cache_node_alloc() will be called with interrupts disabled like during regular operations. This makes lockdep happy. Signed-off-by: Christoph Lameter Tested-by: Andre Noll Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 746976a301ac9c9aa10d7d42454f8d6cdad8ff2b Author: Thomas Gleixner Date: Tue Jul 3 20:05:20 2007 +0200 NTP: remove clock_was_set() call to prevent deadlock The clock_was_set() call in seconds_overflow() which happens only when leap seconds are inserted / deleted is wrong in two aspects: 1. it results in a call to on_each_cpu() with interrupts disabled 2. it is potential deadlock source vs. call_lock in smp_call_function() The only possible side effect of the removal might be, that an absolute CLOCK_REALTIME timer fires 1 second too late, in the rare case of leap second deletion and an absolute CLOCK_REALTIME timer which expires in the affected time frame. It will never fire too early. This was probably observed by the reporter of a June 30th -> July 1st hang: http://lkml.org/lkml/2007/7/3/103 A similar problem was observed by Dave Jones, who provided a screen shot with a lockdep back trace, which allowed to analyse the problem. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit d61bcce9c1aa2c9f8a768d73c4c517f81d226725 Author: Andrew Morton Date: Tue Jul 3 22:28:36 2007 +0200 ide: ide_scan_pcibus(): check __pci_register_driver return value drivers/ide/setup-pci.c: In function 'ide_scan_pcibus': drivers/ide/setup-pci.c:879: warning: ignoring return value of '__pci_register_driver', declared with attribute warn_unused_result Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 8006bf56e360a4db71d304df778870a371a9e930 Author: Albert Lee Date: Tue Jul 3 22:28:36 2007 +0200 ide: pdc202xx_new PLL input clock fix Recently the PLL input clock of Promise 2027x is sometimes detected higher than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to measure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee Cc: Alan Cox Cc: Bahadir Balban Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 52374f890c1d0d64148d55a20d995a0b3e0ae987 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 3 22:28:35 2007 +0200 it821x: fix incorrect SWDMA mask SWDMA modes are unsupported by it821x. Attempts to tune SWDMA modes always fail (due to sanity check in ->speedproc) and result in PIO being tuned. * Fix incorrect SWDMA mask so core code won't try these modes and will just tune PIO if no other DMA modes are available. * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit 603a0e2c0a160ad8c2d00d71a700bb95482be5de Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 3 22:28:35 2007 +0200 amd74xx: resume fix * Driver can't skip programming transfer mode on the device in amd_set_drive() (similar fix has been applied to via82cxxx driver ages ago). * While at it remove redundant warning (ide_config_drive_speed() already produces more valuable one). * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz commit 96dcc08b0c6b730474469b10ed5eeda06e617deb Author: Sergei Shtylyov Date: Tue Jul 3 22:28:35 2007 +0200 hpt366: use correct enablebits for HPT36x The HPT36x chips finally turned out to have the channel enable bits -- however, badly implemented. Make use of them despite it's probably only going to burden the driver's code -- assuming both channels are always enabled by the HighPoint BIOS anyway... Signed-off-by: Sergei Shtylyov Acked-by: Linas Vepstas Cc: michal.kepien@poczta.onet.pl Signed-off-by: Bartlomiej Zolnierkiewicz commit 783353b1d3d1ed3ae4a0bd4ea4557bd4d77aa04e Author: Sergei Shtylyov Date: Tue Jul 3 22:28:35 2007 +0200 hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66 Add the MAXTOR STM3320620A drive into the UltraDMA/66 mode blacklist for the HPT36x chips. Signed-off-by: Sergei Shtylyov Acked-by: Linas Vepstas Signed-off-by: Bartlomiej Zolnierkiewicz commit 785955752fde4c555a1d9f74ddfe1f7aca3e0c7f Author: Alan Cox Date: Tue Jul 3 22:28:35 2007 +0200 ide: Fix a theoretical Ooops case Found by a static analyser. It is in theory possible we dereference dev->id when it has become invalid. Re-order to avoid this. Not needed for new-ide as we no longer support the crazy exabyte nest stuff Signed-off-by: Alan Cox Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit b42fa133110fa952299fa76cbe91226c14838261 Author: Masatake YAMATO Date: Tue Jul 3 22:28:34 2007 +0200 ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy Look at wait_drive_not_busy in drivers/ide/ide-taskfile.c: static u8 wait_drive_not_busy(ide_drive_t *drive) { ide_hwif_t *hwif = HWIF(drive); int retries = 100; u8 stat; /* * Last sector was transfered, wait until drive is ready. * This can take up to 10 usec, but we will wait max 1 ms * (drive_cmd_intr() waits that long). */ while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--) udelay(10); if (!retries) printk(KERN_ERR "%s: drive still BUSY!\n", drive->name); return stat; } `printk' is never called because `retries' never holds zero at the outside of `while' loop: when `retries' holds zero at the while's loop condition, `retries' will hold -1 at the if condition. Signed-off-by: Masatake YAMATO Cc: Chuck Ebbert Cc: joe@perches.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 1fb4a17f6e47d86b25bfc4fd9df4301bca09c999 Author: Hartmut Birr Date: Mon Jul 2 13:39:41 2007 -0300 V4L/DVB (5822): Fix the return value in ttpci_budget_init() if the call to budget_register() fails in ttpci_budget_int(), ttpci_budget_init() returns success. The attached patch will fix this problem. Signed-off-by: Hartmut Birr Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1e4597e8f0049dccedb0e011934007309fa2aeab Author: Oleg Nesterov Date: Mon Jul 2 12:26:20 2007 -0300 V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock Spotted and tested by Thomas Sattler . cinergyT2.c does cancel_delayed_work() + flush_scheduled_work() while holding cinergyt2->sem. This leads to deadlock because work->func() needs the same mutex to complete. Another bug is that this code in fact can't reliably stop the re-arming delayed_work. Convert this code to use cancel_rearming_delayed_work() and move it out of ->sem. Another mutex, ->wq_sem, was added to protect against the concurrent open/resume. This patch is a horrible hack to fix the lockup which happens in practice. As Dmitry Torokhov pointed out this driver has other problems and needs further changes. Signed-off-by: Oleg Nesterov Signed-off-by: Mauro Carvalho Chehab commit f057131fb6eb2c45f6023e3da41ccd6e4e71aee9 Author: Jelle Foks Date: Mon May 21 14:56:17 2007 -0300 V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners v4l-info and other programs would loop indefinitely while querying the tuners for cx88-blackbird cards. The cause was that vidioc_g_tuner didn't return an error value for qctrl->id != 0, making the application think there is a never ending list of tuners... This patch adds the same index check as done in vidioc_g_tuner() in cx88-video. Signed-off-by: Jelle Foks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 333408f21590d50397f3004e3f87070fa8f52c51 Author: Trent Piepho Date: Tue Jul 3 15:08:10 2007 -0300 V4L/DVB (5808): Bttv: fix v4l1 breaking the driver If one uses a V4L *one* application, such as vlc or mplayer's v4l driver, as the first user after the driver is loaded, the driver wedges itself and will never capture properly. Even if one uses a V4L2 application later, it still won't work. If one uses a V4L *two* application first, such as tvtime or mplayer's v4l2 driver, then the driver will be ok. One can then run a V4L1 application, and it will work. It turns out the problem is with norm changing and the crop support that was added in 2.6.21. The driver defaults to PAL, and keeps the last norm it was set too across opens. If one changes the norm via V4L1, the cropping parameters are not reset like they should be, and they'll remain broken across device opens. This patch removes the direct setting of btv->tvnorm in the V4L1 ioctl VIDIOCSCHAN handler. The norm is set via the existing call to set_input(), which calls set_tvnorm(), which will reset the cropping values now that it is able to detect the norm change. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 872aad45d6174570dd2e1defc3efee50f2cfcc72 Author: Alan Cox Date: Tue Jul 3 15:14:05 2007 +0100 pata_pcmcia: Switch to ata_sff_port_start PCMCIA doesn't use DMA and as this driver is used on many platforms we don't want it to fail on those that define the DMA alloc API as a NULL return Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a0ac38f16045f90dbbcd265b638cd7254c53aa65 Author: Alan Cox Date: Tue Jul 3 15:15:13 2007 +0100 pata_pdc202xx_old: Correct cable detect logic We got it backwards and now the other detects are fixed it shows up Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d6f4d5eafdd0bbdaa166a0650d27045c26ca63dd Author: Alan Cox Date: Tue Jul 3 15:11:30 2007 +0100 ata_generic: Check the right register for the DMA enabled flags Mirrors change in IT821X Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit ee5815023527dd579ada340786e329ff6c5c0eea Author: Chuck Ebbert Date: Mon Jun 25 19:13:32 2007 -0400 pata_ali: fix UDMA settings This patch was found to fix some of the problems with the pata_ali driver. https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482 Signed-off-by: Jeff Garzik commit d9f9c6bc91c14f53ffa782ffcd42259ecae1d38c Author: Florian Attenberger Date: Mon Jul 2 17:09:29 2007 +0200 sata_mv: PCI-ID for Adaptec 1430SA SATA Controller Signed-off-by: Florian Attenberger Signed-off-by: Jeff Garzik commit 4031826b3ca40982880f6b9f2282c7d7fad60d77 Author: Tejun Heo Date: Tue Jul 3 01:38:47 2007 +0900 libata: fix assigned IRQ reporting host->irq and host->irq2 should be set before ata_host_register() for IRQ reporting to work. Move up host->irq assignment in ata_host_activate() and add it to ata_pci_init_one() native path and pata_cs5520. The port info printing in ata_host_register() doesn't fit all the different controllers. It should probably be moved out to LLDs with some helpers in the future. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit aa2e09da2a332e748532aa2a71b090e7e7c3203d Author: Len Brown Date: Mon Jul 2 23:57:45 2007 -0400 ACPI: fix acpi_osi=!Linux Need to check for special case "acpi_osi=!Linux" before handling the general case "acpi_osi=!*", or it will have no effect. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit 841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730 Author: Ralph Campbell Date: Fri Jun 29 11:37:56 2007 -0700 IPoIB/cm: Partial error clean up unmaps wrong address If a page can't be allocated for the frag list of a skb, the code to unmap the partially allocated list is off by one. For exaple, if 'frags' equals one, i == 0, and the alloc_page() fails, then the old loop would have unmapped mapping[1] which is uninitialized. The same would happen if the call to ib_dma_map_page() failed. Signed-off-by: Ralph Campbell Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 786f238e4f2f0d962831ee3228f2327133eb082a Author: Jack Morgenstein Date: Mon Jul 2 17:36:18 2007 +0300 mlx4_core: Add new Mellanox device IDs Add new IDs for PCIe gen2 devices. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 7718457dc8fd98a9f61a5e42653161bac3904a65 Author: Marco Roeland Date: Tue Jul 3 08:25:50 2007 +0800 Blackfin arch: remove zero-sized include/asm-blackfin/macros.h This file accidentally got truncated instead of deleted in commit df30b11. Signed-off-by: Marco Roeland Cc: Robert P. J. Day Cc: Jeff Garzik Cc: Jesper Juhl Cc: Alex Riesen Cc: Robin Getz Acked-by: Bryan Wu commit 531e3a61f55261bf466d0415c48999511334933c Author: Jeff Garzik Date: Mon Jul 2 18:12:19 2007 -0400 [libata] sata_nv: undo merge error Only the ADMA entry was supposed to be able to change queue depth. Signed-off-by: Jeff Garzik commit 63ac9b915924d1237d2135fcb4de724e6127ca5e Author: Patrick McHardy Date: Mon Jul 2 16:08:28 2007 +0200 3c589_cs: fix local_bh_enable warning Russell King wrote: > Having upgraded from 2.6.16 to 2.6.22-rc6, I'm now seeing the following. > > Looks like netfilter is calling local_bh_enable() with IRQs disabled, > which would appear to be illegal. Thankfully, this is a warn-once > warning. > > WARNING: at /home/rmk/git/linux-2.6-rmk/kernel/softirq.c:138 local_bh_enable() > [...] > [] (nf_conntrack_destroy+0x0/0x2c) from [] (__kfree_skb+0xd0/0x100) > [] (__kfree_skb+0x0/0x100) from [] (kfree_skb+0x4c/0x50) > r5:c12a3800 r4:00000300 > [] (kfree_skb+0x0/0x50) from [] (el3_start_xmit+0xb8/0xd0 [3c589_cs]) > [] (el3_start_xmit+0x0/0xd0 [3c589_cs]) from [] (dev_hard_start_xmit+0x1a8/0x244) > r7:c12a3800 r6:c1a9aa00 r5:c1a9aa00 r4:c12a3800 > [] (dev_hard_start_xmit+0x0/0x244) from [] (__qdisc_run+0xb0/0x198) Thats a bug in the 3c589_cs driver. Patch attached. Signed-off-by: Patrick McHardy Signed-off-by: Jeff Garzik commit a3cabb271ea66739704497102536fb01bb72fe37 Author: Uwe Koziolek Date: Thu Jun 14 23:40:43 2007 +0200 libata: PATA-mode fixes for sis_sata Changed PATA handler for PATA-ports used by sata_sis. This patch was originally submitted by Jeff Garzik. Added PCI-ID 1180 for SiS966 Controller in pata_sis. The 1180 mode is fully compatible to other SiS PATA-controller. The PCI-ID 1183 is SATA in PATA-emulation, but not fully compatible to SiS5513/5518. sata_sis.c is forwarding this ID to pata_sis. 1183 is not working if simply added to pata_sis. This handling fixes issues with SiS968. Signed-off-by: Uwe Koziolek Signed-off-by: Jeff Garzik commit e14cbfa630cd3ab2631ee21b718b290928f47868 Author: Tejun Heo Date: Mon Jun 25 11:28:59 2007 +0900 libata: add HTS541616J9SA00 to NCQ blacklist Another member of HTS5416* family doing spurious NCQ completion. Signed-off-by: Tejun Heo Cc: Enrico Sardi Signed-off-by: Jeff Garzik commit 1e0b5ab81e2abb8bbf7446f4a17f43a1e34944fe Author: Robert Hancock Date: Thu Jun 28 18:52:24 2007 -0600 sata_nv: allow changing queue depth The sata_nv driver was missing the change_queue_depth hook in the SCSI host template which the other NCQ-capable libata drivers had. This made it impossible to change the queue depth by user request. Add this in. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 90c937853d792ea997d7fdec72dbbea4f92e12c4 Author: Tejun Heo Date: Fri Jun 29 11:33:08 2007 +0900 sata_inic162x: disable LBA48 devices sata_inic162x can't do LBA48 properly yet and is likely to corrupt data on drives larger than LBA28 limit. Disable LBA48 devices during device configuration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 74cdbba42dd515887ef3fc0ab498e70bd086c075 Author: Albert Lee Date: Thu Jun 28 10:05:31 2007 +0800 libata: remove reading alt_status from ata_hsm_qc_complete() In ata_hsm_qc_complete(): Calling ata_altstatus() after the qc is completed might race with next qc. Remove it. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 8c781bf77a339748839bfd5eedfe2ad3e0e05c4a Author: Albert Lee Date: Tue Jun 26 13:43:15 2007 +0800 libata: pata_pdc2027x PLL input clock fix Recently the PLL input clock of pata_pdc2027x is sometimes detected higer than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to mesure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee Cc: Alan Cox Signed-off-by: Jeff Garzik commit abcdceb9d0bf39da7c7ff8bcdff6eb4d9dfec56f Author: Randy Dunlap Date: Mon Jun 11 11:59:34 2007 -0700 scsi disk help file is not complete On Mon, 11 Jun 2007 20:28:16 +0200 api wrote: > Good day, > When doing make menuconfig one comes across CONFIG_BLK_DEV_SD. > The help file states that this is for scsi disks.NO MENTION IS MADE THAT > IT IS NEEDE FOR SATA DISKS AS WELL! > Would have saved me a lot of time if the help was up to date. > I hope this can be changed so others can make a kernel for sata systems > quicker. From: Randy Dunlap Add help info for BLK_DEV_SD referring to its use in SATA or PATA driver configurations. Add help text for "ATA" indicating that it probably needs some SCSI config symbols enabled in order to be useful. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 1f750a782c0e9593a8d0981ea972f22334980955 Author: Richard Purdie Date: Mon Jul 2 10:19:07 2007 +0100 [ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume The PXA CKEN changes broken syspend/resume on the pxa27x. This patch corrects the problem and fixes another couple of bad references. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 756813cac1d0172e1f93d977fe8bd1cd5086be21 Author: Andrzej Zaborowski Date: Tue Jun 26 14:31:23 2007 +0100 [ARM] 4454/1: Use word accesses in Versatile PCI config reads ARM Versatile PCI config reads of one byte width have the lowest two bits of the address cleared and result in reading from a wrong place in the config space. This change is to use word size accesses like it is done for halfword reads. Byte reads are used for retrieving the IRQ number of a PCI device and the problem was not exposed until 2.6.20 because the value read was discarded in drivers/pci/setup-irq.c (recently fixed). Signed-off-by: Andrzej Zaborowski Acked-by: Paul Brook Signed-off-by: Russell King commit 96acb6eb8effe7c2549909e2ee49f4130f2c167d Author: Dhananjay Phadke Date: Mon Jul 2 09:37:57 2007 +0530 RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload Resending patch 3/3 only. These changes allow driver close routine to be called during module unload, to clean-up buffers and other software resources, flush queues etc. Also, hardware is reset to pristine state. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit d14e37e12087e98b63907518dff83a90297605d6 Author: Adrian Bunk Date: Sun Jul 1 22:21:10 2007 +0200 drivers/net/ns83820.c: fix a check-after-use This patch fixes a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit afaee82c0aef7c2b30acff129c723031343e10c2 Author: David Brownell Date: Sun Jul 1 11:47:59 2007 -0700 net/usb/cdc_ether minor sparse cleanup Remove an "sparse" warning about a shadowed variable name. Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 2d1a3bbdf21d05e16703c8d608628ae4676eb3ac Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:26:00 2007 +0530 RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers This patch updates the various access routines to access different control and status settings present in different register locations. This will fix problems related to working of different ports in multi Port card. Signed-off by: Dhananjay Phadke Signed-off by: Milan Bag Signed-off-by: Jeff Garzik commit 644caeefb3bbf539e74b7098648ff0bfc9e52bb3 Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:25:59 2007 +0530 RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly NetXen driver uses PCI function 0 to provide the functionality of MSI. The patch makes driver check the bus master bit for function 0 and enable it after the card initialization. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit b8f59586cecdb612cd31f4d9e7904f46277ddd64 Author: Peter Korsgaard Date: Sat Jun 30 23:07:42 2007 +0200 dm9601: Return 0 from bind() on success Fixup dm9601_bind() so it returns 0 on success rather than just a positive number, as otherwise usbnet doesn't init the status handler. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 043600a62a45b2d5cac262fca9012fc24db19964 Author: Peter Korsgaard Date: Wed Jun 27 21:18:18 2007 +0200 Update MAINTAINERS for USB network devices >>>>> "Greg" == Greg KH writes: Greg> Yeah, this is the cdc_acm driver that is still in the USB drivers/ Greg> directory tree as it is a USB class driver that shows up as a tty device Greg> to userspace. It should not be moved to the networking list unless no Greg> one minds that I never see any queries about it :) Ok, here's an updated patch: Questions regarding the USB network drivers should now go to netdev. Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 3e323f3e86196eec18d6959585aa3188d060c43b Author: Peter Korsgaard Date: Wed Jun 27 08:48:15 2007 +0200 usbnet: Zero padding byte if there is tail room in skb Usbnet adds a padding byte if a 0 byte USB packet would be sent. Zero padding byte if there is tail room in skb. Signed-of-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 23de559b8d3537f972f325e7e015c18aa2e4d987 Author: Peter Korsgaard Date: Wed Jun 27 08:14:50 2007 +0200 dm9601: HW header size shouldn't be included in packet length The dm9601 driver was including the 2 byte hardware header in the packet length, causing the HW to send 2 extra bytes of garbage on tx. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 983b7dc07f083d7d78f408a6f841b399b954767d Author: maximilian attems Date: Sun Jun 24 23:36:45 2007 +0200 starfire list alpha as 64 bit arch instead of: "This driver has not been ported to this 64-bit architecture yet." the driver is said to work on alpha, see http://bugs.debian.org/305330 Signed-off-by: maximilian attems Signed-off-by: Jeff Garzik commit b245fb675bf03d716b84dcb40885aeb50041dcca Author: Maik Hampel Date: Thu Jun 28 17:07:26 2007 +0200 myri10ge: SET_NETDEV_DEV() SET_NETDEV_DEV() in myri10ge to create the "/sys/class/net//device" symlink. Signed-off-by: Maik Hampel Signed-off-by: Jeff Garzik commit 4a3207a3339955047aab1fd5d808f8050d50dd85 Author: Mike Frysinger Date: Mon Jul 2 13:49:15 2007 +0800 Blackfin arch: update board defconfig files Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 795bb15e0735bd2b0015ca333fa157399b72c168 Author: Kumar Gala Date: Mon Jul 2 00:04:36 2007 -0500 [POWERPC] Update defconfigs Signed-off-by: Kumar Gala commit 9f7905812e5919862acb6ede63e10d3d1bb4958e Author: Olof Johansson Date: Mon Jun 4 14:47:04 2007 +1000 [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver Uninline virq_to_hw and export it so modules can use it. The alternative would be to export the irq_map array instead, but it's an infrequently called function, and keeping the array unexported seems considerably cleaner. This is needed so that the pasemi_mac driver can be compiled as a module. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8 Author: Christian Krafft Date: Thu Jun 28 21:14:38 2007 +1000 [POWERPC] Fix PMI breakage in cbe_cbufreq driver The recent change to cell_defconfig to enable cpufreq on Cell exposed the fact that the cbe_cpufreq driver currently needs the PMI interface code to compile, but Kconfig doesn't make sure that the PMI interface code gets built if cbe_cpufreq is enabled. In fact cbe_cpufreq can work without PMI, so this ifdefs out the code that deals with PMI. This is a minimal solution for 2.6.22; a more comprehensive solution will be merged for 2.6.23. Signed-off-by: Christian Krafft Signed-off-by: Paul Mackerras commit 86affd5a00a92e491e5f00ed659492767519fdf7 Author: David Gibson Date: Thu Jun 28 11:27:57 2007 +1000 [POWERPC] Disable old EMAC driver in arch/powerpc The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet MAC found in PowerPC 4xx embedded chips is not suitable for arch/powerpc. It will not build because it relies on the old arch/ppc OCP mechanism. BenH has a new, device-tree aware version of the driver which will work in arch/powerpc, but until it's merged, this patch will disable the old, non-building version. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit a38d6181ff27824c79fc7df825164a212eff6a3f Author: Linus Torvalds Date: Sun Jul 1 12:54:24 2007 -0700 Linux 2.6.22-rc7 Last -rc? That's the plan.. commit 2391dae3e36c19fe668c71eac2eb8344dbaaf46d Author: Rafael J. Wysocki Date: Sun Jul 1 12:07:33 2007 -0700 PM: introduce set_target method in pm_ops Commit 52ade9b3b97fd3bea42842a056fe0786c28d0555 changed the suspend code ordering to execute pm_ops->prepare() after the device model per-device .suspend() calls in order to fix some ACPI-related issues. Unfortunately, it broke the at91 platform which assumed that pm_ops->prepare() would be called before suspending devices. at91 used pm_ops->prepare() to get notified of the target system sleep state, so that it could use this information while suspending devices. However, with the current suspend code ordering pm_ops->prepare() is called too late for this purpose. Thus, at91 needs an additional method in 'struct pm_ops' that will be used for notifying the platform of the target system sleep state. Moreover, in the future such a method will also be needed by ACPI. This patch adds the .set_target() method to 'struct pm_ops' and makes the suspend code call it, if implemented, before executing the device model per-device .suspend() calls. It also modifies the at91 code to use pm_ops->set_target() instead of pm_ops->prepare(). Signed-off-by: Rafael J. Wysocki Acked-by: David Brownell Cc: Pavel Machek Cc: Johannes Berg Cc: Len Brown Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbcdd772ff43de58cc0d9de76ae9d05e2dd98bc0 Author: Bjorn Helgaas Date: Sun Jul 1 12:06:49 2007 -0700 smsc-ircc2: bypass PNP detection until we get the quirks worked out Don't use PNP detection by default yet. We have some PNP and BIOS issues to work out first. Sample problem on a Toshiba Portege 4000: the SMCf010 device is handed off disabled. We assign I/O ports originally assigned to the SMCf010 to a PCMCIA device instead. We enable the SMCf010, configuring it to use disjoint ports, but _SRS doesn't work correctly, so the device doesn't work. Signed-off-by: Bjorn Helgaas Cc: Andrey Borzenkov Cc: Adam Belay Cc: Michal Piotrowski Cc: Samuel Ortiz Cc: "David S. Miller" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84288ad89e9736c7478e138f247397b9ab7a9d28 Author: Andrew Morton Date: Sun Jul 1 12:06:48 2007 -0700 i386: mtrr crash fix Commit 3ebad5905609476a4ff1151a66b21d9794009961 ("[PATCH] x86: Save and restore the fixed-range MTRRs of the BSP when suspending") added mtrr operations without verifying that the CPU has MTRRs. Crashes transmeta CPUs. Cc: "H. Peter Anvin" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ebffd7c05391693b71d3326c8c78ff82f728ed0 Author: Maxime Austruy Date: Sun Jul 1 12:06:38 2007 -0700 asus_acpi: fix oops on non-asus machines If asus_acpi_init doesn't find any device it knows about, it mistakenly returns a "success" error code even though it cleans up after itself. Later when trying to rmmod asus_acpi, the module_exit routine would try to clean up one more time and we would end up calling acpi_bus_unregister_driver(&asus_hotk_driver) twice. This patch addresses this first problem by returning -ENODEV when no appropriate device is found. Then there was also another bug with the code handling the return value of backlight_device_register. If this function ever failed, the driver would cleanup by calling the module_exit routine from module_init, but it would still return "success". So any attempt to rmmod this module would result in asus_acpi_exit being called twice but it's not ready to handle it (I haven't hit this bug, just found it by code inspection). This patch fixes that by inserting a return -ENODEV; at the end of this error handling path. Signed-off-by: Maxime Austruy Cc: Len Brown Cc: Richard Purdie Cc: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d80d02173360562625c10a526132fb87be4de2a4 Author: Randy Dunlap Date: Sun Jul 1 12:06:37 2007 -0700 pci.h stubs (for EDD build error) Provide stubs for more PCI bus/slot functions when CONFIG_PCI=n. Signed-off-by: Randy Dunlap Cc: Matt Domsch Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10c86be57724adf44c266300964182fd2966d108 Author: Randy Dunlap Date: Sun Jul 1 12:06:37 2007 -0700 ALSA: more section mismatches Fix section mismatch warnings: WARNING: sound/built-in.o(.exit.text+0x3ad): Section mismatch: reference to .init.text: (between 'sb_exit' and 'unload_uart6850') WARNING: sound/built-in.o(.exit.text+0x753): Section mismatch: reference to .init.text: (between 'snd_mts64_module_exit' and 'snd_portman_module_exit') Signed-off-by: Randy Dunlap Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95203aec21fcdff1f1fa5480a597d02416aa0a63 Author: Alexey Dobriyan Date: Sun Jul 1 12:06:36 2007 -0700 frv: fix fallout from "remove sched.h from mm.h" patch /home/rpjday/AMD/k/topics/0_hi/hi1.c:15: error: dereferencing pointer to incomplete type /home/rpjday/AMD/k/topics/0_hi/hi1.c:16: error: dereferencing pointer to incomplete type Signed-off-by: Alexey Dobriyan Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17022220dd70378b2f17fa9b0248f15067d88c58 Author: Christoph Lameter Date: Sun Jul 1 12:06:35 2007 -0700 SLAB: remove WARN_ON_ONCE for zero sized objects for 2.6.22 release We agreed to remove the WARN_ON_ONCE before 2.6.22 is released. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f4915b9c5d7a35da11bfcff80ae6466cb7b9fc4 Author: Stephen Hemminger Date: Sun Jul 1 12:50:35 2007 -0400 blink driver power saving The blink driver wakes up every jiffies which wastes power unnecessarily. Using a notifier gives same effect. Also add ability to unload module. Signed-off-by: Stephen Hemminger [ We should really just delete the whole thing. The blink driver is broken in many other ways too -Linus ] Signed-off-by: Linus Torvalds commit 4710bcce8e02257c8a423b7a62ea81d0207582c8 Author: Linus Torvalds Date: Sun Jul 1 10:56:11 2007 -0700 i386: remove bogus mtrr range check Commit 9215da33209b861b01c51382254b178a3fe92a30 "fixed" the MTRR range check to not allow any MTRR's under the 1MB mark (since that's where the fixed MTRR's are active). However, that was totally bogus, since it's normal (and almost required) to have a large variable MTRR that starts at 0, and covers some large percentage of the whole RAM, and then using the fixed MTRR's to override that large MTRR to handle the special ISA hole in the 640k-1M region. The old check was bogus too (checking that no variable MTRR is used that is entirely under the 1MB range), but at least it wasn't actively detrimental, because no sane situation would ever trigger such MTRR usage in the first place. That said, the whole notion of not allowing variable MTRR's in the low 1MB is just stupid, so rather than revert the commit, this just removes the whole sad and unnecessary check entirely. Cc: Jan Beulich Cc: Andi Kleen Cc: Andrew Morton Tested-by: Luca Palermo Signed-off-by: Linus Torvalds commit fde937d826e43c9fe7fecc98b6f3da7188e76930 Author: Will Schmidt Date: Fri Jun 29 15:49:50 2007 -0500 Fix VDSO gettimeofday() when called with NULL struct timeval. The vdso64 portion of patch 74609f4536f2b8fd6a48381bbbe3cd37da20a527 for fixing problems with NULL gettimeofday input mistakenly checks for a null tz field twice, when it should be checking for null tz once, and null tv once; by way of a r10/r11 typo. Any application calling gettimeofday(&tv,NULL) will "fail". This corrects that typo, and makes my G5 happy. Tested on G5. Signed-off-by: Will Schmidt Cc: Tony Breeds Forwarded-by: Ben Herrenschmidt [ Ben says: "I checked the 32 bits part of the change is correct. You can probably blame me for originally writing the 2 versions with inversed usage of r10 and r11, thus confusing Tony :-)" Ben duly blamed. - Linus ] Signed-off-by: Linus Torvalds commit fe77d4f283e840879f0e23b86a5d6a486823fdef Author: Stefan Richter Date: Mon Jun 25 22:18:40 2007 +0200 firewire: add Kconfig help on building both stacks Alas that won't work so good, because nobody reads help texts. I thought about adding some crude multiple choice selection (build the old stack, build the new stack, build both stacks). It's possible, but it would introduce awkward dummy config variables. Signed-off-by: Stefan Richter commit 0a9972baa7454c747fd5f67ce864420dff99d383 Author: Stefan Richter Date: Sat Jun 23 20:28:17 2007 +0200 firewire: fix async reception on big endian machines descriptor.data_address is little endian Tested-by: Olaf Hering Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 5f0212174db33828f8bddcff501b73d2bc734f72 Author: Randy Dunlap Date: Thu Jun 28 22:40:23 2007 -0700 [IRDA]: fix printk format Fix printk format warning: drivers/net/irda/irport.c:512: warning: format '%d' expects type 'int', but argument 5 has type 'long int' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8da32de5c845b711a500f89342baf10c662e2ecb Author: Kumar Gala Date: Fri Jun 29 00:12:04 2007 -0500 gianfar: Fix typo bug introduced by move to udp_hdr() In commit 4bedb45203eab92a87b4c863fe2d0cded633427f both the udp and tcp cases where changed to use udp_hdr() instead of leaving the tcp case alone and fixing with tcp_hdr(). This ended up causing random behavior with TCP connections because of looking for tcp_hdr()->check in the wrong place. Signed-off-by: Kumar Gala commit 17200811cf539b9107a99a39bf71ba3567966285 Author: Jarek Poplawski Date: Thu Jun 28 22:11:47 2007 -0700 [NETPOLL] netconsole: fix soft lockup when removing module #1 Until kernel ver. 2.6.21 (including) cancel_rearming_delayed_work() required a work function should always (unconditionally) rearm with delay > 0 - otherwise it would endlessly loop. This patch replaces this function with cancel_delayed_work(). Later kernel versions don't require this, so here it's only for uniformity. #2 After deleting a timer in cancel_[rearming_]delayed_work() there could stay a last skb queued in npinfo->txq causing a memory leak after kfree(npinfo). Initial patch & testing by: Jason Wessel Signed-off-by: Jarek Poplawski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4e4eda866ec7bd7a151e4884a291221eb74644ae Author: Dmitry Torokhov Date: Fri Jun 29 01:10:54 2007 -0400 Input: document some of keycodes Document some of keycodes, based on USB HUT 1.12 and current mapping in HID driver. Signed-off-by: Dmitry Torokhov commit c77da1780325d889cac98e8179449ddf54e71ce0 Author: Henrique de Moraes Holschuh Date: Fri Jun 29 01:08:49 2007 -0400 Input: add a new EV_SW SW_RADIO event, for radio switches on laptops Many laptops have rf-kill physical switches that are not keys, but slider or rocker switches. Often (like in all ThinkPads with a radio kill slider switch), they have both a slider/rocker switch and a hot key. Trying to kludge a real switch to act like a key is not a very smart thing to do if you can help it, and it gets specially bad when you are going to have both in the same machine. So, we do the right thing and add an input EV_SW event for radio kill switches. The EV_SW SW_RADIO event is defined with positive logic, i.e. when the switch is active, the radios are to be enabled. When the switch is inactive, the radios are to be disabled. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Dmitry Torokhov commit 33143ea1a34d12699e6aa222ba124498abcfe4d1 Author: Dmitry Torokhov Date: Fri Jun 29 01:06:35 2007 -0400 Input: serio - take drv_mutex in serio_cleanup() We need to take serio->drv_mutex in serio_cleanup() to prevent the function from being called while driver is in the middle of attaching to a serio port. Such situation can happen with i8042 and atkbd drivers if user rapidly presses Ctrl-Alt-Del during system startup, and leads to kernel oops. Reported-by: Dave Young Signed-off-by: Dmitry Torokhov commit 9f462a1a5de06503fd247186b91d4205ac1cf1ba Author: Alexey Dobriyan Date: Thu Jun 28 21:25:31 2007 -0700 [SPARC64]: Add linux/pagemap.h to asm/tlb.h As seen on sparc64-allnoconfig: CC arch/sparc64/mm/tlb.o In file included from arch/sparc64/mm/tlb.c:19: include/asm/tlb.h: In function 'tlb_flush_mmu': include/asm/tlb.h:60: warning: implicit declaration of function 'release_pages' include/asm/tlb.h: In function 'tlb_remove_page': include/asm/tlb.h:92: warning: implicit declaration of function 'page_cache_release' Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit edd5cd4a9424f22b0fa08bef5e299d41befd5622 Author: David Woodhouse Date: Wed Jun 27 14:10:09 2007 -0700 Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM Not all the world is an i386. Many architectures need 64-bit arguments to be aligned in suitable pairs of registers, and the original sys_sync_file_range(int, loff_t, loff_t, int) was therefore wasting an argument register for padding after the first integer. Since we don't normally have more than 6 arguments for system calls, that left no room for the final argument on some architectures. Fix this by introducing sys_sync_file_range2(int, int, loff_t, loff_t) which all fits nicely. In fact, ARM already had that, but called it sys_arm_sync_file_range. Move it to fs/sync.c and rename it, then implement the needed compatibility routine. And stop the missing syscall check from bitching about the absence of sys_sync_file_range() if we've implemented sys_sync_file_range2() instead. Tested on PPC32 and with 32-bit and 64-bit userspace on PPC64. Signed-off-by: David Woodhouse Acked-by: Russell King Cc: Arnd Bergmann Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4d4da8f82c2598b8713f4a01f360f3751d90be Author: Jay Lubomirski Date: Wed Jun 27 14:10:09 2007 -0700 serial: clear proper MPSC interrupt cause bits The interrupt clearing code in mpsc_sdma_intr_ack() mistakenly clears the interrupt for both controllers instead of just the one its supposed to. This can result in the other controller appearing to hang because its interrupt was effectively lost. So, don't clear the interrupt cause bits for both MPSC controllers when clearing the interrupt for one of them. Just clear the one that is supposed to be cleared. Signed-off-by: Jay Lubomirski Acked-by: Mark A. Greer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddc80bd781590ef6eb8ce30a0f3ac88c5599e41c Author: Andrew Morton Date: Wed Jun 27 14:10:08 2007 -0700 ext2: fix return of uninitialised variable gcc correctly says fs/ext2/super.c: In function 'ext2_remount': fs/ext2/super.c:1055: warning: 'err' may be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5da44ad504662de8120063bdca46897a15f3f1e5 Author: Alexey Dobriyan Date: Wed Jun 27 14:10:06 2007 -0700 mips-jazz: correct flags for timer io resource arch/mips/jazz/setup.c:55:4: error: Initializer entry defined twice Signed-off-by: Alexey Dobriyan Acked-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33e44b158821cc703f99d43d87579a2fe819ce7b Author: Evgeniy Polyakov Date: Wed Jun 27 14:10:04 2007 -0700 w1_therm_read_bin: don't call flush_signals() This can disrupt userspace signal management. Signed-off-by: Evgeniy Polyakov Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a66e356c04ece4a96f44b942b68234c3de8ec3f5 Author: Masami Hiramatsu Date: Wed Jun 27 14:10:04 2007 -0700 relayfs: fix overwrites When I use relayfs with "overwrite" mode, read() still sets incorrect number of consumed bytes. Signed-off-by: Masami Hiramatsu Acked-by: Tom Zanussi Acked-by: David Wilder Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d62fdebdaf9b866c7e236a8f5cfe90e6dba5773 Author: David Wilder Date: Wed Jun 27 14:10:03 2007 -0700 relay file read: start-pos fix Fix a bug in the relay read interface causing the number of consumed bytes to be set incorrectly. Signed-off-by: Tom Zanussi Signed-off-by: David Wilder Cc: Masami Hiramatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea7fc3336b1d657c65daf55614d4aaadd8c1c244 Author: Randy Dunlap Date: Wed Jun 27 14:10:02 2007 -0700 ALSA: use __devexit_p Change __devexit to __devexit_p: sound/isa/opl3sa2.c:956: error: expected expression before '__attribute__' Signed-off-by: Randy Dunlap Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a465c3239d5b3a5a7361c38fc499ad8082a0685 Author: Stefan Richter Date: Wed Jun 27 14:10:01 2007 -0700 Documentation/HOWTO: update URLs of git trees Also, remove outdated 1394 tree and mention MAINTAINERS as pointer to development trees. Signed-off-by: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74bfe034d62ae71ad896932748de3ec8d1340809 Author: Olaf Hering Date: Wed Jun 27 14:10:00 2007 -0700 fix section mismatch in chipsfb WARNING: drivers/built-in.o(.text+0x8742a): Section mismatch: reference to .init.data:chipsfb_fix (between 'chipsfb_pci_init' and 'chipsfb_set_par') WARNING: drivers/built-in.o(.text+0x87432): Section mismatch: reference to .init.data:chipsfb_fix (between 'chipsfb_pci_init' and 'chipsfb_set_par') WARNING: drivers/built-in.o(.text+0x87442): Section mismatch: reference to .init.data:chipsfb_var (between 'chipsfb_pci_init' and 'chipsfb_set_par') WARNING: drivers/built-in.o(.text+0x8744a): Section mismatch: reference to .init.data:chipsfb_var (between 'chipsfb_pci_init' and 'chipsfb_set_par') init_chips is only called from chipsfb_pci_init chipsfb_fix and chipsfb_var are only referenced from init_chips Signed-off-by: Olaf Hering Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8738c5c5298d55ccfc26383f9f45af082a9be57 Author: Davide Libenzi Date: Wed Jun 27 14:09:59 2007 -0700 avoid spurious POLLIN returns in signalfd The new code in kernel/signal.c does not allow fetching private signals from another task. This patch avoid spurious POLLIN returns from a signalfd poll(2) operation. Signed-off-by: Davide Libenzi Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58e78475ec706f93e0cc049449ffd11fbfdadb3e Author: Jeff Mahoney Date: Wed Jun 27 14:09:58 2007 -0700 saa7134: fix thread shutdown handling This patch changes the test for the thread pid from >= 0 to > 0. When the saa8134 driver initialization fails after a certain point, it goes through the complete shutdown process for the driver. Part of shutting it down includes tearing down the thread for tv audio. The test for tearing down the thread tests for >= 0. Since the dev structure is kzalloc'd, the test will always be true if we haven't tried to start the thread yet. We end up waiting on pid 0 to complete, which will never happen, so we lock up. This bug was observed in Novell Bugzilla 284718, when request_irq() failed. Signed-off-by: Jeff Mahoney Acked-by: Mauro Carvalho Chehab Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53f3bed0a46c786b17f040005b1bd7a78ddd0770 Author: Randy Dunlap Date: Wed Jun 27 14:09:57 2007 -0700 ALSA: fix ice1712 section mismatch Cannot mix const and __initdata: sound/pci/ice1712/prodigy192.c:708: error: ak4114_controls causes a section type conflict Signed-off-by: Randy Dunlap Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92504f79a7c57b853dfb59595fd2860282f6ba1e Author: Randy Dunlap Date: Wed Jun 27 14:09:56 2007 -0700 IOATDMA: fix section mismatches Rename struct pci_driver data so that false section mismatch warnings won't be produced. Sam, ISTM that depending on variable names is the weakest & worst part of modpost section checking. Should __init_refok work here? I got build errors when I tried to use it, probably because the struct pci_driver probe and remove methods are not marked "__init_refok". WARNING: drivers/dma/ioatdma.o(.data+0x10): Section mismatch: reference to .init.text: (between 'ioat_pci_drv' and 'ioat_pci_tbl') WARNING: drivers/dma/ioatdma.o(.data+0x14): Section mismatch: reference to .exit.text: (between 'ioat_pci_drv' and 'ioat_pci_tbl') Signed-off-by: Randy Dunlap Acked-by: Chris Leech Cc: Sam Ravnborg Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59faba1b316a7798a33752b3889193333f8af1a0 Author: Trent Piepho Date: Wed Jun 27 14:09:54 2007 -0700 Fix Kconfig dependency problems wrt boolean menuconfigs If one has a dependency chain (tristate)FOO depends on (bool)BAR depends on (tristate)BAZ, build problems will result. If BAZ=m, then BAR can be set y, which allows FOO=y. It's possible to have FOO=y && BAZ=m, which wouldn't be allowed if FOO depended directly on BAZ. In effect, the bool promotes the tristate from m to y. This ends up causing a problem with several menuconfigs that look like: menuconfig BAR bool depends on BAZ [tristate] if BAR config FOO tristate endif The solution used here is to add the dependencies of BAR to the if statement, so that items in the if block will gain a direct non-bool-promoted dependency on BAZ. This is how it would work if a menu was used instead of an if block. Signed-off-by: Trent Piepho Acked-by: Mauro Carvalho Chehab Cc: "David S. Miller" Acked-by: Jeff Garzik Cc: Dominik Brodowski Cc: Chas Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30acbabae38793c9c9acace4de5b1c1889570768 Author: Hugh Dickins Date: Wed Jun 27 14:09:53 2007 -0700 mm: kill validate_anon_vma to avoid mapcount BUG validate_anon_vma gave a useful check on the integrity of the anon_vma list when Andrea was developing obj rmap; but it was not enabled in SLES9 itself, nor in mainline, until Nick changed commented-out RMAP_DEBUG to configurable CONFIG_DEBUG_VM in 2.6.17. Now Petr Vandrovec reports that its BUG_ON(mapcount > 100000) can easily crash a CONFIG_DEBUG_VM=y system. That limit was just an arbitrary number to protect against an infinite loop. We could raise it to something enormous (depending on sizeof struct vma and size of memory?); but I rather think validate_anon_vma has outlived its usefulness, and is better just removed - which gives a magnificent performance boost to anything like Petr's test program ;) Of course, a very long anon_vma list is bad news for preemption latency, and I believe there has been one recent report of such: let's not forget that, but validate_anon_vma only makes it worse not better. Signed-off-by: Hugh Dickins Cc: Petr Vandrovec Acked-by: Nick Piggin Cc: Andrea Arcangeli Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 172d0496cd22c98ee2e4238821fa309c01685f3a Author: Bjorn Helgaas Date: Wed Jun 27 14:09:52 2007 -0700 PNP SMCf010 quirk: auto-config device if BIOS left it broken Some HP firmware leaves the SMCf010 IRDA device incompletely configured, or reports the wrong resources in _CRS. As a workaround, when we find such a device, try to auto-configure the device. This ignores the _CRS data, picks a config from _PRS, and runs _SRS to configure the device. This makes smsc-ircc2 work correctly with PNP resources (with no preconfiguration!) on all the machines I tested. I think Windows does something like this by default for all devices, so we should consider doing the same thing in Linux. This patch addresses part of the 2.6.22 regression: "no irda0 interface (2.6.21 was OK), smsc does not find chip" It fixes smsc-ircc2 PNP device detection on HP nc6000, nc6220, nw8000, nw8240, and possibly other machines. Signed-off-by: Bjorn Helgaas Cc: Samuel Ortiz Cc: "Linus Walleij (LD/EAB)" Cc: Andrey Borzenkov Cc: Michal Piotrowski Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c31d2f59c14191c3251f18ad1782fe6692f0c33 Author: Bjorn Helgaas Date: Wed Jun 27 14:09:50 2007 -0700 smsc-ircc2: skip preconfiguration for PNP devices If we rely on the device resources from PNPBIOS, we also have to rely on the BIOS to configure any bridges on the way to the device. Using the PNPBIOS resources but changing the configuration of a bridge behind the back of the firmware is likely to make things inconsistent. This patch addresses part of the 2.6.22 regression: "no irda0 interface (2.6.21 was OK), smsc does not find chip" It fixes smsc-ircc2 PNP device detection on HP nx5000 laptops. Other laptops, including HP nc6000, HP nc8000, HP nw8000, and Toshiba Portege 4000, still need PNP quirks to make this work. With "smsc-ircc2.nopnp", we do the legacy device probe, including manual bridge preconfiguration, as before. Signed-off-by: Bjorn Helgaas Cc: Samuel Ortiz Acked-by: "Linus Walleij (LD/EAB)" Cc: Andrey Borzenkov Cc: Michal Piotrowski Cc: "David S. Miller" Cc: Adam Belay Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80581c43d02f66afb2cafa44bef710a2549a1748 Author: Randy Dunlap Date: Wed Jun 27 14:09:49 2007 -0700 mtrr/cyrix: fix sections main.c::mtrr_add() or mtrr_del() [exported] calls main.c::mtrr_add_page() or mtrr_del_page() or mtrr_restore() [resume] calls main.c::set_mtrr() calls main.c::ipi_handler() calls main.c::mtrr_if->set_all() == which can be cyrix_set_all WARNING: arch/i386/kernel/built-in.o(.text+0x8657): Section mismatch: reference to .init.data: (between 'cyrix_set_all' and 'centaur_get_free_region') WARNING: arch/i386/kernel/built-in.o(.text+0x866b): Section mismatch: reference to .init.data: (between 'cyrix_set_all' and 'centaur_get_free_region') WARNING: arch/i386/kernel/built-in.o(.text+0x867e): Section mismatch: reference to .init.data: (between 'cyrix_set_all' and 'centaur_get_free_region') WARNING: arch/i386/kernel/built-in.o(.text+0x8684): Section mismatch: reference to .init.data: (between 'cyrix_set_all' and 'centaur_get_free_region') WARNING: arch/i386/kernel/built-in.o(.text+0x868a): Section mismatch: reference to .init.data: (between 'cyrix_set_all' and 'centaur_get_free_region') Signed-off-by: Randy Dunlap Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2fd89962cd5de6b1fb9c1c789b56bc16f58f121 Author: Randy Dunlap Date: Wed Jun 27 14:09:48 2007 -0700 eventfd: clean compile when CONFIG_EVENTFD=n Fix gcc warning and add parameter checking when CONFIG_EVENTFD=n: fs/aio.c: In function 'aio_complete': fs/aio.c:955: warning: statement with no effect Signed-off-by: Randy Dunlap Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0887eedb4498e20e7895508b7af8e419e397405 Author: Ville Syrjala Date: Wed Jun 27 14:09:46 2007 -0700 atyfb: Fix XCLK frequency on Apple iBook1 Fix a regression on Apple iBook1. Changes in the clock init code caused an incorrect XCLK frequency to be used leading to a corrupted display. Signed-off-by: Ville Syrjala Cc: Olaf Hering Cc: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4c5cdb3e099da7cc64df622b02ff7659babe16e Author: Michael Halcrow Date: Wed Jun 27 14:09:45 2007 -0700 zero out last page for llseek/write When one llseek's past the end of the file and then writes, every page past the previous end of the file should be cleared. Trevor found that the code, as is, does not assure that the very last page is always cleared. This patch takes care of that. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e10f281bca03f45bdec91e67645c394eaec2f8f6 Author: Michael Halcrow Date: Wed Jun 27 14:09:44 2007 -0700 eCryptfs: initialize crypt_stat in setattr Recent changes in eCryptfs have made it possible to get to ecryptfs_setattr() with an uninitialized crypt_stat struct. This results in a wide and colorful variety of unpleasantries. This patch properly initializes the crypt_stat structure in ecryptfs_setattr() when it is necessary to do so. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 240e2df5c740d73fc08cac9989872212deb2d20e Author: Michael Halcrow Date: Wed Jun 27 14:09:44 2007 -0700 eCryptfs: fix write zeros behavior This patch fixes the processes involved in wiping regions of the data during truncate and write events, fixing a kernel hang in 2.6.22-rc4 while assuring that zero values are written out to the appropriate locations during events in which the i_size will change. The range passed to ecryptfs_truncate() from ecryptfs_prepare_write() includes the page that is the object of ecryptfs_prepare_write(). This leads to a kernel hang as read_cache_page() is executed on the same page in the ecryptfs_truncate() execution path. This patch remedies this by limiting the range passed to ecryptfs_truncate() so as to exclude the page that is the object of ecryptfs_prepare_write(); it also adds code to ecryptfs_prepare_write() to zero out the region of its own page when writing past the i_size position. This patch also modifies ecryptfs_truncate() so that when a file is truncated to a smaller size, eCryptfs will zero out the contents of the new last page from the new size through to the end of the last page. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f708dd91d15876e26d7a57f97a255cedffca463 Author: Kumar Gala Date: Thu Jun 28 13:26:06 2007 -0500 phy: Fix phy_id for Vitesse 824x PHY The phy_id specified for the Vitesse 824x PHY would never match because it was expecting bits to be set that would be masked by the phy_id_mask. Fix the phy_id so it will match properly, and changed the mdio_bus_match to mask both the driver and devices phy_id with the mask so we dont have this issue in the future. Signed-off-by: Kumar Gala commit 7dcf5284d12d7b59359a503d35797295f085f327 Author: Dan Williams Date: Mon Jun 18 12:10:33 2007 -0400 [PATCH] libertas: remove private ioctls Signed-off-by: Christoph Hellwig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 18c96c3497aa871608d57ca5e08de3558159a6c9 Author: Dan Williams Date: Mon Jun 18 12:01:12 2007 -0400 [PATCH] libertas: fix WPA associations by handling ENABLE_RSN correctly Don't clobber the firmware's internal state machine by setting ENABLE_RSN more than once during the 4-way handshake. Check what the ENABLE_RSN status is and only set if it should be changed. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit f8f551089b0ca571b8f95465b6c3e1dd7bcea28e Author: Dan Williams Date: Wed May 30 10:12:55 2007 -0400 [PATCH] libertas: kill wlan_scan_process_results Fold into wlan_scan_networks() and protect with debug defines. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit b59bb616636f58ea650d2800a1dfc41c114f5ef8 Author: Dan Williams Date: Mon Jun 18 11:50:43 2007 -0400 [PATCH] libertas: style fixes Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 9f7a60d6e47a70957e5f6676cfe8c83956b08aa6 Author: Qi Yong Date: Thu Jun 28 00:47:10 2007 -0400 Input: atkbd - use printk_ratelimit for spurious ACK messages Signed-off-by: Qi Yong Signed-off-by: Dmitry Torokhov commit da4249c99fd59c4e224e4f9acaf07669d205bb1d Author: Dmitry Torokhov Date: Thu Jun 28 00:46:56 2007 -0400 Input: atkbd - throttle LED switching On some boxes keyboard controllers are too slow to withstand continuous flow of requests to turn keyboard LEDs on and off and start losing some keypresses or even all of them. Delay executing of LED switching request if we had another one within 50 ms thus easing load on the controller. Signed-off-by: Dmitry Torokhov commit 9d9d50bb2efb50594abfc3941a5504b62c514ebd Author: Dmitry Torokhov Date: Thu Jun 28 00:44:27 2007 -0400 Input: i8042 - add HP Pavilion ZT1000 to the MUX blacklist This should get rid of "atkbd.c: Suprious NAK on isa0060/serio0" messages caused by broken MUX implementation. The box does not have external PS/2 ports and, according to documentation, automatically disables touchpad when an external mouse is plugged into a port replicator, so MUX mode would not work anyway. Signed-off-by: Dmitry Torokhov commit 67a32be082035bfc126849df38a8772a96f3e5c0 Author: Stephen Hemminger Date: Tue Jun 26 22:03:04 2007 -0400 remove leftover documentation of acpi_generic_hotkey This looks like leftover text in the kernel parameter in documentation. Signed-off-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit ad5c980fdef0f339eb7c5888525acf9ce33855ec Author: Ian Romanick Date: Wed Jun 27 06:38:00 2007 +1000 Add support SiS based XGI chips to SiS DRM. This adds support for some of the XGI Volari family that are based on the SiS. Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 0db3dc73f7a3a73b0dc725b6a991253f5652c905 Author: Stephen Hemminger Date: Wed Jun 27 00:39:42 2007 -0700 [NETPOLL]: tx lock deadlock fix If sky2 device poll routine is called from netpoll_send_skb, it would deadlock. The netpoll_send_skb held the netif_tx_lock, and the poll routine could acquire it to clean up skb's. Other drivers might use same locking model. The driver is correct, netpoll should not introduce more locking problems than it causes already. So change the code to drop lock before calling poll handler. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 40a1d531f6c894b298e784fd2090d87633e4989a Author: Tejun Heo Date: Wed Jun 27 02:49:38 2007 +0900 libata: kill ATA_HORKAGE_DMA_RW_ONLY ATA_HORKAGE_DMA_RW_ONLY for TORiSAN is verified to be subset of using DMA for ATAPI commands which aren't aligned to 16 bytes. As libata now doesn't use DMA for unaligned ATAPI commands, the horkage is redundant. Kill it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b9a4197e266a40d5d1d16c9fb2a852cf10743afe Author: Tejun Heo Date: Wed Jun 27 02:48:43 2007 +0900 libata: use PIO for non-16 byte aligned ATAPI commands The IDE driver used DMA for ATAPI commands if READ/WRITE command is multiple of sector size or sg command is multiple of 16 bytes. For libata, READ/WRITE sector alignment is guaranteed by the high level driver (sr), so we only have to worry about the 16 byte alignment. This patch makes ata_check_atapi_dma() always request PIO for all data transfer commands which are not multiple of 16 bytes. The following reports are related to this problem. http://bugzilla.kernel.org/show_bug.cgi?id=8605 (confirmed) http://thread.gmane.org/gmane.linux.kernel/476620 (confirmed) https://bugzilla.novell.com/show_bug.cgi?id=229260 (probably) Albert first pointed out the difference between IDE and libata. Kudos to him. Signed-off-by: Tejun Heo Cc: Albert Lee Signed-off-by: Jeff Garzik commit e00f1ff3c8977eff07d0214d2f3478ac947bda0f Author: Tejun Heo Date: Wed Jun 27 02:47:35 2007 +0900 libata: call ata_check_atapi_dma() with qc better prepared In atapi_xlat(), prepare qc better before calling ata_check_atapi_dma() such that ata_check_atapi_dma() can use info from qc. While at it, reformat weird looking if/else block in the function. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 914616a3c2a54504f3b0eda0b67fcd32226b3e83 Author: Tejun Heo Date: Mon Jun 25 21:47:11 2007 +0900 libata: fix infinite EH waiting bug When EH gives up after repeated exceptions, it doesn't't clear the PENDING bit on exit which leaves PENDING bit set without EH actually scheduled. This makes ata_port_wait_eh() to wait forever makes rmmod hang on such port. Fix it by clearing the flag. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 09d7f9b0658072485a93247e1b6e15e661f860d2 Author: Tejun Heo Date: Mon Jun 25 23:34:02 2007 +0900 libata: fix ata_dev_disable() Fix silly condition check bug in ata_dev_disable(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 112cc2b510156494918abdf877111dfd56e5643b Author: Randy Dunlap Date: Mon Jun 25 10:42:22 2007 -0700 pata_it821x: fix section mismatch warning Fix section mismatch when CONFIG_HOTPLUG=n (but functions are used for resume): WARNING: drivers/ata/pata_it821x.o(.text+0x3f): Section mismatch: reference to .init.text: (between 'it821x_reinit_one' and 'it821x_program_udma') WARNING: drivers/ata/pata_it821x.o(.text+0x691): Section mismatch: reference to .init.text: (between 'it821x_init_one' and 'it821x_passthru_set_dmamode') Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 8b5bb2fa3d1c2a90ca921b6bfbb7e2de1e6dd273 Author: Tejun Heo Date: Mon Jun 25 21:43:04 2007 +0900 libata: remove unused variable from ata_eh_reset() Removed unused variable did_followup_srst from ata_eh_reset(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 37301a559d87494614fb843b96b7528532236f82 Author: Tejun Heo Date: Mon Jun 25 20:45:54 2007 +0900 libata: be less verbose about hpa There's no reason to print out hpa related messages when HPA is not active. Kill the unconditional message and add a warning message which is printed if HPA size is smaller than the current size. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8af500bc7f8f1a8822ff451596f818ecb6968f38 Author: Tejun Heo Date: Mon Jun 25 21:11:13 2007 +0900 libata: kill non-sense warning message prereset() is now allowed to set flag for unsupported reset method. EH layer is responsible for selecting the fallback. Remove non-sense warning message. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 55f3952d45a439cecc36fd845a87026d04c82931 Author: Tejun Heo Date: Mon Jun 25 21:31:05 2007 +0900 libata: kill the infamous abnormal status message The infamous abnormal status message triggers on not so abnormal cases including empty port and even when it's being triggered on actual errors the info it provides is redundant and out of context - higher level functions will print the info in better safe later anyway. Also, by being triggered all the time, it leads people to think that the abnormality is somehow related to all ATA and system problems they're experiencing and gives owners of healthy systems unfounded doubts about the integrity of the universe. Make it a DPRINTK and save the universe. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 62877f6b0c4943c2231b84b49182a078eb02a777 Author: Alan Cox Date: Fri Jun 22 14:17:28 2007 +0100 HPT374 is UDMA100 not UDMA133 Propogate change from drivers/ide Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit f9046eb3f64db73f1c5b2a25d2a5983351cd1a04 Author: Olaf Hering Date: Tue Jun 19 22:41:10 2007 +0200 2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined! On Tue, Jun 19, Stephen Hemminger wrote: > Olaf Hering wrote: > > What happend to __ucmpdi2 from David Woodhouse? > > google has a few hits about stuff like this on 32bit powerpc with gcc 4.1.2: > > > > ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined! > > > > using the drivers/net/s2io* files from 2.6.21 with 2.6.22-rc5 fixes the > > compile. > > > > 25805dcf9d83098cf5492117ad2669cd14cc9b24 adds two u64 >>= 48 followed by > > a switch statement (line 2889 and 6816). > > Probably the "switch(err) {" needs a cast to a smaller type (like u8). This change removes the compiler-generated calls to __ucmpdi2. Signed-off-by: Olaf Hering Signed-off-by: Jeff Garzik commit 549f8009830177fe8897fd098a999b647990f30d Author: Divy Le Ray Date: Mon Jun 25 15:19:30 2007 -0700 cxgb3 - fix register to stop bc/mc traffic Use the right register to stop broadcast/multicast traffic. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit d791c2bdf0e7bd71b867210650e00c850b1f7de9 Author: Ralf Baechle Date: Sun Jun 24 15:59:54 2007 +0200 au1000_eth: Fix warnings. Fixed by including : CC drivers/net/au1000_eth.o drivers/net/au1000_eth.c: In function 'au1000_probe': drivers/net/au1000_eth.c:661: warning: implicit declaration of function 'dma_alloc_noncoherent' drivers/net/au1000_eth.c:802: warning: implicit declaration of function 'dma_free_noncoherent' Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 48d8d7ee5dd17c64833e0343ab4ae8ef01cc2648 Author: Siddha, Suresh B Date: Mon Jun 25 15:52:35 2007 -0700 x86_64 irq: use mask/unmask and proper locking in fixup_irqs() Force irq migration path during cpu offline, is not using proper locks and irq_chip mask/unmask routines. This will result in some races(especially the device generating the interrupt can see some inconsistent state, resulting in issues like stuck irq,..). Appended patch fixes the issue by taking proper lock and encapsulating irq_chip set_affinity() with a mask() before and an unmask() after. This fixes a MSI irq stuck issue reported by Darrick Wong. There are several more general bugs in this area(irq migration in the process context). For example, 1. Possibility of missing edge triggered irq. 2. Reliable method of migrating level triggered irq in the process context. We plan to look and close these in the near future. Eric says: In addition even with the fix from Suresh there is still at least one nasty hardware race in fixup_irqs(). However we exercise that code path rarely enough that we are unlikely to hit it in the real world, and that race seems to have existed since the code was merged. And a fix for that is not coming soon as it is an open investigation area if we can fix irq migration to work outside of irq context or if we have to rework the requirements imposed by the generic cpu hotplug and layer on fixup_irqs(). So this may come up again. Signed-off-by: Suresh Siddha Cc: Eric W. Biederman Reported-and-tested-by: Darrick Wong Cc: Andi Kleen Acked-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit c47e285dee9673087273fafcff06a44c58ed4efd Author: Suresh Siddha Date: Mon Jun 25 15:31:37 2007 -0700 x86_64: set the irq_chip name for lapic set the irq_chip name for lapic. Signed-off-by: Suresh Siddha Signed-off-by: Linus Torvalds commit 1ee27a4eedf3cc08245d395936c1bfaf80c074cc Author: Jes Sorensen Date: Mon Jun 18 17:19:05 2007 +0200 [IA64] Make SN2 PCI code use ioremap rather than manually mangle the address This one changes the SN2 specific PCI drivers to use ioremap() for obtaining the real address to access for the PCI registers instead of manually calculating them with __IA64_UNCACHED_OFFSET. The patch should have no real change when running on a normal Linux kernel, but when running as a paravirtualized it is needed. Signed-off-by: Jes Sorenson Signed-off-by: Tony Luck commit c034637967881830979b5415e55578e42f806659 Author: Russ Anderson Date: Thu Jun 14 16:01:24 2007 -0500 [IA64] Force error to surface in nofault code Montecito behaves slightly differently than previous processors, resulting in the MCA due to a failed PIO read to sometimes surfacing outside the nofault code. Adding an additional or and stop bits ensures the MCA surfaces in the nofault code. Signed-off-by: Russ Anderson Signed-off-by: Tony Luck commit eaf6c766446c0faa326b339900f975e6f1f62b01 Author: Dean Nelson Date: Tue Jun 19 06:26:17 2007 -0500 [IA64] change sh_change_coherence oemcall to use nolock Change sn_change_coherence's ia64_sal_oemcall to the nolock variety since PROM does the locking for this function internally. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 2e77ff21d225f7676517ac895df2be8ada573f4f Author: MUNEDA Takahiro Date: Wed Jun 20 13:00:00 2007 +0900 [IA64] remove duplicate header include line Remove duplicate header include line from arch/ia64/kernel/time.c. Signed-off-by: MUNEDA Takahiro Signed-off-by: Tony Luck commit 66fa9b107e259d01929fe647796b3021d3a83c4a Author: Keith Owens Date: Tue Jun 26 16:25:22 2007 +1000 [IA64] Correct unwind validation code Both rp_loc and pfs_loc can be in the register stack area _or_ they can be in the memory stack area, the latter occurs when a struct pt_regs is pushed. Correct the validation check on these fields to check for both stack areas. Not allowing for memory stack locations means no backtrace past ia64_leave_kernel, or any other code that uses PT_REGS_UNWIND_INFO. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 9be26f4c4b138c425598bd3cc50411bd87fce287 Author: vignesh babu Date: Thu Jun 7 15:27:46 2007 +0530 [IA64] is_power_of_2-ia64/mm/hugetlbpage.c Replacing (n & (n-1)) in the context of power of 2 checks with is_power_of_2 Signed-off-by: vignesh babu Signed-off-by: Tony Luck commit 8e15a0e35fdaf19e1aeb7923571e928bd6123cfd Author: Chris Dearman Date: Thu Jun 21 12:59:58 2007 +0100 [MIPS] Count timer interrupts correctly. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 2fae3731b1b02316c219c4556bb7ad3a920f73cc Author: Ralf Baechle Date: Wed Jun 20 14:25:27 2007 +0100 [MIPS] SMTC and non-SMTC kernel and modules are incompatible So don't allow mixing. Signed-off-by: Ralf Baechle commit 3207cd5c4b852b54126f5a4b2564652c64d93a6a Author: Ralf Baechle Date: Mon Jun 18 16:36:11 2007 +0100 [MIPS] EMMA2RH: Disable GEN_RTC, it can't possibly work. Neither rtc_mips_get_time nor rtc_mips_set_time are being initialized by the EMMA2RH setup code, so genrtc at best was a RTC dummy avoiding a few error messages but not providing actual functionality. Signed-off-by: Ralf Baechle commit 8e09ffb60bbc2b49c06718d5a1252860c709a660 Author: Atsushi Nemoto Date: Thu Jun 14 00:56:31 2007 +0900 [MIPS] Remove a duplicated local variable in test_and_clear_bit() Fix a sparse warning caused by 2c921d07f8c641e691b0dfd80a5cfe14c60ec489 include2/asm/bitops.h:313:23: warning: symbol 'res' shadows an earlier one include2/asm/bitops.h:309:16: originally declared here Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a76f3a417a431eaf673323459357d8e684b52c49 Author: Pavel Kiryukhin Date: Tue Jun 5 13:42:20 2007 +0400 [MIPS] use compat_siginfo in rt_sigframe_n32 Signed-off-by: Pavel Kiryukhin Signed-off-by: Ralf Baechle commit c8eae71dc81af15809d87d7aabb94810cea9577d Author: Ralf Baechle Date: Tue Jun 12 13:04:09 2007 +0100 [MIPS] 20K: Handle WAIT related bugs according to errata information We used to avoid the WAIT entirely on the 20K but really only need to do this on early revs of the 20K. Without this a 20K was a bit of a power hog. Well, in the lower power power hog category ;-) Signed-off-by: Ralf Baechle commit b0c10b9f4c4123dfb2f9e0d3df244a402c938561 Author: Ralf Baechle Date: Fri Jun 1 15:47:46 2007 +0100 [MIPS] AP/SP requires shadow registers, auto enable support. Noticed by Chris Dearman (chris@mips.com). Signed-off-by: Ralf Baechle commit b3a04a6d07453664abdf8b36296a640752ad4a70 Author: Yoichi Yuasa Date: Mon May 28 23:26:56 2007 +0900 [MIPS] Fix pb1500 reg B access au_readl() is correct here. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 08a45936823d0c47db9e328185fdaad6c62d16bd Author: Yoichi Yuasa Date: Mon May 28 23:13:50 2007 +0900 [MIPS] Alchemy: Fix wrong cast Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit e460b73c8790bb14959cc99a8eb040e6bd2ecbf0 Author: Yoichi Yuasa Date: Mon May 28 22:54:28 2007 +0900 [MIPS] remove "support for" from system type entry Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 2ec0e59aff1b51ff80c2c544cbef17b7613c8d38 Author: Yoichi Yuasa Date: Mon May 21 23:02:34 2007 +0900 [MIPS] add io_map_base to pci_controller on Cobalt Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 3ca507920d4f618a960aed19609bcce6c4d15387 Author: Ralf Baechle Date: Tue Jun 26 19:37:20 2007 +0200 [MIPS] __ucmpdi2 arguments are unsigned long long. Reported by Eugene Surovegin . Signed-off-by: Ralf Baechle commit 5131a184a3458d9ac47d9eba032cf4c4d3295afd Author: Zach Brown Date: Fri Jun 22 15:14:46 2007 -0700 SCTP: lock_sock_nested in sctp_sock_migrate sctp_sock_migrate() grabs the socket lock on a newly allocated socket while holding the socket lock on an old socket. lockdep worries that this might be a recursive lock attempt. task/3026 is trying to acquire lock: (sk_lock-AF_INET){--..}, at: [] sctp_sock_migrate+0x2e3/0x327 [sctp] but task is already holding lock: (sk_lock-AF_INET){--..}, at: [] sctp_accept+0xdf/0x1e3 [sctp] This patch tells lockdep that this locking is safe by using lock_sock_nested(). Signed-off-by: Zach Brown Signed-off-by: Vlad Yasevich commit a357b8f42e7b85e2522c3ad2b29b685bc28743b4 Author: David S. Miller Date: Tue Jun 26 00:13:31 2007 -0700 [SPARC64]: Need to set state to IDLE during sun4v IRQ enable. This fixes hypervisor console interrupts on LDOM guests. Signed-off-by: David S. Miller commit 1245088400c0e5f93b979356e578c9a8825b953a Author: David S. Miller Date: Tue Jun 26 00:13:09 2007 -0700 [SPARC64]: Fix VIRQ enabling. We were doing the wrong call to turn them on, and also when enabling we need to forcefully set the state to IDLE. Signed-off-by: David S. Miller commit 701271dfd220d214e26ef90c48a2dae3a2042687 Author: David S. Miller Date: Tue Jun 26 00:11:56 2007 -0700 [SPARC64]: Add irqs to mdesc_node. Will be used to store translated LDC rx-ino and tx-ino. Signed-off-by: David S. Miller commit d099321bdbba0d49796841cd9d9faf6b0f0aa658 Author: Luiz Fernando N. Capitulino Date: Thu Jun 21 22:34:23 2007 -0300 USB: ftdio_sio: New IPlus device ID Reported by Grzegorz Chimosz Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 46269db99cc1a618d707deb370d821d1f8d75945 Author: Alexander Gattin Date: Wed Jun 20 00:48:10 2007 +0300 USB: add new device id to option driver Cc: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit 74ac07e8b8209ba9429fa1a9afc07aa5ecef5af8 Author: Oliver Neukum Date: Wed Jun 13 18:50:41 2007 +0200 USB: fix race leading to use after free in io_edgeport usb_unlink_urb() is asynchronous, therefore an URB's buffer may not be freed without waiting for the completion handler. This patch switches to usb_kill_urb(), which is synchronous. Thanks to Alan for making me look at the remaining users of usb_unlink_urb() Signed-off-by: Oliver Neukum Signed-off-by: Al Borchers Signed-off-by: Greg Kroah-Hartman commit 5afeb104e7901168b21aad0437fb51dc620dfdd3 Author: Oliver Neukum Date: Mon Jun 11 15:36:02 2007 +0200 USB: usblcd doesn't limit memory consumption during write usblcd currently has no way to limit memory consumption by fast writers. This is a security problem, as it allows users with write access to this device to drive the system into oom despite resource limits. Here's the fix taken from the modern skeleton driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit fc0f8fc9be654bbff08ede04a49bd8f9805b9e13 Author: Oliver Neukum Date: Tue Jun 12 15:36:07 2007 +0200 USB: memory leak in iowarrior.c this is a classical memory leak in the ioctl handler. The buffer is simply never freed. This fixes it the obvious way. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 944dc184f6fe0dc63633099ba87cb75fe4ee0c51 Author: Oliver Neukum Date: Mon May 7 08:33:18 2007 +0200 USB: ti serial driver sleeps with spinlock held you are submitting an URB with GFP_KERNEL holding a spinlock. In this case the spinlock can be dropped earlier. Signed-off-by: Oliver Neukum Cc: Al Borchers Signed-off-by: Greg Kroah-Hartman commit 8cfbe7e60d9618d8f80a3cd218c45dd64cb9e5cf Author: Oleg Nesterov Date: Wed May 30 11:06:33 2007 -0400 USB: g_file_storage: call allow_signal() New changes in the signal-handling code require compensating changes in g_file_storage. This patch (as913) by Oleg Nesterov makes the code use allow_signal() instead of sigprocmask(). From: Alan Stern Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ae62fbb5f1f796d87cbdbe6701e13f2b52d5c0a7 Author: Paul Mackerras Date: Tue Jun 26 14:49:11 2007 +1000 [POWERPC] Fix subtle FP state corruption bug in signal return on SMP This fixes a bug which can cause corruption of the floating-point state on return from a signal handler. If we have a signal handler that has used the floating-point registers, and it happens to context-switch to another task while copying the interrupted floating-point state from the user stack into the thread struct (e.g. because of a page fault, or because it gets preempted), the context switch code will think that the FP registers contain valid FP state that needs to be copied into the thread_struct, and will thus overwrite the values that the signal return code has put into the thread_struct. This can occur because we clear the MSR bits that indicate the presence of valid FP state after copying the state into the thread_struct. To fix this we just move the clearing of the MSR bits to before the copy. A similar potential problem also occurs with the Altivec state, and this fixes that in the same way. Signed-off-by: Paul Mackerras commit 74609f4536f2b8fd6a48381bbbe3cd37da20a527 Author: Tony Breeds Date: Tue Jun 26 09:50:32 2007 +1000 [POWERPC] Fix VDSO gettimeofday() when called with NULL struct timeval Consider the prototype for gettimeofday(): int gettimofday(struct timeval *tv, struct timezone *tz); Although it is valid to call with /either/ tv or tz being NULL, and the C version of sys_gettimeofday() supports this, the current version of gettimeofday() in the VDSO will SEGV if called with a NULL tv. This adds a check for tv being NULL so that it doesn't SEGV. Signed-off-by: Tony Breeds Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit ca74c013441200b162f6a384b23b833d1865a9e8 Author: Paul Mackerras Date: Tue Jun 26 14:19:35 2007 +1000 [POWERPC] Update defconfigs Signed-off-by: Paul Mackerras commit d30d6badd1769a00bc5a800b8af4e8b3f169c633 Author: will schmidt Date: Sat Jun 23 01:24:56 2007 +1000 [POWERPC] Update g5_defconfig Update the g5_defconfig with default settings. This is to keep things up to date, and specifically to ensure that the CONFIG_MACINTOSH_DRIVERS option is enabled. This also turns on CONFIG_MSI. Signed-off-by: Will Schmidt cc: Michael Ellerman Signed-off-by: Paul Mackerras commit b9e3614f444f6546204f4538afcaa3ebe36d49f2 Author: Björn Steinbrink Date: Mon Jun 25 23:04:37 2007 +0200 fix nmi_watchdog=2 bootup hang wrmsrl() is broken, dropping the upper 32bits of the value to be written. This broke the NMI watchdog on AMD hardware. (and it probably broke other code too.) Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 0c07f6115b779ae4597749d47dec228c6d2d1c7c Author: Nicolas Pitre Date: Wed Jun 20 19:10:34 2007 +0100 [ARM] 4449/1: more entries in arch/arm/boot/.gitignore Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 92c83ff1ce6165bd62cebe4e4d1ca5ccb6f9713b Author: Catalin Marinas Date: Fri Jun 22 14:27:50 2007 +0100 [ARM] 4452/1: Force the literal pool dump before reloc_end In the arch/arm/boot/compressed/head.S file, the contents of the literal pool accumulated during the relocatable code must be dumped before reloc_end. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit da1f95b4c41e09ef96869552db587452e0da46d6 Author: Robin Getz Date: Mon Jun 25 18:05:53 2007 +0800 Blackfin arch: Fix up remaining printks with proper log levels Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit de3025f4e2bc063c274f561f9daf2b696910ad3b Author: Jie Zhang Date: Mon Jun 25 18:04:12 2007 +0800 Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration Add silicon revision "any" and "none". Add proper -mcpu option according to the cpu and silicon revision configuration. Need update to use latest Blackfin cross compile toolchain. Signed-off-by: Jie Zhang Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 189548642c5962e60c3667bdb3a703fe0bed12a6 Author: Linus Torvalds Date: Sun Jun 24 16:21:48 2007 -0700 Linus 2.6.22-rc6 commit a06381fec77bf88ec6c5eb6324457cb04e9ffd69 Author: Thomas Gleixner Date: Sat Jun 23 11:48:40 2007 +0200 FUTEX: Restore the dropped ERSCH fix The return value of futex_find_get_task() needs to be -ESRCH in case that the search fails. This was part of the original futex fixes and got accidentally dropped, when the futex-tidy-up patch was split out. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Stable Team Signed-off-by: Linus Torvalds commit c8cbee61c9d53ee28473ad33bbb54f6a88f5e3af Author: Tian Kevin Date: Sat Jun 23 17:16:52 2007 -0700 ACPI: preserve the ebx value in acpi_copy_wakeup_routine Register %ebx serves as the "global offset table base register" for position-independent code. For absolute code, %ebx serves as a local register and has no specified role in the function calling sequence. In either case, a function must preserve the register value for the caller. acpi_copy_wakeup_routine overrides %ebx without saving it, this may corrupt the called data. Kevin found that most time the value of Sx is saved in %esi, however sometimes compiler also uses %ebx. When this happens, suspends fails since sleep value in ebx is changed by acpi_copy_wakeup_routine. The same funtion in X86_64 doesn't have this problem. Signed-off-by: Zhang Rui Looks-okay-to: Pavel Machek Signed-off-by: Rafael J. Wysocki Cc: Len Brown Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d2861f31474b373ce7754dc5122b414a176c64 Author: Kirill Korotaev Date: Sat Jun 23 17:16:51 2007 -0700 ext4: lost brelse in ext4_read_inode() One of error path in ext4_read_inode() leaks bh since brelse is forgoten. Signed-off-by: Kirill Korotaev Acked-by: Vasily Averin Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4a10a362cd1df6c23fe46f449d36b3f712e2824 Author: Kirill Korotaev Date: Sat Jun 23 17:16:48 2007 -0700 ext3: lost brelse in ext3_read_inode() One of error path in ext3_read_inode() leaks bh since brelse is forgoten. Signed-off-by: Kirill Korotaev Acked-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b018b2888b32284e09bba9cccb5cd2e12199feb Author: Tony Jones Date: Sat Jun 23 17:16:47 2007 -0700 audit: fix oops removing watch if audit disabled Removing a watched file will oops if audit is disabled (auditctl -e 0). To reproduce: - auditctl -e 1 - touch /tmp/foo - auditctl -w /tmp/foo - auditctl -e 0 - rm /tmp/foo (or mv) Signed-off-by: Tony Jones Cc: Al Viro Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 266f5aa0970409bf1ebdf9fc4e65a1186eeed3c2 Author: Carsten Otte Date: Sat Jun 23 17:16:46 2007 -0700 ext2: disallow setting xip on remount Yan Zheng pointed out that ext2_remount lacks checking if -o xip should be enabled or not. This patch checks for presence of direct_access on the backing block device and if the blocksize meets the requirements. Signed-off-by: Carsten Otte Cc: Yan Zheng Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f84e4be53a04a65d97bf0faa0c8f99e29bc0170 Author: Joshua Wise Date: Sat Jun 23 17:16:45 2007 -0700 x86_64: fix misplaced `continue' in mce.c Background: When a userspace application wants to know about machine check events, it opens /dev/mcelog and does a read(). Usually, we found that this interface works well, but in some cases, when the system was taking large numbers of machine check exceptions, the read() would hang. The system would output a soft-lockup warning, and the daemon reading from /dev/mcelog would suck up as much of a single CPU as it could spinning in system space. Description: This patch fixes this bug. In particular, there was a "continue" inside a timeout loop that presumably was intended to break out of the outer loop, but instead caused the inner loop to continue. This patch also makes the condition for the break-out a little more evident by changing a !time_before to a time_after_eq. Result: The read() no longer hangs in this test case. Testing: On my system, I could replicate the bug with the following command: # for i in `seq 15000`; do ./inject_sbe.sh; done where inject_sbe.sh contains commands to inject a single-bit error into the next memory write transaction. Patch: This patch is against git f1518a088bde6aea49e7c472ed6ab96178fcba3e. Signed-off-by: Joshua Wise Signed-off-by: Tim Hockin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8aaf12142d066d3982475d58a9094c85a06a5a9 Author: Andy Whitcroft Date: Sat Jun 23 17:16:44 2007 -0700 update checkpatch.pl to version 0.06 Update to checkpatch.pl v0.06. Of note: - do { and else handled correctly as control structures for { matching - trailing whitespace correctly tripped when line otherwise empty - support for const, including const foo * const bar - multiline macros defining values correctly reported This version of checkpatch.pl can be found at the following URL: http://www.kernel.org/pub/linux/kernel/people/apw/checkpatch/checkpatch.pl-0.06 Full Changelog: Andy Whitcroft (14): Version: 0.06 cleanup the Type regular expression declarations fix up block counting end of line counts as a space for ++ and -- do { needs the same checks as if, for et al handle "const foo * const a" as a valid type add spacing checks following ; complete whitespace lines should trip trailing whitespace check else is also a block control structure badly formatted else can trip function declaration detect and report trailing statements after else types need to be terminated by a boundary multiline macros defining values should be surrounded by parentheses soften the wording of the Signed-off-by: warnings Signed-off-by: Andy Whitcroft Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit debee0768ea1978c6efba03206a414685e4a9ed1 Author: Christoph Lameter Date: Sat Jun 23 17:16:43 2007 -0700 slab allocators: MAX_ORDER one off fix MAX_ORDER is the first order that is not possible. Use MAX_ORDER - 1 to calculate the larges possible object size in slab.h Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71c42157904404a37f89fff3b2536c55115823a5 Author: Dave Hansen Date: Sat Jun 23 17:16:42 2007 -0700 document nlink function These should have been documented from the beginning. Fix it. Signed-off-by: Dave Hansen Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0faa45480261a52323fe88bfab6aea1e8eb87b65 Author: Jonathan Corbet Date: Sat Jun 23 17:16:41 2007 -0700 "volatile considered harmful" Encourage developers to avoid the volatile type class in kernel code. Signed-off-by: Jonathan Corbet Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c18a325645bf98850ca84037fff05de1836e785 Author: Jeff Dike Date: Sat Jun 23 17:16:39 2007 -0700 uml: add asm/paravirt.h Add asm-um/paravirt.h so that i386 headers that get pulled into UML don't cause build failures when they want asm/paravirt.h. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08932a198345c80d20cfa055a45464cebb9ff93b Author: Nick Piggin Date: Sat Jun 23 17:16:37 2007 -0700 uml: use generic BUG Get UML to use the generic bug support rather than arch specific one. If I insert an artificial bug right before loading init, I get this: Kernel panic - not syncing: Kernel mode signal 4 EIP: 0023:[<0819d501>] CPU: 0 Not tainted ESP: 002b:f7fd4fbc EFLAGS: 00000246 Not tainted EAX: 00000000 EBX: 00007870 ECX: 00000013 EDX: 00007870 ESI: 0000786d EDI: 00000011 EBP: f7fd4fd8 DS: 002b ES: 002b 08273bec: [<0806e814>] show_regs+0x104/0x106 08273c08: [<08058927>] panic_exit+0x2c/0x4b 08273c18: [<08080ee7>] notifier_call_chain+0x32/0x5b 08273c38: [<08080fbd>] __atomic_notifier_call_chain+0x30/0x32 08273c54: [<08080fee>] atomic_notifier_call_chain+0x2f/0x31 08273c70: [<08073b88>] panic+0x75/0x131 08273c94: [<080586c7>] relay_signal+0x87/0x95 08273cb0: [<0806b9ee>] sig_handler_common_skas+0x9e/0x120 08273cd8: [<08067738>] sig_handler+0x28/0x4f 08273cec: [<0806792e>] handle_signal+0x53/0x89 08273d0c: [<08069f60>] hard_handler+0x18/0x28 08273d1c: [] transitions+0xf7d598b8/0xfffffff0 With this patch in place, this is how it looks: BUG: failure at init/main.c:779/init_post()! Kernel panic - not syncing: BUG! EIP: 0023:[<081a65d1>] CPU: 0 Not tainted ESP: 002b:f7f0dfbc EFLAGS: 00000246 Not tainted EAX: 00000000 EBX: 000069db ECX: 00000013 EDX: 000069db ESI: 000069d8 EDI: 00000011 EBP: f7f0dfd8 DS: 002b ES: 002b 098efedc: [<0806e9a4>] show_regs+0x104/0x106 098efef8: [<080589c7>] panic_exit+0x2c/0x4b 098eff08: [<080818d7>] notifier_call_chain+0x32/0x5b 098eff28: [<080819ad>] __atomic_notifier_call_chain+0x30/0x32 098eff44: [<080819de>] atomic_notifier_call_chain+0x2f/0x31 098eff60: [<08073f28>] panic+0x75/0x131 098eff84: [<080541d5>] init_post+0xcd/0xe8 098eff9c: [<08048ad4>] kernel_init+0x8e/0x9a 098effb4: [<08066dee>] run_kernel_thread+0x41/0x53 098effe0: [<08058e75>] new_thread_handler+0x62/0x8b 098efffc: [] 0xa55a5a5a [ jdike - added BUG_TABLE to linker script ] Signed-off-by: Nick Piggin Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b08b5ad9473a972fdd5d739080d24a84b23525ac Author: Ingo Korb Date: Sat Jun 23 17:16:35 2007 -0700 Char: stallion, fix oops during init with ISA cards The stallion driver oopses while initializing ISA cards due to an uninitialized variable. This patch changes the initialisation order to match the PCI code path. Signed-off-by: Ingo Korb Acked-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ed2f9c75b719da4f494f24ed2d56d45f5b4959 Author: Ivan Kokshaysky Date: Sat Jun 23 17:16:35 2007 -0700 alpha: fix alignment problem in csum_ipv6_magic() Hopefully this fixes http://bugzilla.kernel.org/show_bug.cgi?id=8635 The struct in6_addr passed to csum_ipv6_magic() is 4 byte aligned, so we can't use the regular 64-bit loads. Since the cost of handling of 4 byte and 1 byte aligned 64-bit data is roughly the same, this code can cope with any src/dst [mis]alignment. Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Cc: Dustin Marquess Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 653d4876b730fedca8473481863cf700245e3582 Author: Andy Whitcroft Date: Sat Jun 23 17:16:34 2007 -0700 update checkpatch.pl to version 0.05 This version brings a some new tests, and a host of changes to fix false positives, of particular note: - detect 'var ++;' and 'var --;' as a bad combination - multistatement #defines are now checked based on statement count - multistatement #defines with initialisation correctly reported - checks the location of the inline keywords - EXPORT_SYMBOL for variables are now understood - typedefs are loosened to handle sparse etc This version of checkpatch.pl can be found at the following URL: http://www.shadowen.org/~apw/public/checkpatch/checkpatch.pl-0.05 Full Changelog: Andy Whitcroft (18): Version: 0.05 macro definition checks should be for a single statement avoid assignements only in if conditionals declarations of function pointers need no space multiline macros which are purely initialisation cannot be wrapped EXPORT_SYMBOL can also directly follow a variable definition check on the location of the inline keyword EXPORT_SYMBOL needs to allow for attributes ensure we do not find C99 // in strings handle malformed #include lines accept the {0,} form typedefs are sensible for defining function pointer parameters ensure { handling correctly handles nested switch() statements trailing whitespace checks are not anchored typedefs for sparse bitwise annotations make sense update the type matcher to include sparse annotations clean up indent and spacing Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92c4ca5c3a5e180e9762438db235f41d192cb955 Author: Christoph Lameter Date: Sat Jun 23 17:16:33 2007 -0700 sched: fix next_interval determination in idle_balance() The intervals of domains that do not have SD_BALANCE_NEWIDLE must be considered for the calculation of the time of the next balance. Otherwise we may defer rebalancing forever. Siddha also spotted that the conversion of the balance interval to jiffies is missing. Fix that to. From: Srivatsa Vaddagiri also continue the loop if !(sd->flags & SD_LOAD_BALANCE). Tested-by: Paul E. McKenney It did in fact trigger under all three of mainline, CFS, and -rt including CFS -- see below for a couple of emails from last Friday giving results for these three on the AMD box (where it happened) and on a single-quad NUMA-Q system (where it did not, at least not with such severity). Signed-off-by: Christoph Lameter Signed-off-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 849663430268db63a9c3c7467984e4e530ded901 Author: Christoph Lameter Date: Sat Jun 23 17:16:32 2007 -0700 SLUB: fix behavior if the text output of list_locations overflows PAGE_SIZE If slabs are allocated or freed from a large set of call sites (typical for the kmalloc area) then we may create more output than fits into a single PAGE and sysfs only gives us one page. The output should be truncated. This patch fixes the checks to do the truncation properly. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e27dbe7746f3bcbcf1f9a37f31df4b886e36ce3 Author: Ben Dooks Date: Sat Jun 23 17:16:31 2007 -0700 SM501: Check SM501 ID register on initialisation When binding the driver, check the ID register for a valid identity, in case the SM501 is not functioning correctly. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffd65af0e67a054e1e2393c9b0995c03c47cdc30 Author: Ben Dooks Date: Sat Jun 23 17:16:31 2007 -0700 SM501: Add Documentation/SM501.txt Add documentation for the SM501 in Documentation/SM501.txt outlining the SM501 driver. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 819062219abf8a78e54cad5c1c8716e6c8e7b870 Author: Ben Dooks Date: Sat Jun 23 17:16:30 2007 -0700 SM501: Clock updates and checks Ensure that the M1XCLK and MCLK are sourced from the same PLL (and refuse to bind the driver if they are not). Update the PCI to safe initialisation values, as 72MHz is the maximum clock for 33MHz PCI bus mastering. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5136237bc392413332b02e69ada158c307da658f Author: Ben Dooks Date: Sat Jun 23 17:16:29 2007 -0700 SM501: Fix sm501_init_reg() mask/set order The order of the set and mask operation in sm501_init_reg() was setting and then masking the bits set. Correct the order so that we do not end up with 288MHz SDRAM clocks on certain systems. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5913bbd2ddebd9c2c6841986c29376e691dd396 Author: Ben Dooks Date: Sat Jun 23 17:16:29 2007 -0700 SM501: initialise SDRAM clock before bus clocks This init sequence of setting the SDRAM clock before the bus clock is recommend by Silicon Motion to stop problems with writes not sticking into registers. Signed-off-by: Vincent Sanders Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 331d74750e69a2202f857d3af9323335d0d6879f Author: Ben Dooks Date: Sat Jun 23 17:16:28 2007 -0700 SM501: suspend support This patch adds support for suspending the core (mfd driver) of the SM501. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ed8a2b3c501bedd4b35130c8a52662ccf78abad Author: Egmont Koblinger Date: Sat Jun 23 17:16:27 2007 -0700 console UTF-8 fixes (fix) Recently my console UTF-8 patch went mainline. Here is an additional patch that fixes two nasty issues and improves a third one, namely: 1. My patch changed the behavior if a glyph is not found in the Unicode mapping table. Previously for Unicode values less than 256 or 512 the kernel tried to display the glyph from that position of the glyph table, which could lead to a different accented letter being displayed. I removed this fallback possibility and changed it to display the replacement symbol. As Behdad pointed out, some fonts (e.g. sun12x22 from the kbd package) lack Unicode mapping information, hence all you get is lots of question marks. Though theoretically it's actually a user-space bug (the font should be fixed), Behdad and I both believe that it'd be good to work around in the kernel by re-introducing the fallback solution for ASCII characters only. This sounds a quite reasonable decision, since all fonts ship the ASCII characters in the first 128 positions. This way users won't be surprised by lots of question marks just because s/he issued a not-so-perfectly parameterized setfont command. As this fallback is only re-introduced for code points below 128, you still won't see an accented letter replaced by another, but at least you'll always get the English letters right. 2. My patch introduced "question mark with inverted color attributes" as a last resort fallback glyph. Though it perfectly works on VGA console, on framebuffer you may end up with question marks that are highlighed but shouldn't be, and normal characters that are accidentally highlighed. This is caused by missing FLUSHes when changing the color attribute. 3. I've updated the table of double-width character based on Markus's updated version. Only ten new code poings (one interval) is added. Signed-off-by: Egmont Koblinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e71e474c784dc274f28ec8bb22a5dbabc6dc7c5 Author: Cedric Le Goater Date: Sat Jun 23 17:16:25 2007 -0700 fix refcounting of nsproxy object when unshared When a namespace is unshared, a refcount on the previous nsproxy is abusively taken, leading to a memory leak of nsproxy objects. Signed-off-by: Cedric Le Goater Cc: Badari Pulavarty Cc: Herbert Poetzl Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d79af701d334777541136e914a9c0969b2ad307 Author: Jean Delvare Date: Sat Jun 23 17:16:24 2007 -0700 hwmon/coretemp: fix a broken error path Signed-off-by: Jean Delvare Cc: Rudolf Marek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b5a60da281c767196427ce8144deae6ec46b389 Author: Olaf Kirch Date: Sat Jun 23 23:11:52 2007 -0700 [NET]: Make skb_seq_read unmap the last fragment Having walked through the entire skbuff, skb_seq_read would leave the last fragment mapped. As a consequence, the unwary caller would leak kmaps, and proceed with preempt_count off by one. The only (kind of non-intuitive) workaround is to use skb_seq_read_abort. This patch makes sure skb_seq_read always unmaps frag_data after having cycled through the skb's paged part. Signed-off-by: Olaf Kirch Signed-off-by: David S. Miller commit 515e06c4556bd8388db6b2bb2cd8859126932946 Author: Shannon Nelson Date: Sat Jun 23 23:09:23 2007 -0700 [NET]: Re-enable irqs before pushing pending DMA requests This moves the local_irq_enable() call in net_rx_action() to before calling the CONFIG_NET_DMA's dma_async_memcpy_issue_pending() rather than after. This shortens the irq disabled window and allows for DMA drivers that need to do their own irq hold. Signed-off-by: Shannon Nelson Signed-off-by: David S. Miller commit ddb61a57bb6df673986e6476407f97d28b02031f Author: Jens Axboe Date: Sat Jun 23 23:07:50 2007 -0700 [TCP] tcp_read_sock: Allow recv_actor() return return negative error value. tcp_read_sock() currently assumes that the recv_actor() only returns number of bytes copied. For network splice receive, we may have to return an error in some cases. So allow the actor to return a negative error value. Signed-off-by: Jens Axboe Signed-off-by: David S. Miller commit 4b2a8fb3a7f7935f62a7bbdc851789fb7c2da032 Author: Konstantin Sharlaimov Date: Sat Jun 23 23:05:54 2007 -0700 [PPP]: Fix osize too small errors when decoding mppe. The mppe_decompress() function required a buffer that is 1 byte too small when receiving a message of mru size. This fixes buffer allocation to prevent this from occurring. Signed-off-by: Konstantin Sharlaimov Signed-off-by: David S. Miller commit 7e4a6da7c2a1e0df06b71dc4ddc31910229ba9d9 Author: David S. Miller Date: Sat Jun 23 23:04:11 2007 -0700 [PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e This can cause packet buffer overflows in certain cases, the real bug will be fixed differently in a followon changeset. Signed-off-by: David S. Miller commit 64beb8f3eb3c724add64ca3272915528e10213c1 Author: Florian Westphal Date: Sat Jun 23 22:59:40 2007 -0700 [TIPC]: Fix infinite loop in netlink handler The tipc netlink config handler uses the nlmsg_pid from the request header as destination for its reply. If the application initialized nlmsg_pid to 0, the reply is looped back to the kernel, causing hangup. Fix: use nlmsg_pid of the skb that triggered the request. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit dbbeb2f9917792b989b6269ebfe24257f9aa1618 Author: Patrick McHardy Date: Sat Jun 23 22:58:34 2007 -0700 [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark secmark doesn't depend on CONFIG_NET_SCHED. Signed-off-by: Patrick McHardy Acked-by: James Morris Signed-off-by: David S. Miller commit d5a3d32a042126f65a008e0e5204ef92ad2ee55d Author: Venkatesh Pallipadi Date: Fri Jun 15 19:36:00 2007 -0400 ACPI: fix 2.6.20 SMP boot regression Always disable/enable interrupts in the acpi idle routine, even in the error path. This is required as the 2.6.20 change in git commit d331e739f5ad2aaa9... "Fix interrupt race in idle callback" expects the idle handler to enable interrupt before returning. There was a case in acpi idle routine, in which interrupt was not being enabled before return, which caused the system to hang at bootup, while enabling C-states on an SMP system. The signature of the hang was that "processor.nocst" was required to enable boot. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit af6f2b2b5ce478d77a34497f9058bc65093c761a Author: Haavard Skinnemoen Date: Sat Jun 23 15:43:48 2007 +0200 [AVR32] Update defconfigs Update defconfigs for ATNGW100 and ATSTK1002. This will enable the SLUB allocator by default on both, and will enable NFS root on ATSTK1002 (ATNGW100 had it enabled before.) Signed-off-by: Haavard Skinnemoen commit 6b84bbfc7133ee493f3e9529a42b5ee53ea69dfe Author: David Brownell Date: Fri Jun 22 19:17:57 2007 -0700 [AVR32] Initialize dma_mask and dma_coherent_mask The current at32ap7000 platform devices aren't declared as supporting DMA, so that layered drivers can't tell whether they need to manage DMA. This patch makes all those platform devices report that they support DMA. Most do, but in a few cases this is inappropriate. Signed-off-by: David Brownell Signed-off-by: Haavard Skinnemoen commit 7f8b9acae8a76fcce5f4af0dfac735a1b7b4fdbf Author: ben.nizette@iinet.net.au Date: Wed Jun 20 20:44:30 2007 +0800 [AVR32] NGW100, Remove relics of the old USART mapping scheme USART mapping used to be accomplished by the manual filling of at32_usart_map[] and at32_nr_usarts. This has now been replaced with at32_map_usart() so we can remove these variables. Signed-off-by: Ben Nizette Signed-off-by: Haavard Skinnemoen commit ab61f7d21ab7f564fce322c498e4a7d6171140db Author: Haavard Skinnemoen Date: Mon Jun 18 14:08:18 2007 +0200 [AVR32] Fix bug in invalidate_dcache_region() If (start + size) is not cacheline aligned and (start & mask) > (end & mask), the last but one cacheline won't be invalidated as it should. Fix this by rounding `end' down to the nearest cacheline boundary if it gets adjusted due to misalignment. Also flush the write buffer unconditionally -- if the dcache wrote back a line just before we invalidated it, the dirty data may be sitting in the write buffer waiting to corrupt our buffer later. Signed-off-by: Haavard Skinnemoen commit 75154f402ef18e459ff97ddece25656b6c2b329c Author: Andi Kleen Date: Sat Jun 23 02:29:25 2007 +0200 x86_64: Ignore compat mode SYSCALL when IA32_EMULATION is not defined Previously a program could switch to a compat mode segment and then execute SYSCALL and it would jump to an uninitialized MSR and crash the kernel. Instead supply a dummy target for this case. Pointed out by Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e2f1f19272f8de0374ad297b9806f8b6509e0013 Author: Olaf Hering Date: Sat Jun 23 02:29:24 2007 +0200 x86_64: Fix only make Macintosh drivers default on Macs Include PPC_MAC in the default too, not only MAC which only covers m68k MACs. Signed-off-by: Olaf Hering Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9d9bbd4d247a674deb43565582151acdc22e90d1 Author: Andi Kleen Date: Sat Jun 23 02:29:23 2007 +0200 i386: Make CMPXCHG64 only dependent on PAE It is only used for PAE kernels in set_64bit. The problem is that due to a old Windows bug many CPUs need magic MSRs to enable CMPXCHG64, and we can't do that nicely early enough before it is potentially used. But since we only need it in PAE kernels so only force the checking for CMPXCHG65 with PAE. This fixes a boot failure on Transmeta Crusoe Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8bfe6d68391af6171df789124fc3dfefeb392d9c Author: Satyam Sharma Date: Fri Jun 22 17:04:27 2007 -0700 [IPV4]: include sysctl.h from inetdevice.h When CONFIG_INET=y and CONFIG_SYSCTL=n: In file included from net/core/netpoll.c:16: include/linux/inetdevice.h:15: error: '__NET_IPV4_CONF_MAX' undeclared here (not in a function) make[2]: *** [net/core/netpoll.o] Error 1 make[1]: *** [net/core] Error 2 make: *** [net] Error 2 So #include sysctl.h from inetdevice.h. Signed-off-by: Satyam Sharma Signed-off-by: David S. Miller commit 6d5b78cdd5a17665674429400b3ed10e3ec60684 Author: YOSHIFUJI Hideaki Date: Fri Jun 22 16:07:04 2007 -0700 [IPV6] NDISC: Fix thinko to control Router Preference support. Bug reported by Haruhito Watanabe . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e2d8e314ad18d4302b3b7ea21ab8b2cb72f2b152 Author: Yasuyuki Kozakai Date: Fri Jun 22 14:10:22 2007 -0700 [NETFILTER]: nfctnetlink: Don't allow to change helper There is no realistic situation to change helper (Who wants IRC helper to track FTP traffic ?). Moreover, if we want to do that, we need to fix race issue by nfctnetlink and running helper. That will add overhead to packet processing. It wouldn't pay. So this rejects the request to change helper. The requests to add or remove helper are accepted as ever. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d258131aaea8a3979f82c0313b9a583130b29981 Author: Jerome Borsboom Date: Fri Jun 22 14:08:17 2007 -0700 [NETFILTER]: nf_conntrack_sip: add missing message types containing RTP info Signed-off-by: Jerome Borsboom Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0864a4e201b1ea442f4c8b887418a29f67e24d30 Author: Arjan van de Ven Date: Wed Jun 20 22:23:21 2007 -0700 Allow DEBUG_RODATA and KPROBES to co-exist Do not mark the kernel text read only if KPROBES is in the kernel; kprobes needs to hot-patch the kernel text to insert it's instrumentation. In this case, only mark the .rodata segment as read only. Signed-off-by: Arjan van de Ven Tested-by: S. P. Prasanna Cc: Andi Kleen Cc: William Cohen Cc: Ian McDonald Signed-off-by: Linus Torvalds commit 58229a18994215bbfe0bcd1c99d2e039f30b076b Author: Thomas Gleixner Date: Thu Jun 21 20:45:15 2007 +0000 posix-timers: Prevent softirq starvation by small intervals and SIG_IGN posix-timers which deliver an ignored signal are currently rearmed in the timer softirq: This is necessary because the timer needs to be delivered again when SIG_IGN is removed. This is not a problem, when the interval is reasonable. With high resolution timers enabled one might arm a posix timer with a very small interval and ignore the signal. This might lead to a softirq starvation when the interval is so small that the timer is requeued onto the softirq pending list right away. This problem was pointed out by Jan Kiszka. Thanks Jan ! The correct solution would be to stop the timer, when the signal is ignored and rearm it when SIG_IGN is removed. Unfortunately this requires modification in sigaction and involves non trivial sighand locking. It's too late in the release cycle for such a change. For now we just keep the timer running and enforce that the timer only fires every jiffie. This does not break anything as we keep the overrun counter correct. It adds a little inaccuracy to the timer_gettime() interface, but... The more complex change is necessary anyway to fix another short coming of the current implementation, which I discovered while looking at this problem: A pending signal is discarded when SIG_IGN is set. In case that a posixtimer signal is pending then it is discarded as well, but when SIG_IGN is removed later nothing rearms the timer. This is not new, it's that way since posix timers have been merged. So nothing to worry about right now. I have a working solution to fix all of this, but the impact is too large for both stable and 2.6.22. I'm going to send it out for review in the next days. This should go into 2.6.21.stable as well. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Jan Kiszka Cc: Ulrich Drepper Cc: Stable Team Signed-off-by: Linus Torvalds commit b9bae3402572dc50a1e084c5b1ae5117918ef0f0 Author: Hugh Dickins Date: Thu Jun 21 23:27:45 2007 +0100 page_mapping must avoid slub pages Nicolas Ferre reports oops from flush_dcache_page() on ARM when using SLUB: which reuses page->mapping as page->slab. The page_mapping() function, used by ARM and PA-RISC flush_dcache_page() implementations, must not confuse SLUB pages with those which have page->mapping set. Signed-off-by: Hugh Dickins Cc: Nicolas Ferre Cc: Christoph Lameter Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 05dc16d6a175139a5872d08db56ee277ec90df5b Author: Randolph Chung Date: Tue Jun 12 14:27:32 2007 +0800 [PARISC] unwinder improvements Add special-case handling for "handle_interruption" so that we can rewind past the interruption. This is useful for seeing what caused a BUG() or WARN_ON(); otherwise the unwind stops at the interruption. Signed-off-by: Randolph Chung Signed-off-by: Kyle McMartin commit e036306aa1832963cd147849b282259a32f5ac08 Author: Randolph Chung Date: Tue Jun 12 14:27:32 2007 +0800 [PARISC] Fix unwinder on 64-bit kernels The unwinder was broken by the shift of PAGE_OFFSET in order to increase the size of the vmalloc area on 64-bit kernels. Signed-off-by: Randolph Chung Signed-off-by: Kyle McMartin commit 06b32f3ab6df4c7489729f94bdc7093c72681d4b Author: Helge Deller Date: Tue Dec 19 19:28:33 2006 +0100 [PARISC] Handle wrapping in expand_upwards() Function expand_upwards() did not guarded against wrapping around to address 0. This fixes the adjtimex02 testcase from the Linux Test Project on a 32bit PARISC kernel. [expand_upwards is only used on parisc and ia64; it looks like it does the right thing on both. --kyle] Signed-off-by: Helge Deller Cc: Tony Luck Signed-off-by: Kyle McMartin commit d2f1c0fa2b346769ac35559ae3bafccf151dd446 Author: Julian Stecklina Date: Mon Jun 18 19:56:28 2007 +0200 [PARISC] stop lcd driver from stripping initial whitespace Signed-off-by: Julian Stecklina Signed-off-by: Kyle McMartin commit c8681f14013d3ad2fc4fb4e30cfd4ea548f7a249 Author: Jack Morgenstein Date: Thu Jun 21 13:39:10 2007 -0700 IB/mlx4: Correct max_srq_wr returned from mlx4_ib_query_device() We need to keep a spare entry in the SRQ so that there always is a next WQE available when posting receives (so that we can tell the difference between a full queue and an empty queue). So subtract 1 from the value HW gives us before reporting the limit on SRQ entries to consumers. Found by Mellanox QA. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 13ef5f44c3931dff1d75443a875e97b588d4b8f0 Author: Roland Dreier Date: Thu Jun 21 13:39:08 2007 -0700 IPoIB/cm: Remove dead definition of struct ipoib_cm_id It's completely unused. Signed-off-by: Roland Dreier commit 82c3aca6ad9004169df8f2f8c0747686fe4003b3 Author: Michael S. Tsirkin Date: Wed Jun 20 19:22:15 2007 +0300 IPoIB/cm: Fix interoperability when MTU doesn't match IPoIB connected mode currently rejects a connection request unless the supported MTU is >= the local netdevice MTU. This breaks interoperability with implementations that might have tweaked IPOIB_CM_MTU, and there's real no longer a reason to do so: this test is just a leftover from when we did not tweak MTU per-connection. Fix this by making the test as permissive as possible. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3ec7393a6858a1716e74aa81be6af76fd180021d Author: Michael S. Tsirkin Date: Tue Jun 19 13:40:41 2007 +0300 IPoIB/cm: Initialize RX before moving QP to RTR Fix a crasher bug in IPoIB CM: once a QP is in the RTR state, a receive completion (or even an asynchronous error) might be observed on this QP, so we have to initialize all of our receive data structures before moving to the RTR state. As an optimization (since modify_qp might take a long time), the jiffies update done when moving RX to the passive_ids list is also left in place to reduce the chance of the RX being misdetected as stale. This fixes bug . Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 24bce5080306bd5255cbda3d6b09a29d5515b470 Author: Roland Dreier Date: Thu Jun 21 11:05:58 2007 -0700 IB/umem: Fix possible hang on process exit If ib_umem_release() is called after ib_uverbs_close() sets context->closing, then a process can get stuck in a D state, because the code boils down to if (down_write_trylock(&mm->mmap_sem)) down_write(&mm->mmap_sem); which is obviously a stupid instant deadlock. Fix the code so that we only try to take the lock once. This bug was introduced in commit f7c6a7b5 ("IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules") which fortunately never made it into a release, and was reported by Pete Wyckoff . Signed-off-by: Roland Dreier commit 47d46379eb66278107947729e34a833c76dca252 Author: Wang Zhenyu Date: Thu Jun 21 13:43:18 2007 +0800 [AGPGART] intel_agp: don't load if no IGD and AGP port After i915 chip, GMCH has no AGP port. Origin bridge driver in device table will try to access illegal regs like APBASE, APSIZE, etc. This may cause problem. So mark them as NULL in the table, we won't load if no IGD got detect and bridge has no AGP port. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 216e39db112da4d25a52aeb956e7da70fdd0d94c Author: Mike Frysinger Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: add proper const volatile to addr argument to the read functions Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 334280fff3f7201d0fd564fe85e0a6f035ce3f68 Author: Sonic Zhang Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: Add definition of dma_mapping_error Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit b9b712765738d141154b435a5bfec4adbbee25f3 Author: Mike Frysinger Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: move cond_syscall() behind __KERNEL__ like all other architectures Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 86b73c8cfc8daeff554ae3e95e2a0ee77c45d499 Author: Robin Getz Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: match kernel startup messaage with new linker script Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 9c8f1729b0a838dc0f44b77dab80890a98585964 Author: Mike Frysinger Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: add missing braces around array bfin serial init Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit c5d88d9e2566e7ddccb0e001446b9a39882560a3 Author: Robin Getz Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: update printk to use KERN_EMERG and reformat crash output to look like: return address: [0x0357fcc4]; contents of: 0x0357fca0: fcbc 0357 fe20 0357 0009 0000 6a8c 0345 0x0357fcb0: 000e 0000 fcc4 0357 fd44 0357 e128 00ad 0x0357fcc0: 00a0 0000 [000e] 0000 0000 0000 0080 0000 0x0357fcd0: 0000 0000 0000 0000 00a0 0000 000e 0000 instruction in [] is the offending instruction Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 4bf3f3cbb6add01d3e6a18c73f594b73113b14f2 Author: Robin Getz Date: Thu Jun 21 11:34:16 2007 +0800 Blackfin arch: update ANOMALY handling update lists for 533, 537, and add SSYNC workaround into assembly files. Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 5fe675e2b3e41349deb0c81667065b9cb229ea1d Author: Stas Sergeev Date: Wed Jun 20 22:42:13 2007 +0400 fix module_param mistake in it821x The attached patch fixes a trivial mistake in a MODULE_PARAM_DESC of pata_it821x driver. The parameter name in MODULE_PARAM_DESC should match the one in module_param_named. Signed-off-by: Stas Sergeev Signed-off-by: Jeff Garzik commit a3d2cc5e742f82a87fdf9e2b730f41ff381c0a73 Author: Tejun Heo Date: Tue Jun 19 18:52:56 2007 +0900 ahci: fix PORTS_IMPL override If PORTS_IMPL register is zero, ahci initialize it to full mask corresponding to nr_ports in the CAP register. hpriv->cap, which is initialized at the end of the function, is incorrectly used as value of CAP causing ahci to always override PORTS_IMPL to 0x1 if it's zero. Fix it. This fixes a bug where early ich6 ahci can only access the first port. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3fae450c68d06b8890e1530bdd0910e938e7251d Author: Henrik Kretzschmar Date: Tue Jun 19 10:10:50 2007 +0200 kerneldoc fix in libata Fix parameter name from ata_dev_reread_id() in libata-core.c for kerneldoc. Signed-off-by: Henrik Kretzschmar Signed-off-by: Jeff Garzik commit 2f8fcebbf5c8dd2ee7eb5711c03318c011d50d39 Author: Tejun Heo Date: Mon Jun 18 14:38:41 2007 +0900 libata: more NONCQ devices More for the NCQ blacklist. One hitachi and one raptor. Other members of these families of drives are already on the list, so no surprises. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 374abf2cb16a9df8be96675c606996458872e8b3 Author: Bartlomiej Zolnierkiewicz Date: Mon Jun 11 11:40:07 2007 +0200 pata_it821x: (partially) fix DMA in RAID mode Code intended to check DMA status was checking DMA command register. Moreover firmware seems to "forget" to set DMA capable bit for the slave device (at least in RAID mode but without ITE RAID volumes) so check device ID for DMA capable bit when deciding whether to use DMA and remove DMA status check completely. Thanks to Pavol Simo for the bugreport and testing the initial fix. This change unfortunately still doesn't fix DMA in RAID mode (which works fine with IDE it821x) but Alan is working on the missing pieces (pata_it821x vs libata EH issues). Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox Cc: Tejun Heo Signed-off-by: Jeff Garzik commit 9f7897554eeca34ec23dd877cc27402bd327a1ce Author: Peer Chen Date: Thu Jun 7 18:23:12 2007 +0800 PATA: Add the MCP73/77 support to PATA driver Add the MCP73/MCP77 support to PATA driver. The patch base on kernel 2.6.22-rc4 Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 2090dee420911045258d50239dc2c527e4b1dd06 Author: Divy Le Ray Date: Wed May 30 10:01:50 2007 -0700 cxgb3 - MAC watchdog update Fix variables initialization and usage in the MAC watchdog. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 7b581a0fa85464f7f765b9a66f612e7ec4ab17f9 Author: Divy Le Ray Date: Wed May 30 10:01:44 2007 -0700 cxgb3 - Stop mac RX when changing MTU Rx traffic needs to be halted when the MTU is changed to avoid a potential chip hang. Reset/restore MAC filters around a MTU change. Also fix the pause frames high materwark setting. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit c706bfb52afc9b5d115f61a8e1c0c30540feb3f4 Author: Divy Le Ray Date: Wed May 30 10:01:39 2007 -0700 cxgb3 - Fix direct XAUI support Check all lanes for link status on direct XAUI cards. Don't assume that direct XAUI always uses XGMAC 1. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 890de332834a95450a74e5f615f4f9a0fa564623 Author: Divy Le Ray Date: Wed May 30 10:01:34 2007 -0700 cxgb3 - fix netpoll hanlder Fix netpoll handler to work with line interrupt, msi and msi-x. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit e360b5628f1d040c0e96dd9ee011196645e08aef Author: Divy Le Ray Date: Wed May 30 10:01:29 2007 -0700 cxgb3 - fix skb->dev dereference eth_type_trans() now sets skb->dev. References to skb->dev should happen after it is called. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit d41f2d17f863fcd9496748135967e71551d5873d Author: Gregory Haskins Date: Fri Jun 15 17:17:50 2007 -0400 natsemi irq flags The spinlock irq flags should be a unsigned long to properly support 64 bit Signed-off-by: Gregory Haskins Signed-off-by: Jeff Garzik commit 2cc49a5ca14348f225beb888ad383064f2a96876 Author: Tim Mann Date: Thu Jun 14 13:16:38 2007 -0700 forcedeth: use unicast receive mode for WoL I happened to notice that a system with an NVidia NIC using the forcedeth driver won't wake-on-LAN if the interface was in promiscuous mode when you power off. By experiment, it looks like the hardware needs to have NvRegPacketFilterFlags set to NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR (i.e., receive unicast packets to my address) in order for WoL to work. Jeff Garzik writes: "NVIDIA says the patch looks OK." I didn't venture to insert a signed-off-by line with his name on it, though. Signed-off-by: Tim Mann Signed-off-by: Jeff Garzik commit d46146274b2dc01fac4063d31393385117d31f58 Author: Martin Schwidefsky Date: Wed Jun 20 13:03:57 2007 +0200 s390: netiucv inlining cleanup The recent iucv rework patches re-introduced some unnecessary inlines. Remove them again. Signed-off-by: Frank Pavlic Signed-off-by: Martin Schwidefsky Signed-off-by: Jeff Garzik commit bfac0d0b6c6e20933b46f53a964c130f2f2bfa85 Author: Thomas Gleixner Date: Wed Jun 20 13:02:55 2007 +0200 s390: netiucv spinlock initializer cleanup spinlock initializer cleanup in netiucv.c Signed-off-by: Thomas Gleixner Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5 Author: Ursula Braun Date: Wed Jun 20 13:01:30 2007 +0200 s390: don't call iucv_path_connect from tasklet context net/iucv/iucv.c creates the requirement for iucv_path_connect not to be called from tasklet context anymore. An extra checking is added in case of a failing netiucv_tx to fulfil this requirement for netiucv. Signed-off-by: Ursula Braun Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit dc5bc0cabd1003b4fa358f0d54dfdc46585efb57 Author: Cornelia Huck Date: Wed Jun 20 13:00:20 2007 +0200 s390: Use ccw_device_get_id() in qeth/claw drivers Use ccw_device_get_id() to get a device number instead of parsing the ccw device's bus id. Signed-off-by: Cornelia Huck Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit cd3e76ebcb41c48ef6e706006b793d45030bae75 Author: Frank Pavlic Date: Wed Jun 20 12:59:14 2007 +0200 s390: qeth: wrong packet length in qdio header Packets Length in qdio header is broken when using EDDP on Layer2 devices. This leads to skb_under_panic on receiver system when running on z/VM GuestLAN devices. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit add3f2fa7a6cec16d35a95b9078e1ecc80a6f332 Author: Ursula Braun Date: Wed Jun 20 12:58:02 2007 +0200 s390: avoid inconsistent lock state in qeth ipv6_regen_rndid in net/ipv6/addrconf.c makes use of "write_lock_bh" for its inet6_dev->lock. It may run in softirq-context. qeth makes use of "read_lock" for the same inet6_dev->lock. To avoid a potential deadlock situation, qeth should make use of "read_lock_bh" for its usages of inet6_dev->lock. Signed-off-by: Ursula Braun Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit d81ef0fb76ef2eb7126f64cb34217d2ddfb48483 Author: Ursula Braun Date: Wed Jun 20 12:56:49 2007 +0200 s390: qeth driver does not recover While first recovery continues, the card issues a STARTLAN command itself. In this case qeth schedules another recovery. This second recovery is cancelled because of an already running first recovery. Stop first recovery in case of 0xe080. Signed-off-by: Ursula Braun Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit d78f6642bea3b8f064dcb9a17db58593ef8cc0fb Author: Ursula Braun Date: Wed Jun 20 12:55:18 2007 +0200 s390: print correct level for HiperSockets devices For real HiperSockets the EBCDIC-ASCII conversion is not necessary. This is only needed for z/VM GuestLAN devices. Signed-off-by: Ursula Braun Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 031ae4deb095a1f18a842740459c5ae184ec931c Author: Jay Vosburgh Date: Wed Jun 13 22:11:34 2007 -0700 bonding: Fix 802.3ad no carrier on "no partner found" instance Modify carrier state determination for 802.3ad mode to comply with section 43.3.9 of IEEE 802.3, which requires that "Links that are not successful candidates for aggregation (e.g., links that are attached to other devices that cannot perform aggregation or links that have been manually configured to be non-aggregatable) are enabled to operate as individual IEEE 802.3 links." Bug reported by Laurent Chavey . This patch is an updated version of his patch that changes the wording of commentary and adds an update to the driver version. Signed-off-by: Jay Vosburgh Signed-off-by: Laurent Chavey Signed-off-by: Jeff Garzik commit 3201e656ce56ed02e9501906c18ffe16ae350a52 Author: Jay Vosburgh Date: Tue Jun 19 11:12:12 2007 -0700 bonding: Fix use after free in unregister path The following patch (based on a patch from Stephen Hemminger ) removes use after free conditions in the unregister path for the bonding master. Without this patch, an operation of the form "echo -bond0 > /sys/class/net/bonding_masters" would trigger a NULL pointer dereference in sysfs. I was not able to induce the failure with the non-sysfs code path, but for consistency I updated that code as well. I also did some testing of the bonding /proc file being open while the bond is being deleted, and didn't see any problems there. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 3a2c892daaf54b31a70785c2821771e8094188ed Author: Stephen Hemminger Date: Mon Jun 11 13:35:23 2007 -0500 spidernet: checksum and ethtool It doesn't look like spidernet hardware can really checksum all protocols, the code looks like it does IPV4 only. If so, it should use NETIF_F_IP_CSUM instead of NETIF_F_HW_CSUM. The driver doesn't need it's own get/set for ethtool tx csum, and it should use the standard ethtool_op_get_link. Signed-off-by: Stephen Hemminger Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 128c6e2e519fe7d0a15de04f3dde00700145cec4 Author: Linas Vepstas Date: Mon Jun 11 13:29:03 2007 -0500 spidernet: turn off descriptor chain end interrupt. At some point, the transmit descriptor chain end interrupt (TXDCEINT) was turned on. This is a mistake; and it damages small packet transmit performance, as it results in a huge storm of interrupts. Turn it off. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit c3d1182a538fd99b6fe5effa1ab54521c0efb1d1 Author: Linas Vepstas Date: Mon Jun 11 13:26:50 2007 -0500 spidernet: silence the ramfull messages Although the previous patch resolved issues with hangs when the RX ram full interrupt is encountered, there are still situations where lots of RX ramfull interrupts arrive, resulting in a noisy log in syslog. There is no need for this. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 2bf27a0d4913a5f0ef38e3be510b1b3add2869ad Author: Linas Vepstas Date: Mon Jun 11 13:23:42 2007 -0500 spidernet: Don't terminate the RX ring The terminated RX ring will cause trouble during the RX ram full conditions, leading to a hung driver, as the hardware can't find the next descr. There is no real reason to terminate the RX ring; it doesn't make the operation any smooother, and it does require an extra sync. So don't do it. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 4c4bd5a97a87670d2c368ed4ed8a8f2c93080605 Author: Linas Vepstas Date: Mon Jun 11 13:21:13 2007 -0500 spidernet: Cure RX ram full bug This patch fixes a rare deadlock that can occur when the kernel is not able to empty out the RX ring quickly enough. Below follows a detailed description of the bug and the fix. As long as the OS can empty out the RX buffers at a rate faster than the hardware can fill them, there is no problem. If, for some reason, the OS fails to empty the RX ring fast enough, the hardware GDACTDPA pointer will catch up to the head, notice the not-empty condition, ad stop. However, RX packets may still continue arriving on the wire. The spidernet chip can save some limited number of these in local RAM. When this local ram fills up, the spider chip will issue an interrupt indicating this (GHIINT0STS will show ERRINT, and the GRMFLLINT bit will be set in GHIINT1STS). When te RX ram full condition occurs, a certain bug/feature is triggered that has to be specially handled. This section describes the special handling for this condition. When the OS finally has a chance to run, it will empty out the RX ring. In particular, it will clear the descriptor on which the hardware had stopped. However, once the hardware has decided that a certain descriptor is invalid, it will not restart at that descriptor; instead it will restart at the next descr. This potentially will lead to a deadlock condition, as the tail pointer will be pointing at this descr, which, from the OS point of view, is empty; the OS will be waiting for this descr to be filled. However, the hardware has skipped this descr, and is filling the next descrs. Since the OS doesn't see this, there is a potential deadlock, with the OS waiting for one descr to fill, while the hardware is waiting for a differen set of descrs to become empty. A call to show_rx_chain() at this point indicates the nature of the problem. A typical print when the network is hung shows the following: net eth1: Spider RX RAM full, incoming packets might be discarded! net eth1: Total number of descrs=256 net eth1: Chain tail located at descr=255 net eth1: Chain head is at 255 net eth1: HW curr desc (GDACTDPA) is at 0 net eth1: Have 1 descrs with stat=xa0800000 net eth1: HW next desc (GDACNEXTDA) is at 1 net eth1: Have 127 descrs with stat=x40800101 net eth1: Have 1 descrs with stat=x40800001 net eth1: Have 126 descrs with stat=x40800101 net eth1: Last 1 descrs with stat=xa0800000 Both the tail and head pointers are pointing at descr 255, which is marked xa... which is "empty". Thus, from the OS point of view, there is nothing to be done. In particular, there is the implicit assumption that everything in front of the "empty" descr must surely also be empty, as explained in the last section. The OS is waiting for descr 255 to become non-empty, which, in this case, will never happen. The HW pointer is at descr 0. This descr is marked 0x4.. or "full". Since its already full, the hardware can do nothing more, and thus has halted processing. Notice that descrs 0 through 254 are all marked "full", while descr 254 and 255 are empty. (The "Last 1 descrs" is descr 254, since tail was at 255.) Thus, the system is deadlocked, and there can be no forward progress; the OS thinks there's nothing to do, and the hardware has nowhere to put incoming data. This bug/feature is worked around with the spider_net_resync_head_ptr() routine. When the driver receives RX interrupts, but an examination of the RX chain seems to show it is empty, then it is probable that the hardware has skipped a descr or two (sometimes dozens under heavy network conditions). The spider_net_resync_head_ptr() subroutine will search the ring for the next full descr, and the driver will resume operations there. Since this will leave "holes" in the ring, there is also a spider_net_resync_tail_ptr() that will skip over such holes. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 83d35145c443d8394aaf1743301e79fa0a8054d7 Author: Linas Vepstas Date: Mon Jun 11 13:17:02 2007 -0500 spidernet: null out skb pointer after its been used. Avoid kernel crash in mm/slab.c due to double-free of pointer. If the ethernet interface is brought down while there is still RX traffic in flight, the device shutdown routine can end up trying to double-free an skb, leading to a crash in mm/slab.c Avoid the double-free by nulling out the skb pointer. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 24315c5e6f508edd84e996d67daef3d1bcc72f8b Author: Kristian Høgsberg Date: Wed Jun 20 17:48:07 2007 -0400 firewire: Only set client->iso_context if allocation was successful. This patch fixes an OOPS on cdev release for an fd where iso context creation failed. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit 8acff0a2449aeda37204c4074976bf79f21968e3 Author: Li Yang Date: Wed Jun 20 20:23:34 2007 +0800 Fix up CREDIT entry ordering Reorder my CREDIT entry to make it in alphabetic order by last name. Signed-off-by: Li Yang Signed-off-by: Linus Torvalds commit bf8c4817427de0744e9c008d3ad5a7635e41e397 Author: Yinghai Lu Date: Wed Jun 20 12:23:39 2007 +0200 x86_64: fix link warning between for .text and .init.text WARNING: arch/x86_64/kernel/built-in.o(.text+0xace9): Section mismatch: reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr') WARNING: arch/x86_64/kernel/built-in.o(.text+0xad09): Section mismatch: reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr') WARNING: arch/x86_64/kernel/built-in.o(.text+0xad38): Section mismatch: reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr') WARNING: drivers/built-in.o(.text+0x3a680): Section mismatch: reference to .init.text:acpi_map_pxm_to_node (between 'acpi_get_node' and 'acpi_lock_ac_dir') AK: also marked mtrr_bp_init __init to avoid some more warnings Signed-off-by: Yinghai Lu Signed-off-by: Andi Kleen Acked-by: Jan Beulich Signed-off-by: Linus Torvalds commit 018d2ad0cccfa9bb8bee1d160c353e568484a137 Author: Andi Kleen Date: Wed Jun 20 12:23:36 2007 +0200 x86: change_page_attr bandaids - Disable CLFLUSH again; it is still broken. Always do WBINVD. - Always flush in the i386 case, not only when there are deferred pages. These are both brute-force inefficient fixes, to be improved next release cycle. The changes to i386 are a little more extensive than strictly needed (some dead code added), but it is more similar to the x86-64 version now and the dead code will be used soon. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 55181000cd60334fe920c65ffbcdfe0e3f1de406 Author: Andi Kleen Date: Wed Jun 20 12:23:35 2007 +0200 x86: Disable KPROBES with DEBUG_RODATA for now Right now Kprobes cannot write to the write protected kernel text when DEBUG_RODATA is enabled. Disallow this in Kconfig for now. Temporary fix for 2.6.22. In .23 add code to temporarily unprotect it. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9f1f79e641c548ee93fb20f69c9a404b92ee4fdd Author: Andi Kleen Date: Wed Jun 20 12:23:34 2007 +0200 x86: Only make Macintosh drivers default on Macs It's already annoying that they appear on x86 now -- that's for the 3button emulation needed on x86 macs -- but at least don't make them default. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0e52d3281f8aa6486949478ea95c8ca85c3ffab5 Author: Andi Kleen Date: Wed Jun 20 12:23:33 2007 +0200 x86_64: Quieten Atari keyboard warnings in Kconfig Not directly related to x86, but I got tired of seeing these warnings on every kconfig update when building on a non m68k box: drivers/input/keyboard/Kconfig:170:warning: 'select' used by config symbol 'KEYBOARD_ATARI' refers to undefined symbol 'ATARI_KBD_CORE' drivers/input/mouse/Kconfig:182:warning: 'select' used by config symbol 'MOUSE_ATARI' refers to undefined symbol 'ATARI_KBD_CORE' I moved the definition of ATARI_KBD_CORE into drivers/input/keyboard/Kconfig so it's always seen by Kconfig. Cc: Geert Uytterhoeven Acked-by: Roman Zippel Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 388c19e176436707eb30a81c7e4129e08769f92b Author: Andi Kleen Date: Wed Jun 20 12:23:32 2007 +0200 x86: Disable DAC on VIA bridges Several reports that VIA bridges don't support DAC and corrupt data. I don't know if it's fixed, but let's just blacklist them all for now. It can be overwritten with iommu=usedac Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0b622330213ce0f0ee23199e433ed73284209b46 Author: Andi Kleen Date: Wed Jun 20 12:23:31 2007 +0200 x86_64: Fix eventd/timerfd syscalls They had the same syscall number. Pointed out by Davide Libenzi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e412ac4971d27ea84f3d63ce425c6ab2d6a67f23 Author: Andi Kleen Date: Wed Jun 20 12:23:30 2007 +0200 x86_64: Fix readahead/sync_file_range/fadvise64 compat calls Correctly convert the u64 arguments from 32bit to 64bit. Pointed out by Heiko Carstens. I guess this proves Linus' theory that nobody uses the more exotic Linux specific syscalls. It wasn't discovered by a user. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 Author: Ralf Baechle Date: Wed Jun 20 22:27:10 2007 +0100 [MIPS] Don't drag a platform specific header into generic arch code. For some platforms it's definitions may conflict. So that's the one-liner. The rest is 10 square kilometers of collateral damage fixup this include used to paper over. Signed-off-by: Ralf Baechle commit c5f226c7e95bf318879fb6ae02fc0dfb0f6d408c Author: Tony Breeds Date: Wed Jun 20 15:17:29 2007 +1000 [POWERPC] Fix powermac late initcall to only run on powermac Current ppc64_defconfig kernel fails to boot on iSeries, dying with: Unable to handle kernel paging request for data at address 0x00000000 Faulting instruction address: 0xc00000000071b258 Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=32 iSeries NIP [c00000000071b258] .iSeries_src_init+0x34/0x64 LR [c000000000701bb4] .kernel_init+0x1fc/0x3bc Call Trace: [c000000007d0be30] [0000000000008000] 0x8000 (unreliable) [c000000007d0bea0] [c000000000701bb4] .kernel_init+0x1fc/0x3bc [c000000007d0bf90] [c0000000000262d4] .kernel_thread+0x4c/0x68 Instruction dump: e922cba8 3880ffff 78840420 f8010010 f821ff91 60000000 e8090000 78095fe3 4182002c e922cb58 e862cbb0 e9290140 f8410028 7c0903a6 e9690010 Kernel panic - not syncing: Attempted to kill init! This happens because some powermac code unconditionally sets ppc_md.progress to NULL. This patch makes sure the powermac late initcall is only run on powermac machines. Signed-off-by: Tony Breeds Signed-off-by: Paul Mackerras commit 9ba4ace39fdfe22268daca9f28c5df384ae462cf Author: Segher Boessenkool Date: Wed Jun 20 01:07:04 2007 +1000 [POWERPC] PowerPC: Prevent data exception in kernel space (32-bit) The "is_exec" branch of the protection check in do_page_fault() didn't do anything on 32-bit PowerPC. So if a userland program jumps to a page with Linux protection flags "---p", all the tests happily fall through, and handle_mm_fault() is called, which in turn calls handle_pte_fault(), which calls update_mmu_cache(), which goes flush the dcache to a page with no access rights. Boom. This fixes it. Signed-off-by: Segher Boessenkool Cc: Johannes Berg Signed-off-by: Paul Mackerras commit 7c8545e98468c53809fc06788a3b9a34dff05240 Author: Li Yang Date: Mon Jun 18 19:29:21 2007 +0800 [POWERPC] rheap - eliminates internal fragments caused by alignment The patch adds fragments caused by rh_alloc_align() back to free list, instead of allocating the whole chunk of memory. This will greatly improve memory utilization managed by rheap. It solves MURAM not enough problem with 3 UCCs enabled on MPC8323. Signed-off-by: Li Yang Acked-by: Joakim Tjernlund Signed-off-by: Kumar Gala commit 186e234358ba29a4094d0c8c0d3ea00f84d32a3e Author: Neil Horman Date: Mon Jun 18 19:59:16 2007 -0400 SCTP: Fix sctp_getsockopt_get_peer_addrs This is the split out of the patch that we agreed I should split out from my last patch. It changes space_left to be computed in the same way the to variable is. I know we talked about changing space_left to an int, but I think size_t is more appropriate, since we should never have negative space in our buffer, and computing using offsetof means space_left should now never drop below zero. Signed-off-by: Neil Horman Acked-by: Sridhar Samudrala Signed-off-by: Vlad Yasevich commit 408f22e81ea2fcf96c80e85ee12d20ef5148bf7c Author: Neil Horman Date: Sat Jun 16 14:03:45 2007 -0400 SCTP: update sctp_getsockopt helpers to allow oversized buffers I noted the other day while looking at a bug that was ostensibly in some perl networking library, that we strictly avoid allowing getsockopt operations to complete if we pass in oversized buffers. This seems to make libraries like Perl::NET malfunction since it seems to allocate oversized buffers for use in several operations. It also seems to be out of line with the way udp, tcp and ip getsockopt routines handle buffer input (since the *optlen pointer in both an input and an output and gets set to the length of the data that we copy into the buffer). This patch brings our getsockopt helpers into line with other protocols, and allows us to accept oversized buffers for our getsockopt operations. Tested by me with good results. Signed-off-by: Neil Horman Acked-by: Sridhar Samudrala Signed-off-by: Vlad Yasevich commit dc74d7f996b465d8a95033c753d34c8b4c01c9d7 Author: Heiko Carstens Date: Tue Jun 19 13:10:06 2007 +0200 [S390] Move psw_set_key. Move psw_set_key() from ptrace.h to processor.h which is a more suitable place for it. In addition the moves makes the function invisible to user space. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit bca0fb8683b7406d3056dc53a14b0a482c367e2b Author: Heiko Carstens Date: Tue Jun 19 13:10:05 2007 +0200 [S390] Add oops_enter()/oops_exit() calls to die(). This is mainly to switch off all potentially debugging stuff that won't report anything useful after an oops happened. Besided that setting pause_on_oops will work too, but doesn't make too much sense on s390. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 0fc9bbf771ce7d41ed33300e75e74e922dde1c38 Author: Heiko Carstens Date: Tue Jun 19 13:10:04 2007 +0200 [S390] Print list of modules on die(). Print list of modules on die() like a lot of other architectures do. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 84b36a8e0c863aeea29b62f8411157192481dd2e Author: Heiko Carstens Date: Tue Jun 19 13:10:03 2007 +0200 [S390] Fix yet another two section mismatches. WARNING: arch/s390/kernel/built-in.o(.text+0xb92a): Section mismatch: reference to .init.text:start_secondary (between 'restart_addr' and 'stack_overflow') WARNING: arch/s390/appldata/built-in.o(.data+0xdc): Section mismatch: reference to .init.text: (between 'appldata_nb' and 'appldata_timer_lock') Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ce4448238aee0144a2458874944df5a5a01a6ac6 Author: Michael Holzheu Date: Tue Jun 19 13:10:02 2007 +0200 [S390] Fix zfcpdump header Added members for volume number and real memory size to header information. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 0a71a312437d444e1a45317823fda8160df37ee4 Author: Michael Holzheu Date: Tue Jun 19 13:10:01 2007 +0200 [S390] Missing blank when appending cio_ignore kernel parameter When appending the 'cio_ignore' kernel parameter to the command line, a blank has to be inserted in order to separate 'cio_ignore' from the preceding kernel parameters. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 19e6454ca778e11e81497bd87c930dc0defd03d7 Author: David Howells Date: Mon Jun 18 23:30:41 2007 -0700 [AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data() Return the number of bytes buffered in rxrpc_send_data(). Signed-off-by: David Howells Signed-off-by: David S. Miller commit cc0191aeef73e5aa0c7f9a586d4bb27ed67facbb Author: Neil Horman Date: Mon Jun 18 22:33:20 2007 -0700 [IPVS]: Fix state variable on failure to start ipvs threads ip_vs currently fails to reset its ip_vs_sync_state variable if the sync thread fails to start properly. The result is that the kernel will report a running daemon when their actuall is none. If you issue the following commands: 1. ipvsadm --start-daemon master --mcast-interface bla 2. ipvsadm -L --daemon 3. ipvsadm --stop-daemon master Assuming that bla is not an actual interface, step 2 should return no data, but instead returns: $ ipvsadm -L --daemon master sync daemon (mcast=bla, syncid=0) Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 281216177a407f78cfd650ee4391afc487577193 Author: Patrick McHardy Date: Mon Jun 18 22:30:15 2007 -0700 [XFRM]: Fix MTU calculation for non-ESP SAs My IPsec MTU optimization patch introduced a regression in MTU calculation for non-ESP SAs, the SA's header_len needs to be subtracted from the MTU if the transform doesn't provide a ->get_mtu() function. Reported-and-tested-by: Marco Berizzi Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e99f056b2777f3fc6871ff6347c98c0321ad2f8f Author: Tim Shimmin Date: Tue Jun 19 15:26:35 2007 +1000 [XFS] Update the MAINTAINERS file entry for XFS - change git repo name. Make the git repository bare and so give it the conventional .git suffix. Signed-off-by: Tim Shimmin commit 700716c8468d95ec6d03566a4e4fb576c3223cbc Author: Christoph Hellwig Date: Thu May 24 15:27:17 2007 +1000 [XFS] s/memclear_highpage_flush/zero_user_page/ SGI-PV: 957103 SGI-Modid: xfs-linux-melb:xfs-kern:28678a Signed-off-by: Christoph Hellwig Signed-off-by: Tim Shimmin commit 41e904dee22066ae7ac3a7f695b2c8bd43ce4e04 Author: Benjamin Herrenschmidt Date: Tue Jun 19 14:37:39 2007 +1000 [POWERPC] Fix snd-powermac refcounting bugs The old snd-powermac driver has some serious refcounting issues when initialisation fails, which is the case on all new machines with a layout-id since those are handled by the new snd-aoa driver. Some of those bugs seem to have been under the radar for some time (like double pci_dev_put), but one was actually added in 2.6.22 with Stephen attempt at teaching refcounting to the driver which didn't do it at all. This patch fixes both, thus removing all sort of kref errors that would happen if that driver gets loaded on a G5 machine or a recent PowerBook due to OF nodes left around with a 0 refcount. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e227e8f3ba3bfb8e26fee783026c1425ba600037 Author: Paul Mundt Date: Tue Jun 19 12:41:32 2007 +0900 sh64: Handle -ERESTART_RESTARTBLOCK for restartable syscalls. The current implementation only handles -ERESTARTNOHAND, whereas we also need to handle -ERESTART_RESTARTBLOCK in the handle_signal() case for restartable system calls. Follows the sh change. Signed-off-by: Paul Mundt commit 3aeb884b4ec442719a2d8aa15316415a7412efd8 Author: Paul Mundt Date: Tue Jun 19 12:33:21 2007 +0900 sh: Handle -ERESTART_RESTARTBLOCK for restartable syscalls. The current implementation only handles -ERESTARTNOHAND, whereas we also need to handle -ERESTART_RESTARTBLOCK in the handle_signal() case for restartable system calls. As noted by Carl: This fixes the LTP test nanosleep03 - the current kernel causes -ERESTART_RESTARTBLOCK to reach user space rather than the correct -EINTR. Reported-by: Carl Shaw Signed-off-by: Paul Mundt commit fa490cfd15d7ce0900097cc4e60cfd7a76381138 Author: Linus Torvalds Date: Mon Jun 18 09:34:40 2007 -0700 Fix possible runqueue lock starvation in wait_task_inactive() Miklos Szeredi reported very long pauses (several seconds, sometimes more) on his T60 (with a Core2Duo) which he managed to track down to wait_task_inactive()'s open-coded busy-loop. He observed that an interrupt on one core tries to acquire the runqueue-lock but does not succeed in doing so for a very long time - while wait_task_inactive() on the other core loops waiting for the first core to deschedule a task (which it wont do while spinning in an interrupt handler). This rewrites wait_task_inactive() to do all its waiting optimistically without any locks taken at all, and then just double-check the end result with the proper runqueue lock held over just a very short section. If there were races in the optimistic wait, of a preemption event scheduled the process away, we simply re-synchronize, and start over. So the code now looks like this: repeat: /* Unlocked, optimistic looping! */ rq = task_rq(p); while (task_running(rq, p)) cpu_relax(); /* Get the *real* values */ rq = task_rq_lock(p, &flags); running = task_running(rq, p); array = p->array; task_rq_unlock(rq, &flags); /* Check them.. */ if (unlikely(running)) { cpu_relax(); goto repeat; } /* Preempted away? Yield if so.. */ if (unlikely(array)) { yield(); goto repeat; } Basically, that first "while()" loop is done entirely without any locking at all (and doesn't check for the case where the target process might have been preempted away), and so it's possibly "incorrect", but we don't really care. Both the runqueue used, and the "task_running()" check might be the wrong tests, but they won't oops - they just mean that we could possibly get the wrong results due to lack of locking and exit the loop early in the case of a race condition. So once we've exited the loop, we then get the proper (and careful) rq lock, and check the running/runnable state _safely_. And if it turns out that our quick-and-dirty and unsafe loop was wrong after all, we just go back and try it all again. (The patch also adds a lot of comments, which is the actual bulk of it all, to make it more obvious why we can do these things without holding the locks). Thanks to Miklos for all the testing and tracking it down. Tested-by: Miklos Szeredi Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit a0f98a1cb7d27c656de450ba56efd31bdc59065e Author: Ingo Molnar Date: Sun Jun 17 18:37:45 2007 +0200 sched: fix SysRq-N (normalize RT tasks) Gene Heskett reported the following problem while testing CFS: SysRq-N is not always effective in normalizing tasks back to SCHED_OTHER. The reason for that turns out to be the following bug: - normalize_rt_tasks() uses for_each_process() to iterate through all tasks in the system. The problem is, this method does not iterate through all tasks, it iterates through all thread groups. The proper mechanism to enumerate over all threads is to use a do_each_thread() + while_each_thread() loop. Reported-by: Gene Heskett Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit caec4e8dc85e0644ec24aeb36285e1ba02da58cc Author: Benjamin Herrenschmidt Date: Tue Jun 12 08:16:18 2007 +1000 Fix signalfd interaction with thread-private signals Don't let signalfd dequeue private signals off other threads (in the case of things like SIGILL or SIGSEGV, trying to do so would result in undefined behaviour on who actually gets the signal, since they are force unblocked). Signed-off-by: Benjamin Herrenschmidt Acked-by: Davide Libenzi Signed-off-by: Linus Torvalds commit bd197234b0a616c8f04f6b682326a5a24b33ca92 Author: Thomas Gleixner Date: Sun Jun 17 21:11:10 2007 +0200 Revert "futex_requeue_pi optimization" This reverts commit d0aa7a70bf03b9de9e995ab272293be1f7937822. It not only introduced user space visible changes to the futex syscall, it is also non-functional and there is no way to fix it proper before the 2.6.22 release. The breakage report ( http://lkml.org/lkml/2007/5/12/17 ) went unanswered, and unfortunately it turned out that the concept is not feasible at all. It violates the rtmutex semantics badly by introducing a virtual owner, which hacks around the coupling of the user-space pi_futex and the kernel internal rt_mutex representation. At the moment the only safe option is to remove it fully as it contains user-space visible changes to broken kernel code, which we do not want to expose in the 2.6.22 release. The patch reverts the original patch mostly 1:1, but contains a couple of trivial manual cleanups which were necessary due to patches, which touched the same area of code later. Verified against the glibc tests and my own PI futex tests. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Acked-by: Ulrich Drepper Cc: Pierre Peiffer Signed-off-by: Linus Torvalds commit e61ef2416b0b92828512b6cfcd0104a02b6431fe Author: Roland Dreier Date: Mon Jun 18 09:23:47 2007 -0700 IB/mlx4: Make sure inline data segments don't cross a 64 byte boundary Inline data segments in send WQEs are not allowed to cross a 64 byte boundary. We use inline data segments to hold the UD headers for MLX QPs (QP0 and QP1). A send with GRH on QP1 will have a UD header that is too big to fit in a single inline data segment without crossing a 64 byte boundary, so split the header into two inline data segments. Signed-off-by: Roland Dreier commit 5ae2a7a836be660ff1621cce1c46930f19200589 Author: Roland Dreier Date: Mon Jun 18 08:15:02 2007 -0700 IB/mlx4: Handle FW command interface rev 3 Upcoming firmware introduces command interface revision 3, which changes the way port capabilities are queried and set. Update the driver to handle both the new and old command interfaces by adding a new MLX4_FLAG_OLD_PORT_CMDS that it is set after querying the firmware interface revision and then using the correct interface based on the setting of the flag. Signed-off-by: Roland Dreier commit 082dee3216c99a838af40be403799f60bcea2e97 Author: Jack Morgenstein Date: Mon Jun 18 08:13:59 2007 -0700 IB/mlx4: Handle buffer wraparound in __mlx4_ib_cq_clean() When compacting CQ entries, we need to set the correct value of the ownership bit in case the value is different between the index we copy the CQE from and the index we copy it to. Found by Ronni Zimmerman of Mellanox. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 54e95f8dcbd7d86f79b423e8d11053ec9a2d9946 Author: Roland Dreier Date: Mon Jun 18 08:13:53 2007 -0700 IB/mlx4: Get rid of max_inline_data calculation The calculation of max_inline_data in set_kernel_sq_size() is bogus, since it doesn't take into account the fact that inline segments may not cross a 64-byte boundary, and hence multiple inline segments will probably need to be used to post large inline sends. We don't support inline sends for kernel QPs anyway, so there's no point in doing this calculation anyway, since the field is just zeroed out a little later. So just delete the bogus calculation. Signed-off-by: Roland Dreier commit 0e6e74162164d908edf7889ac66dca09e7505745 Author: Roland Dreier Date: Mon Jun 18 08:13:48 2007 -0700 IB/mlx4: Handle new FW requirement for send request prefetching New ConnectX firmware introduces FW command interface revision 2, which requires that for each QP, a chunk of send queue entries (the "headroom") is kept marked as invalid, so that the HCA doesn't get confused if it prefetches entries that haven't been posted yet. Add code to the driver to do this, and also update the user ABI so that userspace can request that the prefetcher be turned off for userspace QPs (we just leave the prefetcher on for all kernel QPs). Unfortunately, marking send queue entries this way is confuses older firmware, so we change the driver to allow only FW command interface revisions 2. This means that users will have to update their firmware to work with the new driver, but the firmware is changing quickly and the old firmware has lots of other bugs anyway, so this shouldn't be too big a deal. Based on a patch from Jack Morgenstein . Signed-off-by: Roland Dreier commit 154c772ebfb12ef66855510e6be2b12c85110b0c Author: Russell King Date: Mon Jun 18 14:59:45 2007 +0100 [ARM] Update show_regs/oops register format Add the kernel release and version information to the output of show_regs/oops. Add the CPU PSR register. Avoid using printk to output partial lines; always output a complete line. Re-combine the "Control" and "Table + DAC" lines after nommu separated them; we don't want to waste vertical screen space needlessly. Signed-off-by: Russell King commit 5527398218aae85f37552a69fad163fa500c39e4 Author: Paul Mundt Date: Mon Jun 18 18:57:13 2007 +0900 sh: oops_enter()/oops_exit() in die(). As Russell helpfully pointed out on linux-arch: http://marc.info/?l=linux-arch&m=118208089204630&w=2 We were missing the oops_enter/exit() in the sh die() implementation. As we do support lockdep, it's beneficial to add these calls so lockdep properly disables itself in the die() case. Signed-off-by: Paul Mundt commit 83dd4504456d4b5e464d6ec4a7665e2c922db67f Author: Myron Stowe Date: Mon Jun 4 16:25:37 2007 -0600 ACPICA: fix error path in new external package objects as method arguments In the routine acpi_ut_create_package_object(), if the ACPI_ALLOCATE_ZEROED() fails then ACPI_FREE(package_desc) is called as part of the cleanup. This should instead be acpi_ut_remove_reference(package_desc) in order to remove the reference acquired from acpi_ut_create_internal_object() [see the routine acpi_ut_create_buffer_object() as an example of proper functionality]. Signed-off-by: Myron Stowe Signed-off-by: Len Brown commit e7c746ef098770f863ba294adac5b30d124ba469 Author: Thomas Renninger Date: Mon Jun 18 00:40:51 2007 -0400 ACPI: gracefully print null trip-point device if acpi_bus_get_device() returns NULL, print nothing instead of " Signed-off-by: Len Brown commit 69a331470ff02561cf1898eeb152ccca9f22bf53 Author: Kaz Kojima Date: Mon Jun 18 10:08:20 2007 +0900 sh: Fix restartable syscall arg5 clobbering. We use R0 as the 5th argument of syscall. When the syscall restarts after signal handling, we should restore the old value of R0. The attached patch does it. Without this patch, I've experienced random failures in the situation which signals are issued frequently. Signed-off-by: Kaz Kojima Signed-off-by: Paul Mundt commit d9202429e60d16d39c427cd4e4408cf1827ab9e9 Author: Russell King Date: Sun Jun 17 13:38:27 2007 +0100 [ARM] Add support for pause_on_oops and display preempt/smp options Add calls to oops_enter() and oops_exit() to __die(), so that things like lockdep know when an oops occurs. Add suffixes to the oops report to indicate whether the running kernel has been built with preempt or smp support. Signed-off-by: Russell King commit 188e1f81ba31af1b65a2f3611df4c670b092bbac Author: Linus Torvalds Date: Sat Jun 16 19:09:12 2007 -0700 Linux 2.6.22-rc5 The manatees, they are dancing! Signed-off-by: Linus Torvalds commit 9d66586f7723b73c5925c7c7819c260484627851 Author: Eric W. Biederman Date: Sat Jun 16 10:16:16 2007 -0700 shm: fix the filename of hugetlb sysv shared memory Some user space tools need to identify SYSV shared memory when examining /proc//maps. To do so they look for a block device with major zero, a dentry named SYSV, and having the minor of the internal sysv shared memory kernel mount. To help these tools and to make it easier for people just browsing /proc//maps this patch modifies hugetlb sysv shared memory to use the SYSV dentry naming convention. User space tools will still have to be aware that hugetlb sysv shared memory lives on a different internal kernel mount and so has a different block device minor number from the rest of sysv shared memory. Signed-off-by: Eric W. Biederman Cc: "Serge E. Hallyn" Cc: Albert Cahalan Cc: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22741925d268e8479ef66312749bd8d96ed35365 Author: Adam Litke Date: Sat Jun 16 10:16:15 2007 -0700 hugetlb: fix get_policy for stacked shared memory files Here's another breakage as a result of shared memory stacked files :( The NUMA policy for a VMA is determined by checking the following (in the order given): 1) vma->vm_ops->get_policy() (if defined) 2) vma->vm_policy (if defined) 3) task->mempolicy (if defined) 4) Fall back to default_policy By switching to stacked files for shared memory, get_policy() is now always set to shm_get_policy which is a wrapper function. This causes us to stop at step 1, which yields NULL for hugetlb instead of task->mempolicy which was the previous (and correct) result. This patch modifies the shm_get_policy() wrapper to maintain steps 1-3 for the wrapped vm_ops. (akpm: the refcounting of mempolicies is busted and this patch does nothing to improve it) Signed-off-by: Adam Litke Acked-by: William Irwin Cc: dean gaudet Cc: Christoph Lameter Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74584ae509befc2ed711810e7df4b075473869b2 Author: Jan Kara Date: Sat Jun 16 10:16:14 2007 -0700 udf: fix possible leakage of blocks We have to take care that when we call udf_discard_prealloc() from udf_clear_inode() we have to write inode ourselves afterwards (otherwise, some changes might be lost leading to leakage of blocks, use of free blocks or improperly aligned extents). Also udf_discard_prealloc() does two different things - it removes preallocated blocks and truncates the last extent to exactly match i_size. We move the latter functionality to udf_truncate_tail_extent(), call udf_discard_prealloc() when last reference to a file is dropped and call udf_truncate_tail_extent() when inode is being removed from inode cache (udf_clear_inode() call). We cannot call udf_truncate_tail_extent() earlier as subsequent open+write would find the last block of the file mapped and happily write to the end of it, although the last extent says it's shorter. [akpm@linux-foundation.org: Make checkpatch.pl happier] Signed-off-by: Jan Kara Cc: Eric Sandeen Cc: Cyrill Gorcunov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b356be019d0c28f67af02809df7072c1c8f7d32 Author: Christoph Lameter Date: Sat Jun 16 10:16:13 2007 -0700 SLUB: minimum alignment fixes If ARCH_KMALLOC_MINALIGN is set to a value greater than 8 (SLUBs smallest kmalloc cache) then SLUB may generate duplicate slabs in sysfs (yes again) because the object size is padded to reach ARCH_KMALLOC_MINALIGN. Thus the size of the small slabs is all the same. No arch sets ARCH_KMALLOC_MINALIGN larger than 8 though except mips which for some reason wants a 128 byte alignment. This patch increases the size of the smallest cache if ARCH_KMALLOC_MINALIGN is greater than 8. In that case more and more of the smallest caches are disabled. If we do that then the count of the active general caches that is displayed on boot is not correct anymore since we may skip elements of the kmalloc array. So count them separately. This approach was tested by Havard yesterday. Signed-off-by: Christoph Lameter Cc: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dab5241d06bfc9ee141ea78c56cde5070d7460d Author: Benjamin Herrenschmidt Date: Sat Jun 16 10:16:12 2007 -0700 Rework ptep_set_access_flags and fix sun4c Some changes done a while ago to avoid pounding on ptep_set_access_flags and update_mmu_cache in some race situations break sun4c which requires update_mmu_cache() to always be called on minor faults. This patch reworks ptep_set_access_flags() semantics, implementations and callers so that it's now responsible for returning whether an update is necessary or not (basically whether the PTE actually changed). This allow fixing the sparc implementation to always return 1 on sun4c. [akpm@linux-foundation.org: fixes, cleanups] Signed-off-by: Benjamin Herrenschmidt Cc: Hugh Dickins Cc: David Miller Cc: Mark Fortescue Acked-by: William Lee Irwin III Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 679ce0ace6b1a07043bc3b405a34ddccad808886 Author: Matt Mackall Date: Sat Jun 16 10:16:11 2007 -0700 random: fix output buffer folding (As reported by linux@horizon.com) Folding is done to minimize the theoretical possibility of systematic weakness in the particular bits of the SHA1 hash output. The result of this bug is that 16 out of 80 bits are un-folded. Without a major new vulnerability being found in SHA1, this is harmless, but still worth fixing. Signed-off-by: Matt Mackall Cc: Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39a279026609c205d331ec39fea11b2fd470a054 Author: Jeff Dike Date: Sat Jun 16 10:16:10 2007 -0700 uml: kill x86_64 STACK_TOP_MAX The x86_64 a.out.h got a definition of STACK_TOP_MAX, which interferes with the UML version. So, just undef it like STACK_TOP. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c539ab73070b381f0452dae791f891ec2515098e Author: Jeff Dike Date: Sat Jun 16 10:16:09 2007 -0700 uml: remove PAGE_SIZE from libc code Distros seem to be removing PAGE_SIZE from asm/page.h. So, the libc side of UML should stop using it. I replace it with UM_KERN_PAGE_SIZE, which is defined to be the same as PAGE_SIZE on the kernel side of the house. I could also use getpagesize(), but it's more important that UML have the same value of PAGE_SIZE everywhere. It's conceivable that it could be built with a larger PAGE_SIZE, and use of getpagesize() would break that badly. PAGE_MASK got the same treatment, as it is closely tied to PAGE_SIZE. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5a9c77df45b113d21b64cbc2bf6c72a0da48998 Author: David Brownell Date: Sat Jun 16 10:16:08 2007 -0700 spi doc updates Update two points in the SPI interface documentation: - Update description of the "chip stays selected after message ends" mode. In some cases it's required for correctness; it isn't just a performance tweak. (Yes: to use this mode on mult-device busses, another programming interface will be needed. One draft has been circulated already.) - Clarify spi_setup(), highlighting that callers must ensure that no requests are queued (can't change configuration except between I/Os), and that the device must be deselected when this returns (which is a key part of why it's called during device init). Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed45666271f4fafa95b9d8ad44050e9a9bd2376e Author: Mike Accetta Date: Sat Jun 16 10:16:07 2007 -0700 md: fix bug in error handling during raid1 repair If raid1/repair (which reads all block and fixes any differences it finds) hits a read error, it doesn't reset the bio for writing before writing correct data back, so the read error isn't fixed, and the device probably gets a zero-length write which it might complain about. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af03b8e4e81c3789e597632268940edd11ffe870 Author: NeilBrown Date: Sat Jun 16 10:16:06 2007 -0700 md: fix two raid10 bugs 1/ When resyncing a degraded raid10 which has more than 2 copies of each block, garbage can get synced on top of good data. 2/ We round the wrong way in part of the device size calculation, which can cause confusion. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edad01e2a1c527af3baf22dc6977aeb058881150 Author: Alexey Dobriyan Date: Sat Jun 16 10:16:05 2007 -0700 fuse: ->fs_flags fixlet fs/fuse/inode.c:658:3: error: Initializer entry defined twice fs/fuse/inode.c:661:3: also defined here Signed-off-by: Alexey Dobriyan Acked-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da88ba17de990a4b0d18ecde2c40355700888750 Author: Björn Steinbrink Date: Sat Jun 16 10:16:04 2007 -0700 perfctr-watchdog: fix interchanged parameters to release_{evntsel,perfctr}_nmi Fix oops triggered during: echo 0 > /proc/sys/kernel/nmi_watchdog The culprit seems to be 09198e68501a7e34737cd9264d266f42429abcdc: [PATCH] i386: Clean up NMI watchdog code In two places, the parameters to release_{evntsel,perfctr}_nmi got interchanged during the cleanup. Fix interchanged parameters to release_{evntsel,perfctr}_nmi. Signed-off-by: Björn Steinbrink Cc: Stephane Eranian Cc: Andi Kleen Cc: Michal Piotrowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f41dddbbd7193fb5cdae0a24db4d378d56885fd Author: Rafael J. Wysocki Date: Sat Jun 16 10:16:03 2007 -0700 swsusp: Fix userland interface Fix oops caused by 'cat /dev/snapshot', reported by Arkadiusz Miskiewicz, and make it impossible to thaw tasks with the help of the swsusp userland interface while there is a snapshot image ready to save. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1d93de3e4633c4cbfd622a3564d8268a116a46a Author: Randy Dunlap Date: Sat Jun 16 10:16:02 2007 -0700 toshiba_acpi: fix section mismatch in allyesconfig Fix section error (allyesconfig). The exit function is called from init, so functions that are called by the exit function cannot be marked __exit. WARNING: drivers/built-in.o(.text+0xe5bc6): Section mismatch: reference to .exit. text: (between 'toshiba_acpi_exit' and 'hci_raw') Signed-off-by: Randy Dunlap Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e903e7b1605aff88d7f89a96fab5e43081b914f Author: Paul Jackson Date: Sat Jun 16 10:16:01 2007 -0700 cpuset: zero malloc - fix for old cpusets The cpuset code to present a list of tasks using a cpuset to user space could write to an array that it had kmalloc'd, after a kmalloc request of zero size. The problem was that the code didn't check for writes past the allocated end of the array until -after- the first write. This is a race condition that is likely rare -- it would only show up if a cpuset went from being empty to having a task in it, during the brief time between the allocation and the first write. Prior to roughly 2.6.22 kernels, this was also a benign problem, because a zero kmalloc returned a few usable bytes anyway, and no harm was done with the bogus write. With the 2.6.22 kernel changes to make issue a warning if code tries to write to the location returned from a zero size allocation, this problem is no longer benign. This cpuset code would occassionally trigger that warning. The fix is trivial -- check before storing into the array, not after, whether the array is big enough to hold the store. Cc: "Eric W. Biederman" Cc: "Serge E. Hallyn" Cc: Balbir Singh Cc: Dave Hansen Cc: Herbert Poetzl Cc: Kirill Korotaev Cc: Paul Menage Cc: Srivatsa Vaddagiri Cc: Christoph Lameter Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6f8bb1310d4745ff1d0c74eeacae31e2a3eeff1 Author: Hugh Dickins Date: Sat Jun 16 10:15:59 2007 -0700 i386 mm: use pte_update() in ptep_test_and_clear_dirty() It is not safe to use pte_update_defer() in ptep_test_and_clear_young(): its only user, /proc//clear_refs, drops pte lock before flushing TLB. Use the safe though less efficient pte_update() paravirtop in its place. Likewise in ptep_test_and_clear_dirty(), though that has no current use. These are macros (header file dependency stops them from becoming inline functions), so be more liberal with the underscores and parentheses. Signed-off-by: Hugh Dickins Cc: Zachary Amsden Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30475cc12a50816f290828fb7e3cd7036cd622df Author: Badari Pulavarty Date: Sat Jun 16 10:15:59 2007 -0700 Restore shmid as inode# to fix /proc/pid/maps ABI breakage shmid used to be stored as inode# for shared memory segments. Some of the proc-ps tools use this from /proc/pid/maps. Recent cleanups to newseg() changed it. This patch sets inode number back to shared memory id to fix breakage. Signed-off-by: Badari Pulavarty Cc: "Albert Cahalan" Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd08c40e3e23f868eb0e49f638eb208736ec7e66 Author: Christoph Lameter Date: Sat Jun 16 10:15:57 2007 -0700 SLUB slab validation: Alloc while interrupts are disabled must use GFP_ATOMIC The data structure to manage the information gathered about functions allocating and freeing objects is allocated when the list_lock has already been taken. We need to allocate with GFP_ATOMIC instead of GFP_KERNEL. Signed-off-by: Christoph Lameter Cc: Mel Gorman Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54c6ed7562d59ab238df1ec9ff76d81d7d0f0842 Author: Björn Steinbrink Date: Sat Jun 16 10:15:56 2007 -0700 i386: use the right wrapper to disable the NMI watchdog When disabled through /proc/sys/kernel/nmi_watchdog, the NMI watchdog uses the stop() method directly, which does not decrement the activity counter, leading to a BUG(). Use the wrapper function instead to fix that. Signed-off-by: Björn Steinbrink Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faa4cfa6b334fc07c3386e620a2fb55de508c077 Author: Björn Steinbrink Date: Sat Jun 16 10:15:55 2007 -0700 i386: fix NMI watchdog not reserving its MSRs At system boot time, the NMI watchdog no longer reserved its MSRs, allowing other subsystems to mess with them. Fix that. Signed-off-by: Björn Steinbrink Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38ad2ed08d89a4b830a03131fa73e4ef3e98d9f4 Author: Paul Fulghum Date: Sat Jun 16 10:15:55 2007 -0700 tty: restore locked ioctl file op Restore tty locked ioctl handler which was replaced with an unlocked ioctl handler in hung_up_tty_fops by the patch: commit e10cc1df1d2014f68a4bdcf73f6dd122c4561f94 Author: Paul Fulghum Date: Thu May 10 22:22:50 2007 -0700 tty: add compat_ioctl This was reported in: [Bug 8473] New: Oops: 0010 [1] SMP The bug is caused by switching to hung_up_tty_fops in do_tty_hangup. An ioctl call can be waiting on BLK after testing for existence of the locked ioctl handler in the normal tty fops, but before calling the locked ioctl handler. If a hangup occurs at that point, the locked ioctl fop is NULL and an oops occurs. (akpm: we can remove my debugging code from do_ioctl() now, but it'll be OK to do that for 2.6.23) Signed-off-by: Paul Fulghum Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4d2781731e846c2f01dd85e71883d120860c6dd Author: David Woodhouse Date: Sat Jun 16 10:48:19 2007 +0100 fix radeon setparam on 32/64 systems, harder. Commit 9b01bd5b284bbf519b726b39f1352023cb5e9e69 introduced a compat_ioctl handler for RADEON_SETPARAM, the sole purpose of which was to handle the fact that on i386, alignof(uint64_t)==4. Unfortunately, this handler was installed for _all_ 64-bit architectures, instead of only x86_64 and ia64. And thus it breaks 32-bit compatibility on every other arch, where 64-bit integers are aligned to 8 bytes in 32-bit mode just the same as in 64-bit mode. Arnd has a cunning plan to use 'compat_u64' with appropriate alignment attributes according to the 32-bit ABI, but for now let's just make the compat_radeon_cp_setparam routine entirely disappear on 64-bit machines whose 32-bit compat support isn't for i386. It would be a no-op with compat_u64 anyway. Signed-off-by: David Woodhouse Acked-by: Arnd Bergmann Cc: Benjamin Herrenschmidt Cc: Dave Airlie Signed-off-by: Linus Torvalds commit 18b461796b737f94286f73710debc8649467161b Author: Carlos E. Ugarte Date: Mon Jun 4 11:49:19 2007 -0400 ieee1394: fix to ether1394_tx in ether1394.c This patch fixes a problem that occurs when packets cannot be sent across the ieee1394 bus and we return NETDEV_TX_BUSY in the net driver "hard start xmit" routine ether1394_tx. When we return NETDEV_TX_BUSY the stack will call ether1394_tx again with the same skb. So we need to restore the header to look like it did before we munged it for xmit over ieee1394. [Stefan Richter: changed whitespace, deleted a local variable] Signed-off-by: Stefan Richter commit a515958d6f77fdff1a40f8b08a9a95ac223c5d48 Author: Stefan Richter Date: Sat Jun 9 19:31:14 2007 +0200 firewire: fix hang after card ejection Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit d1be0a8225f2cb1cdc356ebb0ae6800f023ce67d Author: Bartlomiej Zolnierkiewicz Date: Sat Jun 16 02:24:44 2007 +0200 ide-scsi: fix OOPS in idescsi_expiry() drive->driver_data contains pointer to Scsi_Host not idescsi_scsi_t. Signed-off-by: Bartlomiej Zolnierkiewicz commit ce9b2b0abbf019d5259eb089a1cc256852930f67 Author: Rafael J. Wysocki Date: Sat Jun 16 02:24:43 2007 +0200 Resume from RAM on HPC nx6325 broken generic_ide_resume() should check if dev->driver is not NULL before applying to_ide_driver() to it. Fix that. Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit d09c6b809432668371b5de9102f4f9aa6a7c79cc Author: Paul Mundt Date: Thu Jun 14 15:13:16 2007 +0900 mm: Fix memory/cpu hotplug section mismatch and oops. When building with memory hotplug enabled and cpu hotplug disabled, we end up with the following section mismatch: WARNING: mm/built-in.o(.text+0x4e58): Section mismatch: reference to .init.text: (between 'free_area_init_node' and '__build_all_zonelists') This happens as a result of: -> free_area_init_node() -> free_area_init_core() -> zone_pcp_init() <-- all __meminit up to this point -> zone_batchsize() <-- marked as __cpuinit fo This happens because CONFIG_HOTPLUG_CPU=n sets __cpuinit to __init, but CONFIG_MEMORY_HOTPLUG=y unsets __meminit. Changing zone_batchsize() to __devinit fixes this. __devinit is the only thing that is common between CONFIG_HOTPLUG_CPU=y and CONFIG_MEMORY_HOTPLUG=y. In the long run, perhaps this should be moved to another section identifier completely. Without this, memory hot-add of offline nodes (via hotadd_new_pgdat()) will oops if CPU hotplug is not also enabled. Signed-off-by: Paul Mundt Acked-by: Yasunori Goto Signed-off-by: Linus Torvalds -- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bc90ba093af2e5022b9d055a2148b54a6aa35bc9 Author: Tejun Heo Date: Fri Jun 15 13:24:28 2007 +0200 block: always requeue !fs requests at the front SCSI marks internal commands with REQ_PREEMPT and push it at the front of the request queue using blk_execute_rq(). When entering suspended or frozen state, SCSI devices are quiesced using scsi_device_quiesce(). In quiesced state, only REQ_PREEMPT requests are processed. This is how SCSI blocks other requests out while suspending and resuming. As all internal commands are pushed at the front of the queue, this usually works. Unfortunately, this interacts badly with ordered requeueing. To preserve request order on requeueing (due to busy device, active EH or other failures), requests are sorted according to ordered sequence on requeue if IO barrier is in progress. The following sequence deadlocks. 1. IO barrier sequence issues. 2. Suspend requested. Queue is quiesced with part or all of IO barrier sequence at the front. 3. During suspending or resuming, SCSI issues internal command which gets deferred and requeued for some reason. As the command is issued after the IO barrier in #1, ordered requeueing code puts the request after IO barrier sequence. 4. The device is ready to process requests again but still is in quiesced state and the first request of the queue isn't REQ_PREEMPT, so command processing is deadlocked - suspending/resuming waits for the issued request to complete while the request can't be processed till device is put back into running state by resuming. This can be fixed by always putting !fs requests at the front when requeueing. The following thread reports this deadlock. http://thread.gmane.org/gmane.linux.kernel/537473 Signed-off-by: Tejun Heo Acked-by: David Greaves Acked-by: Jeff Garzik Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 16c61add51f2182140637c924687a2aab6b568f9 Author: Adrian Bunk Date: Fri Jun 15 15:15:43 2007 -0700 [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 7769f4064cd9f4fbae09f071578a051aae83e844 Author: Ilpo Järvinen Date: Fri Jun 15 15:14:04 2007 -0700 [TCP]: Fix logic breakage due to DSACK separation Commit 6f74651ae626ec672028587bc700538076dfbefb is found guilty of breaking DSACK counting, which should be done only for the SACK block reported by the DSACK instead of every SACK block that is received along with DSACK information. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit b9ce204f0a265f819d10c943a607746abb62f245 Author: Ilpo Järvinen Date: Fri Jun 15 15:08:43 2007 -0700 [TCP]: Congestion control API RTT sampling fix Commit 164891aadf1721fca4dce473bb0e0998181537c6 broke RTT sampling of congestion control modules. Inaccurate timestamps could be fed to them without providing any way for them to identify such cases. Previously RTT sampler was called only if FLAG_RETRANS_DATA_ACKED was not set filtering inaccurate timestamps nicely. In addition, the new behavior could give an invalid timestamp (zero) to RTT sampler if only skbs with TCPCB_RETRANS were ACKed. This solves both problems. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 02676e5aee271c1f20d7d44249d26741aef1e846 Author: Jens Axboe Date: Fri Jun 15 13:16:13 2007 +0200 splice: only check do_wakeup in splice_to_pipe() for a real pipe We only ever set do_wakeup to non-zero if the pipe has an inode backing, so it's pointless to check outside the pipe->inode check. Signed-off-by: Jens Axboe commit 00de00bdad278783b3664ad2969954a707f5944a Author: Jens Axboe Date: Fri Jun 15 13:14:22 2007 +0200 splice: fix leak of pages on short splice to pipe If the destination pipe is full and we already transferred data, we break out instead of waiting for more pipe room. The exit logic looks at spd->nr_pages to see if we moved everything inside the spd container, but we decrement that variable in the loop to decide when spd has emptied. Instead we want to compare to the original page count in the spd, so cache that in a local variable. Signed-off-by: Jens Axboe commit 17ee4f49ab2c802c7818fa71c4e7e351a7230b86 Author: Jens Axboe Date: Fri Jun 15 13:10:37 2007 +0200 splice: adjust balance_dirty_pages_ratelimited() call As we have potentially dirtied more than 1 page, we should indicate as such to the dirty page balancing. So call balance_dirty_pages_ratelimited_nr() and pass in the approximate number of pages we dirtied. Signed-off-by: Jens Axboe commit 7702fd1f6fea57921f2e643d27a23a2d0394499c Author: Avi Kivity Date: Thu Jun 14 16:27:40 2007 +0300 KVM: Prevent guest fpu state from leaking into the host The lazy fpu changes did not take into account that some vmexit handlers can sleep. Move loading the guest state into the inner loop so that it can be reloaded if necessary, and move loading the host state into vmx_vcpu_put() so it can be performed whenever we relinquish the vcpu. Signed-off-by: Avi Kivity commit 8888985144db8f4cb7e56154b31bdf233d3550bf Author: Wang Zhenyu Date: Thu Jun 14 10:01:04 2007 +0800 [AGPGART] intel_agp: fix device probe This patch trys to fix device probe in two cases. First we should correctly detect device if integrated graphics device is not enabled or exists, like an add-in card is plugged. Second on some type of intel GMCH, it might have multiple graphic chip models, like 945GME case, so we should be sure the detect works through the whole table. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 74235a25c673f80147c1f975304888e8212a14d5 Author: Herbert Xu Date: Thu Jun 14 13:02:55 2007 -0700 [IPV6] addrconf: Fix IPv6 on tuntap tunnels The recent patch that added ipv6_hwtype is broken on tuntap tunnels. Indeed, it's broken on any device that does not pass the ipv6_hwtype test. The reason is that the original test only applies to autoconfiguration, not IPv6 support. IPv6 support is allowed on any device. In fact, even with the ipv6_hwtype patch applied you can still add IPv6 addresses to any interface that doesn't pass thw ipv6_hwtype test provided that they have a sufficiently large MTU. This is a serious problem because come deregistration time these devices won't be cleaned up properly. I've gone back and looked at the rationale for the patch. It appears that the real problem is that we were creating IPv6 devices even if the MTU was too small. So here's a patch which fixes that and reverts the ipv6_hwtype stuff. Thanks to Kanru Chen for reporting this issue. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d7ea5b91fad553e445bbe5d958b6a7b16222c092 Author: Ilpo Järvinen Date: Thu Jun 14 12:58:26 2007 -0700 [TCP]: Add missing break to TCP option parsing code This flaw does not affect any behavior (currently). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7b4f4ec21038ac13c63d130357d1c3015ec3f3e8 Author: Chris Dearman Date: Thu May 24 22:46:25 2007 +0100 [MIPS] Fix builds where MSC01E_xxx is undefined. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit ffe9ee4709cf513fb80e9b7e04d214dd8b76a10d Author: Chris Dearman Date: Thu May 24 22:24:20 2007 +0100 [MIPS] Separate performance counter interrupts Support for performance counter overflow interrupt that is on a separate interrupt from the timer. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit b72c05262298cc2ac92edb657f5ea3a97ad5ea3d Author: Chris Dearman Date: Fri Apr 27 15:58:41 2007 +0100 [MIPS] Malta: Fix for SOCitSC based Maltas And an attempt to tidy up the core/controller differences. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 093d0faf57e59feee224217273f944e10e4e3562 Author: Haavard Skinnemoen Date: Mon Jun 11 17:17:14 2007 +0200 [AVR32] Define ARCH_KMALLOC_MINALIGN to L1_CACHE_BYTES This allows SLUB debugging to be used without fear of messing up DMA transfers. SPI is one example that easily breaks without this patch. Signed-off-by: Haavard Skinnemoen commit 2fdfe8d9a2687718b07a35196b89fbf48ba0c82f Author: Haavard Skinnemoen Date: Tue May 29 21:33:37 2007 +0200 [AVR32] STK1000: Set SPI_MODE_3 in the ltv350qv board info In the latest incarnation of the ltv350qv driver the call to spi_setup() has been removed. So we need to initialize things more carefully in the board info struct. Signed-off-by: Haavard Skinnemoen commit 2ae795b02aa46a99d845958ae8d7bc8afa04292b Author: David Brownell Date: Thu May 24 13:52:08 2007 -0700 [AVR32] gpio_*_cansleep() fix The AVR32 was missing the gpio_*_cansleep() calls, breaking compilation for some code using them. Signed-off-by: David Brownell Signed-off-by: Haavard Skinnemoen commit 126187f1e00048abec4d4a2eb3eeae396fbaa944 Author: Andrea Righi Date: Wed May 23 14:14:52 2007 -0700 [AVR32] ratelimit segfault reporting rate Limit the rate of the kernel logging for the segfaults of user applications, to avoid potential message floods or denial-of-service attacks. Signed-off-by: Andrea Righi Signed-off-by: Andrew Morton Signed-off-by: Haavard Skinnemoen commit 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d Author: Milton Miller Date: Sun Jun 10 14:32:43 2007 +1000 [POWERPC] Fix console output getting dropped on platforms without udbg_putc Previously, registering this early console would just result in dropping early buffered printk output until a udbg_putc was registered. However, commit 69331af79cf29e26d1231152a172a1a10c2df511 clears the CON_PRINTBUFFER flag on the main console when a CON_BOOT (early) console has been registered, resulting in the buffered messages never being displayed to the user. This fixes the problem by making sure we don't register udbg_console on platforms that don't implement udbg_putc. Signed-off-by: Milton Miller Acked-by: Mark A. Greer Signed-off-by: Paul Mackerras commit c63c4faa8cf055319c7ed557d2050c1c3776fac5 Author: Paul Mackerras Date: Thu Jun 7 22:42:19 2007 +1000 [POWERPC] Fix per-cpu allocation on oldworld SMP powermacs The per-cpu area(a) for the secondary CPU(s) isn't getting allocated on old SMP powermacs that don't have the secondary CPU(s) listed in the device tree, as per-cpu areas are now only allocated for CPUs in the cpu_possible_map, and we aren't setting the bits for the secondary CPU(s) until smp_prepare_cpus(), which is after per-cpu allocation. Therefore this sets the bits for CPUs 1..3 in cpu_possible_map in pmac_setup_arch, so they get per-cpu data allocated. Signed-off-by: Paul Mackerras commit 06ad391919b2078ec2e012f0593014b88e7a6c4e Author: Vlad Yasevich Date: Tue Jun 12 15:26:22 2007 -0400 [SCTP] Don't disable PMTU discovery when mtu is small Right now, when we receive a mtu estimate smaller then minim threshold in the ICMP message, we disable the path mtu discovery on the transport. This leads to the never increasing sctp fragmentation point even when the real path mtu has increased. Signed-off-by: Vlad Yasevich commit 8a4794914f9cf2681235ec2311e189fe307c28c7 Author: Vlad Yasevich Date: Thu Jun 7 14:21:05 2007 -0400 [SCTP] Flag a pmtu change request Currently, if the socket is owned by the user, we drop the ICMP message. As a result SCTP forgets that path MTU changed and never adjusting it's estimate. This causes all subsequent packets to be fragmented. With this patch, we'll flag the association that it needs to udpate it's estimate based on the already updated routing information. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala commit c910b47e1811b3f8b184108c48de3d7af3e2999b Author: Vlad Yasevich Date: Thu Jun 7 13:47:03 2007 -0400 [SCTP] Update pmtu handling to be similar to tcp Introduce new function sctp_transport_update_pmtu that updates the transports and destination caches view of the path mtu. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala commit fe979ac169970b3d12facd6565766735862395c5 Author: Vlad Yasevich Date: Wed May 23 11:11:37 2007 -0400 [SCTP] Fix leak in sctp_getsockopt_local_addrs when copy_to_user fails If the copy_to_user or copy_user calls fail in sctp_getsockopt_local_addrs(), the function should free locally allocated storage before returning error. Spotted by Coverity. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala commit 8b35805693e1915829355723537f99f1b8bc9cc0 Author: Vlad Yasevich Date: Tue May 15 17:14:58 2007 -0400 [SCTP]: Allow unspecified port in sctp_bindx() Allow sctp_bindx() to accept multiple address with unspecified port. In this case, all addresses inherit the first bound port. We still catch full mis-matches. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala commit d570ee490fb18220262cfe41284d7aede797ed4f Author: Vlad Yasevich Date: Tue May 15 16:32:39 2007 -0400 [SCTP]: Correctly set daddr for IPv6 sockets during peeloff During peeloff of AF_INET6 socket, the inet6_sk(sk)->daddr wasn't set correctly since the code was assuming IPv4 only. Now we use a correct call to set the destination address. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala commit 204abf28679cd55a8e254b18965583bb1c8bc739 Author: Thomas Bogendoerfer Date: Wed Jun 13 12:58:53 2007 -0700 [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING. esp_reset_cleanup() does everything necessary except clear the flag, so we never exit resetting state. Signed-off-by: David S. Miller Signed-off-by: James Bottomley commit c3bff2ec10b8bf2f53c954e370f9bdae93064472 Author: Pierre Ossman Date: Wed Jun 13 19:06:03 2007 +0200 mmc: get back read-only switch function Somehow the code to read the read-only switch of SD cards got lost in the reorganisation. Signed-off-by: Pierre Ossman commit 0107a4b32e36dccd4456e2c5e34c5cd22c94e094 Author: Ragner Magalhaes Date: Wed Jun 13 19:09:28 2007 +0200 mmc-omap: fix sd response type 6 vs. 1 Ignoring OMAP_MMC_STAT_CARD_ERR, treating it as if the command completed correctly. Signed-off-by: Ragner Magalhaes Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Pierre Ossman commit 66e1e3b20cbbf99da63e6c1af0fc6d39c2ed099a Author: David S. Miller Date: Wed Jun 13 01:03:53 2007 -0700 [TCP]: Set initial_ssthresh default to zero in Cubic and BIC. Because of the current default of 100, Cubic and BIC perform very poorly compared to standard Reno. In the worst case, this change makes Cubic and BIC as aggressive as Reno. So this change should be very safe. Signed-off-by: David S. Miller commit fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f Author: David S. Miller Date: Tue Jun 12 23:56:52 2007 -0700 [SPARC64]: Fix args to sun4v_ldc_revoke(). First argument is LDC channel ID, then mapping cookie, then the MTE revoke cookie. Signed-off-by: David S. Miller commit f467b998eeae933029a83db8ad860da3879acd63 Author: David S. Miller Date: Tue Jun 12 23:53:03 2007 -0700 [SPARC64]: Really fix parport. We were passing a "struct pci_dev *" instead of a "struct device *" to the parport registry routines. No wonder things exploded. The ebus_bus_type hacks can be backed out from asm-sparc64/dma-mapping.h, those were wrong. Signed-off-by: David S. Miller commit 56f5c0bd50e948408ac0fd587b5c89fa7e2a1b6e Author: David S. Miller Date: Tue Jun 12 16:54:08 2007 -0700 [SPARC64]: Fix IO/MEM space sizing for PCI. In pci_determine_mem_io_space(), do not hard code the region sizes. Instead, use the values given to us in the ranges property. Thanks goes to Mikael Petterson for the original Xorg failure bug repoert, and strace dumps from Mikael and Dmitry Artamonow. Signed-off-by: David S. Miller commit 4a907dec9845001dc2b117a0ed2a2150384a4cea Author: David S. Miller Date: Wed Jun 13 00:01:04 2007 -0700 [SPARC64]: Wire up cookie based sun4v interrupt registry. This will be used for logical domain channel interrupts. Signed-off-by: David S. Miller commit 893e7c2db05f14032f2390ef7c59a499fc25ccae Author: Dmitry Torokhov Date: Wed Jun 13 01:49:58 2007 -0400 Input: move input-polldev to drivers/input To work around deficiences in Kconfig that allows to "select" a symbol without automatically selecting all dependencies for that symbol move input-polldev from drivers/input/misc to drivers/input thus removing extra dependency on CONFIG_INPUT_MISC. Signed-off-by: Dmitry Torokhov commit af15cc7b858c7653443ab64db2e41b69506450ee Author: Ilpo Järvinen Date: Tue Jun 12 16:16:44 2007 -0700 [TCP]: Fix left_out setting during FRTO Without FRTO, the tcp_try_to_open is never called with lost_out > 0 (see tcp_time_to_recover). However, when FRTO is enabled, the !tp->lost condition is not used until end of FRTO because that way TCP avoids premature entry to fast recovery during FRTO. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit dd14cbc994709a1c5a64ed3621f583c49a27e521 Author: Tejun Heo Date: Mon Jun 11 14:04:01 2007 +0900 sysfs: fix race condition around sd->s_dentry, take#2 Allowing attribute and symlink dentries to be reclaimed means sd->s_dentry can change dynamically. However, updates to the field are unsynchronized leading to race conditions. This patch adds sysfs_lock and use it to synchronize updates to sd->s_dentry. Due to the locking around ->d_iput, the check in sysfs_drop_dentry() is complex. sysfs_lock only protect sd->s_dentry pointer itself. The validity of the dentry is protected by dcache_lock, so whether dentry is alive or not can only be tested while holding both locks. This is minimal backport of sysfs_drop_dentry() rewrite in devel branch. Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 6aa054aadfea613a437ad0b15d38eca2b963fc0a Author: Tejun Heo Date: Mon Jun 11 14:03:27 2007 +0900 sysfs: fix condition check in sysfs_drop_dentry() The condition check doesn't make much sense as it basically always succeeds. This causes NULL dereferencing on certain cases. It seems that parentheses are put in the wrong place. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit dc351252b33f8fede396d6173dba117bcb933607 Author: Eric Sandeen Date: Mon Jun 11 14:02:45 2007 +0900 sysfs: store sysfs inode nrs in s_ino to avoid readdir oopses Backport of ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc1/2.6.22-rc1-mm1/broken-out/gregkh-driver-sysfs-allocate-inode-number-using-ida.patch For regular files in sysfs, sysfs_readdir wants to traverse sysfs_dirent->s_dentry->d_inode->i_ino to get to the inode number. But, the dentry can be reclaimed under memory pressure, and there is no synchronization with readdir. This patch follows Tejun's scheme of allocating and storing an inode number in the new s_ino member of a sysfs_dirent, when dirents are created, and retrieving it from there for readdir, so that the pointer chain doesn't have to be traversed. Tejun's upstream patch uses a new-ish "ida" allocator which brings along some extra complexity; this -stable patch has a brain-dead incrementing counter which does not guarantee uniqueness, but because sysfs doesn't hash inodes as iunique expects, uniqueness wasn't guaranteed today anyway. Signed-off-by: Eric Sandeen Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 6f8a7c66e2dc8080950d28edc0259f37739aead9 Author: Brice Goglin Date: Mon Jun 11 20:27:07 2007 +0200 myri10ge: update driver version Update myri10ge driver version to 1.3.1-1.248. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 798a95dbd38b113a0f6f3bfe8a2769b261046d09 Author: Brice Goglin Date: Mon Jun 11 20:26:50 2007 +0200 myri10ge: report when the link partner is running in Myrinet mode Since Myri-10G boards may also run in Myrinet mode instead of Ethernet, add a message when we detect that the link partner is not running in the right mode. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit f181137f9d70dc851dcb418cdad4df7888a0bfd3 Author: Brice Goglin Date: Mon Jun 11 20:26:31 2007 +0200 myri10ge: limit the number of recoveries Limit the number of recoveries from a NIC hw watchdog reset to 1 by default. It enables detection of defective NICs immediately since these memory parity errors are expected to happen very rarely (less than once per century*NIC). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit c27e672172def41924ea8410398554c49c17b3c1 Author: Mithlesh Thukral Date: Mon Jun 11 03:30:58 2007 -0700 NetXen: Fix link status messages NetXen: Fix incorrect link status even with switch turned OFF. NetXen driver failed to accurately indicate when a link is up or down. This was encountered during failover testing, when the first port indicated that the link was up even when the 10G switch it was assigned to in the Bladecenter was turned off completely. Signed-off by: Wen Xiong Signed-off by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit ca93ca428b8e09973f19e2725bf19cb3f1836034 Author: Jeff Garzik Date: Tue Jun 12 18:52:31 2007 -0400 Revert "[netdrvr e100] experiment with doing RX in a similar manner to eepro100" This reverts commit d52df4a35af569071fda3f4eb08e47cc7023f094. This patch attempted to fix e100 for non-cache coherent memory architectures by using the cb style code that eepro100 had and using the EL and s bits from the RFD list. Unfortunately the hardware doesn't work exactly like this and therefore this patch actually breaks e100. Reverting the change brings it back to the previously known good state for 2.6.22. The pending rewrite in progress to this code can then be safely merged later. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 3d7dbeac58d0669c37e35a3b91bb41c0146395ce Author: David S. Miller Date: Tue Jun 12 14:36:42 2007 -0700 [TCP]: Disable TSO if MD5SIG is enabled. Signed-off-by: David S. Miller commit 606f585e363527da9feaed79465132c0c661fd9e Author: Konstantin Sharlaimov Date: Tue Jun 12 14:16:59 2007 -0700 [PPP_MPPE]: Fix "osize too small" check. Prevent mppe_decompress() from generating "osize too small" errors when checking for output buffer size. When receiving a packet of mru size the output buffer for decrypted data is 1 byte too small since mppe_decompress() tries to account for possible PFC, however later in code it is assumed no PFC. Adjusting the check prevented these errors from occurring. Signed-off-by: Konstantin Sharlaimov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 82fde74b94f11eee1e9c30e43fb162f80a5e63c0 Author: Luis Carlos Date: Thu Jun 7 16:40:59 2007 -0400 [PATCH] libertas: convert libertas_mpp into anycast_mask With firmware 5.220.11.p5, this allows to specify the anycast addresses the device will listen to. The anycast address range is C0:27:C0:27:C0:XX where XX goes from 00 to 1F (or 0 to 31 in dec). The value to write on anycast_mask will specify which addresses the device listens to. Bits in a 32 bit int are numbered from 0 (least significative bit) to 31. A specific address ending in YY will be listened to if bit YY in the value is set to one. Examples: 0x00000000 : do not listen to any anycast address 0xFFFFFFFF : listen to every anycast address from :00 to :1F 0x00000013 : listen to anycast addresses :00, :01 and :04 Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville commit 2fb3bd6a23e5d37889a78b6a13a124fa7c586009 Author: Dan Williams Date: Mon Jun 4 20:05:23 2007 -0400 [PATCH] libertas: actually send mesh frames to mesh netdev Found by Luis; got broken during module split. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit fff47f108d7bd9f80b223cd187e09dbb0cb89114 Author: Luis Carlos Cobo Rus Date: Wed May 30 12:16:13 2007 -0400 [PATCH] libertas: deauthenticate from AP in channel switch This avoids channel mismatch between driver and firmware in case we change channel while associated to an AP. Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit b8bedefd8fe589ff87a681e20583c8317030491d Author: Luis Carlos Cobo Rus Date: Wed May 30 12:14:34 2007 -0400 [PATCH] libertas: pull current channel from firmware on mesh autostart Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit 42c059ea2b0aac5f961253ba81c1b464d181a600 Author: Roland Dreier Date: Tue Jun 12 10:52:02 2007 -0700 IB/mlx4: Fix warning in rounding up queue sizes Doing max(1, foo) where foo is u32 generates a warning, because 1 is a signed constant. Fix this by using 1U instead. Signed-off-by: Roland Dreier commit 614c3c85b5b4c3776439d464939c123cce679dee Author: Roland Dreier Date: Tue Jun 12 10:50:42 2007 -0700 IB/mlx4: Fix handling of wq->tail for send completions Cast the increment added to wq->tail when send completions are processed to u16 to avoid using wrong values caused by standard integer promotions. The same bug was fixed in libmlx4 by Eli Cohen . Signed-off-by: Roland Dreier commit 462b529f91b618f4bd144bbc6184f616dfb58a1e Author: Grant Grundler Date: Sun Jun 10 16:31:41 2007 -0600 [PARISC] remove global_ack_eiem Kudos to Thibaut Varene for spotting the (mis)use of appropriately named global_ack_eiem. This took a long time to figure out and both insight from myself, Kyle McMartin, and James Bottomley were required to narrow down which bit of code could have this race condition. The symptom was interrupts stopped getting delivered while some workload was generating IO interrupts on two different CPUs. One of the interrupt sources would get masked off and stay unmasked. Problem was global_ack_eiem was accessed with read/modified/write sequence and not protected by a spinlock. PA-RISC doesn't need a global ack flag though. External Interrupts are _always_ delivered to a single CPU (except for "global broadcast interrupt" which AFAIK currently is not used.) So we don't have to worry about any given IRQ vector getting delivered to more than one CPU. Tested on a500 and rp34xx boxen. rsync to/from gsyprf11 (a500) would lock up the box since NIC (tg3) interrupt and SCSI (sym2) were on "opposite" CPUs (2 CPU system). Put them on the same CPU or apply this patch and 10GB of data would rsync completely. Please apply the following critical patch. thanks, grant Signed-off-by: Grant Grundler Acked-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 8c4df74e02b0853ad86d1595fb6065d6c26fb196 Author: Dmitry Torokhov Date: Tue Jun 12 00:33:32 2007 -0400 Input: i8042 - add ULI EV4873 to noloop list The box does not implement AUX LOOP command properly and so we can't test for AUX IRQ delivery so blacklist it via DMI and assume that AUX port is present. Signed-off-by: Dmitry Torokhov commit 90245c17d3170438a0445614cbc5f72c1717d583 Author: Dmitry Torokhov Date: Tue Jun 12 00:33:27 2007 -0400 Input: i8042 - add ASUS P65UP5 to the noloop list This board does not raise AUX IRQ in response to AUX LOOP command which interferes with our test for proper AUX IRQ wiring. Put it in the blacklist and assume mouse is present. Signed-off-by: Dmitry Torokhov commit c6f8d7066d18ac86ff88627d858b749d9ba168bc Author: Ondrej Zary Date: Tue Jun 12 00:33:13 2007 -0400 Input: usbtouchscreen - fix fallout caused by move from drivers/usb During the move from drivers/usb/input into drivers/input/touchscreen Kconfig variables were shuffled a bit to use a new namespace (CONFIG_TOUCHSCREEN) while usbtouchscreen was still using old ones. Also noticed by Robert P. J. Day Signed-off-by: Ondrej Zary Signed-off-by: Daniel Ritz Signed-off-by: Dmitry Torokhov commit 78bfd36169398bfc07bca218952a429bf301bc55 Author: Timothy Shimmin Date: Mon Jun 11 20:42:09 2007 -0700 [XFS] Update the MAINTAINERS file entry for XFS. Remove David Chatterton from XFS entry in MAINTAINERS file. Signed-off-by: Tim Shimmin commit 14042cbefce4af12f7ca35d2604686154d803291 Author: Mattias Nissler Date: Fri Jun 8 15:31:13 2007 +0200 [PATCH] mac80211: Don't stop tx queue on master device while scanning. mac80211 stops the tx queues during scans. This is wrong with respect to the master deivce tx queue, since stopping it prevents any probes from being sent during the scan. Instead, they accumulate in the queue and are only sent after the scan is finished, which is obviously wrong. Signed-off-by: Mattias Nissler Signed-off-by: John W. Linville commit 0107136c04290ddd765adc568fe7a335d355d17e Author: Johannes Berg Date: Mon Jun 11 08:07:13 2007 +0200 [PATCH] mac80211: fix debugfs tx power reduction output This patch fixes a typo in mac80211's debugfs.c. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c9aca9da026036306aa00a928f6acb4b94eb3c33 Author: David Lamparter Date: Mon Jun 4 00:06:51 2007 +0200 [PATCH] cfg80211: fix signed macaddress in sysfs Fix signedness mixup making mac addresses show up strangely (like 00:11:22:33:44:ffffffaa) in /sys/class/ieee80211/*/macaddress. Signed-off-by: David Lamparter Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 2648a53acf16a837e11836203aadb219bd951a1e Author: Sam Ravnborg Date: Mon Jun 11 21:52:04 2007 +0200 kbuild: fix sh64 section mismatch problems There's a special .cranges section that is almost always generated, with data being moved to the appropriate section by the linker at a later stage. To give a bit of background, sh64 has both a native SHmedia instruction set (32-bit instructions) and SHcompact (which is compatability with normal SH -- 16-bit, a massively reduced register set, etc.). code ranges are emitted when we're using the 32-bit ABI, but not the 64-bit one. It is a special staging section used solely by binutils where code with different flags get placed (more specifically differing flags for input and output sections), before being lazily merged by the linker. The closest I've been able to find to documentation is: http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/emultempl/sh64elf.em?rev=1.10&content-type=text/x-cvsweb-markup&cvsroot=src It's an array of 8-byte Elf32_CRange structure given in http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/bfd/elf32-sh64.h?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=src that describes for which ISA a range is used. Silence the warnings by allowing references from .init.text to .cranges. The following warnings are fixed: WARNING: init/built-in.o(.cranges+0x0): Section mismatch: reference to .init.text: WARNING: init/built-in.o(.cranges+0xa): Section mismatch: reference to .init.text: WARNING: init/built-in.o(.cranges+0x14): Section mismatch: reference to .init.text: WARNING: init/built-in.o(.cranges+0x1e): Section mismatch: reference to .init.text: WARNING: init/built-in.o(.cranges+0x28): Section mismatch: reference to .init.text: WARNING: init/built-in.o(.cranges+0x32): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x50): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x5a): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x64): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0xfa): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x104): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x10e): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x14a): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x154): Section mismatch: reference to .init.text: WARNING: kernel/built-in.o(.cranges+0x15e): Section mismatch: reference to .init.text: WARNING: mm/built-in.o(.cranges+0x6e): Section mismatch: reference to .init.text: WARNING: mm/built-in.o(.cranges+0x78): Section mismatch: reference to .init.text: WARNING: mm/built-in.o(.cranges+0x82): Section mismatch: reference to .init.text: WARNING: mm/built-in.o(.cranges+0xaa): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x136): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x140): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x14a): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x168): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x1f4): Section mismatch: reference to .init.text: WARNING: fs/built-in.o(.cranges+0x1fe): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x302): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x30c): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x316): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x3a2): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x3ac): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x4ce): Section mismatch: reference to .init.text: WARNING: net/built-in.o(.cranges+0x4d8): Section mismatch: reference to .init.text: Signed-off-by: Paul Mundt Cc: Kaz Kojima Signed-off-by: Sam Ravnborg commit 717c9339202a42ae7bec7d3c4b84deecdcae9f81 Author: Dan Williams Date: Tue May 29 00:03:31 2007 -0400 [PATCH] libertas: reduce SSID and BSSID mixed-case abuse Kill mixed case function names from scan.c/scan.h. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 8cf1dc098fda226a0c3baa27ec737ce041acbb46 Author: Dan Williams Date: Mon May 28 23:56:10 2007 -0400 [PATCH] libertas: remove WPA_SUPPLICANT structure Unused. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit d8efea254887128d710cc1475505514da004932c Author: Dan Williams Date: Mon May 28 23:54:55 2007 -0400 [PATCH] libertas: remove structure WLAN_802_11_SSID and libertas_escape_essid Replace WLAN_802_11_SSID with direct 'ssid' and 'ssid_len' members like ieee80211. In the process, remove private libertas_escape_essid and depend on the ieee80211 implementation of escape_essid instead. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 785e8f2679ce9ae703f1c737aa4d48b315d511ca Author: Dan Williams Date: Fri May 25 23:51:12 2007 -0400 [PATCH] libertas: tweak association debug output Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 707985b3850f6ff168340e20b7f6b783782fb8ed Author: David Woodhouse Date: Fri May 25 23:41:16 2007 -0400 [PATCH] libertas: fix big-endian associate command. Byte-swapping length fields and then passing them to memcpy() considered harmful. Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit e5b3d472ad4eaa9013fd9f67f7a1b132f3ec910c Author: David Woodhouse Date: Fri May 25 23:40:21 2007 -0400 [PATCH] libertas: don't byte-swap firmware version number. It's a byte array. Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 86760088a7c51ccc263ec3b8039ec9a7400a6d70 Author: David Woodhouse Date: Fri May 25 23:39:34 2007 -0400 [PATCH] libertas: more endianness fixes, in tx.c this time Now we finally get connectivity. For a while, before something else dies... Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit bb793e2bfc25b8891b84b8fe3cb4b77cd4619814 Author: David Woodhouse Date: Fri May 25 23:38:14 2007 -0400 [PATCH] libertas: More endianness fixes. Now it at least manages to load the firmware. Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 981f187b7c4b237011d4175cae0120d5d203c0fd Author: David Woodhouse Date: Fri May 25 23:36:54 2007 -0400 [PATCH] libertas: first pass at fixing up endianness issues Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 123e0e044091ca35a4766b38ae15032f2d41bcd6 Author: Dan Williams Date: Fri May 25 23:23:43 2007 -0400 [PATCH] libertas: sparse fixes Fix various issues reported by sparse. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 0e8a5bd9502f709ddd1ea441ef0362fad3e4a4a1 Author: David Woodhouse Date: Fri May 25 23:15:27 2007 -0400 [PATCH] libertas: fix character set in README Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 7d8d28b31d16875f868889264efbba1f6c516860 Author: Luis Carlos Cobo Rus Date: Fri May 25 23:12:19 2007 -0400 [PATCH] libertas: support for mesh autostart on firmware 5.220.11 Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit f5e05b697d2105e5c3f9d837046a8c33ee5b7e14 Author: Luis Carlos Cobo Rus Date: Fri May 25 23:08:34 2007 -0400 [PATCH] libertas: split wext for eth and msh Separate wireless handlers of mshX and ethX. ethX remains as before. For mshX, it has been disabled set/get essid, wap and set mode. Get mode always returns "Repeater" and by now we use the Nickname to show if the mesh is active ("Mesh") or not (empty). The rest remains as before. Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit 0a0d08aca5d0a77da4b66de289acfd891a3e72e1 Author: Luis Carlos Cobo Rus Date: Fri May 25 23:05:27 2007 -0400 [PATCH] libertas: make mac address configuration work with mesh interface too Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit a23c58a3ac4090a41e63ae5b69af87b409abe019 Author: Luis Carlos Cobo Rus Date: Fri May 25 23:04:13 2007 -0400 [PATCH] libertas: updated readme file Fix some wording and blinding table command options, clarify argument list for fwt_add and fwt_list, simplify fwt_list_route Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit 90a42210f275e1f828eb6c08bf8252c2d6a774e0 Author: Dan Williams Date: Fri May 25 23:01:24 2007 -0400 [PATCH] libertas: Make WPA work through supplicant handshake Fix WPA so it works up through the supplicant 4-Way handshake process. Doesn't successfully pass traffic yet; may be problems installing the GTK to the firmware. - RSN needs to be enabled before the association command is sent - Use keys from the association request not the adapter structure - cmd_act_mac_strict_protection_enable != IW_AUTH_DROP_UNENCRYPTED - Fix network filtering logic in is_network_compatible() WPA helpers Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 45f43de829981e9b9de56d6098d00d511b4fb56c Author: Dan Williams Date: Fri May 25 22:58:55 2007 -0400 [PATCH] libertas: add more verbose debugging to libertas_cmd_80211_authenticate Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 57361c6edc5801636eeeef0100d3071ab0b5c573 Author: Dan Williams Date: Fri May 25 22:54:50 2007 -0400 [PATCH] libertas: debug print spacing fixes in assoc.c Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit d9ad2f5df89c66b5eae6ac5aaabe62508baba4ef Author: Dan Williams Date: Fri May 25 22:38:41 2007 -0400 [PATCH] libertas: send SIOCGIWSCAN event after partial scans too Any time the driver gets new scan results, even from partial scans, it should send the scan event to userspace. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit aeea0ab45ae3d761064ca926863bb41f0ad167ce Author: Dan Williams Date: Fri May 25 22:30:48 2007 -0400 [PATCH] libertas: honor specific channel requests during association Previously if a fixed channel was specified along with an SSID, the channel request would be ignored during the association process. Instead, when searching for an adhoc or infrastructure network to join, allow filtering results based on channel so that the driver doesn't pick a BSS on a different channel than requested. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit ac26f81ccecc23ad5d8c20ebe1dd482fa395298b Author: Dan Williams Date: Fri May 25 22:19:59 2007 -0400 [PATCH] libertas: fix default adhoc channel Inadvertently removed on a previous commit; causes the first adhoc start to fail if a channel has not been set or no other association has been made. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 80e78ef74dffb2195e2a1164c18579180a76fd5b Author: Dan Williams Date: Fri May 25 22:18:47 2007 -0400 [PATCH] libertas: fix deadlock SIOCGIWSCAN handler Update signal quality before the locked scan result translation loop, because calling libertas_prepare_and_send_command() with the 'waitforrsp' option grabs adapter->lock in the command return processing, leading to the deadlock. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 94b23855c034ffa50e1f94f43ef4500520e4c36e Author: Dan Williams Date: Fri May 25 21:59:29 2007 -0400 [PATCH] libertas: correct error report paths for wlan_fwt_list_ioctl Ensure the leave debug print gets triggered when necessary. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 6cfb00823872d0181c5c72c2d457de93518d96e7 Author: Dan Williams Date: Fri May 25 17:33:28 2007 -0400 [PATCH] libertas: correctly balance locking in libertas_process_rx_command adapter->lock should released after unlocking adapter->driver_lock to balance the order in which they were locked at the top of the function. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 24d443b5d568c6e11b07267e2d784f5f04aa5dac Author: Dan Williams Date: Fri May 25 17:29:34 2007 -0400 [PATCH] libertas: fix debug enter/leave prints for libertas_execute_next_command Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 3cf20931fa8ffd765a95f72d7539ab34770684d9 Author: Dan Williams Date: Fri May 25 17:28:30 2007 -0400 [PATCH] libertas: use compare_ether_addr() rather than memcmp() where appropriate Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 02eb229bbded41d189f1ec57dbd264f80c93b5c6 Author: Dan Williams Date: Fri May 25 17:27:31 2007 -0400 [PATCH] libertas: use MAC_FMT and MAC_ARG where appropriate Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit e76850d620a0a26fa807b4fa189c64a94789461e Author: Dan Williams Date: Fri May 25 17:09:41 2007 -0400 [PATCH] libertas: make association paths consistent The BSS to associate with (in either Infrastructure or IBSS join operations) is now stored in _one_ place in the association request (the bss member), not two places as before (pattemptedbss and curbssparams->bssdescriptor). Association requests are passed to the necessary association functions to (a) give them access to the bss member and (b) ensure that association/join/start setup uses settings from the request, not the current adapter settings (which may not be valid for the requested settings). Because the 'bss' member of the association request is used now, the command return functions from associate and adhoc join/start need access to the in-progress association request to update curbssparams when everything is done. The association worker moves the request from pending to in-progress for the duration of the association attempt. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit ef9a264b7a288a07c43ddb244c4f9ab0e8df90e4 Author: Dan Williams Date: Fri May 25 16:46:33 2007 -0400 [PATCH] libertas: move channel changing into association framework Handle channel changes through the deferred association framework rather than directly. Fixes errors when setting channels along with other parameters like mode and SSID. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit d43fb8ee3dab261e475d4f5189cf86182139b7f4 Author: Marcelo Tosatti Date: Fri May 25 16:28:20 2007 -0400 [PATCH] libertas: fix oops on rmmod Use list_for_each_entry_safe, to protect against list_del(). Signed-off-by: Marcelo Tosatti Signed-off-by: John W. Linville commit 0e37275e9af07be6aa796b3ee981054525980b74 Author: Luis Carlos Cobo Rus Date: Fri May 25 16:26:47 2007 -0400 [PATCH] libertas: cleanup of fwt_list_route processing Signed-off-by: Luis Carlos Cobo Rus Acked-by: Dan Williams Signed-off-by: John W. Linville commit eb8f7330e7edf655176c51a62cd2e34de91a1eba Author: Dan Williams Date: Fri May 25 16:25:21 2007 -0400 [PATCH] libertas: fix 'keep previous scan' behavior Do not clear the scan list except under specific conditions, such as when (a) user-requested, or (b) joining/starting an adhoc network. Furthermore, only clear entries which match the SSID or BSSID of the request, not the whole scan list. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit fcdb53dbc743f288bf72e485fefb3a967b733686 Author: Dan Williams Date: Fri May 25 16:15:56 2007 -0400 [PATCH] libertas: make scan result handling more flexible - use a linked list for scan results - age scan results - pass bss_descriptors around instead of indexes into the scan table - lock access to the scan results - stop returning EAGAIN from SIOCGIWSCAN handler Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 90e8eafc93ed159846bb7126af8502f2a8570a11 Author: Luis Carlos Cobo Date: Fri May 25 13:53:26 2007 -0400 [PATCH] libertas: updated mesh commands for 5.220.9.p11 Updated commands fwt_add and fwt_list, bt_list. New commands: bt_get_invert, bt_set_invert, to invert the blinding table, i.e., receive only frames from nodes listed in the BT. This patch needs/is needed for firmware 5.220.9.p11. Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville commit 7db283c914457dbeb72878df0641f4a5e05d75fa Author: Luis Carlos Cobo Rus Date: Fri May 25 13:48:54 2007 -0400 [PATCH] libertas: version bump (321p0) and cmds update for new fw (5.220.10.p0) This patch along with the previous commands update one, is necessary for mesh and fwt ioctls to work properly with firmware version 5.220.10.p0 and later. Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville commit 1db733eff6319cdf4199fc7d3a3554fef1361f1a Author: Dan Williams Date: Fri May 25 13:36:57 2007 -0400 [PATCH] libertas: don't tear down netdev in libertas_activate_card libertas_activate_card() doesn't create the netdev, and shouldn't free it on error. The caller of libertas_activate_card() is responsible for cleaning up errors from libertas_add_card(), not libertas_activate_card(). Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit c72368310d6799da92ec12192d8b15c2ae7ab0b5 Author: Dan Williams Date: Fri May 25 13:35:23 2007 -0400 [PATCH] libertas: correctly unregister mesh netdev on error Subject says it all. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 4ace1138767869547944798ba9f1fd6d1e048acb Author: Dan Williams Date: Fri May 25 13:16:38 2007 -0400 [PATCH] libertas: replace 'macaddress' with 'bssid' Start to normalize bss_descriptor with ieee80211_network so we can eventually replace bss_descriptor more easily. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 7732ca45c68f893689a8c0d8c6e2eb2bfefbc087 Author: Dan Williams Date: Fri May 25 13:13:25 2007 -0400 [PATCH] libertas: call SET_NETDEV_DEV from common code Move usage of SET_NETDEV_DEV into common code since it has nothing to do with bus-specific devices. Also fixes a bug where the mesh device was getting SET_NETDEV_DEV called after register_netdevice, resulting in no 'device' link in /sys/class/net/mshX/. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 0681f989357416d7ef28ebaea4151ce70a6ae21c Author: Luis Carlos Cobo Date: Fri May 25 13:11:13 2007 -0400 [PATCH] libertas: fixed kernel oops on module/card removal Fixed kernel oops on module/card removal (using dongles) Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville commit b46794dffab643e69d41c58a1a39c57b03826813 Author: Luis Carlos Cobo Date: Fri May 25 13:10:18 2007 -0400 [PATCH] libertas: add URB debug info Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville commit 60045136ab5c4a431c05a93804cb8f054240b34e Author: Luis Carlos Cobo Date: Fri May 25 13:08:33 2007 -0400 [PATCH] libertas: fixed incorrect assigment of fcs errors to frag errors Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville commit 634b8f49c11f49272b09d13a34b22a17b8c3d419 Author: Holger Schurig Date: Fri May 25 13:05:16 2007 -0400 [PATCH] libertas: remove unused variables in wlan_dev_t Actually, this patch removev wlan_dev_t totally and puts the used variables of it directly into wlan_private. That reduces one level of indirection and looks a little bit simpler. It's now "priv->card" and not "priv->wlan_dev.card" and "priv->dev" instead of "priv->wlan_dev.netdev" Changed two occurences of "((wlan_private *) dev->priv)->wlan_dev.netdev" into "dev", because I didn't see the point in doing pointer-ping-pong. The variables "ioport", "upld_rcv" and "upld_type" where unused. They have been removed. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit ec3eef28d9bc3fbcc5d3dd668dffcaa675015b11 Author: Holger Schurig Date: Fri May 25 12:49:10 2007 -0400 [PATCH] libertas: let DRV_NAME be overridable For now, it's "libertas" by default, but that is overwritten in if_usb.c/if_bootcmd.c and in if_cs.c. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 435a1acba23437a6c8462dd8437e48cdf09a2f71 Author: Holger Schurig Date: Fri May 25 12:41:52 2007 -0400 [PATCH] libertas: fix RESET logic at unload time Previously, we had a fixed array of 5 elements where we remembered all initialized devices. This has been changed to use a "struct list_head" organization, which is IMHO cleaner. Also renamed usb_cardp to cardp, as in the reset of the code. Renamed reset_device() to if_usb_reset_device() like many other functions. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 084708b61014776198c56d1606343d4f504c691e Author: Holger Schurig Date: Fri May 25 12:37:58 2007 -0400 [PATCH] libertas: split module into two (libertas.ko and usb8xxx.ko) * add CONFIG_LIBERTAS to Kconfig * remove global variable libertas_fw_name, the USB module might want to use a different default FW name than the CF module, so libertas_fw_name is now local to if_usb.c * exported some symbols as GPL Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit ed457037c5e8287a3fd24408250fb396b57b9a1b Author: Holger Schurig Date: Fri May 25 12:18:36 2007 -0400 [PATCH] libertas: move contents of fw.h to decl.h Also removes some useless "extern" declarations from function declaration. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 208fdd2f447899164bd139452c291b155e53cee9 Author: Holger Schurig Date: Fri May 25 12:17:06 2007 -0400 [PATCH] libertas: indirect all hardware access via hw_XXXX functions This functions makes all libertas_sbi_XXX functions static to the if_usb.c file and renames them to if_usb_XXXX(). The get called from other places of the source code via priv->hw_XXXX(). Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 0583e8ef149700ede2aa181509e217c39e565f28 Author: Chris Ball Date: Fri May 25 12:13:24 2007 -0400 [PATCH] libertas: wakeup both mesh and normal wakeup when getting out of scan The previous patch wakes up the mesh device *instead* of the wlan device when coming out of scan. We need to wake up both of them. Signed-off-by: Chris Ball Signed-off-by: John W. Linville commit 0601e7ee463f2736586de9a24025f8791db7f5a8 Author: Javier Cardona Date: Fri May 25 12:12:06 2007 -0400 [PATCH] libertas: added transmission failures to mesh statistics Added transmission failures to mesh statistics. Removed whitespace before newlines. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 6a8121572e2f2d188f04673bfa460ccfcedeb008 Author: Marcelo Tosatti Date: Fri May 25 12:09:13 2007 -0400 [PATCH] libertas: fix error handling of card initialization Subject says it all. Signed-off-by: Marcelo Tosatti Signed-off-by: John W. Linville commit 51d84f501684db22f5fcc30821cbbde2a0a2f264 Author: Javier Cardona Date: Fri May 25 12:06:56 2007 -0400 [PATCH] libertas: fixed transmission flow control on the mesh interface This patch implements proper transmission flow control on mshX. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8 Author: Holger Schurig Date: Fri May 25 12:04:31 2007 -0400 [PATCH] libertas: split wlan_add_card() Split wlan_add_card() into a part that just setups kernel parameters and into the function libertas_activate_card(), which will implizitly use hardware functions by the started thread. This allows us later to do something like this: priv = libertas_add_card(); priv->hw_command_to_host = if_usb_command_to_host; priv->hw_xxxx = if_usb_xxxx; priv->hw_yyyy = if_usb_yyyy; wlan_activate_card() and of course the CF driver can set it's own functions. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 3874d0fefd965eedfc7f8e0a5459ddf914eb4306 Author: Holger Schurig Date: Fri May 25 12:01:42 2007 -0400 [PATCH] libertas: move reset_device() code main.c to if_usb.c The reset_device() logic is only needed for USB devices, not for CF devices. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit fb3dddf22c63d7e0622d4819a87dbb8563f0e968 Author: Holger Schurig Date: Fri May 25 11:58:22 2007 -0400 [PATCH] libertas: changed some occurences of kmalloc() + memset(&a,0,sz) to kzalloc() The subject says it all. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 6df3073d2923c12b6f7524917a634e83de958dfe Author: Holger Schurig Date: Fri May 25 11:56:37 2007 -0400 [PATCH] libertas: fix SSID output * a newline was missing * changed %32s to '%s', no need to right justify the ESSID Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 1ac812f161801c276dd520def0e81b9938eb7761 Author: Holger Schurig Date: Fri May 25 11:55:19 2007 -0400 [PATCH] libertas: get rid of libertas_sbi_get_priv() It's not really needed, because we can call wlan_remove_card() with wlan_private* anyway. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit ed37b51610ff4e853893a92bb725bab99d17b236 Author: Holger Schurig Date: Fri May 25 11:52:42 2007 -0400 [PATCH] libertas: change debug output of libertas_interrupt() It used to be LBS_DEB_MAIN, now it's LBS_DEB_THREAD Also fixed a missing ":" in lbs_deb_enter() Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 78523daa86cf0b02c4d2f73b962c04ad565e9140 Author: Holger Schurig Date: Fri May 25 11:49:19 2007 -0400 [PATCH] libertas: single out mesh code This patches adds the two functions wlan_add_mesh() and wlan_remove_mesh(), which are responsible for the mshX interface. In a CF driver with a non- mesh-aware firmware you can omit the calls to this functions. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit a46c64108b06ec68337e62e7c2d4b3e8aed74b82 Author: Holger Schurig Date: Fri May 25 11:32:07 2007 -0400 [PATCH] libertas: tune debug code * renamed module parameter back to libertas_debug * change from bit shifts to constants, that way it's easier to look at the source and specify the libertas_debug=0xXXXX module parameter * moved module_param from fw.c to main.c, where it belongs better Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 9012b28a407511fb355f6d2176a12d4653489672 Author: Holger Schurig Date: Fri May 25 11:27:16 2007 -0400 [PATCH] libertas: make debug configurable The debug output of libertas was either not present or it was overwhelming. This patch adds the possibility to specify a bitmask for the area of interest. One should then only get the desired output. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 46868202b2dd22156460a220553a223f406f4f22 Author: Holger Schurig Date: Fri May 25 00:37:28 2007 -0400 [PATCH] libertas: exclude non-used code when PROC_DEBUG is not set This reduces usb8xxx.ko by 951 bytes (text) and 256 bytes (data) when PROC_DEBUG isn't defined. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 2be9219680e8abfa79da74e8d827ecf5c41be76d Author: Marcelo Tosatti Date: Fri May 25 00:33:28 2007 -0400 [PATCH] libertas: fix scanning from associate path The previous scan fix did not account for scan paths other than set_scan() that need to do a full scan at once. Add a "full_scan" parameter to wlan_scan_networks() to control such behaviour. Signed-off-by: Marcelo Tosatti Signed-off-by: John W. Linville commit bf68dac89b6502f8577a8be1b4fc06cb641ae1f3 Author: Holger Schurig Date: Fri May 25 00:14:38 2007 -0400 [PATCH] libertas: make libertas_wlan_data_rates static Move libertas_wlan_data_rates into wext.c and make it static. wext.c is the only user of this array. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 66fcc559042d85d57d9856d2a7fbcaa3e827a58c Author: Holger Schurig Date: Fri May 25 00:11:58 2007 -0400 [PATCH] libertas: move vendor & product id's into if_usb.c For me it looks cleaner, because it removes one level of indirection. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 7b1d5c0b604df6cee31b2c0160ede3f1311fbb66 Author: Holger Schurig Date: Fri May 25 00:09:54 2007 -0400 [PATCH] libertas: remove unused/superfluous definitions of DEV_NAME_LEN DEV_NAME_LEN is already defined in defs.h and that is sufficient. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 42fff92aa53fd5903f318e16fbbcc9176403562c Author: Holger Schurig Date: Fri May 25 00:07:38 2007 -0400 [PATCH] libertas: remove __FILE__ from debug output Remove filename from debug output because it's way too long. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 5c20676fcda300c023d55ba1221b5ff4ab749537 Author: Marcelo Tosatti Date: Fri May 25 00:04:11 2007 -0400 [PATCH] libertas: remove deprecated pm_register and associated code Subject says it all. Signed-off-by: Marcelo Tosatti Signed-off-by: John W. Linville commit 0b7db95602d0eb5339c7b7a9c7beff4b146bdeec Author: Holger Schurig Date: Thu May 24 23:47:34 2007 -0400 [PATCH] libertas: fix removal of all debugfs files rmmod did not remove /sys/kernel/debug/libertas_wireless/eth1/ subscribed_events/high_snr. After I fixed this, I noticed that it also didn't remove /sys/kernel/debug/libertas_wireless/eth1 as well. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 604ba49150987e48a94f2a704ba4e44479901c5c Author: Holger Schurig Date: Thu May 24 23:42:42 2007 -0400 [PATCH] libertas: a debug output was missing a newline Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit eb3ce631f9abc45a98a12699d5a25742fd8421e7 Author: Holger Schurig Date: Thu May 24 23:41:15 2007 -0400 [PATCH] libertas: rename wlan_association_worker Renames wlan_association_worker into libertas_association_worker Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 064827edf6901e5fcbd84fc258fb2326a530da9c Author: Marcelo Tosatti Date: Thu May 24 23:37:28 2007 -0400 [PATCH] libertas: scan two channels per scan command Scan two channels per each command on set_scan(), then bail out and let get_scan() continue the scanning work up to the last channel. This gives time to the firmware so it can go back to the association channel and keep the connection alive. Fixes http://dev.laptop.org/ticket/841 Signed-off-by: Marcelo Tosatti Signed-off-by: John W. Linville commit ff72b7a6188088976bf7d77d3309a9b2f1716071 Author: Ralf Baechle Date: Thu Jun 7 13:17:30 2007 +0100 [MIPS] Fix smp barriers in test_and_{change,clear,set}_bit Signed-off-by: Ralf Baechle commit e10e0cc8852ac846d5590188b935c98742e5cc43 Author: Atsushi Nemoto Date: Fri Jun 1 23:40:59 2007 +0900 [MIPS] Fix IP27 build IP27 does no longer have ZONE_DMA. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 4ebd5233f0420f1e383c38f962ec84c4d53fbbad Author: Ralf Baechle Date: Thu May 31 16:15:01 2007 +0100 [MIPS] Fix modpost warnings by making start_secondary __cpuinit WARNING: arch/mips/kernel/built-in.o(.text+0x9a58): Section mismatch: reference to .init.text:cpu_report (between 'start_secondary' and 'smp_prepare_boot_cpu') WARNING: arch/mips/kernel/built-in.o(.text+0x9a60): Section mismatch: reference to .init.text:per_cpu_trap_init (between 'start_secondary' and 'smp_prepare_boot_cpu') WARNING: arch/mips/kernel/built-in.o(.text+0x9adc): Section mismatch: reference to .init.text:cpu_probe (between 'start_secondary' and 'smp_prepare_boot_cpu') mipsel-linux-objcopy -S -O srec --remove-section=.reginfo --remove-section=.mdebug --remove-section=.comment --remove-section=.note --remove-section=.pdr --remove-section=.options --remove-section=.MIPS.options vmlinux arch/mips/boot/vmlinux.srec Signed-off-by: Ralf Baechle commit cf7578995398e20d3ab0748e6d5f83ea6c7a0035 Author: Chris Dearman Date: Tue May 29 20:01:55 2007 +0100 [MIPS] SMTC: Fix build error caused by nonsense code. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 6a05888d713dd915d3268000a479e38646aa423f Author: Ralf Baechle Date: Thu May 31 14:03:45 2007 +0100 [MIPS] SMTC: The MT ASE requires to initialize c0_pagemask and c0_wired. Signed-off-by: Ralf Baechle commit 8e8a52ed87e5b1fa60108b525774f2a28b4016d5 Author: Ralf Baechle Date: Thu May 31 14:00:19 2007 +0100 [MIPS] SMTC: Don't continue in set_vi_srs_handler on detected bad arguments. Signed-off-by: Ralf Baechle commit ef36fc3c5b37111d41827d00536364667a923235 Author: Ralf Baechle Date: Thu May 31 13:36:57 2007 +0100 [MIPS] SMTC: Fix warning. Signed-off-by: Ralf Baechle commit 7a6d4f38744e6453ec3bd359f751c34923207735 Author: Atsushi Nemoto Date: Tue May 29 23:29:40 2007 +0900 [MIPS] Wire up utimensat, signalfd, timerfd, eventfd Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d3a509118af28bac5b900aa4e642141853cdfd1c Author: Ralf Baechle Date: Fri May 25 15:46:38 2007 +0100 [MIPS] Atlas: Fix build. Signed-off-by: Ralf Baechle commit acaec427bc81199da41fb000ab1979041ebc3289 Author: Chris Dearman Date: Thu May 24 22:30:18 2007 +0100 [MIPS] Always install the DSP exception handler. Some non-DSP enabled cores 24K / 34K can generate a DSP exception where they are actually expected to produce a reserved instruction exception. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit da9bc7263dc7e32d52dd922fe3f46eb7107c0143 Author: Ralf Baechle Date: Thu May 24 14:56:58 2007 +0100 [MIPS] SMTC: Don't set and restore irqregs ptr from self_ipi. This did corrupt register s0 which the caller of self_ipi expects to be unchanged. This is a kernel bug which will only be triggered with the compilers which compile __smtc_ipi_replay to use s0 across the invocation of self_ipi. Gcc 4.1.2 does this, for example. Signed-off-by: Ralf Baechle commit fbf6ede2ce05592661cec04e04b88f6bab00eb09 Author: Maciej W. Rozycki Date: Mon May 21 13:47:22 2007 +0100 [MIPS] Fix KMODE for the R3000 This must be the oldest bug that we have got. Leaving interrupts "as they are" for the R3000 obviously means copying IEp to IEc. Since we have got STATMASK now, I took this opportunity to mask the status register "correctly" for the R3000 now too. Oh, and the R3000 hardly ever is 64-bit. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit c5760abde715dcd9ead66769e45d1896332e9d9c Author: Jean-Christian de Rivaz Date: Mon Jun 11 17:44:14 2007 +0800 Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived in the kernel like in uboot Signed-off-by: Jean-Christian de Rivaz Signed-off-by: Bryan Wu commit d6fe89b0630080e2bd6ece20ff7b1b5c2647ed62 Author: Bryan Wu Date: Mon Jun 11 17:34:17 2007 +0800 Blackfin SPI driver: fix bug SPI DMA incomplete transmission SPI writes intermittently drop bytes at end of DMA transfer http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3205 http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=2892 Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 6c1640d52b9b7355cd777c4f08bc930ac96d905b Author: Ben Dooks Date: Wed Jun 6 10:01:04 2007 +0100 [ARM] 4445/1: ANUBIS: Fix CPLD registers Update the ANUBIS register definitions inline with the specs and ensure they are registered correctly. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5698bd28c67775c722dc1f4ab82e0041c1c740ea Author: Ben Dooks Date: Wed Jun 6 10:36:09 2007 +0100 [ARM] 4444/2: OSIRIS: CPLD suspend fix Ensure the CPLD 8bit settings are preserved over a suspend/resume cycle as the CPU sends a hard-reset at resume time. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 55ba86bc6c33ce8b690fdf20ab485ef94cccd423 Author: Ben Dooks Date: Wed Jun 6 09:53:00 2007 +0100 [ARM] 4443/1: OSIRIS: Add watchdog device to machine devices Add the watchdog timer to the list of devices the Osiris registers at startup. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c362aecdb51ecb364d427a9b947fd2dfbd4cb86a Author: Ben Dooks Date: Wed Jun 6 09:51:51 2007 +0100 [ARM] 4442/1: OSIRIS: Fix CPLD register definitions Fix the CPLD register definitions to correctly mirror the documentation Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 27bb9e79bcfedc1888d23c3c212c189fa8534fe7 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin SPI driver: tweak spi cleanup function to match newer kernel changes Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell commit 566da5b2666e62a7b061b42964658697183bef1c Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin RTC drivers: update MAINTAINERS information Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: Alessandro Zummo commit 19aa6382e3c927b8ec5caec7b74c3dc555101146 Author: Mike Frysinger Date: Mon Jun 11 16:16:45 2007 +0800 Blackfin serial driver: decouple PARODD and CMSPAR checking from PARENB as the termios info does not stipulate that the former are dependent on the latter Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit cf68676222e54cd0a31efd968da00e65f9a0963f Author: Mike Frysinger Date: Mon Jun 11 16:12:49 2007 +0800 Blackfin serial driver: actually implement the break_ctl() function Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 9808901b6c63a1c850b072e624c228901a9eaf10 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin serial driver: ignore framing and parity errors if we get a break signal, we want to ignore framing and parity errors because those will always be set (by nature of the signal) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit c16c3ca79abcb69a9e45f7c15f8358b3915c0e49 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin serial driver: hook up our UARTs STP bit with userspaces CMSPAR so we can now do spaced/marked parity Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit df30b1171714bbf0e55ffe02138be4b8447e4235 Author: Mike Frysinger Date: Mon Jun 11 17:47:27 2007 +0800 Blackfin arch: move HI/LO macros into blackfin.h and punt the rest of macros.h as it includes VDSP macros we never use Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit de6a9520d4c799ce2079c59457b06251367e67b6 Author: Mike Frysinger Date: Mon Jun 11 17:27:05 2007 +0800 Blackfin arch: redo our linker script a bit - we can start taking advantages of defines in asm-generic/vmlinux.lds.h - move our L1 relocated sections into init so it gets freed after relocation Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 43a3188ea348c41a197a754164ff96cc48124d85 Author: Mike Frysinger Date: Thu Jun 14 13:33:37 2007 +0800 Blackfin arch: make sure we initialize our L1 Data B section properly based on the linked kernel Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 581d62ab304fb43d2ae4de06527676661b171cf6 Author: Michael Hennerich Date: Thu Jun 14 13:30:23 2007 +0800 Blackfin arch: fix bug can not wakeup from sleep via push buttons Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 5e10b4a653b9c7942fd1044fe5b592d544736897 Author: Mike Frysinger Date: Mon Jun 11 16:44:09 2007 +0800 Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit fd92348e520af92ddd48b8100cd0ccb16a055ed3 Author: Michael Hennerich Date: Mon Jun 11 16:39:40 2007 +0800 Blackfin arch: add missing gpio.h header to fix compiling in some pm configurations Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit e7613aab91270a6c76c61d3a1c05eaaa882b1842 Author: Michael Hennerich Date: Mon Jun 11 16:37:57 2007 +0800 Blackfin arch: As Mike pointed out range goes form m..MAX_BLACKFIN_GPIO -1 Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 00163e869e44f5489c33cd3ec0e502c33a0d4ba7 Author: Mike Frysinger Date: Mon Jun 11 16:22:18 2007 +0800 Blackfin arch: fix spelling typo in output Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 5af4c2b367c9c3dcc0cb02880df3a8581bb12a87 Author: Aubrey Li Date: Thu Jun 14 13:28:47 2007 +0800 Blackfin arch: try to split up functions like this into smaller units according to LKML review Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu commit 51be24c351bc9ee4937121100adb098eeb1effdd Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: add proper ENDPROC() add proper ENDPROC() to close out assembly functions so size/type is set properly in the final ELF image Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 52a078120c33b06a9abb721357adaafc3b55b7c1 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: move more of our startup code to .init so it can be freed once we are up and running Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 83a5c3e3218f138b1a99f787c76e380d6a6ecec9 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: unify differences between our diff head.S files -- no functional changes Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 16983de0cec7b93cc2568f96909d4ea7c118bd8a Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: update defconfigs Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 4dfefcf05417f98292a92f2face186d261867952 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: scrub old console defines since they arent respected anymore (use console=) and just confuse people Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit e3b2d3f33b3c1ef36b5c77ef581506915c73aad6 Author: Bryan Wu Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: fixup Blackfin MAINTIANERS team member list Signed-off-by: Bryan Wu commit bc61b4e69d26a1b9627d52ab45064eee9284aa72 Author: Mike Frysinger Date: Thu Jun 14 13:21:08 2007 +0800 Blackfin arch: implement a basic /proc/sram file for L1 allocation visibility implement a basic /proc/sram file for L1 allocation visibility until we can rewrite the entire L1 allocator (which would include a proper mechanism) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 321f6e0f5183e489448ae61af79cca1b7fe43e88 Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: mark our memory init functions with __init so they get freed after init Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 5716e514ed526a819775c45a73f1c8b65309e9d3 Author: Robin Getz Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: all symbols were offset by 4k, since we didn't have the __text label. Bug tracker: http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3231 Singed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 75ed405c63b3fc2402fb8ff825b0ebffcff26b57 Author: Roy Huang Date: Thu Jun 14 12:54:44 2007 +0800 Blackfin arch: fix bug ad1836 fails to build properly for BF533-EZKIT bug log here: http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3166 Signed-off-by: Roy Huang Signed-off-by: Bryan Wu commit d2d50aa97d695d83ccb2341488d977e8cfe36555 Author: Simon Arlott Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: spelling fixes Signed-off-by: Simon Arlott Signed-off-by: Bryan Wu commit ac1bd53c067397947b5d805c631519282f5678fe Author: Aubrey Li Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: DMA code minor naming convention fix Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Cc: Pekka Enberg commit db94d9d24526f83c432f0e5620078f02f7ae76ca Author: Mike Frysinger Date: Mon Jun 11 15:31:30 2007 +0800 Blackfin arch: remove defconfig file Since we have board-specific defconfigs and the default is set to BF537-STAMP, we no longer need this one Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit e141d999b682cda9907179e3b843acb64c34a1d8 Author: Tejun Heo Date: Sun Jun 10 14:26:20 2007 +0900 libata: limit post SRST nsect/lbal wait to ~100ms After SRST, libata used to wait for nsect/lbal to be set to 1/1 for the slave device. However, some ATAPI devices don't set nsect/lbal after SRST and the wait itself isn't too useful as we're gonna wait for !BSY right after that anyway. Before reset-seq update, nsect/lbal wait failure used to be ignored and caused 30sec delay during detection. After reset-seq, all timeouts are considered error conditions making libata fail to detect such ATAPI devices. This patch limits nsect/lbal wait to around 100ms. This should give acceptable behavior to such ATAPI devices while not disturbing the heavily used code path too much. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5acd50f641e697cb42240f278350a4f8eac9b4f5 Author: Tejun Heo Date: Sun Jun 10 14:52:36 2007 +0900 libata: force PIO on IOMEGA ZIP 250 ATAPI IOMEGA ZIP 250 ATAPI claims MWDMA0 support but fails SETXFERMODE if asked to configure itself to MWDMA0. Force PIO. This fixes bugzilla bug#8497. Signed-off-by: Tejun Heo Cc: Calvin Walton Signed-off-by: Jeff Garzik commit 5d4cae5fe2ea1a0974962e2c49dca5c9c4b14cc0 Author: Russell King Date: Sun Jun 10 12:22:20 2007 +0100 [ARM] VFP: fix section mismatch error Fix a real section mismatch issue; the test code is thrown away after initialisation, but if we do not detect the VFP hardware, it is left hooked into the exception handler. Any VFP instructions which are subsequently executed risk calling the discarded exception handler. Introduce a new "null" handler which returns to the "unrecognised fault" return address. Signed-off-by: Russell King commit 9b01bd5b284bbf519b726b39f1352023cb5e9e69 Author: Dave Airlie Date: Sun Jun 10 16:00:27 2007 +1000 drm: fix radeon setparam on 32/64 bit systems. The alignment on 64-bit is different for 64-bit values. Signed-off-by: Dave Airlie commit dc7a93190c21edbf3ed23e678ad04f852b9cff28 Author: Wang Zhenyu Date: Sun Jun 10 15:58:19 2007 +1000 drm/i915: Add support for the G33, Q33, and Q35 chipsets. These require that the status page be referenced by a pointer in GTT, rather than phsyical memory. So, we have the X Server allocate that memory and tell us the address, instead. Signed-off-by: Dave Airlie commit 2f4042b186b9bfe82f48fe801619c6c285c16bef Author: Wang Zhenyu Date: Fri Jun 1 22:03:44 2007 +1000 i915: add new pciids for 945GME, 965GME/GLE Signed-off-by: Dave Airlie commit 2c3d2a46f1ccf591850b20f4fdde12bcf2bf3dfd Author: Albert Lee Date: Thu Jun 7 16:01:17 2007 +0800 libata passthru: update cached device paramters INIT_DEV_PARAMS and SET_MULTI_MODE change the device parameters cached by libata. Re-read IDENTIFY DEVICE info and update the cached device paramters when seeing these commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit fa4453c4c94a61bbefe470b16ddbb6218481c6dc Author: Albert Lee Date: Thu Jun 7 15:52:07 2007 +0800 libata passthru: always enforce correct DEV bit Always enforce correct DEV bit since we know which drive the command is targeted. SAT demands to ignore the DEV bit, too. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 23cb1d718ddbeb718ed7ca5be283dcbfb63993c3 Author: Albert Lee Date: Thu Jun 7 15:50:44 2007 +0800 libata passthru: map UDMA protocols Map the ATA passthru UDMA protocols to ATA_PROT_DMA. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 1dce589c38c36ae69614840ee230183f3a7d43c5 Author: Albert Lee Date: Thu Jun 7 15:49:22 2007 +0800 libata passthru: support PIO multi commands support the pass through of PIO multi commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit f93f1078d08e0f63a6a4bdaa154de3642fc03d5d Author: Albert Lee Date: Thu Jun 7 15:47:13 2007 +0800 libata passthru: update protocol numbers Update the ATA passthru protocol numbers according to the new spec. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6070068b875f604ff3f62e6e342bbd4c1f34a895 Author: Alan Cox Date: Thu Jun 7 16:13:55 2007 +0100 libata: Correct abuse of language The controller is not reporting an unlawful type, it is reporting an invalid type. Illegal specifically means "prohibited by law" Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d92e74d353345d19f762e9501a50b0a5f43f7ba8 Author: Alan Cox Date: Thu Jun 7 16:19:15 2007 +0100 libata-core/sff: Fix multiple assumptions about DMA The ata IRQ ack functions are only used when debugging. Unfortunately almost every controller that calls them can cause crashes in some configurations as there are missing checks for bmdma presence. In addition ata_port_start insists of installing DMA buffers and pad buffers for controllers regardless. The SFF controllers actually need to make that decision dynamically at controller setup time and all need the same helper - so we add ata_sff_port_start. Future patches will switch the SFF drivers to use this. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0522b2869d89b095bf417c8cc6fa404842e91903 Author: Peer Chen Date: Thu Jun 7 18:05:12 2007 +0800 ahci: Add MCP73/MCP77 support to AHCI driver Add the MCP73/MCP77 support to ahci driver. Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit afe3cc51ba4be6b25b721c40f178ea4157751161 Author: Tejun Heo Date: Wed Jun 6 16:35:55 2007 +0900 libata: fix hw_sata_spd_limit initialization hw_sata_spd_limit used to be incorrectly initialized to zero instead of UINT_MAX if SPD is zero in SControl register. This breaks PHY speed down. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ef143d577ba98c8a53aee9aa60e7d1f07c32fd7a Author: Albert Lee Date: Tue Jun 5 13:01:33 2007 +0800 libata: print device model and firmware revision for ATAPI devices For ATA/CFA devices, libata prints out the device model and firmware revision. Do the same for ATAPI devices. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 22888423b3b1b96573250671afb5b72ea4364902 Author: Olof Johansson Date: Sun Jun 3 18:35:10 2007 -0500 libata: fix probe time irq printouts Most drivers don't seem to fill out the host->irq field, resulting in the wrong (no) irq being reported at probe time. For example, sil24 on my system: ata1: SATA max UDMA/100 cmd 0xd00008009001f000 ctl 0x0000000000000000 bmdma 0x0000000000000000 irq 0 ata2: SATA max UDMA/100 cmd 0xd000080090021000 ctl 0x0000000000000000 bmdma 0x0000000000000000 irq 0 Since they're allocated and set up in ata_host_activate(), just save them away there. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit bd9c5a39e4141678bd6242e5b74bfe39d8d0be35 Author: Tejun Heo Date: Fri Jun 8 22:20:59 2007 +0900 libata: disable NCQ for HITACHI HTS541680J9SA00/SB21C7EP HITACHI HTS541680J9SA00/SB21C7EP spuriously completes NCQ commands. Blacklist it for NCQ. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c3a44a47e8f60e8e4ae58d3a024b9a7ab293e673 Author: Yoichi Yuasa Date: Tue Jun 5 22:33:29 2007 +0900 remove unused variable in pata_isapnp This patch has removed unused variable in pata_ispnp. Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit c0811987c6909cd5463d107933217be113b75f4e Author: Sam Ravnborg Date: Sun Jun 10 00:50:51 2007 +0200 net: fix typo in drivers/net/usb/Kconfig Replace invisible character with a space. The diff looks like this on my terminal: - Choose this option if you're using a host-to-host cable - with one of these chips. + Choose this option if you're using a host-to-host cable + with one of these chips. Reported by: Massimo Maiurana Signed-off-by: Sam Ravnborg Cc: Massimo Maiurana Signed-off-by: Jeff Garzik commit 895ee682db14ed71860e22495280bdee4dae4738 Author: Kim Phillips Date: Tue Jun 5 18:46:47 2007 +0800 phylib: add RGMII-ID mode to the Marvell m88e1111 PHY to fix broken ucc_geth Support for configuring RGMII-ID (RGMII with internal delay) mode on the 88e1111 and 88e1145. Ucc_geth on MPC8360EMDS(the main user of ucc_geth) is broken after changed to use phylib. It is fixed by adding this internal delay. Also renamed 88e1111s -> 88e1111 (no references to an 88e1111s part were found), and fixed some whitespace. Signed-off-by: Kim Phillips Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit dec590c1bb05c1553b68cab7aa3ea36d77e7f9a3 Author: Thomas Klein Date: Wed Jun 6 20:53:16 2007 +0200 ehea: Fixed possible kernel panic on VLAN packet recv This patch fixes a possible kernel panic due to not checking the vlan group when processing received VLAN packets and a malfunction in VLAN/hypervisor registration. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 0d04761d17976ce560a22d9a21af575cd0d1bc21 Author: Mithlesh Thukral Date: Thu Jun 7 04:36:36 2007 -0700 NetXen: Fix compile failure seen on PPC architecture NetXen: Add NETXEN prefixes to macros to clean them up. This is a cleanup patch which adds NETXEN prefix to some stand alone macro names. These posed compile errors when NetXen driver was backported to 2.6.9 on PPC architecture as macros like USER_START are defined in file arch/ppc64/mm/hash_utils.c Signed-off-by: Andy Gospodarek Signed-off by: Wen Xiong Acked-off by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit 3e2facef86a1665d64961b541aa0773f5ca22125 Author: Mithlesh Thukral Date: Thu Jun 7 04:33:02 2007 -0700 NetXen: Fix ping issue after reboot on Blades with 3.4.19 firmware NetXen: Fix initialization and subsequent ping issue on 3.4.19 firmware This patch fixes the ping problem seen X/PBlades after the adapter's firmware was moved to 3.4.19. After configured interface up, ping failed. NetXen adapter couldn't accept ARP broadcast packet. Manual addition of MAC address in the ARP table, made ping work. NetXen adapter should finish initilization after system boot. But looks NetXen adapter didn't initilization correctly after system boot up. So have to re-load the firmware again in probe routine. Also re-initilization netxen_config_0 and netxen_config_1 registers. Signed-off by: Wen Xiong Signed-off by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit b4fea61a193bdd75f6667a0db04eb74b9ccbe39c Author: Dave Jones Date: Wed Jun 6 03:07:52 2007 -0400 typo in via-velocity.c http://bugzilla.kernel.org/show_bug.cgi?id=8160 Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit ce6eea58eb8f50f563663c6e723b4bbbe55b012e Author: Brian King Date: Fri Jun 8 14:05:17 2007 -0500 ibmveth: Automatically enable larger rx buffer pools for larger mtu Currently, ibmveth maintains several rx buffer pools, which can be modified through sysfs. By default, pools are not allocated by default such that jumbo frames cannot be supported without first activating larger rx buffer pools. This results in failures when attempting to change the mtu. This patch makes ibmveth automatically allocate these larger buffer pools when the mtu is changed. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit 4aa9c93e1c7911866c546651a5efbbf62914092e Author: Brian King Date: Fri Jun 8 14:05:16 2007 -0500 ibmveth: Fix h_free_logical_lan error on pool resize When attempting to activate additional rx buffer pools on an ibmveth interface that was not yet up, the error below was seen. The patch fixes this by only closing and opening the interface to activate the resize if the interface is already opened. (drivers/net/ibmveth.c:597 ua:30000004) ERROR: h_free_logical_lan failed with fffffffffffffffc, continuing with close Unable to handle kernel paging request for data at address 0x00000ff8 Faulting instruction address: 0xd0000000002540e0 Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=128 NUMA PSERIES LPAR Modules linked in: ip6t_REJECT xt_tcpudp ipt_REJECT xt_state iptable_mangle ipta ble_nat ip_nat iptable_filter ip6table_mangle ip_conntrack nfnetlink ip_tables i p6table_filter ip6_tables x_tables ipv6 apparmor aamatch_pcre loop dm_mod ibmvet h sg ibmvscsic sd_mod scsi_mod NIP: D0000000002540E0 LR: D0000000002540D4 CTR: 80000000001AF404 REGS: c00000001cd27870 TRAP: 0300 Not tainted (2.6.16.46-0.4-ppc64) MSR: 8000000000009032 CR: 24242422 XER: 00000007 DAR: 0000000000000FF8, DSISR: 0000000040000000 TASK = c00000001ca7b4e0[1636] 'sh' THREAD: c00000001cd24000 CPU: 0 GPR00: D0000000002540D4 C00000001CD27AF0 D000000000265650 C00000001C936500 GPR04: 8000000000009032 FFFFFFFFFFFFFFFF 0000000000000007 000000000002C2EF GPR08: FFFFFFFFFFFFFFFF 0000000000000000 C000000000652A10 C000000000652AE0 GPR12: 0000000000004000 C0000000004A3300 00000000100A0000 0000000000000000 GPR16: 00000000100B8808 00000000100C0F60 0000000000000000 0000000010084878 GPR20: 0000000000000000 00000000100C0CB0 00000000100AF498 0000000000000002 GPR24: 00000000100BA488 C00000001C936760 D000000000258DD0 C00000001C936000 GPR28: 0000000000000000 C00000001C936500 D000000000265180 C00000001C936000 NIP [D0000000002540E0] .ibmveth_close+0xc8/0xf4 [ibmveth] LR [D0000000002540D4] .ibmveth_close+0xbc/0xf4 [ibmveth] Call Trace: [C00000001CD27AF0] [D0000000002540D4] .ibmveth_close+0xbc/0xf4 [ibmveth] (unreliable) [C00000001CD27B80] [D0000000002545FC] .veth_pool_store+0xd0/0x260 [ibmveth] [C00000001CD27C40] [C00000000012E0E8] .sysfs_write_file+0x118/0x198 [C00000001CD27CF0] [C0000000000CDAF0] .vfs_write+0x130/0x218 [C00000001CD27D90] [C0000000000CE52C] .sys_write+0x4c/0x8c [C00000001CD27E30] [C00000000000871C] syscall_exit+0x0/0x40 Instruction dump: 419affd8 2fa30000 419e0020 e93d0000 e89e8040 38a00255 e87e81b0 80c90018 48001531 e8410028 e93d00e0 7fa3eb78 f81d0430 4bfffdc9 38210090 Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit b7e773b869f49bbd69e9dad76b34d3552627fac5 Author: G. Liakhovetski Date: Fri Jun 8 19:15:56 2007 -0700 [IrDA]: f-timer reloading when sending rejected frames. Jean II was right: you have to re-charge the final timer when resending rejected frames. Otherwise it triggers at a wrong time and can break the currently running communication. Reproducible under rt-preempt. Signed-off-by: G. Liakhovetski Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit c0cfe7faa12f189ef1024fce5a710791d0062355 Author: G. Liakhovetski Date: Fri Jun 8 19:15:17 2007 -0700 [IrDA]: Fix Rx/Tx path race. From: G. Liakhovetski We need to switch to NRM _before_ sending the final packet otherwise we might hit a race condition where we get the first packet from the peer while we're still in LAP_XMIT_P. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 217397d7d267f832081169016e1ab66691a13e08 Author: Robert P. J. Day Date: Fri Jun 8 13:47:07 2007 -0700 Protect from multiple inclusion Prevent from being included more than once, otherwise you get a redefinition error if you happen to include first. Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00df344fd06fd6ac71d0665f1ce8cc6870e4f564 Author: Andy Whitcroft Date: Fri Jun 8 13:47:06 2007 -0700 update checkpatch.pl to version 0.04 This version brings a some new tests, and a host of changes to fix false positives, of particular note: - check for and report #if 0 - extend checking of line lengths and spacing for .pl, .sh etc - extends the pointer type checks to multiple levels - updates printk handling to track newlines - adds a wrapped patch detector - drops the leading component of the filenames - extends switch indent handling to switch statmentes rooted in the context - adds foo * bar single pointer checks This version of checkpatch.pl can be found at the following URL: http://www.shadowen.org/~apw/public/checkpatch/checkpatch.pl-0.04 Full Changelog: Andy Whitcroft (16): allow checking line lengths and spacing on other source files clean up that whitespace sanitise the input line standardising the content of quotes clean up pointer type * and space checks fix up the sanitiser so it maintains the line length apply the printk facility checks only to the first printk in a set switch/case indent checks may anchor in the context add a wrapped patch detector put the #ifdef in C file checks on ice asm volatile is acceptable check for and report #if 0 drop the leading component of the filename as patches are -p1 use the original line when reporting operator errors correct spelling of Joel's name Version: 0.04 add support for struct foo * bar checks Geert Uytterhoeven (1): Fix checkpatch.pl name in usage template Randy Dunlap (1): checkpatch: produce fewer lines of output Signed-off-by: Andy Whitcroft Cc: Randy Dunlap Cc: Joel Schopp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7909234993973692414901055dfbebbca21e73f Author: Randy Dunlap Date: Fri Jun 8 13:47:04 2007 -0700 hexdump: more output formatting Add a prefix string parameter. Callers are responsible for any string length/alignment that they want to see in the output. I.e., callers should pad strings to achieve alignment if they want that. Add rowsize parameter. This is the number of raw data bytes to be printed per line. Must be 16 or 32. Add a groupsize parameter. This allows callers to dump values as 1-byte, 2-byte, 4-byte, or 8-byte numbers. Default is 1-byte numbers. If the total length is not an even multiple of groupsize, 1-byte numbers are printed. Add an "ascii" output parameter. This causes ASCII data output following the hex data output. Clean up some doc examples. Align the ASCII output on all lines that are produced by one call. Add a new interface, print_hex_dump_bytes(), that is a shortcut to print_hex_dump(), using default parameter values to print 16 bytes in byte-size chunks of hex + ASCII output, using printk level KERN_DEBUG. Signed-off-by: Randy Dunlap Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abb49202ff37bf2eca7296c62ad18c77f636ec8e Author: Alan Cox Date: Fri Jun 8 13:47:03 2007 -0700 MAINTAINERS: corrections The UFS entry was misformatted The NEC V850 links are all broken The Berkshire watchdog links are all broken Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389834b680c13f4727c14f70fa71c2c5678b6081 Author: Randy Dunlap Date: Fri Jun 8 13:47:03 2007 -0700 checkpatch: produce fewer lines of output Produce one less line of output per flagged incident. Change this: use tabs not spaces PATCH: /home/rddunlap/arcmsr1200014.patch4:756: FILE: b/drivers/scsi/arcmsr/arcmsr_hba.c:1843: + return PCI_ERS_RESULT_NEED_RESET;$ to this: use tabs not spaces #756: FILE: b/drivers/scsi/arcmsr/arcmsr_hba.c:1843: + return PCI_ERS_RESULT_NEED_RESET;$ Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76c4e5eafe93df0d03c9d1dc2e4e3efd344be34b Author: Jeff Mahoney Date: Fri Jun 8 13:47:02 2007 -0700 reiserfs: mailing list has moved This patch changes MAINTAINERS to reflect the new location of the reiserfs development mailing list. The old list forwards to the new one. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b39b70366c5be68affe9777de72846540d840464 Author: Andrew Morton Date: Fri Jun 8 13:47:01 2007 -0700 x86_64: oops_begin() fix We don't want to see this: > BUG: using smp_processor_id() in preemptible [00000001] code: bash/3857 > caller is oops_begin+0xb/0x6f > > Call Trace: > [] show_trace+0x34/0x4f > [] dump_stack+0x12/0x17 > [] debug_smp_processor_id+0xad/0xbc > [] oops_begin+0xb/0x6f > [] do_page_fault+0x66a/0x7c0 > [] error_exit+0x0/0x84 > coming out when the kernel is trying to oops. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12710a56cb56e81bd8f457cc2f50c2ebfc0cb390 Author: Bob Picco Date: Fri Jun 8 13:47:00 2007 -0700 fix sysrq-m oops We aren't sampling for holes in memory. Thus we encounter a section hole with empty section map pointer for SPARSEMEM and OOPs for show_mem. This issue has been seen in 2.6.21, current git and current mm. The patch below is for mainline and mm. It was boot tested for SPARSEMEM, current VMEMMAP of Andy's in mm ml and DISCONTIGMEM. A slightly different patch will be posted to stable for 2.6.21. Previous to commit f0a5a58aa812b31fd9f197c4ba48245942364eae memory_present was called for node_start_pfn to node_end_pfn. This would cover the hole(s) with reserved pages and valid sections. Most SPARSEMEM supported arches do a pfn_valid check in show_mem before computing the page structure address. This issue was brought to my attention on IRC by Arnaldo Carvalho de Melo. Thanks to Arnaldo for testing. Signed-off-by: Bob Picco Cc: Chuck Ebbert Cc: Andi Kleen Cc: Arnaldo Carvalho de Melo Acked-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778e9a9c3e7193ea9f434f382947155ffb59c755 Author: Alexey Kuznetsov Date: Fri Jun 8 13:47:00 2007 -0700 pi-futex: fix exit races and locking problems 1. New entries can be added to tsk->pi_state_list after task completed exit_pi_state_list(). The result is memory leakage and deadlocks. 2. handle_mm_fault() is called under spinlock. The result is obvious. 3. results in self-inflicted deadlock inside glibc. Sometimes futex_lock_pi returns -ESRCH, when it is not expected and glibc enters to for(;;) sleep() to simulate deadlock. This problem is quite obvious and I think the patch is right. Though it looks like each "if" in futex_lock_pi() got some stupid special case "else if". :-) 4. sometimes futex_lock_pi() returns -EDEADLK, when nobody has the lock. The reason is also obvious (see comment in the patch), but correct fix is far beyond my comprehension. I guess someone already saw this, the chunk: if (rt_mutex_trylock(&q.pi_state->pi_mutex)) ret = 0; is obviously from the same opera. But it does not work, because the rtmutex is really taken at this point: wake_futex_pi() of previous owner reassigned it to us. My fix works. But it looks very stupid. I would think about removal of shift of ownership in wake_futex_pi() and making all the work in context of process taking lock. From: Thomas Gleixner Fix 1) Avoid the tasklist lock variant of the exit race fix by adding an additional state transition to the exit code. This fixes also the issue, when a task with recursive segfaults is not able to release the futexes. Fix 2) Cleanup the lookup_pi_state() failure path and solve the -ESRCH problem finally. Fix 3) Solve the fixup_pi_state_owner() problem which needs to do the fixup in the lock protected section by using the in_atomic userspace access functions. This removes also the ugly lock drop / unqueue inside of fixup_pi_state() Fix 4) Fix a stale lock in the error path of futex_wake_pi() Added some error checks for verification. The -EDEADLK problem is solved by the rtmutex fixups. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a539a87280b3032fd12bc93a4a82f1d8aa97ca8 Author: Thomas Gleixner Date: Fri Jun 8 13:46:58 2007 -0700 rt-mutex: fix chain walk early wakeup bug Alexey Kuznetsov found some problems in the pi-futex code. One of the root causes is: When a wakeup happens, we do not to stop the chain walk so we follow a not longer relevant locking chain. Drop out when this happens. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Alexey Kuznetsov Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0d1d2bf5a28f78def7b68ca1eb5ba31aafd43a1 Author: Thomas Gleixner Date: Fri Jun 8 13:46:57 2007 -0700 rt-mutex: fix stale return value Alexey Kuznetsov found some problems in the pi-futex code. The major problem is a stale return value in rt_mutex_slowlock(): When the pi chain walk returns -EDEADLK, but the waiter was woken up during the phases where the locks were dropped, the rtmutex could be acquired, but due to the stale return value -EDEADLK returned to the caller. Reset the return value in the retry path. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Alexey Kuznetsov Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51b94d2a5a90d4800e74d7348bcde098a28f4fb3 Author: Tejun Heo Date: Fri Jun 8 13:46:55 2007 -0700 sata_promise: use TF interface for polling NODATA commands sata_promise uses two different command modes - packet and TF. Packet mode is intelligent low-overhead mode while TF is the same old taskfile interface. As with other advanced interface (ahci/sil24), ATA_TFLAG_POLLING has no effect in packet mode. However, PIO commands are issued using TF interface in polling mode, so pdc_interrupt() considers interrupts spurious if ATA_TFLAG_POLLING is set. This is broken for polling NODATA commands because command is issued using packet mode but the interrupt handler ignores it due to ATA_TFLAG_POLLING. Fix pdc_qc_issue_prot() such that ATA/ATAPI NODATA commands are issued using TF interface if ATA_TFLAG_POLLING is set. This patch fixes detection failure introduced by polling SETXFERMODE. Signed-off-by: Tejun Heo Acked-by: Mikael Pettersson Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b4dc1fdb868089ab60c09531d476284b71373e3 Author: Randy Dunlap Date: Fri Jun 8 13:46:54 2007 -0700 isdn/diva: fix section mismatch __exit function is used by both init and exit routines, so it cannot be marked __init. (from allyesconfig) WARNING: drivers/built-in.o(.text+0x9b83cf): Section mismatch: reference to .exit.text: (between 'divasfunc_exit' and 'didd_callback') Signed-off-by: Randy Dunlap Cc: Karsten Keil Acked-by: Armin Schindler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e16f5350d4cf402cffd18898b07c3b72917db192 Author: Jeff Dike Date: Fri Jun 8 13:46:54 2007 -0700 uml: get declaration of simple_strtoul Include linux/kernel.h wherever simple_strtoul is used. This kills a compile warning in stderr_console.c and potential ones in the other files. This also fixes a bunch of style violations in exitcode.c. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49277b1c68f9bd22119a5174a68254ec1b39d8c2 Author: Jiri Slaby Date: Fri Jun 8 13:46:53 2007 -0700 Char: stallion, proper fail return values do not return 0 in one case and return proper values in other 2. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e415109f5a1ec9ca7dac4fad2b852113ce303c96 Author: Jiri Slaby Date: Fri Jun 8 13:46:52 2007 -0700 Char: stallion, alloc tty before pci devices init this causes oops, because pci probe function calls tty_register_device for each device found. Thanks to Ingo. Signed-off-by: Jiri Slaby Cc: "Ingo Korb" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64834b226b237e654ab164d3af88ceaa65f10362 Author: Jiri Slaby Date: Fri Jun 8 13:46:52 2007 -0700 Char: stallion, don't fail with less than max panels Since it's not neccesary to have MAX_PANELS on the card, don't fail to let users use this card even in this case. Stop the testing for loop instead. Thanks to Ingo. Signed-off-by: Jiri Slaby Cc: "Ingo Korb" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 193faea9280a809cc30e81d7e503e01b1d7b7042 Author: Stephen Rothwell Date: Fri Jun 8 13:46:51 2007 -0700 Move three functions that are only needed for CONFIG_MEMORY_HOTPLUG into the appropriate #ifdef. Signed-off-by: Stephen Rothwell Cc: Yasunori Goto Cc: Andy Whitcroft Cc: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4249e08e92647b406422553bfb16276b2bf849aa Author: Ratnadeep Joshi Date: Fri Jun 8 13:46:50 2007 -0700 Documentation/atomic_ops.txt typo fix Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e80ad9b651abb7229551339081d7e53097bf8ea7 Author: Jeff Dike Date: Fri Jun 8 13:46:49 2007 -0700 uml: fix kernel stack size on x86_64 Force KERNEL_STACK_ORDER to be at least 1 on UML/x86_64, to avoid overflows. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272c1d21d6fe42979068e14c04fb60fb6045ad74 Author: Christoph Lameter Date: Fri Jun 8 13:46:49 2007 -0700 SLUB: return ZERO_SIZE_PTR for kmalloc(0) Instead of returning the smallest available object return ZERO_SIZE_PTR. A ZERO_SIZE_PTR can be legitimately used as an object pointer as long as it is not deferenced. The dereference of ZERO_SIZE_PTR causes a distinctive fault. kfree can handle a ZERO_SIZE_PTR in the same way as NULL. This enables functions to use zero sized object. e.g. n = number of objects. objects = kmalloc(n * sizeof(object)); for (i = 0; i < n; i++) objects[i].x = y; kfree(objects); Signed-off-by: Christoph Lameter Acked-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a17627ef8833ac30622a7b39b7be390e1b174405 Author: Yoann Padioleau Date: Fri Jun 8 13:46:48 2007 -0700 potential parse error in ifdef part 3 Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Signed-off-by: Yoann Padioleau Cc: Andi Kleen Cc: Paul Mackerras Acked-by: Paul Mundt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 Author: Christoph Lameter Date: Fri Jun 8 13:46:46 2007 -0700 slab: fix alien cache handling cache_free_alien must be called regardless if we use alien caches or not. cache_free_alien() will do the right thing if there are no alien caches available. Signed-off-by: Christoph Lameter Cc: Paul Mundt Acked-by: Pekka J Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a210906c1b791af1434323f69427286039c9c8b9 Author: Hugh Dickins Date: Fri Jun 8 13:46:46 2007 -0700 mount -t tmpfs -o mpol=: check nodes online Randy Dunlap reports that a tmpfs, mounted with NUMA mpol= specifying an offline node, crashes as soon as data is allocated upon it. Now restrict it to online nodes, where before it restricted to MAX_NUMNODES. Signed-off-by: Hugh Dickins Cc: Robin Holt Cc: Christoph Lameter Cc: Andi Kleen Tested-and-acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9739ed1c8eafd554788d8e2ba09847b5718a34e7 Author: Andy Whitcroft Date: Fri Jun 8 13:46:45 2007 -0700 update feature-removal-schedule.txt to include deprecated functions Now that deprecated functions are detected out of Documentation/feature-removal-schedule.txt update this to include kernel_thread. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f44cd23a5a2e26191a28ab6e91bd0c7849c8e0f Author: Andrew Morton Date: Fri Jun 8 13:46:45 2007 -0700 document Acked-by: Explain what we use Acked-by: for, and how it differs from Signed-off-by: Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a47653fc2643cf61bcabba8c9ff5c45517c089ba Author: Ken Chen Date: Fri Jun 8 13:46:44 2007 -0700 loop: preallocate eight loop devices The kernel on-demand loop device instantiation breaks several user space tools as the tools are not ready to cope with the "on-demand feature". Fix it by instantiate default 8 loop devices and also reinstate max_loop module parameter. Signed-off-by: Ken Chen Acked-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c287ef1ff9296ddf707af6f9d355e1c3ffc243dd Author: Greg Ungerer Date: Fri Jun 8 13:46:43 2007 -0700 nommu: report correct errno in message Report the correct errno for out of memory debug output in binfmt_flat.c Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4342f4ace2335d4fa9fe52b4cceca979413470b2 Author: Greg Ungerer Date: Fri Jun 8 13:46:39 2007 -0700 m68knommu: fix ColdFire timer off by 1 The coldfire timer runs from 0 to TRR included, then 0 again and so on. It counts thus actually TRR + 1 steps for 1 tick, not TRR. Fix that. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a0df2ef4569ac57cb18cd97e34c0c4733e829d9 Author: Andy Whitcroft Date: Fri Jun 8 13:46:39 2007 -0700 update checkpatch.pl to version 0.03 This version brings a host of changes to cure false positives and bugs detected on patches submitted to lkml and -mm. It also brings a number of new tests in response to reviews, of particular note: - catch use of volatile - allow deprecated functions to be listed in feature-removal-schedule.txt - warn about #ifdef's in c files - check that spinlock_t and struct mutex use is commented - report on architecture specific defines being used - report memory barriers without an associated comment Full changelog: catch use of volatile convert other quoted string checks to common routine alloc deprecated functions to be listed in feature-removal-schedule.txt split out the line length and indent for each line improve switch block handling handle GNU diff context lines with no leading space warn about #ifdef's in c files tidy up tests for signed-off-by using raw mode check that spinlock_t and struct mutex use is commented syntax checks for open brace placement may drop off the bottom of hunk report memory barriers without an associated comment when a sign off is present but ugly do not report it missing do not mistake bitfield definitions for indented labels report on architecture specific defines being used major update to the operator checks prevent switch/if/while etc matching foo_switch generify assignement in condition error message introduce an operator context marker Version: 0.03 Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fd75b19483b2f6e6619602a535b4939e46921c1 Author: Alan Stern Date: Fri May 4 11:57:00 2007 -0400 OHCI: Fix machine check in ohci_hub_status_data This patch (as901) fixes an oversight in ohci-hcd. The hub_status_data routine must not try to access the controller's memory-mapped registers if the controller is in a low-power state; such attempts will cause a crash on some architectures (such as PPC). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 615ae11b3b4af7a5adb0819ff11b3b764eb92268 Author: Alan Stern Date: Fri Jun 8 15:23:27 2007 -0400 USB: Fix up bogus bInterval values in endpoint descriptors This patch (as904) adds code to check for endpoint descriptor bInterval values outside the legal limits. Illegal values are set to 32 ms, which seems like a reasonable default. This fixes Bugzilla #8432. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fd209e35b74110ee1f3371838b0782b5b02eaaba Author: Simon Arlott Date: Thu May 10 23:04:13 2007 -0700 USB: cxacru: ignore error trying to start ADSL in atm_start The sysfs adsl_status attribute ignores (aside from returning -EIO to the user) any error sending a START/STOP command to the device and there is at least one firmware which never sends a response but appears to work regardless. Therefore atm_start should also continue if an error is received so that such firmware is usable. The official Conexant driver doesn't expect a reply either but this is for another device (E2 router) and a commonly used firmware does respond. Also, there is no point in changing -ECONNRESET to -ETIMEDOUT since nothing ever checks for either of these values. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit da1f82b5543738d4c127a449490bc0d55e121fe8 Author: Simon Arlott Date: Thu May 10 23:04:12 2007 -0700 USB: cxacru: create sysfs attributes in atm_start instead of bind Since usbatm doesn't set the usb_interface driver data until after calling bind and heavy_init, it would be NULL when the sysfs attributes are read. Reading the MAC address from atm_dev before atm_dev exists would have been be possible too. Calling create_device_file in atm_start will avoid this problem, and the data is useless until the first status poll runs. However, it must be ready before a status poll does a printk on line status change otherwise userspace could react before the files exist. For completeness I've moved remove_device_file to atm_stop so it's not called in unbind when it's not needed. There's no point starting ADSL if atm_start could still fail either. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 64b85006f5d473fefc181dece9473710b55966e0 Author: Simon Arlott Date: Thu May 10 23:04:09 2007 -0700 USB: cxacru: add Documentation file The sysfs attributes for exposing cxacru statistics/status information with possible values is now explained in Documentation/networking/cxacru.txt including information on the writable adsl_state attribute's commands and a sample of the kernel log format. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 67fa10627ec0d8aa16f1cf38cf527e67d8097d3c Author: Ben Collins Date: Sat May 26 03:06:32 2007 -0700 USB: UNUSUAL_DEV: Sync up some reported devices from Ubuntu UNUSUAL_DEV: Sync up some reported devices from Ubuntu Various unusual dev entries accumulated from Ubuntu bug reports. Signed-off-by: Ben Collins Cc: Alan Stern Signed-off-by: Phil Dibowitz commit 01ee7d7032204b383b2fba73021e7acbc776184b Author: David Brownell Date: Fri May 25 20:40:14 2007 -0700 USB: usb gadgets avoid le{16,32}_to_cpup() It turns out that le16_to_cpup() and le32_to_cpup() aren't always safe to call with pointers into packed structures, since those are inlined functions and GCC may lose the "packed" attribute. So those references can become unaligned kernel accesses, which are evil on some hardware. This patch updates uses of those routines in the gadget stack. The references into packed structures can just use leXX_to_cpu(*x), which in most cases is more natural. Some other uses in RNDIS, mostly in debug code, were wrong in the first place; those use get_unaligned(). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 97cb95d1c4b724bc3bedd16dd022fbd3c2d61283 Author: Pete Zaitcev Date: Thu May 24 21:59:19 2007 -0700 usblp: Don't let suspend to kill ->used Suspend destroys refcounting for open/release. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit dda034bcb51a0a28318046d74d664e0fc5f7d1d4 Author: Kay Sievers Date: Sun May 27 17:04:58 2007 +0200 USB: set default y for CONFIG_USB_DEVICE_CLASS Signed-off-by: Kay Sievers Cc: bert hubert Signed-off-by: Greg Kroah-Hartman commit 50e5d35ce2c4190cead13a091ea1ceab47d29cc2 Author: Paul Moore Date: Thu Jun 7 18:38:14 2007 -0700 [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. IPv4 options are not very well aligned within the packet and the format of a CIPSO option is even worse. The result is that the CIPSO engine in the kernel does a few unaligned accesses when parsing and validating incoming packets with CIPSO options attached which generate error messages on certain alignment sensitive platforms. This patch fixes this by marking these unaligned accesses with the get_unaliagned() macro. Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit ba6ff9f2b5c6018b293bd21083ffaa5ad710e671 Author: Paul Moore Date: Thu Jun 7 18:37:15 2007 -0700 [NetLabel]: consolidate the struct socket/sock handling to just struct sock The current NetLabel code has some redundant APIs which allow both "struct socket" and "struct sock" types to be used; this may have made sense at some point but it is wasteful now. Remove the functions that operate on sockets and convert the callers. Not only does this make the code smaller and more consistent but it pushes the locking burden up to the caller which can be more intelligent about the locks. Also, perform the same conversion (socket to sock) on the SELinux/NetLabel glue code where it make sense. Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit 6363097cc4d182f93788131b5d8f72aa91d950a0 Author: Herbert Xu Date: Thu Jun 7 18:35:38 2007 -0700 [IPV4]: Do not remove idev when addresses are cleared Now that we create idev before addresses are added, it no longer makes sense to remove them when addresses are all deleted. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 87d37a4f470834223fc8a243af002998bdb5b886 Author: Markus Rechberger Date: Mon Jun 4 18:45:44 2007 +0200 firmware: remove orphaned Email Manuel Estrada Sainz passed away on May 9th 2004, his email account got deactivated. He was in charge of the firmware_class code, and still got CC'ed in recent discussions about it. Signed-off-by: Markus Rechberger Signed-off-by: Greg Kroah-Hartman commit 5c73a3fba6dd2b410de378f648bc9851ffa7201a Author: Greg Kroah-Hartman Date: Thu Jun 7 15:05:15 2007 -0700 kobject: use the proper printk level for kobject error Thanks to Jean Delvare for pointing it out to me. Cc: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 475c5a1518477f0301fc50dc59e690032fad1fef Author: Stephen Hemminger Date: Tue May 8 13:41:49 2007 -0700 Driver core: kill unused code CC drivers/base/dd.o drivers/base/dd.c:211: warning: =E2=80=98device_probe_drivers=E2=80=99 defi= ned but not used Looks like the following is dead. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 2c7afd125cc482dbdf6b0a169c42337e7e76cda5 Author: Kay Sievers Date: Tue May 1 13:46:26 2007 +0200 Driver core: keep PHYSDEV for old struct class_device Class-devices created by "struct class_device" are going to be replaced by "struct device". Keep the deprecated PHYSDEV* variables for the already "deprecated" struct class_device" devices. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit adfdebceaca988515ecdb557d600fd5ab9da913a Author: David Brownell Date: Thu May 10 22:36:14 2007 -0700 update Documentation/driver-model/platform.txt Make note of the legacy "probe-the-hardware" drivers, and some APIs that are mostly unused except by such drivers. We probably can't escape having legacy drivers for a while (e.g. old ISA drivers), but we can at least discourage this style code for new drivers, and unless it's unavoidable. Signed-off-by: David Brownell Cc: Andres Salomon Cc: Dmitry Torokhov Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ce53fc4c57603d99c330a6ee2fe96d94f2d350f Author: Steve French Date: Fri Jun 8 14:55:14 2007 +0000 [CIFS] CIFS should honour umask This patch makes CIFS honour a process' umask like other filesystems. Of course the server is still free to munge the permissions if it wants to; but the client will send the "right" permissions to begin with. A few caveats: 1) It only applies to filesystems that have CAP_UNIX (aka support unix extensions) 2) It applies the correct mode to the follow up CIFSSMBUnixSetPerms() after remote creation When mode to CIFS/NTFS ACL mapping is complete we can do the same thing for that case for servers which do not support the Unix Extensions. Signed-off-by: Matt Keenen Signed-off-by: Steve French commit c1183a3345f2e553fa0907a453cbb311c7e1698c Author: Peer Chen Date: Fri Jun 8 15:14:32 2007 +0200 ide: Add the MCP73/77 support to PATA driver Add the MCP73/MCP77 support to PATA driver. bart: Added amd74xx_chipsets[] and amd_pci_tbl[] entries. bart: Bumped driver version. Signed-off-by: Peer Chen Cc: Alan Cox , Cc: Andrew Morton Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 8da725dd94fda144802dc06b956c720eb77cfd75 Author: Peer Chen Date: Fri Jun 8 15:14:32 2007 +0200 Add the PATA controller device ID to pci_ids.h for MCP73/MCP77. Add the PATA controller device ID to pci_ids.h for MCP73/MCP77. Signed-off-by: Peer Chen Cc: Alan Cox , Cc: Andrew Morton Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 278978e953a35a2ddf27f197003b29da54e31908 Author: Sergei Shtylyov Date: Fri Jun 8 15:14:32 2007 +0200 hpt366: disallow Ultra133 for HPT374 Eliminate UltraATA/133 support for HPT374 -- the chip isn't capable of this mode according to the manual, and doesn't even seem to tolerate 66 MHz DPLL clock... Signed-off-by: Sergei Shtylyov Cc: Geller Sandor Signed-off-by: Bartlomiej Zolnierkiewicz commit ea30759643b423933ced48acdd78e5299f05295b Author: Jiri Slaby Date: Fri Jun 8 15:14:31 2007 +0200 ide: generic IDE PCI driver, add another device exception generic IDE PCI driver, add another device exception This device is char device and is grabbed by generic ide driver: 00:0b.0 Class ffff: National Semiconductor Corporation 87410 IDE (rev ff) (prog-if ff) Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Disallow generic IDE PCI driver to grab it by adding next condition. Also consolidate exceptions to one bigger 'switch (dev->vendor)'. Signed-off-by: Jiri Slaby Cc: Ingo Korb Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 0d2157f78d17fcee17791f54959e67cc0af0da74 Author: Lee Trager Date: Fri Jun 8 15:14:30 2007 +0200 ide: HPA detect from resume Currently when system which have HPA require HPA to be detected and disabled upon resume from RAM or disk. The current IDE drivers do not do this nor does libata (obviously it since it doesn't support HPA yet). I have implemented this into the current IDE drivers and it has been tested by many others since 7/15/2006 in bug number 6840: http://bugzilla.kernel.org/show_bug.cgi?id=6840 and it has been confirmed to work fine with no problems. bart: added drv != NULL check to generic_ide_suspend() From: Lee Trager Signed-off-by: Bartlomiej Zolnierkiewicz commit 0380dad45e4f5a606025cc4df2a2cd26af08796b Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:29 2007 +0200 it821x: RAID mode fixes The DMA support for RAID mode broke after: commit 71ef51cc1756d1c56b57c70e7cc27a3559c81ee6 Author: Jens Axboe Date:   Fri Jul 28 09:02:17 2006 +0200     [PATCH] it821x: fix ide dma setup bug     Only enable dma for a valid speed setting.     Signed-off-by: Jens Axboe commit 0a8348d08677ad77ee353f96eb8745c693a05a13 Author: Jens Axboe Date:   Fri Jul 28 08:58:26 2006 +0200     [PATCH] ide: if the id fields looks screwy, disable DMA     It's the safer choice. Originally due to a bug in itx821x, but a     generally sound thing to do.     Signed-off-by: Jens Axboe However it worked by pure luck before Jens' fixes: bogus ide_dma_enable() usage in it821x driver combined with loosy check in ide_dma_verbose() allowed the hardware to operate in DMA mode. When these problems were fixed the DMA support broke... The source root for the regression turned out to be that the it821x.c code was clearing too much of id->field_valid. The IDE core code was using the original value of id->field_valid to do the tuning but later DMA got disabled in ide_dma_verbose() because of the incorrect id->field_valid fixup. Fix it. While at it: * Do fixup() after probing the drives but before tuning them (which is also OK w.r.t. ide_undecoded_slave() fixup). This change fixes device IDENTIFY data to be consistent before/after the tuning and allows us to remove extra re-tuning of drives from it821x_fixups(). * Fake MWDMA0 enabled/supported bits in IDENTIFY data if the device has DMA capable bit set (this is just to tell the IDE core that DMA is supported since it821x firmware takes care of DMA mode programming). * Don't touch timing registers and don't program transfer modes on devices et all when in RAID mode - depend solely on firmware to do the tuning (as suggested by Alan Cox and done in libata pata_it821x driver). Thanks for testing the patch goes out to Thomas Kuther. Cc: Thomas Kuther Cc: Alan Cox Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 1abb8a8b841354e7a09ba2009376f0a6368b5cec Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:28 2007 +0200 serverworks: fix CSB6 tuning logic Problem noticed by Joe Zbiciak, see http://kerneltrap.org/node/8252 for details. On CSB6 the driver is using BIOS settings and not programming DMA/PIO timings itself. However the logic was completely broken and resulted in wrong timings being silently allowed (instead of being corrected by the driver). This bug would explain some data corruption/timeout issues with Serverworks MegaIDE in RAID mode that Alan Cox has fixed recently with: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=2074a106f52b6371885afbd714e929d60d0e3f64 For 2.6.23 we may be better off with completely switching the driver to always programming timings (libata pata_serverworks.c driver is doing things this way and there were no problems reported so far) but for 2.6.22 lets fix the bug in the simplest and the least intrusive way. Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit ed84fad5002c00dfb318f797dbf591320eebc1c0 Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:27 2007 +0200 serverworks: remove crappy code Remove crappy code noticed by Linus, see http://lkml.org/lkml/2007/5/23/476 for details. While at it simplify logic a bit. There should be no functionality changes caused by this patch. Cc: Linus Torvalds Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit c43850981b5203e13747f8a696a762eb412d9394 Author: Hans Verkuil Date: Thu Jun 7 09:04:03 2007 -0300 V4L/DVB (5751): Ivtv: fix ia64 printk format warnings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 72fb39ea58e7e2af93895fd12642b3fff2f76462 Author: Mauro Carvalho Chehab Date: Thu Jun 7 09:42:20 2007 -0300 V4L/DVB (5761): Fix broken b2c2 dependency on non x86 architectures This patch moves flexcop-dma (currently used only by flexcop-pci) to b2c2-flexcop-pci module, that is dependent on CONFIG_PCI, fixing the bug as reported by Geert Uytterhoeven : drivers/media/dvb/b2c2/flexcop-dma.c uses the PCI DMA API, but DVB_B2C2_FLEXCOP doesn't depend on PCI, causing the following problem on PCI-less systems: | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' Apparently this is the flexcop DMA core, which is used by both DVB_B2C2_FLEXCOP_PCI and DVB_B2C2_FLEXCOP_USB. Signed-off-by: Mauro Carvalho Chehab commit f2100d82b858815848b661d57d7e166341c02e20 Author: Hans Verkuil Date: Thu May 17 08:08:45 2007 -0300 V4L/DVB (5673): Fix audio stuttering for saa711x/ivtv when in radio mode. Signed-off-by: Jose Alberto Reguero Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b6cfe6af6bfb101212b217cba55012d1d35ab3a8 Author: Hans Verkuil Date: Mon Jun 4 04:55:36 2007 -0300 V4L/DVB (5736): Add V4L2_FBUF_CAP/FLAG_LOCAL/GLOBAL_INV_ALPHA Michael Schimek requested the addition of inverted alpha framebuffer caps/flags to support such hardware. 'Normal' alpha uses this formula to mix the framebuffer and video: output = fb pixel * fb alpha + video pixel * (1 - fb alpha) and the 'inverted' alpha uses this formula: output = fb pixel * (1 - fb alpha) + video pixel * fb alpha Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 987e00ba5cf667beed2b88bd1d01150334cdb6dc Author: Hans Verkuil Date: Tue May 29 13:03:27 2007 -0300 V4L/DVB (5732): Add ivtv CROPCAP support and fix ivtv S_CROP for video output. The VIDIOC_CROPCAP ioctl was missing in ivtv. The handling of output video cropping was wrong. This has now been fixed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1f137600cacf9a2908529c7d544de82672226a98 Author: Hans Verkuil Date: Tue May 29 08:18:37 2007 -0300 V4L/DVB (5730): Remove unused V4L2_CAP_VIDEO_OUTPUT_POS V4L2_CAP_VIDEO_OUTPUT_POS was initially introduced for 2.6.22 but never actually used: remove it before the final 2.6.22 is made. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fe818d1d9a50930aa7e1ce7169fb42e1e0c45882 Author: Thierry Merle Date: Sun May 27 17:21:17 2007 -0300 V4L/DVB (5720): Usbvision: fix urb allocation and submits - fixed the urb allocation part that was not taking into account the current alternate setting this fixes usb_submit_urb returning -90 errno in isocIrq. - fixed usb_submit_urb returning -1 errno in isocIrq (need to ignore usb urb with status==-ENOENT) Acked-by: Dwaine P. Garden Signed-off-by: Thierry Merle Signed-off-by: Mauro Carvalho Chehab commit c6604150ab04aaaf98baf1ddca2e9e4f7d3da4d3 Author: Oliver Endriss Date: Mon May 28 18:06:27 2007 -0300 V4L/DVB (5716): Tda10086,tda826x: fix tuning, STR/SNR values Several people reported unreliable reception with the current driver. Furthermore, STR and SNR values seem to be inverted. This fix is based on a patch posted by Hartmut Hackman. Thanks to Helmut Auer for testing and helping to optimize the patch. tda826x: - set baseband cut-off to 19 MHz tda10086: - change the parameters of the carrier recovery loop - toggle register 0x02 between 0x35 (tuning) and 0x00 (locked) - invert STR and SNR values Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dc02d50a6d71cba2b2edb78377af5a5965879a49 Author: Hans Verkuil Date: Sat May 19 14:07:16 2007 -0300 V4L/DVB (5675): Move big PIO accesses from the interrupt handler to a workhandler Sliced VBI transfers use PIO instead of DMA. This was done inside the interrupt handler, but since PIO accesses are very slow this meant that a lot of time was spent inside the interrupt handler. All PIO copies are now moved to a workqueue. This should fix various issues with missing time ticks and remote key hits. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ffeb9ec72e18e16d0b0835d959cdf01650758638 Author: Andrew Morton Date: Sat May 26 07:54:21 2007 -0300 V4L/DVB (5699): Cinergyt2: fix file release handler If this mutex_lock_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 624fc7f52b48f69fd9d1fe7a594c211762c89825 Author: Russell King Date: Sat May 26 07:55:32 2007 -0300 V4L/DVB (5700): Saa7111: fix picture settings cache bug If the SAA7111 device is powered down, and requires re-initialisation when the V4L device is opened (as on the NetWinder), the SAA7111 driver gets completely confused about the current settings. The problem is centred around the way the driver keeps _two_ cached copies of the current settings - one of the struct video_picture settings, and one of the registers. When the decoder is re-initailised, the cached register settings are overwritten, as are the values in the hardware registers. However, the cached video_picture settings are not. Resolve this by removing the useless and buggy second level of caching for video_picture. Instead, provide a function which updates register values if and only if the value we are going to write to the register has changed. Signed-off-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 05f85839a2ffcaa75d505526ca8e74097be18d8c Author: Mauro Carvalho Chehab Date: Sat May 26 10:45:28 2007 -0300 V4L/DVB (5702): Fix Kconfig items to avoid linkedition errors The recent changes on Kconfig broke compilation when VIDEO_DEV is compiled as module. On some cases, drivers like VIDEO_BUF are compiled with 'y' option instead of 'm': ... Thanks to: Toralf Forster for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit 620a324b744a7d66c3c45a83042f8e7fc9fc5a04 Author: Jens Axboe Date: Thu Jun 7 09:39:42 2007 +0200 splice: __generic_file_splice_read: fix read/truncate race Original patch and description from Neil Brown , merged and adapted to splice branch by me. Neils text follows: __generic_file_splice_read() currently samples the i_size at the start and doesn't do so again unless it needs to call ->readpage to load a page. After ->readpage it has to re-sample i_size as a truncate may have caused that page to be filled with zeros, and the read() call should not see these. However there are other activities that might cause ->readpage to be called on a page between the time that __generic_file_splice_read() samples i_size and when it finds that it has an uptodate page. These include at least read-ahead and possibly another thread performing a read So we must sample i_size *after* it has an uptodate page. Thus the current sampling at the start and after a read can be replaced with a sampling before page addition into spd. Signed-off-by: Jens Axboe commit 475ecade683566b19ebb84972de864039ac5fce3 Author: Hugh Dickins Date: Thu Jun 7 09:36:00 2007 +0200 splice: __generic_file_splice_read: fix i_size_read() length checks __generic_file_splice_read's partial page check, at eof after readpage, not only got its calculations wrong, but also reused the loff variable: causing data corruption when splicing from a non-0 offset in the file's last page (revealed by ext2 -b 1024 testing on a loop of a tmpfs file). Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe commit 20d698db67059a63d217030dfd02872cb5f88dfb Author: Jens Axboe Date: Tue Jun 5 11:05:11 2007 +0200 splice: move balance_dirty_pages_ratelimited() outside of splice actor I've seen inode related deadlocks, so move this call outside of the actor itself, which may hold the inode lock. Signed-off-by: Jens Axboe commit 17374ff1aa9ce2a0597416a16729474b538af443 Author: Jens Axboe Date: Mon Jun 4 15:03:12 2007 +0200 pipe: move pipe_inode_info structure decleration up before it's used There's really no reason it's below the first use of the pointer type, and it'll fail compilation for the network addition (for good reason). So move it up a bit. Signed-off-by: Jens Axboe commit 267adc3e66c3d3c2edb89dac9eddc20ac94d646b Author: Jens Axboe Date: Fri Jun 8 08:33:41 2007 +0200 splice: remove do_splice_direct() symbol export It's only supposed to be used by do_sendfile(), which is never modular. So kill the export. Signed-off-by: Jens Axboe commit d366d39885b4a56eb90c7670deb46d82501579ad Author: Jens Axboe Date: Fri Jun 1 14:54:11 2007 +0200 splice: move inode size check into generic_file_splice_read() Signed-off-by: Jens Axboe commit a4cd7ed86ff511aebcc97675937039f2321d6987 Author: Roland Dreier Date: Thu Jun 7 23:24:39 2007 -0700 IB/mlx4: Make sure RQ allocation is always valid QPs attached to an SRQ must never have their own RQ, and QPs not attached to SRQs must have an RQ with at least 1 entry. Enforce all of this in set_rq_size(). Based on a patch by Eli Cohen . Signed-off-by: Roland Dreier commit bf2944bd56c7a48cc3962a860dbc4ceee6b1ace8 Author: Sean Hefty Date: Tue Jun 5 09:57:31 2007 -0700 RDMA/cma: Fix initialization of next_port next_port should be between sysctl_local_port_range[0] and [1]. However, it is initially set to a random value with get_random_bytes(). If the value is negative when treated as a signed integer, next_port can end up outside the expected range because of the result of the % operator being negative. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 57f01b53398baebd809e7efd49fc10c10174b46d Author: Jack Morgenstein Date: Wed Jun 6 19:35:04 2007 +0300 IB/mlx4: Fix zeroing of rnr_retry value in ib_modify_qp() The code in __mlx4_ib_modify_qp() overwrites context->params1 after the RNR retry parameter is ORed in, which results in the RNR retry parameter always being set to 0. Fix this by moving where we OR in the value to later in the function, after the initial assignment of context->params1. Found by the Mellanox firmware group. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit b2d9308ae43a9cfa56cc9682dc6ed63347a8d2bf Author: Jack Morgenstein Date: Thu Jun 7 23:24:38 2007 -0700 mlx4_core: Don't set MTT address in dMPT entries with PA set If a dMPT entry has the PA flag (direct physical address) set, then the (unused) MTT base address field has to be set to 0. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit fe40900f408642e772739088d30636e2f3f7d0d8 Author: Roland Dreier Date: Thu Jun 7 23:24:36 2007 -0700 mlx4_core: Check firmware command interface revision HCA firmware with incompatible changes to the FW commmand interface is coming soon. Add a check of the interface revision during initialization and bail out if the firmware advertises a revision that the driver doesn't know about. This will avoid strange failures later if the driver goes on using the wrong interface revision. Signed-off-by: Roland Dreier commit 8c2786cfa6d15c474ec7030e8161c88e9b5c597d Author: David S. Miller Date: Thu Jun 7 21:59:44 2007 -0700 [SPARC64]: Handle PCI bridges without 'ranges' property. This fixes the IDE controller not showing up on Netra-T1 systems. Just like Simba bridges, some PCI bridges can lack the 'ranges' OBP property. So we handle this similarly to the existing Simba code: 1) In of_device register address resolving, we push the translation to the parent. 2) In PCI device scanning, we interrogate the PCI config space registers of the PCI bus device in order to resolve the resources, just like the generic Linux PCI probing code does. With much help and testing from Fabio, who also reported the initial problem. Signed-off-by: David S. Miller Signed-off-by: Fabio Massimo Di Nitto commit ea1ff19ce0146a3982a6ded4274122e6d0a91bed Author: Robert P. J. Day Date: Thu Jun 7 20:24:50 2007 -0700 [SPARC64]: Include instead of . To be consistent with other architectures, include the generic version of rwsem.h. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 85f6038f2170e3335dda09c3dfb0f83110e87019 Author: Bryan Wu Date: Tue Jun 5 11:02:01 2007 +0800 RAMFS NOMMU: missed POSIX UID/GID inode attribute checking This bug was caught by LTP testcase fchmod06 on Blackfin platform. In the manpage of fchmod, "EPERM: The effective UID does not match the owner of the file, and the process is not privileged (Linux: it does not have the CAP_FOWNER capability)." But the ramfs nommu code missed the inode_change_ok POSIX UID/GID verification. This patch fixed this. Signed-off-by: Bryan Wu Cc: David Howells Signed-off-by: Linus Torvalds commit e5e3c84b70e58fc605635fd340fb8dba3cc59058 Author: Steven Rostedt Date: Wed Jun 6 23:34:04 2007 -0400 enable interrupts in user path of page fault. This is a minor fix, but what is currently there is essentially wrong. In do_page_fault, if the faulting address from user code happens to be in kernel address space (int *p = (int*)-1; p = 0xbed;) then the do_page_fault handler will jump over the local_irq_enable with the goto bad_area_nosemaphore; But the first line there sees this is user code and goes through the process of sending a signal to send SIGSEGV to the user task. This whole time interrupts are disabled and the task can not be preempted by a higher priority task. This patch always enables interrupts in the user path of the bad_area_nosemaphore. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 2c750edd39a45402e355459194fe8804366bedd2 Author: Peter Zijlstra Date: Wed Jun 6 11:39:40 2007 +0200 frv: build fix In file included from /usr/src/linux-2.6-2/net/ipv4/ip_input.c:118: include2/asm/system.h:245: error: parse error before "__cmpxchg_32" include2/asm/system.h:245: error: parse error before '*' token include2/asm/system.h:245: warning: type defaults to `int' in declaration of `__cmpxchg_32' include2/asm/system.h:245: warning: function declaration isn't a prototype include2/asm/system.h:245: warning: data definition has no type or storage class Signed-off-by: Peter Zijlstra Acked-by: David Howells Signed-off-by: Linus Torvalds commit ec4d18f219e71ef682fe2d7b9a6d121617fef6d5 Author: David S. Miller Date: Thu Jun 7 16:58:22 2007 -0700 [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver. We used to access the 64-bit IRQ IMAP and ICLR registers of bus controllers 4-bytes in and as a 32-bit register word, since only the low 32-bits were relevant. This seemed like a good idea at the time. But the PCI-E controller requires full 8-byte 64-bit access to these registers, so we switched over to accessing them fully. SBUS was not adjusted properly, which broke interrupts completely. Signed-off-by: David S. Miller commit 321566c2504445160b18e1508a73081579923a6b Author: David S. Miller Date: Wed Jun 6 14:03:08 2007 -0700 [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning. If we are on hummingbird, bus runs at 66MHZ. pbm->pci_bus should be setup with the result of pci_scan_one_pbm() or else we deref NULL pointers in the error interrupt handlers. Signed-off-by: David S. Miller commit 4aa2e62c45b5ca08be2d0d3c0744d7585b56e860 Author: Joy Latten Date: Mon Jun 4 19:05:57 2007 -0400 xfrm: Add security check before flushing SAD/SPD Currently we check for permission before deleting entries from SAD and SPD, (see security_xfrm_policy_delete() security_xfrm_state_delete()) However we are not checking for authorization when flushing the SPD and the SAD completely. It was perhaps missed in the original security hooks patch. This patch adds a security check when flushing entries from the SAD and SPD. It runs the entire database and checks each entry for a denial. If the process attempting the flush is unable to remove all of the entries a denial is logged the the flush function returns an error without removing anything. This is particularly useful when a process may need to create or delete its own xfrm entries used for things like labeled networking but that same process should not be able to delete other entries or flush the entire database. Signed-off-by: Joy Latten Signed-off-by: Eric Paris Signed-off-by: James Morris commit b00b4bf94edb42852d55619af453588b2de2dc5e Author: Patrick McHardy Date: Tue Jun 5 16:06:59 2007 -0700 [NET_SCHED]: Fix filter double free cbq and atm destroy their filters twice when destroying inner classes during qdisc destruction. Reported-and-tested-by: Strobl Anton Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7c355f532dd43036622e1880c114773463bafd23 Author: Thomas Graf Date: Tue Jun 5 16:03:03 2007 -0700 [NET]: Avoid duplicate netlink notification when changing link state When changing the link state from userspace not affecting any other flags. Two duplicate notification are being sent, once as action in the NETDEV_UP/NETDEV_DOWN notification chain and a second time when comparing old and new device flags after the change has been completed. Although harmless, the duplicates should be avoided. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit df2bc459a3ad71f8b44c358bf7169acf9caf4acd Author: David S. Miller Date: Tue Jun 5 15:18:43 2007 -0700 [UDP]: Revert 2-pass hashing changes. This reverts changesets: 6aaf47fa48d3c44280810b1b470261d340e4ed87 b7b5f487ab39bc10ed0694af35651a03d9cb97ff de34ed91c4ffa4727964a832c46e624dd1495cf5 fc038410b4b1643766f8033f4940bcdb1dace633 There are still some correctness issues recently discovered which do not have a known fix that doesn't involve doing a full hash table scan on port bind. So revert for now. Signed-off-by: David S. Miller commit 3c0d2f3780fc94746c4842e965bd2570e2119bb6 Author: Miklos Szeredi Date: Tue Jun 5 13:10:29 2007 -0700 [AF_UNIX]: Fix stream recvmsg() race. A recv() on an AF_UNIX, SOCK_STREAM socket can race with a send()+close() on the peer, causing recv() to return zero, even though the sent data should be received. This happens if the send() and the close() is performed between skb_dequeue() and checking sk->sk_shutdown in unix_stream_recvmsg(): process A skb_dequeue() returns NULL, there's no data in the socket queue process B new data is inserted onto the queue by unix_stream_sendmsg() process B sk->sk_shutdown is set to SHUTDOWN_MASK by unix_release_sock() process A sk->sk_shutdown is checked, unix_release_sock() returns zero I'm surprised nobody noticed this, it's not hard to trigger. Maybe it's just (un)luck with the timing. It's possible to work around this bug in userspace, by retrying the recv() once in case of a zero return value. Signed-off-by: Miklos Szeredi Signed-off-by: David S. Miller commit c764c9ade6d9b710bad2b9c631ede9864333b98c Author: Akinobu Mita Date: Tue Jun 5 12:56:53 2007 -0700 [NETFILTER]: nf_conntrack_amanda: fix textsearch_prepare() error check The return value from textsearch_prepare() needs to be checked by IS_ERR(). Because it returns error code as a pointer. Cc: "Brian J. Murrell" Signed-off-by: Akinobu Mita Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4c1b52bc7a2f5ee01ea3fc248a8748a1c6843f7c Author: Dmitry Mishin Date: Tue Jun 5 12:56:09 2007 -0700 [NETFILTER]: ip_tables: fix compat related crash check_compat_entry_size_and_hooks iterates over the matches and calls compat_check_calc_match, which loads the match and calculates the compat offsets, but unlike the non-compat version, doesn't call ->checkentry yet. On error however it calls cleanup_matches, which in turn calls ->destroy, which can result in crashes if the destroy function (validly) expects to only get called after the checkentry function. Add a compat_release_match function that only drops the module reference on error and rename compat_check_calc_match to compat_find_calc_match to reflect the fact that it doesn't call the checkentry function. Reported by Jan Engelhardt Signed-off-by: Dmitry Mishin Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3c158f7f57601bc27eab82f0dc4fd3fad314d845 Author: Patrick McHarrdy Date: Tue Jun 5 12:55:27 2007 -0700 [NETFILTER]: nf_conntrack: fix helper module unload races When a helper module is unloaded all conntracks refering to it have their helper pointer NULLed out, leading to lots of races. In most places this can be fixed by proper use of RCU (they do already check for != NULL, but in a racy way), additionally nf_conntrack_expect_related needs to bail out when no helper is present. Also remove two paranoid BUG_ONs in nf_conntrack_proto_gre that are racy and not worth fixing. Signed-off-by: Patrick McHarrdy Signed-off-by: David S. Miller commit 51055be81c3cb14d0165a7432b787098b817fd35 Author: Patrick McHardy Date: Tue Jun 5 12:40:01 2007 -0700 [RTNETLINK]: ifindex 0 does not exist ifindex == 0 does not exist and implies we should do a lookup by name if one was given. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ef7c79ed645f52bcbdd88f8d54a9702c4d3fd15d Author: Patrick McHardy Date: Tue Jun 5 12:38:30 2007 -0700 [NETLINK]: Mark netlink policies const Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 14a49e1fd2bb91ba2bf0e1f06711b6dbc21de02d Author: David S. Miller Date: Tue Jun 5 00:19:24 2007 -0700 [TCP] tcp_probe: Attach printf attribute properly to printl(). GCC doesn't like the way Stephen initially did it: net/ipv4/tcp_probe.c:83: warning: empty declaration Signed-off-by: David S. Miller commit 274707cff9810b784c548ed169298617a1bc3528 Author: Eric Dumazet Date: Tue Jun 5 00:16:12 2007 -0700 [TCP]: Use LIMIT_NETDEBUG in tcp_retransmit_timer(). LIMIT_NETDEBUG allows the admin to disable some warning messages (echo 0 >/proc/sys/net/core/warnings). The "TCP: Treason uncloaked!" message can use this facility. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c4b1010f406d7c3f819c22a6323c46776d5b148c Author: Denis Cheng Date: Tue Jun 5 00:06:57 2007 -0700 [NET]: Merge dst_discard_in and dst_discard_out. Signed-off-by: Denis Cheng Signed-off-by: David S. Miller commit c36befb52350fa76bf3cb03d13ba2e17dbe8a508 Author: Ivo van Doorn Date: Tue Jun 5 00:04:46 2007 -0700 [RFKILL]: Make rfkill->name const The rfkill name can be made const safely, this makes the compiler happy when drivers make it point to some const string used elsewhere. Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit 71e27da9618b5f4d525ec821def83991da20429f Author: Herbert Xu Date: Mon Jun 4 23:36:06 2007 -0700 [IPV4]: Restore old behaviour of default config values Previously inet devices were only constructed when addresses are added (or rarely in ipmr). Therefore the default config values they get are the ones at the time of these operations. Now that we're creating inet devices earlier, this changes the behaviour of default config values in an incompatible way (see bug #8519). This patch creates a compromise by setting the default values at the same point as before but only for those that have not been explicitly set by the user since the inet device's creation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 31be308541e990592a2d0a3e77e8e51bd0cea0e0 Author: Herbert Xu Date: Mon Jun 4 23:35:37 2007 -0700 [IPV4]: Add default config support after inetdev_init Previously once inetdev_init has been called on a device any changes made to ipv4_devconf_dflt would have no effect on that device's configuration. This creates a problem since we have moved the point where inetdev_init is called from when an address is added to where the device is registered. This patch is the first half of a set that tries to mimic the old behaviour while still calling inetdev_init. It propagates any changes to ipv4_devconf_dflt to those devices that have not had the corresponding attribute set. The next patch will forcibly set all values at the point where inetdev_init was previously called. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 42f811b8bcdf6695bf74de580b1daf53445e8949 Author: Herbert Xu Date: Mon Jun 4 23:34:44 2007 -0700 [IPV4]: Convert IPv4 devconf to an array This patch converts the ipv4_devconf config members (everything except sysctl) to an array. This allows easier manipulation which will be needed later on to provide better management of default config values. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8d76527e728d00d1cf9d5dd663caffb2dcf05ae6 Author: Herbert Xu Date: Mon Jun 4 23:34:08 2007 -0700 [IPV4]: Only panic if inetdev_init fails for loopback When I made the inetdev_init call work on all devices I incorrectly left in the panic call as well. It is obviously undesirable to panic on an allocation failure for a normal network device. This patch moves the panic call under the loopback if clause. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8 Author: Patrick McHardy Date: Mon Jun 4 21:32:46 2007 -0700 [TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack A time_wait socket inherits sk_bound_dev_if from the original socket, but it is not used when sending ACK packets using ip_send_reply. Fix by passing the oif to ip_send_reply in struct ip_reply_arg and use it for output routing. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b91b9fd11210a7023f37eaee1e977ad9ce532095 Author: Michael Chan Date: Mon Jun 4 21:24:42 2007 -0700 [BNX2]: Update version and reldate. Update to version 1.5.11. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 02537b0676930b1bd9aff2139e0e645c79986931 Author: Michael Chan Date: Mon Jun 4 21:24:07 2007 -0700 [BNX2]: Fix occasional counter corruption on 5708. The statistics block DMA on 5708 can be messed up occasionally on the average of about once per hour. If the user is reading the counters within one second after the corruption, the counters will be all messed up. One second later, the counters will be ok again until the next corruption occurs. The workaround is to disable the periodic statistics DMA. Instead, we manually trigger the DMA once a second in bnx2_timer(). This manual trigger of the DMA avoids the problem. As a consequence, we can only allow 0 or 1 second settings for ethtool -C statistics block. Thanks to Jean-Daniel Pauget and CaT for reporting this rare problem. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 0aa38df7cd5b6c5b89f5146f4a2286434bc4a8f3 Author: Michael Chan Date: Mon Jun 4 21:23:06 2007 -0700 [BNX2]: Enable DMA on 5709. Add missing code to enable DMA on 5709 A1. The bit is a no-op on A0 and therefore can be set on all 5709 chips. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 641bdcd56c8bb2110a31da846b2752b11a644050 Author: Michael Chan Date: Mon Jun 4 21:22:24 2007 -0700 [BNX2]: Add missing wait in bnx2_init_5709_context(). For correctness, we need to wait for the MEM_INIT bit to be cleared in the BNX2_CTX_COMMAND register before proceeding. [Added return -EBUSY when the MEM_INIT bit doesn't clear, suggested by Jeff Garzik.] Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 7947b20ebae785ba25154aa1a9a00a98a22de75a Author: Michael Chan Date: Mon Jun 4 21:17:10 2007 -0700 [BNX2]: Fix netdev watchdog on 5708. There's a bug in the driver that only initializes half of the context memory on the 5708. Surprisingly, this works most of the time except for some occasional netdev watchdogs when sending a lot of 64-byte packets. The fix is to add the missing code to initialize the 2nd halves of all context memory. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 3e1db334dca97df9034ebeec4657329a2b37a811 Author: Roland Dreier Date: Sun Jun 3 19:47:10 2007 -0700 IB/mthca, mlx4_core: Fix typo in comment s/signifant/significant/ Signed-off-by: Roland Dreier commit 2c5cb2355843f9958e19a4b243456be92f97c73b Author: Roland Dreier Date: Sat Jun 2 07:16:02 2007 -0700 mlx4_core: Free catastrophic error MSI-X interrupt with correct dev_id We need to pass the same dev_id to free_irq() and request_irq(). When using MSI-X, the MLX4_EQ_CATAS interrupt uses a different dev_id from the other interrupts. Signed-off-by: Roland Dreier commit b581401ed0cc83a4483ed39c00a14a60bacecc3a Author: Roland Dreier Date: Thu Jun 7 11:51:58 2007 -0700 mlx4_core: Initialize ctx_list and ctx_lock earlier We may call mlx4_dispatch_event() before mlx4_register_device() is called for a device, because for example a catastrophic error happens immediately after we enable interrupts. Therefore priv->ctx_list and priv->ctx_lock need to be initialized earlier. This bug was actually exposed by the MSI-X bug that returned IRQ numbers to drivers in reverse order, so that the first FW command interrupt looked to mlx4 like a catastrophic error. Signed-off-by: Roland Dreier commit 09360d5408cb641abff0f32a172a3332f02e8e88 Author: Eli Cohen Date: Wed May 30 13:14:31 2007 +0300 mlx4_core: Fix CQ context layout The reserved6 field should be 64 bits, not just 16 bits. Without this, the structure does not match the hardware layout on 32-bit architectures: the db_rec_addr field ends up at offset 52 instead of offset 56. The bug slipped by because the alignment of __be64 members ends up putting it in the right place on x86-64. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit b74d0deb968e1f85942f17080eace015ce3c332c Author: Roland McGrath Date: Wed Jun 6 03:59:00 2007 -0700 Restrict clearing TIF_SIGPENDING This patch should get a few birds. It prevents sigaction calls from clearing TIF_SIGPENDING in other threads, which could leak -ERESTART*. And It fixes ptrace_stop not to clear it, which done at the syscall exit stop could leak -ERESTART*. It probably removes the harm from signalfd, at least assuming it never calls dequeue_signal on kernel threads that might have used block_all_signals. Signed-off-by: Roland McGrath Cc: Andrew Morton Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Satoru Takeuchi Signed-off-by: Linus Torvalds commit 8381e04b90ce9e7669a2d20aa7aaff3be910e447 Author: Andy Whitcroft Date: Thu Jun 7 16:16:40 2007 +0100 checkpatch.pl: should be executable scripts/checkpatch.pl should be executable, make it so. Signed-off-by: Andy Whitcroft Acked-by: Andrew Morton Acked-by: Joel Schopp Signed-off-by: Linus Torvalds commit f40e524eaec9697d1515564fd5b961d839d2dc4f Author: Paul Mackerras Date: Thu Jun 7 22:21:31 2007 +1000 [POWERPC] Fix building of COFF zImages The COFF zImage (for booting oldworld powermacs) wasn't being built correctly because the procedure descriptor in crt0.S for the zImage entry point wasn't declared as .globl, and therefore wasn't getting pulled in from wrapper.a by the linker. This adds the necessary .globl statement. Signed-off-by: Paul Mackerras commit 3373c0ae6a51085b10a95fd9d2214a9995ef7563 Author: Pierre Ossman Date: Thu May 31 22:25:11 2007 +0200 mmc: don't call switch on old cards Make sure we don't call the switch function on cards too old to support it. They should just ignore it, but some have been reported to lock up instead. Signed-off-by: Pierre Ossman commit 71651297a448289353b2493c6c3c183f9be7be7c Author: Pierre Ossman Date: Wed Jun 6 20:23:25 2007 +0200 mmc: fix broken if clause Fix a broken if clause which was causing SD cards to go into 4-bit mode even if the host did not support it. (Reported by David Brownell and Marc Pignat) Signed-off-by: Pierre Ossman commit 60da8de671cc314c75118768052d04ea92eaed4d Author: Robert P. J. Day Date: Wed Jun 6 20:19:34 2007 +0200 au1xmmc: Replace C code with call to ARRAY_SIZE() macro. Signed-off-by: Robert P. J. Day Signed-off-by: Pierre Ossman commit b6cedb38613d41367839df9d2181df3c81fb25c4 Author: Marc Pignat Date: Wed Jun 6 20:27:59 2007 +0200 mmc-atmel: remove linux/mmc/protocol.h dependencies Fix compilation error by removing command decoding from at91_mci.c driver. Decoding commands in the host driver is the wrong way. Signed-off-by: Marc Pignat Signed-off-by: Pierre Ossman commit 87873c86802ba7ff9d9550d06459a6e99d72c5eb Author: Sebastian Siewior Date: Wed Jun 6 14:03:58 2007 +1000 [POWERPC] spufs: Fix error handling in spufs_fill_dir() The error path in spufs_fill_dir() is broken. If d_alloc_name() or spufs_new_file() fails, spufs_prune_dir() is getting called. At this time dir->inode is not set and a NULL pointer is dereferenced by mutex_lock(). This bugfix replaces spufs_prune_dir() with a shorter version that does not touch dir->inode but simply removes all children. Signed-off-by: Sebastian Siewior Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 5e1e9ba690a2e2135a8f997242f9c46d2b8ac033 Author: Stuart Yoder Date: Wed Jun 6 04:29:14 2007 +1000 [POWERPC] Add table of contents to booting-without-of.txt Add table of contents. Signed-off-by: Stuart Yoder Signed-off-by: Paul Mackerras commit e5c0b9ec538a86433ddd725f675e0a5a2117b9ed Author: Christoph Hellwig Date: Tue Jun 5 11:25:59 2007 +1000 [POWERPC] spufs: Don't yield nosched context Nosched context sould never be scheduled out, thus we must not deactivate them in spu_yield ever. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit d30ac1242bf842fe28501a78a460a43910ef2dba Author: Stuart Yoder Date: Tue Jun 5 07:16:15 2007 +1000 [POWERPC] Fix typo in booting-without-of-txt section numbering Fix typo in section numbering. Signed-off-by: Stuart Yoder Acked-by: David Gibson Signed-off-by: Paul Mackerras commit 6dcbf164dcf4042bcbe9f56d94f65acd10b0e1f6 Author: Christoph Hellwig Date: Tue Jun 5 04:14:41 2007 +1000 [POWERPC] scc_sio: Fix link failure scc_sio.o should only be built if the txx9 serial driver is actually built into the kernel. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann -- Signed-off-by: Paul Mackerras commit 1552cb923efcd0f5499104256010d2ace437581d Author: Thomas Renninger Date: Tue Jun 5 04:14:40 2007 +1000 [POWERPC] cbe_cpufreq: Limit frequency via cpufreq notifier chain ... and get rid of cpufreq_set_policy call that caused a build failure due interfering commits. Signed-off-by: Thomas Renninger Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e7c40012b84f670ba57fe4a3f453ddecc8813e9b Author: Arnd Bergmann Date: Tue Jun 5 04:14:39 2007 +1000 [POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap We had a problem on a system with only dynamically allocated PCI buses (using of_pci_phb_driver) in combination with libata. This setup ended up having no "primary" phb, which means that pci_io_base never got initialized and all IO port numbers are 64 bit numbers, which is larger than the PIO_MASK limit. Signed-off-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit bb5db29aa0379f0f3ef857a3a3715f17261c611b Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs scheduler: Fix wakeup races Fix the race between checking for contexts on the runqueue and actually waking them in spu_deactive and spu_yield. The guts of spu_reschedule are split into a new helper called grab_runnable_context which shows if there is a runnable thread below a specified priority and if yes removes if from the runqueue and uses it. This function is used by the new __spu_deactivate hepler shared by preemption and spu_yield to grab a new context before deactivating a specified priority and if yes removes if from the runqueue and uses it. This function is used by the new __spu_deactivate hepler shared by preemption and spu_yield to grab a new context before deactivating the old one. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 47d3a5faa3f72186f769ed9579c630afb8433f2b Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Synchronize pte invalidation vs ps close Make sure the mapping_lock also protects access to the various address_space pointers used for tearing down the ptes on a spu context switch. Because unmap_mapping_range can sleep we need to turn mapping_lock from a spinlock into a sleeping mutex. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 89df00855beabfa700f9a9ed52f0983bdc4b021d Author: Sebastian Siewior Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Free mm if spufs_fill_dir() failed In case spufs_fill_dir() fails only put_spu_context() gets called for cleanup and the acquired mm_struct never gets freed. Signed-off-by: Sebastian Siewior Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 877907d37da9694a34adc9dc3e2ce09400148cb5 Author: Jeremy Kerr Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Fix gang destroy leaks Previously, closing a SPE gang that still has contexts would trigger a WARN_ON, and leak the allocated gang. This change fixes the problem by using the gang's reference counts to destroy the gang instead. The gangs will persist until their last reference (be it context or open file handle) is gone. Also, avoid using statements with side-effects in a WARN_ON(). Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ce92987baba60bc082b9eedddfaf4ae3f8435dac Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Hook up spufs_release_mem Currently spufs_mem_release and the mem file doesn't have any release method hooked up, leading to leaks everytime is used. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 8f18a158192ef6dc63a572bdbbdf5613cfbbe2e4 Author: Arnd Bergmann Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Refuse to load the module when not running on cell As noticed by David Woodhouse, it's currently possible to mount spufs on any machine, which means that it actually will get mounted by fedora. This refuses to load the module on platforms that have no support for SPUs. Cc: David Woodhouse Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 6291ed3c04d5c83c26e77d4fa47e06d0416be81d Author: Olof Johansson Date: Mon Jun 4 10:49:05 2007 +1000 [POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug The powerpc iommu code was refactored by Linas back in the 2.6.20 time frame to map 4K pages from the generic code, but I had forgotten to go back and fix my platform driver before submitting it. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit eeb47d1234af1a9267836f680a8e114b2e88d0dc Author: Mark Fasheh Date: Wed Jun 6 16:15:24 2007 -0700 ocfs2: Fix invalid assertion during write on 64k pages The write path code intends to bug if a math error (or unhandled case) results in a write outside of the current cluster boundaries. The actual BUG_ON() statements however are incorrect, leading to a crash on kernels with 64k page size. Fix those by checking against the right variables. Also, move the assertions higher up within the functions so that they trip *before* the code starts to mark buffers. Signed-off-by: Mark Fasheh commit 59be7dc97bacc0fd8e22f0be6e2aebb5c9b4ff47 Author: Tiger Yang Date: Mon Jun 4 10:31:08 2007 +0800 ocfs2: Fix masklog breakage Some of the sysfs changes inadvertantly broke the simple runtime debug log filtering employed in ocfs2. Fix this by properly exporting the masklog category filter names. Signed-off-by: Tiger Yang Signed-off-by: Mark Fasheh commit 874808c6dd429f7431b906a32c7f78a68e7636af Author: Wang Zhenyu Date: Wed Jun 6 11:16:25 2007 +0800 [AGPGART] intel_agp: Add support for G33, Q33 and Q35 chipsets This patch adds pci ids for G33, Q33 and Q35 chips, and update with new GTT size and stolen mem size detect method on these chips. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit df80b148869291621ddf51eb8716658d5bfba811 Author: Wang Zhenyu Date: Thu May 31 11:51:12 2007 +0800 [AGPGART] intel_agp: add support for 945GME Add pci id info for 945GME. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit c8eebfd6807f37b9a8a7ce3a64b60429788dfb54 Author: Wang Zhenyu Date: Thu May 31 11:34:06 2007 +0800 [AGPGART] intel_agp: add support for 965GME/GLE Add pci id info for 965GME/GLE support. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 9614ece14f23f2ce54a076c471aec9c91e51e79c Author: Wang Zhenyu Date: Wed May 30 09:45:58 2007 +0800 [AGPGART] intel_agp: use table for device probe Fixed issues noted by Christoph Hellwig, and I changed device table scan a bit to allow the case that some models of graphics chips may have same host bridge type. This type of chip will be added in the future. This patch cleans up device probe function. Eric Anholt was the original author. Signed-off-by: Eric Anholt Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit c4ca881796b7e14120851ddf6e04845ef94a314a Author: Wang Zhenyu Date: Wed May 30 09:40:46 2007 +0800 [AGPGART] intel_agp: cleanup intel private data Remove volatile type declare for IO mem variables. A single private gart data is used by all drivers, this makes it clean. Eric Anholt wrote the original patch. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 6ba07e590d1f841a5d0539978399b852a015ab53 Author: Atsushi Nemoto Date: Mon May 21 23:45:38 2007 +0900 [MIPS] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS This fixes the warning: arch/mips/kernel/traps.c:931: warning: 'do_default_vi' defined but not used Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 490dcc4d309141b622107ad5ad82674a01e089bc Author: Robert P. J. Day Date: Sun May 20 12:11:07 2007 -0400 [MIPS] Fix some minor typoes in arch/mips/Kconfig. Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit cc8f0b827fdd616a3358fc939a2811bc0d6c3f79 Author: Ralf Baechle Date: Sun May 20 22:29:01 2007 +0200 [MIPS] Remove prototype for deleted function qemu_handle_int Signed-off-by: Ralf Baechle commit 8676d2e0244cbef294c7d9ad6e50048f9dfba9e0 Author: Atsushi Nemoto Date: Fri May 18 00:46:13 2007 +0900 [MIPS] Fix some system calls with long long arguments * O32 fadvise64() pass long long arguments by register pairs. Add sys32 version for 64 bit kernel. * N32 readahead() can pass a long long argument by one register. No need to use sys32_readahead. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit fbd5604d56c4543457aeae6dda69c9b8a1405474 Author: Thomas Bogendoerfer Date: Fri May 18 14:32:36 2007 +0200 [MIPS] Make dma_map_sg handle sg elements which are longer than one page Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 1fe5f2c4503cf45806a47c608706fc7892649d4b Author: Atsushi Nemoto Date: Fri May 18 00:53:47 2007 +0900 [MIPS] Drop __ARCH_WANT_SYS_FADVISE64 sys_fadvise64() is not used on MIPS. The libc can implement both posix_fadvise() and posix_fadvise64() using sys_fadvise64_64(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 22df5bc591ea2d0dbe8240fe8af0816b8a6533b9 Author: Thomas Bogendoerfer Date: Thu May 17 14:53:12 2007 +0200 [MIPS] Fix VGA corruption on RM300C ... by setting DRAM config to 2MB (SNI always used that size). This also fixes video dram size detection in cirrusfb. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 0c2bf745f9bdef7243ef5f04e6b05f592abead06 Author: Thomas Bogendoerfer Date: Thu May 17 14:51:47 2007 +0200 [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit d73d420708f456a63d7db2c504c62cd713381d7d Author: Sergei Shtylyov Date: Wed May 16 20:35:13 2007 +0400 [MIPS] EMMA2RH: remove dead KGDB code Get rid of the cross-arch KGDB specific code which shouldn't have been there in the first place... Signed-off-by: Sergey Shtylyov Signed-off-by: Ralf Baechle commit f9509c84d8d9451ecd1731e922e7094b38ee336a Author: Chris Dearman Date: Thu May 17 21:36:55 2007 +0100 [MIPS] Remove duplicate fpu enable hazard code. Use common code from hazards.h instead. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 79894c7b47f78decaa3511f1d6646aa06e2c6bed Author: Ralf Baechle Date: Wed May 16 17:54:08 2007 +0200 [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler. Aside of being handy for debugging this has never been a particularly good idea but is now getting in the way of dyntick / tickless kernels and general cleanups. Signed-off-by: Ralf Baechle commit 100c1ddc98e070c1b595d6bad329fb57bc57313c Author: Yehuda Sadeh Weinraub Date: Tue Jun 5 21:31:16 2007 +0000 [CIFS] Missing flag on negprot needed for some servers to force packet signing A related signature issue that I came across. There's a bug in win2k that when NT error codes are not negotiated, the server doesn't response that signatures are mandatory. Since there's (currently) no way turn on signatures in such case, I had to force NT error codes, so that this bug will not occur Signed-off-by: Yehuda Sadeh Weinraub Signed-off-by: Steve French commit 221601c3d1df8148525daf3143a7a22fba772566 Author: Steve French Date: Tue Jun 5 20:35:06 2007 +0000 [CIFS] whitespace cleanup part 2 Various coding style problems found by running the new checkpatch.pl script against fs/cifs. 3 more files fixed up. Signed-off-by: Steve French commit e7e8cc5ae63c39dbbbb5f14c5120bdf2d931fac9 Author: Antonino Daplas Date: Tue Jun 5 13:15:26 2007 -0700 [VIDEO] sunxvr500fb: Fix pseudo_palette array size - the pseudo_palette is only 16 elements long. - the pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit f2c138638687a7ffbf0d2a0e7addfec7bab9a765 Author: Antonino Daplas Date: Tue Jun 5 13:15:01 2007 -0700 [VIDEO] sunxvr2500fb: Fix pseudo_palette array size - the pseudo_palette is only 16 elements long. - the pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit c0f85a82484c25d23b44a87a35daddb2b276b4aa Author: Russell King Date: Tue Jun 5 21:14:40 2007 +0100 [ARM] pxa: fix pxa27x keyboard driver CKEN macro definitions no longer contains the bit number; remove it from usages in the pxa27x keyboard driver. Signed-off-by: Russell King commit d2fa9e05e3876198d8ab31624fe84512a0a44b45 Author: Antonino Daplas Date: Tue Jun 5 13:14:33 2007 -0700 [VIDEO] ffb: The pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit db002b8597df84643e949cce793d0f696f100c9e Author: Russell King Date: Tue Jun 5 19:39:49 2007 +0100 [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking 2389b272168ceec056ca1d8a870a97fa9c26e11a contains a merge bug; fix it. Signed-off-by: Russell King commit 5fdae1f681426d23eadcb99566030781ba8c65c9 Author: Steve French Date: Tue Jun 5 18:30:44 2007 +0000 [CIFS] whitespace cleanup Various coding style problems found by running fs/cifs against the new checkpatch.pl script. Since there were too many to fit in one patch. Updated the first four files. Signed-off-by: Steve French commit 29982e9acd3e81a289c73321401427d02eaa8adc Author: Doug Chapman Date: Mon May 7 15:59:46 2007 -0400 [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive Patch for: http://bugzilla.kernel.org/show_bug.cgi?id=8426 A recent code cleanup that moved code from mptscsih to mptspi inadvertently change the order some code was called. This caused a massive slowdown (of 150x to 300x) on the CD/DVD drive on the high-end HP Integrity servers. Signed-off-by: Doug Chapman Acked-by: Eric Moore Signed-off-by: James Bottomley commit 353076fee81318d056c7a853b1bf6ad1f81d050d Author: Sam Ravnborg Date: Mon Jun 4 23:52:45 2007 -0700 [VIDEO]: Fix section mismatch warning in promcon. Fix the following warnings in promcon: WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x480): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x488): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x48c): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x490): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') The warnings happens because the function: promcon_init_unimap() references promfont_unitable and promfont_unicount which are marked __initdata by the conmakehash command in the drivers/video/console/Makefile Fix the warning by removing the __initdata marker on the two variables. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 65d8bac3df9516adb17ce9df94a955d3c2c85a51 Author: David S. Miller Date: Mon Jun 4 23:33:04 2007 -0700 [ATA]: Back out bogus (SPARC64 && !PCI) Kconfig depends. Signed-off-by: David S. Miller commit f04dbac2623439e8e15abf55742769af0280c919 Author: David S. Miller Date: Mon Jun 4 23:32:23 2007 -0700 [SPARC64]: Fill in gaps in non-PCI dma_*() NOP implementation. Signed-off-by: David S. Miller commit a2f9f6bbb30e60ee9f9f83cede960123a65876a2 Author: David S. Miller Date: Mon Jun 4 21:48:33 2007 -0700 [SPARC64]: Fix {mc,smt}_capable(). It's not just sun4v hypervisor platforms that should return true for this, sun4u with UltraSPARC-IV should return true too. Signed-off-by: David S. Miller commit 5cd342df96e911fb8135fb3d58f33c2c5af9ffab Author: David S. Miller Date: Mon Jun 4 21:35:18 2007 -0700 [SPARC64]: Make core and sibling groups equal on UltraSPARC-IV. Signed-off-by: David S. Miller commit f78eae2e6f5d1eb05f76a45486286445b916bd92 Author: David S. Miller Date: Mon Jun 4 17:01:39 2007 -0700 [SPARC64]: Proper multi-core scheduling support. The scheduling domain hierarchy is: all cpus --> cpus that share an instruction cache --> cpus that share an integer execution unit Signed-off-by: David S. Miller commit d887ab3a9b1899f88b8cfba531e726b5fb2ebd14 Author: David Miller Date: Sun Jun 3 23:38:09 2007 -0700 [SPARC64]: Provide mmu statistics via sysfs. If the system supports hypervisor based statistics, allow them to be fetched, enabled, and disabled via sysfs. Enable and disable via the boolean: /sys/devices/systems/cpu/cpuN/mmustat_enable Statistic values are provided under: /sys/devices/systems/cpu/cpuN/mmu_status/ Signed-off-by: David S. Miller commit 48b67356400dd7866c035024aeaa2f804de7cead Author: David Miller Date: Sun Jun 3 19:07:32 2007 -0700 [SPARC64]: Fix service channel hypervisor function names. sed 's/scv/svc/' Signed-off-by: David S. Miller commit d1f253e60aefe4d3a3e708b3c2a082f3ec1be6f4 Author: David S. Miller Date: Sat Jun 2 20:46:36 2007 -0700 [SPARC64]: Export basic cpu properties via sysfs. Cache sizes, udelay_val, and clock_tick. Signed-off-by: David S. Miller commit eff3414b7277c4792debfa227f5408238d925f16 Author: David S. Miller Date: Sat Jun 2 14:41:44 2007 -0700 [SPARC64]: Move topology init code into new file, sysfs.c Also, use per-cpu data for struct cpu. Calling kmalloc for each cpu in topology_init() is just plain clumsy. Signed-off-by: David S. Miller commit 5ecd3100e695228ac5e0ce0e325e252c0f11806f Author: Linus Torvalds Date: Mon Jun 4 17:57:25 2007 -0700 Linux 2.6.22-rc4 commit 464cf177df7727efcc5506322fc5d0c8b896f545 Author: Tejun Heo Date: Sun May 27 15:10:40 2007 +0200 libata: always use polling SETXFER Several people have reported LITE-ON LTR-48246S detection failed because SETXFER fails. It seems the device raises IRQ too early after SETXFER. This is controller independent. The same problem has been reported for different controllers. So, now we have pata_via where the controller raises IRQ before it's ready after SETXFER and a device which does similar thing. This patch makes libata always execute SETXFER via polling. As this only happens during EH, performance impact is nil. Setting ATA_TFLAG_POLLING is also moved from issue hot path to ata_dev_set_xfermode() - the only place where SETXFER can be issued. Note that ATA_TFLAG_POLLING applies only to drivers which implement SFF TF interface and use libata HSM. More advanced controllers ignore the flag. This doesn't matter for this fix as SFF TF controllers are the problematic ones. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108 Author: Andrew Morton Date: Sun Jun 3 13:50:41 2007 -0700 vanishing ioctl handler debugging We've had several reoprts of the CPU jumping to 0x00000000 is do_ioctl(). I assume that there's a race and someone is zeroing out the ioctl handler while this CPU waits for the lock_kernel(). The patch adds code to detect this, then emits stuff which will hopefuly lead us to the culprit. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c738480d21a190e3d99c7ce985ab9484f373a3c Author: Andrew Morton Date: Sun Jun 3 13:50:40 2007 -0700 mtrr atomicity fix Rafael gets this on an SMP box with kernel preemption enabled, during hibernation and restore (100% of the time): Enabling non-boot CPUs ... BUG: using smp_processor_id() in preemptible [00000001] code: bash/4514 caller is mtrr_save_state+0x9/0x40 Cc: "Rafael J. Wysocki" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e44a45ae7b7f7c7a4ebd6aa39b703bf2b97fe848 Author: David Brownell Date: Sun Jun 3 13:50:40 2007 -0700 SPI dynamic busid generation bugfix Fix SPI dynamic bus ID assignment to start at 2^15-1 rather than a negative number. Valid bus ids are supposed to be positive, and are (now) stored in an 's16' value. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6985c7f6842fa040d058640e363140ad1730dc5 Author: Akinobu Mita Date: Mon Jun 4 16:14:59 2007 +0000 [CIFS] fix mempool destroy done in wrong order in cifs error path Slab cache used as memory pool can not be destroyed before the memory pool destruction. Because the memory pool still holds some objects and kmem_cache_destroy() says "Can't free all objects". Signed-off-by: Akinobu Mita Signed-off-by: Steve French commit 3a2430708fb8f31c084503cb47240483ec2c2662 Author: David S. Miller Date: Sun Jun 3 17:56:04 2007 -0700 [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS Reported by Meelis Roos. Signed-off-by: David S. Miller Signed-off-by: James Bottomley commit 8ce7955aa52c37db1425ea4bd4edcfa67e253454 Author: Michael Schmitz Date: Sun Jun 3 12:55:04 2007 +0200 [SCSI] atari_NCR5380: update_timeout removal Atari SCSI driver fixes: remove update_timeout kludge Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven Acked-by: Christoph Hellwig Signed-off-by: James Bottomley commit c3d4ed4e3e5aa8d9e6b4b795f004a7028ce780e9 Author: Kyle McMartin Date: Mon Jun 4 02:26:52 2007 -0400 [PARISC] Fix kernel panic in check_ivt check_ivt had some seriously broken code wrt function pointers on parisc64. Instead of referencing the hpmc code via a function pointer, export symbols and reference it as a const array. Thanks to jda for pointing out the broken 64-bit func ptr handling. Signed-off-by: Kyle McMartin commit 1dfa2812404c37d7571622195f907cea3331616c Author: Dmitry Torokhov Date: Sun Jun 3 23:29:36 2007 -0400 Input: reduce raciness when input handlers disconnect There is a race between input handler's release() and disconnect() methods: when input handler disconnects it wakes up all regular users and then process to walk user list to wake up async. users. While disconnect() walks the list release() removes elements of the same list causing oopses. While this is not a substibute for proper locking we can reduce odds of getting an oops if we wake up normal readers after walking the list. Signed-off-by: Dmitry Torokhov commit 26be5a509af5f80c7012bd4f0478a94746c9c9d9 Author: Dmitry Torokhov Date: Fri May 11 01:16:12 2007 -0400 Input: ucb1x00 - do not access input_dev->private directly Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov Acked-by: Pavel Machek commit 9a412847fbe396563acf2a78d5830c9c6c5a5d43 Author: Paul Mundt Date: Mon Jun 4 11:07:23 2007 +0900 sh: Fix se73180 platform device registration. Copy and paste error from se7343, fix it up. Signed-off-by: Paul Mundt commit 0fd14754141e3604529579232d34fcffd89c24b9 Author: Paul Mundt Date: Mon Jun 4 10:58:23 2007 +0900 sh: ioremap() through PMB needs asm/mmu.h. Signed-off-by: Paul Mundt commit 63dfc3c77b6a99cc618e0a11b7532a56e2699320 Author: Paul Mundt Date: Mon Jun 4 10:53:00 2007 +0900 sh: voyagergx: Fix build warnings. pr_debug() was using a %x on an unsigned long, which was making the build a bit noisy. Signed-off-by: Paul Mundt commit 907c9d70042e38efc6a981d425a3d8d98b089cba Author: Paul Mundt Date: Mon Jun 4 10:51:59 2007 +0900 sh: Fix SH4-202 clock fwk set_rate() mismatch. With the SH7722 changes, ->set_rate() also takes an algo_id, SH4-202 was overlooked when this change went in. Signed-off-by: Paul Mundt commit 8b19a7ce566007a8c45f9ba9d2b4a31bba20d62d Author: Paul Mundt Date: Mon Jun 4 10:50:42 2007 +0900 sh: microdev: Fix compile warnings. irq.c needs linux/interrupt.h. Signed-off-by: Paul Mundt commit c596b1a38085a041464b9b2c0c200e81ff695634 Author: Paul Mundt Date: Mon Jun 4 10:39:50 2007 +0900 sh: Fix in_nmi symbol build error. If CONFIG_KGDB_NMI is disabled, we're left with a stray in_nmi reference that can't be resolved. Move the symbol under the ifdef, too. Signed-off-by: Paul Mundt commit 899b69d079713d0f568fb2700b86987aa94f29b2 Author: David S. Miller Date: Sun Jun 3 17:39:56 2007 -0700 [ATA]: Don't allow to enable this for SPARC64 without PCI. Based upon a report from Meelis Roos. Signed-off-by: David S. Miller commit e11a6c236b3070ed05b079f91a9b3defa48b54d3 Author: David S. Miller Date: Sun Jun 3 17:35:24 2007 -0700 [VIDEO]: XVR500 and XVR2500 require FB=y Signed-off-by: David S. Miller commit 6e1d91039becc9d5bcd046d8c709dbaf471220e3 Author: Patrick McHardy Date: Fri Jun 1 11:45:04 2007 -0700 [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl Currently when icmp_errors_use_inbound_ifaddr is set and an ICMP error is sent after the packet passed through ip_output(), an address from the outgoing interface is chosen as ICMP source address since skb->dev doesn't point to the incoming interface anymore. Fix this by doing an interface lookup on rt->dst.iif and using that device. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 584bdf8cbdf6f277c2a00e083257ee75687cf6f4 Author: Wei Dong Date: Thu May 31 22:49:28 2007 -0700 [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP Signed-off-by: Wei Dong Signed-off-by: David S. Miller commit 4fcd6b991685493185c2bb8a76b21aadb658bd76 Author: Herbert Xu Date: Thu May 31 22:15:50 2007 -0700 [NET] gso: Fix GSO feature mask in sk_setup_caps This isn't a bug just yet as only TCP uses sk_setup_caps for GSO. However, if and when UDP or something else starts using it this is likely to cause a problem if we forget to add software emulation for it at the same time. The problem is that right now we translate GSO emulation to the bitmask NETIF_F_GSO_MASK, which includes every protocol, even ones that we cannot emulate. This patch makes it provide only the ones that we can emulate. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6418204f919c030ca0c943f6c77dc84aff2ec0d2 Author: Ilpo Järvinen Date: Thu May 31 21:37:55 2007 -0700 [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules) The code used to ignore GSO completely, passing either way too small or zero pkts_acked when GSO skb or part of it got ACKed. In addition, there is no need to calculate the value in the loop but simple arithmetics after the loop is sufficient. There is no need to handle SYN case specially because congestion control modules are not yet initialized when FLAG_SYN_ACKED is set. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 75202e76893c11ce7f8bcc9a07f994d71e3d5113 Author: Bill Nottingham Date: Thu May 31 21:33:35 2007 -0700 [NET]: Fix comparisons of unsigned < 0. Recent gcc versions emit warnings when unsigned variables are compared < 0 or >= 0. Signed-off-by: Bill Nottingham Signed-off-by: David S. Miller commit 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8 Author: Venkatesh Pallipadi Date: Thu May 31 21:28:44 2007 -0700 [NET]: Make net watchdog timers 1 sec jiffy aligned. round_jiffies for net dev watchdog timer. Signed-off-by: Venkatesh Pallipadi Signed-off-by: David S. Miller commit b206a65d671d359d0947f0b6da9d418c49a9b28a Author: Jeff Garzik Date: Thu May 31 21:26:23 2007 -0700 [ATM]: Fix warning. The compiler warning drivers/atm/firestream.c: In function ‘top_off_fp’: drivers/atm/firestream.c:1505: warning: cast to pointer from integer of different size does indicate a bug, albeit a minor one. Fixed, by using a 32-bit temporary prior to the call to bus_to_virt(). The larger bug is still present: the entire driver assumes that machine pointers are 32-bit, as it stores pointers in 32-bit hardware registers. This is obvious to anyone who knows the driver well, but for the casual readers it is helpfully noted with FIXME. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 3f196eb519a419bf83ecc22753943fd0a0de4f8f Author: Mark Glines Date: Thu May 31 15:44:48 2007 -0700 [TCP]: Use default 32768-61000 outgoing port range in all cases. This diff changes the default port range used for outgoing connections, from "use 32768-61000 in most cases, but use N-4999 on small boxes (where N is a multiple of 1024, depending on just *how* small the box is)" to just "use 32768-61000 in all cases". I don't believe there are any drawbacks to this change, and it keeps outgoing connection ports farther away from the mess of IANA-registered ports. Signed-off-by: Mark Glines Signed-off-by: David S. Miller commit 278a3de5abc7901805689a66340b5af9882b4f9a Author: David S. Miller Date: Thu May 31 15:19:20 2007 -0700 [AF_UNIX]: Fix datagram connect race causing an OOPS. Based upon an excellent bug report and initial patch by Frederik Deweerdt. The UNIX datagram connect code blindly dereferences other->sk_socket via the call down to the security_unix_may_send() function. Without locking 'other' that pointer can go NULL via unix_release_sock() which does sock_orphan() which also marks the socket SOCK_DEAD. So we have to lock both 'sk' and 'other' yet avoid all kinds of potential deadlocks (connect to self is OK for datagram sockets and it is possible for two datagram sockets to perform a simultaneous connect to each other). So what we do is have a "double lock" function similar to how we handle this situation in other areas of the kernel. We take the lock of the socket pointer with the smallest address first in order to avoid ABBA style deadlocks. Once we have them both locked, we check to see if SOCK_DEAD is set for 'other' and if so, drop everything and retry the lookup. Signed-off-by: David S. Miller commit 007a880d627aee0e854e793099bb33d0c1130678 Author: Michael Chan Date: Thu May 31 14:49:51 2007 -0700 [TG3]: Fix link problem on Dell's onboard 5906. The bug is caused by code that always set (TG3_FLAG_USE_MI_INTERRUPT | TG3_FLAG_USE_LINKCHG_REG) on all Dell's onboard devices. With these 2 flags set, the link status is polled by tg3_timer() and will only work when the PHY is set up to interrupt the MAC on link changes. This breaks 5906 because the 5906 PHY does not support TG3_FLAG_USE_MI_INTERRUPT the same as other PHYs. For correctness, only Dell's onboard 5701 needs these 2 flags to be set. This change will fix the 5906 problem and will change other Dell devices except 5700 and 5701 to use the more efficient interrupt-driven link changes. Update version to 3.77. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1c92b4e50ef926d1e26fcc056a520e4a7d12478c Author: David S. Miller Date: Thu May 31 13:24:26 2007 -0700 [AF_UNIX]: Make socket locking much less confusing. The unix_state_*() locking macros imply that there is some rwlock kind of thing going on, but the implementation is actually a spinlock which makes the code more confusing than it needs to be. So use plain unix_state_lock and unix_state_unlock. Signed-off-by: David S. Miller commit 3bb457af4fa86dceef57d7c3e959aff162457fdc Author: Kyle McMartin Date: Sun Jun 3 17:47:00 2007 -0400 [PARISC] Fix bug when syscall nr is __NR_Linux_syscalls The bug was that we were comparing __NR_syscalls to be greater or equal to the syscall number stored in %r20. __NR_syscalls is one greater than the last syscall though, so we're loading one entry beyond the end of the syscall table, and trying to jump to it. Fix this by only checking that we're greater, alternatively, we could have compared to (__NR_Linux_syscalls - 1) Signed-off-by: Kyle McMartin commit 0e5f82dda5e60a21cf8ba4f77334d60290277d2c Author: Andrew Victor Date: Thu May 31 10:16:00 2007 +0100 [ARM] 4421/1: AT91: Value of _KEY fields. Use the actual value (0xA5) for the AT91_SHDW_KEY and AT91_WDT_KEY register fields instead of a bitmask. This is consistent with how AT91_RSTC_KEY is defined, and is easier to use in code. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit beaf53bff7985ad57b5b6983f3d6142380449370 Author: Li Yang Date: Fri May 25 13:54:02 2007 +0800 NET: add MAINTAINERS entry for ucc_geth driver Signed-off-by: Li Yang Acked-by: Kim Phillips Signed-off-by: Jeff Garzik commit 6ffdd071e0386645d539a7386f77669777412fea Author: Brice Goglin Date: Wed May 30 21:13:59 2007 +0200 myri10ge: report link up/down in standard ethtool way Report link up/down in standard ethtool way Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 225c3837bb47d33357dcdad9f88321d75a3eb7fd Author: Mithlesh Thukral Date: Fri Jun 1 04:13:08 2007 -0700 NetXen: Removal of extra free_irq call NetXen: Removal of redundant free_irq This patch removes a redundant free_irq() call from remove() routine. This will also eliminate a warning during unload of driver. Signed-by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit df31233ab95980d037d0304aaf44f9939fbaede5 Author: Valerie Henson Date: Wed May 30 06:08:54 2007 -0600 Update tulip maintainer email address I've quit Intel and gone into business as a Linux consultant. Update my email address in MAINTAINERS. Signed-off-by: Valerie Henson Signed-off-by: Jeff Garzik commit 6026ee67eda769122be535e8f05be438dfdcb29a Author: Paul Mundt Date: Fri Jun 1 17:36:48 2007 +0900 smc91x: sh solution engine fixes. The current smc91x I/O routines ifdef the solution engine subtypes individually, which is rather bogus, as they can simply use CONFIG_SOLUTION_ENGINE instead. This fixes it for some of the other solution engines that weren't included in the ifdef list (SH7206 specifically). There are also inb/outb definitions which are totally bogus (missing brackets in _both_ cases, SMC_CAN_USE_8BIT == 0, and even better, they try to use a 16-bit access to fake 8-bit access). Kill that nonsense off completely. Signed-off-by: Paul Mundt -- drivers/net/smc91x.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 416b5d10afdc797c21c457ade3714e8f2f75edd9 Author: Auke Kok Date: Fri Jun 1 10:22:39 2007 -0700 e1000: disable polling before registering netdevice To assure the symmetry of poll enable/disable in up/down, we should initialize the netdevice to be poll_disabled at load time. Doing this after register_netdevice leaves us open to another race, so lets move all the netif_* calls above register_netdevice so the stack starts out how we expect it to be. Signed-off-by: Auke Kok Cc: Herbert Xu Cc: Doug Chapman Signed-off-by: Jeff Garzik commit 25805dcf9d83098cf5492117ad2669cd14cc9b24 Author: Stephen Hemminger Date: Fri Jun 1 09:44:01 2007 -0700 network drivers: eliminate unneeded kill_vid code Many drivers had code that did kill_vid, but they weren't doing vlan filtering. With new API the stub is unneeded unless device sets NETIF_F_HW_VLAN_FILTER. Bad habit: I couldn't resist fixing a couple of nearby style things in acenic, and forcedeth. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit cb434e380d58d3956c75dc5ead00eced599b9d16 Author: Stephen Hemminger Date: Fri Jun 1 09:44:00 2007 -0700 atl1: eliminate unneeded kill_vid code This driver has unneeded stubs for VLAN filtering. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7b332244a63dc1f408fd2ebb2636d58ac69a4916 Author: Stephen Hemminger Date: Fri Jun 1 09:43:59 2007 -0700 8139cp: fix VLAN unregistration The 8139cp driver did VLAN unregistration incorrectly. It disables VLAN completely when the first VID is unregistered. It should instead disable VLAN when the group is unregistered by calling cp_vlan_rx_register with a NULL grp. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3d4e66f5cd217160da9c3a2e3ec27b22e743bd25 Author: Stephen Hemminger Date: Fri Jun 1 09:43:58 2007 -0700 sky2: Fix VLAN unregistration Fix sky2 disabling VLAN completely when the first vid is unregistered. sky2 disables VLAN completely when the first VID is unregistered. It should instead disable VLAN when the group is unregistered by calling sky2_vlan_rx_register with grp = NULL. Signed-off-by: Patrick McHardy Signed-off-by: Stephen Hemminger drivers/net/sky2.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) Signed-off-by: Jeff Garzik commit d2d1acdb6a632486be9a731f40c68980c09f0490 Author: Stephen Hemminger Date: Fri Jun 1 09:43:57 2007 -0700 VLAN: kill_vid is only useful for VLAN filtering devices The interface for network device VLAN extension was confusing. The kill_vid function is only really useful for devices that do hardware filtering. Devices that only do VLAN receiption without filtering were being forced to provide the hook, and there were bugs in those devices. Many drivers had kill_vid routine that called vlan_group_set_device, with NULL, but that is done already. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e68a8c10c4c5daf363e946d10c1a5cba77d7f92c Author: Stephen Hemminger Date: Wed May 30 14:23:17 2007 -0700 qla3xxx: device doesnt do hardware checksumming. Reading the code for ql_hw_csum_setup(), it is obvious that this driver is broken for IPV6. The driver sets the NETIF_F_HW_SUM flag, but the code for checksum setup only deals with IPV4. Compile tested only, no hardware available. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f72267c30f5a08f9a77c97417ec120e6943195f8 Author: Russell King Date: Sat Jun 2 15:36:37 2007 +0100 [ARM] Solve buggy smp_processor_id() usage BUG: using smp_processor_id() in preemptible [00000001] code: opcontrol/427 Resolve this bug by ensuring that we're not using smp_processor_id() in a preemptable context (by disabling preemption.) Signed-off-by: Russell King commit 29c349d22ccda5678a7dfb732093dbd3befcefa3 Author: Bill Gatliff Date: Thu May 31 16:17:16 2007 +0100 [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA) The default value passed through to pxa_gpio_mode() is lost due to a missing GPIO_DFLT_HIGH mask for nonzero values. The enclosed patch fixes this programming error. Signed-off-by: Bill Gatliff Signed-off-by: Russell King commit b6b27ae5e85fb193c08448157943b187958b8ca2 Author: Andrew Victor Date: Thu May 31 09:34:53 2007 +0100 [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending When suspending to slow-clock mode, at91_pm_verify_clocks() is called to ensure that all the clocks are disabled or in the correct state. This patch replaces the "#warning TODO" messages for the SAM9 processors with the correct code. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1f4b49a4293ea7b0adeaeae37207b9c9fd2dd7c2 Author: Andrew Victor Date: Thu May 31 09:29:33 2007 +0100 [ARM] 4418/1: AT91: Number of programmable clocks differs The number of programmable clocks available on the AT91 processors can differ, therefore do not always display the contents of the PMC_PCKR(0) .. PMC_PCKR(3) registers (ie, assume there are 4 clocks). If CONFIG_AT91_PROGRAMMABLE_CLOCKS is enabled, the programmable clocks will be registered like the other system/peripheral clocks, and the state of the programmable clocks will be displayed like with the other clocks. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c7341d436a7a89dc26706386de0a301fc9dbe49a Author: Catalin Marinas Date: Fri Jun 1 17:13:59 2007 +0100 [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S ARMv7 support code requires a valid stack for saving/restoring registers as the whole D-cache flushing function is more complex. This patch ensures that the SP register is not corrupted. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 627aa944a17ba82ca3ba87dc1d6ee85bd314ec79 Author: Milton Miller Date: Thu May 31 01:29:01 2007 +1000 [POWERPC] Fix zImage.coff generation for 32-bit pmac Commit 9da82a6dee9db4cd5ae7a74ab4f51afb52b6efb9 inadvertently removed the platform override for zImage.coff to be generated with pmaccoff. Rather than add a special makefile rule, change the platform for which the wrapper platform uses the special rules. Signed-off-by: Milton Miller Signed-off-by: Paul Mackerras commit f48419666e645208c0156aecab1ee6157303da3c Author: Stefan Roese Date: Sat Jun 2 19:30:20 2007 +1000 [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms The IBM/AMCC 405 platforms don't compile anymore in the current kernel version. This fixes the compile breakage. Signed-off-by: Stefan Roese Signed-off-by: Paul Mackerras commit e358ae4dd4ca823abc5ee06c61e3915636e60191 Author: Johannes Berg Date: Sat Jun 2 19:13:44 2007 +1000 [POWERPC] Don't allow PMAC_APM_EMU for 64-bit In b302887854d6f0c6f9fc3f1080535e7c1bd53134 I switched the apm emulation code to use the generic code but accidentally dropped the PPC32 dependency from the configuration symbol. This adds it back. Signed-off-by: Johannes Berg Signed-off-by: Paul Mackerras commit f5921697cf5cae68dcbfa881d9e08f3cebef47eb Author: Michael Ellerman Date: Fri Jun 1 17:23:26 2007 +1000 [POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE There is a thinko in the irq code, it uses IRQ_NONE to indicate no irq, whereas it should be using NO_IRQ. IRQ_NONE is returned from irq handlers to say "not handled". As it happens they currently have the same value (0), so this is just for future proof-ness. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71 Author: Akinobu Mita Date: Tue May 29 20:46:51 2007 +1000 [POWERPC] Fix return from pte_alloc_one() in out-of-memory case pte_alloc_one() is expected to return NULL if out of memory. But it returns virt_to_page(NULL), which is not NULL. This fixes it. Cc: Paul Mackerras Signed-off-by: Akinobu Mita Signed-off-by: Paul Mackerras commit 66b30922c8a2c880fe61080c5bf87ae6615b9f64 Author: Michael Neuling Date: Tue May 29 17:01:52 2007 +1000 [POWERPC] Fix compile warning in pseries xics code In 616883df78bd4b3fcdb6ddc39bd3d4cb902bfa32 request_irq was marked as __must_check so we must... er... check it. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit b610b9780bdb2750849f32c2eefef46af58c67f8 Author: David Gibson Date: Tue May 29 15:37:12 2007 +1000 [POWERPC] Don't use HOSTCFLAGS in BOOTCFLAGS In the bootwrapper code for powerpc, we include HOSTCFLAGS into the BOOTCFLAGS used for building the zImage wrapper code. Since the wrapper code is not host code, this makes no sense. This patch removes the use of HOSTCFLAGS here, instead including directly into BOOTCFLAGS those flags from the normal kernel CFLAGS which also make sense in the bootwrapper code. In particular, this makes the bootwrapper use -msoft-float, preventing the compiler from generating floating point instructions. Previously, under some circumstances the compiler could generate floating point instructions in the bootwrapper which would cause exceptions on embedded CPUS which don't have floating point support. Signed-off-by: David Gibson Acked-by: Josh Boyer Signed-off-by: Paul Mackerras commit 0570d4ed4325c0fb2ceb75f45a21d878b1741b61 Author: Stephen Rothwell Date: Mon May 28 16:12:59 2007 +1000 [POWERPC] Create a zImage for legacy iSeries This zImage is really just the stripped vmlinux, but it means that there is one less special case for iSeries and also that the zImages will be built for a combined kernel build that happens to include iSeries. This zImage boots fine on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 18456d015c50bc903fc66c65621170170190a1fd Author: Stephen Rothwell Date: Mon May 28 10:20:45 2007 +1000 [POWERPC] pasemi idle uses hard_smp_processor_id and so needs to include asm/smp.h so a UP build works. Signed-off-by: Stephen Rothwell Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 42d284bc45a9d6625b30c3175563829847406e03 Author: Stephen Rothwell Date: Mon May 28 10:19:08 2007 +1000 [POWERPC] ps3/interrupt.c uses get_hard_smp_processor_id and so needs to include asm/smp.h for a UP build to work. Signed-off-by: Stephen Rothwell Acked-by: Geoff Levand Signed-off-by: Paul Mackerras commit 6ad8d010b2f364b739020e514e61b6a73444464b Author: Benjamin Herrenschmidt Date: Sun May 27 15:18:22 2007 +1000 [POWERPC] Fix possible access to free pages I think we have a subtle race on ppc64 with the tlb batching. The common code expects tlb_flush() to actually flush any pending TLB batch. It does that because it delays all page freeing until after tlb_flush() is called, in order to ensure no stale reference to those pages exist in any TLB, thus causing potential access to the freed pages. However, our tlb_flush only triggers the RCU for freeing page table pages, it does not currently trigger a flush of a pending TLB/hash batch, which is, I think, an error. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 988519acb3dbe7168276a36cbb8fd91fddbffaee Author: David Gibson Date: Fri May 25 13:19:17 2007 +1000 [POWERPC] Fix compiler/assembler flags for Ebony platform boot files The recent addition of assembler flags for 44x.c and ebony.c in the bootwrapper to make them compile on certain toolchains was not correct and could break other platforms. This patch switches to using a compiler flag instead, which implies the appropriate assembler flag, and also stops the compiler itself generating instructions which are invalid for the platform in question. Signed-off-by: David Gibson Acked-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 7d43e57764fe6922703c36d8d0d56a7ead21f03d Author: Benjamin Herrenschmidt Date: Thu May 24 15:41:04 2007 +1000 [POWERPC] Fix ppc32 single-stepping out of syscalls The ppc32 kernel didn't properly set/clear the TIF_SINGLESTEP flag, causing return from syscalls to not SIGTRAP, thus executing one more instruction before stopping again. This fixes it. The ptrace code is a bit of a mess, and is overdue for at least a -proper- 32/64 bits split and possibly more cleanups but this minimum fix should be ok for 2.6.22 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5169b8a1659fef9cc093ed3d889a854945a18177 Author: Michael Ellerman Date: Wed May 23 18:08:13 2007 +1000 [POWERPC] Update documentation for of_find_node_by_type() The documentation for of_find_node_by_type() incorrectly refers to the "name" parameter - it should be "type". Also the behaviour when from == NULL is not really documented, fix that. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 6287ee32952b502c23d54f12895c3895ddbe5013 Author: Bob Moore Date: Tue Apr 3 19:59:37 2007 -0400 ACPICA: Support for external package objects as method arguments Implemented support to allow Package objects to be passed as method arguments to the acpi_evaluate_object interface. Previously, this would return an AE_NOT_IMPLEMENTED exception. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 8ff6f48d99a0351bcc9ceab422042ef9d3bad9aa Author: Luck, Tony Date: Thu May 24 13:57:40 2007 -0700 ACPI: Section mismatch ... acpi_map_pxm_to_node Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node() is defined with attribute __cpuinit, but is called by "normal" kernel functions acpi_getnode() and acpi_map_cpu2node(). Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on which this routine operates from __cpuinitdata to regular memory, so this routine can also move out of init space. Signed-off-by: Tony Luck Signed-off-by: Len Brown commit 0477d24e2a87a9077b62298b01b031929f5cf2a2 Author: David Woodhouse Date: Fri Jun 1 20:04:43 2007 +0100 [JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree() We should keep the mdata node with higher version number, not just the one we happen to find latest. Doh. Signed-off-by: David Woodhouse commit 718ea8361b15aec5f4cb559d63ba34bc5a58d8f9 Author: David Woodhouse Date: Fri Jun 1 19:21:59 2007 +0100 [MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions It returns ERR_PTR(foo) on error, not just NULL. Signed-off-by: David Woodhouse commit 94774a3a8e01989960aaadaea6deff51a4e7deed Author: Salyzyn, Mark Date: Wed May 30 11:59:13 2007 -0400 [SCSI] aacraid: fix shutdown handler to also disable interrupts. Moves quiesce, thread and interrupt shutdown into aacraid drivers' .shutdown handler. This fix to the aac_shutdown handler will remove the superfluous reset of the adapter during a (clean) kexec. This fix may mitigate the active investigation 'kexec and aacraid broken' but it is unlikely to affect the root cause (issue likely present in both kexec and kdump). This patch reduces the chance the problem will occur with a kexec. The fix for root cause is currently expected to be the minimum value check to the aacraid.startup_timeout driver variable after an adapter reset within aacraid_commit_reset.patch submitted on 05/22/2007 and awaiting testing by Yinghai to confirm. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit c1a834dc704763673df10282995257f2de93cbe9 Author: Ingo Molnar Date: Fri Jun 1 00:47:16 2007 -0700 timer stats: speedups Make timer-stats have almost zero overhead when enabled in the config but not used. (this way distros can enable it more easily) Also update the documentation about overhead of timer_stats - it was written for the first version which had a global lock and a linear list walk based lookup ;-) Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fcc15ec3c1c287a781a4620e52522b6186f26f6 Author: Bjorn Steinbrink Date: Fri Jun 1 00:47:15 2007 -0700 timer statistics: fix race Fix two races in the timer stats lookup code. One by ensuring that the initialization of a new entry is finished upon insertion of that entry. The other by cleaning up the hash table when the entries array is cleared, so that we don't have any "pre-inserted" entries. Thanks to Eric Dumazet for reminding me of the memory barriers. Signed-off-by: Bjorn Steinbrink Signed-off-by: Ian Kumlien Acked-by: Ingo Molnar Cc: Eric Dumazet Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c79d9c9e9ace5eeae54f484f62fbd86bf27a344a Author: Sam Ravnborg Date: Fri Jun 1 00:47:14 2007 -0700 net/hp100: fix section mismatch warning Fix following section mismatch warning in hp100: WARNING: drivers/net/hp100.o(.init.text+0x26a): Section mismatch: reference to .exit.text: (after 'init_module') The warning says that we use a function marked __exit from a function marked __init. This is not good on architectures where we discard __exit section for drivers that are built-in. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39959588f58668472bc7108942a8998acedce911 Author: Sam Ravnborg Date: Fri Jun 1 00:47:13 2007 -0700 kvm: fix section mismatch warning in kvm-intel.o Fix following section mismatch warning in kvm-intel.o: WARNING: o-i386/drivers/kvm/kvm-intel.o(.init.text+0xbd): Section mismatch: reference to .exit.text: (between 'hardware_setup' and 'vmx_disabled_by_bios') The function free_kvm_area is used in the function alloc_kvm_area which is marked __init. The __exit area is discarded by some archs during link-time if a module is built-in resulting in an oops. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2b77b233557bde22498a519f650b1ccc91ddb4e Author: Sam Ravnborg Date: Fri Jun 1 00:47:12 2007 -0700 acpi: fix section mismatch warning in asus + toshiba Fix following section mismatch warnings in acpi WARNING: drivers/acpi/asus_acpi.o(.init.text+0xb7): Section mismatch: reference to .exit.text: (after 'init_module') WARNING: o-i386/drivers/acpi/toshiba_acpi.o(.init.text+0x13a): Section mismatch: reference to .exit.text: (after 'init_module') The exit function is used in the init function during an error codition. As __exit may be discarded during link-time / run-time this is no good. Do not mark the exit function __exit. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 162dd3b9e41d2c7531bf09c580c8e82dbf01e7ba Author: Sam Ravnborg Date: Fri Jun 1 00:47:11 2007 -0700 isdn: fix section mismatch warnings Fix the following section mismatch warnings: WARNING: drivers/isdn/hardware/eicon/divadidd.o(.init.text+0xc4): Section mismatch: reference to .exit.text: (between 'init_module' and 'diddfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0xf4): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0x10d): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0x148): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') They all point to situation whare a function marked __init calls a function marked __exit - but the __exit section may have been discarded. Note: This warning is generated by a modified copy of modpost in my tree. It will soon hit upstearm. Signed-off-by: Sam Ravnborg Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8281a2b661d5f4f8081b387886187bbf190b92d Author: Sam Ravnborg Date: Fri Jun 1 00:47:10 2007 -0700 microcode: fix section mismatch warning Fix the following section mismatch warnings in microcode.c: WARNING: arch/i386/kernel/built-in.o(.init.text+0x3966): Section mismatch: reference to .exit.text: (between 'microcode_init' and 'parse_maxcpus') WARNING: arch/i386/kernel/built-in.o(.init.text+0x3992): Section mismatch: reference to .exit.text: (between 'microcode_init' and 'parse_maxcpus') The warning are caused by a function marked __init that calls a function marked __exit. Functions marked __exit may be discarded either during link or run-time and thus the reference is not good. Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bd327ef288923f4188050bae295661ed0fbb3fb Author: Krzysztof Helt Date: Fri Jun 1 00:47:09 2007 -0700 pm3fb: switching between X and fb fix This patch correctly restores console state after switching from X. Otherwise, screen is always off after switching from X. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27390bc335ff86d92c3819cc28035fde23d1a9c2 Author: Christoph Lameter Date: Fri Jun 1 00:47:09 2007 -0700 SLUB: fix locking for hotplug callbacks Hotplug callbacks are performed with interrupts enabled. Slub requires interrupts to be disabled for flushing caches. Signed-off-by: Christoph Lameter Cc: Michal Piotrowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac140a8f8396504b33ddafb7309feca77bff8497 Author: Andrea Paterniani Date: Fri Jun 1 00:47:07 2007 -0700 SPI: Freescale iMX SPI controller driver fixes Fix 2 bugs: - SPI_DMA_RHDMA bad value. - Missing return value in setup() function (lost passing from patch-2.6.20-rc4-spi_imx to patch-2.6.20-rc6-spi_imx). Signed-off-by: Andrea Paterniani Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b11115c15351faba978ce1b9e75068e77f6ef48d Author: Maciej W. Rozycki Date: Fri Jun 1 00:47:07 2007 -0700 serial_core.h: include The header refers to handle_sysrq(), but does not include which provides a declaration of the function. This may result in an implicit declaration and a warning if the actual one is seen later on. Signed-off-by: Maciej W. Rozycki Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62e5b05db6cd5dd9cf9614cc5d2d0702c1e339bb Author: Satoru Takeuchi Date: Fri Jun 1 00:47:06 2007 -0700 Better documentation for ERESTARTSYS Add comment for errnos related to restart syscall to avoid the leakage of them to user programs. Signed-off-by: Satoru Takeuchi Cc: Oleg Nesterov Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7083174a2ca5ff80de773d2054caee2f77bf9f9 Author: Jay Estabrook Date: Fri Jun 1 00:47:05 2007 -0700 ALPHA: misc fixes 1. arch/alpha/Kconfig several adjustments: a) additions to the systems list and cleanup of same b) change limits of NR_CPUS and make dep. on platform Note that MARVEL support is limited to 32 CPUs whan using 42-bit KSEG - one needs 48-bit KSEG to handle up to 64, and we've never supported 48-bit KSEG. 2. include/asm-alpha/core_wildfire.h fix a typo that undoubtedly prevents WILDFIRE support from working Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ae0b6c704877d0c6b95dd7c3b1907770ca28b79 Author: Jay Estabrook Date: Fri Jun 1 00:47:04 2007 -0700 ALPHA: correct low-level I/O routines for sable-lynx This code corrects the behavior of the t2_readX/t2_writeX routines, and t2_ioreadNN/t2_iowriteNN routines. The value T2_DENSE_MEM is now subtracted from the "xaddr" argument in each of the readX/writeX routines, since those routines may be called directly, rather than always through the ioreadNN/iowriteNN routines. Examples of the direct calls, via the __raw_readX/writeX macros, are the memcpy_fromio/toio, _memset_c_io, and scr_memcpyw routines. Signed-off-by: Jay Estabrook Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 025a22151c41890e5d30a1d4fb84c547b84d7671 Author: Jay Estabrook Date: Fri Jun 1 00:47:03 2007 -0700 ALPHA: support graphics on non-zero PCI domains This code replaces earlier and incomplete handling of graphics on non-zero PCI domains (aka hoses or peer PCI buses). An option (CONFIG_VGA_HOSE) is set TRUE if configuring a GENERIC kernel, or a kernel for MARVEL, TITAN, or TSUNAMI machines, as these are the machines whose SRM consoles are capable of configuring and handling graphics options on non-zero hoses. All other machines have the option set FALSE. A routine, "find_console_vga_hose()", is used to find the graphics device which the machine's firmware believes is the console device, and it sets a global (pci_vga_hose) for later use in managing access to the device. This is called in "init_arch" on TITAN and TSUNAMI machines; MARVEL machines use a custom version of this routine because of extra complexity. A routine, "locate_and_init_vga()", is used to find the graphics device and set a global (pci_vga_hose) for later use in managing access to the device, in the case where "find_console_vga_hose" has failed. Various adjustments are made to the ioremap and ioportmap routines for detecting and translating "legacy" VGA register and memory references to the real PCI domain. [akpm@linux-foundation.org: don't statically init bss] [akpm@linux-foundation.org: build fix] Signed-off-by: Jay Estabrook Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8778beb981b7e5df3472b05475e4c7905dad1f3d Author: Yoshinori Sato Date: Fri Jun 1 00:47:01 2007 -0700 h8300 trival patches - warning fix. - call trace area check fix. - There is no meaning, ' & ' it deletes Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a9a62bb035b1f74e7d017e3bd48d1c687d7de3c Author: Haavard Skinnemoen Date: Fri Jun 1 00:47:00 2007 -0700 atmel_spi dma address bugfix When either rx_buf or tx_buf is not being used, i.e. for plain read- or write operations, the atmel_spi uses a fixed-size DMA buffer instead. If the transfer is longer than the size of this buffer, it is split into multiple DMA transfers. When the transfer is split like this, the atmel_spi driver ends up using the same DMA address again and again even for the buffer that came from the user, which is of course wrong. Fix this by adding the number of bytes already transferred to the DMA address so that the data ends up in the right place. Thanks to Wu Xuan for discovering this bug. Signed-off-by: Haavard Skinnemoen Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e88b34bade55a51dd23a50de0ac5076cbbb8f4fd Author: Luis R. Rodriguez Date: Fri Jun 1 00:46:57 2007 -0700 prism54: MAINTAINERS update Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 924ad158442a5db3e935efcb6131cbffadd6544c Author: Karsten Keil Date: Fri Jun 1 00:46:55 2007 -0700 Fix broken CLIR in isdn driver I noticed that CLIR (aka "hide your calling number") in isdn_tty is broken: The at-command parser filters out the required "R" (e.g. ATDR089123456) It's been broken for a *very* long time. Signed-off-by: Karsten Keil Signed-off-by: Matthias Goebl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bf1dedd1a5fd6f1d8369dfc9bb10056bc886cea Author: Tilman Schmidt Date: Fri Jun 1 00:46:54 2007 -0700 ISDN4Linux: fix maturity label According to the definitions recently posted on LKML, the maturity label for the ISDN4Linux subsystem is wrong. This patch corrects it and also clarifies the accompanying help text a bit. Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 040b6362d58fe9a344e053546c12bf821f6fce99 Author: Oleg Nesterov Date: Fri Jun 1 00:46:53 2007 -0700 tty: fix leakage of -ERESTARTSYS to userland Spotted by Satoru Takeuchi. kill_pgrp(task_pgrp(current)) sends the signal to the current's thread group, but can choose any sub-thread as a target for signal_wake_up(). This means that job_control() and tty_check_change() may return -ERESTARTSYS without signal_pending(). Signed-off-by: Oleg Nesterov Cc: Satoru Takeuchi Cc: Roland McGrath Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13466c8419c3ab3ccd5e905eef53ca49c6c201be Author: Yasunori Goto Date: Fri Jun 1 00:46:53 2007 -0700 memory hotplug: fix unnecessary calling of init_currenty_empty_zone() zone->present_pages is updated in online_pages(). But, __add_zone() can be called twice or more before calling online_pages(). So, init_currenty_empty_zone() can be called unnecessary times. It is cause of memory leak of zone's wait_table. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cd8fa87fbf31b2ab77b8aaec497e7f6a3757578 Author: Matthew Garrett Date: Fri Jun 1 00:46:51 2007 -0700 RTC: use fallback IRQ if PNP tables don't provide one Intel Macs (and possibly other machines) provide a PNP entry for the RTC, but provide no IRQ. As a result the rtc-cmos driver doesn't allow wakeup alarms. If the RTC is located at the legacy ioport range, assume that it's on IRQ 8 unless the tables say otherwise. Signed-off-by: Matthew Garrett Cc: Matthieu CASTET Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 926b28984da035ac407e6b8f22ee8b4f94f51cf1 Author: Pekka Enberg Date: Fri Jun 1 00:46:50 2007 -0700 Documentation: How to use GDB to decode OOPSes Adds instructions how to use GDB to figure out the exact location of an OOPS to Documentation/BUG-HUNTING. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a920b5b666d0be8141bd1ce620fffa7de96b81b Author: Andy Whitcroft Date: Fri Jun 1 00:46:48 2007 -0700 add a trivial patch style checker We are seeing increasing levels of minor patch style violations in submissions to the mailing lists as well as making it into the tree. These detract from the quality of the submission and cause unnessary work for reviewers. As a first step package up the current state of the patch style checker and include it in the kernel tree. Add instructions suggesting running it on submissions. This adds version v0.01 of the checkpatch.pl script. Signed-off-by: Andy Whitcroft Signed-off-by: Joel Schopp Cc: Randy Dunlap Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc913b1899ce0c15ec496d1aa121c36785e0528a Author: Jeff Garzik Date: Fri Jun 1 00:46:47 2007 -0700 misc/tifm_7xx1: replace deprecated irq flag Signed-off-by: Jeff Garzik Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9db71a188bd04114c04b1faa6538f1c4faa0a9a7 Author: Geert Uytterhoeven Date: Fri Jun 1 00:46:46 2007 -0700 fbdev: Move declaration of fb_class to Move the forward declaration of fb_class from drivers/video/console/fbcon.h to , together with the other forward declarations related to drivers/video/fbmem.c. This kills the following sparse warning: | drivers/video/fbmem.c:1363:14: warning: symbol 'fb_class' was not declared. Should it be static? Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfeeffbb4fb73a32c00d52742850f88e563726a5 Author: Avuton Olrich Date: Fri Jun 1 00:46:45 2007 -0700 cfag12864bfb: Use sys_ instead of cfb_ framebuffer accessors Because the framebuffer memory is allocated system RAM, use the sys_ drawing libraries. It also fixes the following compile error: LD .tmp_vmlinux1 drivers/built-in.o:(.data+0x8b48): undefined reference to `cfb_fillrect' drivers/built-in.o:(.data+0x8b50): undefined reference to `cfb_copyarea' drivers/built-in.o:(.data+0x8b58): undefined reference to `cfb_imageblit' [adaplas] Use fb_sys_read/write for the same reasons as above. Signed-off-by: Avuton Olrich Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38d473f99575f57f5911c7c94922fcf0b0a58b8d Author: Ondrej Zajicek Date: Fri Jun 1 00:46:43 2007 -0700 vt8623fb: arkfb: null pointer dereference fix This patch prevents null pointer dereference in arkfb and vt8623fb. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d9f95f916e926195a57b76064586ea0b1985848 Author: Krzysztof Helt Date: Fri Jun 1 00:46:42 2007 -0700 skeletonfb: fix of xxxfb_setup ifdef This patch fixes wrong ifdef around the xxxfb_setup. It also moves this function to remove forward declaration. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ede66fca23cfee4ee80b48298007d930f49bbe Author: Ulrich Drepper Date: Fri Jun 1 00:46:41 2007 -0700 fix compat futex code for private futexes When the private futex support was added the compat code wasn't changed. The result is that code using compat code which fail, e.g., because the timeout values are not correctly passed. The following patch should fix that. Signed-off-by: Ulrich Drepper Cc: Eric Dumazet Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9e82af823c10d8f981072e0d7c3a8a31f73e0bd Author: Tim Gardner Date: Fri Jun 1 00:46:40 2007 -0700 Work around Dell E520 BIOS reboot bug Force Dell E520 to use the BIOS to shutdown/reboot. I have at least one report that this patch fixes shutdown/reboot problems on the Dell E520 platform. (Andi says: People can always set the boot option. It hardly seems like a critical issue needing a backport.) Signed-off-by: Tim Gardner Acked-by: Andi Kleen Acked-by: Matt Domsch Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0939c17c7bcf1c838bea4445b80a6966809a438f Author: Chris Wright Date: Fri Jun 1 00:46:39 2007 -0700 x86: fix oprofile double free Chuck reports that the recent fix from Andi to oprofile 6c977aad03a18019015035958c65b6729cd0574c introduces a double free. Each cpu's cpu_msrs is setup to point to cpu 0's, which causes free_msrs to free cpu 0's pointers for_each_possible_cpu. Rather than copy the pointers, do a deep copy instead. [acme@redhat.com: allocate_msrs() was using for_each_online_cpu()] Signed-off-by: Chris Wright Cc: Andi Kleen Cc: Alan Cox Cc: Dave Jones Cc: Chuck Ebbert Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24faa9eef876d39e0826a36f31ae0e8b0eeb9835 Author: Jason Gaston Date: Fri Jun 1 00:46:38 2007 -0700 pci_ids: update patch for Intel ICH9M This patch updates the Intel ICH9M LPC Controller DID's, due to a specification change. Signed-off-by: Jason Gaston Cc: Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8343685643f2901fe11aa9d0358cafbeaf7b4c3 Author: Yoann Padioleau Date: Fri Jun 1 00:46:36 2007 -0700 parse errors in ifdefs Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Cc: "Luck, Tony" Cc: Ivan Kokshaysky Cc: Richard Henderson Cc: Russell King Cc: Ralf Baechle Cc: Jeff Garzik Cc: Jan Kara Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 632155e659449685b719995d7e7081cff7b01aba Author: Yoann Padioleau Date: Fri Jun 1 00:46:35 2007 -0700 potential parse error in ifdef I have made a tool to parse the kernel that does not pre-process the source. That means that my parser tries to parse all the code, including code in the #else branch or code that is not often compiled because the driver is not very used (or not used at all). So, my parser sometimes reports parse error not originally detected by gcc. Here is my (first) patch. [akpm@linux-foundation.org: fix amd8111e.c] Signed-off-by: Yoann Padioleau Acked-by: Matthew Wilcox Acked-by: Wim Van Sebroeck Acked-by: David Woodhouse Acked-by: Jeff Garzik Acked-by: James Bottomley Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78b7611c4a1e3ff008abc4751b566cb533d68f3d Author: Eric W. Biederman Date: Fri Jun 1 00:46:33 2007 -0700 msi: mask the msix vector before we unmap it With these two lines in the reverse order the drives/block/ccis.c was oopsing in msi_free_irqs. Silly us calling writel on an area after we unmap it. BUG: unable to handle kernel paging request at virtual address f8b2200c printing eip: c01e9cc7 *pdpt = 0000000000003001 *pde = 0000000037e48067 *pte = 0000000000000000 Oops: 0002 [#1] SMP Modules linked in: cciss ipv6 parport_pc lp parport autofs4 i2c_dev i2c_core sunrpc loop dm_multipath button battery asus_acpi ac tg3 floppy sg dm_snapshot dm_zero dm_mirror ext3 jbd dm_mod ata_piix libata mptsas scsi_transport_sas mptspi scsi_transport_spi mptscsih mptbase sd_mod scsi_mod CPU: 1 EIP: 0060:[] Not tainted VLI EFLAGS: 00010286 (2.6.22-rc2-gd2579053 #1) EIP is at msi_free_irqs+0x81/0xbe eax: f8b22000 ebx: f71f3180 ecx: f7fff280 edx: c1886eb8 esi: f7c4e800 edi: f7c4ec48 ebp: 00000002 esp: f5a0dec8 ds: 007b es: 007b fs: 00d8 gs: 0033 ss: 0068 Process rmmod (pid: 5286, ti=f5a0d000 task=c47d2550 task.ti=f5a0d000) Stack: 00000002 f8b72294 00000400 f8b69ca7 f8b6bc6c 00000002 00000000 00000000 00000000 00000000 00000000 f5a997f4 f8b69d61 f7c5a4b0 f7c4e848 f7c4e848 f7c4e800 f7c4e800 f8b72294 f7c4e848 f8b72294 c01e3cdf f7c4e848 c024c469 Call Trace: [] cciss_shutdown+0xae/0xc3 [cciss] [] cciss_remove_one+0xa5/0x178 [cciss] [] pci_device_remove+0x16/0x35 [] __device_release_driver+0x71/0x8e [] driver_detach+0xa0/0xde [] bus_remove_driver+0x27/0x41 [] pci_unregister_driver+0xb/0x13 [] cciss_cleanup+0xf/0x51 [cciss] [] sys_delete_module+0x110/0x135 [] sysenter_past_esp+0x5f/0x85 Here's a patch that just reverses the 2 lines of code as Eric suggests. Please consider this for inclusion. Signed-off-by: Mike Miller Signed-off-by: Chase Maupin Signed-off-by: "Eric W. Biederman" Cc: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dd11f9be47188ce08543ef65e9ece9beb2027dc Author: Eric W. Biederman Date: Fri Jun 1 00:46:32 2007 -0700 msi: fix the ordering of msix irqs "Mike Miller (OS Dev)" writes: Found what seems the problem with our vectors being listed backward. In drivers/pci/msi.c we should be using list_add_tail rather than list_add to preserve the ordering across various kernels. Please consider this for inclusion. Signed-off-by: "Eric W. Biederman" Screwed-up-by: Michael Ellerman Cc: "Mike Miller (OS Dev)" Cc: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4eb527a0ca83de28e773371f42abad2ab1ed7fdf Author: Mariusz Kozlowski Date: Fri Jun 1 00:46:30 2007 -0700 m68k: parenthesis balance Balance parenthesis in m68k mac debug code. Signed-off-by: Mariusz Kozlowski Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85d71244f02583886dc20a60df2d4657d42116b4 Author: Jan Kara Date: Fri Jun 1 00:46:29 2007 -0700 Fix possible UDF data corruption update_next_aext() could possibly rewrite values in elen and eloc, possibly leading to data corruption when rewriting a file. Use temporary variables instead. Also advance cur_epos as it can also point to an indirect extent pointer. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 296baae254c2e9ead4da5bfa57ecec86750331c7 Author: Jan Altenberg Date: Fri Jun 1 00:46:29 2007 -0700 Add select PHYLIB to the UCC_GETH Kconfig option ucc_geth has been migrated to use the common phylib code. So lets add a 'select PHYLIB' to the UCC_GETH Kconfig entry. Signed-off-by: Jan Altenberg Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e1c49db4c640b35df13889b86b9d62215ade4b6 Author: Zou Nan hai Date: Fri Jun 1 00:46:28 2007 -0700 x86_64: allocate sparsemem memmap above 4G On systems with huge amount of physical memory, VFS cache and memory memmap may eat all available system memory under 4G, then the system may fail to allocate swiotlb bounce buffer. There was a fix for this issue in arch/x86_64/mm/numa.c, but that fix dose not cover sparsemem model. This patch add fix to sparsemem model by first try to allocate memmap above 4G. Signed-off-by: Zou Nan hai Acked-by: Suresh Siddha Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa0aa866c82e441787e07169cb4925e3b673e891 Author: Alexey Dobriyan Date: Fri Jun 1 00:46:27 2007 -0700 Fix vmi.c compilation Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea55d30798ac206c9f584ac264b6b8eb093d237a Author: Artem Bityutskiy Date: Wed May 30 12:08:14 2007 +0300 [JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes() If we have already read enough bytes, no need to call read_more(). Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit df5e38703d647b160d7ba300b3d2fcb64a48549a Author: Stephen Rothwell Date: Thu May 31 20:18:25 2007 -0700 Xtensa: use asm-generic/fcntl.h Commit fc4fb2adf944d45a7f3d4d38df991c79ffdb6a43 "fixed" the Xtensa asm/fcntl.h and in doing so ignored asm-generic/fcntl.h completely. It turns out that it is now exactly the same as asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton commit 29c4dfd92edc26c2cd2c0c64c9201d5b91d6418e Author: Chris Zankel Date: Thu May 31 17:49:32 2007 -0700 [XTENSA] Remove non-rt signal handling The non-rt signal handling was never really used, so we don't break anything. This patch also cleans up the signal stack-frame to make it independent from the processor configuration. It also improves the method used for controlling single-stepping. We now save and restore the 'icountlevel' register that controls single stepping and set or clear the saved state to enable or disable it. Signed-off-by: Chris Zankel commit adba09f01577ea441a761a85aacb1e43b58d35c4 Author: Chris Zankel Date: Thu May 31 17:48:07 2007 -0700 [XTENSA] Move common sections into bss sections Move the fields of the COMMON sections 'swapper_pg_dir' and 'empty_zero_page' to the BSS section. Remove the unused COMMON sections 'emtpy_bad_page_table' and 'empty_bad_page'. Signed-off-by: Chris Zankel commit de4f6e5b41bef50fc981410ae8380f27f4e93bf8 Author: Chris Zankel Date: Thu May 31 17:47:01 2007 -0700 [XTENSA] clean-up header files The header files in the asm-xtensa directory are not clean and 'make headers_check' fails. This is a first patch to fix most of the header files. It removes unnecessary include statements and adds some that are required for building the kernel. The linker script required some updates or the linking stage would fail. Signed-off-by: Chris Zankel commit 176fd6c96dcbc263eb1c61eae9fe2a33f23a876d Author: Chris Zankel Date: Thu May 31 17:46:09 2007 -0700 [XTENSA] Use generic 64-bit division Use generic 64-bit division algorithm from the asm-generic directory.\ Signed-off-by: Chris Zankel commit 54213baf643dd14d3bc06ca7575a817d79a350c2 Author: Chris Zankel Date: Thu May 31 17:45:23 2007 -0700 [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c This patch removes the following symbols from arch/xtensa/kernel/xtensa_ksyms.c that were already exported: memcmp, memchr, strcat, strchr, strlen, stncat, strnlen, strrchr, strstr, enable_irq, and disable_irq Signed-off-by: Chris Zankel commit a0bb46ba074d2442e96f55c997293767340f4ce9 Author: Chris Zankel Date: Thu May 31 17:44:31 2007 -0700 [XTENSA] fix sources using deprecated assembler directive The assembler directive '.begin literal' is deprecated in the newer versions of the binutils (strncopy_user.S and strnlen_user.S). Signed-off-by: Chris Zankel commit 4af410a868ddddfc6aa9b19379599feac7e79d95 Author: Chris Zankel Date: Thu May 31 17:43:40 2007 -0700 [XTENSA] Spelling fixes in arch/xtensa Spelling fixes in arch/xtensa/. Signed-off-by: Simon Arlott Signed-off-by: Chris Zankel commit ef6051a90e2ad1af636e99d1d4603fdcf2adfcbe Author: Chris Zankel Date: Thu May 31 17:41:14 2007 -0700 [XTENSA] fix bit operations in bitops.h A macro used internally in the bitops.h file to identify the number of leading zeros (__cntlz) was implemented incorrectly for Xtensa processors that don't provide the 'nsa/nsau' instructions. As a result, the dependent functions and macros (ffs, ffz, fls) were broken. Signed-off-by: Chris Zankel commit 184b812f7da6726d7ea4ca409c7a8762ff6c6df6 Author: Jay Cliburn Date: Sat May 26 17:01:04 2007 -0500 PCI: quirk disable MSI on via vt3351 The Via VT3351 APIC does not play well with MSI and unleashes a flood of APIC errors when MSI is used to deliver interrupts. The problem was recently exposed when the atl1 network device driver, which enables MSI by default, stimulated APIC errors on an Asus M2V mainboard, which employs the Via VT3351. See http://bugzilla.kernel.org/show_bug.cgi?id=8472 for additional details on this bug. Signed-off-by: Jay Cliburn Signed-off-by: Greg Kroah-Hartman commit 73a74ed3a6f8fcb817fdffa2c2718f96d0108b7f Author: Ivan Kokshaysky Date: Wed May 23 14:50:02 2007 -0700 PCI: i386: fixup for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controllers Wolfgang gets: PCI: Cannot allocate resource region 0 of device 0000:00:04.0 PCI: Error while updating region 0000:00:04.0/0 (a8008000 != fec08000) Note that the BAR seems to have high address bits hardwired to fec00000. And device 0000:00:04.0 is 00:04.0 System peripheral: Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller (rev 02) I'd guess that when we try to reassign this resource, PCI interrupts might just stop working. This could explain SCSI timeouts and other weird things. Cc: Wolfgang Erig Cc: Chuck Ebbert Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3c92c57af9a24a08b8d2f76650b1209239914fcd Author: Ben Gardner Date: Thu May 10 22:58:58 2007 -0700 PCI: Fix pci_find_present pci_find_present() is only matching the last item in the list of ids. The break after the match is found only escapes the for loop, not the while loop, so found gets reset to NULL on the next pass. Signed-off-by: Ben Gardner Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e3008dedff4bdc96a5f67224cd3d8d12237082a0 Author: Andy Gospodarek Date: Thu May 10 22:58:57 2007 -0700 PCI: disable MSI by default on systems with Serverworks HT1000 chips I've been seeing lots of messages like these: eth0: No interrupt was generated using MSI, switching to INTx mode. Please report this failure to the PCI maintainer and include system chipset information. On several systems that use the following Severworks HT1000 (also sometimes labeled as a Broadcom chipset as well) bridge chips. It doesn't appear MSI works well (if at all) on these systems. Signed-off-by: Andy Gospodarek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4fdadebc313f46a750e9ffca9c68c35c587ced9f Author: Dan Williams Date: Thu Apr 26 18:21:38 2007 -0700 msi: fix ARM compile In file included from drivers/pci/msi.c:22: include/asm/smp.h:17:26: asm/arch/smp.h: No such file or directory include/asm/smp.h:20:3: #error " included in non-SMP build" include/asm/smp.h:23:1: warning: "raw_smp_processor_id" redefined In file included from include/linux/sched.h:65, from include/linux/mm.h:4, from drivers/pci/msi.c:10: include/linux/smp.h:85:1: warning: this is the location of the previous definition Tested on powerpc, i386, and x86_64. Signed-off-by: Dan Williams Acked-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 436bd75e47cf804dfe89f805106bb53ff577e99a Author: Theodore Ts'o Date: Thu May 31 12:43:28 2007 -0400 Define/reserve new ext4 superblock fields Signed-off-by: "Theodore Ts'o" commit 315054f023d28ee64f308adf8b5737831541776b Author: Alex Tomas Date: Thu May 24 13:04:25 2007 -0400 When ext4_ext_insert_extent() fails to insert new blocks we should free just the allocated blocks. Signed-off-by: Alex Tomas Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 25d14f983f70ddbeb15fa2d0f32f6b70bca42a15 Author: Amit Arora Date: Thu May 24 13:04:13 2007 -0400 ext4: Extent overlap bugfix This patch adds a check for overlap of extents and cuts short the new extent to be inserted, if there is a chance of overlap. Signed-off-by: Amit Arora Signed-off-by: "Theodore Ts'o" commit 8a9dc94498f39c259b011d0abcb89bdf73cafa2d Author: Mingming Cao Date: Thu May 24 13:04:41 2007 -0400 Remove unnecessary exported symbols. Signed-Off-By: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 8c55e20411c9499c52890a081724a8b71f3dc3a1 Author: Dave Kleikamp Date: Thu May 24 13:04:54 2007 -0400 EXT4: Fix whitespace Replace a lot of spaces with tabs Signed-off-by: Dave Kleikamp Signed-off-by: "Theodore Ts'o" commit ca9a7af35f1ce4a990c6c3aace65ed36f89d50bf Author: Kristian Høgsberg Date: Thu May 31 11:36:23 2007 -0400 firewire: Install firewire-constants.h and firewire-cdev.h for userspace. This just adds them to include/linux/Kbuild using header-y. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit 1ca31ae7cfed3e2a8e48fbf6ed6cac06495b6158 Author: Kristian Høgsberg Date: Thu May 31 11:16:43 2007 -0400 firewire: Change struct fw_cdev_iso_packet to not use bitfields. The struct is part of the userspace interface and can not use bitfields. This patch replaces the bitfields with a __u32 'control' word and provides access macros to set the bits. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit 2aef469a35a273609beaa7094d5a07c1f6d75285 Author: Kristian Høgsberg Date: Wed May 30 19:06:35 2007 -0400 firewire: Implement suspend/resume PCI driver hooks. It's a low-impact design, that just makes suspend/resume look like a bus reset to the upper level drivers, but it should be sufficient. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit b32744751e751e0abb184cf3b7359c9387a4bdf8 Author: Stefan Richter Date: Wed May 30 20:44:52 2007 -0400 firewire: add to MAINTAINERS Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit 14e2198646d92ef52a69d20269580a3fbe7c996b Author: Stefan Richter Date: Sun May 27 13:18:27 2007 +0200 firewire: fw-sbp2: implement sysfs ieee1394_id The attribute /sys/bus/scsi/devices/*:*:*:*/ieee1394_id, as generated by the old sbp2 driver, is typically used to create persistently named links in /dev/disk/by-id. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit d7794c86686a05276de42f145e485099426aca68 Author: Stefan Richter Date: Sun May 27 13:17:15 2007 +0200 ieee1394: sbp2: offer SAM-conforming target port ID in sysfs With "modprobe sbp2 long_ieee1394_id=y", the format of /sys/bus/scsi/devices/*:*:*:*/ieee1394_id is changed from e.g. 0001041010004beb:0:0 to 0001041010004beb:00042c:0000. The longer format fully conforms to object identifier sizes as per SAM(-2...4) and reflects what the SAM target port identifier is meant to contain: A Discovery ID allegedly specified by ISO/IEC 13213:1994 --- however there is no such thing; the authors of SAM probably meant Directory ID). Especially target nodes with multiple dynamically added targets may use Directory IDs to persistently identify target ports. The new format is independent of implementation details of nodemgr. Thus the same ieee1394_id attribute format can be implemented in the new firewire stack. The ieee1394_id is typically used to create persistently named links in /dev/disk/by-id. Signed-off-by: Stefan Richter commit a52938f3e2e7c1dd2f00775016703991b7809c42 Author: Stefan Richter Date: Sun May 27 13:11:47 2007 +0200 ieee1394: fix calculation of sysfs attribute "address" struct csr1212_keyval.offset is relative to 0xffff f000 0000 rather than 0xffff f000 0400. Signed-off-by: Stefan Richter commit cc4c24e115ca7bc2e4ec74d70bcb8fda1d1a8df8 Author: Henrique de Moraes Holschuh Date: Wed May 30 20:50:14 2007 -0300 ACPI: thinkpad-acpi: do not use named sysfs groups The initial version of the thinkpad-acpi sysfs interface (not yet released in any stable mainline kernel) made liberal use of named sysfs groups, in order to get the attributes more organized. This proved to be a really bad design decision. Maybe if attribute groups were as flexible as a real directory, and if binary attributes were not second-class citizens, the idea of subdirs and named groups would not have been so bad. This patch makes all the thinkpad-acpi sysfs groups anonymous (thus removing the subdirs), adds the former group names as a prefix (so that hotkey/enable becomes hotkey_enable for example), and updates the documentation. These changes will make the thinkpad-acpi sysfs ABI a lot easier to maintain. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 3ecb0a5a7b567c9719d61938bcdba22938084b65 Author: Peter Oberparleiter Date: Thu May 31 17:38:07 2007 +0200 [S390] cio: deregister ccw device when pgid disband failed Deregister ccw device when device failure is detected during offline- processing (e.g. when no last-path-gone indication was presented by the hardware) to prevent the device from entering a non-recoverable not-operational state. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 59a8a6e227cf0bc42e5be741ebfea97c222ab9ef Author: Cornelia Huck Date: Thu May 31 17:38:06 2007 +0200 [S390] cio: Use device_schedule_callback() for removing disconnected devices. We can't deregister disconnected and orphaned devices directly from the online attribute's store method, but must take a detour. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit ea1f4eece943968940a399c72c1ca675d51e466e Author: Heiko Carstens Date: Thu May 31 17:38:05 2007 +0200 [S390] Fix section annotations. Use the __cpuinit instead of __devinit section annotations for code that deals with cpu hotplug. In addition add some more annotations on functions that have been left out so far. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d330f93595a4eb100118c8af50012d6b0dc559e3 Author: Christoph Hellwig Date: Thu May 31 17:38:04 2007 +0200 [S390] raw3270: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit e11f0d04c6bc6bcf301bc60c060c4ac346e61885 Author: Christoph Hellwig Date: Thu May 31 17:38:03 2007 +0200 [S390] arch/s390/kernel/debug.c: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit 3006d7c67139e5173cf58986c7b6e080a893e2ac Author: Christoph Hellwig Date: Thu May 31 17:38:02 2007 +0200 [S390] dasd_eer: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit c41d4e3e688e338418311f449a4c68f6cb8eabbb Author: Michael Holzheu Date: Thu May 31 17:38:01 2007 +0200 [S390] Add exception handler for diagnose 224 To be able to run with the diagnose 224 switched off, a potential specification exception has to be handled. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 12d810c1b8c2b913d48e629e2b5c01d105029839 Author: Roman Zippel Date: Thu May 31 00:40:54 2007 -0700 m68k: discontinuous memory support Fix support for discontinuous memory Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00c541eae7a477e3d1adb1ebf27cccc0bdb5f824 Author: Andrew Morton Date: Thu May 31 00:40:52 2007 -0700 afs: needs sched.h mips: fs/afs/flock.c: In function `afs_lock_may_be_available': fs/afs/flock.c:55: error: dereferencing pointer to incomplete type fs/afs/flock.c: In function `afs_lock_work': fs/afs/flock.c:84: error: dereferencing pointer to incomplete type fs/afs/flock.c:89: error: dereferencing pointer to incomplete type fs/afs/flock.c:109: error: dereferencing pointer to incomplete type fs/afs/flock.c:135: error: dereferencing pointer to incomplete type fs/afs/flock.c:143: error: dereferencing pointer to incomplete type fs/afs/flock.c:158: error: dereferencing pointer to incomplete type fs/afs/flock.c:161: error: dereferencing pointer to incomplete type fs/afs/flock.c:179: error: `TASK_UNINTERRUPTIBLE' undeclared (first use in this function) fs/afs/flock.c:179: error: (Each undeclared identifier is reported only once fs/afs/flock.c:179: error: for each function it appears in.) fs/afs/flock.c:179: error: `TASK_INTERRUPTIBLE' undeclared (first use in this function) fs/afs/flock.c:182: error: dereferencing pointer to incomplete type Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ffa68755a0eddf3baeecd0e7612a5106cf2db23 Author: Christoph Lameter Date: Thu May 31 00:40:51 2007 -0700 SLUB: Fix NUMA / SYSFS bootstrap issue We need this patch in ASAP. Patch fixes the mysterious hang that remained on some particular configurations with lockdep on after the first fix that moved the #idef CONFIG_SLUB_DEBUG to the right location. See http://marc.info/?t=117963072300001&r=1&w=2 The kmem_cache_node cache is very special because it is needed for NUMA bootstrap. Under certain conditions (like for example if lockdep is enabled and significantly increases the size of spinlock_t) the structure may become exactly the size as one of the larger caches in the kmalloc array. That early during bootstrap we cannot perform merging properly. The unique id for the kmem_cache_node cache will match one of the kmalloc array. Sysfs will complain about a duplicate directory entry. All of this occurs while the console is not yet fully operational. Thus boot may appear to be silently failing. The kmem_cache_node cache is very special. During early boostrap the main allocation function is not operational yet and so we have to run our own small special alloc function during early boot. It is also special in that it is never freed. We really do not want any merging on that cache. Set the refcount -1 and forbid merging of slabs that have a negative refcount. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbe9c9612930e0604dc99ef2da7e063fa3278817 Author: Roman Zippel Date: Thu May 31 00:40:50 2007 -0700 m68k: runtime patching infrastructure Add the basic infrastructure to allow runtime patching of kernel and modules to optimize a few functions with parameters, which are only calculated once during bootup and are otherwise constant. Use this for the conversion between virtual and physical addresses. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fc799e1b4efdbc405d87d9f154d64d9bc299e5c Author: Andrew Morton Date: Thu May 31 00:40:49 2007 -0700 ntfs_init_locked_inode(): fix array indexing Local variable `i' is a byte-counter. Don't use it as an index into an array of le32's. Reported-by: "young dave" Cc: "Christoph Lameter" Acked-by: Anton Altaparmakov Cc: Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebdf7d399e67499dbd2a6b5154805fb049846cbb Author: Tejun Heo Date: Thu May 31 00:40:48 2007 -0700 pci-quirks: fix MSI disabling on RS400-200 and RS480 Commit c0affe9db42bf85f4a606b3262c35ec59a5d3788 doesn't work because the host controller is being quirked not a PCI bridge. This patch reverts the commit, rename quirk_svw_msi() to quirk_disable_all_msi() and use it instead. Signed-off-by: Tejun Heo Cc: Matias Alejandro Torres Cc: Greg K-H Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1aee215d760175601b820bd1e2f0364e844ff8c Author: Christoph Lameter Date: Thu May 31 00:40:47 2007 -0700 SLUB: More documentation Update documentation to describe how to read a SLUB error report. Add slub parameters to Documentation/kernel-parameters. Signed-off-by: Christoph Lameter Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af20376ee65cd2d13f7eb587fab70879d8c355b Author: Marc Pignat Date: Thu May 31 00:40:44 2007 -0700 at91: fix enable/disable_irq_wake symmetry in pcmcia driver Fix enable_irq_wake and disable_irq_wake symmetry in at91 pcmcia driver disable_irq_wake call must be symmetric with enable_irq_wake. This patch fix that problem for the at91_pcmia driver. It seems that this patch was forgotten when we've fixed irq_wake symmetry in all at91 related drivers. It was discussed in the "at91 drivers and [enable/disable]_irq_wake (wrong?) usage" thread on the linux-arm-kernel mailing list. Signed-off-by: Marc Pignat Cc: David Brownell Cc: Russell King Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Andrew Victor Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8387c1a46376b8cfc5f4751b27a6c90f930992cf Author: Linus Torvalds Date: Thu May 31 07:55:16 2007 -0700 smpboot: fix cachesize comparison in smp_tune_scheduling() Jarek Poplawski noted that boot_cpu_data.x86_cache_size is signed int and can be < 0 too. In fact we test for it. Except we assigned it to an unsigned value.. Cc: Jarek Poplawski Cc: Ingo Molnar Cc: Nick Piggin Cc: Andi Kleen Cc: Andrew Morton Signed-off-by: Linus Torvalds commit a2b7d2e97edcad0e95ae0d3c253d3f2f69254fa4 Author: Antonino A. Daplas Date: Thu May 31 14:04:57 2007 +0800 neofb: Fix pseudo_palette array overrun in neofb_setcolreg The pseudo_palette has room for 16 entries only, but in truecolor mode, it attempts to write 256. Signed-off-by: Antonino Daplas Acked-by: Tero Roponen Signed-off-by: Linus Torvalds commit 672cc6c6c72673570b5ca44fe8a8b9ed604f5a4f Author: Jaroslav Kysela Date: Thu May 31 11:03:27 2007 +0200 [ALSA] version 1.0.14 Signed-off-by: Jaroslav Kysela commit 8a73709ecc6a972c94e6ff9c0cc639f8f38b9151 Author: Horst H. von Brand Date: Thu May 31 01:27:52 2007 -0700 [SPARC]: Missing #include in drivers/sbus/char/flash.c drivers/sbus/char/flash.c does use macros VM_READ and such, needs to include linux/mm.h. Signed-off-by: Horst H. von Brand Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1fb8812ba5a4c34b680d4405216310233f3c7573 Author: Andrew Morton Date: Thu May 31 01:19:24 2007 -0700 [SPARC32]: Build fix. Fix 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de arch/sparc/lib/atomic32.c: In function '__cmpxchg_u32': arch/sparc/lib/atomic32.c:127: error: 'addr' undeclared (first use in this function) arch/sparc/lib/atomic32.c:127: error: (Each undeclared identifier is reported only once arch/sparc/lib/atomic32.c:127: error: for each function it appears in.) I assume this is what was intended.. Signed-off-by: Andrew Morton Acked-by: William Irwin Signed-off-by: David S. Miller commit dbbe3cb8cff6b494ac2cba6a94dc7aabe7e5b635 Author: David S. Miller Date: Wed May 30 19:01:47 2007 -0700 [SPARC64]: Add missing NCS and SVC hypervisor interfaces. Signed-off-by: David S. Miller commit 85553ddafc5415534bcbe63ffa3af6506e6a754e Author: David S. Miller Date: Thu May 31 01:34:55 2007 -0700 [IPSEC]: Add xfrm_sysctl.txt. And use it to document new xfrm_acq_expires sysctl. Signed-off-by: David S. Miller commit 9a834b87c5544c347fd788cd9d4eb276402ab54a Author: Stephen Hemminger Date: Thu May 31 01:21:39 2007 -0700 [BRIDGE]: Round off STP perodic timers. Peroidic STP timers don't have to be exact. The hold timer runs at 1HZ, and the hello timer normally runs at 2HZ; save power by aligning it them to next second. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 071f7722686151817855195654f16a0b65d9473c Author: Baruch Even Date: Thu May 31 01:20:45 2007 -0700 [BRIDGE]: Reduce frequency of forwarding cleanup timer in bridge. The bridge cleanup timer is fired 10 times a second for timers that are at least 15 seconds ahead in time and that are not critical to be cleaned asap. This patch calculates the next time to run the timer as the minimum of all timers or a minimum based on the current state. Signed-off-by: Baruch Even Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 67403754bceda484a62a697878ff20a0e8d3aae6 Author: Stephen Hemminger Date: Tue May 29 13:24:51 2007 -0700 [TCP] tcp_probe: use GCC printf attribute The function in tcp_probe is printf like, use GCC to check the args. Sighed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 63313494c4419bd5d60b4f3ef8970a98525ac9d3 Author: Sangtae Ha Date: Tue May 29 13:24:11 2007 -0700 [TCP] tcp_probe: a trivial fix for mismatched number of printl arguments. Just a fix to correct the number of printl arguments. Now, srtt is logging correctly. Signed-off-by: Sangtae Ha Signed-off-by: David S. Miller commit 4540250be1d724943a55eb9668e6edc1aaae28c4 Author: YOSHIFUJI Hideaki Date: Tue May 29 13:23:34 2007 -0700 [IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b0ba66671a92f7d12fdbc42592d36e678f713efc Author: Herbert Xu Date: Tue May 29 13:22:52 2007 -0700 [NET] napi: Call __netif_rx_complete in netif_rx_complete This patch kills a little bit of code duplication between the two variants of netif_rx_complete. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e4fd5da39f99d5921dda1fe3d93652fbd925fbfd Author: Pavel Emelianov Date: Tue May 29 13:19:18 2007 -0700 [TCP]: Consolidate checking for tcp orphan count being too big. tcp_out_of_resources() and tcp_close() perform the same checking of number of orphan sockets. Move this code into common place. Signed-off-by: Pavel Emelianov Signed-off-by: David S. Miller commit 4e07a91c37c69ec1647c218214591ee4fe3408fe Author: Arnaldo Carvalho de Melo Date: Tue May 29 13:17:47 2007 -0700 [SOCK]: Shrink struct sock by 8 bytes on 64-bit. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit be02097cf6342eb0426833f54c95e0fb4c9bca45 Author: David S. Miller Date: Tue May 29 13:16:31 2007 -0700 [AF_PACKET]: Kill CONFIG_PACKET_SOCKET. Always set, but af_packet.c, not by the Kconfig subsystem, so just get rid of it. Signed-off-by: David S. Miller commit 8c7fc03e27167425a1396320da43533462556b0c Author: David S. Miller Date: Tue May 29 13:15:41 2007 -0700 [IPV6]: Fix build warning. net/ipv6/ip6_fib.c: In function ‘fib6_add_rt2node’: net/ipv6/ip6_fib.c:661: warning: label ‘out’ defined but not used Signed-off-by: David S. Miller commit a2efcfa04865eaaa88b870f4babf12f4c1fc4f83 Author: David S. Miller Date: Tue May 29 13:12:50 2007 -0700 [AF_PACKET]: Kill bogus CONFIG_PACKET_MULTICAST It is unconditionally set by af_packet.c, not by the Kconfig subsystem, so just kill it off. Signed-off-by: David S. Miller commit ddc31ce311b65fc3c30ec9ca5baf688a882260bc Author: David S. Miller Date: Tue May 29 13:06:51 2007 -0700 [IPV4]: Kill references to bogus non-existent CONFIG_IP_NOSIOCRT Signed-off-by: David S. Miller commit f282d45cb496e3960046afd3d5f241265eda6fde Author: Kazunori MIYAZAWA Date: Tue May 29 13:03:17 2007 -0700 [IPSEC]: Fix panic when using inter address familiy IPsec on loopback. Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit 83f03fa5adbad0a829424241ad24ef9e4b4ba585 Author: Jerome Borsboom Date: Tue May 29 12:59:54 2007 -0700 [NET]: parse ip:port strings correctly in in4_pton in4_pton converts a textual representation of an ip4 address into an integer representation. However, when the textual representation is of in the form ip:port, e.g. 192.168.1.1:5060, and 'delim' is set to -1, the function bails out with an error when reading the colon. It makes sense to allow the colon as a delimiting character without explicitly having to set it through the 'delim' variable as there can be no ambiguity in the point where the ip address is completely parsed. This function is indeed called from nf_conntrack_sip.c in this way to parse textual ip:port combinations which fails due to the reason stated above. Signed-off-by: Jerome Borsboom Signed-off-by: David S. Miller commit 7ebba6d14f8d63cad583bf1cc0330b601d5a8171 Author: YOSHIFUJI Hideaki Date: Tue May 29 01:13:24 2007 -0700 [IPV6] ROUTE: No longer handle ::/0 specially. We do not need to handle ::/0 routes specially any longer. This should fix BUG #8349. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Yuji Sekiya Signed-off-by: David S. Miller commit 144466bdf8c479ae36678ace7a3b8e8b748df6f6 Author: Kazunori MIYAZAWA Date: Fri May 25 01:22:25 2007 -0700 [IPSEC]: Fix IPv6 AH calculation in outbound Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit aad0e0b9b6e4f7085d5e2ec4b5bb59ffecd8b1fb Author: David S. Miller Date: Fri May 25 00:42:49 2007 -0700 [XFRM]: xfrm_larval_drop sysctl should be __read_mostly. Signed-off-by: David S. Miller commit 01e67d08faa782f1a4d38de702331f5904def6ad Author: David S. Miller Date: Fri May 25 00:41:38 2007 -0700 [XFRM]: Allow XFRM_ACQ_EXPIRES to be tunable via sysctl. Signed-off-by: David S. Miller commit 4738d2fa5986d3717055d8ee14b2aad87c30f1e7 Author: David S. Miller Date: Thu May 24 20:59:26 2007 -0700 [CASSINI]: Fix printk message typo. Signed-off-by: David S. Miller commit 189fe3174ce93f4c949325426c87c4d875a13424 Author: Rafael J. Wysocki Date: Thu May 31 18:10:22 2007 +1000 [CRYPTO] cryptd: Fix problem with cryptd and the freezer Make sure that cryptd is marked as nonfreezable and does not hold up the freezer. Signed-off-by: Rafael J. Wysocki Signed-off-by: Herbert Xu commit 897cc188f7f0e402b92a4a6a9e234b45c612eb42 Author: Takashi Iwai Date: Tue May 29 19:01:37 2007 +0200 [ALSA] hda-codec - Fix STAC922x capture boost level STAC922x provides the capture boost level up to 4, but actually it works only up to 2. Since the range of the mixer is automatically defined from amp-capability bits, we need to override the value beforehand. snd_hda_override_amp_caps() is introduced for this purpose. The function patch_stac922x() calls this for NID 0x12 (Mux Capture Volume). This should fix another recording problem on Intel Macs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f9acba4347ac2145456aa8dedaab3d74761da42a Author: Takashi Iwai Date: Tue May 29 18:01:06 2007 +0200 [ALSA] hda-codec - Fix input with STAC92xx The recent fix for STAC92xx surround outputs broke the input pin setting for shared line-in and mic jacks. This patch fixes the breakage. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7353e14d91b78dc6da0d93fb081346c5ef854876 Author: Steve Longerbeam Date: Tue May 29 14:36:17 2007 +0200 [ALSA] hda-codec - Fix pin configs for Gateway MX6453 Fix pin default configs for speaker associations and sequence for Gateway MX6453 machine with STAC925x codecs. Signed-off-by: Steve Longerbeam Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 799f88a3126cae3e59409f135da925cb0c1bc2c1 Author: Tobin Davis Date: Tue May 29 14:29:08 2007 +0200 [ALSA] hda-codec - Add support for MSI K9N Ultra This patch adds the MSI K9N Ultra system to the realtek patch. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e60623b406ff3f8fea145466557f22daea671ae1 Author: Daniel T Chen Date: Tue May 29 03:41:55 2007 -0400 [ALSA] hda-codec - Add quirk for Supermicro PDSBA to alc883_cfg_tbl[] Tested and verified in #alsa/Freenode on Tuesday, May 29, 2007. Signed-off-by: Daniel T Chen Signed-off-by: crimsun@Box.ncat.edu Signed-off-by: Jaroslav Kysela commit dd146a60cb70a843a8b3a21560fdcfb4c0c9c850 Author: Baruch Even Date: Fri May 25 12:18:49 2007 +0200 [ALSA] hda-codec - Add quirk for MSI S420 Add a quirk for MSI S420 (based on a guess work). From: Baruch Even Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c72816b79e9735284b3c0f6b3a4aa4e1c0537c0d Author: Zoltan Devai Date: Tue May 22 16:17:05 2007 +0200 [ALSA] Fix ASoC s3c24xx-pcm spinlock bug This should fix a spinlock lockup bug on the s3c24xx arch. From: Zoltan Devai Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 36c3b4e60a83187e82bc9bcde854e765bde3d670 Author: Daniel Drake Date: Mon May 21 12:27:57 2007 +0200 [ALSA] hda-intel: fix ASUS M2V detection Commit f32610edab47f36946d23b883aeae91e15986121 added ALC660VD support, but this caused a 2.6.21 regression for some users. The ASUS M2V device is now detected as ALC660VD rather than ALC660/861 but the PCI quirk was not carried over. This patch allows affected users to use audio again. http://bugzilla.kernel.org/show_bug.cgi?id=8273 https://bugs.gentoo.org/show_bug.cgi?id=178243 Signed-off-by: Daniel Drake Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2704364248378193a24505e414dbfd4201053349 Author: Takashi Iwai Date: Sat May 19 16:30:35 2007 +0200 [ALSA] ali5451 - Fix possible NULL dereference Reported by Eric Sesterhenn. Fix the wrong checks of extra voice pointer, which may cause NULL dereferences. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3b542985edeed1a1af124ee055e2d35a30489d93 Author: Christian Rothlaender Date: Fri May 18 16:55:26 2007 +0200 [ALSA] hda-codec - Add support for ASUS A8J modem This patch adds support for the ASUS A8J Series 56k Modem (Motorola SM56) Signed-off-by: Christian Rothlaender Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fb3409e71f0e5cb3e22327eba2e4d6fbd51d54df Author: Tobin Davis Date: Thu May 17 09:40:47 2007 +0200 [ALSA] HDA: Fix headphone mute issue on non-eapd Conexant systems This patch fixes an automute code issue for systems that do not rely on eapd support. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 49c605db8d75216f88c3a57cfed3adfaddb71c6a Author: Tobin Davis Date: Thu May 17 09:38:24 2007 +0200 [ALSA] HDA: Add more systems to Sigmatel codec This patch adds more Dell systems and a Panasonic laptop with STAC9200 codecs. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2c11f955b27edaf0270185781391abe6f39b7ed0 Author: Tobin Davis Date: Thu May 17 09:36:34 2007 +0200 [ALSA] HDA: Add support for Gateway NX860 This patch adds support for the Gateway NX860 system. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4e1c20842044da32f771631049b7082dad63a9c5 Author: Andrew Morton Date: Thu May 31 13:48:57 2007 +0900 sh: support older gcc's Make my version of gcc happy. Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 66c5227ecd3041b0467a091ad81b8d312e572ea8 Author: Evgeniy Polyakov Date: Thu May 31 13:46:21 2007 +0900 sh: trivial build cleanups. Several errors were spotted during building for custom config (SMP included). Although SMP still does not compile (no ipi and __smp_call_function) and does not work, this looks a bit cleaner. Some other errors obtained via gcc-4.1.0 build. Signed-off-by: Evgeniy Polyakov Signed-off-by: Paul Mundt commit f75522cea12fe1ed9336c1a02b170bd06383e8a3 Author: Manuel Lauss Date: Thu May 31 13:44:55 2007 +0900 sh: Fix vsyscall build failure. CC arch/sh/kernel/vsyscall/vsyscall.o a/arch/sh/kernel/vsyscall/vsyscall.c: In function 'arch_setup_additional_pages': a/arch/sh/kernel/vsyscall/vsyscall.c:63: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:67: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:82: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:85: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c: In function 'arch_vma_name': a/arch/sh/kernel/vsyscall/vsyscall.c:91: error: dereferencing pointer to incomplete type Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt commit bdff33ddd906b2ab9eb70e9098f507fac6d56b70 Author: Manuel Lauss Date: Thu May 31 13:44:17 2007 +0900 sh: Trivial fix for dma-api compile failure. Trivial fix for arch/sh/drivers/dma/dma-api.c compile failure: CC arch/sh/drivers/dma/dma-api.o a/arch/sh/drivers/dma/dma-api.c: In function 'dma_wait_for_completion': a/arch/sh/drivers/dma/dma-api.c:233: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function) a/arch/sh/drivers/dma/dma-api.c:233: error: (Each undeclared identifier is reported only once a/arch/sh/drivers/dma/dma-api.c:233: error: for each function it appears in.) a/arch/sh/drivers/dma/dma-api.c:233: warning: implicit declaration of function 'schedule' Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt commit 370ac91aab8403d74c2b59c3b43692eaed4ef268 Author: Takashi YOSHII Date: Thu May 31 13:42:21 2007 +0900 sh: Fix pcrel too far for in_nmi label. Add lost in_nmi definition to solve pcrel too far. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 3f0a6766e0cc5a577805732e5adb50a585c58175 Author: Bryan Wu Date: Thu May 31 11:31:55 2007 +0800 a bug in ramfs_nommu_resize function, passing old size to vmtruncate It should be pass "newsize" to vmtruncate function to modify the inode->i_size, while the old size is passed to vmtruncate. This bug was caught by LTP truncate test case on Blackfin platform. After it was fixed, the LTP truncate test case passed. Signed-off-by: Bryan Wu Cc: David Howells Signed-off-by: Linus Torvalds commit b4946ffb1860597b187d78d61ac6504177eb0ff8 Author: Trond Myklebust Date: Wed May 30 12:58:00 2007 -0400 NFS: Fix a refcount leakage in O_DIRECT The current code is leaking a reference to dreq->kref when the calls to nfs_direct_read_schedule() and nfs_direct_write_schedule() return an error. This patch moves the call to kref_put() from nfs_direct_wait() back into nfs_direct_read() and nfs_direct_write() (which are the functions that actually took the reference in the first place) fixing the leak. Thanks to Denis V. Lunev for spotting the bug and proposing the original fix. Acked-by: Denis V. Lunev Acked-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7a74fc4925067c2102175baef73f9b07ab519b71 Author: Kyle McMartin Date: Wed May 30 02:43:16 2007 -0400 fix possible null ptr deref in kallsyms_lookup ugh, this function gets called by our unwinder. recursive backtrace for the win... bisection to find this one was "fun." Signed-off-by: Kyle McMartin Signed-off-by: Linus Torvalds commit b927b3e2c9bc39b7eeeaca91e4cd6c3ed59f165a Author: Richard Henderson Date: Tue May 29 16:03:28 2007 -0700 alpha: support new syscalls Some of the new syscalls require supporting TIF_RESTORE_SIGMASK. Signed-off-by: Richard Henderson Signed-off-by: Linus Torvalds commit 74fd1b687fbeba566ceb59cc1fdbc7a64c5e0c0b Author: Richard Henderson Date: Tue May 29 16:01:35 2007 -0700 alpha: cleanup in bitops.h Remove 2 functions private to the alpha implemetation, in favor of similar functions in . Provide a more efficient version of the fls64 function for pre-ev67 alphas. Signed-off-by: Richard Henderson Signed-off-by: Linus Torvalds commit cdea460643072e1ee3647434aa254b5b81364f68 Author: Russell King Date: Wed May 30 17:48:45 2007 +0100 [ARM] Fix some section mismatch warnings The following patch fixes these section mismatch warnings: WARNING: arch/arm/mach-at91/built-in.o(.text+0xdf4): Section mismatch: reference to .init.data:dk_nand_partition (between 'nand_partitions' and 'at91_leds_event') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (between 'nand_partitions' and 'ads7843_pendown_state') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-at91/built-in.o(.text+0xc28): Section mismatch: reference to .init.data:kb9202_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-footbridge/built-in.o(.text+0xaa4): Section mismatch: reference to .init.data:cats_pci (between 'cats_pci_init' and 'ebsa285_leds_event')WARNING: arch/arm/mach-ixp2000/built-in.o(.text+0xb54): Section mismatch: reference to .init.text:ixp2000_init_irq (between 'ixdp2x00_init_irq' and 'ixdp2x00_irq_handler') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x670): Section mismatch: reference to .init.text:ixp23xx_pci_common_init (between 'ixp23xx_pci_slave_init' and 'ixp23xx_pci_scan_bus') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x890): Section mismatch: reference to .init.text:ixp23xx_init_irq (between 'ixdp2351_init_irq' and 'roadrunner_pci_preinit') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x9a8): Section mismatch: reference to .init.text:ixp23xx_pci_preinit (after 'roadrunner_pci_preinit') WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x80): Section mismatch: reference to .init.text:imx_set_mmc_info (between '__ksymtab_imx_set_mmc_info' and '__ksymtab_set_imx_fb_info') WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x88): Section mismatch: reference to .init.text:set_imx_fb_info (after '__ksymtab_set_imx_fb_info') WARNING: arch/arm/mach-sa1100/built-in.o(.text+0x1930): Section mismatch: reference to .init.data:neponset_port_fns (between 'neponset_probe' and 'assabet_leds_event') WARNING: drivers/built-in.o(.text+0x3f100): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x3f1c8): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x4f988): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x4fa50): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') Signed-off-by: Sam Ravnborg Acked-by: Lennert Buytenhek Signed-off-by: Russell King commit 88f5774b0748d6d9ebec7a39caae98c0d83b8cc8 Author: Bill Nottingham Date: Wed May 30 04:16:43 2007 -0400 [SCSI] qla2xxx: fix timeout in qla2x00_down_timeout iterations is unsigned, so it is impossible to get out of the loop and return -ETIMEDOUT. Signed-off-by: Bill Nottingham Acked-by: Seokmann Ju Signed-off-by: James Bottomley commit f2f027c6e9912840020be8b78f037d5c8ac665e0 Author: Hugh Dickins Date: Wed May 23 14:41:42 2007 -0700 [SCSI] fix CONFIG_SCSI_WAIT_SCAN=m CONFIG_MODULES=y CONFIG_SCSI=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m 2.6.21-rc5-mm2 VFS panics unable to find my root on /dev/sda2, but boots okay if I change drivers/scsi/Kconfig to "default y" instead of "default m" for SCSI_WAIT_SCAN. Make sure there's a late_initcall to scsi_complete_async_scans when it's built in, so a monolithic SCSI_SCAN_ASYNC kernel can rely on the scans being completed before trying to mount root, even if they're slow. [akpm@linux-foundation.org: build fixes] Signed-off-by: Hugh Dickins Acked-by: Matthew Wilcox Signed-off-by: James Bottomley commit ade21372b7c6927861845d65432ff0b0b1142ca0 Author: Thomas Klein Date: Wed May 30 12:39:23 2007 +0200 ehea: Fixed multi queue RX bug Must access the respective queue's dummy netdev instead of the port's netdev. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit d8511f83015032ab983073bdbc78bc4aca3eaf9e Author: Stephen Hemminger Date: Thu May 24 15:22:47 2007 -0700 sky2: enable IRQ on duplex renegotiation Don't want IRQ on FIFO error because there is nothing useful to do with it. But do want IRQ on duplex change. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 47313054352b879a2bc65379d55b05f48a0af7ec Author: Herbert Xu Date: Tue May 29 15:07:31 2007 -0700 e1000: restore netif_poll_enable call but make sure IRQs are off This restores the previously removed netif_poll_enable call in e1000_open. It's needed on all but the first call to e1000_open for a NIC as e1000_close always calls netif_poll_disable. netif_poll_enable can only be called safely if no polls have been scheduled. This should be the case as long as we don't enter our IRQ handler. In order to guarantee this we explicitly disable IRQs as early as possible when we're probing the NIC. Signed-off-by: Herbert Xu Cc: "Kok, Auke" Cc: Jeff Garzik Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 8a32352661cc8e942897d205ba18f871ef7be597 Author: Maciej W. Rozycki Date: Tue May 29 16:12:22 2007 +0100 defxx: Fix the handling of ioremap() failures If ioremap_nocache() is unfortunate enough to fail, the error code is not set correctly leading to a false success from dfx_register(). This change fixes the problem. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 34dd962b748bdb4f96fc5e6e69dc66522924f489 Author: Stephen Hemminger Date: Thu May 24 15:22:45 2007 -0700 sky2: program proper register for fiber PHY Driver was reading value from one register, setting bit and then writing the wrong register. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 56069c0fdd3a4db5769df30c9700cd3bc002fc48 Author: Stephen Hemminger Date: Thu May 24 15:22:44 2007 -0700 sky2: checksum offload plus vlan bug Driver was not correctly setting up transmit descriptor when doing VLAN tag insertion with checksum offload. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b4ed372b29e458021293e1c791d92d90f1bf5fe3 Author: Stephen Hemminger Date: Thu May 24 15:22:43 2007 -0700 sky2: dont set bogus bit in PHY register This code inherited from the sk98lin driver is incorrect on the Yukon2. The GPHY_CTRL register values are specific to the internal PHY of the chip and the values used were leftovers. Driver was setting bit 13 which is now the INT polarity for the PHY! Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2389b272168ceec056ca1d8a870a97fa9c26e11a Author: Thomas Gleixner Date: Tue May 29 21:53:50 2007 +0100 [ARM] 4417/1: Serial: Fix AMBA drivers locking The -rt patch triggered a lockdep warning in the amba serial drivers, which never shows up on UP kernels. On SMP systems this would trigger as well. Release the port lock before calling tty_flip_buffer_push() and reacquire it after the call. This matches the code in the 8250 serial driver. Signed-off-by: Thomas Gleixner Signed-off-by: Russell King commit 2ccdd1e77da52ad494e9af46bf272d816830cb28 Author: Catalin Marinas Date: Fri May 18 11:25:31 2007 +0100 [ARM] 4394/1: ARMv7: Add the TLB range operations We are currently using the ARMv6 operations but need to duplicate some of the code because of the introduction of the new CPU barrier instructions in ARMv7. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 919a84292070949691346adaf3dfba642f12329e Author: Michael-Luke Jones Date: Sun May 27 21:33:28 2007 +0100 [ARM] 4410/1: Remove extern declarations in coyote/ixdpg425-pci.c This patch removes apparently unnecessary extern declarations in coyote-pci.c and ixdpg425-pci.c within arch/arm/mach-ixp4xx and has been compile-tested without producing warnings or errors. Kernel coding style forbids the use of extern declarations within .c files. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 1ff082882f0f36536ab91b020573607668f9bb61 Author: Ben Dooks Date: Mon May 28 19:03:47 2007 +0100 [ARM] 4416/1: NWFPE: fix undeclared symbols Fix the undeclared symbols sparse is warning about. arch/arm/nwfpe/softfloat.c:1727:7: warning: symbol 'float64_to_uint32' was not declared. Should it be static? arch/arm/nwfpe/softfloat.c:1753:7: warning: symbol 'float64_to_uint32_round_to_zero' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e078761a0a815e142eee9f546f821ea259c82f7c Author: Ben Dooks Date: Mon May 28 18:57:31 2007 +0100 [ARM] 4415/1: AML5900: fix sparse warnings from map_io The map_io function does not need to be exported from this file, and therefore should be declared static. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0cc69daa3e6c958bc678b3db268dc279b68fd76f Author: Ben Dooks Date: Mon May 28 18:55:43 2007 +0100 [ARM] 4414/1: S3C2443: sparse fix for clock.c Fix sparse warnings in the arch/arm/mach-s3c2443/clock.c, including an bug in initialising the cf clock initialiser where two values are being set for the ctrlbit. arch/arm/mach-s3c2443/clock.c:397:12: warning: symbol 'clk_usb_bus_host' was not declared. Should it be static? arch/arm/mach-s3c2443/clock.c:760:4: error: Initializer entry defined twice arch/arm/mach-s3c2443/clock.c:761:4: also defined here Signed-off-by: Ben Dooks Signed-off-by: Russell King commit eca8c2424171b6b6b2dcb0faa92dfddd1e3297d9 Author: Ben Dooks Date: Mon May 28 18:19:16 2007 +0100 [ARM] 4412/1: S3C2412: reset errata fix The S3C2412 has an reset-errata where the clock may cause a glitch switching back to EXTCLK. We force a switch to EXTCLK before writing the reset register to force use of the CLKCON sync logic to properly switch. Fix problem reported by Matthieu Castet. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 486cab2ba25b469f7a8822e84fd43960a472e3d9 Author: Andrew Victor Date: Mon May 28 10:47:19 2007 +0100 [ARM] 4411/1: KS8695: Another serial driver fix Fix a error reported by newer versions of GCC. error: static declaration of 'ks8695_reg' follows non-static declaration Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 28c670cb9b0df7c8579f78c9d06e148896378cf4 Author: Russell King Date: Sat May 26 12:08:29 2007 +0100 [ARM] oprofile: avoid lockdep warnings on mpcore oprofile init Fix lockdep warnings, caused by 'set_affinity' being called without the correct locks taken and local interrupts disabled: ================================= [ INFO: inconsistent lock state ] 2.6.22-rc2 #1 --------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. swapper/1 [HC0[0]:SC0[0]:HE1:SE1] takes: (irq_controller_lock){++..}, at: [] gic_set_cpu+0x60/0xa0 {in-hardirq-W} state was registered at: [] lock_acquire+0x58/0x6c [] _spin_lock+0x40/0x50 [] gic_mask_irq+0x2c/0x6c [] handle_level_irq+0x11c/0x14c [] asm_do_IRQ+0x60/0x84 [] __irq_svc+0x4c/0xc0 [] __alloc_bootmem_nopanic+0x74/0x88 [] __alloc_bootmem+0x18/0x3c [] alloc_large_system_hash+0x16c/0x200 [] inode_init_early+0x5c/0xa4 [] vfs_caches_init_early+0x24/0xa0 [] start_kernel+0x220/0x2fc [<00008078>] 0x8078 irq event stamp: 88438 hardirqs last enabled at (88438): [] preempt_return+0x20/0x2c hardirqs last disabled at (88436): [] __do_softirq+0xb0/0x138 softirqs last enabled at (88437): [] __do_softirq+0x104/0x138 softirqs last disabled at (88428): [] irq_exit+0x68/0x7c other info that might help us debug this: no locks held by swapper/1. stack backtrace: [] (dump_stack+0x0/0x14) from [] (print_usage_bug+0x138/0x168) [] (print_usage_bug+0x0/0x168) from [] (mark_lock+0x484/0x6a0) [] (mark_lock+0x0/0x6a0) from [] (__lock_acquire+0x3c0/0x10c8) [] (__lock_acquire+0x0/0x10c8) from [] (lock_acquire+0x58/0x6c) [] (lock_acquire+0x0/0x6c) from [] (_spin_lock+0x40/0x50) [] (_spin_lock+0x0/0x50) from [] (gic_set_cpu+0x60/0xa0) [] (gic_set_cpu+0x0/0xa0) from [] (em_route_irq+0x38/0x40) [] (em_route_irq+0x0/0x40) from [] (em_setup+0x18/0xa4) [] (em_setup+0x0/0xa4) from [] (oprofile_arch_init+0x24/0xe8) [] (oprofile_arch_init+0x0/0xe8) from [] (oprofile_init+0x1c/0x64) [] (oprofile_init+0x0/0x64) from [] (kernel_init+0x154/0x368) [] (kernel_init+0x0/0x368) from [] (do_exit+0x0/0x904) oprofile: using arm/mpcore Signed-off-by: Russell King commit 5b10c8e436b69f25b6dcb5586bbdc5e39c20ed1d Author: Russell King Date: Sat May 26 12:04:17 2007 +0100 [ARM] Fix stacktrace FP range checking Fix an oops in the stacktrace code, caused by improper range checking. We subtract 12 off 'fp' before testing to see if it's below the low bound. However, if 'fp' were zero before, it becomes a very large positive number, causing this test to succeed where it should fail. Signed-off-by: Russell King commit b91d8a1205faa76affc4e1b7d5ccac1d17026970 Author: David Rientjes Date: Fri May 11 16:18:55 2007 -0700 [ARM] use __used attribute Use the newly introduced __used attribute in place of the deprecated __attribute_used__. Functionally the same. Signed-off-by: David Rientjes Signed-off-by: Russell King commit cc650a7a9f5ebc3f9290a8e20e3f55b4f52f849e Author: Kyle McMartin Date: Wed May 30 02:36:00 2007 -0400 [PARISC] be more defensive in process.c::get_wchan While debugging, I noticed we don't check the task_struct arg passed to get_wchan, whereas everyone else does. Signed-off-by: Kyle McMartin commit 376e210b71d7736775f43f32c5c7712f90aaf59a Author: Kyle McMartin Date: Wed May 30 02:27:46 2007 -0400 [PARISC] fix "reduce size of task_struct on 64-bit machines" fallout Amazingly, parisc was the only arch effected by this... Convert register-sized loads/stores to always be 32-bit for these fields. Signed-off-by: Kyle McMartin commit cb9577958d85896303561d9cc8544885deb272be Author: Kyle McMartin Date: Wed May 30 02:24:28 2007 -0400 [PARISC] fix null ptr deref in unwind.c commit ffb45122766db220d0bf3d01848d575fbbcb6430 removed one too many args. kallsyms_lookup is not safe to call with a NULL *modname. Paper bag over the problem for the time being. Signed-off-by: Kyle McMartin commit 516a9491151d5f75911647dd44812f25ff24282d Author: Kyle McMartin Date: Wed May 30 02:14:36 2007 -0400 [PARISC] fix trivial spelling nit in asm/linkage.h Noticed by John David Anglin. Signed-off-by: Kyle McMartin commit 72738a96d196a4ffa97712bfa35fa28a05cf0a3a Author: Grant Grundler Date: Mon May 28 16:31:59 2007 -0600 [PARISC] remove remnants of parisc-specific softirq code Kyle, This patch removes remnants of softirq support that we no longer need. I suspect this was just overlooked when willy convert parisc to generic IRQ support. Tested on c3600 32-bit UP. Signed-off-by: Grant Grundler [and tested on a c8000 64-bit SMP --kyle] Signed-off-by: Kyle McMartin commit 8dff980f1d1392990c6813c86f4bce108d3054fe Author: Helge Deller Date: Mon May 28 00:26:02 2007 +0200 [PARISC] fix section mismatch in smp.c WARNING: arch/parisc/kernel/built-in.o(.text.__cpu_up+0x20): Section mismatch: reference to .init.text:smp_boot_one_cpu (after '__cpu_up') Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit c2b6ebd50be76879261b67fc5fd29608b82ae443 Author: Helge Deller Date: Mon May 28 18:01:39 2007 +0200 [PARISC] fix "ENTRY" macro redefinition Thanks to James for noticing. It fixes: fs/ext3/xattr.c:65:1: warning: "ENTRY" redefined In file included from include/linux/linkage.h:4, from include/linux/fs.h:271, from fs/ext3/xattr.c:54: include/asm/linkage.h:13:1: warning: this is the location of the previous definition Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit dd272b5716a54afa33a69f2241284d8ec60b7892 Author: Len Brown Date: Wed May 30 00:26:11 2007 -0400 ACPI: add __init to acpi_initialize_subsystem() Add __init to: acpi_initialize_subsystem() (and un-export it) acpi_os_initialize() Add __initdata to: acpi_osl_dmi_table[] Signed-off-by: Len Brown commit f507654d450d329c81a70eec0096d5dfe67802ec Author: Len Brown Date: Wed May 30 00:10:38 2007 -0400 ACPI: Make _OSI(Linux) a special case _OSI("Linux") is like _OS("Linux"), it is ill-defined and virtually no BIOS vendors test interaction with it. As a result, it can do more damage than good because it causes the BIOS to follow un-tested paths. Recently, several machines have turned up that erroneously test this string in a way which causes them to _not_ test other compatibility strings, including the ZI9 and Toshiba. So it appears that this bad code has made it into a BIOS vendor's reference BIOS. Linux has no choice but to stop advertising compatibility with _OSI string "Linux" - as there are an unbounded number of possible incompatibilities going forward. But some BIOSes have already shipped which do use it for things like conditionally re-enabling video on resume from S3. (Too bad they didn't do that unconditionally) Add special case code for _OSI(Linux) Squawk to dmesg if _OSI(Linux) is requested Add DMI list both to enable and disable _OSI(Linux) But for now, keep the default enabled via #define OSI_LINUX_ENABLED. http://bugzilla.kernel.org/show_bug.cgi?id=7787 Signed-off-by: Len Brown commit 7f397dcdb78d699a20d96bfcfb595a2411a5bbd2 Author: Matt Mackall Date: Tue May 29 21:58:10 2007 -0500 random: fix seeding with zero entropy Add data from zero-entropy random_writes directly to output pools to avoid accounting difficulties on machines without entropy sources. Tested on lguest with all entropy sources disabled. Signed-off-by: Matt Mackall Acked-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit 602b6aeefe8932dd8bb15014e8fe6bb25d736361 Author: Matt Mackall Date: Tue May 29 21:54:27 2007 -0500 random: fix error in entropy extraction Fix cast error in entropy extraction. Add comments explaining the magic 16. Remove extra confusing loop variable. Signed-off-by: Matt Mackall Acked-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit eaad084bb0f3a6259e56400cd45d061dbf040600 Author: Thomas Gleixner Date: Tue May 29 23:47:39 2007 +0200 NOHZ: prevent multiplication overflow - stop timer for huge timeouts get_next_timer_interrupt() returns a delta of (LONG_MAX > 1) in case there is no timer pending. On 64 bit machines this results in a multiplication overflow in tick_nohz_stop_sched_tick(). Reported by: Dave Miller Make the return value a constant and limit the return value to a 32 bit value. When the max timeout value is returned, we can safely stop the tick timer device. The max jiffies delta results in a 12 days timeout for HZ=1000. In the long term the get_next_timer_interrupt() code needs to be reworked to return ktime instead of jiffies, but we have to wait until the last users of the original NO_IDLE_HZ code are converted. Signed-off-by: Thomas Gleixner Acked-off-by: David S. Miller Signed-off-by: Linus Torvalds commit a2cb4a98f243d01f2c8d5799c764bb96ffa66c44 Author: Roland Dreier Date: Tue May 29 16:07:09 2007 -0700 IB/mlx4: Fix last allocated object tracking in bitmap allocator Set last allocated object to the object after the one just allocated before ORing in the extra top bits. Also handle the case where this wraps around. Signed-off-by: Roland Dreier commit d998ccce020e2cfcf11c6b57503532930ede2894 Author: Sean Hefty Date: Mon May 21 17:38:02 2007 -0700 IB/cm: Fix stale connection detection The ib_cm can incorrectly detect a stale connection (a new connection request for a QPN that is already connected) as a duplicate connection request. Separate the handling of potential duplicate REQs from stale connections. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit ec56dc0b7f6c3fec20bbc2e98ff1a06edf2fc9b9 Author: Michael S. Tsirkin Date: Mon May 28 14:37:27 2007 +0300 IPoIB/cm: Fix performance regression on Mellanox commit 518b1646 ("IPoIB/cm: Fix SRQ WR leak") introduced a severe performance regression on Mellanox cards, because keeping a QP in the error state for extended periods of time moves hardware to the slow path (until the QP is destroyed). For example, MPI latency goes from ~3 usecs to ~7 usecs. Fix this by posting a send WR on one of the QPs that are being flushed, instead of using a separate drain QP that is kept in the error state. This fixes bug , reported and bisected by Scott Weitzenkamp at Cisco and debugged by Sasha Mikheev at Voltaire. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8b7e15772a286d0ef8e4f8eca422ce5368b6fa97 Author: Michael S. Tsirkin Date: Sun May 27 18:06:42 2007 +0300 IB/mthca: Fix handling of send CQE with error for QPs connected to SRQ mthca_free_err_wqe() currently treats both send and receive CQEs identically if a QP is using an SRQ. But for Tavor hardware, send CQEs with error can be chained together even if the RQ is part of SRQ, so we may miss some CQEs. Fix by following the WQE chain for all send CQEs even for non-SRQ QPs. This fixes crashes in IPoIB CM: Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit ae00d812436dc968f4a5dea7757b6a94910b6dc4 Author: Len Brown Date: Tue May 29 18:43:33 2007 -0400 ACPI: extend "acpi_osi=" boot option The boot option "acpi_osi=" has always disabled Linux _OSI support, thus disabling all OS Interface strings which are advertised by Linux to the BIOS. Now... acpi_osi="string" adds the interface string, and acpi_osi="!string" invalidates the pre-defined interface string eg. acpi_osi="!Windows 2006" would disable Linux's claim of Vista compatibility. Signed-off-by: Len Brown commit 68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599 Author: Thomas Renninger Date: Sun Nov 19 23:01:40 2006 +0100 ACPI: thermal: Replace pointer with name in trip_points For users with active thermal trip points, they need the fan's name, rather than its address, to understand where to look to observe and control fan state. Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 0efabac9b7c8535eeb199d2f16d3eb44dc4761b2 Author: Len Brown Date: Thu May 24 02:25:00 2007 -0400 ACPICA: allow Load(OEMx) tables HP and Hitachi machines have been implemented with SSDT's that use the "OEMx" signatures. But upon Load, ACPICA is rejecting these tables because they are not using the "SSDT" signature. ACPI Error (tbinstal-0134): Table has invalid signature [OEMx], must be SSDT... Signed-off-by: Len Brown commit d5d4db704b962773c03ee3beb3258b6450611e66 Author: Alan Stern Date: Tue May 29 16:34:52 2007 -0400 USB: replace flush_workqueue with cancel_sync_work This patch (as912) replaces a couple of calls to flush_workqueue() with cancel_sync_work() and cancel_rearming_delayed_work(). Using a more directed approach allows us to avoid some nasty deadlocks. The prime example occurs when a first-level device (the parent is a root hub) is removed while at the same time the root hub gets a remote wakeup request. khubd would try to flush the autosuspend workqueue while holding the root-hub's lock, and the remote-wakeup workqueue routine would be waiting to lock the root hub. The patch also reorganizes the power management portion of usb_disconnect(), separating it out into its own routine. The autosuspend workqueue entry is cancelled immediately instead of waiting for the device's release routine. In addition, synchronization with the autosuspend thread is carried out even for root hubs (an oversight in the original code). Signed-off-by: Alan Stern Cc: Andrew Morton Cc: Greg KH Cc: Mark Lord Signed-off-by: Linus Torvalds commit 4096b46f01a362fe2cc83f6be25cc7be6bce2ab7 Author: Sam Ravnborg Date: Tue May 29 21:29:00 2007 +0200 sparc64: fix alignment bug in linker definition script The RO_DATA section were hardcoded to a specific alignment in include/asm-generic/vmlinux.h. But for sparc64 this did not match the PAGE_SIZE. Introduce a new section definition named: RO_DATA that takes actual alignment as parameter. RODATA are provided for backward compatibility. On top of this avoid hardcoding alignment for sparc64 in reset of the script Fix is build-tested on sparc64 + x86_64. Signed-off-by: Sam Ravnborg commit d7ea3be56adc95b17351221fd95e78115f3b01f4 Author: Brandon Craig Rhodes Date: Mon May 28 09:38:46 2007 -0700 [PATCH] hostap: Allocate enough tailroom for TKIP When hostap_tx_encrypt() tries to allocate enough headroom and tailroom for ieee80211 encryption, it only makes enough room for the "mpdu" phase of the operation, but forgets about the "msdu" phase. (For TKIP, these two phases require, respectively, 4 and 8 bytes of tailroom, per the "ieee80211_crypt_tkip" structure at the bottom of net/ieee80211/ieee80211_crypt_tkip.c.) Signed-off-by: Brandon Craig Rhodes Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit ef7ab2357ba09e8a795018640a87e93dfa043360 Author: Akinobu Mita Date: Sun May 27 23:26:31 2007 +0900 [PATCH] softmac: alloc_ieee80211() NULL check This patch adds missing NULL check and trims a line longer than 80 columns. Cc: Johannes Berg Cc: Joe Jezak Cc: Daniel Drake Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville commit a76193df7c7b60f9facb4090c5ec082e06582209 Author: Akinobu Mita Date: Sun May 27 23:25:00 2007 +0900 [PATCH] ieee80211: fix incomplete error message Fix error message: Unable to network device. --> Unable to allocate network device. Cc: James Ketrenos Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville commit 20c9d198731f440eaad6fafd00fe7ccfcd443a84 Author: Björn Steinbrink Date: Mon May 28 03:43:39 2007 +0200 [PATCH] prism54: fix monitor mode oops Manually set the device of a skb for prism54 cards that are in monitor mode as we never call eth_type_trans in that case. Signed-off-by: Björn Steinbrink Signed-off-by: John W. Linville commit 91fa558ba28b0014205f2c1a75b1cceb4298aa04 Author: John W. Linville Date: Tue May 15 16:14:40 2007 -0400 [PATCH] mac80211: avoid null ptr deref in ieee80211_ibss_add_sta avoid sdata null pointer dereference in ieee80211_ibss_add_sta. Signed-off-by: John W. Linville commit 52fb24cd83bdd6a1dcbd4cf4b3f5cafb741b5552 Author: Michael Wu Date: Sun May 20 09:44:00 2007 -0700 [PATCH] mac80211: always set carrier status on open ieee80211_open should always set the carrier status since we may have set it to off before. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 Author: Hong Liu Date: Thu May 17 11:13:44 2007 +0800 [PATCH] mac80211: fix memory leak when defrag fragments We forget to free all the fragments when defraging them into one packet. Signed-off-by: Hong Liu Signed-off-by: John W. Linville commit f11b0f0eb2ea7562db63a01c60d398ec52d5ea46 Author: Zhu Yi Date: Wed May 9 13:41:52 2007 +0800 [PATCH] mac80211: fail back to use associate from reassociate Some APs have strict checking between associate and reassociate. In a case when an AP is restarted during a connection, it denies the mac80211 reassoc request since this is a new association for the AP. To fix this problem, we need to check the status code against WLAN_STATUS_REASSOC_NO_ASSOC and clear ifsta->prev_bssid_set in handling the association failure response. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7db35f31cbb8ca1dbaba03d74b7db79ace084358 Author: David S. Miller Date: Tue May 29 02:22:14 2007 -0700 [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry. Several interfaces were missing and others misnumbered or improperly documented. Also, make sure to check the return value when registering the kernel TSBs with the hypervisor. This helped to find the 4MB kernel TSB alignment bug fixed in a previous changeset. Signed-off-by: David S. Miller commit 2d9e2763c22a4ce41c3cc5f35366a51f1eba38dc Author: David S. Miller Date: Tue May 29 01:58:31 2007 -0700 [SPARC64]: Fix two bugs wrt. kernel 4MB TSB. 1) The TSB lookup was not using the correct hash mask. 2) It was not aligned on a boundary equal to it's size, which is required by the sun4v Hypervisor. wasn't having it's return value checked, and that bug will be fixed up as well in a subsequent changeset. Signed-off-by: David S. Miller commit 5f81941c9d47f783e834028dcfb8548809da5a53 Author: Martin Habets Date: Tue May 29 01:11:57 2007 -0700 [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM. The DRM code depends on an atomic version of cmpxchg(), which is not available on sparc32. Since other platforms besides sparc32 have this issue a KCONFIG option is added for it. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de Author: Kyle McMartin Date: Tue May 29 02:51:13 2007 -0700 [SPARC]: Emulate cmpxchg like parisc Signed-off-by: Kyle McMartin Signed-off-by: David S. Miller commit 679292993c77c06f7ade4e317c13256b92c2651b Author: David S. Miller Date: Sun May 27 20:24:47 2007 -0700 [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler. It was using an immediate _PAGE_EXEC_4U value in an 'and' instruction to perform the test. This doesn't work because the immediate field is signed 13-bit, this the mask being tested against the PTE was 0x1000 sign-extended to 32-bits instead of just plain 0x1000. Signed-off-by: David S. Miller commit b00ccd0f0b3fe8776aead63ec96313e84451b337 Author: Jan Engelhardt Date: Sun May 27 14:48:54 2007 -0700 [SPARC]: Linux always started with 9600 8N1 The Linux kernel ignored the PROM's serial settings (115200,n,8,1 in my case). This was because mode_prop remained "ttyX-mode" (expected: "ttya-mode") due to the constness of string literals when used with "char *". Since there is no "ttyX-mode" property in the PROM, Linux always used the default 9600. [ Investigation of the suncore.s assembler reveals that gcc optimizied away the stores, yet did not emit a warning, which is a pretty anti-social thing to do and is the only reason this bug lived for so long -DaveM ] Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 7189859f28b7064a83b6ab4036bb334279f922c2 Author: Horst H. von Brand Date: Sat May 26 17:47:53 2007 -0700 [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI) This is bug 8540 on bugzilla.kernel.org arch/sparc64/time.c contains references to assorted bq4802 stuff if CONFIG_PCI is not set, and compile fails. I #ifdef'ed out everything that looks PCI-ish in that file. Signed-off-by: David S. Miller commit 22adb358e816ce6aa0afb231ae9d826b0bddc8b0 Author: David S. Miller Date: Sat May 26 01:14:43 2007 -0700 [SPARC64]: Eliminate NR_CPUS limitations. Cheetah systems can have cpuids as large as 1023, although physical systems don't have that many cpus. Only three limitations existed in the kernel preventing arbitrary NR_CPUS values: 1) dcache dirty cpu state stored in page->flags on D-cache aliasing platforms. With some build time calculations and some build-time BUG checks on page->flags layout, this one was easily solved. 2) The cheetah XCALL delivery code could only handle a cpumask with up to 32 cpus set. Some simple looping logic clears that up too. 3) thread_info->cpu was a u8, easily changed to a u16. There are a few spots in the kernel that still put NR_CPUS sized arrays on the kernel stack, but that's not a sparc64 specific problem. Signed-off-by: David S. Miller commit 5cbc30737398b49f62ae8603129ce43ac7db1a41 Author: David S. Miller Date: Fri May 25 15:49:59 2007 -0700 [SPARC64]: Use machine description and OBP properly for cpu probing. Signed-off-by: David S. Miller commit e01c0d6d8cf29c1c11725837b265598cab687952 Author: David S. Miller Date: Fri May 25 01:04:15 2007 -0700 [SPARC64]: Negotiate hypervisor API for PCI services. Signed-off-by: David S. Miller commit 22d6a1cba3e9ec9baf8ce4d8dd1d088e112a64f1 Author: David S. Miller Date: Fri May 25 00:37:12 2007 -0700 [SPARC64]: Report proper system soft state to the hypervisor. Signed-off-by: David S. Miller commit 36b48973b8f1818d0ae6d16e548081d00162ae39 Author: David S. Miller Date: Fri May 25 00:33:49 2007 -0700 [SPARC64]: Fix typo in sun4v_hvapi_register error handling. Signed-off-by: David S. Miller commit 89a4063e959a4701b998f3f1c3f8a6562ab5ba51 Author: David S. Miller Date: Tue May 22 23:48:10 2007 -0700 [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp Signed-off-by: David S. Miller commit 5ff263667798946abc15314eae3f341345877d7a Author: Thomas Bogendoerfer Date: Tue May 22 17:03:44 2007 -0700 [SCSI] jazz_esp: Converted to use esp_core. Use new esp_scsi for JAZZ SCSI host adapter driver Signed-off-by: Thomas Bogendoerfer Signed-off-by: David S. Miller commit 5840fc66bb47fa4382bf3229d4979c3fcd375b01 Author: David S. Miller Date: Tue May 22 01:24:14 2007 -0700 [SPARC64]: PCI device scan is way too verbose by default. These messages were very useful when bringing up the OBP based PCI device scan code, but it's just a lot of noise every bootup now especially on big machines. The messages can be re-enabled via 'ofpci_debug=1' on the kernel command line. Signed-off-by: David S. Miller commit 9977e390dd25751fc40e01850da88b37d3c81109 Author: Krzysztof Helt Date: Sat May 19 12:06:02 2007 -0700 [SERIAL] sunzilog: section mismatch fix This patch fixes section mismatch warnings in the sunzilog driver. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 42e28264783f1b3b9a99e0fdda263ed9bffcf331 Author: Krzysztof Helt Date: Sat May 19 12:03:24 2007 -0700 [SPARC32]: Removes mismatch section warnigs in sparc time.c file This patch removes mismatch section warnings in the sparc/kernel/time.c file. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 59db8102bd0ab7a67d525d086ca08e07d69fadd4 Author: David S. Miller Date: Wed May 23 18:00:46 2007 -0700 [SPARC64]: Don't be picky about virtual-dma values on sun4v. Handle arbitrary base and length values as long as they are multiples of IO_PAGE_SIZE. Bug found by Arun Kumar Rao. Signed-off-by: David S. Miller commit a1aadd55fb43e31407aecc4ebaf0258130a98238 Author: Christoph Hellwig Date: Wed May 23 14:57:49 2007 -0700 [SPARC64]: Kill unused DIE_PAGE_FAULT enum value. sparc64 got rid of the pagefault notifiers, so the enum value for them can go away aswell. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit b68a890fa3cd977365fda2b1f1ec4e8dc58baddf Author: Christoph Hellwig Date: Wed May 23 14:56:45 2007 -0700 [SCSI] pluto: Use wait_for_completion_timeout. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit df3c7244264f1d12562413aa32d56be802486516 Author: David Chinner Date: Thu May 24 15:27:03 2007 +1000 [XFS] Write at EOF may not update filesize correctly. The recent fix for preventing NULL files from being left around does not update the file size corectly in all cases. The missing case is a write extending the file that does not need to allocate a block. In that case we used a read mapping of the extent which forced the use of the read I/O completion handler instead of the write I/O completion handle. Hence the file size was not updated on I/O completion. SGI-PV: 965068 SGI-Modid: xfs-linux-melb:xfs-kern:28657a Signed-off-by: David Chinner Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit b23c9e386cc639aa7c0b7360388b3e3759059e06 Author: Uwe Bugla Date: Mon May 28 23:24:48 2007 -0400 Input: logips2pp - fix typo in Kconfig Signed-off-by: Uwe Bugla Signed-off-by: Dmitry Torokhov commit 0e2a4fd2e8c48ba5eb386d5698846a5ca0c80f39 Author: Dmitry Torokhov Date: Mon May 28 23:24:39 2007 -0400 Input: db9 - do not ignore dev2 module parameter Because of incorrect parameter setup anything passed in dev2=... was always ignored by the driver. See bugzilla #8541. Signed-off-by: Dmitry Torokhov commit 3abc12012f957d1c5b9f35b244256f88ad146564 Author: Alan Cox Date: Wed May 23 14:14:15 2007 -0700 [ARM] enable arbitary speed tty ioctls and split input/output speed Add the ioctls and values needed for this to the ARM26/ARM32 ports. The actual code has been in the base kernel for a while and automatically turns on when a port sets the required defines. [RMK: also added termbits.h changes to avoid build breakage] Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 471e44b26ef84658ee434087413c445bbe14686b Author: Jeff Garzik Date: Mon May 28 09:00:05 2007 -0400 [libata] Add drive to NCQ blacklist Contributed by Simon Griph. Signed-off-by: Jeff Garzik commit 350958f984268dcf0f087aac78c5b9fe2846aeff Author: Jeff Garzik Date: Sun May 27 07:09:18 2007 -0400 firewire: fix return code Fix this warning on x86-64 drivers/firewire/fw-cdev.c:798: warning: initialization from incompatible pointer type by making the return code of ioctl_send_request() the same as all the other ioctl_xxx() return codes. Signed-off-by: Jeff Garzik Signed-off-by: Stefan Richter commit 9a60731d0036a6c6c265acd4248c17fd24fc8e13 Author: Stefan Richter Date: Fri May 25 13:54:49 2007 +0200 firewire: prefix modules with firewire- instead of fw- Of course everybody immediately associates "fw-" with FireWire, not firmware or firewall or whatever. But "firewire-" has a nice ring to it too. Signed-off-by: Stefan Richter Acked-by: Kristian Hoegsberg commit ec839e43fbe1b1ab74264ac510f6cd9c8e8334a4 Author: Kristian Høgsberg Date: Tue May 22 18:55:48 2007 -0400 firewire: Add missing byteswapping for receive DMA programs. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 976da96a5d4fe84bd292b950e566325dc3e5904e Author: Petr Vandrovec Date: Sun May 13 22:14:44 2007 -0700 ieee1394: raw1394: Fix async send While playing with libiec61883 I've noticed that async_send is broken because it was doing copy_from_user(...., packet->data_size) before packet->data_size was set to any useful value. It got broken when packet->allocated_data_size got introduced, as hpsb_alloc_packet does not set packet->data_size anymore. (Regression in 2.6.22-rc1) Signed-off-by: Petr Vandrovec Signed-off-by: Stefan Richter commit ef50a6c59dc66f22eba67704e291d709f21e0456 Author: Stefan Richter Date: Mon May 21 01:05:41 2007 +0200 ieee1394: eth1394: bring back a parent device This adds a real parent device to eth1394's ethX device like in Linux 2.6.20 and older. However, due to unfinished conversion of the ieee1394 away from class_device, we now refer to the FireWire controller's PCI device as the parent, not to the ieee1394 driver's fw-host device. Having a real parent device instead of a virtual one allows udev scripts to distinguish eth1394 interfaces from networking bridges, bondings and the likes. Fixes a regression since 2.6.21: https://bugs.gentoo.org/show_bug.cgi?id=177199 Signed-off-by: Stefan Richter commit 7a97bc03e089d1a75dc533f0fe69ec8dac672916 Author: Stefan Richter Date: Sat May 5 17:25:51 2007 +0200 ieee1394: eth1394: handle tlabel exhaustion When eth1394 was unable to acquire a transaction label, it just dropped outgoing packets without attempt to resend them later. The transmit queue is now halted if no tlabel is available to ->hard_start_xmit(). A workqueue job is then scheduled to catch the moment when ieee1394 recycled the next lot of tlabels. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=8402 Signed-off-by: Stefan Richter commit 69c29fa7d142d65b13e366ae51e50944484b65ab Author: Stefan Richter Date: Sat May 5 17:19:09 2007 +0200 ieee1394: eth1394: remove bogus netif_wake_queue When we are within hard_start_xmit, the queue is already awake. Signed-off-by: Stefan Richter commit 20e2008e1f24a6831bf4311f8e2f8692f16a92de Author: Stefan Richter Date: Sat May 5 17:18:12 2007 +0200 ieee1394: sbp2: include workqueue.h Signed-off-by: Stefan Richter commit 6996abf0962bb86b6285987a4698f6d275ff531f Author: Nicolas Boichat Date: Sun May 27 22:17:43 2007 +0200 hwmon/applesmc: Handle name file creation error and deletion The previous patch was incomplete. Signed-off-by: Nicolas Boichat Signed-off-by: Jean Delvare commit 548c343b2ff03488b913440799e83d66d7db8fad Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/applesmc: Simplify dependencies The dependency upon HWMON is now handled at menu level. Signed-off-by: Jean Delvare Cc: Nicolas Boichat commit 45f2acc484b31d429eb1359c48ea5cd3acb869cd Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon-vid: Don't spam the logs when VRM version is missing If we cannot guess which VRM version the CPU uses, we set it to 0 and log it. So we shouldn't spam the log each time vid_from_reg() is later called with vrm 0. Signed-off-by: Jean Delvare Acked-by: Rudolf Marek commit e142e2a30787e9fa1bf0f66aa1d01727ce718cc7 Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/w83627hf: Be quiet when no chip is found Signed-off-by: Jean Delvare commit 67f363b1f6a31cf5027a97372f64bcced4f05ba6 Author: Rudolf Marek Date: Sun May 27 22:17:43 2007 +0200 hwmon/coretemp: Add more safety checks Add detection of AE18 Errata of Core processor and warns users that the absolute readings might be wrong for Core2 processor. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 7574d7e937f81754dfd82deac24aea5880107e2d Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/ds1621: Fix swapped temperature limits The low temperature limit and the high temperature limit registers have been accidentally swapped, causing alarms to trigger when they shouldn't. Signed-off-by: Jean Delvare Acked-by: Aurelien Jarno commit 593af52aa63193ac331cc13bca2b5611b74ddf77 Author: Helge Deller Date: Sun May 27 21:15:49 2007 +0200 [PARISC] Wire up utimensat/signalfd/timerfd/eventfd syscalls Wire up utimensat/signalfd/timerfd/eventfd syscalls and mark select/fadvise64/utimes to be ignored by checksyscalls.sh Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 8c678b101a08a6543e62ab60aace93042456aa9d Author: Helge Deller Date: Sun May 27 20:38:47 2007 +0200 [PARISC] fix section mismatch in superio serial drivers This patch fixes two section mismatches in superio serial setup: WARNING: drivers/built-in.o(.text.superio_serial_init+0x78): Section mismatch: reference to .init.text:early_serial_setup (after 'superio_serial_init') WARNING: drivers/built-in.o(.text.superio_serial_init+0xa4): Section mismatch: reference to .init.text:early_serial_setup (after 'superio_serial_init') Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 6fe077fd381048293134fbc6011d7e4633edc0c5 Author: Helge Deller Date: Sun May 27 19:57:11 2007 +0200 [PARISC] fix section mismatch in parisc eisa driver Hi Kyle, this patch fixes the following section mismatch (EISA cards should be hotplug aware, but the EISA bus itself shouldn't): WARNING: drivers/built-in.o(.text.eisa_probe+0x220): Section mismatch: reference to .init.text:eisa_root_register (after 'eisa_probe') Please apply, Helge Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit e9541d0ca2a5d713c5d8dcb635d3f41e75c90bfb Author: Helge Deller Date: Sun May 27 19:30:36 2007 +0200 [PARISC] fix section mismatches in arch/parisc/kernel Hi Kyle, this patch fixes two section mismatches in arch/parisc/kernel: WARNING: arch/parisc/kernel/built-in.o(.data.read_mostly+0xd8): Section mismatch: reference to .init.text:processor_probe (between 'cpu_driver' and 'boot_cpu_data') WARNING: arch/parisc/kernel/built-in.o(.text.alloc_pa_dev+0x140): Section mismatch: reference to .init.text:parisc_hardware_description (after 'alloc_pa_dev') Additionally, mark some tables as constants. Please apply, Helge Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 25971f68d392f1816e21520e9e59648403b0bdad Author: Helge Deller Date: Sun May 27 18:20:47 2007 +0200 [PARISC] fix section mismatch in ccio-dma Hi Kyle, this fixes section mismatches in ccio-dma. Additionally, mark parisc_device_id table const. Please apply, Helge Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 48a7d5c66b3cecc40364d62cfd54c502c0979561 Author: Helge Deller Date: Sun May 27 18:10:25 2007 +0200 [PARISC] fix section mismatch in parisc STI video drivers Hi Kyle, this patch fixes various section mismatches in the sti graphics driver: WARNING: drivers/built-in.o(.text.sticore_pci_init+0xac): Section mismatch: reference to .init.text:sti_try_rom_generic (after 'sticore_pci_init') WARNING: drivers/built-in.o(.text.sticore_pci_init+0xe4): Section mismatch: reference to .init.text:sticore_check_for_default_sti (after 'sticore_pci_init') WARNING: drivers/built-in.o(.text.sti_get_rom+0x18): Section mismatch: reference to .init.text:sti_init_roms (after 'sti_get_rom') (and others). Basically it's a replacement of __init by __devinit. Please apply, Helge Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 649f0edd8b8ec0c0344fc36dd3f1c0add4497dc8 Author: Helge Deller Date: Sun May 27 18:07:25 2007 +0200 [PARISC] fix section mismatch in parport_gsc Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 76fb9278fd76e8662987ca83a106ac30c813bea5 Author: Helge Deller Date: Sun May 27 14:27:23 2007 +0200 [PARISC] fix lasi_82596 build Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 43e7f6adf33da1f7816ff738d3725bbde8fd98de Author: Robert P. J. Day Date: Wed May 23 14:14:14 2007 -0700 [ARM] remove unused header file: arch/arm/mach-s3c2410/bast.h Signed-off-by: Robert P. J. Day Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Russell King commit cc50a0df51e4f2a7982ade338b3d74825ca67e08 Author: Michael-Luke Jones Date: Wed May 23 22:41:53 2007 +0100 [ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup This trivial patch updates the nslu2 and nas-100d headers to remove pointless GPIO defines, and updates nslu2-setup.c accordingly. In addition minor style cleanups to some comments are included. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 435c5da00b9610f9664c5d6f38dfdafce419ef4a Author: Michael-Luke Jones Date: Wed May 23 22:38:45 2007 +0100 [ARM] 4405/1: NSLU2, DSM-G600 frequency fixup code This patch is required as the frequency fixup in nslu2_init does not run sufficiently early in the boot sequence to take effect. In addition the dsmg600 setup code behaviour has been improved such that a 'fixup' routine is avoided. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit e87a8e85e90660183d3ef8e700627689c6292a3f Author: Michael-Luke Jones Date: Wed May 23 22:36:44 2007 +0100 [ARM] 4404/1: Trivial IXP42x Kconfig cleanup Avila and IXDP4xx support were separated in 2.6.21 so this comment isn't correct any more. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 6776f3d26aec60cb6e0fc770a00993accd09376f Author: Enrico Scholz Date: Mon May 21 12:29:40 2007 +0100 [ARM] 4403/1: Make the PXA-I2C driver work with lockdep validator Using lockdep validator causes warnings like INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. [] (dump_stack+0x0/0x14) from [] (__lock_acquire+0x150/0xc40) [] (__lock_acquire+0x0/0xc40) from [] (lock_acquire+0x5c/0x70) [] (lock_acquire+0x0/0x70) from [] (_spin_lock_irq+0x48/0x58) r7:c07e5144 r6:00000000 r5:c015fb94 r4:c07e50b8 [] (_spin_lock_irq+0x0/0x58) from [] (i2c_pxa_xfer+0x110/0x2e0) r5:c07e50b8 r4:0000001f This is caused by memcpy'ing a statical initialized spin-lock. This patch removes a static pxa_i2c structure which was used only as a source for this memcpy() operation. Instead of, members and the spinlock will be initialized manually. Signed-off-by: Enrico Scholz Signed-off-by: Russell King commit ece97941c378b4a424530585a7c855e466f1bd2c Author: Ben Dooks Date: Mon May 21 09:40:06 2007 +0100 [ARM] 4402/1: S3C2443: Add physical address of HSMMC controller Add physical address of HSMMC to include/asm-arm/arch-s3c2410/map.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 8e81725b17b07ed5052bbd826ff0479a4c22a0ea Author: Ben Dooks Date: Mon May 21 09:38:51 2007 +0100 [ARM] 4401/1: S3C2443: Add definitions for port GPIOJ Add definitions for S3C2443 functions in GPIOJ Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c420bc9f09a0926b708c3edb27eacba434a4f4ba Author: Linus Torvalds Date: Fri May 25 19:55:14 2007 -0700 Linux 2.6.22-rc3 It's that time of the year again. Summer starts in the US, and people want to sit at the beach with a new -rc candidate. Signed-off-by: Linus Torvalds commit f4d43bd579f13219ffd3cae48432eab5bbac2d6f Author: Hugh Dickins Date: Sat May 26 00:39:17 2007 +0100 fix compat console unimap regression Why is it that since the 2f1a2ccb9c0de632ab07193becf5f7121794f6ae console UTF-8 fixes went into 2.6.22-rc1, the PowerMac G5 shows only inverse video question marks for the text on tty2-6? whereas tty1 is fine, and so is x86. No fault of that patch: by removing the old fallback behaviour, it reveals that 32-bit setfont running on 64-bit kernels has only really worked on the current console, the rest getting faked by that inadequate fallback. Bring the compat do_unimap_ioctl into line with the main one: PIO_UNIMAP and GIO_UNIMAP apply to the specified tty, not redirected to fg_console. Use the same checks, and most particularly, remember to check access_ok: con_set_unimap and con_get_unimap are using __get_user and __put_user. And the compat vt_check should ask for the same capability as the main one, CAP_SYS_TTY_CONFIG rather than CAP_SYS_ADMIN. Added in vt_ioctl's vc_cons_allocated check for safety, though failure may well be impossible. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 5c04ec74da2f4d3ec0ca406c705313c9b3c7f9b5 Author: Kyle McMartin Date: Fri May 25 19:19:35 2007 -0400 [PARISC] Build fixes for power.c is no longer implicitly included. Signed-off-by: Kyle McMartin commit ad46c54868078440b4538fa263a5fd2f124b5a57 Author: Kyle McMartin Date: Fri May 25 19:18:01 2007 -0400 [PARISC] kobject is embedded in subsys, not kset Signed-off-by: Kyle McMartin commit 960c8a10cbd47d1535996f40749b36f3d2c45f88 Author: Alan Cox Date: Fri May 25 20:48:55 2007 +0100 pata_hpt37x: Further improvements based on the IDE updates and vendor drivers Better DPLL use and calibration Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit c343a8391496de83c66e771ead986aab0d6f777f Author: Alan Cox Date: Fri May 25 20:39:30 2007 +0100 pata: Trivia Typo/comment fixes Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit c4814f9001a8dd28e39311a919beac34f778f76d Author: Michel Dänzer Date: Sat May 26 04:37:08 2007 +1000 drm: make sure the drawable code doesn't call malloc(0). Signed-off-by: Michel Dänzer Signed-off-by: Dave Airlie commit 777c7738a598c6e8d4b850181a509757fb79cf36 Author: Dave Airlie Date: Sat May 26 04:19:03 2007 +1000 drm/radeon: add more IGP chipset pci ids Add more IGP chipset PCI IDs Signed-off-by: Dave Airlie commit d9b08b9efece1f397143378938e626d0de29e911 Author: Christoph Hellwig Date: Fri May 18 13:12:40 2007 +0200 [PATCH] ocfs2: use generic_segment_checks Signed-off-by: Christoph Hellwig Signed-off-by: Mark Fasheh commit 8fccfc829a66b8b879c6672940523a402a786ce1 Author: Mark Fasheh Date: Wed May 9 17:34:26 2007 -0700 ocfs2: fix inode leak We weren't cleaning up our inode reference on error in ocfs2_reserve_local_alloc_bits(). Add a check for error return and iput() if need be. Move the code to set the alloc context inode info to the end of the function so we don't have any possibility of passing back a bad pointer. Signed-off-by: Mark Fasheh commit 5c3c6bb7709bf2bf4132750124879b3d89183e46 Author: Nate Diller Date: Thu May 10 22:56:01 2007 -0700 [PATCH] ocfs2: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Mark Fasheh commit 1024c902abdcbd2425aa850d7ef04e013ffb35f0 Author: Mark Fasheh Date: Mon May 14 11:39:40 2007 -0700 ocfs2: unmap_mapping_range() in ocfs2_truncate() We weren't calling this before, but since ocfs2 handles the entire truncate operation, we should. Signed-off-by: Mark Fasheh commit e9dfc0b2bc42761410e8db6c252c6c5889e178b8 Author: Mark Fasheh Date: Mon May 14 11:38:51 2007 -0700 ocfs2: trylock in ocfs2_readpage() Similarly to the page lock / cluster lock inversion in ocfs2_readpage, we can deadlock on ip_alloc_sem. We can down_read_trylock() instead and just return AOP_TRUNCATED_PAGE if the operation fails. Signed-off-by: Mark Fasheh commit a6399bdd492a3289d39e4b79cbe69ad44a054ee3 Author: Thomas Gleixner Date: Sat May 26 05:56:14 2007 +1000 drm: Spinlock initializer cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 52df0ee07ca23676785e6c7e569b6d93c6dbc026 Author: Jeff Garzik Date: Fri May 25 05:02:06 2007 -0400 [libata] sata_via, pata_via: Add PCI IDs. Supplied by VIA. Also, convert named constants to hex values in the pata_via PCI ID table. (standard libata policy for PCI device IDs, which are considered simply arbitrary hex numbers, without a need to create a single-use constant in linux/pci_ids.h) Signed-off-by: Jeff Garzik commit 6c7b7d2b7615110edbc4ea7816831c13b0250ebb Author: Jeff Garzik Date: Fri May 25 04:39:39 2007 -0400 [libata] Fix decoding of 6-byte commands The code for parsing 6-byte SCSI command LBAs missed the top 5 bits (the MSB). Signed-off-by: Jeff Garzik commit ddfc87a098a0172ad13ce50edf55d5fe266f1352 Author: Uwe Koziolek Date: Fri May 25 09:48:52 2007 +0200 libata: sata_sis fixes The sata_sis driver supports SATA and PATA ports. The broken support of both types in one controller is fixed. Signed-off-by: Uwe Koziolek Signed-off-by: Jeff Garzik commit 7e068376c5128db2a342fa659a6dfa1488adc135 Author: Tony Breeds Date: Wed May 23 14:26:43 2007 -0700 Fix build failure for drivers/ata/pata_scc.c The commit d4b2bab4f26345ea1803feb23ea92fbe3f6b77bc added deadline support to prereset and reset methods to libbata the pata_scc driver wasn't converted. This patch is a naive attempt to bring this driver up to scratch. Build failures are: drivers/ata/pata_scc.c: In function 'scc_pata_prereset': drivers/ata/pata_scc.c:870: error: too few arguments to function 'ata_std_prereset' drivers/ata/pata_scc.c: In function 'scc_error_handler': drivers/ata/pata_scc.c:916: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type drivers/ata/pata_scc.c:916: warning: passing argument 3 of 'ata_bmdma_drive_eh' from incompatible pointer type drivers/ata/pata_scc.c: In function 'scc_pata_prereset': drivers/ata/pata_scc.c:871: warning: control reaches end of non-void function On a releated note scc_bus_post_reset() is (AFACT) identical to ata_bus_post_reset(), would a patch to make ata_bus_post_reset() assesable to drivers be accepted? Signed-off-by: Tony Breeds Acked-by: Tejun Heo Cc: Akira Iguchi Cc: Jeff Garzik Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a05e2091709dbb22b86a1b3343cd3fa3c0d7a6b Author: Jeff Garzik Date: Thu May 24 23:40:15 2007 -0400 [libata] sata_mv: add TODO list Signed-off-by: Jeff Garzik commit bb312235933689fb0f973ae61d19d7416de1e085 Author: Jeff Garzik Date: Thu May 24 23:35:59 2007 -0400 [libata] sata_promise: fix flags typo A stray comma makes all the difference. Change to '|' as these flags should be or'd together. Signed-off-by: Jeff Garzik commit 14e50e57aedb2a89cf79b77782879769794cab7b Author: David S. Miller Date: Thu May 24 18:17:54 2007 -0700 [XFRM]: Allow packet drops during larval state resolution. The current IPSEC rule resolution behavior we have does not work for a lot of people, even though technically it's an improvement from the -EAGAIN buisness we had before. Right now we'll block until the key manager resolves the route. That works for simple cases, but many folks would rather packets get silently dropped until the key manager resolves the IPSEC rules. We can't tell these folks to "set the socket non-blocking" because they don't have control over the non-block setting of things like the sockets used to resolve DNS deep inside of the resolver libraries in libc. With that in mind I coded up the patch below with some help from Herbert Xu which provides packet-drop behavior during larval state resolution, controllable via sysctl and off by default. This lays the framework to either: 1) Make this default at some point or... 2) Move this logic into xfrm{4,6}_policy.c and implement the ARP-like resolution queue we've all been dreaming of. The idea would be to queue packets to the policy, then once the larval state is resolved by the key manager we re-resolve the route and push the packets out. The packets would timeout if the rule didn't get resolved in a certain amount of time. Signed-off-by: David S. Miller commit 04efb8787e4d8a7b21a61aeb723de33154311256 Author: David S. Miller Date: Thu May 24 17:54:15 2007 -0700 [CASSINI]: Check pci_set_mwi() return value. Signed-off-by: David S. Miller commit cf5792d20cdc9a88abf9984a2224f57de1952926 Author: Alan Cox Date: Wed May 23 22:39:01 2007 +0100 pata_via: Handle laptops via DMI Oh the joy of saving a fraction of a cent using short 40 wire cables and not faking 80wire Teach the VIA driver that there are some systems we need to know are magically wired for high speeds. Signed-off-by: Alan Cox Tested-by: Francis Russell Signed-off-by: Jeff Garzik commit 6dffaf61e22d21e539ae7e30c2e33e41230c3d52 Author: Tejun Heo Date: Wed May 23 11:58:52 2007 +0200 libata: -ENODEV during prereset isn't an error During prereset, -ENODEV return from ata_wait_ready() is not an error. This causes unnecessary bug message on controllers which uses 0xff to indicate empty port. Fix it. Signed-off-by: Tejun Heo Cc: Paul Mundt Signed-off-by: Jeff Garzik commit fd7fe701612e42fb8780d7bf61fbb0467a488c9b Author: Tejun Heo Date: Wed May 23 11:22:15 2007 +0200 libata: don't consider 0xff as port empty if SStatus is available Some SATA controllers (sata_sil) use 0xff to indicate port not ready status, not port empty. As libata interprets 0xff as port empty, this causes unnecessary reset failure and retry. Don't consider 0xff as port empty if SStatus is available and indicates that port is online. Signed-off-by: tejun Heo Cc: Paul Mundt Cc: Indan Zupancic Signed-off-by: Jeff Garzik commit b33620f9fa6a8deabaac7a7cd827cc7fafbf0064 Author: Tejun Heo Date: Tue May 22 11:34:22 2007 +0200 ata_piix: add short 40c quirk for Acer Aspire 2030, take #2 Acer Aspire 2023WLMi uses short 40c cable. Add quirk for it. Signed-off-by: Tejun Heo Cc: Steve H. Signed-off-by: Jeff Garzik commit dd668d150cad39d3af676519c81c2757fb7787da Author: Alan Cox Date: Mon May 21 15:00:53 2007 +0100 pata_sis: Fix and clean up some timing setups - Rename sis_port_base to sis_old_port_base() so nobody uses it for new generation controllers in error. - Use byte size operations where it is cleaner for mode setup - Fix a couple of masking errors on certai chip revs when setting speeds Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 824cf333db97954d6144230b5e28f4e65e67d312 Author: Alan Cox Date: Mon May 21 14:57:01 2007 +0100 hpt3x2n: Correct revision boundary We have a revision that isn't correctly claimed as two drivers both go for it: Fix the test accordingly. Noticed originally by Bill Nottingham. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit ba78073e6f70cd9c64a478a9bd901d7c8736cfbc Author: Vasily Averin Date: Thu May 24 16:58:54 2007 -0700 [NET]: "wrong timeout value" in sk_wait_data() v2 sys_setsockopt() do not check properly timeout values for SO_RCVTIMEO/SO_SNDTIMEO, for example it's possible to set negative timeout values. POSIX do not defines behaviour for sys_setsockopt in case negative timeouts, but requires that setsockopt() shall fail with -EDOM if the send and receive timeout values are too big to fit into the timeout fields in the socket structure. In current implementation negative timeout can lead to error messages like "schedule_timeout: wrong timeout value". Proposed patch: - checks tv_usec and returns -EDOM if it is wrong - do not allows to set negative timeout values (sets 0 instead) and outputs ratelimited information message about such attempts. Signed-off-By: Vasily Averin Signed-off-by: David S. Miller commit 1ff75ed254bdbb47bb0c1d71a3cc65f6831a8e3a Author: Jing Min Zhao Date: Thu May 24 16:44:40 2007 -0700 [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook They're the same. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f8f1c08eaef838e22bf427665da87cfa73e5074d Author: Jing Min Zhao Date: Thu May 24 16:44:11 2007 -0700 [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA Add missing process of T.120 address in OpenLogicalChannelAck signal. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 596830f1a1e5d26a83fe83b99ced1456d9d7f39b Author: Jing Min Zhao Date: Thu May 24 16:43:42 2007 -0700 [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal According to the implementation of H.323, it's not necessary to check the addresses in Information signals. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bb807245ef981cac7e8550aea365e6f2157d5c4d Author: Jing Min Zhao Date: Thu May 24 16:43:07 2007 -0700 [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access Update get_h225_addr() to meet the changes in ASN.1 types. It was using field ip6 to access IPv6 TransportAddress, it should be ip according the ASN.1 definition. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d052918688bdd7a1218aa5ae182013bf45a4881a Author: Jing Min Zhao Date: Thu May 24 16:42:26 2007 -0700 [NETFILTER]: nf_conntrack_h323: fix ASN.1 types 1. Add support for decoding IPv6 address. I know it was manually added in the header file, but not in the template file. That wouldn't work. 2. Add missing support for decoding T.120 address in OLCA. 3. Remove unnecessary decoding of Information signal. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 25b86e05467a2bf936b78695ef49039e3bbd1e0c Author: Patrick McHardy Date: Thu May 24 16:41:50 2007 -0700 [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation When the packet size is changed by the FTP NAT helper, the connection tracking helper adjusts the sequence number of the newline character by the size difference. This is wrong because NAT sequence number adjustment happens after helpers are called, so the unadjusted number is compared to the already adjusted one. Based on report by YU, Haitao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5fe26f53fe9e2ba5dca2835a4ca69d0ba7b5f707 Author: Patrick McHardy Date: Thu May 24 16:40:51 2007 -0700 [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update When trying to locate the oldest entry in the history of newline character sequence numbers, the sequence number of the current entry is incorrectly compared with the index of the oldest sequence number instead of the number itself. Additionally it is not made sure that the current sequence number really is after the oldest known one. Based on report by YU, Haitao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2e4b3b0e8734d1173c96c6f5d8a8dd6728950b56 Author: Patrick McHardy Date: Wed May 23 23:39:54 2007 -0700 [NET_SCHED]: sch_htb: fix event cache time calculation The event cache time must be an absolute value, when no event exists it is incorrectly set to 1s instead of 1s in the future. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1b07a95a5be77dc1291de12b216f930aee04eb4f Author: David S. Miller Date: Wed May 23 17:43:11 2007 -0700 [DCCP]: Fix build warning when debugging is disabled. Signed-off-by: David S. Miller commit cb283ead710c342d9856af8507e2a42bf5c6576c Author: Jon Paul Maloy Date: Wed May 23 15:11:15 2007 -0700 [TIPC]: Fixed erroneous introduction of for_each_netdev Signed-off-by: Jon Paul Maloy Signed-off-by: David S. Miller commit b8f558313506b5bc435f2e031f3bec4b1725098e Author: Milan Kocian Date: Wed May 23 14:55:06 2007 -0700 [RTNETLINK]: Fix sending netlink message when replace route. When you replace route via ip r r command the netlink multicast message is not send. This patch corrects it. NL message is sent with NLM_F_REPLACE flag. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8320 Signed-off-by: Milan Kocian Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8a903be129a741fd1e1d44223f0e3a01c357bde5 Author: Jan Engelhardt Date: Wed May 23 14:51:07 2007 -0700 [TR]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 42859007f458f305624009862d6ca818e3c5be57 Author: Jan Engelhardt Date: Wed May 23 14:50:18 2007 -0700 [ARCNET]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a31b19c514664b8161b956f8da45d8a9166da0c6 Author: Jan Engelhardt Date: Wed May 23 14:49:38 2007 -0700 [TIPC]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 29e32ccdec8574aa5b6e0b6b555815dbb62591e1 Author: Jan Engelhardt Date: Wed May 23 14:48:57 2007 -0700 [SCTP]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a6938a1e0e0ebdf42f34b37116576d9eaaa9bba4 Author: Jan Engelhardt Date: Wed May 23 14:48:10 2007 -0700 [IPVS]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Acked-by: Simon Horman Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3df25df354d0e9bae9b83be5a828b6756db9bcf4 Author: Jan Engelhardt Date: Wed May 23 14:46:35 2007 -0700 [DCCP]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7e7a2d07b0faf13b2f7ad982c77ca30c9e9ee0e4 Author: Matthias Kaehlcke Date: Wed May 23 14:45:45 2007 -0700 [ATM]: Use mutex instead of binary semaphore in idt77252 driver. Use mutex instead of binary semaphore in idt77252 driver. Signed-off-by: Matthias Kaehlcke Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit bbb711e63332d7b43b535381c78b26a66cd60f48 Author: Oliver Hartkopp Date: Wed May 23 14:35:31 2007 -0700 [IPV6]: Ignore ipv6 events on non-IPV6 capable devices. Signed-off-by: Oliver Hartkopp Signed-off-by: Urs Thuermann Signed-off-by: David S. Miller commit 36247f5421015eab0bdd96789b24790598934db9 Author: Herbert Xu Date: Wed May 23 14:30:44 2007 -0700 [NET_SCHED]: Fix qdisc_restart return value when dequeue is empty My previous patch that changed the return value of qdisc_restart incorrectly made the case where dequeue returns empty continue processing packets. This patch is based on diagnosis and fix by Patrick McHardy. Reported-and-debugged-by: Anant Nitya Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 096a458c3a9c717563e98b0a2ce69821459a6660 Author: Ayaz Abdulla Date: Mon May 21 20:23:11 2007 -0400 forcedeth: fix cpu irq mask This patch fixes the cpu irq mask define to include the timer irq. Another flag check was setting up the timer bit in all cases so we didn't notice the issue. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 294cf1b880fad9221e911fb2ce07b1fff3ae1a3d Author: Mariusz Kozlowski Date: Thu May 24 19:46:14 2007 +0200 chelsio parenthesis fix Hello, Balanance parenthesis in chelsio header file. Signed-off-by: Mariusz Kozlowski drivers/net/chelsio/suni1x10gexp_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit 93c1d3b790673bb2a7489d6f165c5c99a7f44baf Author: Florin Malita Date: Tue May 22 18:09:42 2007 -0500 spidernet: skb used after netif_receive_skb The stats update code in spider_net_pass_skb_up() is touching the skb after it's been passed up to the stack. To avoid that, just update the stats first. Signed-off-by: Florin Malita Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit e971290133d8151c468cd70206fedc92648feb58 Author: Ralf Baechle Date: Thu May 24 12:54:04 2007 +0100 meth driver renovation The meth ethernet driver for the SGI IP32 aka O2 is so far still an old style driver which does not use the device driver model. This is now causing issues with some udev based gadgetry in debian-stable. Fixed by converting the meth driver to a platform device. Signed-off-by: Ralf Baechle -- Fixes since previous patch: o Fixed typo in meth_exit_module() Signed-off-by: Jeff Garzik commit 73815538e642de66a5607cc16d13004ecb1a3062 Author: Yoichi Yuasa Date: Thu May 24 16:12:27 2007 +0900 remove unnecessary dependency on VIA velocity config Hi, This patch has removed unnecessary dependency on VIA velocity config. Yoichi Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit 239dc572b8e6ecde91afe96d2426ddc2afd4695d Author: Denver Gingerich Date: Wed May 23 14:34:43 2007 -0700 fix compiler warning in fixed.c Correct the following compiler warning (and warnings resulting from the correction): warning: 'fixed_mdio_register_device' defined but not used Signed-off-by: Denver Gingerich Cc: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2ed22bc294315d19aa1f0423b83d21a2d94c641b Author: David Hollis Date: Wed May 23 07:33:17 2007 -0400 asix.c - Add Belkin F5D5055 ids (Originally sent to linux-usb-devel) The attached patch adds the device IDs for the Belkin F5D5055 device. Reported by Andy Juniper Signed-off-by: David Hollis -- David Hollis Signed-off-by: Jeff Garzik commit 66bd23fad81fb0b84c16edd48ec160f8fdbe3f57 Author: Li Yang Date: Tue May 22 20:34:14 2007 +0800 ucc_geth:trivial fix Remove redundant includes. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 5bc8d39a4759e956fa25880d57ef579f96f1a334 Author: Li Yang Date: Tue May 22 20:24:37 2007 +0800 ucc_geth: Fix MODULE_DEVICE_TABLE() duplication Fix MODULE_DEVICE_TABLE() duplication in ucc_geth.c and ucc_geth_mii.c for ucc_geth to be compiled as module. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 2dfbfc37121d307e1f1d24c2979382cb17b19347 Author: Michael S. Tsirkin Date: Thu May 24 18:32:46 2007 +0300 IPoIB/cm: Drain cq in ipoib_cm_dev_stop() Since NAPI polling is disabled while ipoib_cm_dev_stop() is running, ipoib_cm_dev_stop() must poll the CQ itself in order to see the packets draining. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8fd357a6e3375083f7d321413eb8f6739491f342 Author: Michael S. Tsirkin Date: Thu May 24 14:02:39 2007 -0700 IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop() time_after() was used backwards, so the timeout occurred immediately. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 65a2c841d68ae3402ea4cad8d00fe4b9b0a5bc80 Author: Stefan Roscher Date: Thu May 24 16:51:08 2007 +0200 IB/ehca: Fix number of send WRs reported for new QP Due to a typo, the driver was reporting the wrong number of "actual send WRs" after ehca_create_qp(). Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c0be5fb5f835110652911ea8b88ad78f841e5b45 Author: Eli Cohen Date: Thu May 24 16:05:01 2007 +0300 IB/mlx4: Initialize send queue entry ownership bits We need to initialize the owner bit of send queue WQEs to hardware ownership whenever the QP is modified from reset to init, not just when the QP is first allocated. This avoids having the hardware process stale WQEs when the QP is moved to reset but not destroyed and then modified to init again. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit d57c4a38928ab2f71542046a9bae2932006b2523 Author: Tony Luck Date: Thu May 24 10:59:44 2007 -0700 [IA64] acpi_get_sysname() should be __init Section mismatch: reference to .init.text:acpi_find_rsdp (between 'acpi_get_sysname' and 'acpi_request_vector') acpi_get_sysname() needs to call the __init function acpi_find_rsdp, but it doesn't have the __init attribute itself, hence the warning. Luckily it is only called from machvec_init() which has __init attribute, so the fix is to define acpi_get_sysname() as __init too. Signed-off-by: Tony Luck commit 4d389dcea8543161c3bb1e26f1c2ffb7e0822ff1 Author: Alan Cox Date: Wed May 23 14:43:52 2007 -0700 [WATCHDOG] clean-up watchdog documentation Random sampling of some URLs in the Documentation tree to see how many were stale found that one watchdog driver was now a porn site. In fact if the watchdogs document directory was any older it would be written in latin Clean it up somewhat and add Last reviewed headers, something all the Documentation could do with IMHO. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Wim Van Sebroeck commit c2b38989cf2b0c003a9cf57efc833ab16d33901e Author: Josef 'Jeff' Sipek Date: Thu May 24 12:21:43 2007 -0400 Documentation: Fix up docs still talking about i_sem .. it got changed to 'i_mutex' some time ago. Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Linus Torvalds commit 35729449655abcceeb3c72181e9920cf98f81c1e Author: Venki Pallipadi Date: Tue May 22 15:36:57 2007 -0700 [IA64] Cleanup acpi header to reuse the generic _PDC defines ia64 _PDC setup is defined similar to i386. So, cleanup the header to use generic _PDC defines than using specific defines in ia64. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit ce45b51ac4c3c575c71ab5c91c29bf34c2af6f7d Author: Venki Pallipadi Date: Tue May 22 15:35:24 2007 -0700 [IA64] Fix using uninitialized data in _PDC setup Silly bug in _PDC data setup. Haven't seen any real side-effects of this one yet. But, needs fixing regardless. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit 8f53b6fcc49745c19bb2dd2972185ff398160162 Author: Linus Torvalds Date: Thu May 24 10:13:43 2007 -0700 Don't call a warnign a bug. It's a warning. Change the default printout message for WARN_ON() to say what it is, not something else. I'm tired of having people get all aflutter about a warning. Signed-off-by: Linus Torvalds commit 1a93fa86bf6eb0d8bed84ef18c8b35be389edee5 Author: Linus Torvalds Date: Thu May 24 08:50:39 2007 -0700 Revert "HOWTO: bug report addition" (or "HOWTO: mention bughunting") This reverts commit 722385f75efd82d9f480f0765a1e97a4d83cac0d (or commit 3f27100872b21e4cc70d07b96eeb3611b30bce63, it's your choice ;), since the same patch to Documentation/HOWTO got added twice because it just kept applying cleanly. Noted by Qi Yong. Cc: Qi Yong Acked-by: Diego Calleja Signed-off-by: Linus Torvalds commit 92ea77275b5345c1300433f28689493dc4163f24 Author: Linus Torvalds Date: Thu May 24 08:37:14 2007 -0700 Fix crash with irqpoll due to the IRQF_IRQPOLL flag testing With irqpoll enabled, trying to test the IRQF_IRQPOLL flag in the actions would cause a NULL pointer dereference if no action was installed (for example, the driver might have been unloaded with interrupts still pending). So be a bit more careful about testing the flag by making sure to test for that case. (The actual _change_ is trivial, the patch is more than a one-liner because I rewrote the testing to also be much more readable. Original (discarded) bugfix by Bernhard Walle. Cc: Bernhard Walle Tested-by: Vivek Goyal Signed-off-by: Linus Torvalds commit d4a8f3677fe2c2fc86443254fe42825e244c194d Author: Trond Myklebust Date: Tue May 22 10:22:27 2007 -0400 NFS: Fix nfs_direct_dirty_pages() We only need to dirty the pages that were actually read in. Also convert nfs_direct_dirty_pages() to call set_page_dirty() instead of set_page_dirty_lock(). A call to lock_page() is unacceptable in an rpciod callback function. Signed-off-by: Trond Myklebust commit 749e146e01cf87ce3c1d6f6077b877471b04df5b Author: Chuck Lever Date: Sat May 19 17:22:46 2007 -0400 NFS: Fix handful of compiler warnings in direct.c This patch fixes a couple of signage issues that were causing an Oops when running the LTP diotest4 test. get_user_pages() returns a signed error, hence we need to be careful when comparing with the unsigned number of pages from data->npages. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7fe7f8487ae742239dd8c66596e2311c30d057d1 Author: Trond Myklebust Date: Sun May 20 10:18:27 2007 -0400 NFS: Avoid a deadlock situation on write When processes are allowed to attempt to lock a non-contiguous range of nfs write requests, it is possible for generic_writepages to 'wrap round' the address space, and call writepage() on a request that is already locked by the same process. We avoid the deadlock by checking if the page index is contiguous with the list of nfs write requests that is already held in our nfs_pageio_descriptor prior to attempting to lock a new request. Signed-off-by: Trond Myklebust commit 05e9ebbefb379a4da782b21b8427c88ac28a2334 Author: Sumant Patro Date: Thu May 17 05:47:51 2007 -0700 [SCSI] megaraid_sas: intercept cmd timeout and throttle io eh_timed_out call back (megasas_reset_timer) is used to throttle io to the adapter when it is called the first time for a scmd. The MEGASAS_FW_BUSY flag is set and can_queue reduced to 16. The can_queue is restored from completion routine in following two conditions : 5 seconds has elapsed and the # of outstanding cmds in FW is < 17. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 5dee9e7c4c869fcffccc3d432b755793dfa71376 Author: Marcel Holtmann Date: Thu May 24 14:27:19 2007 +0200 [Bluetooth] Fix L2CAP configuration parameter handling The L2CAP configuration parameter handling was missing the support for rejecting unknown options. The capability to reject unknown options is mandatory since the Bluetooth 1.2 specification. This patch implements its and also simplifies the parameter parsing. Signed-off-by: Marcel Holtmann commit fd184ab4283a6a6105e8312a497d2a2a193eaf67 Author: Marcel Holtmann Date: Thu May 24 14:26:15 2007 +0200 [Bluetooth] Always send HCI_Reset for Broadcom devices In case of Broadcom based Bluetooth devices, it is safe to always send HCI_Reset as first command. This gives the advantage that all HID Proxy versions will automatically work and don't need any additional quirks anymore. Signed-off-by: Marcel Holtmann commit 761e784673d79c8ea9befdad31e30c65e0d20b82 Author: Jordan Crouse Date: Thu May 24 21:23:24 2007 +1000 [CRYPTO] geode: Fix in-place operations and set key Allow in-place crypto operations. Also remove the coherent user flag (we use it automagically now), and by default use the user written key rather then the HW hidden key - this makes crypto just work without any special considerations, and thats OK, since its our only usage model. Signed-off-by: Jordan Crouse Signed-off-by: Herbert Xu commit 2761f5c2ea80bcaa77ec1827064f3aa919474ac8 Author: Russell King Date: Thu May 24 06:56:08 2007 +0200 mmc: add maintainer for ARM Primecell controller Russell King handles this driver. Signed-off-by: Russell King Signed-off-by: Pierre Ossman commit c58ff04ad10f3bf290e9457c46412b1623afad19 Author: Pavel Pisa Date: Wed May 16 01:10:41 2007 +0200 mmc: add maintainer for iMX MMC interface Pavel Pisa takes on the role of administrating this driver. Signed-off-by: Pavel Pisa Signed-off-by: Pierre Ossman commit 9f9c24f4fe1a3acff40acba9f83136bf520ac6ae Author: Syed Khasim Date: Wed May 16 01:07:22 2007 +0200 mmc: Add maintainers for TI OMAP MMC interface Carlos Aguiar and Anderson Briglia are interested in making sure the driver works for existing boards as they have access to them, and Syed Khasim can make it work for new omaps (2430, 3430). Signed-off-by: Syed Khasim Signed-off-by: Pierre Ossman commit 272f133afb20badf413228f112f2e03c84ba8a52 Author: Pierre Ossman Date: Mon May 14 21:25:26 2007 +0200 mmc: mark unmaintained drivers Most of the host controller drivers in the MMC layer lacks an official maintainer. Make sure this is mentioned in MAINTAINERS in case someone wants to pick up the ball. Signed-off-by: Pierre Ossman commit 9c9f2d63a77325bc050e4ed9255ee8270c067d1a Author: Pierre Ossman Date: Wed May 16 17:29:21 2007 +0200 mmc: clean up unused parts of block driver Remove dead code and unused structs from the block driver. Signed-off-by: Pierre Ossman commit db2668fdbeb2e3c95ebadf95856c9e31a8a8d569 Author: H. Peter Anvin Date: Wed May 23 16:59:27 2007 -0700 boot documentation: clarifications Textual clarifications (and fix an off-by-one error) based on feedback mostly from Jeremy Fitzhardinge. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit af669c97291c458c97a869bf3c36eb870e7430c1 Author: William Lee Irwin III Date: Wed May 23 13:58:23 2007 -0700 i386 bigsmp: section mismatch fixes WARNING: arch/i386/mach-generic/built-in.o(.data+0xc4): Section mismatch: reference to .init.text: (between 'apic_bigsmp' and 'cpu.4905') This appears to be resolvable by removing all the __init and __initdata qualifiers from arch/i386/mach-generic/bigsmp.c Signed-off-by: William Irwin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3c8bdfb931171d6cfd1ec23b2218b0a1f052b95 Author: Andrew Morton Date: Wed May 23 13:58:22 2007 -0700 drivers/isdn/hardware/eicon/message.c warning fixes Squash these: drivers/isdn/hardware/eicon/message.c: In function 'api_put': drivers/isdn/hardware/eicon/message.c:536: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/message.c: In function 'plci_free_msg_in_queue': drivers/isdn/hardware/eicon/message.c:1035: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'data_b3_req': drivers/isdn/hardware/eicon/message.c:3121: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c:3154: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'callback': drivers/isdn/hardware/eicon/message.c:4060: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'nl_ind': drivers/isdn/hardware/eicon/message.c:7137: warning: cast from pointer to integer of different size Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 241be8d9c4c475c66b2f60a6dddb5e416b1b2811 Author: Andrew Morton Date: Wed May 23 13:58:22 2007 -0700 capifunc warning fixes squish these: drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferSet': drivers/isdn/hardware/eicon/capifunc.c:192: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferGet': drivers/isdn/hardware/eicon/capifunc.c:197: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:198: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:200: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferFree': drivers/isdn/hardware/eicon/capifunc.c:205: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:206: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'sendf': drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c:321: warning: cast to pointer from integer of different size Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5f1b194a9afa3e686986839eb67620e6549e9ad Author: Imre Deak Date: Wed May 23 13:58:20 2007 -0700 omap_uwire: SPI_CPHA mode bugfix The omap_uwire controller driver handles SPI_CPHA incorrectly; It should mean: CPHA=0 ... sample at leading edge of clock CPHA=1 ... sample at trailing edge of clock This bug has been masked by inverse bugs in layered drivers; and was uncovered by running some of them on non-OMAP hardware. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81fc632355834b7133ec4f3341cfb171bd9edc31 Author: Jarek Poplawski Date: Wed May 23 13:58:20 2007 -0700 Documentation/memory-barriers.txt: various fixes Fix various grammatical issues in Documentation/memory-barriers.txt. Cc: "Robert P. J. Day" Signed-off-by: Jarek Poplawski Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03491c92932b8d2dab1bb298e0122ff6d39680af Author: Thomas Gleixner Date: Wed May 23 13:58:19 2007 -0700 i386: fix early usage of atomic_add_return and local_add_return on real i386 The check (boot_cpu_data.x86 == 3) in atomic_add_return() and local_add_return() fails, when those operations are used before boot_cpu_data is filled in. Change the check to (boot_cpu_data.x86 <= 3) to fix this. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98d8256739f2c6c636fa2da359f5949c739ae839 Author: Thomas Gleixner Date: Wed May 23 13:58:18 2007 -0700 Prevent going idle with softirq pending The NOHZ patch contains a check for softirqs pending when a CPU goes idle. The BUG is unrelated to NOHZ, it just was made visible by the NOHZ patch. The BUG showed up mainly on P4 / hyperthreading enabled machines which lead the investigations into the wrong direction in the first place. The real cause is in cond_resched_softirq(): cond_resched_softirq() is enabling softirqs without invoking the softirq daemon when softirqs are pending. This leads to the warning message in the NOHZ idle code: t1 runs softirq disabled code on CPU#0 interrupt happens, softirq is raised, but deferred (softirqs disabled) t1 calls cond_resched_softirq() enables softirqs via _local_bh_enable() calls schedule() t2 runs t1 is migrated to CPU#1 t2 is done and invokes idle() NOHZ detects the pending softirq Fix: change _local_bh_enable() to local_bh_enable() so the softirq daemon is invoked. Thanks to Anant Nitya for debugging this with great patience ! Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40acc095302aee380491df5f58d98945243468ec Author: Li Yang Date: Wed May 23 13:58:17 2007 -0700 ehci-fsl: fix cache coherency problem on system with large memory The patch fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=7482. It sets USB snooping on 4G space for PowerPC platforms without CONFIG_NOT_COHERENT_CACHE defined. Reported-by: Stefan Meyer Signed-off-by: Li Yang Cc: Greg KH Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d6ac9843175c1d29c075794519cb045b52e46c2 Author: Randy Dunlap Date: Wed May 23 13:58:16 2007 -0700 document clocksources Document the available clocksources per platform and move clocksource= into the correct (alpha) location in the file. Signed-off-by: Randy Dunlap Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a2731f9310a66beaf55677229ab067c85ce4fa Author: Michael Halcrow Date: Wed May 23 13:58:15 2007 -0700 eCryptfs: delay writing 0's after llseek until write Delay writing 0's out in eCryptfs after a seek past the end of the file until data is actually written. http://www.opengroup.org/onlinepubs/009695399/functions/lseek.html ``The lseek() function shall not, by itself, extend the size of a file.'' Without this fix, applications that lseek() past the end of the file without writing will experience unexpected behavior. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4acb3e2f97f41cf9b53182b494384467d3ceb304 Author: Eric Sesterhenn / Snakebyte Date: Wed May 23 13:58:15 2007 -0700 Off by one in floppy.c Another coverity patch i forgot to resend, original thread here http://marc.info/?l=linux-kernel&m=115144559823592&w=2 In case drive == N_DRIVE, we get one past the drive_params array. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa74419bb7b51af4bbb66116d14cc92f0b5aff25 Author: Nicolas Boichat Date: Wed May 23 13:58:13 2007 -0700 applesmc - sensors patch missing from 2.6.22-rc2 Add name file needed by lm_sensors user-space applications in applesmc sysfs tree. Cc: Soeren Sonnenburg Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae2d990eede0ef5938c210d48a177c044258ecd8 Author: Alan Stern Date: Wed May 23 13:58:12 2007 -0700 HiSax: fix error checking for hisax_register()] This patch (as875) adds error-checking to the callers of hisax_register(). It also changes an error pathway in that routine, making it return an error code rather than 0. This fixes Bugzilla #7960. Signed-off-by: Alan Stern Acked-by: Karsten Keil Cc: Martin Bachem Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d9a2000e683ecd497b65d5f3e73b048c68976e1 Author: Domenico Andreoli Date: Wed May 23 13:58:11 2007 -0700 documentation: Documentation/initrd.txt Final clearification of the pivot_root mechanism, which brings this document really up-to-date. Signed-off-by: Domenico Andreoli Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a778b73ff793d34c0082f76110f73a7754915067 Author: NeilBrown Date: Wed May 23 13:58:10 2007 -0700 md: fix bug with linear hot-add and elsewhere Adding a drive to a linear array seems to have stopped working, due to changes elsewhere in md, and insufficient ongoing testing... So the patch to make linear hot-add work in the first place introduced a subtle bug elsewhere that interracts poorly with older version of mdadm. This fixes it all up. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab6085c795a71b6a21afe7469d30a365338add7a Author: NeilBrown Date: Wed May 23 13:58:10 2007 -0700 md: don't write more than is required of the last page of a bitmap It is possible that real data or metadata follows the bitmap without full page alignment. So limit the last write to be only the required number of bytes, rounded up to the hard sector size of the device. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 787f17feb204ed1c6331892fb8124b80dc9fe288 Author: NeilBrown Date: Wed May 23 13:58:09 2007 -0700 md: avoid overflow in raid0 calculation with large components If a raid0 has a component device larger than 4TB, and is accessed on a 32bit machines, then as 'chunk' is unsigned long, chunk << chunksize_bits can overflow (this can be as high as the size of the device in KB). chunk itself will not overflow (without triggering a BUG). So change 'chunk' to be 'sector_t, and get rid of the 'BUG' as it becomes impossible to hit. Cc: "Jeff Zheng" Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dbf37e8adf1ab6b82a510d5e69fa676ed9717c4 Author: Stefan Richter Date: Wed May 23 13:58:08 2007 -0700 i386, x86-64: show that CONFIG_HOTPLUG_CPU is required for suspend on SMP It's not sufficiently documented that CONFIG_HOTPLUG_CPU is required for suspend/hibernation on SMP. Point out the non-obvious. Signed-off-by: Stefan Richter Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82cd0e8410ae74d3fd39d168049381eafc489e5b Author: Akinobu Mita Date: Wed May 23 13:58:07 2007 -0700 i2o: eliminate a peculiar constraint on i2o_max_drivers There is no reason i2o_max_drivers must be a power of two. This patch eliminates such a constraint. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be324797d9b2a10f767e89dfbd880c735249bef9 Author: Akinobu Mita Date: Wed May 23 13:58:06 2007 -0700 i2o: fix notifiers when max_drivers is configured Maximum number of I2O drivers which could be registered is configurable by max_drivers module parameter. But the module parameter is ignored and default value (I2O_MAX_DRIVERS = 8) is used in the loops to notify all registered drivers. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e578e9a1cc8a5983d87126d5877e305d3189f1b9 Author: Akinobu Mita Date: Wed May 23 13:58:05 2007 -0700 i2o: destroy event queue only when drv->event is set i2o_driver_register() initalizes event queue for driver only when drv->event is set. So similarly the event queue should be destroyed only when drv->event is set in the error path. Otherwise destroy_workqueue() will called with NULL. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3762bfc8d046342db664d855f8f875e8a4c2ca1 Author: Davi Arnaut Date: Wed May 23 13:58:04 2007 -0700 signalfd: retrieve multiple signals with one read() call Gathering signals in bulk enables server applications to drain a signal queue (almost full of realtime signals) more efficiently by reducing the syscall and file look-up overhead. Very similar to the sigtimedwait4() call described by Niels Provos, Chuck Lever, and Stephen Tweedie in a paper entitled "Analyzing the Overload Behavior of a Simple Web Server". The paper lists more details and advantages. Signed-off-by: Davi E. M. Arnaut Acked-by: Davide Libenzi Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0532cb427ed2a5957d39e98cb5a4741b68fc6102 Author: Randy Dunlap Date: Wed May 23 13:58:03 2007 -0700 update dontdiff file Update dontdiff file by adding entries from many .gitignore files. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6373da1fb719f167c775c96015b0553507c34a18 Author: OGAWA Hirofumi Date: Wed May 23 13:58:00 2007 -0700 power: Fix sizeof(PAGE_SIZE) typo Fix sizeof(PAGE_SIZE) typo. It should be just PAGE_SIZE for zeroing the swsusp_header. Signed-off-by: OGAWA Hirofumi Signed-off-by: OGAWA Hirofumi Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8511f94908a92337b80f0c12342b9051232054f Author: Jiri Slaby Date: Wed May 23 13:57:59 2007 -0700 Misc: phantom, take care of pci posting phantom, take care of pci posting thanks to akpm for pointing this out Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c15395c0dbdd646ca80945a7578c8c6cd44ce942 Author: Jiri Slaby Date: Wed May 23 13:57:58 2007 -0700 phantom: move to unlocked_ioctl phantom's ioctl is often (4000 times a sec or so) invoked, don't acquire BKL and block other processes. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14441960e8c27a64487e0b455b323e784f33583f Author: Oleg Nesterov Date: Wed May 23 13:57:57 2007 -0700 simplify cleanup_workqueue_thread() cleanup_workqueue_thread() and cwq_should_stop() are overcomplicated. Convert the code to use kthread_should_stop/kthread_stop as was suggested by Gautham and Srivatsa. In particular this patch removes the (unlikely) busy-wait loop from the exit path, it was a temporary and ugly kludge (if not a bug). Note: the current code was designed to solve another old problem: work->func can't share locks with hotplug callbacks. I think this could be done, see http://marc.info/?l=linux-kernel&m=116905366428633 but this needs some more complications to preserve CPU affinity of cwq->thread during cpu_up(). A freezer-based hotplug looks more appealing. [akpm@linux-foundation.org: make it more tolerant of gcc borkenness] Signed-off-by: Oleg Nesterov Cc: Zilvinas Valinskas Cc: Gautham R Shenoy Cc: Srivatsa Vaddagiri Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fcbc72965f767bb5c4518aef754c28f45fc6147 Author: Jiri Slaby Date: Wed May 23 13:57:56 2007 -0700 Char: cyclades, fix deadlock An omitted unlock. Signed-off-by: Jiri Slaby Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33e9e24101abac2bf3535d0d013d6d27d19197cb Author: Christoph Lameter Date: Wed May 23 13:57:56 2007 -0700 SLUB Debug: fix check for super sized slabs (>512k 64bit, >256k 32bit) The check for super sized slabs where we can no longer move the free pointer behind the object for debugging purposes etc is accessing a field that is not setup yet. We must use objsize here since the size of the slab has not been determined yet. The effect of this is that a global slab shrink via "slabinfo -s" will show errors about offsets being wrong if booted with slub_debug. Potentially there are other troubles with huge slabs under slub_debug because the calculated free pointer offset is truncated. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 418508c13222ddba475873ea95c8aeadd26104f2 Author: Miklos Szeredi Date: Wed May 23 13:57:55 2007 -0700 fix unused setup_nr_node_ids mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used This is now the only (!) compiler warning I get in my UML build :) Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ead5f0b5fa41dd3649a44bfc922d06641ff3dbcf Author: Miklos Szeredi Date: Wed May 23 13:57:54 2007 -0700 fuse: delete inode on drop When inode is dropped (no more references) delete it from cache. There's not much point in keeping it cached, when a new lookup will refresh the attributes anyway. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 889f784831d6cc9125a74eb55a5641f95635a204 Author: Miklos Szeredi Date: Wed May 23 13:57:54 2007 -0700 fuse: generic_write_checks() for direct_io This fixes O_APPEND in direct IO mode. Also checks writes against file size limits, notably rlimits. Reported by Greg Bruno. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 492c8b332e3af279ffadf49b85967d5e43810923 Author: Christoph Hellwig Date: Wed May 23 13:57:53 2007 -0700 uselib: add missing MNT_NOEXEC check We don't allow loading ELF shared library from noexec points so the same should apply to sys_uselib aswell. Signed-off-by: Christoph Hellwig Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a1b63914815e4223ceb3d079286e18f9ee92b4b Author: David Woodhouse Date: Wed May 23 13:57:52 2007 -0700 Missing 'const' from reiserfs MIN_KEY declaration. In stree.c, MIN_KEY is declared const. The extern declaration in dir.c doesn't match... Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 772dce71f5468d97143aef74be04e34faa712d48 Author: Sascha Hauer Date: Wed May 23 13:57:52 2007 -0700 imxfb: fix memory hole info->pseudo_palette was previously kmalloced. Do not overwrite it afterwards Signed-off-by: Sascha Hauer Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90e16dddecc6bd804920b639f61825d2a1769f89 Author: Sascha Hauer Date: Wed May 23 13:57:51 2007 -0700 imxfb: remove ifdefs Here are some small fixes for the imxfb framebuffer driver: - remove ifndef for MX1FS2 platform which is not present in the kernel. - REV, CLS, PS and SPL_SPR are only needed with some sharp displays. Only setup the corresponding io pins when such a display is connected. Signed-off-by: Sascha Hauer Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92c4579dbb3bc70bd397e272258c69f88de189b8 Author: Geert Uytterhoeven Date: Wed May 23 13:57:50 2007 -0700 ps3fb: use FB_SYS_* instead of FB_CFB_* ps3fb: Use the FB_SYS_* operations instead of the FB_CFB_* operations as the actual frame buffer memory is part of system RAM Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a01fbbd52e4faf5971856c011e87ec6571b62840 Author: Richard Purdie Date: Wed May 23 13:57:49 2007 -0700 w100fb: fix compile warnings Fix compile warnings from w100fb.c. Attribute registration failure doesn't stop the driver working so just warn about it. Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2686ba894bfedcacbe1b5197c574f3f1e66f2fda Author: Krzysztof Helt Date: Wed May 23 13:57:48 2007 -0700 pm3fb: various fixes - fix 16-bit RGBA 4444 and 5551 modes (use fbset -rgba to set them) - kill wmb() after each register write by PM3_SLOW_WRITE_REG - kill inaccurate comments (leftovers from skeletonfb.c) - kill PCI class restriction, now it is more general and shorter - white spaces and other minor fixes and source reducing Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d1a62c596023991e860f1814aacb12a5169aa9 Author: Krzysztof Helt Date: Wed May 23 13:57:47 2007 -0700 pm2fb: RDAC_WR barriers clean up This patch fixes a possible barriers problem in RDAC_WR functions, then remove redudant ones. It also removes one unneeded register load from blitter function(). Signed-off-by: Krzysztof.Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d74c1fdaaea34b56c1dffe2c79f64d2c53c11b1 Author: Krzysztof Helt Date: Wed May 23 13:57:46 2007 -0700 fbdev: cleanup of sparc FB options This patch puts all SBUS/UPA selection under one option "SBUS/UPA framebuffers" and moves all sparc specific drivers next to them in one group. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bea3f29fc626e190f012c4ad5f8a9e9a2f26cf6 Author: Florin Malita Date: Wed May 23 13:57:45 2007 -0700 spi: potential memleak in spidev_ioctl 'ioc' should be deallocated if __copy_from_user fails (found by Coverity - CID 1644). Signed-off-by: Florin Malita Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6087b2dab2c914268b1a50882edbbad82bfefd29 Author: Badari Pulavarty Date: Wed May 23 13:57:45 2007 -0700 optimize compat_core_sys_select() by a using stack space for small fd sets Optimize select by a using stack space for small fd sets. core_sys_select() already has this optimization. This is for compat version. Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bb44adef39ad3bda2be40bb34686bc56bd563a5 Author: Roland McGrath Date: Wed May 23 13:57:44 2007 -0700 recalc_sigpending_tsk fixes Steve Hawkes discovered a problem where recalc_sigpending_tsk was called in do_sigaction but no signal_wake_up call was made, preventing later signals from waking up blocked threads with TIF_SIGPENDING already set. In fact, the few other calls to recalc_sigpending_tsk outside the signals code are also subject to this problem in other race conditions. This change makes recalc_sigpending_tsk private to the signals code. It changes the outside calls, as well as do_sigaction, to use the new recalc_sigpending_and_wake instead. Signed-off-by: Roland McGrath Cc: Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c6df2a9177c010bf811c361149069e4bfd9bb11 Author: Ben Collins Date: Wed May 23 13:57:43 2007 -0700 Avoid zero size allocation in cache_k8_northbridges() kmalloc for flush_words resulted in zero size allocation when no k8_northbridges existed. Short circuit the code path for this case. Also remove uneeded zeroing of num_k8_northbridges just after checking if it is zero. Signed-off-by: Ben Collins Cc: Andi Kleen Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6754bb4de94098a0aaa23a600f0edb9a9454c252 Author: Robert P. J. Day Date: Wed May 23 13:57:42 2007 -0700 Documentation: fix the explanation of Kconfig files Fix the obvious errors in the explanation of Kconfig files. Signed-off-by: Robert P. J. Day Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9aaffc898ff4a3df18c5fc4b9e0fa47e779ad726 Author: Paul E. McKenney Date: Wed May 23 13:57:41 2007 -0700 prohibit rcutorture from being compiled into the kernel There have been a number of instances where people have accidentally compiled rcutorture into the kernel (CONFIG_RCU_TORTURE_TEST=y), which has never been useful, and has often resulted in great frustration. The attached patch prohibits rcutorture from being compiled into the kernel. It may be excluded altogether or compiled as a module. People wishing to have rcutorture hammer their machine immediately upon boot are free to hand-edit lib/Kconfig.debug to remove the "depends on m" line. Thanks to Randy Dunlap for the trick that makes this work. Signed-off-by: Paul E. McKenney Acked-by: Josh Triplett Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf6acedbeac17dea1c1eed85048a72e188f3f768 Author: Jeff Dike Date: Wed May 23 13:57:40 2007 -0700 uml: improve PTRACE_SYSEMU checking Make the PTRACE_SYSEMU checking more robust. It will make sure that system call numbers are reported correctly. If there is a problem, it will disable PTRACE_SYSEMU use and use PTRACE_SYSCALL instead. Thanks to Balaji G for helping reproduce this problem. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da90fa8ff671a0139772ec3b3e82c06077e82122 Author: Domen Puncer Date: Wed May 23 13:57:39 2007 -0700 spi/spidev: check message size before copying Message size needs to be checked before copying, or bad things could happen. Signed-off-by: Domen Puncer Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7add02d6247bff34005e040347d81777c80931c Author: Andrew Morton Date: Wed May 23 13:57:39 2007 -0700 capability.h warning fix include/linux/capability.h:397: warning: "struct task_struct" declared inside parameter list include/linux/capability.h:397: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ce7ad7b2d11fae2c3d285a6a0caea9322c0b8fc Author: Kristen Carlson Accardi Date: Wed May 23 13:57:38 2007 -0700 genhd: send async notification on media change Send an uevent to user space to indicate that a media change event has occurred. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86ce18d7b7925bfd6b64c061828ca2a857ee83b8 Author: Kristen Carlson Accardi Date: Wed May 23 13:57:38 2007 -0700 genhd: expose AN to user space Allow user space to determine if a disk supports Asynchronous Notification of media changes. This is done by adding a new sysfs file "capability_flags", which is documented in (insert file name). This sysfs file will export all disk capabilities flags to user space. We also define a new flag to define the media change notification capability. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 352823160613b65fdaa558be486720a71f75ed86 Author: Thomas Gleixner Date: Wed May 23 13:57:37 2007 -0700 NOHZ: Rate limit the local softirq pending warning output The warning in the NOHZ code, which triggers when a CPU goes idle with softirqs pending can fill up the logs quite quickly. Rate limit the output until we found the root cause of that problem. Signed-off-by: Thomas Gleixner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43d4f961a87509b4ea5c1d6f02751aef360a632f Author: David Brownell Date: Wed May 23 13:57:36 2007 -0700 spi doc update: describe clock mode bits Update the SPI documentation to cover a few points that have proven to be confusing or unclear; most notably the two clock mode bits. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8888735fcaac7681dbcca67fbcc88cf627c47b3a Author: Domen Puncer Date: Wed May 23 13:57:32 2007 -0700 mpc52xx_psc_spi: fix it for CONFIG_PPC_MERGE Fix mpc5200 PSC SPI driver to actually work for CONFIG_PPC_MERGE - s/mpc52xx/mpc5200/, as this was changed in device tree some time ago - fix spi id detection The move from 'ppc' to 'powerpc' didn't quite match the latest kernel.org code. Signed-off-by: Domen Puncer Acked-by: Dragos Carp Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9ba347f27f2508e3da023688d047e111cbbe2da Author: Miklos Szeredi Date: Wed May 23 13:57:32 2007 -0700 fuse: fix mknod of regular file The wrong lookup flag was tested in ->create() causing havoc (error or Oops) when a regular file was created with mknod() in a fuse filesystem. Thanks to J. Cameijo Cerdeira for the report. Kernels 2.6.18 onward are affected. Please apply to -stable as well. Signed-off-by: Miklos Szeredi Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c12b3c62513ecf95c979d5c1785f99562b9dd10d Author: Christoph Lameter Date: Wed May 23 13:57:31 2007 -0700 SLUB Debug: Fix object size calculation The object size calculation is wrong if !CONFIG_SLUB_DEBUG because the #ifdef CONFIG_SLUB_DEBUG is now switching off the size adjustments for DESTROY_BY_RCU and ctor. Signed-off-by: Christoph Lameter Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72fcde966252abd17d70e4e216a0411a34523a8f Author: Thomas Gleixner Date: Wed May 23 13:57:30 2007 -0700 Ignore bogus ACPI info for offline CPUs Booting a SMP kernel with maxcpus=1 on a SMP system leads to a hard hang, because ACPI ignores the maxcpus setting and sends timer broadcast info for the offline CPUs. This results in a stuck for ever call to smp_call_function_single() on an offline CPU. Ignore the bogus information and print a kernel error to remind ACPI folks to fix it. Signed-off-by: Thomas Gleixner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88f18ba028b5939bb6f77bd690e5ad8d01bb24cc Author: Gautham R Shenoy Date: Wed May 23 13:57:29 2007 -0700 freezer: move frozen_process() to kernel/power/process.c Other than refrigerator, no one else calls frozen_process(). So move it from include/linux/freezer.h to kernel/power/process.c. Also, since a task can be marked as frozen by itself, we don't need to pass the (struct task_struct *p) parameter to frozen_process(). Signed-off-by: Gautham R Shenoy Signed-off-by: Rafael J. Wysocki Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fcc57f2d5d558056668159f9153bf21d2c53d16 Author: Gautham R Shenoy Date: Wed May 23 13:57:28 2007 -0700 freezer: fix PF_NOFREEZE vs freezeable race This patch fixes the race pointed out by Oleg Nesterov. * Freezer marks a thread as freezeable. * The thread now marks itself PF_NOFREEZE, but it will be frozen on on calling try_to_freeze(). Thus the task is frozen, even though it doesn't want to. * Subsequent thaw_processes() will also fail to thaw the task since it is marked PF_NOFREEZE. Avoid this problem by checking the task's PF_NOFREEZE status in frozen_processes() before marking the task as frozen. Signed-off-by: Gautham R Shenoy Signed-off-by: Rafael J. Wysocki Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a076e4bca2fdabb9e45d86722cc72c0944da5f94 Author: Oleg Nesterov Date: Wed May 23 13:57:27 2007 -0700 freezer: fix kthread_create vs freezer theoretical race kthread() sleeps in TASK_INTERRUPTIBLE state waiting for the first wakeup. In theory, this wakeup may come from freeze_process()->signal_wake_up(), so the task can disappear even before kthread_create() sets its ->comm. Change kthread() to use TASK_UNINTERRUPTIBLE. [akpm@linux-foundation.org: s/BUG_ON/WARN_ON+recover] Signed-off-by: Oleg Nesterov Acked-by: "Eric W. Biederman" Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49b12d4f5e274517b8bc032d507abf31cc2f4150 Author: Rafael J. Wysocki Date: Wed May 23 13:57:26 2007 -0700 freezer: take kernel_execve into consideration Kernel threads can become userland processes by calling kernel_execve(). In particular, this may happen right after the try_to_freeze_tasks() called with FREEZER_USER_SPACE has returned, so try_to_freeze_tasks() needs to take userspace processes into consideration even if it is called with FREEZER_KERNEL_THREADS. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba96a0c88098697a63e80157718b7440414ed24d Author: Rafael J. Wysocki Date: Wed May 23 13:57:25 2007 -0700 freezer: fix vfork problem Currently try_to_freeze_tasks() has to wait until all of the vforked processes exit and for this reason every user can make it fail. To fix this problem we can introduce the additional process flag PF_FREEZER_SKIP to be used by tasks that do not want to be counted as freezable by the freezer and want to have TIF_FREEZE set nevertheless. Then, this flag can be set by tasks using sys_vfork() before they call wait_for_completion(&vfork) and cleared after they have woken up. After clearing it, the tasks should call try_to_freeze() as soon as possible. Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33e1c288da62a6a5aa9077a6b7bfa690b1b02cf4 Author: Rafael J. Wysocki Date: Wed May 23 13:57:24 2007 -0700 freezer: close potential race between refrigerator and thaw_tasks If the freezing of tasks fails and a task is preempted in refrigerator() before calling frozen_process(), then thaw_tasks() may run before this task is frozen. In that case the task will freeze and no one will thaw it. To fix this race we can call freezing(current) in refrigerator() along with frozen_process(current) under the task_lock() which also should be taken in the error path of try_to_freeze_tasks() as well as in thaw_process(). Moreover, if thaw_process() additionally clears TIF_FREEZE for tasks that are not frozen, we can be sure that all tasks are thawed and there are no pending "freeze" requests after thaw_tasks() has run. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7f7c31c98830e5f4aa5486b8aabb7f3bf4a2512 Author: Steve French Date: Thu May 24 02:29:51 2007 +0000 [CIFS] typo in previous patch (also fixed missing space after if) Signed-off-by: Steve French commit 585a2858b970cb6e2e5ca4877eefd18b4dba8ed4 Author: Andrew Morton Date: Thu May 24 02:42:39 2007 +0200 ide serverworks warning fixes gcc-4.3: drivers/ide/pci/serverworks.c: In function 'svwks_tune_chipset': drivers/ide/pci/serverworks.c:176: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:190: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:211: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:212: warning: overflow in implicit constant conversion Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 5a6248cac22a77588f81c7473cfd03d250cc5b56 Author: Junio C Hamano Date: Thu May 24 02:42:38 2007 +0200 Match DMA blacklist entries between ide-dma.c and libata-core.c There are a few entries in ata_device_blacklist[] in libata-core.c marked with HORKAGE_NODMA but are missing from drive_blacklist[] in ide-dma.c. This patch makes the lists in sync. Also remove a duplicated entry for "SanDisk SDP3B-64". Signed-off-by: Junio C Hamano Cc: Alan Cox Cc: Dave Jones Signed-off-by: Bartlomiej Zolnierkiewicz commit 39c98c421200e7bb16bed7aab2b640b43ca6621b Author: Mika Kukkonen Date: Thu May 24 02:42:38 2007 +0200 Add two missing chipsets to drivers/ide/ide-proc.c Compiling with '-Wswitch-enum' I noticed following: CC drivers/ide/ide-proc.o drivers/ide/ide-proc.c: In function ‘proc_ide_read_imodel’: drivers/ide/ide-proc.c:54: warning: enumeration value ‘ide_etrax100’ not handled in switch drivers/ide/ide-proc.c:54: warning: enumeration value ‘ide_acorn’ not handled in switch How about the following patch? Signed-off-by: Mika Kukkonen Signed-off-by: Bartlomiej Zolnierkiewicz commit 2074a106f52b6371885afbd714e929d60d0e3f64 Author: Alan Cox Date: Thu May 24 02:42:38 2007 +0200 ide/pci/serverworks.c: Fix corruption/timeouts with MegaIDE It turns out from customer reports to Red Hat and some PCI dumps that the MegaIDE in RAID mode doesn't provide the drive tuning data that the serverworks driver expects but sometimes does provide something that fools the code. For the RAID class case skip the oem setup and don't trust the BIOS data. We then tune from scratch and this sorts it out. (This has been confirmed on an afflicted IBM blade) [libata serverworks.c never trusts the BIOS in the first place so is accidentally immune] Signed-off-by: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 6c6a2a8d201b4f8fd54167802da5ddbe08abd744 Author: Henry Su Date: Thu May 24 02:42:37 2007 +0200 add the IDE device ID for ATI SB700 Add the IDE device ID to atiixp_pci_tbl struct in atiixp.c for ATI SB700. From: Henry Su Signed-off-by: Luugi Marsan Signed-off-by: Bartlomiej Zolnierkiewicz commit d86ebd140963e50238ac397074b1ab7fc7ec1126 Author: Tony Luck Date: Wed May 23 16:46:40 2007 -0700 [IA64] start_secondary() and smp_callin() should be __cpuinit Continuing the seemingly neverending quest to stomp out "Section mismatch" warnings. Signed-off-by: Tony Luck commit 02d89b87081f516ad3993637f9b75db0d9786554 Author: Roland Dreier Date: Wed May 23 15:16:08 2007 -0700 IB/mlx4: Don't allocate RQ doorbell if using SRQ If a QP is attached to a shared receive queue (SRQ), then it doesn't have a receive queue (RQ). So don't allocate an RQ doorbell (or map a doorbell from userspace for userspace QPs) for that QP. Signed-off-by: Roland Dreier commit 58da10bb3fe680a197e83d5eccb5265a721c98e2 Author: Kumar Gala Date: Wed May 23 09:51:46 2007 -0500 [POWERPC] Fix Kconfig warning Fix config warning related to select usage: drivers/macintosh/Kconfig:117:warning: 'select' used by config symbol 'PMAC_APM_EMU' refers to undefined symbol 'SYS_SUPPORTS_APM_EMULATION' Signed-off-by: Kumar Gala commit 28356a1679006b110215596e057f304ef3083922 Author: Steve French Date: Wed May 23 14:45:36 2007 +0000 [CIFS] Fix oops on failed cifs mount (in kthread_stop) If the cifs demultiplex thread wakes up and exits (zeroing server->tsk) before kthread_stop is called, the cifs_mount code could pass a null pointer to kthread_stop Thanks to akpm, Dave Young and Shaggy for suggesting earlier versions of this patch. CC: akpm@linux-foundatior.org Signed-off-by: Dave Young Signed-off-by: Dave Kleikamp Signed-off-by: Steve French commit c1c9889a3860028b3578b98c3a56bdf0dd658920 Author: Kumar Gala Date: Wed May 23 07:59:06 2007 -0500 [PPC] Fix modpost warning Mark pte_alloc_one_kernel as __init_refok to fix the following warning: WARNING: arch/ppc/mm/built-in.o(.text+0x1114): Section mismatch: reference to .init.text:early_get_page (between 'pte_alloc_one_kernel' and 'v_mapped_by_tlbcam') Signed-off-by: Kumar Gala commit f1aed92464def83fc3677cade823cad71cf5f0d4 Author: Kumar Gala Date: Wed May 23 07:49:37 2007 -0500 [POWERPC] Fix modpost warning Mark pte_alloc_one_kernel as __init_refok to fix the following warning: WARNING: arch/powerpc/mm/built-in.o(.text+0x1068): Section mismatch: reference to .init.text:early_get_page (between 'pte_alloc_one_kernel' and 'steal_context') Signed-off-by: Kumar Gala commit 405861a0429113f8e426092af09dd05ec6209410 Author: Li Yang Date: Wed May 23 11:28:03 2007 +0800 [POWERPC] Fix Section mismatch warnings This patch fix the following Section mismatch warnings in powerpc code. WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.data:mv643xx_eth_pd_devs from .text between 'mv643xx_eth_add_pds' (at offset 0x9ed2) and 'gg2_read_config' WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.data:mv643xx_eth_pd_devs from .text between 'mv643xx_eth_add_pds' (at offset 0x9ed6) and 'gg2_read_config' WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.text:note_scsi_host from __ksymtab between '__ksymtab_note_scsi_host' (at offset 0x8) and '__ksymtab_sys_ctrler' Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 90c615bc42886f23a6112733a949d0f6fbe343b6 Author: Timur Tabi Date: Wed May 23 07:23:55 2007 -0500 [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST The UCC_GETH Kconfig option in drivers/net/Kconfig had a line to select the UCC_FAST option is arch/powerpc/sysdev/qe_lib/Kconfig, which is only used on PowerPC builds. On other architectures, this would generated a warning. The fix is to have UCC_FAST depend on UCC_GETH. Signed-off-by: Timur Tabi Signed-off-by: Andrew Morton Signed-off-by: Kumar Gala commit f2fb9eb3482c9ab3cca84cf0c80f646ce9aeb4de Author: Domen Puncer Date: Mon May 21 08:56:00 2007 +0200 [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic) Unbreak lite5200 dts, which were broken by 5c1992f83304cf2d56934dd6c06709b96e1b0c81 Signed-off-by: Domen Puncer Acked-by: Sylvain Munaut Signed-off-by: Kumar Gala commit fa91d43b914b77637653d984416e17e182f7b807 Author: Tony Lindgren Date: Fri May 4 18:23:24 2007 -0700 USB: Add support for Olimex arm-usb-ocd JTAG interface serial port This patch adds support for the serial port on Olimex arm-usb-ocd JTAG interface. The device appears as two serial ports, but the first one is reserved for the JTAG interface. The JTAG interface can be used with OpenOCD from userspace. For more information, please see: http://openocd.berlios.de/web/ http://www.olimex.com/dev/arm-usb-ocd.html Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman commit 5b7da8f6ff1aaf5a500dc798f4d1c2d6e98420a5 Author: Danny Budik Date: Fri May 4 16:09:37 2007 -0400 USB: Add support for Sierra Wireless Aircard 595U This patch adds support for the newly released Aircard 595U EVDO modem to the Sierra Wireless driver (sierra.c) in kernel 2.6.21. I suspect that my mailer may be mangling patches so let me know and I'll try to resend it. From: Danny Budik Signed-off-by: Greg Kroah-Hartman commit 9d33efd9a791041bbe3a9e879925ef8fbb94d812 Author: Oliver Neukum Date: Fri May 4 09:23:40 2007 +0200 USB: ldusb bugfix This patch fixes a problem reported with consecutive reads in the ldusb driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 2adb80e9c52f35a4d63783b98d48386c38c90484 Author: Guido Scholz Date: Tue May 8 19:52:41 2007 +0200 USB: ftdi_sio: Add USB Product Id for OpenDCC USB product id registration for the OpenDCC (www.opendcc.de) model railway central unit. Applies to 2.6.21.1. Signed-off-by: Guido Scholz Signed-off-by: Greg Kroah-Hartman commit d4b7d8e8024a33d9d1f916379eaee7aa945a7c48 Author: Alan Stern Date: Tue May 22 11:48:17 2007 -0400 USB: fix ratelimit call semantics This patch (as910) fixes a ratelimit modification so that the original error-handling path will be followed even when the log-rate limitation kicks in. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit dd865571d7af06ba1285c2db85083649193cceab Author: Alan Stern Date: Tue May 22 11:38:19 2007 -0400 USB: handle errors in power/level attribute This patch (as906) improves the error handling for the USB power/level attribute file. If an error occurs, the original power-level settings will be restored. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7ed92f1a149dddc3cb537ccd7441e98adac12c3e Author: Alan Stern Date: Tue May 22 09:38:39 2007 -0400 USB: make the autosuspend workqueue thread freezable This patch (as881b) makes the ksuspend_usb_wq workqueue freezable. We don't want a rogue workqueue thread running around, unexpectedly suspending or resuming USB devices in the middle of a system sleep transition. This fixes Bugzilla #8498. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8ab5e8c0ca55c4b40d254f7043a9052345fcd343 Author: Andrey Borzenkov Date: Sat May 19 14:23:28 2007 -0700 USB: Fix USB OHCI Subvendor for Toshiba Portege 4000 This fixes a bug in an OHCI quirk handler for Portege 4000; the Subvendor is 0x1179 (PCI_VENDOR_ID_TOSHIBA) not 0x102f (PCI_VENDOR_ID_TOSHIBA_2) bugid 8510 00:02.0 USB Controller [0c03]: ALi Corporation USB 1.1 Controller [10b9:5237] (rev 03) (prog-if 10 [OHCI]) Subsystem: Toshiba America Info Systems Unknown device [1179:0004] Flags: bus master, medium devsel, latency 64, IRQ 11 Memory at f7eff000 (32-bit, non-prefetchable) [size=4K] Capabilities: Signed-off-by: Andrey Borzenkov Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bdc4abdd0960e7ca946f4ec93b4cf7a2b826b24f Author: Pete Zaitcev Date: Mon May 21 20:52:44 2007 -0700 USB: usblp: Use correct DMA address in case of probe error Looks like the error path had a copy-paste error. The normal exit path uses correct URB already. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit b268f484f9d7ce91301091e0fb2c80e9e8caa3df Author: Jan Engelhardt Date: Thu May 17 17:16:44 2007 +0200 USB: Fix debug output of ark3116 Fix debug output. Previously, it would output "0xFFFFFFB0" on 32-bit archs (and probably "0xFFFFFFFFFFFFFFB0" on 64-bits), because buf is taken as signed char, which is promoted to signed int, while %x always expects an unsigned int. Signed-off-by: Jan Engelhardt Signed-off-by: Greg Kroah-Hartman commit 09b7002d68cfa1c45cc413a0c7cca399c25a57c6 Author: Dmitry Torokhov Date: Tue May 8 00:31:30 2007 -0400 USB: Onetouch - switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 57a21c1b929450b1e020c0a03cca6fa7448f4222 Author: Alan Stern Date: Tue May 15 17:40:37 2007 -0400 USB: don't try to kzalloc 0 bytes This patch (as907) prevents us from trying to allocate 0 bytes when an interface has no endpoint descriptors. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b89ee19ae6c0b5a0d9facca780b53959fbadd123 Author: Alan Stern Date: Fri May 11 10:19:04 2007 -0400 USB: remove short initial timeout for device descriptor fetch This patch (as905) removes a micro-optimization from the hub port initialization code. Previously we had been using a short timeout on the first attempt the read the device descriptor; now we will use the standard timeout length. It's not clear that the short timeout ever provided any benefit. And now we know of one case where it actually hurts: The device can't meet the short timeout and then it gets terminally confused. This fixes Bugzilla #8444. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d984abc97e400d68a09729b80060fe0ec591eb16 Author: Pete Zaitcev Date: Fri May 11 22:00:29 2007 -0700 USB: Deref URB after usbmon is done with it I haven't personally run across an oops because of this, but I feel safer with this fix in place. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9a03095831e839959175379bfdd88e6e1a93b9ea Author: Ben Collins Date: Wed May 16 16:49:54 2007 -0400 USB: Remove duplicate IDs from option card driver Cc: Matthias Urlichs Signed-off-by: Ben Collins Signed-off-by: Greg Kroah-Hartman commit be23edf848b14d1b426c12f2f58e4949c4fbd695 Author: Andrew Morton Date: Thu May 10 23:04:14 2007 -0700 USB: auerswald: fix file release handler If this down_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit fcbd963912acc0c5d51bb27f8654f2a91fcff322 Author: Li Yang Date: Sat Apr 28 14:07:32 2007 +0800 USB: fsl_usb2_udc: Fix UMTI_WIDE support and a compile warning Change PORT_WIDTH bit for UMTI_WIDE mode and fix a compile warning introduced in last revision. Signed-off-by: Li Yang Signed-off-by: Greg Kroah-Hartman commit 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa Author: Alan Stern Date: Mon Apr 23 17:30:32 2007 -0400 USB: set the correct Interrupt interval in usb_bulk_msg This patch (as902) fixes a mistake I introduced into usb_bulk_msg(). usb_fill_int_urb() already does the bit-shifting calculation for high-speed Interrupt intervals; it shouldn't be done twice. Signed-off-by: Alan Stern commit 762e92fa1742007dedd90ff6b1ea74842f0cd34b Author: Neil \"Superna\" ARMSTRONG Date: Wed Apr 25 20:34:28 2007 +0200 USB: New device PID for ftdi_sio driver Hello, I need to use MaxStream's PKG-U modules which includes a ftdi sio chipset for usb2serial communication, here are the patches for handling Maxstream's modules. The VID & PID to use with the open-source driver are provided on the CD-ROM bundled with the modules. From: Neil Superna ARMSTRONG Signed-off-by: Greg Kroah-Hartman commit bf87ce5a06ed2cb13ad04f065706cf36ab021549 Author: Alan Stern Date: Thu Apr 5 16:07:44 2007 -0400 USB: remove unneeded WARN_ON This patch (as883) removes an out-of-date WARN_ON from the main HCD endpoint-disable routine. The warning is triggered whenever an endpoint is disabled while the root hub is suspended. In the past that may not have been legal, but it definitely is legal now. Merely unbinding a USB driver will do it. Furthermore, I've never seen any occurrences of this warning that really did signal an actual bug or error condition. At this point it has outlived its purpose. Signed-off-by: Alan Stern Signed-off-by: David Brownell commit ef7f6c7084b333c7524dcd297e0578d43733a2a2 Author: Alan Stern Date: Thu Apr 5 16:03:49 2007 -0400 USB: more autosuspend timer stuff This patch (as879) ties up some loose ends from an earlier patch. These are things I didn't think to include at the time but which clearly belonged there. If an autosuspend fails because driver activity races with the autosuspend call, restart the autosuspend timer. When a device is resumed by an external request, it counts as device activity and should update the last_busy time so that the next autoresume won't occur immediately. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4fe5354f61cad4c0550285283c83c66c070c198e Author: Alan Stern Date: Thu Apr 5 16:06:53 2007 -0400 EHCI: fix problem with BIOS handoff This patch (as882) fixes a problem with the EHCI BIOS handoff. On my machine, the BIOS configures the controller and the handoff fails, leaving the controller configured. During resume-from-disk, this confuses ehci-hcd into thinking that the controller has not been tampered with. The problem is fixed by turning off the Configured Flag whenever a BIOS handoff is attempted, whether it succeeds or not. Signed-off-by: Alan Stern Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 36433127ae7a842482ba857f5ad3c431817a9542 Author: Oliver Neukum Date: Mon Apr 30 01:37:44 2007 -0700 USB: address FIXME in usbnet w.r.t drivers claiming multiple interfaces This fixes the issue of drivers claiming multiple interfaces. Operations are stopped as soon as an interface is suspend and resumed only as all interfaces have been resumed. Signed-off-by: Oliver Neukum Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 741ec4e6d0b7780d29a63f908d6d21df425be365 Author: David Brownell Date: Sun Apr 29 19:51:05 2007 -0700 USB: remove usb DocBook warnings This just removes some warnings generated by the Docbook tools when turning USB (host and peripheral side) kerneldoc into HTML; they're all about missing ID attributes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4149b72eaa74583c361e3aaf5804eb74b72c51f1 Author: David Brownell Date: Sun Apr 29 10:09:47 2007 -0700 USB: handle more rndis_host oddities Workaround another device firmware bug, wherein CDC descriptors get placed in a wrong place never previously observed in the wild. Fix a bug where a seeming RNDIS device returns a bogus response during device initialization. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 47f8468e6008a1d62f7dacbcff4ec3e115a500c8 Author: David Brownell Date: Sun Apr 29 10:21:14 2007 -0700 USB: fix more ftdi-elan/u132-hcd #include lossage Partial fix for bogosity in the ftdi-elan and u132-hcd drivers ... these have no business including with the internals of other drivers, much less doing so in a broken way!! A previous patch resolved one build fix, this resolves another... Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 64902cbaf17a5c81a2ed0cca51bf57227086df65 Author: Matthew Davidson Date: Tue May 1 01:15:01 2007 +0100 usb-storage: ignore Sitecom WL-117 USB-WLAN The Sitecom WL-117 is another "driverless" ZD1211 device where the virtual windows driver CD must be ejected before the WLAN device appears. zd1211rw takes care of the ejecting, but usb-storage must be told not to claim the device. From: Matthew Davidson Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit deb3d7fff0b7c21c5a80b2fdfb93d7fb1abcf21f Author: Oliver Neukum Date: Wed May 2 10:17:50 2007 +0200 USB: remove useless check in mos7840 found by coverity this useless check should be removed. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5ac43d1fbbfd1b89f83c1a907c58d558d262e441 Author: Oliver Neukum Date: Wed May 2 10:33:10 2007 +0200 USB: fix omninet memory leak found by coverity the transfer of allocating the descriptor in attach and no longer in open was incomplete resulting in a memory leak coverity spotted. This fix is against the patch set you posted. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit c199426eff6c1a144d1123a80dc123562a9ec7d2 Author: Kumar Gala Date: Thu May 17 07:52:42 2007 -0500 [PPC] Remove duplicate export of __div64_32. We now get the export of __div64_32 from lib/div64.c and can drop the one in ppc_ksysm.c Signed-off-by: Kumar Gala commit 9c05e63e9180011e791c6c72ce38b45c1a3fa898 Author: Kumar Gala Date: Mon May 14 17:12:24 2007 -0500 [PPC] Fix COMMON symbol warnings We get the following warnings in various ARCH=ppc builds: WARNING: "ee_restarts" [arch/ppc/kernel/built-in] is COMMON symbol WARNING: "fee_restarts" [arch/ppc/kernel/built-in] is COMMON symbol WARNING: "htab_hash_searches" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "next_slot" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "mmu_hash_lock" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "primary_pteg_full" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "global_dbcr0" [arch/ppc/kernel/built-in] is COMMON symbol Switch to local symbols for ee_restarts, fee_restarts, and global_dbcr0 and global symbols for mmu_hash_lock, next_slot, primary_pteg_full, and htab_hash_searches. (except mmu_hash_lock which is global) and space directive instead. Signed-off-by: Kumar Gala commit 3cb1d95847db993911ba0bba65e05087c7586eed Author: Milind Arun Choudhary Date: Tue Mar 6 02:44:13 2007 -0800 [PARISC] ROUNDUP macro cleanup in drivers/parisc Clean up ROUNDUP, Use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary Acked-by: Grant Grundler Signed-off-by: Andrew Morton Signed-off-by: Kyle McMartin commit ea74342900dbe79f2a31ed3609b9e2bdb5c7198c Author: Milind Arun Choudhary Date: Sun Apr 1 13:06:46 2007 +0530 [PARISC] ROUND_UP macro cleanup in arch/parisc ROUND_UP macro cleanup, use ALIGN where ever appropriate Signed-off-by: Milind Arun Choudhary Signed-off-by: Kyle McMartin commit 230ffc8e348e7841b79fd7c659d16aa5d7ec8a69 Author: Semih Hazar Date: Tue May 22 23:35:12 2007 -0400 Input: ads7846 - SPI_CPHA mode bugfix In commit [1] the SPI mode is set to 1, but it should be 0. As stated in the commit, ads784x samples the data on the rising edge. SPI mode 1 samples on the falling edge [2] though. The root cause of this is a bug in the omap_uwire code, which treats CPHA=1 incorrectly; so these two bugs cancel each other out on one of the main regression test platforms for this driver. [1] kernel.org GIT 7937e86a70235e1584486654687dc9908a11e00a [2] http://en.wikipedia.org/wiki/Serial_Peripheral_Interface_Bus Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit bff0de5f59ff935138eb41c397a7e50468028b83 Author: David Brownell Date: Tue May 22 23:28:40 2007 -0400 Input: ads7846 - document that it handles tsc2046 too The TSC2046 is an updated version of the ADS7846 ... mention that in the Kconfig helptext and driver source. Signed-off-by: David Brownell Acked-by: Kevin Hilman Signed-off-by: Dmitry Torokhov commit 36bd52a49b790a71f3d353cdddf2f22e1e6f84ff Author: Eric Piel Date: Tue May 22 23:28:03 2007 -0400 Input: input-polldev - add module info This is required to load it as a module, as GPL-compatible license is necessary to use workqueues. Signed-off-by: Eric Piel Signed-off-by: Dmitry Torokhov commit ddd43b063d16cdeffbc18f00b72c112f246fae78 Author: Paul Mundt Date: Wed May 23 12:24:32 2007 +0900 sh: section mismatch fixes for system timer. Fix up a couple of section mismatch warnings regarding sys_timer. Signed-off-by: Paul Mundt commit 1124d5ca7b7296035c1cc5fc00fdbfa44603b2ac Author: Dmitry Torokhov Date: Mon May 14 23:52:22 2007 -0400 Input: ucb1x00-ts - remove commented out code Signed-off-by: Dmitry Torokhov commit c130bdba585cff185919cc5c82c126fc58aab7a6 Author: Satoru Takeuchi Date: Mon May 14 23:52:07 2007 -0400 Input: ucb1400_ts - use sched_setscheduler() Fix Philips UCB1400 driver to use sched_setscheduler() instead of setting the fields of task_struct directly. Signed-off-by: Satoru Takeuchi Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 1e0c5b1275a0e59747349745da8778523a9dcd18 Author: Dmitry Torokhov Date: Mon May 14 23:51:54 2007 -0400 Input: ALPS - force stream mode ALPS appears to need SETSTREAM command after reset, otherwise it does not produce any data. Now that we do not request stream mode by default individual drivers need to take care of it. [Jason Riedy - fix oops] Signed-off-by: Dmitry Torokhov commit c0338c15973c1b6de2b42808a071bf3af948d595 Author: Johann Deneux Date: Mon May 14 00:09:33 2007 -0400 Input: iforce - minor clean-ups Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit b8691fd2258d2ae5941c5e5f8bf3dfdaa8951b81 Author: Johann Deneux Date: Mon May 14 00:09:28 2007 -0400 Input: iforce - fix force feedback not working Use an interrupt URB to send force-feedback data to the device instead of a bulk URB. This was broken since 2.6.18. Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit 7022672e4046fac4699aa5f8ff2a5213b7ec4ff9 Author: Simon Arlott Date: Fri May 11 20:42:34 2007 +0100 [PARISC] spelling fixes: arch/parisc/ Spelling fixes in arch/parisc/. Signed-off-by: Simon Arlott Acked-by: Grant Grundler Signed-off-by: Kyle McMartin commit b5e8b733a18a1192666005f95f44e02440b057d4 Author: Aurelien Jarno Date: Tue May 22 17:38:26 2007 +0200 [PARISC] Disable LWS debugging The LWS debugging code on parisc is wrongly enabled due to a bug in the use of the preprocessor directives. This debugging code is not thread safe and causes problems with a recent glibc on SMP kernels. Signed-off-by: Aurelien Jarno Signed-off-by: Kyle McMartin commit 2cbd42dbf8887c8742f8e6a286c7e5f4f5ddb56b Author: Kyle McMartin Date: Tue Mar 27 16:47:49 2007 -0400 [PARISC] Let PA-8900 processors boot Signed-off-by: Kyle McMartin commit 27f282b9c6ec0c2ed64778ca154674929eefb195 Author: Alexey Dobriyan Date: Sat Mar 17 19:28:27 2007 +0300 parisc: convert /proc/gsc/pcxl_dma to seq_file As side effect, remove one more ->get_info user and a novel approach of content generation: sprintf(buf, "%sfoo", buf, ...); sprintf(buf, "%sbar", buf, ...); ... Compile-tested. Signed-off-by: Alexey Dobriyan Signed-off-by: Kyle McMartin commit fd3eef10f5a55acdefbd3f53ca7618a35cb6231f Author: Kyle McMartin Date: Sat Mar 17 11:17:31 2007 -0400 [PARISC] Wire up kexec_load syscall Definitely unimplemented at this point and will just trap to sys_ni_syscall... Signed-off-by: Kyle McMartin commit 034a15bfef7f52b4f1ff928b9a06d993969857db Author: Kyle McMartin Date: Sat Mar 17 11:15:01 2007 -0400 [PARISC] Move #undef to end of syscall table Signed-off-by: Kyle McMartin commit 2c8307f63dd5caaf7ff8ad5118951e559a9ed5c8 Author: Alexandr Andreev Date: Tue Mar 6 02:44:13 2007 -0800 parisc: sync compat getdents Add VERIFY_WRITE check in the beginning like compat_sys_getdents() EFAULT on parisc if put_user() fails. Signed-off-by: Alexandr Andreev Signed-off-by: Alexey Dobriyan Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Signed-off-by: Andrew Morton Signed-off-by: Kyle McMartin commit 01da41b86f6e5f9a724e20a63f093d77e37d8056 Author: Alexey Dobriyan Date: Sat Mar 3 01:13:35 2007 +0000 parisc: make command_line[] static Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Kyle McMartin commit 575c3e2a041c08ad39b5d4535539a9a7d4c63aa6 Author: Patrick McHardy Date: Tue May 22 17:00:49 2007 -0700 [RTNETLINK]: Remove remains of wireless extensions over rtnetlink Remove some unused variables and function arguments related to the recently removed wireless extensions over rtnetlink. Signed-off-by: Patrick McHardy Acked-by: Johannes Berg Signed-off-by: David S. Miller commit 83b496e928dbd38104bfb107230cc88751b09d89 Author: Patrick McHardy Date: Tue May 22 17:00:01 2007 -0700 [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink rtnl_setlink doesn't allow to change subsets of the flags, just to override the set entirely by a new one. This means that for simply setting a device up or down userspace first needs to query the current flags, change it and send the changed flags back, which is racy and needlessly complicated. Mask the flags using ifi_change since this is what it is intended for. For backwards compatibility treat ifi_change == 0 as ~0 (even though it seems quite unlikely that anyone has been using this so far). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1f8481d19af005c469ee50cf972486240905585e Author: David Howells Date: Tue May 22 16:14:24 2007 -0700 [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n Make the call state names array available even if CONFIG_PROC_FS is disabled as it's used in other places (such as debugging statements) too. Signed-off-by: David Howells Signed-off-by: David S. Miller commit 71a904bf49582f1866e2d6f9ce0a186af9a50b39 Author: David Howells Date: Tue May 22 16:13:49 2007 -0700 [AF_RXRPC]: AF_RXRPC depends on IPv4 Add a dependency for CONFIG_AF_RXRPC on CONFIG_INET. This fixes this error: net/built-in.o: In function `rxrpc_get_peer': (.text+0x42824): undefined reference to `ip_route_output_key' Signed-off-by: David Howells Signed-off-by: David S. Miller commit 26b8e51e98ae09cfc770b918577c004a376de4b8 Author: Herbert Xu Date: Tue May 22 16:12:26 2007 -0700 [IPSEC]: Fix warnings with casting int to pointer This patch adds some casts to shut up the warnings introduced by my last patch that added a common interator function for xfrm algorightms. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3d9780b97667fcd63159c0933fdce75465da6c70 Author: Dave Jones Date: Mon May 21 20:59:47 2007 -0400 [SCSI] fusion: Fix |/|| confusion There are several cases where the fusion driver uses the logical || to try to do an arithmetical or ... fix by replacing with |. Signed-off-by: Dave Jones Acked-by: "Moore, Eric" Signed-off-by: James Bottomley commit edd75ede2d40eadb98e07d87e88fa970f86ffe9e Author: Jonathan Corbet Date: Tue May 22 00:39:00 2007 -0300 V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode A bug in the ov7670 sensor causes it to introduce noise unless the CLKRC register is rewritten *after* setting the image mode. Naturally, resetting CLKRC in this way will cause other modes to fail. So carefully poke the register only when indicated. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 7acf90c70c6ee063f7465b2f10e2083bc49f355b Author: Jonathan Corbet Date: Tue May 22 00:37:58 2007 -0300 V4L/DVB (5690): Cafe_ccic: Properly power down the sensor The proper method for powering down the sensor on OLPC systems has changed somewhat; in particular, the sensor must be powered down completely (rather than simply told to power down) or the associated "camera active" LED will stay on. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 82c01d3d5a26f82aea1fb2e9a357dfb6404f44db Author: matthieu castet Date: Mon May 21 11:15:09 2007 -0300 V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF Allow to use SECAM-BG with the FI1216MF tuner. The selection is done with the secam=B module argument. The default behaviour should be the same as before. Signed-off-by: Matthieu CASTET Signed-off-by: Andrew Morton Acked-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 8fdcf86af61bfba744f5868ec04dad71637ac33a Author: Darrick J. Wong Date: Wed May 16 14:01:48 2007 -0700 [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete Every so often, the driver will call asd_clear_nexus to clean out a task. It is supposed to be the case that the CLEAR NEXUS does not go on the done list until after the task itself has been put on the done list, but for some reason this doesn't always happen. Thus, the wait_for_completion_timeout call times out, and we return success. This makes libsas free the task even though the task hasn't completed, leading to a BUG_ON message from aic94xx_hwi.c around line 341. We should return failure from asd_clear_nexus so that libsas tries again; at a bare minimum it shouldn't be freeing active tasks. I _think_ this will fix one of the SCB timeout crash problems (though I've not been able to reproduce it lately...) Signed-off-by: Darrick J. Wong Signed-off-by: James Bottomley commit f45ffaec2e51071ea0067849cbb84df9e0531b35 Author: James Bottomley Date: Tue May 22 09:26:22 2007 -0500 [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6 On Tue, 2007-05-22 at 06:51 -0500, Bob Tracy wrote: > Second try: originally reported this back on April 17th. 2.6.X > kernel builds started failing after I upgraded my compiler from > gcc-3.3.X to gcc-3.4.6: > > make -C drivers/scsi/aic7xxx/aicasm > (...) > gcc -I/usr/include -I. aicasm.c aicasm_symbol.c aicasm_gram.c aicasm_macro_gram.c aicasm_scan.c aicasm_macro_scan.c -o aicasm -ldb > aicasm_gram.y:1948: error: conflicting types for 'yyerror' > aicasm_gram.tab.c:3004: error: previous implicit declaration of 'yyerror' was here > aicasm_macro_gram.y:162: error: conflicting types for 'mmerror' > aicasm_macro_gram.tab.c:1196: error: previous implicit declaration of 'mmerror' was here Fix is to add a prototype for yyerror and mmerror to the relevant files. Signed-off-by: James Bottomley commit 1208bab5d07c9a9172f04b76dc107c37507a9bb3 Author: Salyzyn, Mark Date: Tue May 22 09:32:29 2007 -0400 [SCSI] aacraid: apply commit config for reset_devices flag Under some conditions associated with the unclean transition to kdump, the aacraid adapters will view the array as foreign and not export it to prevent access and data manipulation. The solution is to submit a commit configuration to export the devices since this is a expected behavior when transitioning to a kdump kernel. This patch adds the aacraid.reset_devices flag and when either this or the global reset_devices flag is set, ensures that a commit config is issued and extends the startup_timeout if it is set less than 5 minutes. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 09ff92fea2890c697a36d8b26f5a3ea725ef8fb4 Author: Alan Stern Date: Mon May 21 09:55:04 2007 -0400 [SCSI] sd: fix refcounting regression in suspend/resume routines This patch (as909) fixes a couple of refcounting errors in the sd driver's suspend and resume methods. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 4abdcf933f647763592db6bef001d1fae61a5527 Author: Simon Arlott Date: Sun May 6 20:56:14 2007 -0300 V4L/DVB (5630): Dvb-core: Handle failures to create devices dvb-core is not started early enough when device drivers that use dvb are compiled in so dvb_register_device fails (silently) since dvb_class is NULL, this runs dvb_init using subsys_initcall instead of module_init. dvb_register_device will now check the return value of class_device_create. Signed-off-by: Simon Arlott Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit a6d7613226c4e159b12fbaad707ddadf47b38ccf Author: Manu Abraham Date: Sun May 13 12:23:43 2007 -0300 V4L/DVB (5639a): Fix dst usage count Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c74e83a8632fd88560a533980a0d4c3922325326 Author: Hans Verkuil Date: Thu May 17 06:41:44 2007 -0300 V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change Reverted the change to struct v4l2_pix_format. I completely missed that this struct was used by existing ioctls so that changing it broke the ABI. I will have to think of another way of setting the top/left coordinates but for now this change is reverted to preserve compatibility. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bf57ab7ae74591973265ebd8e18bd0e785dbfb33 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:27 2007 -0300 V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF Signed-off-by: Mauro Carvalho Chehab commit d460f857a5332fe892d88ddfb5efa827dc3b25e6 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:09 2007 -0300 V4L/DVB (5639): Fix Kconfig dependencies for ivtv ivtv were wrongly marked as dependent of USB. Signed-off-by: Mauro Carvalho Chehab commit a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732 Author: Arnaud Patard Date: Tue May 22 19:49:16 2007 +0200 i2c-s3c2410: Fix build warning Fix for the following build warning: CC drivers/i2c/busses/i2c-s3c2410.o drivers/i2c/busses/i2c-s3c2410.c: In function 's3c24xx_i2c_probe': drivers/i2c/busses/i2c-s3c2410.c:839: warning: format '%ld' expects type 'long int', but argument 4 has type 'resource_size_t' Signed-off-by: Arnaud Patard Signed-off-by: Jean Delvare commit 6a7ce82f02e8ce7391e40018749d93762abf6ee0 Author: Jean Delvare Date: Tue May 22 19:49:16 2007 +0200 i2c-tiny-usb: Fix truncated adapter name Signed-off-by: Jean Delvare Cc: Till Harbaum commit de81d2aaebc8e5e5167cb93f674c57705898e45e Author: David Brownell Date: Tue May 22 19:49:16 2007 +0200 i2c: Legacy i2c drivers shouldn't issue uevents Prevent legacy drivers from issuing uevents for device creation/removal, so that userspace can't cause modprobing loops for them. This became a problem for some legacy PC drivers. I can't easily see it becoming an issue with I2C legacy drivers, but consistency-in-paranoia seems likely to be a good thing here. For usable i2c-level driver model uevents, just switch to a new-style driver. Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit a66aa704d6f332b001dfb0e787c92b2c61c75081 Author: Kenji Kaneshige Date: Tue May 22 10:20:36 2007 -0700 [IA64] fix kmalloc(0) in arch/ia64/pci/pci.c Hiroyuki Kamezawa reported the problem that pci_acpi_scan_root() of ia64 might call kmalloc_node() with zero size. Currently ia64's pci_acpi_scan_root() assumes that _CRS method of root bridge has at least one resource window. But, the root bridges that has no resource window must be taken into account. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 6ae384884d936cb39ab20238af34689933e44525 Author: Robin Holt Date: Fri May 18 13:46:52 2007 -0500 [IA64] Only unwind non-running tasks. Unwinding a running task has proven problematic. In one instance, the running task was attempting to unwind itself and received an interrupt between when get_wchan allocated local variables on the stack and when unw_init_from_blocked_task was called which resulted in unw_init_frame_info to place this tasks task_struct pointer over the switch stack's ar_bspstore entry. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit e2e6fe7bb6e30621ad4e8a3acb1e711815c239bd Author: Robin Holt Date: Fri May 18 13:46:23 2007 -0500 [IA64] Improve unwind checking. This patch adds some sanity checks to keep register and memory stack pointers in the unw_frame_info structure within the tasks stack address range. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 412e8a0ebf1a58c060cc76438e5b6d33789c5e20 Author: Eugene Teo Date: Mon May 21 22:30:22 2007 +0800 [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free skb could have been freed by then. Also, in libertas_upload_rx_packet(), skb->protocol is initialized by eth_type_trans(). Signed-off-by: Eugene Teo Signed-off-by: John W. Linville commit 596f2d0554352f1089f7478b309b27d8cdf5cd4f Author: Eugene Teo Date: Sat May 19 11:09:20 2007 +0800 [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check NULL checks should be performed before the dereference. Spotted by the Coverity checker. Signed-off-by: Eugene Teo Signed-off-by: John W. Linville commit 3d4bd24b019981394fabb465b0c7932924b83d65 Author: Florin Malita Date: Fri May 18 16:04:33 2007 -0400 [PATCH] libertas: skb dereferenced after netif_rx In libertas_process_rxed_packet() and process_rxed_802_11_packet() the skb is dereferenced after being passed to netif_rx (called from libertas_upload_rx_packet). Spotted by Coverity (1658, 1659). Also, libertas_upload_rx_packet() unconditionally returns 0 so the error check is dead code - might as well take it out and change the signature. Signed-off-by: Florin Malita Signed-off-by: John W. Linville commit 5453e7723b95958f4591b2e0063573d8d53e7699 Author: Benjamin Herrenschmidt Date: Tue May 22 16:25:51 2007 +1000 [POWERPC] Fix warning in 32-bit builds with CONFIG_HIGHMEM Some missing fixup for the removal of 4 level fixup header. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 832a791c580a86cbeea5bb12a984d95b1f458539 Author: Benjamin Herrenschmidt Date: Tue May 22 14:33:05 2007 +1000 [POWERPC] Fix powerpc vmlinux.lds.S Sam's recent change in 7664709b44a13e2e0b545e2dd8e7b8797a1748dc broke things for us because we ended up with *(.text.*) before *(.text), whereas previously *(.text) was first. This was important because the start of the text section contains the kernel entry point. In fact, we don't need that *(.text.*) thing anymore and it incorrectly matched .text.init.refok, thus putting it before .text. .. ouch ! Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 177e9ea49deea238f59bb0b1708cfc60b75828fb Author: Anton Blanchard Date: Sun May 20 03:13:43 2007 +1000 [POWERPC] Fix typo: MMCR0_PMA0 != MMCR0_PMAO pmc.c has: #ifndef MMCR0_PMA0 #define MMCR0_PMA0 0 This one took a while to find. Unfortunately its the wrong define (number 0 vs letter O). Its probably worth removing this override, since if our includes get screwed up we will have the same (hard to debug) failure. Fix it simply for now, so that we can backport to stable. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 2fae4985a135ca5d7d9bba17d45d674c099621b4 Author: Anton Blanchard Date: Sat May 19 15:22:41 2007 +1000 [POWERPC] Add missing pmc_type fields in cpu_table A number of cpu_table entries were missing the pmc_type field, which means that the sysfs entries for the performance monitor counters don't get created. This adds them. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit d3fdaed9e973687f088c9c156a6e20870386e0b7 Author: Hugh Dickins Date: Sat May 19 02:47:01 2007 +1000 [POWERPC] Fix smp_call_function to be preempt-safe smp_call_function_map() was not safe against preemption to another cpu: its test for removing self from map was outside the spinlock. Rearrange it a little to fix that. smp_call_function_single() was also wrong: now get_cpu() before excluding self, as other architectures do. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit d25790532370e7448e3d3bd25a17e1e9f1299816 Author: Stephen Rothwell Date: Tue May 22 11:10:19 2007 +1000 Fix headers check fallout commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 added an include of linux/jiffies.h in linux/smb_fs.h outside the ifdef __KERNEL__. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit df5f6311f171cc249e39ccd06321b68823ac68f0 Author: David Woodhouse Date: Mon May 21 19:53:35 2007 -0400 Make 'headerscheck' stop immediately on an error This should make it stop immediately after printing the _helpful_ error message, rather than continuing to spit out many pages more of 'CHECK include/linux/foo.h' before eventually coming to a halt with something less obvious. Now I get this... CHECK include/linux/smb_fs.h /shiny/git/linux-2.6/usr/include/linux/smb_fs.h requires linux/jiffies.h, which does not exist in exported headers make[2]: *** [/shiny/git/linux-2.6/usr/include/linux/.check.smb_fs.h] Error 1 make[1]: *** [linux] Error 2 make: *** [headers_check] Error 2 Signed-off-by-if-Sam-says-so: David Woodhouse [ Sam had better say so! This made me waste way too much time. - Linus] Signed-off-by: Linus Torvalds commit 72dd9ca59944f117c719a1cc3fc9010bce0486f2 Author: Jeff Garzik Date: Tue May 22 00:28:11 2007 -0400 partitions/LDM: build fix This from a "tested" patch... Signed-off-by: Jeff Garzik Cc: Anton Altaparmakov Signed-off-by: Linus Torvalds commit efa5bf1dd2cf3cdee0bfe97cfd76ff2296179ae4 Author: Linus Torvalds Date: Mon May 21 18:41:17 2007 -0700 Revert "kbuild: make better section mismatch reports on i386, arm and mips" This reverts commit f892b7d480eec809a5dfbd6e65742b3f3155e50e, which totally broke the build on x86 with CONFIG_RELOCATABLE (which, as far as I can tell, is the only case where it should even matter!) due to a SIGSEGV in modpost. Cc: Sam Ravnborg Cc: Atsushi Nemoto Signed-off-by: Linus Torvalds commit 8bc3fc470eb25af4d70c72485cbcb130cc657691 Author: Jeff Garzik Date: Mon May 21 20:26:38 2007 -0400 libata: bump versions Signed-off-by: Jeff Garzik commit a617c09f6d646b60f31efc8afd9f81b752bf21b7 Author: Jeff Garzik Date: Mon May 21 20:14:23 2007 -0400 libata: Trim trailing whitespace Signed-off-by: Jeff Garzik commit bc9a8a7eaa58d802a2b26c75edcc95cb92835db3 Author: Alan Cox Date: Mon May 21 15:20:33 2007 +0100 libata: Kiss post_set_mode goodbye As of the -mm tree we don't have post_set_mode users any more. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2f91d81db3060f6d218e32d935b9a18ffca4dde2 Author: Alan Cox Date: Mon May 21 15:15:51 2007 +0100 ata_piix: clean up With cable methods in place we don't need a custom error handler for SATA so get rid of it Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 4349eebf67b2b06eab36f3dad651ac36619ae986 Author: Alan Cox Date: Mon May 21 14:52:49 2007 +0100 pata_hpt366: Enable bits are unreliable so don't use them Various people had problems with both old and new IDE when hpt366 enable bits started getting honoured. It turns out they are not reliable so don't rely on them Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 39f198868dfd4216ff221d741c72a009d995a7ba Author: Dave Jones Date: Mon May 21 14:31:03 2007 -0400 libata: Add Seagate STT20000A to DMA blacklist. http://bugzilla.kernel.org/show_bug.cgi?id=1044 points out an additional hard disk that doesn't handle DMA transfers correctly. This patch is the libata variant of the earlier patch to drivers/ide/ Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit c7a42156d99bcea7f8173ba7a6034bbaa2ecb77c Author: Tejun Heo Date: Fri May 18 16:23:19 2007 +0200 ahci: disable 64bit dma on sb600 SB600 claims it can do 64bit DMA but it can't. Disable it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf Author: Auke Kok Date: Tue May 15 15:29:16 2007 -0700 Add constant for FCS/CRC length (frame check sequence) About a dozen drivers that have some form of crc checksumming or offloading use this constant, warranting a global define for it. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit f1e9a4eaea5c22cfb557e58a8cd0ca3bde5160a5 Author: Maciej W. Rozycki Date: Mon May 21 14:33:21 2007 +0100 declance: Remove a dangling spin_unlock_irq() thingy The spin_unlock_irq() invocation in lance_start_xmit() has no matching locking request. The call is already protected by netif_tx_lock, so remove the statement. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 3e1657c8ef53e1cd541cc1e420f3230dc075949b Author: Auke Kok Date: Mon May 21 14:51:35 2007 -0700 e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1) Herbert Xu wrote: "netif_poll_enable can only be called if you've previously called netif_poll_disable. Otherwise a poll might already be in action and you may get a crash like this." Removing the call to netif_poll_enable in e1000_open should fix this issue, the only other call to netif_poll_enable is in e1000_up() which is only reached after a device reset or resume. Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=8455 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240339 Tested by Doug Chapman Signed-off-by: Auke Kok Acked-by: Herbert Xu Signed-off-by: Jeff Garzik commit 9f81036c54ed1f860d2807c5a6aa4f2b30c21204 Author: Michael S. Tsirkin Date: Mon May 21 19:06:54 2007 +0300 IB/cm: Improve local id allocation The IB CM uses an idr for local id allocations, with a running counter as start_id. This fails to generate distinct ids if 1. An id is constantly created and destroyed 2. A chunk of ids just beyond the current next_id value is occupied This in turn leads to an increased chance of connection request being mis-detected as a duplicate, sometimes for several retries, until next_id gets past the block of allocated ids. This has been observed in practice. As a fix, remember the last id allocated and start immediately above it. This also fixes a problem with the old code, where next_id might overflow and become negative. Signed-off-by: Michael S. Tsirkin Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit 518b1646f8a31904ca637b8df0c1e31c34a7a3c2 Author: Michael S. Tsirkin Date: Mon May 21 15:04:59 2007 +0300 IPoIB/cm: Fix SRQ WR leak SRQ WR leakage has been observed with IPoIB/CM: e.g. flipping ports on and off will, with time, leak out all WRs and then all connections will start getting RNR NAKs. Fix this in the way suggested by spec: move the QP being destroyed to the error state, wait for "Last WQE Reached" event and then post WR on a "drain QP" connected to the same CQ. Once we observe a completion on the drain QP, it's safe to call ib_destroy_qp. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 24bd1e4e32e88cd3d0675482d15bea498a922ca8 Author: Michael S. Tsirkin Date: Fri May 18 16:12:54 2007 +0300 IB/ipoib: Fix typos in error messages Trivial error message fixups. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit dde33348e53ecab687a9768bf5262f0b8f79b7f2 Author: Anton Altaparmakov Date: Mon May 21 09:37:42 2007 +0100 LDM: Fix for Windows Vista dynamic disks This fixes the LDM driver so that it works with Windows Vista dynamic disks which are subtly different to Windows 2000/XP ones. The patch was needed to get a Vista formatted dynamic disk to be recognized and parsed successfully. Thanks go to Chris Teachworth for the report and testing. Cc: Richard Russon Signed-off-by: Anton Altaparmakov Signed-off-by: Linus Torvalds commit 17304383ebc1ce68a88030ac4d18ea549d9578c7 Author: Brian Gerst Date: Mon May 21 14:31:53 2007 +0200 i386: fix PGE mask cr4 is a 32-bit register, so casting the mask to an unsigned char is wrong, as it clears more than the PGE bit. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d0aff6e6f4e54f79f9c89d147d371bad384454e9 Author: john stultz Date: Mon May 21 14:31:52 2007 +0200 x86_64: vsyscall time() fix The vsyscall time() function basically returns the second portion of xtime directly. This however means that there is about a ticks worth of time each second where time() will return a second value less then what gettimeofday() does. Additionally, this window where vtime() is behind vgettimeofday() grows when dynticks is enabled, so its probably good to get this in before dynticks lands. Big thanks to Sripathi for noticing this issue and creating a test case to work with! This patch changes the vtime() implemenation to call vgettimeofday(), much as syscall time() implementation calls gettimeofday(). 2.6.21 stable candidate too Signed-off-by: John Stultz Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d8902bfcacde6001e1b11bb06137c3bae3ae52d0 Author: Yinghai Lu Date: Mon May 21 14:31:51 2007 +0200 x86_64: early_print kernel console should send CRLF not LFCR In commit d358788f3f30113e49882187d794832905e42592 Author: Russell King Date: Mon Mar 20 20:00:09 2006 +0000 Glen Turner reported that writing LFCR rather than the more traditional CRLF causes issues with some terminals. Since this afflicts many serial drivers, extract the common code to a library function (uart_console_write) and arrange for each driver to supply a "putchar" function. but early_printk is left out. Signed-off-by: Yinghai Lu Cc: Russell King Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 39427d6e595ebee38fdd77bcf55d6b13d7a4324a Author: Andi Kleen Date: Mon May 21 14:31:50 2007 +0200 i386: Enable CX8/PGE CPUID bits early on VIA C3 Fix boot failures with the early CPUID checking on VIA C3 Includes fixes from Christian Volkmann Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c1f59d8be7e5da75d9380da23671005b363c45c Author: Christian Volkmann Date: Mon May 21 14:31:48 2007 +0200 i386: Fix wrong CPU error message in early boot path - boot/setup.S did not print "PANIC: CPU too old for this kernel" ( not visible, also the message did not match ) - I add "# missed before: set ds" => somebody should check if I am right with the way to set. => seems to be a generic error in setup.S not to set "ds" for error messages. AK: extracted patch out of other changes AK: also couldn't find any other case where ds is wrong Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c12ceb766eb5ac975c1145d51236fcdcf81a6578 Author: Andi Kleen Date: Mon May 21 14:31:47 2007 +0200 i386: Clear MCE flag on AMD K6 It reports machine check capability in CPUID, but doesn't actually implement all the necessary MSRs of the standard Intel machine check architecture. This fixes a boot failure on K6s recently introduced. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 21124a82bb82e100369846ff2044dd5ea65fc934 Author: Andi Kleen Date: Mon May 21 14:31:46 2007 +0200 x86_64: Support gcc 5 properly The ifdef tests were broken. Assume it acts like gcc 4 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6c977aad03a18019015035958c65b6729cd0574c Author: Andi Kleen Date: Mon May 21 14:31:45 2007 +0200 i386: Fix K8/core2 oprofile on multiple CPUs Only try to allocate MSRs once instead of for every CPU. This assumes the MSRs are the same on all CPUs which is currently true. P4-HT is a special case for different SMT threads, but the code always saves/restores all MSRs so it works identical. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c87b948b258829f0bdffe51baa72fba5c42d359 Author: Andi Kleen Date: Mon May 21 14:31:44 2007 +0200 x86_64: Support x86_64 in make buildtar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 20c3a3d0dd5a91ee8986b94071da0cae8c057af5 Author: Andi Kleen Date: Mon May 21 14:31:43 2007 +0200 i386: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5e200c28955802b26d831f098a67402fa9d20ffc Author: Andi Kleen Date: Mon May 21 14:31:42 2007 +0200 x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 88b4036934b5a6d8cda810487503d2fc4c46d448 Author: Bryan Wu Date: Mon May 21 18:32:16 2007 +0800 Blackfin SPI: cleanup according to David Brownell's review a) platorm_driver_probe(...) instead of platform_driver_register(&driver); b) set bfin_spi_enable and bfin_spi_disable static c) Why is the width flag a u32? d) maybe use dev_dbg() instead of pr_debug() Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 2ac5ee4738cbd9c146ccda53f02006eaf6a43352 Author: Mike Frysinger Date: Mon May 21 18:09:39 2007 +0800 Blackfin serial driver: implement support for ignoring parity/break errors properly setting up and respecting the read_status_mask / ignore_status_mask fields of the serial core Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5c4e472b0af57553f9584e0b33c491b168ac1dff Author: Aubrey Li Date: Mon May 21 18:09:38 2007 +0800 Blackfin serial driver: fix overhead issue Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9d7b6677ac35fdfee93e8f50589e04bcc95649c1 Author: Bryan Wu Date: Mon May 21 18:09:37 2007 +0800 Blackfin arch: update pm.c according to power management API change. Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c4d1889f7be0a7f34d29e5c4ce00a2b4b78ebb26 Author: Bryan Wu Date: Mon May 21 18:09:36 2007 +0800 Blackfin arch: update defconfig files Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ca9cb6fd4405a1e2276e17c895297004dd81734d Author: Mike Frysinger Date: Mon May 21 18:09:35 2007 +0800 Blackfin arch: add board default configs to blackfin arch Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit bde7db8608cab31c6d92982b00e8064bd492a85b Author: Sonic Zhang Date: Mon May 21 18:09:34 2007 +0800 Blackfin arch: Change NO_ACCESS_CHECK to ACCESS_CHECK Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c824498db47285aeff430c007685a193b673c949 Author: Bernd Schmidt Date: Mon May 21 18:09:33 2007 +0800 Blackfin arch: fix signal handling bug There's a forum thread at https://blackfin.uclinux.org/gf/project/uclinux-dist/forum/?action=ForumBrowse&_forum_action=MessageReply&message_id=24741 which has a testcase involving signal handling that crashes quite readily. Inspecting the code I believe what happens is that signal handling can become confused when it is invoked on return from an interrupt, if the contents of P0 and R0 at the time of the interrupt happen to be such that P0 is larger than zero (indicating to the signal code that we're in a syscall), and R0 happens to have a value of something like -EINTR or -ERESTARTSYS. Fixed by setting orig_p0 to -1 if we're returning from an interrupt. The testcase now seems to run without problems. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a9c59c2746c7e773839d51027c0e16ccf41f8fef Author: Mike Frysinger Date: Mon May 21 18:09:32 2007 +0800 Blackfin arch: cache SWRST value at bootup so other things like watchdog can non-destructively query it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 19381f024b01413d83cec1655c3fc4c9c09ae274 Author: Bryan Wu Date: Mon May 21 18:09:31 2007 +0800 Blackfin arch: update blackfin header files to latest one in VDSP. a) add new processor BF52x/BF54x header files b) update blackfin BF533/BF537/BF561 header files to latest one in VDSP. c) scrub watchdog/rtc masks from headers as we dont need/want them (too generic and the drivers dont use them) Signed-off-by: Mike Frysinger Signed-off-by: Roy Huang Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c09c4e006590210001ced90d59e62182bfd396f9 Author: Mike Frysinger Date: Mon May 21 18:09:30 2007 +0800 Blackfin arch: make sure we use local labels Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ac57ac39e4f92f327451ad4084c4d5f60bcfa999 Author: Mike Frysinger Date: Mon May 21 18:09:29 2007 +0800 Blackfin arch: dont clear the bit that tells coreb to start booting Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5f9a3e899897201a49965cd9e1bb2570b3bde2b5 Author: Aubrey Li Date: Mon May 21 18:09:28 2007 +0800 Blackfin arch: dma_memcpy borken for > 64K Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5079df993c3ab45af10dc9a45b3b9e712fd56f23 Author: Mike Frysinger Date: Mon May 21 18:09:27 2007 +0800 Blackfin arch: document why we have to touch the UART peripheral in our boot up code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ef9256d2831df0896566c3823cd2bdf0e55df984 Author: Mike Frysinger Date: Mon May 21 18:09:26 2007 +0800 Blackfin arch: issue reset via SWRST so we dont clobber the watchdog state Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c0fc525dcc407a516132fc11af82375319ebdadb Author: Mike Frysinger Date: Mon May 21 18:09:25 2007 +0800 Blackfin arch: move board specific setup out of common init code and into the board specific init code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 95e493c00ac0d2371c3f627fdb99d776d29a8166 Author: Mike Frysinger Date: Mon May 21 18:09:24 2007 +0800 Blackfin arch: finish removing p* volatile defines for MMRs Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 30870b93cd76bdfa7385f8d471345f5f6269fb00 Author: Mike Frysinger Date: Mon May 21 18:09:23 2007 +0800 Blackfin arch: dont clear status register bits in SWRST so we can actually use it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit eb8d5f6c0322e641ec32ed632dd3b02586205673 Author: Mike Frysinger Date: Mon May 21 18:09:22 2007 +0800 Blackfin arch: make sure we declare the revid functions as pure (since they are) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 0a290593a053752d9629fb1276392ce35c26b348 Author: Mike Frysinger Date: Mon May 21 18:09:21 2007 +0800 Blackfin arch: initial tepla-bf561 board support Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6e537e9329d133526a576b741f85b3d48edc4ac1 Author: Michael Hennerich Date: Mon May 21 18:09:20 2007 +0800 Blackfin arch: Fix bug using usb keyboard crashes kernel Without conswitchp preset, we have the following situation: - During initcalls: con_init is called, and returns because of !display_desc. - At this point there is no memory allocated for vc_cons[].d A bit later vty_init calls kbd_init. - From now on events are passed to kbd_event which will then call kbd_keycode. - kbd_keycode will oops on a NULL pointer dereference on vc->vc_tty Signed-off-by: Michael Hennerich Cc: Pekka Enberg Signed-off-by: Bryan Wu [ Added commit description based on email thread. - Linus ] Signed-off-by: Linus Torvalds commit 8a0e6656030ffe9bcb81b725e956917bafc7522d Author: Mike Frysinger Date: Mon May 21 18:09:19 2007 +0800 Blackfin arch: fix trace output for FLAT binaries Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 678402709602a5e62bb79454f0f41bd952373300 Author: Michael Hennerich Date: Mon May 21 18:09:18 2007 +0800 Blackfin arch: GPIO fix some defines Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 23ee968d96ef5ad564c0f0b8a30412fb93137ebb Author: Michael Hennerich Date: Mon May 21 18:09:17 2007 +0800 Blackfin arch: DMA operation cleanup 1) Disable Interrupts during DMA memcpy to avoid raise conditions. 2) Mark MDMA channel 0 as reserved, since were using it internally. 3) Add DMA based equivalents for insX and outsX. 4) Our insX and outsX only handles len <= 2^16. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit d1b945fdb62f3e6852fea5a8779c0151ac1e55a8 Author: Michael Hennerich Date: Mon May 21 18:09:16 2007 +0800 Blackfin arch: Move write to VR_CTL closer to IDLE Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9ae246cd85e05d3fb31b9770588c1fe0914872fe Author: Michael Hennerich Date: Mon May 21 18:09:15 2007 +0800 Blackfin arch: Fix reserved map after we changed PORT_H definition Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a161bb0510d793a450127c12160309907af3d3f7 Author: Mike Frysinger Date: Mon May 21 18:09:14 2007 +0800 Blackfin arch: mark a bunch of local functions as static Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 140a9aec22f454120d1953f24cd2b5338b6141e2 Author: Michael Hennerich Date: Mon May 21 18:09:13 2007 +0800 Blackfin arch: Add configuration data for ISP176x on BF561 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6dae211411448dd9a12895b802bdedca8296f23d Author: Mike Frysinger Date: Mon May 21 18:09:12 2007 +0800 Blackfin arch: fix a few random warnings Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e3defffe915961cf9c6e1f16486ae83fb7212f29 Author: Aubrey Li Date: Mon May 21 18:09:11 2007 +0800 Blackfin arch: ISP1761 doesn't work for USB flash disk ZONE_DMA is required for some drivers subsystem, such as USB/SCSI. Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049 Author: Bryan Wu Date: Mon May 21 18:09:10 2007 +0800 Blackfin arch: add SPI MMC driver support on bf533-stamp, tested on STAMP-BF533 Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 8af10b79877ff5dfd5c7b1928d57cf38483e819d Author: Michael Hennerich Date: Mon May 21 18:09:09 2007 +0800 Blackfin arch: Add Workaround for ANOMALY 05000257 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 Author: Alexey Dobriyan Date: Mon May 21 01:22:52 2007 +0400 Detach sched.h from mm.h First thing mm.h does is including sched.h solely for can_do_mlock() inline function which has "current" dereference inside. By dealing with can_do_mlock() mm.h can be detached from sched.h which is good. See below, why. This patch a) removes unconditional inclusion of sched.h from mm.h b) makes can_do_mlock() normal function in mm/mlock.c c) exports can_do_mlock() to not break compilation d) adds sched.h inclusions back to files that were getting it indirectly. e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were getting them indirectly Net result is: a) mm.h users would get less code to open, read, preprocess, parse, ... if they don't need sched.h b) sched.h stops being dependency for significant number of files: on x86_64 allmodconfig touching sched.h results in recompile of 4083 files, after patch it's only 3744 (-8.3%). Cross-compile tested on all arm defconfigs, all mips defconfigs, all powerpc defconfigs, alpha alpha-up arm i386 i386-up i386-defconfig i386-allnoconfig ia64 ia64-up m68k mips parisc parisc-up powerpc powerpc-up s390 s390-up sparc sparc-up sparc64 sparc64-up um-x86_64 x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig as well as my two usual configs. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit ff1be9ad61e3e17ba83702d8ed0b534e5b8ee15c Author: OGAWA Hirofumi Date: Sun May 20 23:39:40 2007 +0900 Fix "fs: convert core functions to zero_user_page" The bug was introduced by 01f2705daf5a36208e69d7cf95db9c330f843af6. It misses to convert the first argument, it should be "new_page". This became a cause of fatfs corruption. Cc: Nate Diller Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit be2864b5ee46e0d5ed626de6cbfeb9abbd9c2e6f Author: Heiko Carstens Date: Mon May 21 11:25:23 2007 +0200 [S390] More verbose show_mem() like other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a5a60a2beea07c23e242ad8e7398e761935d669a Author: Heiko Carstens Date: Mon May 21 11:25:22 2007 +0200 [S390] Make use of kretprobe_assert. s390 change for git commit 0f95b7fc839bc3272b1bf2325d8748a649bd3534. That is print kprobes debug data before BUG(). Cc: Ananth N Mavinakayanahalli Cc: Maneesh Soni Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 913f11ee48edfa78b531e0db9385b640fbf9f6d7 Author: Heiko Carstens Date: Mon May 21 11:25:21 2007 +0200 [S390] Wire up signald, timerfd and eventfd syscalls. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fd5d8bf03a9843ec3cdb10c820f409aa04048b52 Author: Heiko Carstens Date: Mon May 21 11:25:20 2007 +0200 [S390] Wire up sys_utimensat. Wire up sys_utimensat, reserve syscall number for sys_fallocate and add a couple of syscalls to the ignore list to get rid of warings. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 85ee32d02901bfd2e287ac669709758e04d73c4d Author: Cornelia Huck Date: Mon May 21 11:25:19 2007 +0200 [S390] cio: Update documentation. - read_dev_chars()/read_conf_data() are deprecated. Don't document them, but advise to issue the channel program from the driver itself. - Remove some really obsolete and incorrect stuff. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 31d106c68b1af88835a474556052d6efbfec99c5 Author: Paul Mundt Date: Mon May 21 15:10:04 2007 +0900 sh: Fix dreamcast build for IRQ changes. When the irq.h changes went in, the dreamcast code was still referencing an old value. Switch it back to the IRQ number, which fixes this: arch/sh/boards/dreamcast/irq.c: In function `disable_systemasic_irq': arch/sh/boards/dreamcast/irq.c:59: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function) arch/sh/boards/dreamcast/irq.c:59: error: (Each undeclared identifier is reported only once arch/sh/boards/dreamcast/irq.c:59: error: for each function it appears in.) Reported-by: Adrian McMenamin Signed-off-by: Paul Mundt commit dfbbbe92956b849a6704dbd5352348d6ba1165da Author: dmitry pervushin Date: Tue May 15 08:42:22 2007 +0900 sh: Fix clock multiplier on SH7722. This fixes up the master clock multiplier and initial rate propagation for the SH7722 clocks. Signed-off-by: dmitry pervushin Signed-off-by: Paul Mundt commit e113276624104d9c3b25f333d8dd999b804d980a Author: Paul Mundt Date: Tue May 15 08:36:36 2007 +0900 sh: Wire up kdump crash kernel exec in die(). Now that we have the basic kdump support in place, add it in to die() so we can enter the crash kernel automatically. Signed-off-by: Paul Mundt commit f3a9022fd187de41a04de9c5b44ff40e68c6d661 Author: Paul Mundt Date: Mon May 14 19:39:48 2007 +0900 sh: sr.bl toggling around idle sleep. As pointed out by Saito-san, without the sr.bl manipulation we can occasionally hit delays in the idle loop due to interrupt handling, so ensure that interrupts are blocked before going to sleep. At the same time, we throw in TIF_POLLING_NRFLAG for the !hlt_counter case (primarily used by the ST-40 parts). Signed-off-by: Paul Mundt commit 69d87daa18aced7f494bc1d5a977b063bbbdffbd Author: Paul Mundt Date: Mon May 14 17:00:31 2007 +0900 sh: disable genrtc support. sh never had support for this, so remove the option entirely. Signed-off-by: Paul Mundt commit 1d4be747a8077d90e10e1e0b0f8994abb4adacb4 Author: Paul Mundt Date: Mon May 14 16:58:35 2007 +0900 fs: Kill sh dependency for binfmt_flat. Not really sure where this bogosity came from, but there's certainly nothing special about sh that lets us use flat files with the MMU on. Kill the dependency, and leave it as !MMU, like it is for all of the other nommu-wielding ports. Signed-off-by: Paul Mundt commit 9af9a413d21f7a113f4fd909fb9962fea36b6cfa Author: Paul Mundt Date: Mon May 14 12:48:09 2007 +0900 sh: Disable psw support for R7785RP. While R7780RP and R7780MP support this, R7785RP does not. Signed-off-by: Paul Mundt commit 0d08b5fb37835988952d190b4540a71d60a4d198 Author: Paul Mundt Date: Mon May 14 10:49:40 2007 +0900 sh: Fix page size alignment in __copy_user_page(). SH-3 comes up with the PAGE_SIZE on a misaligned boundary: arch/sh/mm/copy_page.S: Assembler messages: arch/sh/mm/copy_page.S:132: Warning: misaligned data fix it up with explicit alignment. Signed-off-by: Paul Mundt commit 27641dee99e0d0c25f224cdfbd11486bd2f131ee Author: Paul Mundt Date: Mon May 14 10:48:01 2007 +0900 sh: Fix up various compile warnings for SE boards. - setup-sh7750.c only defines the sh7751_ipr_map when building with SH7751 support. - 7722 Solution Engine was missing a mach-type entry, causing the macro in cf-enabler to be undefined. - arch/sh/mm/init.c needs linux/pagemap.h. Signed-off-by: Paul Mundt commit 26bbfda8b1a4d491a86c60b3a97948a4f49fb86a Author: Paul Mundt Date: Mon May 14 09:29:55 2007 +0900 sh: Wire up signalfd/timerfd/eventfd syscalls. Signed-off-by: Paul Mundt commit fce692e7986f9689a8f414a74e58c4a6d35d5551 Author: Christoph Hellwig Date: Mon May 14 08:18:14 2007 +0900 sh: revert addition of page fault notifiers Just at the time you added them on sh we're removing them from other architectures. As there's no user yet this patch just removes them completely. Once you actually have a kprobes patch it should follow the direct call to kprobes_fault_handler model that powerpc, s390 and sparc64 employ in 2.6.22-rc1 and that I'm updating other architectures to. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mundt commit e868d61272caa648214046a096e5a6bfc068dc8c Author: Simon Arlott Date: Mon May 14 08:15:10 2007 +0900 spelling fixes: arch/sh/ Spelling fixes in arch/sh/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mundt commit 56a8c8b6ac4d6edba5153d17730aaf96ba8f1f8c Author: Roland Dreier Date: Sun May 20 20:19:24 2007 -0700 IB/mlx4: Check if SRQ is full when posting receive Make mlx4_post_srq_recv() fail if the SRQ is full (head == tail). Signed-off-by: Roland Dreier commit 6cbdc8c5357276307a77deeada3f04626ff17da6 Author: Simon Arlott Date: Fri May 11 20:40:30 2007 +0100 [ARM] spelling fixes Spelling fixes in arch/arm/. Signed-off-by: Simon Arlott Signed-off-by: Russell King commit fc432e1952a3899ce35e84b417e5d60f74cb901b Author: Mariusz Kozlowski Date: Sat May 19 00:39:36 2007 +0200 [ARM] at91_adc parenthesis balance Trivial unbalanced parenthesis macro fix. Signed-off-by: Mariusz Kozlowski Signed-off-by: Russell King commit 69e9c93d0d7d9dfa6bdf5144274dbe65a627b63a Author: Ben Dooks Date: Sun May 20 18:13:32 2007 +0100 [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition Add definition for high-speed MMC/SD device and add to SMDK2443 device list. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 42482e3c77bcb310affdf13e92b93f077d44a7fc Author: Ben Dooks Date: Sun May 20 19:58:10 2007 +0100 [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings Reduce the Twrph0 timing slightly to fit on an SMDK2443. This should still produce valid timings for the NAND devices as it is still over the smallest device fitted to these boards. Signed-off-by: Ben Dooks <(address hidden)> Signed-off-by: Russell King commit 7e966f3c392ffb5297a6ba0ea701d6a20d1d7292 Author: Ben Dooks Date: Sun May 20 18:02:50 2007 +0100 [ARM] 4398/1: S3C2443: Fix watchdog IRQ number Fix the IRQ number for watchdog on S3C2443 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5f2ef21703564d3e6f18fd92f2e72f723a5c3402 Author: Ben Dooks Date: Sun May 20 17:32:39 2007 +0100 [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity Change the name of the S3C2443_SDI1 to S3C2443_HSMMC to ensure that it is correctly identified. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 67364334681503655fbff6c2f2dacfb17f04cadc Author: Ben Dooks Date: Sun May 20 17:17:32 2007 +0100 [ARM] 4396/1: S3C2443: Add missing HCLK clocks Add the clocks missing form HCLKCON back into the set of clocks being registered at initalisation time. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 333a42e1f4c5c5c2ed7c652254c35b9e98d5c789 Author: Ben Dooks Date: Sun May 20 11:55:53 2007 +0100 [ARM] 4395/1: S3C24XX: add include of to relevant machines Include in any machines that use the PM functions which require struct sys_device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 95ba71f76f1cce550cb2e2b345a204d4a926d29c Author: Greg Ungerer Date: Thu May 17 06:22:41 2007 +0100 [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu We don't need valid_phys_addr_range() or valid_mmap_phys_addr_range() for the !CONFIG_MMU case. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 1d28bff7c4ea138032b44d514351b7caceb9fba5 Author: Greg Ungerer Date: Thu May 17 06:12:22 2007 +0100 [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts Fix the formating of the "CPU part" field to be consistent with the other fields for pre-ARM7 parts. One tab to many for them to all line up. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 2446304dd687488c054d0437f2aeef1ef2bfbd02 Author: Eli Cohen Date: Thu May 17 10:32:41 2007 +0300 IB/mlx4: Pass send queue sizes from userspace to kernel Pass the number of WQEs for the send queue and their size from userspace to the kernel to avoid having to keep the QP size calculations in sync between the kernel driver and libmlx4. This fixes a bug seen with the current mlx4_ib driver and current libmlx4 caused by a difference in the calculated sizes for SQ WQEs. Also, this gives more flexibility for userspace to experiment with using multiple WQE BBs for a single SQ WQE. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 2ad8ee713566671875216ebcec64f2eda47bd19d Author: David Woodhouse Date: Tue May 8 00:12:58 2007 +0100 [JFFS2] Fix potential memory leak of dead xattrs on unmount. An xattr_datum which ends up orphaned should be freed by the GC thread. But if we umount before the GC thread is finished, or if we mount read-only and the GC thread never runs, they might never be freed. Clean them up during unmount, if there are any left. Signed-off-by: David Woodhouse commit 8ae5d31263c746f1680d005b33a82d167cdb9eb6 Author: David Woodhouse Date: Sat May 5 17:50:25 2007 +0100 [JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files. When we cannot mark nodes as obsolete, such as on NAND flash, we end up having to delete inodes with !nlink in jffs2_build_remove_unlinked_inode(). However, jffs2_build_xattr_subsystem() runs later than this, and will attach an xref to the dead inode. Then later when the last nodes of that dead inode are erased we hit a BUG() in jffs2_del_ino_cache() because we're not supposed to get there with an xattr still attached to the inode which is being killed. The simple fix is to refrain from attaching xattrs to inodes with zero nlink, in jffs2_build_xattr_subsystem(). It's it's OK to trust nlink here because the file system isn't actually mounted yet, so there's no chance that a zero-nlink file could actually be alive still because it's open. Signed-off-by: David Woodhouse commit 9093bbb2d96d0184f037cea9b4e952a44ebe7c32 Author: Stephen Hemminger Date: Sat May 19 15:39:25 2007 -0700 [NET]: Fix race condition about network device name allocation. Kenji Kaneshige found this race between device removal and registration. On unregister it is possible for the old device to exist, because sysfs file is still open. A new device with 'eth%d' will select the same name, but sysfs kobject register will fial. The following changes the shutdown order slightly. It hold a removes the sysfs entries earlier (on unregister_netdevice), but holds a kobject reference. Then when todo runs the actual last put free happens. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d8cf27287ac7fb5cbfcc4139917a997c39d841ca Author: Patrick McHardy Date: Sat May 19 14:44:15 2007 -0700 [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr When icmp_send is called on the local output path before the packet hits ip_output, skb->dev is not set, causing a crash when sysctl_icmp_errors_use_inbound_ifaddr is set. This can happen with the netfilter REJECT target or IPsec tunnels. Let routing decide the ICMP source address in that case, since the packet is locally generated there is no inbound interface and the sysctl should not apply. The option actually seems to be unfixable broken, on the path after ip_output() skb->dev points to the outgoing device and we don't know the incoming device anymore, so its going to do the absolute wrong thing and pick the address of the outgoing interface. Add a comment about this. Reported by Curtis Doty . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c Author: Patrick McHardy Date: Sat May 19 14:24:16 2007 -0700 [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name The option is named CONFIG_NF_NAT not CONFIG_IP_NF_NAT. Remove the ifdef completely since helpers also expect defragmented packet even without NAT. Noticed by Robert P. J. Day Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5397e97d7533a03b28a7b8aeee648cbb36a8afc6 Author: Patrick McHardy Date: Sat May 19 14:23:52 2007 -0700 [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation When the helper module is removed for a master connection that has a fulfilled expectation, but has already timed out and got removed from the hash tables, nf_conntrack_helper_unregister can't find the master connection to unset the helper, causing a use-after-free when the expected connection is destroyed and releases the last reference to the master. The helper destroy callback was introduced for the PPtP helper to clean up expectations and expected connections when the master connection times out, but doing this from destroy_conntrack only works for unfulfilled expectations since expected connections hold a reference to the master, preventing its destruction. Move the destroy callback to the timeout function, which fixes both problems. Reported/tested by Gabor Burjan . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c92b3a2f1f11655ecf6774b745017a414241d07c Author: Herbert Xu Date: Sat May 19 14:21:18 2007 -0700 [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all This is a natural extension of the changeset [XFRM]: Probe selected algorithm only. which only removed the probe call for xfrm_user. This patch does exactly the same thing for af_key. In other words, we load the algorithm requested by the user rather than everything when adding xfrm states in af_key. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 580e572a4a1bfea2f42af63ba4785ac7dfbcb45d Author: Ilpo Järvinen Date: Sat May 19 13:56:57 2007 -0700 [TCP] FRTO: Prevent state inconsistency in corner cases State could become inconsistent in two cases: 1) Userspace disabled FRTO by tuning sysctl when one of the TCP flows was in the middle of FRTO algorithm (and then RTO is again triggered) 2) SACK reneging occurs during FRTO algorithm A simple solution is just to abort the previous FRTO when such obscure condition occurs... Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 463236557db4b5d4de9eb3fafa2e7d7905ac65ab Author: Ilpo Järvinen Date: Sat May 19 13:56:23 2007 -0700 [TCP] FRTO: Add missing ECN CWR sending to one of the responses The conservative spurious RTO response did not queue CWR even though the sending rate was lowered. Whenever reduction happens regardless of reason, CWR should be sent (forgetting to send it is not very fatal though). A better approach would be to queue CWR when one of the sending rate reducing responses (rate-halving one or this conservative response) is used already at RTO. Doing that would allow CWR to be sent along with the two new data segments that are sent during FRTO. However, it's a bit "racy" because userland could tune the response sysctl to a more aggressive one in between. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit b6ccc67d8e42e38936df330b26ee6d022dda8a64 Author: Mikael Pettersson Date: Sat May 19 13:55:25 2007 -0700 [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error Compiling 2.6.22-rc1 with gcc-3.2.3 for i486 fails with: gcc -m32 -Wp,-MD,net/core/.skbuff.o.d -nostdinc -isystem /home/mikpe/pkgs/linux-x86/gnu/lib/gcc-lib/i486-pc-linux-gnu/3.2.3/include -D__KERNEL__ -Iinclude -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2 -pipe -msoft-float -mregparm=3 -freg-struct-return -mpreferred-stack-boundary=4 -march=i486 -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(skbuff)" -D"KBUILD_MODNAME=KBUILD_STR(skbuff)" -c -o net/core/skbuff.o net/core/skbuff.c net/core/skbuff.c:648:1: directives may not be used inside a macro argument net/core/skbuff.c:647:39: unterminated argument list invoking macro "memcpy" net/core/skbuff.c: In function `pskb_expand_head': net/core/skbuff.c:651: `memcpy' undeclared (first use in this function) net/core/skbuff.c:651: (Each undeclared identifier is reported only once net/core/skbuff.c:651: for each function it appears in.) net/core/skbuff.c:651: syntax error before "skb" make[2]: *** [net/core/skbuff.o] Error 1 make[1]: *** [net/core] Error 2 make: *** [net] Error 2 The patch below implements a simple workaround which is to clone the offending memcpy() call and specialise it for the two different scenarios. Other workarounds are of course possible: e.g. bind the varying parameter in a local variable, or use a macro or inline function to perform the varying computation. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit d007da1fa6f0ad5e01ceae4a1f60cdbb23ecd706 Author: Ivo van Doorn Date: Sat May 19 12:24:39 2007 -0700 [RFKILL]: Fix check for correct rfkill allocation coverity has spotted a bug in rfkill.c (bug id #1627), in rfkill_allocate() NULL was returns if the kzalloc() works, and deref the NULL pointer if it fails, Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit c34b19fb4e243b26fa90a322bf32238356493674 Author: Deepak Saxena Date: Sat May 19 12:00:11 2007 -0700 [IPV6]: Add ip6_tunnel.h to headers_install The Mobile IPv6 package (http://www.mobile-ipv6.org/software/) needs this header file to build the tunnelctl component. The header already looks sanitized so is safe to export. Signed-off-by: Deepak Saxena Signed-off-by: David S. Miller commit 59b0ed121297b57abb2352bdc8313959e7cb5635 Author: Roland Dreier Date: Sat May 19 08:51:58 2007 -0700 IB/mlx4: Fix check of opcode in mlx4_ib_post_send() wr->opcode is invalid if it's >= ARRAY_SIZE(mlx4_ib_opcode), not just strictly >. This was spotted by the Coverity checker (CID 1643). Signed-off-by: Roland Dreier commit 23c15c21d34a4b4b4d7b9a95ce498991c5339c77 Author: Roland Dreier Date: Sat May 19 08:51:57 2007 -0700 mlx4_core: Fix array overrun in dump_dev_cap_flags() Don't overrun fname[] array when decoding device flags. This was spotted by the Coverity checker (CID 1642). Signed-off-by: Roland Dreier commit 65adfa911a3522c1e40e55afd472dd571dc2431b Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mlx4: Fix RESET to RESET and RESET to ERROR transitions According to the IB spec, a QP can be moved from RESET back to RESET or to the ERROR state, but mlx4 firmware does not support this and returns an error if we try. Fix the RESET to RESET transition by just returning 0 without doing anything, and fix RESET to ERROR by moving the QP from RESET to INIT with dummy parameters and then transitioning from INIT to ERROR. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit b18aad7150c85cc86a66be8a1c744b63b41b36e0 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix RESET to ERROR transition According to the IB spec, a QP can be moved from RESET to the ERROR state, but mthca firmware does not support this and returns an error if we try. Work around this FW limitation by moving the QP from RESET to INIT with dummy parameters and then transitioning from INIT to ERROR. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1526130351b31c792ced90c6c5ee08df955696c1 Author: Roland Dreier Date: Sat May 19 08:51:57 2007 -0700 IB/mlx4: Set GRH:HopLimit when sending globally routed MADs This is the same issue discovered in mthca by Rolf Manderscheid . Signed-off-by: Roland Dreier commit 3f37cae6944de9d380c83f717f73d91ec6255d98 Author: Rolf Manderscheid Date: Thu May 17 09:45:48 2007 -0600 IB/mthca: Set GRH:HopLimit when building MLX headers Global CM packets used by rmda_cm were being sent with a GRH:hopLimit of zero, causing them to be dropped by the router. The problem is a missing initialization of the hop_limit field in mthca_read_ah(), which was called by build_mlx_header() when sending a MAD on QP1. Signed-off-by: Rolf Manderscheid Signed-off-by: Roland Dreier commit 1f8f7b7a7b885a0041a21b3d93c507269baf57c8 Author: Eli Cohen Date: Thu May 17 16:32:39 2007 +0300 IB/mlx4: Fix check of max_qp_dest_rdma in modify QP max_qp_dest_rdma is already in natural units - no need to shift. This was discovered by a test that deliberately requests more outstanding atomic operation than the device supports. Found by Sagi Rotem at Mellanox. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit de57c9f102ad7bdc8afa5a1560748cf4f1c18b8e Author: Ali Ayoub Date: Thu May 17 20:58:30 2007 +0300 IB/mthca: Fix use-after-free on device restart Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd5a6ccc0e6d8eed3047b4af0e5c1e7168869cd8 Author: Hoang-Nam Nguyen Date: Wed May 16 14:50:55 2007 +0200 IB/ehca: Return proper error code if register_mr fails Set the return code of ehca_register_mr() to ENOMEM if the corresponding firmware call fails due to out of resources. Some other error codes were explicitly mapped to EINVAL -- just remove those cases so they get mapped to the default case, which already returns EINVAL anyway. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 26bbf13ce1ca21ec69175bcc4b995cb8ffdf8593 Author: Yosef Etigin Date: Sat May 19 08:51:54 2007 -0700 IPoIB: Handle P_Key table reordering SM reconfiguration or failover possibly causes a shuffling of the values in the P_Key table. Right now, IPoIB only queries for the P_Key index once when it creates the device QP, and hence there are problems if the index of a P_Key value changes. Fix this by using the PKEY_CHANGE event to trigger a recheck of the P_Key index. Signed-off-by: Yosef Etigin Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1af4c435f3ab9cdf72ce86c35a455c8bef1d6536 Author: Roland Dreier Date: Sat May 19 08:51:54 2007 -0700 IB/core: Use start_port() and end_port() Clean up ib_query_port() and ib_modify_port() slightly by using the just-added start_port() and end_port() helpers. Signed-off-by: Roland Dreier commit 5eb620c81ce35aa0c533131bf4d06c4c8c2bfadf Author: Yosef Etigin Date: Mon May 14 07:26:51 2007 +0300 IB/core: Add helpers for uncached GID and P_Key searches Add ib_find_gid() and ib_find_pkey() functions that use uncached device queries. The calls might block but the returns are always up-to-date. Cache P_Key and GID table lengths in core to avoid extra port info queries. Signed-off-by: Yosef Etigin Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8b8c8bca3a63073bac20f0fca178e00fdf7f5a09 Author: Roland Dreier Date: Sat May 19 08:51:53 2007 -0700 IB/ipath: Fix potential deadlock with multicast spinlocks Lockdep found the following potential deadlock between mcast_lock and n_mcast_grps_lock: mcast_lock is taken from both interrupt context and process context, so spin_lock_irqsave() must be used to take it. n_mcast_grps_lock is only taken from process context, so at first it seems safe to take it with plain spin_lock(); however, it also nests inside mcast_lock, and hence we could deadlock: cpu A cpu B ipath_mcast_add(): spin_lock_irq(&mcast_lock); ipath_mcast_detach(): spin_lock(&n_mcast_grps_lock); ipath_mcast_find(): spin_lock_irqsave(&mcast_lock); spin_lock(&n_mcast_grps_lock); Fix this by using spin_lock_irq() to take n_mcast_grps_lock. Signed-off-by: Roland Dreier commit 7b82cd8ee7374f803a3daf9a6cbc6eb4bbb10a63 Author: Eli Cohen Date: Mon May 14 11:35:43 2007 +0300 IB/core: Free umem when mm is already gone Free umem when task's mm is already destroyed by the time ib_umem_release gets called. Found by Dotan Barak at Mellanox. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit ccb8f430ac4cfd1acd12ff591918b8b67d73c977 Author: Andrew Victor Date: Mon May 14 14:45:25 2007 +0200 [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver Watchdog driver for the Kendin/Micrel KS8695 processor. Signed-off-by: Andrew Victor Signed-off-by: Wim Van Sebroeck commit 38bdc32af442b6ab09ed61b8b669072098c95dd2 Author: Sam Ravnborg Date: Thu May 17 23:48:19 2007 +0200 mm/slab: fix section mismatch warning Use the new __init_refok marker to avoid the section mismatch warning from slab.c Signed-off-by: Sam Ravnborg commit 577a32f620271416d05f852477151fb51c790bc6 Author: Sam Ravnborg Date: Thu May 17 23:29:25 2007 +0200 mm: fix section mismatch warnings modpost had two cases hardcoded for mm/ Shift over to __init_refok and kill the hardcoded function names in modpost. This has the drawback that the functions will always be kept no matter configuration. With previous code the function were placed in init section if configuration allowed it. Signed-off-by: Sam Ravnborg commit 92080309df1975729a9f8b45fd56528817e34db8 Author: Sam Ravnborg Date: Thu May 17 20:43:54 2007 +0200 init/main: use __init_refok to fix section mismatch Kill a special case in modpost by introducing the __init_refok marker. Signed-off-by: Sam Ravnborg commit 0e0d314e6a01bb14d303e35e6f7ba24b17020044 Author: Sam Ravnborg Date: Thu May 17 20:14:48 2007 +0200 kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings Throughout the kernel there are a few legitimite references to init or exit sections. Most of these are covered by the patterns included in modpost but a few nees special attention. To avoid hardcoding a lot of function names in modpost introduce a marker so relevant function/data can be marked. When modpost see a reference to a init/exit function from a function/data marked no warning will be issued. Idea from: Andrew Morton Signed-off-by: Sam Ravnborg Cc: Andrew Morton commit ca967258b69eb65dcb07bbab90fdf964c6d2ec45 Author: Sam Ravnborg Date: Thu May 17 13:38:44 2007 +0200 all-archs: consolidate .data section definition in asm-generic With this consolidation we can now modify the .data section definition in one spot for all archs. Signed-off-by: Sam Ravnborg commit 7664709b44a13e2e0b545e2dd8e7b8797a1748dc Author: Sam Ravnborg Date: Sun May 13 00:31:33 2007 +0200 all-archs: consolidate .text section definition in asm-generic Move definition of .text section to asm-generic. Signed-off-by: Sam Ravnborg commit cd5477911fc9f5cc64678e2b95cdd606c59a11b5 Author: Li Yang Date: Mon May 14 18:04:28 2007 +0800 kbuild: add "Section mismatch" warning whitelist for powerpc This patch fixes the following class of "Section mismatch" warnings when building powerpc platforms. WARNING: arch/powerpc/kernel/built-in.o - Section mismatch: reference to .init.data:.got2 from prom_entry (offset 0x0) WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.text:mpc8313_rdb_probe from .machine.desc after 'mach_mpc8313_rdb' (at offset 0x4) .... Signed-off-by: Li Yang Signed-off-by: Sam Ravnborg commit f892b7d480eec809a5dfbd6e65742b3f3155e50e Author: Atsushi Nemoto Date: Thu May 17 01:14:38 2007 +0900 kbuild: make better section mismatch reports on i386, arm and mips On i386, ARM and MIPS, warn_sec_mismatch() sometimes fails to show usefull symbol name. This is because empty 'refsym' due to 0 r_addend value. This patch is to adjust r_addend value, consulting with apply_relocate() routine in kernel code. Without this patch: MODPOST vmlinux WARNING: init/built-in.o - Section mismatch: reference to .init.text: from .text between 'rest_init' (at offset 0xf4) and 'try_name' WARNING: mm/built-in.o - Section mismatch: reference to .init.text: from .text between 'kmem_cache_create' (at offset 0x18a39) and 'cache_reap' WARNING: mm/built-in.o - Section mismatch: reference to .init.text: from .text between 'kmem_cache_create' (at offset 0x18a6b) and 'cache_reap' With this patch: MODPOST vmlinux WARNING: mm/built-in.o - Section mismatch: reference to .init.text:set_up_list3s from .text between 'kmem_cache_create' (at offset 0x18a39) and 'cache_reap' WARNING: mm/built-in.o - Section mismatch: reference to .init.text:set_up_list3s from .text between 'kmem_cache_create' (at offset 0x18a6b) and 'cache_reap' Now modpost can detect "kernel_init" name (and whitelist it) and show "set_up_list3s" name. Signed-off-by: Atsushi Nemoto Signed-off-by: Sam Ravnborg commit 2560120997403581dd824e5bd2389c719edcbf12 Author: Russell King Date: Thu May 10 23:03:25 2007 +0100 kbuild: make modpost section warnings clearer Change modpost section mismatch warnings to be less confusing; model them on the binutils linker warnings which we all know how to interpret. Also, fix the wrong ordering of arguments for the final case - fromsec and refsymname were reversed. Signed-off-by: Russell King Acked-by: Acked-by: David S. Miller Signed-off-by: Sam Ravnborg commit 03c9587d752669a12fd553b0cbd835f77b176607 Author: Mike Frysinger Date: Thu May 17 15:06:31 2007 -0400 kconfig: search harder for curses library in check-lxdialog.sh The check-lxdialog.sh script searches for "libFOO.so" which fails on OS X, due to their special naming of libraries like "libfoo.dylib". This patch turns the curses lib search into extensible loops and adds dylib as a valid extension. Signed-off-by: Mike Frysinger Signed-off-by: Sam Ravnborg commit fc31c7716355a226b8ed4e16f4581e5c8fa53570 Author: Mike Frysinger Date: Thu May 17 14:57:20 2007 -0400 kbuild: include limits.h in sumversion.c for PATH_MAX POSIX says limits.h defines PATH_MAX so we should include it (which fixes compiling on some systems like OS X). Signed-off-by: Mike Frysinger Signed-off-by: Sam Ravnborg commit d1ab423502e787e264b4797a5fa200d804c4fd63 Author: Sylvain Munaut Date: Tue May 8 19:59:29 2007 +1000 powerpc: Fix the MODALIAS generation in modpost for of devices Since the devices may have multiple (or none) compatible properties, the uevent generated internally by the kernel may have multiple "C..." entries. So the MODALIAS stored in the module must have wilcard before and after the compatible entry. Also, if the 'compatible' field is not used for matching, there will be no 'C' and that must handled as well. The previous code handled all those case incorrectly and it "mostly" worked ... but not always. Signed-off-by: Sylvain Munaut Signed-off-by: Paul Mackerras Signed-off-by: Sam Ravnborg commit da7cd59ab9c8ed233df4809f6c8c90c636f676c7 Author: Herbert Xu Date: Sat May 19 14:51:00 2007 +1000 [CRYPTO] api: Read module pointer before freeing algorithm The function crypto_mod_put first frees the algorithm and then drops the reference to its module. Unfortunately we read the module pointer which after freeing the algorithm and that pointer sits inside the object that we just freed. So this patch reads the module pointer out before we free the object. Thanks to Luca Tettamanti for reporting this. Signed-off-by: Herbert Xu commit 55b637c6a003a8c4850b41a2c2fd6942d8a7f530 Author: Linus Torvalds Date: Fri May 18 21:06:17 2007 -0700 Linux v2.6.22-rc2 commit e9ca75b53576ddf82ea2d803f87c59dffac7bc42 Author: Gerald Britton Date: Mon May 14 13:53:01 2007 -0400 cciss: Fix pci_driver.shutdown while device is still active Fix an Oops in the cciss driver caused by system shutdown while a filesystem on a cciss device is still active. The cciss_remove_one function only properly removes the device if the device has been cleanly released by its users, which is not the case when the pci_driver.shutdown method is called. This patch adds a new cciss_shutdown function to better match the pattern used by various SCSI drivers: deactivate device interrupts and flush caches. It also alters the cciss_remove_one function to match and readds the __devexit annotation that was removed when cciss_remove_one was serving as the pci_driver.shutdown method. Signed-off-by: Gerald Britton Acked-by: Mike Miller Signed-off-by: Linus Torvalds commit dec04cff500d4e543c55ab1beb0af85d8ed7e6bd Author: H. Peter Anvin Date: Thu May 17 15:50:47 2007 -0700 Further update of the i386 boot documentation A number of items in the i386 boot documentation have been either vague, outdated or hard to read. This text revision adds several more examples, including a memory map for a modern kernel load. It also adds a field-by-field detailed description of the setup header, and a bootloader ID for Qemu. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 1a06a52ee1b0cdb65222474ba6186f3991df68b0 Author: Rolf Eike Beer Date: Thu May 17 23:56:56 2007 +0200 Fix roundup_pow_of_two(1) 1 is a power of two, therefore roundup_pow_of_two(1) should return 1. It does in case the argument is a variable but in case it's a constant it behaves wrong and returns 0. Probably nobody ever did it so this was never noticed. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit a8c8be08e023cf65f103442d1c71710fad7a0905 Author: Tony Luck Date: Fri May 18 15:11:34 2007 -0700 [IA64] Yet another section mismatch warning reference to .init.data: from .text between 'sn_cpu_init' (at offset 0x1411) and 'nasid_slice_to_cpuid' reference to .init.data: from .text between 'sn_cpu_init' (at offset 0x1420) and 'nasid_slice_to_cpuid' The offending .init.data object is shub_1_1_found which should be declared in __cpuinitdata, not in __initdata Signed-off-by: Tony Luck commit 9f57195b2db94488999c9cb8a1e0a6332644d5de Author: Tony Luck Date: Fri May 18 14:15:58 2007 -0700 [IA64] Fix bogus messages about system calls not implemented. There are seven legacy system calls that ia64 doesn't implement, but glibc provides equivalent functionality by using more modern system calls. Stop checksyscalls.sh from complaining about these seven. Signed-off-by: Tony Luck commit 18963c01b8abf381f102752ce024c3582a716125 Author: Davide Libenzi Date: Fri May 18 12:02:33 2007 -0700 timerfd use waitqueue lock ... The timerfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes timerfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi Signed-off-by: Linus Torvalds commit d48eb2331595224ffe89665e79721d44b40bb047 Author: Davide Libenzi Date: Fri May 18 12:02:33 2007 -0700 eventfd use waitqueue lock ... The eventfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes eventfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi Signed-off-by: Linus Torvalds commit 32f9306b161a5e0c892132f7227f36de94090289 Author: Christoph Lameter Date: Fri May 18 00:36:43 2007 -0700 slub: another slabinfo fix The slab manipulation functions should not be triggered by slabs that are unresovable in the subset of slabs selected on the command line. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 223a10a98135da38d3668973d72cdffb1ced4b7d Author: Oleg Nesterov Date: Fri May 18 00:36:42 2007 -0700 revert "cancel_delayed_work: use del_timer() instead of del_timer_sync()" As pointed out by Jarek Poplawski, the patch [WORKQUEUE]: cancel_delayed_work: use del_timer() instead of del_timer_sync() commit: 071b638689464c6b39407025eedd810d5b5e6f5d was wrong, it was merged by mistake after that. From the changelog: after this patch: ... delayed_work_timer_fn->__queue_work() in progress. The latter doesn't differ from the caller's POV, it does make a difference if the caller calls flush_workqueue() after cancel_delayed_work(), in that case flush_workqueue() can miss this work_struct. Signed-off-by: Oleg Nesterov Cc: Jarek Poplawski Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6c5d736af6bc71cebc017e4001ec5efff1ee116 Author: David S. Miller Date: Fri May 18 02:07:50 2007 -0700 [IPV4]: Remove IPVS icmp hack from route.c for now. Revert: 2d771cd86d4c3af26f34a7bcdc1b87696824cad9 This is dangerous if enabled and a better solution to the problem is being worked on. Signed-off-by: David S. Miller commit 29059d12e0c7f349aca6993acac20c5efbe13b81 Author: Herbert Xu Date: Fri May 18 16:25:19 2007 +1000 [CRYPTO] tcrypt: Add missing error check The return value of crypto_hash_final isn't checked in test_hash_cycles. This patch corrects this. Thanks to Eric Sesterhenn for reporting this. Signed-off-by: Herbert Xu commit 03983ab858ae6aea273060277c9b290498340047 Author: David S. Miller Date: Thu May 17 22:55:26 2007 -0700 [SPARC64]: Fix sched_clock() et al. SPARC64_NSEC_PER_CYC_SHIFT was set too high. Signed-off-by: David S. Miller commit b46522394dde7341a5253658096f354b65cbd90d Author: Linus Torvalds Date: Thu May 17 20:18:11 2007 -0700 Revert "[PATCH] x86: Drop cc-options call for all options supported in gcc 3.2+" This reverts commit c8fdd247255a3a027cd9f66dcf93e6847d1d2f85. It turns out the kernel was correct, and the gcc complaint was a gcc bug. The preferred stack boundary is expressed not in bytes, but in the the log2() of the preferred boundary, so "-mpreferred-stack-boundary=2" is in fact exactly what we want, but a gcc that is compiled for x86-64 will consider it an error (because the 64-bit calling sequence says that the stack should be 16-byte aligned) even if we are then using "-m32" to generate 32-bit code. Noted-by: Mikulas Patocka Cc: Jan Hubicka Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit d158325e407864793c5b0fbc85c74702753333b9 Author: Herbert Xu Date: Fri May 18 13:17:22 2007 +1000 [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again Turning it into a boolean was unnecessary and caused ALGAPI to be pinned down as a boolean to. This patch makes it a tristate again. Signed-off-by: Herbert Xu commit 8fd7d1b16ea0e1b3b0823ed91b58993d6c6a1cc6 Author: Tejun Heo Date: Thu May 17 13:37:12 2007 +0200 sata_via: pcim_iomap_regions() conversion missed BAR5 pcim_iomap_regions() conversion missed BAR5. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d9aca22cf443f5ed77d15a320abbab055ae4a976 Author: Tejun Heo Date: Thu May 17 16:43:26 2007 +0200 libata: remove libata.spindown_compat With STANDBYDOWN tracking added, libata.spindown_compat isn't necessary anymore. If userspace shutdown(8) issues STANDBYNOW, libata warns. If userspace shutdown(8) doesn't issue STANDBYNOW, libata does the right thing. Userspace can tell whether kernel supports spindown by testing whether sysfs node manage_start_stop exists as before. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1daf9ce74e0e0ef8ffde800ab495339458c3375f Author: Tejun Heo Date: Thu May 17 13:13:57 2007 +0200 sata_nv: fix fallout of devres conversion As with all other drivers, sata_nv's hpriv is allocated with devm_kzalloc() and there's no need to free it explicitly. Kill nv_remove_one() which incorrectly used kfree() instead of devm_kfree() and use ata_pci_remove_one() directly. Original fix is from Peer Chen. Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit 074b8ba3863dd168befdba6c9115e990349a6755 Author: Peer Chen Date: Thu May 10 22:48:49 2007 -0700 drivers/ata: remove the wildcard from sata_nv driver Because nvidia SATA controllers onward base on AHCI, so wildcard in sata_nv driver is unnecessary. Also the wildcard sometimes cause sata_nv driver to be loaded for AHCI controllers,which is not as expected. Signed-off-by: Peer Chen Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e94bd23f67c87011f012f26ca0af3fcf6878eeac Author: Auke Kok Date: Wed May 16 01:49:46 2007 -0700 e1000: Fix msi enable leak on error, don't print error message, cleanup pci_enable_msi failure is a normal event so we should not print any error. Going over the code I spotted a missing pci_disable_msi() leak when irq allocation fails. The whole code also needed a cleanup, so I combined the two different calls to pci_request_irq into a single call making this look a lot better. All #ifdef CONFIG_PCI_MSI's have been removed. Compile tested with both CONFIG_PCI_MSI enabled and disabled. Signed-off-by: Auke Kok Cc: H. Peter Anvin Signed-off-by: Jeff Garzik commit fb136c070bfdde11dc79758674f54fb26bba1a2f Author: Auke Kok Date: Thu May 17 15:29:07 2007 -0700 ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak pci_enable_msi calls can fail for normal operational reasons. Driver should not print an error message in that case. Fix a leak that leaves msi enabled if pci_request_irq fails. We can remove CONFIG_PCI_MSI ifdefs alltogether Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 4a79a04e4c0aa06b556b7d52bfb31c05fbb05616 Author: Mithlesh Thukral Date: Thu May 17 06:52:25 2007 -0700 NetXen: Fix NetXen driver ping on system-p NetXen: Fix for driver on System-p This patch will fix a ping issue on system-p Signed-off by: Milan Bag Signed-off by: Adhiraj Joshi Signed-by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit 98739407c529899820135b1fba87ccd1a411edda Author: Christoph Hellwig Date: Wed May 16 16:58:00 2007 -0500 spidernet: node-aware skbuff allocation Spidernet was the driver I original did all the node-aware netdevice allocation for, but after a year it still hasn't hit mainline. Signed-off-by: Christoph Hellwig Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 3b6330ce2a3e1f152f79a6203f73d23356e243a7 Author: Scott Wood Date: Wed May 16 15:06:59 2007 -0500 gianfar: Add I/O barriers when touching buffer descriptor ownership. The hardware must not see that is given ownership of a buffer until it is completely written, and when the driver receives ownership of a buffer, it must ensure that any other reads to the buffer reflect its final state. Thus, I/O barriers are added where required. Without this patch, I have observed GCC reordering the setting of bdp->length and bdp->status in gfar_new_skb. Hardware reordering was also theoretically possible. Signed-off-by: Scott Wood Signed-off-by: Jeff Garzik commit dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3 Author: Eugene Surovegin Date: Wed May 16 12:01:05 2007 -0700 ibm_emac: fix link speed detection change Fix link speed detection change. Thanks to Stefan Roese for finding this bug. CC: Stefan Roese Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit 5bb96e9f2434b49a5b8f135f2a384974aa73db51 Author: Eugene Surovegin Date: Wed May 16 11:59:48 2007 -0700 ibm_emac: improved PHY support Original patch is from Jeff Haran with my minor style fixes. His comments follow: The first problem was in the function that configures the PHY for autonegotiation, genmii_setup_aneg(). The original code does a read/modify/write of the autonegotiation advertizement register (reg 4), followed by a read/modify/write of the control register (reg 0). While the original code follows the proper procedure as per reading the IEEE specs, what I found is that on at least one PHY model (National DP83843) the read of the control register comes back with the soft reset bit set (bit 15). Because of the read/modify/write operation, this causes the write to write a 1 back to the reset bit, which initiates a software reset of the PHY. This software reset causes the PHY to return to its power up state which advertizes all modes of operation, thus negating the write to the autoneg advertizement register. The modification is to spin reading the control register until the soft reset bit is clear before doing the modify/write. The second problem was in the function that configures the PHY for forced operation, genmii_setup_forced(). The original code initiates a software reset operation via a write of a 1 to bit 15 of the control register (reg 0), but then proceeds to do a second write to that same register without waiting until that reset bit is cleared by the PHY itself (which according to the IEEE specs indicates that the PHY reset is complete). This is a violation of how one is supposed to use this software reset feature of these PHYs and I believe was the cause of mysterious, difficult to reproduce link failures that we've observed on some of our systems that use this driver. The fix is to modify the function so that it spins waiting for the reset bit to clear after doing the soft reset and before doing the subsequent write. Signed-off-by: Jeff Haran CC: Benjamin Herrenschmidt Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit 0ec6d95053885055a50d973b3a3906905a78a8bf Author: Eugene Surovegin Date: Wed May 16 11:57:37 2007 -0700 ibm_emac: fix section mismatch warnings Fix "Section mismatch" warnings Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit bb33808d282a48803dcb6070ee1547d221669114 Author: Christoph Hellwig Date: Wed May 16 14:59:04 2007 +0200 small netdevices.txt fix Signed-off-by: Christoph Hellwig Signed-off-by: Jeff Garzik commit 50432cb534b566c4fd9e371fb37464a65ccd2391 Author: Stephen Hemminger Date: Mon May 14 12:38:15 2007 -0700 sky2: memory barriers change Do some memory barrier changes for safety/perfomance: Don't need read after update to index, mmiowb() followed by read at end of irq is sufficient. Signed-off-by: Stephn Hemminger Signed-off-by: Jeff Garzik commit 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834 Author: Stephen Hemminger Date: Mon May 14 12:38:14 2007 -0700 sky2: remove dual port workaround This workaround was added to deal with NAPI core and how it affected dual port shared polling. It turned out not to be necessary. Stopping device 0 only doesn't stop NAPI from working completely after that. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a3caeada948535f126e407457e15f2633ee7168a Author: Stephen Hemminger Date: Mon May 14 12:38:13 2007 -0700 sky2: MIB counter overflow handling Make sure that if we ever get a MIB counter overflow interrupt (normally masked off), that the IRQ is cleared. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3225b919036a3ec2e96bb36b7a4fd64c43fdbe84 Author: Stephen Hemminger Date: Mon May 14 12:38:12 2007 -0700 sky2: keep track of receive alloc failures When driver can't allocate receive buffer it drops incoming packet. Keep a counter. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 53419c68517ee296f737cdc0acaca6eb1ae23aeb Author: Stephen Hemminger Date: Mon May 14 12:38:11 2007 -0700 sky2: PHY register settings Align the PHY setup of the sky2 driver with the vendor sk98lin (10.0.4.3) driver. The PHY register settings are mostly black magic, even with access to the documentation it isn't clear what the right values are. The changes are mostly comments, the code change only affects the Yukon FE (100 mbit only) version. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit abc368a17c00b3c7837498cdb4e166cfdeefbe98 Author: Stephen Hemminger Date: Mon May 14 12:38:10 2007 -0700 sky2: remove Gigabyte 88e8056 restriction The problems with Gigabyte motherboards are system configuration dependent. Since it works fine for some users, it doesn't make sense to deprive them. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d739437207064cdcea8f9c81442284106cbcb67f Author: Dave Jones Date: Thu May 17 15:02:21 2007 -0700 [IPV4]: Correct rp_filter help text. As mentioned in http://bugzilla.kernel.org/show_bug.cgi?id=5015 The helptext implies that this is on by default. This may be true on some distros (Fedora/RHEL have it enabled in /etc/sysctl.conf), but the kernel defaults to it off. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 2ff011efa4cc591ed563241bae3d60bc0eaac210 Author: David S. Miller Date: Thu May 17 00:07:47 2007 -0700 [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS These two congestion control modules share code. Signed-off-by: David S. Miller commit a02ba041664171563e6418ccdf3b363d32d6a43b Author: Stephen Hemminger Date: Thu May 17 00:04:18 2007 -0700 [TCP] slow start: Make comments and code logic clearer. Add more comments to describe our version of tcp_slow_start(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4ce61d1c7a8ef4c1337fa983a3036d4010e3c19e Author: Satyam Sharma Date: Wed May 16 23:50:16 2007 -0700 [BLUETOOTH]: Fix locking in hci_sock_dev_event(). We presently use lock_sock() to acquire a lock on a socket in hci_sock_dev_event(), but this goes BUG because lock_sock() can sleep and we're already holding a read-write spinlock at that point. So, we must use the non-sleeping BH version, bh_lock_sock(). However, hci_sock_dev_event() is called from user context and hence using simply bh_lock_sock() will deadlock against a concurrent softirq that tries to acquire a lock on the same socket. Hence, disabling BH's before acquiring the socket lock and enable them afterwards, is the proper solution to fix socket locking in hci_sock_dev_event(). Signed-off-by: Satyam Sharma Signed-off-by: Marcel Holtmann Signed-off-by: Jiri Kosina Signed-off-by: David S. Miller commit 689d79469b64662440a93ffbd1cbf994510bcbf6 Author: David S. Miller Date: Wed May 16 00:30:09 2007 -0700 [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h Noticed by Matvejchikov Ilya. Signed-off-by: David S. Miller commit 723e98b79c5f2dd97ce559506362844b1a086f80 Author: Jarek Poplawski Date: Tue May 15 22:46:18 2007 -0700 [NET]: lockdep classes in register_netdevice After initializing dev->_xmit_lock register_netdevice() sets lockdep class according to dev->type. Idea of this patch - by David Miller. Reported & tested by: "Yuriy N. Shkandybin" Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 0479ea0eab197b3e5d4c731f526c02e5e3fbfbd0 Author: David Woodhouse Date: Thu May 17 18:48:12 2007 +0800 Fix incorrect prototype for ipxrtr_route_packet() The function ipxrtr_route_packet() takes a 'len' argument of type size_t. However, its prototype in af_ipx.c incorrectly suggests that the corresponding argument is of type 'int' instead. Discovered by building with --combine and letting the compiler see it all at once. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit b5b82df6f461e66af821bff5b51f336af92d96b6 Author: David Woodhouse Date: Thu May 17 14:27:39 2007 +0800 NS16550A: Restore HS settings in EXCR2 on resume After a suspend/resume cycle, the UART may have been reset into low-speed mode -- either because it's actually been reset, or because the firmware pokes at the old-style divisor registers. If we detected it as a NS16550A SuperIO chip in the first place and set baud_base to 921600, then we should do so again in the resume path. This patch adds that code to serial8250_resume_port(), and also makes serial8250_resume() actually call serial8250_resume_port() for each port instead of just calling uart_resume_port() directly. And thus fixes serial port operation after suspend/resume. It also fixes a bogus comment where we write the EXCR2 register with a comment saying /* EXCR1 */ Signed-off-by: David Woodhouse Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit c97a9e10eaee328e6eea9f76acf7bacd7d48ef56 Author: Nick Piggin Date: Wed May 16 22:11:21 2007 -0700 mm: more rmap checking Re-introduce rmap verification patches that Hugh removed when he removed PG_map_lock. PG_map_lock actually isn't needed to synchronise access to anonymous pages, because PG_locked and PTL together already do. These checks were important in discovering and fixing a rare rmap corruption in SLES9. Signed-off-by: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea125892a17f43919c726777ed1e4929d41e7984 Author: Christoph Lameter Date: Wed May 16 22:11:21 2007 -0700 Fix page allocation flags in grow_dev_page() grow_dev_page() simply passes GFP_NOFS to find_or_create_page. This means the allocation of radix tree nodes is done with GFP_NOFS and the allocation of a new page is done using GFP_NOFS. The mapping has a flags field that contains the necessary allocation flags for the page cache allocation. These need to be consulted in order to get DMA and HIGHMEM allocations etc right. And yes a blockdev could be allowing Highmem allocations if its a ramdisk. Cc: Hugh Dickins Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d98a690f58e0d6ecf424b7ca84488475cf87bd9 Author: Rafael J. Wysocki Date: Wed May 16 22:11:19 2007 -0700 swsusp: fix sysfs interface The sysfs files /sys/power/disk and /sys/power/state do not work as documented, since they allow the user to write only a few initial characters of the input string to trigger the option (eg. 'echo pl > /sys/power/disk' activates the platform mode of hibernation). Fix it. Special thanks to Peter Moulder for pointing out the problem. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7925409e202a41176b729671eab6e610a54153cd Author: Jan Kara Date: Wed May 16 22:11:19 2007 -0700 circular locking dependency found in QUOTA OFF i_mutex on quota files is special. Unlike i_mutexes for other inodes it is acquired under dqonoff_mutex. Tell lockdep about this lock ranking. Also comment and code in quota_sync_sb() seem to be bogus (as i_mutex for quota file can be acquired under dqonoff_mutex). Move truncate_inode_pages() call under dqonoff_mutex and save some problems with races... Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb49b32fece7910fbb02a6934bca4495596f6c8c Author: Hugh Dickins Date: Wed May 16 22:11:18 2007 -0700 i386: don't check_pgt_cache in flush_tlb_mm No other architecture calls check_pgt_cache() from within flush_tlb_mm(), and i386 is already calling check_pgt_cache() from the usual places, tlb_finish_mmu() and cpu_idle() (the latter being odd, but not unusual). flush_tlb_mm() has no business to be freeing pages: remove that line, which sneaked in with slub's i386 support. Signed-off-by: Hugh Dickins Cc: Andi Kleen Acked-by: Christoph Lameter Acked-by: William Lee Irwin III Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9f2875b7968453a852e1de5d3504fd2241e8989 Author: Nate Diller Date: Wed May 16 22:11:17 2007 -0700 ecryptfs: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71ce92f3fa442069670a52fa6230a6064c4517b3 Author: Dan Aloni Date: Wed May 16 22:11:16 2007 -0700 make sysctl/kernel/core_pattern and fs/exec.c agree on maximum core filename size Make sysctl/kernel/core_pattern and fs/exec.c agree on maximum core filename size and change it to 128, so that extensive patterns such as '/local/cores/%e-%h-%s-%t-%p.core' won't result in truncated filename generation. Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc88d5d4e18add7283770ead2734b601c50b3e2a Author: wendy xiong Date: Wed May 16 22:11:16 2007 -0700 icom: add new sub-device-id to support new adapter This patch add new sub-device-id to support new adapter and changed the interrupt irq number for unsigned char to unsigned int. [akpm@osdl.org: fix whitespace in device table] Signed-off by: Wendy Xiong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e40659c5cae2397d6a329e652aa2d4f1c9f7de2a Author: David Brownell Date: Wed May 16 22:11:15 2007 -0700 rtc kconfig clarification Make drivers/rtc/Kconfig be clearer about what the various "interfaces" actually mean, by showing path names. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558a40f708bbfb1b260d605cca6c3b9d2c86453e Author: David Brownell Date: Wed May 16 22:11:14 2007 -0700 rtc-omap build fix Fix typo which breaks build. How did that happen? Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83c6590cb83d3106df12fee36ac2a261951b8c88 Author: David Brownell Date: Wed May 16 22:11:13 2007 -0700 gpio interface loosens call restrictions Loosen gpio_{request,free}() and gpio_direction_{in,out}put() call context restrictions slightly, so a common idiom is no longer an error: board init code setting up spinlock-safe GPIOs before tasking is enabled. The issue was caught by some paranoid code with might_sleep() checks. The legacy platform-specific GPIO interfaces stick to spinlock-safe GPIOs, so this change reflects current implementations and won't break anything. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621e59a771f310358ade8f14cb745d5d5f1c410e Author: Randy Dunlap Date: Wed May 16 22:11:12 2007 -0700 docbook: make kernel-locking table readable Andi Kleen pointed out to me that the kernel locking cheat sheet table entries are unreadable. Make table entries smaller so that pdf and ps output is readable (columns were being overwritten and garbled) by using abbreviations. This allows the tables to fit on one page cleanly. Add a Legend for the abbreviations: SLIS: spin_lock_irqsave SLI: spin_lock_irq SL: spin_lock SLBH: spin_lock_bh DI: down_interruptible Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dd1a32968d5e4cc61d4f7e3dc396ed0faca6984 Author: Randy Dunlap Date: Wed May 16 22:11:12 2007 -0700 parport: mailing list is subscribers-only linux-parport is subscribers-only: Your mail to 'Linux-parport' with the subject Re: [QUESTION] parallel console configuration Is being held until the list moderator can review it for approval. The reason it is being held: Post by non-member to a members-only list Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3dfd2964ea86ae65f511b10d62ea54d46db3708 Author: Oleg Nesterov Date: Wed May 16 22:11:11 2007 -0700 make freezeable workqueues singlethread It is a known fact that freezeable multithreaded workqueues doesn't like CPU_DEAD. We keep them only for the incoming CPU-hotplug rework. Sadly, we can't just kill create_freezeable_workqueue() right now, make them singlethread. Signed-off-by: Oleg Nesterov Cc: "Rafael J. Wysocki" Cc: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1a4849c419337f649c6633219b555eb4d4d955a Author: Gerd Hoffmann Date: Wed May 16 22:11:09 2007 -0700 Refine SCREEN_INFO sanity check for vgacon initialization Refine SCREEN_INFO sanity check for vgacon initialization. Checking video mode field only to see whenever SCREEN_INFO is initialized is not enougth, in some cases it is zero although a vga card is present. Lets additionally check cols and lines. Signed-off-by: Gerd Hoffmann Cc: Rusty Russell Cc: Andi Kleen Cc: Alan Cc: Ingo Molnar Acked-by: Eric W. Biederman Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79974a0e4c6be6e9a3717b4c5a5d5c44c36b1653 Author: Heiko Carstens Date: Wed May 16 22:11:09 2007 -0700 Let smp_call_function_single return -EBUSY on UP All architectures that have an implementation of smp_call_function_single let it return -EBUSY if it is asked to execute func on the current cpu. (akpm: except for x86_64). Therefore the UP version must always return -EBUSY. [akpm@linux-foundation.org: build fix] Signed-off-by: Heiko Carstens Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8317f14b60c02c69cf7f594e2aabc8a3fdc9618d Author: Heiko Carstens Date: Wed May 16 22:11:08 2007 -0700 simplify compat_sys_timerfd Just thought this is easier to read. Acked-by: Davide Libenzi Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d55e2ca87321b65387d3c52dd38128b3fe6723b0 Author: Benjamin Herrenschmidt Date: Wed May 16 22:11:07 2007 -0700 Make __vunmap static __vunmap doesn't seem to be used outside of mm/vmalloc.c, and has no prototype in any header so let's make it static Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df652fe173c12d29960f3a8eafce29041e86b942 Author: Bernhard Walle Date: Wed May 16 22:11:06 2007 -0700 i386/x86-64: fix section mismatch WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:mtrr_bp_init from .text between 'id entify_cpu' (at offset 0x6571) and 'IRQ0x20_interrupt' It's because identify_cpu() which is __cpuinit calls mtrr_bp_init() which is __init(). __cpuinit() expands to nothing if CONFIG_HOTPLUG_CPU=y and so the call is illegal. Signed-off-by: Bernhard Walle Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f363d16fbb9374c0bd7f2757d412c287169094c9 Author: Aaron Durbin Date: Wed May 16 22:11:06 2007 -0700 acpi: fix potential call to a freed memory section. Strip __cpuinit[data] from Node <-> PXM routines and supporting data structures. Also make pxm_to_node_map and node_to_pxm_map local to the numa acpi module. This fixes a bug triggered by the following conditions: - boot on a machine with a SLIT table defined - kernel is configured w/ CONFIG_HOTPLUG_CPU=n - cat /sys/devices/system/node/node*/distance This will cause an oops by calling into a freed memory section. In particular, on x86_64, __node_distance calls node_to_pxm(). Signed-off-by: Aaron Durbin Cc: Len Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aa817f078b655d0ae36669169d73a5c8a388016 Author: Christoph Lameter Date: Wed May 16 22:11:01 2007 -0700 Slab allocators: define common size limitations Currently we have a maze of configuration variables that determine the maximum slab size. Worst of all it seems to vary between SLAB and SLUB. So define a common maximum size for kmalloc. For conveniences sake we use the maximum size ever supported which is 32 MB. We limit the maximum size to a lower limit if MAX_ORDER does not allow such large allocations. For many architectures this patch will have the effect of adding large kmalloc sizes. x86_64 adds 5 new kmalloc sizes. So a small amount of memory will be needed for these caches (contemporary SLAB has dynamically sizeable node and cpu structure so the waste is less than in the past) Most architectures will then be able to allocate object with sizes up to MAX_ORDER. We have had repeated breakage (in fact whenever we doubled the number of supported processors) on IA64 because one or the other struct grew beyond what the slab allocators supported. This will avoid future issues and f.e. avoid fixes for 2k and 4k cpu support. CONFIG_LARGE_ALLOCS is no longer necessary so drop it. It fixes sparc64 with SLAB. Signed-off-by: Christoph Lameter Signed-off-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ec0974210fe1b7c0618ad6e39a882a4237d7de2 Author: Christoph Lameter Date: Wed May 16 22:11:00 2007 -0700 SLUB: Simplify debug code Consolidate functionality into the #ifdef section. Extract tracing into one subroutine. Move object debug processing into the #ifdef section so that the code in __slab_alloc and __slab_free becomes minimal. Reduce number of functions we need to provide stubs for in the !SLUB_DEBUG case. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a35afb830f8d71ec211531aeb9a621b09a2efb39 Author: Christoph Lameter Date: Wed May 16 22:10:57 2007 -0700 Remove SLAB_CTOR_CONSTRUCTOR SLAB_CTOR_CONSTRUCTOR is always specified. No point in checking it. Signed-off-by: Christoph Lameter Cc: David Howells Cc: Jens Axboe Cc: Steven French Cc: Michael Halcrow Cc: OGAWA Hirofumi Cc: Miklos Szeredi Cc: Steven Whitehouse Cc: Roman Zippel Cc: David Woodhouse Cc: Dave Kleikamp Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: Anton Altaparmakov Cc: Mark Fasheh Cc: Paul Mackerras Cc: Christoph Hellwig Cc: Jan Kara Cc: David Chinner Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5577bd8a85c8b7643a241789b14fafa9c8a6c7db Author: Christoph Lameter Date: Wed May 16 22:10:56 2007 -0700 SLUB: Do our own flags based on PG_active and PG_error The atomicity when handling flags in SLUB is not necessary since both flags used by SLUB are not updated in a racy way. Flag updates are either done during slab creation or destruction or under slab_lock. Some of these flags do not have the non atomic variants that we need. So define our own. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eefaca9c3246f3daf56e7ed02987f79abcee7087 Author: Christoph Lameter Date: Wed May 16 22:10:55 2007 -0700 SLUB: slabinfo fixes Align the output of % with K/M/G of sizes. Check for empty NUMA information to avoid segfault on !NUMA. -r should work directly not only if we match a single slab without additional options. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ade3aff25fb2dce76e2a9b53e1334bd0a174f739 Author: Andrew Morton Date: Wed May 16 22:10:54 2007 -0700 slub: fix handling of oversized slabs I'm getting zillions of undefined references to __kmalloc_size_too_large on alpha. For some reason alpha is building out-of-line copies of kmalloc_slab() into lots of compilation units. It turns out that gcc just isn't smart enough to work out that __builtin_contant_p(size)==true implies that __builtin_contant_p(index)==true. So let's give it a bit of help. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b44f7a5b5078d737b3f5914978aabb761254840 Author: Christoph Lameter Date: Wed May 16 22:10:53 2007 -0700 slab: warn on zero-length allocations slub warns on this, and we're working on making kmalloc(0) return NULL. Let's make slab warn as well so our testers detect such callers more rapidly. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b6f0750457db1f573eb6226960a432da3be8fe2 Author: Christoph Lameter Date: Wed May 16 22:10:53 2007 -0700 SLUB: Define functions for cpu slab handling instead of using PageActive Use inline functions to access the per cpu bit. Intoduce the notion of "freezing" a slab to make things more understandable. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca12ee549f7837b8a685dddc9515f9fc28434ee Author: Christoph Lameter Date: Wed May 16 22:10:52 2007 -0700 SLAB: Move two remaining SLAB specific definitions to slab_def.h Two definitions remained in slab.h that are particular to the SLAB allocator. Move to slab_def.h Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fbf09a09e8aa50c56e2c6dfacc27eff93ff4c93 Author: Christoph Lameter Date: Wed May 16 22:10:51 2007 -0700 SLUB: Remove depends on EXPERIMENTAL and !ARCH_USES_SLAB_PAGE_STRUCT No arch sets ARCH_USES_SLAB_PAGE_STRUCT anymore. Remove the experimental dependency as well since we want to have it as a real alternative to SLAB. It all comes down to killing a single line from init/Kconfig. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c59def9f222d44bb7e2f0a559f2906191a0862d7 Author: Christoph Lameter Date: Wed May 16 22:10:50 2007 -0700 Slab allocators: Drop support for destructors There is no user of destructors left. There is no reason why we should keep checking for destructors calls in the slab allocators. The RFC for this patch was discussed at http://marc.info/?l=linux-kernel&m=117882364330705&w=2 Destructors were mainly used for list management which required them to take a spinlock. Taking a spinlock in a destructor is a bit risky since the slab allocators may run the destructors anytime they decide a slab is no longer needed. Patch drops destructor support. Any attempt to use a destructor will BUG(). Acked-by: Pekka Enberg Acked-by: Paul Mundt Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afc0cedbe9138e3e8b38bfa1e4dfd01a2c537d62 Author: Nick Piggin Date: Wed May 16 22:10:49 2007 -0700 slob: implement RCU freeing The SLOB allocator should implement SLAB_DESTROY_BY_RCU correctly, because even on UP, RCU freeing semantics are not equivalent to simply freeing immediately. This also allows SLOB to be used on SMP. Signed-off-by: Nick Piggin Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd308f09a6636d86dbe62bab892b96711feee67 Author: Stephen Rothwell Date: Thu May 17 11:22:15 2007 +1000 [POWERPC] Remove build warnings in windfarm_core drivers/macintosh/windfarm_core.c: In function 'wf_register_control': drivers/macintosh/windfarm_core.c:219: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result drivers/macintosh/windfarm_core.c: In function 'wf_register_sensor': drivers/macintosh/windfarm_core.c:329: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Stephen Rothwell Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 60e417536bca8988d22ea1cc20a634ffa67bb2a8 Author: Josh Boyer Date: Thu May 17 04:51:37 2007 +1000 [POWERPC] Pass per-file CFLAGs for platform specific op codes As a result of compiling all of the wrapper files for every platform now, the kernel build can fail for toolchains that don't support various op codes by default. An example of this building a 7xx platform with the ELD4.0 toolchain, is below: /tmp/ccYjhJoL.s: Assembler messages: /tmp/ccYjhJoL.s:42: Error: Unrecognized opcode: `mtdcr' /tmp/ccYjhJoL.s:43: Error: Unrecognized opcode: `mfdcr' make[1]: *** [arch/powerpc/boot/44x.o] Error 1 The following patch introduces additional CFLAGS for the 4xx specific files and fixes the kernel compile. Signed-off-by: Josh Boyer Signed-off-by: Paul Mackerras commit 5b825831858b92da2417ecb3e3bbde594e5f7c91 Author: Jon Tollefson Date: Thu May 17 04:43:02 2007 +1000 [POWERPC] Correct #endif comment Fix up comment on two #endifs to match their #ifs. Signed-off-by: Jon Tollefson ---- hash_utils_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Paul Mackerras commit 9a6b50703e95b638f610a65ffcc5faf4356f73c9 Author: Segher Boessenkool Date: Wed May 16 23:12:17 2007 +1000 [POWERPC] Fix ppc_rtas_progress_show() Fixes the warning arch/powerpc/kernel/rtas-proc.c: In function 'ppc_rtas_progress_show': arch/powerpc/kernel/rtas-proc.c:382: warning: the address of 'progress_led' will always evaluate as 'true' by fixing the code to do what it presumably is meant to do. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 67ccd2fcd42333493a33993312c76fb2d4c2a2d6 Author: Segher Boessenkool Date: Wed May 16 22:49:22 2007 +1000 [POWERPC] Fix sed command lines for zlib source construction Not every sed understands \+ so use the more portable * instead. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 8995ac8702737147115e1c75879a1a2d75627b9e Author: Segher Boessenkool Date: Wed May 16 22:34:38 2007 +1000 [POWERPC] Specify GNUTARGET on $(AR) invocations Without this, some versions of GNU ar fail to create an archive index if the object files it is packing together are of a different object format than ar's default format (for example, binutils compiled to default to 64-bit, with 32-bit objects). Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 847f5976f90d5637a86a826c1c594091d08f3156 Author: Benjamin Herrenschmidt Date: Wed May 16 16:57:24 2007 +1000 [POWERPC] Make sure device node type/name is not NULL on hot-added nodes Our device-tree unflattening code makes sure the name and type fields of a device-node are not NULL. However, the code for dynamically adding devices nodes which is used for pSeries hotplug for example didn't do it, potentially causing crashes in some code that assume it can always do things like strcmp on those. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c72ea777d4e51435388fbd863c813a19635fa8ef Author: David Gibson Date: Wed May 16 13:48:50 2007 +1000 [POWERPC] Small fixes for the Ebony device tree This patch corrects a number of minor errors in the Ebony device tree: - Missing (given as 0) cache sizes are added to the CPU node - device_type properties are removed from nodes which don't have a reasonably well defined device_type binding. This does require a very small code change to locate the busses to be probed for of_platform devices by 'compatible' instead of 'device_type'. - A node is added for the SRAM controller - The unit address of the small-flash node is adjusted to correctly reflect the reg property. - device_type values for the MAL and ZMII are updated to reflected more up-to-date versions of the binding. - An incorrect offset in the partition map for the large-flash node is corrected. - Some redundant values, already commented out are removed entirely. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit f7c0d13b9430c4bb4b6f8507ed19d7cc7971dfa5 Author: Stephen Rothwell Date: Wed May 16 13:21:09 2007 +1000 [POWERPC] Fix warning on UP arch/powerpc/platforms/pseries/pseries.h:24: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:25: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:24: warning: control reaches end of non-void function arch/powerpc/platforms/pseries/pseries.h:25: warning: control reaches end of non-void function Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0453c62c8035f1a8a6e331b235c02ccdcb4e8910 Author: Christian Krafft Date: Wed May 16 10:33:21 2007 +1000 [POWERPC] cell_defconfig: Disable cpufreq and pmi Cpufreq using pmi is broken by a dependency issue, that will be fixed in a seperate patch. Bare-metal cpufreq is broken by hardware limitations. As it was the only user, pmi is disabled as well. Signed-off-by: Christian Krafft Signed-off-by: Paul Mackerras commit de821204dbd0a967f77213daf7b89070a65e7523 Author: Benjamin Herrenschmidt Date: Tue May 15 16:19:36 2007 +1000 [POWERPC] Fix IO space on PCI buses created from of_platform This changes the way of_platform_pci creates PCI host bridges such that it uses request_phb_iospace() for mapping the IO ports, instead of using the dynamic hotplug stuff. That guarantees the IO space stays within the 2GB limit and thus doesn't break half of the legacy drivers around. Fixes a couple of warnings due to missing IO space while at it. This patch is a temporary workaround for 2.6.22 before a more complete rewrite of IO mappings is merged in 2.6.23 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 017e3c53f116d6a0741a21624924528dc9f98418 Author: Benjamin Herrenschmidt Date: Tue May 15 14:16:26 2007 +1000 [POWERPC] Add spinlock to request_phb_iospace() request_phb_iospace() can be called from different CPUs at init time (at least with my next patch) and thus needs a spinlock. As for the next patch, this is a temporary workaround for 2.6.22 issues until my rewrite of IO mappings is ready (for 2.6.23) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6a32d085ae71724edffa30fcd2045520a051cb14 Author: David Gibson Date: Tue May 15 12:40:23 2007 +1000 [POWERPC] Fix make rules for treeImage.initrd At present attempting to build treeImage.initrd.* boot images will fail, because make will select the treeImage.% rule which also matches instead of the correct and more specific treeImage.initrd.% rule. This patch corrects the problem by listing the more specific rule first. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit d16f1b648356d70ebbda2eb1b2af18a6816dacb1 Author: Olof Johansson Date: Tue May 15 06:59:12 2007 +1000 [POWERPC] Remove warning in mpic.c arch/powerpc/sysdev/mpic.c: In function 'mpic_request_ipis': arch/powerpc/sysdev/mpic.c:1445: warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 63df81ec3bc91cd894e3609b7267ed50df408ebd Author: Olof Johansson Date: Tue May 15 06:03:30 2007 +1000 [POWERPC] Update pasemi_defconfig Update pasemi_defconfig, add new relevant drivers. Take out CONFIG_PPC_PSERIES, it should't have been enabled in the first place. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 71efe45da9b520fd4621305f8fbcbdd74607f287 Author: Olof Johansson Date: Tue May 15 06:03:09 2007 +1000 [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed Current kernel implements proper TB sync, no need to keep GENERIC_TBSYNC enabled. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit cbb0503742de65a5931226b5b72830f650cf4947 Author: Stephen Rothwell Date: Mon May 14 14:36:28 2007 +1000 [POWERPC] Update iseries_defconfig Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 3692b9444b15ad12e5ec56ec77b1009bb75f8d42 Author: Stephen Rothwell Date: Mon May 14 13:50:33 2007 +1000 [POWERPC] Wire up some more syscalls signalfd, timerfd and eventfd Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7c40542ffaa20e361f5f37d112aba41a725fc759 Author: David Gibson Date: Mon May 14 13:13:57 2007 +1000 [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop() ft_set_prop() from flatdevtree.c in the zImage wrapper will either replace an existing property in the flat device tree, or add a new property definiion if the given property isn't present. However, when adding properties, it adds the property definition immediately before the node's END_NODE tag, potentially after any subnode definitions for the node. This confuses the kernel flat tree parser in prom.c which assumes that all property definitions for a node come before all subnode definitions. This patch corrects ft_set_prop() so that it adds new properties before the first subnode, instead of before the END_NODE tag. Signed-off-by: David Gibson Acked-by: Scott Wood Acked-by: Mark A. Greer Signed-off-by: Paul Mackerras commit e3d67b663b5ededac1b2c552b4f0b4fbe94d7ac3 Author: David Gibson Date: Mon May 14 11:43:20 2007 +1000 [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error There are no actual implementations of fixup_bigphys_addr() in arch/powerpc, and with a 64-bit aware ioremap() and so forth, it should no longer be necessary. This patch removes the last dregs of fixup_bigphys_addr() from arch/powerpc. In fact, the only reason this hasn't caused link errors already is that nobody must have tried using one of the small number of drivers using io_remap_pfn_range() on one of the small number of platforms which are 32-bit but define CONFIG_PHYS_64BIT. Nonetheless this fixes a bug, and should go into 2.6.22. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 39d207036c76ff16650772b83fb1a12ab788ca26 Author: Christoph Hellwig Date: Tue May 15 23:10:34 2007 +1000 [POWERPC] viopath: Use a completion in some more places Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 9d561ed46ea33c223def2eb8e2b09ea108a4d70b Author: Christoph Hellwig Date: Mon May 14 01:50:27 2007 +1000 [POWERPC] viopath: Use completion Use a completion instead of abusing a semaphore for hypervisor event completion in viopath. Signed-off-by: Christoph Hellwig Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e38e3458804019c3fe9b17998e05fd1cd480806d Author: Tony Breeds Date: Sun May 13 13:40:53 2007 +1000 [POWERPC] Fix Kconfig undefined symbol 'IBM_NEW_EMAC_ZMII' An allmodconfig on the current powerpc tree yields: arch/powerpc/platforms/44x/Kconfig:41:warning: 'select' used by config symbol '440GP' refers to undefined symbol 'IBM_NEW_EMAC_ZMII' Hide the select until the driver exists. Signed-off-by: Tony Breeds Signed-off-by: Paul Mackerras commit 5c1992f83304cf2d56934dd6c06709b96e1b0c81 Author: Kumar Gala Date: Tue May 15 16:12:27 2007 -0500 [POWERPC] Removed hardcoded phandles from dts Remove explicit phandles and move to using references that autogenerate the phandles when needed. Signed-off-by: Kumar Gala commit c0fabf7535f827cebf938ac5e44863089ae7eafd Author: Morten Banzon Date: Tue May 15 11:41:11 2007 -0700 [PPC] MCC2 missing in MPC826x device_list Adds the MCC2 device to the 826x device_list and fixed MCC1/MCC2 entries in all other PQ2 processors. Signed-off-by: Morten Banzon Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Kumar Gala commit 4da421d620fc104adf0b8b3841650c78f0e87b0a Author: Kumar Gala Date: Tue May 15 13:20:05 2007 -0500 [POWERPC] 85xx: Add device nodes for error reporting devices used by EDAC Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8541 CDS, MPC8544 DS, MPC8555 CDS, and MPC8568 MDS. Signed-off-by: Kumar Gala commit 50cf67075ba071e0532ccc657ad64cfbb2da3c7a Author: Dave Jiang Date: Thu May 10 10:03:05 2007 -0700 [POWERPC] 85xx: Add device nodes for error reporting devices used by EDAC Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8540 ADS, MPC8548 CDS, and MPC8560 ADS. Also fixed up the size of the PCI node on MPC8560 ADS. Signed-off-by: Dave Jiang Signed-off-by: Kumar Gala commit 1c2de47cd47daa033251dbb4a3643e7e87a681b0 Author: Timur Tabi Date: Mon May 14 11:31:26 2007 -0500 [POWERPC] Fix alignment problem in rh_alloc_align() with exact-sized blocks When an rheap is created, the caller can specify the alignment to use. In rh_alloc_align(), if a free block is found that is the exact size needed (including extra space for alignment), that configured alignment value is not used to align the pointer. Instead, the default alignment is used. If the default alignment is smaller than the configured alignment, then the returned value will not be aligned correctly. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 991eb43af989002d5c7f4a2ff2a6c806a912b51b Author: Kumar Gala Date: Mon May 14 17:11:58 2007 -0500 [POWERPC] Fix COMMON symbol warnings We get the following warnings in various ARCH=powerpc builds: WARNING: "ee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "fee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "htab_hash_searches" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "next_slot" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "mmu_hash_lock" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "primary_pteg_full" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "global_dbcr0" [arch/powerpc/kernel/built-in] is COMMON symbol Switch to moving local symbols (except mmu_hash_lock which is global) and space directive instead. Signed-off-by: Kumar Gala commit 40ebbcbf23d5592f58712fca2ab406ff818e2d65 Author: Dave Jiang Date: Thu Apr 12 13:34:55 2007 -0700 [POWERPC] Fix comment in booke_wdt The early kernel parameter is wdt and not wdt_enable. according to arch/powerpc/kernel/setup_32.c. Signed-off-by: Dave Jiang Signed-off-by: Kumar Gala commit 3d372548b4af1a3d0a40f3dde7af5389a30ce359 Author: James.Yang Date: Wed May 2 16:34:43 2007 -0500 [POWERPC] Remove CPU_FTR_NEED_COHERENT for 7448. Remove CPU_FTR_NEED_COHERENT for MPC7448 (and single-core MPC86xx). This prevents needlessly setting M=1 when not SMP. Signed-off-by: James.Yang Acked-by: Jon Loeliger Signed-off-by: Kumar Gala commit f4dcd3c229a0745aff7d6835ca7c45aaeb293714 Author: Becky Bruce Date: Thu May 10 10:13:04 2007 -0500 [POWERPC] Change include protections to ASM_POWERPC Change several headers in include/asm-powerpc that currently use some variation of ASM_PPC to use ASM_POWERPC instead. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit 516793c61b3db1f60e0b0d0e3c382bcca9ae84fd Author: Russell King Date: Thu May 17 10:19:23 2007 +0100 [ARM] ARMv6: add CPU_HAS_ASID configuration Presently, we check for the minimum ARM architecture that we're building for to determine whether we need ASID support. This is wrong - if we're going to support a range of CPUs which include ARMv6 or higher, we need the ASID. Convert the checks to use a new configuration symbol, and arrange for ARMv6 and higher CPU entries to select it. Signed-off-by: Russell King commit c6af66b9fe93990c70aaee53ce3ce7e53a83676a Author: Russell King Date: Thu May 17 10:16:55 2007 +0100 [ARM] integrator: fix pci_v3 compile error with DEBUG_LL If DEBUG_LL is enabled, we want to use get_irq_regs(), but this causes a build error due to the inline function missing. Add the necessary header file. Signed-off-by: Russell King commit 0f347bb9136f55ff575d55441a29e92c16e87fb0 Author: Russell King Date: Thu May 17 10:11:34 2007 +0100 [ARM] gic: Fix gic cascade irq handling No need for the cascade irq function to have a "fastcall" annotation. Fix the range checking for valid IRQ numbers - comparing the value returned by the GIC with NR_IRQS is meaningless since we translate the GIC irq number to a Linux IRQ number afterwards. Check the GIC returned IRQ number is within limits first, then add the IRQ offset, and only then compare with NR_IRQS. Signed-off-by: Russell King commit 43c0f3d25c602dc96b201ed81ffda0bc600ff969 Author: Christoph Lameter Date: Tue May 15 23:57:09 2007 -0700 Fix: find_or_create_page skips cpuset memory spreading. We call alloc_page where we should be calling __page_cache_alloc. __page_cache_alloc performs cpuset memory spreading. alloc_page does not. There is no reason that pages allocated via find_or_create should be exempt. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8382d2b9a7205fe1fb262f59237715a40c911880 Author: Andrew Morton Date: Tue May 15 23:57:08 2007 -0700 parport_pc needs dma-mapping.h alpha: drivers/parport/parport_pc.c: In function 'parport_pc_fifo_write_block_dma': drivers/parport/parport_pc.c:636: warning: implicit declaration of function 'dma_map_single' drivers/parport/parport_pc.c:637: error: 'DMA_TO_DEVICE' undeclared (first use in this function) drivers/parport/parport_pc.c:637: error: (Each undeclared identifier is reported only once drivers/parport/parport_pc.c:637: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a4dd7783dfc62176a29cb349404180f24f46975 Author: Domen Puncer Date: Tue May 15 23:57:05 2007 -0700 spi: fix spidev for >sizeof(long)/32 devices find_first_zero_bit accepts number of bits, not longs. Signed-off-by: Domen Puncer Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb33ed6345d6156484f39089aa8b52f44ce76609 Author: David Howells Date: Tue May 15 23:57:04 2007 -0700 AFS: Fix afs_prepare_write() afs_prepare_write() should not mark a page up to date if it only partially fills it in, in expectation of the caller filling in the rest prior to calling commit_write(). commit_write(), however, should mark the page up to date. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1800782016fda6fbc9990a0227fec581070f23af Author: Hugh Dickins Date: Tue May 15 23:57:04 2007 -0700 slub: don't confuse ctor and dtor kmem_cache_create() was swapping ctor and dtor in calling find_mergeable(): though it caused no bug, and probably never would, even if destructors are retained; but fix it so as not to generate anxiety ;) Signed-off-by: Hugh Dickins Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abd727ed7abf5c19e7d1760671475cbecbccb0e Author: Christoph Lameter Date: Tue May 15 23:57:03 2007 -0700 SLUB: It is legit to allocate a slab of the maximum permitted size Sorry I screwed up the comparison. It is only an error if we attempt to allocate a slab larger than the maximum allowed size. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faab83bbcd9e001077e42a7c085f1e871997647f Author: David Howells Date: Tue May 15 23:57:02 2007 -0700 AFS: write back dirty data on unmount Fix AFS to write back dirty on unmounting. This didn't happen because afs_super_ops.drop_inode was pointing to generic_delete_inode. Now this pointer is left set to NULL so that the default behaviour occurs instead. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52ade9b3b97fd3bea42842a056fe0786c28d0555 Author: Linus Torvalds Date: Wed May 16 15:28:14 2007 -0700 Fix ACPI suspend / device suspend ordering problem In commit e3c7db621bed4afb8e231cb005057f2feb5db557 we fixed the resume ordering, so that the ACPI low-level resume code was called before the actual driver resume was called. However, that broke the nesting logic of suspend and resume, and we continued to suspend the devices _after_ we the ACPI device suspend code was called. That resulted in us saving PCI state for devices that had already been changed by ACPI, and in some cases disabled entirely (causing the PCI save_state to be all-ones). Which in turn caused the wrong state to be written back on resume. This moves the ACPI device suspend to after the device model per-device suspend() calls. This fixes the bogus state save. Thanks to Lukáš Hejtmánek for testing. Acked-by: Lukas Hejtmanek Acked-by: Rafael J. Wysocki Cc: Len Brown Cc: Pavel Machek Cc: Andrew Morton Cc: Greg KH Signed-off-by: Linus Torvalds commit cab537d609fb718e9fb09d73e3e3e3062db25743 Author: James Bottomley <[mailto:James.Bottomley@SteelEye.com]> Date: Wed May 16 10:06:39 2007 -0400 [SCSI] aacraid: fix panic on short Inquiry Unable to handle kernel paging request at ffff8101c0000000 RIP: [] :aacraid:aac_internal_transfer+0xd6/0xe3 PGD 8063 PUD 0 Oops: 0000 [1] SMP last sysfs file: /block/sdb/removable CPU 2 Modules linked in: autofs4(U) hidp(U) nfs(U) lockd(U) fscache(U) nfs_acl(U) rfcomm(U) l2cap(U) bluetooth(U) sunrpc(U) ipv6(U) cpufreq_ondemand(U) dm_mirror(U) dm_mod(U) video(U) sbs(U) i2c_ec(U) button(U) battery(U) asus_acpi(U) acpi_memhotplug(U) ac(U) parport_pc(U) lp(U) parport(U) joydev(U) ide_cd(U) i2c_i801(U) i2c_core(U) shpchp(U) cdrom(U) bnx2(U) sg(U) pcspkr(U) ata_piix(U) libata(U) aacraid(U) sd_mod(U) scsi_mod(U) ext3(U) jbd(U) ehci_hcd(U) ohci_hcd(U) uhci_hcd(U) Pid: 2352, comm: syslogd Not tainted 2.6.18-prep #1 RIP: 0010:[] [] :aacraid:aac_internal_transfer+0xd6/0xe3 RSP: 0000:ffff8101bfd1fe68 EFLAGS: 00010083 RAX: 0000000000000063 RBX: 0000000000000008 RCX: 00000000ffd1fea0 RDX: ffffffff802da628 RSI: ffff8101c0000000 RDI: ffff8101b2a08168 RBP: ffff8101b2728010 R08: ffffffff802da628 R09: 0000000000000046 R10: 0000000000000000 R11: 0000000000000080 R12: 0000000000000010 R13: ffff8101bfd1fea8 R14: ffff8101bc74df58 R15: ffff8101bc74df58 FS: 00002aaaab0146f0(0000) GS:ffff8101bfcd2e40(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffff8101c0000000 CR3: 00000001bdecd000 CR4: 00000000000006e0 Process syslogd (pid: 2352, threadinfo ffff8101bc74c000, task ffff8101bd979040) Stack: 0000000000000012 0000000000000036 0000000000000000 ffff8101bee9a800 ffff8101be9d3a00 ffff8101be9d3a00 ffff8101be8014f8 ffffffff880b26cc 40212227607e3141 2029282a26252423 0000000000000003 ffff810037e3a000 Call Trace: ] :aacraid:get_container_name_callback+0x8b/0xb5 [] :aacraid:aac_intr_normal+0x1b3/0x1f9 [] :aacraid:aac_rkt_intr+0x37/0x115 [] __rcu_process_callbacks+0xf8/0x1a8 [] handle_IRQ_event+0x29/0x58 [] __do_IRQ+0xa4/0x105 [] __do_softirq+0x5e/0xd5 [] do_IRQ+0xe7/0xf5 [] ret_from_intr+0x0/0xa On digging into it, it turned out that the customer was probing an aacraid device with an INQUIRY of 8 bytes. The way aacraid works, it was blindly trying to use aac_internal_transfer to copy the container name to byte 16 of the inquiry data, resulting in a negative transfer length. It then copies over the whole of kernel memory before dropping off the end. Fix updated and corrected by Mark Salyzyn Signed-off-by: James Bottomley commit 2ab01efd1d2a24db53b4c5d28a2e20cf2b1206c5 Author: Salyzyn, Mark Date: Tue May 15 09:14:21 2007 -0400 [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1) http://bugzilla.kernel.org/show_bug.cgi?id=8469 As discussed in the bugzilla outlined below, we have an sa based (Mustang) RAID adapter on the system, a Dell PERC2/QC. Affected controllers are HP NetRAID, Adaptec AAC-364, Dell PERC2/QC or Adaptec 5400S. This problem coincides with the introduction of the adapter_comm and adapter_deliver platform functions (Message [PATCH 1/4] aacraid: rework communication support code, January 23 2007, which initially migrated to 2.6.21) The panic occurs with an uninitialized adapter_deliver platform function pointer. The enclosed patch, unmodified as tested by Rainer, solves the problem. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit ed56047aecaddc0a45bb23b61ce933fb81f67ef9 Author: Christoph Hellwig Date: Sun May 13 22:48:31 2007 +0200 [SCSI] NCR53C9x: correct spelling mistake in deprecation notice On Mon, Apr 30, 2007 at 03:16:39PM +0200, Geert Uytterhoeven wrote: > > +What: old NCR53C9x driver > > +When: October 2007 > > +Why: Replaced by the much better esp_scsi driver. Actual low-level > > + driver can ported over almost trivially. > ^ > be current linus' tree still has my spelling mistake. Here's a patch to update it Signed-off-by: James Bottomley commit bcd4e22540309f2f135f278cffe134c63dbcaee5 Author: FUJITA Tomonori Date: Fri May 11 19:10:45 2007 +0900 [SCSI] tgt: fix a rdma indirect transfer error bug This sets sg_dma_len to a proper value. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit bdd0d7571ac83190ec0caafb86d0d35ba2616fd2 Author: Sumant Patro Date: Thu May 10 07:22:35 2007 -0700 [SCSI] MegaRAID: Update MAINTAINERS email-id Update Maintainer email-id for MegaRAID SCSI drivers. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit c25da0afa753c29cd99fb41dc73a33ed69556965 Author: Ed Lin Date: Wed May 9 20:50:42 2007 -0800 [SCSI] stex: minor cleanup and version update Add debug information into abort and host_reset routine. Change ioremap to ioremap_nocache. Version updated to 3.6.0000.1. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit d116a7bc6ab4dcf752078daeaf2276f7d7660595 Author: Ed Lin Date: Wed May 9 20:50:40 2007 -0800 [SCSI] stex: fix reset recovery for console device After reset completed, the scsi error handler sends out TEST_UNIT_READY to the device. For 'normal' devices the command will be handled by firmware. However, because the RAID console only interfaces to scsi mid layer, the firmware will not process the command for it. This will make the console to be offlined right after reset. Add the handling in driver to fix this problem. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit 69f4a513911455670d3322fb5252b437c0485707 Author: Ed Lin Date: Wed May 9 20:50:37 2007 -0800 [SCSI] stex: extend hard reset wait time During hard bus reset of st_shasta controllers, 1 ms is not enough for 16-port controllers, although it's good for 8-port controllers. Extend the wait time to 100 ms to allow bus resets finish successfully. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit e0b2e597d5dd8c4f3778545f65c29a9c6aba0e3a Author: Ed Lin Date: Wed May 9 20:50:33 2007 -0800 [SCSI] stex: fix id mapping issue The correct internal mapping of stex controllers should be: id:0~15, lun:0~7 (st_shasta) id:0, lun:0~127 (st_yosemite) id:0~127, lun:0 (st_vsc and st_vsc1) This patch reports the internal mapping to scsi mid layer, eliminating the translation between scsi mid layer and firmware. To achieve this goal, we also need to: -- fail the REPORT_LUNS command for st_shasta because the firmware is known to not report all actual luns -- add an entry in scsi_devindo.c to force sequential lun scan (for st_shasta controllers) -- fail the REPORT_LUNS command for console device -- remove special handling of REPORT_LUNS command for st_yosemite, as there is no translation mapping now Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit 5af23d263c33a3f6fc93facfd87d2a091eff2060 Author: Brian King Date: Wed May 9 15:36:35 2007 -0500 [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices Currently ipr always returns success from eh_dev_reset when called for a SATA device. If ata_do_eh is unable to recover for some reason, this can result in commands that are still outstanding when ata_do_eh returns. Change ipr to verify no commands are outstanding before returning success. Signed-off-by: Brian King Signed-off-by: James Bottomley commit f3270f6ef7d60251617f9d4c08f76ec01c647aa4 Author: Russell King Date: Wed May 16 17:36:17 2007 +0100 [ARM] Silence OMAP kernel configuration warning arch/arm/mach-omap1/Kconfig:41:warning: 'select' used by config symbol 'MACH_OMAP_H3' refers to undefined symbol 'GPIOEXPANDER_OMAP' Signed-off-by: Russell King commit 576fe0bd7e52dce7afb6b9b2450744555b2eb53a Author: Christoph Hellwig Date: Wed May 16 14:52:19 2007 +0200 [IA64] optimize pagefaults a little Get rid of the notifier list and call the kprobes code directly if compiled in. This mirrors the changes that recently went into powerpc, s390 and sparc64. Signed-off-by: Christoph Hellwig Signed-off-by: Tony Luck commit c05107911a38235fec87892d83dc54aba9aaf3bd Author: Russell King Date: Wed May 16 12:41:15 2007 +0100 [ARM] Update ARM syscalls Add utimensat, signalfd, timerfd, eventfd syscalls. Add ignore defines for sync_file_range and fadvise64_64 which we implement differently. Signed-off-by: Russell King commit e903382ceae1dd85e650ffc7e98facdd59cc7a3f Author: Sandeep Sanjay Patil Date: Wed May 16 10:51:45 2007 +0100 [ARM] 4384/1: S3C2412/13 SPI registers offset correction Change the SPI Channel 1 register offset in s3c_spi1_resource[], and s3c2412_dma_mappings[]. Offset has to be 0x100 in s3c2412/13's case. Also, total SPI memory resource size changed to 0x24 for s3c2412/13. Signed-off-by: Sandeep Patil Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d73d8011779292788def2cd2520d6f39d9b406de Author: Dan Williams Date: Tue May 15 01:03:36 2007 +0100 [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files WARNING: arch/arm/mach-iop13xx/built-in.o - Section mismatch: reference to .init.text:iop13xx_pcie_map_irq from .text between 'iop13xx_pci_setup' (at offset 0x7fc) and 'iop13xx_map_pci_memory' While fixing this warning I also recalled Adrian Bunk's recommendation to not use inline in .c files, as 'iop13xx_map_pci_memory' is needlessly inlined. Removing 'inline' uncovered some dead code so that is cleaned up as well. Signed-off-by: Dan Williams Signed-off-by: Russell King commit e702a7155d14a6e11645e17d829217ae98fd45bb Author: Dan Williams Date: Tue May 15 01:03:31 2007 +0100 [ARM] 4382/1: iop13xx: fix msi support updates iop13xx msi support for a msi api change in 2.6.22 rev7: * update for Michael Ellerman's "MSI: arch must connect the irq and the msi_desc" patch Signed-off-by: Dan Williams Signed-off-by: Russell King commit 06ba255571b0a2f1fb7e49e7406364e4194f4e10 Author: Russell King Date: Mon May 14 22:56:32 2007 +0100 [ARM] Remove Integrator/CP SMP platform support The Integrator/CP SMP platform support was never fully merged, and now it's causing build breakage. Remove it. Signed-off-by: Russell King commit e45c7a43825b0feb161ef2ebe5324cd517dd4388 Author: Andrew Victor Date: Mon May 14 14:32:43 2007 +0100 [ARM] 4378/1: KS8695: Serial driver fix A fix for a really stupid typo in the KS8695 serial driver. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 8858e9afdf31bab05247b1680b16c65fe7edbbe1 Author: Milan Svoboda Date: Mon May 14 07:50:42 2007 +0100 [ARM] 4376/1: Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig. IXP4XX has generic GPIO support; however, ARCH_IXP4XX Kconfig entry currently does not select GENERIC_GPIO like other arch entries. Signed-off-by: Milan Svoboda Signed-off-by: Russell King commit aceb6f0b6da20a86516d59f73ecdc7ea3c4a23da Author: Richard Purdie Date: Sun May 13 13:32:23 2007 +0100 [ARM] 4375/1: sharpsl_pm: Fix compile warnings Fix compile warnings from sharpsl_pm.c. Attribute registration failure doesn't stop the driver working so just warn about it. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 9f28745a6b554fdd6b0dbc9856077701a55f9569 Author: Michael Loehr Date: Wed May 9 11:01:24 2007 +0200 [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices IO stall after deleting and path checker changes after reenabling zfcp device Setting one zfcp device offline using chccwdev in a multipath environment and waiting will lead to IO stall on all paths. After setting the zfcp device back online using chccwdev, the devices with io stall will have a different path checker. Devices corresponding to the deleted units are never freed. This has the effect that 'slave_destroy' is never called and zfcp still thinks that this unit is registered (ZFCP_STATUS_UNIT_REGISTERED is still set). Hence the erp routine is not called correctly and the unit is not enabled properly. Do not delete rport and the sdev. Just set the host to block on 'offline'. Setting host online again will then remove the blocked status and everything is fine again. Signed-off-by: Michael Loehr Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit 869b2b444c58302e3233ce0b671fabf28135a37d Author: Martin Peschke Date: Wed May 9 11:01:20 2007 +0200 [SCSI] zfcp: avoid clutter in erp_dbf avoid clutter in erp_dbf cleanup zfcp_fsf_req_dismiss functions: - avoid clutter in erp_dbf (reqs_active is always 0) - fold called three-line function into calling function - add meaningful comment - coding style Signed-off-by: Martin Peschke Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit a04395ead6d17c83da64264b6fe78f852a648202 Author: Thomas Reitmayr Date: Tue May 15 11:47:48 2007 +0200 [ALSA] usbaudio - Coping with short replies in usbmixer This patch makes sure that short USB replies are treated as an error when requesting the value of a certain mixer control. Signed-off-by: Thomas Reitmayr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8286c53e54b8b1b9489b4dd5d2d3a4f94b8c012e Author: Daniel T Chen Date: Tue May 15 11:46:23 2007 +0200 [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty Included is a patch against current alsa-kernel hg tip adding quirks that Ubuntu Dapper/Edgy/Feisty contains. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 609d7694152f85734560ddc83be5e551b34d8c44 Author: Rene Herman Date: Tue May 15 11:42:56 2007 +0200 [ALSA] Fix probe of non-PnP ISA devices isa_register_driver() returns an error if no device is found and it's no fatal error for the drivers with pnp support. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 60af15f529d22a93805e74dd3c52b6f8134511d2 Author: Jaroslav Kysela Date: Wed May 16 11:45:47 2007 +0200 [ALSA] version 1.0.14rc4 Signed-off-by: Jaroslav Kysela commit 272a527c04c0c4f548232f1ec7d2d72bfdab4384 Author: Kailang Yang Date: Mon May 14 11:00:38 2007 +0200 [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops Fixed some platform no sound and Add JD Function for below platform list: Sony(0x104d) 0x9015, 0x900e, 0x1f00 Toshiba(0x1179) DALLAS 0xff00, 0xff01 Targa(0x1462) 0x28fb Asus(0x1043) A7J 0x060d Lenovo(0x17aa) 0x3bfd, 0x2085 MEDION(0x17c0) MD2 0x4071 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a68660e0c63d8f7ab8725f9e771119c08e9f953b Author: Liam Girdwood Date: Thu May 10 19:27:27 2007 +0200 [ALSA] ASoC AC97 device reg bugfix This patch fixes a bug whereby AC97 bus device data was being clobbered when AC97 codecs using the generic ac97_codec.c driver were being registered. Codecs that didn't use the generic driver were unaffected (e.g. WM9712, WM9713). Changes:- o Add new AC97 codec class for custom (or need bus dev registration) AC97 codecs. o Only register/deregister this custom codec device with the AC97 bus. The generic AC97 driver already does this for generic codec devices. This may be related to bug #3038 :- https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3038 Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9ae67c7b870f5220a6b30e4f6e83b319bd9be718 Author: Liam Girdwood Date: Thu May 10 17:12:31 2007 +0200 [ALSA] ASoC AC97 static GPL symbol fix This patch fixes a bug whereby the GPL'ed symbol ac97_dai was being declared as static. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b75e53f09212f12369156710e84d1cbf115113cd Author: Takashi Iwai Date: Thu May 10 16:56:09 2007 +0200 [ALSA] hda-codec - Make the mixer capability check more robust In some cases, mixer elements return -EINVAL because it couldn't obtain proper amp_cap bits. The patch improves the robustness, trying the amp_cap query again in such a case. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d417045e7deeb37d97793805fe302da7b4f82eec Author: Daniel Drake Date: Thu May 10 08:52:19 2007 +0200 [ALSA] usb-audio: another Logitech QuickCam ID This patch adds the ID for another quickcam microphone, reported by freqmod on ALSA ticket #0003040 I'm going to submit a USB patch separately to provide a macro to simplify these entries, as suggested by Alan Stern. We could switch to using that in future. Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 13b8d09f5de0aaa3153bbccc98baf247387823dc Author: Tejun Heo Date: Tue May 15 12:29:22 2007 +0200 libata: track spindown status and skip spindown_compat if possible Our assumption that most distros issue STANDBYNOW seems wrong. The upstream sysvinit and thus many distros including gentoo and opensuse don't take any action for libata disks on spindown. We can skip compat handling for these distros so that they don't need to update anything to take advantage of kernel-side shutdown. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit da071b42f73dabbd0daf7ea4c3ff157d53b00648 Author: Tejun Heo Date: Mon May 14 17:26:18 2007 +0200 libata: fix shutdown warning message printing Unlocking ap->lock and ssleeping don't work because SCSI commands can be issued from completion path without context. Reimplement delayed completion by allowing translation functions to override qc->scsidone(), storing the original completion function to scmd->scsi_done() and overriding qc->scsidone() with a function which schedules delayed invocation of scmd->scsi_done(). This isn't pretty at all but all the ugly parts are thankfully contained in the stop translation path where the compat feature is implemented. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3cadbcc09891b8544203f211dac13f9cc4e6832a Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata-acpi: add ATA_FLAG_ACPI_SATA port flag Whether a controller needs IDE or SATA ACPI hierarchy is determined by the programming interface of the controller not by whether the controller is SATA or PATA, or it supports slave device or not. This patch adds ATA_FLAG_ACPI_SATA port flags which tells libata-acpi that the port needs SATA ACPI nodes, and sets the flag for ahci and sata_sil24. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6ddcd3b0201a7ad72294347636d2b4028ddbd95d Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: during revalidation, check n_sectors after device is configured Device might be resized during ata_dev_configure() due to HPA or (later) ACPI _GTF. Currently it's worked around by caching n_sectors before turning off HPA. The cached original size is overwritten if the device is reconfigured without being hardreset - which always happens after configuring trasnfer mode. If the device gets hardreset for some reason after that, revalidation fails with -ENODEV. This patch makes size checking more robust by moving n_sectors check from ata_dev_reread_id() to ata_dev_revalidate() after the device is fully configured. No matter what happens during configuration, a device must have the same n_sectors after fully configured to be treated as the same device. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe30911b34098db58c21d0f936f6c3f17f32deb8 Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: separate out ata_dev_reread_id() Separate out ata_dev_reread_id() from ata_dev_revalidate(). ata_dev_reread_id() reads IDENTIFY page and determines whether the same device is still there. ata_dev_revalidate() reconfigures after reread completes. This will be used by ACPI update. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d1c68fa6ce7e56e300d8561bb3b6492c336df863 Author: Al Viro Date: Tue May 15 08:21:17 2007 +0100 pata_scc had been missed by ata_std_prereset() switch Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit c7754d465b1feade85b5f1c4492781a30f6652a2 Author: David S. Miller Date: Tue May 15 17:03:54 2007 -0700 [SPARC64]: Add hypervisor API negotiation and fix console bugs. Hypervisor interfaces need to be negotiated in order to use some API calls reliably. So add a small set of interfaces to request API versions and query current settings. This allows us to fix some bugs in the hypervisor console: 1) If we can negotiate API group CORE of at least major 1 minor 1 we can use con_read and con_write which can improve console performance quite a bit. 2) When we do a console write request, we should hold the spinlock around the whole request, not a byte at a time. What would happen is that it's easy for output from different cpus to get mixed with each other. 3) Use consistent udelay() based polling, udelay(1) each loop with a limit of 1000 polls to handle stuck hypervisor console. Signed-off-by: David S. Miller commit 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 Author: Al Viro Date: Tue May 15 20:37:20 2007 +0100 arm: walk_stacktrace() needs to be exported oprofile depends on having it Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecec5ba681a0bf1165899f8b1889f06fcd8e901a Author: Al Viro Date: Tue May 15 20:36:00 2007 +0100 fix uml-x86_64 __NR_syscall_max is done in x86_64 asm-offsets; do an equivalent in uml kern_constants.h Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 327b9eebbf2b7ce632e93a9c1386d944af0dadf4 Author: Al Viro Date: Tue May 15 20:37:10 2007 +0100 audit_match_signal() and friends are used only if CONFIG_AUDITSYSCALL is set Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b4e1ded3cf6e13c122f019532cb60347d6c88c8c Author: Al Viro Date: Tue May 15 20:37:00 2007 +0100 m32r: __xchg() should be always_inline it depends on elimination of unreachable branches in switch (by object size), so we must declare it always_inline Signed-off-by: Al Viro Acked-by: Hirokazu Takata Signed-off-by: Linus Torvalds commit 8eafafb54bc594be8a23b00b25055b59838a9c79 Author: Al Viro Date: Tue May 15 20:36:50 2007 +0100 rpadlpar breakage - fallout of struct subsystem removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1b2bad2f049e405530b4a8a478edc45770b219c1 Author: Al Viro Date: Tue May 15 20:36:40 2007 +0100 em28xx and ivtv should depend on PCI .. because video-buf.c requires PCI, and VIDEO_EM28XX selects it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9cbe05c71251b51607d80256c3b3754957bb5ed8 Author: Al Viro Date: Tue May 15 20:36:30 2007 +0100 missing includes in mlx4 Signed-off-by: Al Viro Acked-by: Jeff Garzik Acked-by: Roland Dreier Signed-off-by: Linus Torvalds commit 7a86edef395576f69d2513c62aea7c966043bc8d Author: Al Viro Date: Tue May 15 20:36:20 2007 +0100 missing dependencies for USB drivers in input stuff that does select USB should depend on USB_ARCH_HAS_HCD, or we'll end up with unbuildable configs. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit faa2fb4e67775101a5c46074fa24f0d81cdb4deb Author: Al Viro Date: Tue May 15 20:36:10 2007 +0100 missing mm.h in fw-ohci need it for page_private(), not all targets have it pulled indirectly Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28aa483f80d146a8f117eb65a4fddf31d58230d7 Author: Linus Torvalds Date: Tue May 15 18:45:49 2007 -0700 x86: Fix discontigmem + non-HIGHMEM compile It's not necessarily a very sane configuration, but people running "make randconfig" noticed it wouldn't compile. This fixes some obvious problems in discontig.c to allow a clean compile. Acked-by: andrew hendry Signed-off-by: Linus Torvalds commit e0ff9cd12a26259f8dd676124a188037e7e90b38 Author: Jan Engelhardt Date: Wed May 16 00:51:46 2007 +0200 Use menuconfig objects: IDE Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 640b31bf1291d1fb8a3e90abed8f145410122bf8 Author: Alan Cox Date: Wed May 16 00:51:46 2007 +0200 sl82c105: Switch to ref counting API Not sure how this one got missed in the great purge some time ago but it did. Signed-off-by: Alan Cox Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 122ab0887c36247bd4508c25e4fccf9264546fe2 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_use_dma() ide_use_dma() duplicates a lot of ide_max_dma_mode() functionality and as all users of ide_use_dma() were converted to use ide_tune_dma() now it is possible to add missing checks to ide_tune_dma() and remove ide_use_dma() completely, so do it. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3649c06e66ad3589374e8765ed69eda65658735c Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: add missing validity checks for identify words 62 and 63 Check validity of identify words 62 and 63 before using them in ide_get_mode_mask(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 4728d546d7137ad5350cc2e53d4748fd26f61a60 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_dma_enable() * check ->speedproc return value in ide_tune_dma() * use ide_tune_dma() in cmd64x/cs5530/sc1200/siimage/sl82c105/scc_pata drivers * remove no longer needed ide_dma_enable() Signed-off-by: Bartlomiej Zolnierkiewicz commit 46cedc9b773795b6190c31e5d32de5207b55a356 Author: Sergei Shtylyov Date: Wed May 16 00:51:44 2007 +0200 sl82c105: add speedproc() method and MWDMA0/1 support Add the speedproc() method for setting transfer modes, modify config_for_dma() to call it and use ide_max_dma_mode() to select the best DMA mode. Add support for the multiword DMA modes 0 and 1, using the upper half of the 'drive_data' field to store the DMA timings to program into the drive control register when DMA is turned on for real. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3c3f5d2c9f64b47aceb88f8d80fcb70fb9f9809f Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: add ->speedproc support * add {cs5530,sc1200}_tunepio() for programming PIO timings * add {cs5530,sc1200}_tune_chipset() (->speedproc method) for setting transfer mode and convert {cs5530,sc1200}_config_dma() to use it * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit a01ba4011aa745be44d0290c5da5cb2dfb4e37ce Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: DMA support cleanup sc1200.c: * remove open-coded variant of ide_dma_host_off() (== ->dma_host_off), it is not needed because ->dma_off_quietly calls ->dma_host_off * use ->dma_host_on (== ide_dma_host_on() for this driver) instead of open-coded variant, call it from the users of sc1200_config_dma2() [ there is no need to call ->dma_host_on in sc1200_config_dma() because core code takes care of calling ->ide_dma_on on successful execution of ->ide_dma_check ] * add comment about ->tuneproc interface abuse cs5530.c/sc1200.c: * core code takes care of calling ->dma_off_quietly before calling ->ide_dma_check so there is no need to call it in ->ide_dma_check methods * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit bd203b57c7edd6bc457b769cd15fa7239cd2241e Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: use ide_tune_dma() part #2 Use ide_tune_dma() in ide-cris/it821x/pdc202xx_old/serverworks drivers. Signed-off-by: Bartlomiej Zolnierkiewicz commit 5fd216bbb277b645109a889c489e13a7aafbc304 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 cs5530/sc1200: add ->udma_filter methods CS5530/SC1200 specifies that two drives on the same cable cannot mix UDMA/MDMA. Add {cs5530,sc1200}_udma_filter() to handle this. This also makes it possible to remove open-coded best DMA mode selection and use standard ide_use_dma()/ide_max_dma_mode() helpers. While at it bump version numbers. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 793a97228d3da876f42b7fb4d4a52cc8cc86dc81 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: always disable DMA before tuning it ide_start_power_step() and set_using_dma() were missing ->dma_off_quietly call (comment in probe_hwif() states that DMA should be always cleared before tuning is attempted). Fix it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7f86723a60d287be19aee620277184f9f5455283 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 pdc202xx_new: use ide_tune_dma() * remove code enabling IORDY and prefetch from config_chipset_for_dma(), as the comment states it has no real effect because these settings are overriden when the PIO mode is set (and for this driver ->autotune == 1 so PIO mode is always programmed) * use ide_tune_dma() in pdcnew_config_drive_xfer_rate() and remove no longer needed config_chipset_for_dma() There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 38ff8a74e8f015f94289b84cd6572a68c3431cdd Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 alim15x3: use ide_tune_dma() Use ide_tune_dma() in ali15x3_config_drive_for_dma() and remove all the open coded DMA tuning code and also config_chipset_for_dma(). Set ->atapi_dma flag correctly in init_hwif_common_ali15x3() so ide_tune_dma() can take care of checking if ATAPI DMA is allowed and remove open coded ATAPI DMA check from ali15x3_config_drive_for_dma(). There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6b8cf7724bd0f8ae1f61937c5f40f4dbbda40960 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 sis5513: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by config_art_rwp_pio() could result in incorrect PIO timings being programmed and possibly the data corruption (for < ATA100 family chipsets PIO0 timings were used, for ATA100 and ATA100a - the random content of test1 variable was used, for ATA133 - MWDMA0 timings were used) * BUG() in sis5513_tune_chipset() if somebody tries to force unsupported PIO5, also cleanup this function a bit while at it * add comment about PIO0 timings for < ATA100 family chipsets * remove open-coded best PIO mode selection from config_art_rwp_pio(), it contained numerous bugs: - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() * use sis5513_tune_drive() instead of config_art_rwp_pio() in sis5513_config_xfer_rate() so the correct PIO mode is also set on drive even if the device is not IORDY/DMA capable * config_art_rwp_pio() was always setting the best possible mode and not the wanted one - fix it and move ide_get_best_pio_mode() call to config_chipset_for_pio() * don't use ide_find_best_mode() in config_chipset_for_pio(), it was being overriden by config_art_rwp_pio() for the host timings anyway + we need to set the same PIO mode on the device and the host * pass correct "pio" argument (255 instead of 5) to sis5513_tune_drive() call in sis5513_config_xfer_rate() so the best PIO mode is set on the drive and not PIO4 * rename sis5513_tune_drive() to sis5513_tuneproc() and config_chipset_for_pio() to sis5513_tune_driver() * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 9445de76c124e90176b5116cf82f6cd1413f5230 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 serverworks: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by svwks_tune_chipset() could result in incorrect PIO timings being programmed and possibly the data corruption (it seems that the minimum possible values were used but I lack the datasheets to be sure) * select best PIO mode in svwks_tune_drive() and not in svwks_tune_chipset() when doing PIO autotuning (pio == 255) * don't try to tune PIO in config_chipset_for_dma() as ide_dma_enable() could return 1 if DMA was previously enabled (svwks_config_drive_xfer_rate() takes care of PIO tuning if no suitable DMA mode is found) * remove config_chipset_for_pio() and use svwks_tune_drive() instead, config_chipset_for_pio() contained numerous bugs when selecting PIO mode (luckily it was only used for devices limited to PIO by capabilities/BIOS): - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO0/1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() - if the max drive PIO was PIO5 then XFER_PIO_0/XFER_PIO_SLOW was selected (XFER_PIO_SLOW is not supported by svwks_tune_chipset() so the result was the same as if using XFER_PIO_5 => wrong PIO timings were set) - it was overriding drive->current_speed * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 4fce3164b84d5b014acbf5a3f57eb3650e154f5b Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:41 2007 +0200 pdc202xx_old: rewrite mode programming code (v2) This patch is based on the documentation (I would like to thank Promise for it) and also partially on the older vendor driver. Rewrite mode programming code: * disable 66MHz clock in pdc202xx_tune_chipset() so it is correctly disabled even if both devices on the channel are not DMA capable and after reset * enable/disable IORDY and PREFETCH bits in pdc202xx_tune_chipset() as they need to be setup correctly also for PIO only devices, plus IORDY wasn't disabled for non-IORDY devices and PREFETCH wasn't disabled for ATAPI devices * remove dead code for setting SYNC_ERDDY_EN bits from config_chipset_for_dma() (driver sets ->autotune to 1 so PIO modes are always programmed => lower nibble of register A never equals 4 => "chipset_is_set" is always true) * enable PIO mode programming for all ATAPI devices (it was limited to ->media == ide_cdrom devices) * remove extra reads of registers A/B/C, don't read register D et all * do clearing / programming of registers A/B/C in one go (gets rid of extra PCI config space read/write cycle) * set initial values of drive_conf/AP/BP/CP variables to zero (paranoia for the case when PCI reads fail) * remove XFER_UDMA6 to XFER_UDMA5 remapping case - it can't happen (ide_rate_filter() takes care of it) * fix XFER_MW_DMA0 timings (they were overclocked, use the official ones) * fix bitmasks for clearing bits of register B: - when programming DMA mode bit 0x10 of register B was cleared which resulted in overclocked PIO timing setting (iff PIO0 was used) - when programming PIO mode bits 0x18 weren't cleared so suboptimal timings were used for PIO1-4 if PIO0 was previously set (bit 0x10) and for PIO0/3/4 if PIO1/2 was previously set (bit 0x08) * add FIXME comment about missing locking for 66MHz clock register Also while at it: * remove unused defines * do a few cosmetic / CodingStyle fixes * bump driver version v2: * in pdc202xx_tune_chipset() the old content of drive configuration registers is used only by the debugging code so cover "drive_conf" PCI registers read by #if PDC202XX_DEBUG_DRIVE_INFO (Noticed by Sergei Shtylyov) Signed-off-by: Bartlomiej Zolnierkiewicz commit 4e19b5c193454ade8d86468077078f680d121979 Author: Kim Phillips Date: Fri May 11 18:25:07 2007 -0500 ucc_geth: eliminate max-speed, change interface-type to phy-connection-type It was agreed that phy-connection-type was a better name for the interface-type property, so this patch renames it. Also, the max-speed property name was determined too generic, and is therefore eliminated in favour of phy-connection-type derivation logic. includes corrections to copyright text. Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit f2773a29596d835d2b00137ba925c186699ea117 Author: Vitaly Wool Date: Sun May 13 18:42:08 2007 +0400 smc911x: fix compilation breakage Looks like the new version of this patch has been overlooked, so I'm resending it. It just adapts the driver to the new IRQ API according to what Russell has pointed out. drivers/net/smc911x.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Signed-off-by: Vitaly Wool Signed-off-by: Jeff Garzik commit 1af7f05628fab81fdf4412d757676412ba5db660 Author: olof@lixom.net Date: Sat May 12 14:57:46 2007 -0500 pasemi_mac: Fix local-mac-address parsing Turns out we have an old version of firmware that stores the mac address in 'mac-address' as a string instead of a byte array. All versions that use local-mac-address should have it as byte array, so no need to do string parsing for that case. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit fd17825480b2de3076727c677f8e257623705963 Author: olof@lixom.net Date: Sat May 12 14:57:36 2007 -0500 pasemi_mac: Terminate PCI ID list This caused some very interesting behaviour depending on what happened to be built at the same time. Add terminating empty entry to the list of IDs. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 52a9435183f961e1bb3c146a62bfbecf93d15d58 Author: Olof Johansson Date: Sat May 12 18:01:09 2007 -0500 pasemi_mac: Interrupt ack fixes Interrupt ack fixes Fix the packet count resets at interrupt time, using the cacheable packet count status to set number of processed/received packets, since the ack count is the cumulative number of packets processed, and not incremental. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit a54c545134ea77609ed9eb5df50524c097112327 Author: olof@lixom.net Date: Sat May 12 14:57:27 2007 -0500 pasemi_mac: Fix register defines Some shift values were obviously wrong. Fix them to correspond with the masks. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 17028c5c91580036eb41da2fad292965fa3b9a7d Author: Martin Michlmayr Date: Tue May 15 21:03:36 2007 +0200 [IA64] Fix section conflict of ia64_mlogbuf_finish Building with GCC 4.2, I get the following error: CC arch/ia64/kernel/mca.o arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict This is because ia64_mlogbuf_finish is both declared static and exported. Fix by removing the export (which is unneeded now). Signed-off-by: Martin Michlmayr Signed-off-by: Tony Luck commit f653c34dd3d8bde2c918316fd5ba2e2c4f95afcf Author: Jens Axboe Date: Tue May 15 19:30:07 2007 +0200 ll_rw_blk: fix gcc 4.2 warning on current_io_context() current_io_context() is both static and exported with EXPORT_SYMBOL(). As there are no users outside of ll_rw_blk.c itself, just kill the export. Problem reported by Martin Michlmayr Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit cfbf07f2a80b618c42a42c20d83647ea8fcceca0 Author: Christoph Lameter Date: Tue May 15 01:42:06 2007 -0700 SLUB: CONFIG_LARGE_ALLOCS must consider MAX_ORDER limit Take MAX_ORDER into consideration when determining KMALLOC_SHIFT_HIGH. Otherwise we may run into a situation where we attempt to create general slabs larger than MAX_ORDER. Signed-off-by: Christoph Lameter Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a3ee3d5529c5e66aedf91401bfac65c61998639 Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:59 2007 -0700 i386: fix voyager build This adds an smp_ops for voyager, and hooks things up appropriately. This is the first baby-step to making subarch runtime switchable. Signed-off-by: Jeremy Fitzhardinge Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 297d9c035edd04327fedc0d1da27c2b112b66fcc Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:48 2007 -0700 i386: move common parts of smp into their own file Several parts of kernel/smp.c and smpboot.c are generally useful for other subarchitectures and paravirt_ops implementations, so make them available for reuse. Signed-off-by: Jeremy Fitzhardinge Acked-by: Chris Wright Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 838c41184fee5e151c09972f2ba90c16493af614 Author: Prarit Bhargava Date: Tue May 15 01:41:43 2007 -0700 Remove cpu hotplug defines for __INIT & __INITDATA After examining what was checked in and the code base I discovered that most of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore.... So here's a patch that reverts the last part of that changeset: Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a. The kernel has moved forward to a state where the original change is not necessary. After porting forward, this final version of the patch was applied and broke non-x86 architectures. Signed-off-by: Prarit Bhargava Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bd2aad2103314a0a09614dc29926a1437db02f7 Author: Stephen Rothwell Date: Tue May 15 01:41:36 2007 -0700 Revert "MAINTAINERS: remove invalid list address for TPM" This reverts commit b6d1c9a44744224d83125a5a89c1a6cc4db27361. Others tell me that this address has worked for them, so I can only assume that I hit a glitch in the sourceforge mail system. Signed-off-by: Stephen Rothwell Cc: Kylene Hall Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f89441b37536fea92b1ed7004e5e2dda011473d Author: Thomas Gleixner Date: Tue May 15 01:41:32 2007 -0700 clocksource: fix lock order in the resume path lockdep complains about the lock nesting of clocksource and watchdog lock in the resume path. Change the resume marker to a bit operation and remove the lock from this path. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c46bdcaec53eda069a8a9cd60621c7431aa7842 Author: Geert Uytterhoeven Date: Tue May 15 01:41:29 2007 -0700 m68k: implement __clear_user() m68k: implement __clear_user(), which is needed by fs/signalfd.c Since we always let the MMU do all checking, clear_user() and __clear_user() are identical. The old clear_user() is renamed to __clear_user() for consistency. Signed-off-by: Geert Uytterhoeven Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fcdf96ca95f81a0e1fd91a2de16dc67c641c958 Author: Simon Horman Date: Tue May 15 01:41:15 2007 -0700 alpha: fix hard_smp_processor_id compile error "Remove hardcoding of hard_smp_processor_id on UP systems", 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f in Linus' tree, moved the definition of hard_smp_processor_id linux/smp.h to asm/smp.h for UP systems. This causes a regression on Alpha. cc1: warnings being treated as errors arch/alpha/kernel/setup.c: In function 'setup_arch': arch/alpha/kernel/setup.c:506: warning: implicit declaration of function 'hard_smp_processor_id' make[1]: *** [arch/alpha/kernel/setup.o] error 1 make: *** [arch/alpha/kernel] error 2 By including asm/smp.h non-conditionally in asm/mmu_context.h the problem appears to be resolved. Cc: Fernando Luis Vazquez Cao Signed-off-by: Simon Horman Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b67405bbbba6bbd28dfd5337b29d5bc5a1140afb Author: Yoshinori Sato Date: Tue May 15 01:41:07 2007 -0700 h8300 atomic.h update add atomic_sub_and_test define. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218f0aaee8a6b0e5772b95b154dea5b7701b33aa Author: Paul Mundt Date: Tue May 15 01:41:02 2007 -0700 nommu: add ioremap_page_range() lib/ioremap.c is presently only built in if CONFIG_MMU is set. While this is reasonable, platforms that support both CONFIG_MMU=y or n need to be able to call in to this regardless. As none of the current nommu platforms do anything special with ioremap(), we assume that it's always successful. This fixes the SH-4 build with CONFIG_MMU=n. Signed-off-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ee9aabb0520adea5937855a9575c08a97b16e7 Author: Davide Libenzi Date: Tue May 15 01:40:57 2007 -0700 epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67647d0fb8bc03609d045a9cce85f7ef6d763036 Author: Davide Libenzi Date: Tue May 15 01:40:52 2007 -0700 epoll: fix some comments Fixes some epoll code comments. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7ea76302547f81e4583d0d7c52a1c37c6747f5d Author: Davide Libenzi Date: Tue May 15 01:40:47 2007 -0700 epoll locks changes and cleanups Changes the rwlock to a spinlock, and drops the use-count variable. Operations are always bound by the mutex now, so the use-count is no more needed. For the same reason, the rwlock can become a simple spinlock. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d47de16c7221968d3eab899d7540efa5ba77af5a Author: Davide Libenzi Date: Tue May 15 01:40:41 2007 -0700 fix epoll single pass code and add wait-exclusive flag Fixes the epoll single pass code. During the unlocked event delivery (to userspace) code, the poll callback can re-issue new events, and we must receive them correctly. Since we loop in a lockless fashion, we want to be O(nready), and we don't want to flash on/off the spinlock for every event, we have the poll callback to use a secondary list to queue events while we're inside the event delivery loop. The rw_semaphore has been turned into a mutex. This patch also adds the wait-exclusive flag, as suggested by Davi Arnaut. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a2b7af27f6d01a443f3af8252fa0b955bf1913 Author: Haavard Skinnemoen Date: Wed Mar 21 18:08:49 2007 +0100 [AVR32] Implement platform hooks for atmel_lcdfb driver This modifies and extends the existing lcdc platform code to support the new atmel_lcdfb driver. The ATSTK1000 board code is set up to use the on-board Samsung LTV350QV LCD panel. Signed-off-by: Haavard Skinnemoen commit 7531d692d4174789d583eb50fcb83cefa121b790 Author: Trond Myklebust Date: Mon May 14 17:21:26 2007 -0400 SUNRPC: Fix sparse warnings - net/sunrpc/xprtsock.c:1635:5: warning: symbol 'init_socket_xprt' was not declared. Should it be static? - net/sunrpc/xprtsock.c:1649:6: warning: symbol 'cleanup_socket_xprt' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit d48c5f41000ad176df71d2d43932c6c50f938196 Author: Trond Myklebust Date: Mon May 14 17:21:26 2007 -0400 NLM: Fix sparse warnings - fs/lockd/xdr4.c:140:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:141:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:432:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:433:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:587:20: warning: symbol 'nlm_version4' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit 2e42c3e2aec6e24e58c4c601e1a33f0e9e36e314 Author: Trond Myklebust Date: Mon May 14 17:20:41 2007 -0400 NFS: Fix more sparse warnings - fs/nfs/nfs4xdr.c:2499:42: warning: incorrect type in argument 2 (different signedness) - fs/nfs/nfs4xdr.c:2658:49: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:2683:50: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3063:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3065:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/callback_xdr.c:138:31: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Trond Myklebust commit 10afec9081fee7e48995fa396fba22c7de4b99d4 Author: Trond Myklebust Date: Mon May 14 17:16:04 2007 -0400 NFS: Fix some 'sparse' warnings... - fs/nfs/dir.c:610:8: warning: symbol 'nfs_llseek_dir' was not declared. Should it be static? - fs/nfs/dir.c:636:5: warning: symbol 'nfs_fsync_dir' was not declared. Should it be static? - fs/nfs/write.c:925:19: warning: symbol 'req' shadows an earlier one - fs/nfs/write.c:61:6: warning: symbol 'nfs_commit_rcu_free' was not declared. Should it be static? - fs/nfs/nfs4proc.c:793:5: warning: symbol 'nfs4_recover_expired_lease' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit 9c9cc93ad2a5d9972672e03685af20e8cea1e5a4 Author: Christoph Hellwig Date: Fri Feb 9 20:06:49 2007 +0000 SUNRPC: remove dead variable 'rpciod_running' rpciod_running is not used at all, but due to the way DECLARE_MUTEX_LOCKED works we don't get a warning for it. Signed-off-by: Christoph Hellwig Signed-off-by: Trond Myklebust commit 8ae20abdd18c6c7f21bbae931353e7cfad77d7b6 Author: Trond Myklebust Date: Mon May 14 16:50:45 2007 -0400 NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c The XDR code should not depend on the physical allocation size of structures like nfs4_stateid and nfs4_verifier since those may have to change at some future date. We therefore replace all uses of sizeof() with constants like NFS4_VERIFIER_SIZE and NFS4_STATEID_SIZE. This also has the side-effect of fixing some warnings of the type format ‘%u’ expects type ‘unsigned int’, but argument X has type ‘long unsigned int’ on 64-bit systems Signed-off-by: Trond Myklebust commit 60945cb7c8377b727288275f21791914fe65311c Author: Nate Diller Date: Thu May 10 22:55:08 2007 -0700 NFS: use zero_user_page Use zero_user_page() instead of the newly deprecated memclear_highpage_flush(). Signed-off-by: Nate Diller Cc: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 550facd138d8f6b0ca683c1e894b5cd0f381cb63 Author: Oleg Nesterov Date: Thu May 10 22:55:07 2007 -0700 NLM: don't use CLONE_SIGHAND in nlmclnt_recovery reclaimer() calls allow_signal() which plays with parent process's ->sighand. Signed-off-by: Oleg Nesterov Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 21051ba6259c519e20a7d575ddceb16e84ad2a5d Author: Trond Myklebust Date: Mon May 14 16:50:44 2007 -0400 NLM: Fix locking client timeouts... nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust commit c47953cfc6bad91c46272aad202ee33276671608 Author: Tony Luck Date: Fri May 11 15:18:45 2007 -0700 [IA64] s/scalibility/scalability/ Previous spelling patch from Simon Arlott broke one spot that didn't need fixing (reported by Simon within 35 minutes of the patch ... but not until after I'd applied to GIT and pushed :-( Signed-off-by: Tony Luck commit 311f594dec9b0c8693ec7df75b82c251b6b0e7c2 Author: Jay Lan Date: Tue Apr 3 17:53:42 2007 -0700 [IA64] kdump on INIT needs multi-nodes sync-up (v.2) The current implementation of kdump on INIT events would enter kdump processing on DIE_INIT_MONARCH_ENTER and DIE_INIT_SLAVE_ENTER events. Thus, the monarch cpu would go ahead and boot up the kdump On SN shub2 systems, this out-of-sync situation causes some slave cpus on different nodes to enter POD. This patch moves kdump entry points to DIE_INIT_MONARCH_LEAVE and DIE_INIT_SLAVE_LEAVE. It also sets kdump_in_progress variable in the DIE_INIT_MONARCH_PROCESS event to not dump all active stack traces to the console in the case of kdump. I have tested this patch on an SN machine and a HP RX2600. Signed-off-by: Jay Lan Acked-by: Zou Nan hai Signed-off-by: Tony Luck commit ae67e498a54259364f7211e10d9834575b340b21 Author: Tony Luck Date: Mon May 14 15:55:11 2007 -0700 [IA64] wire up {signal,timer,event}fd syscalls Signed-off-by: Tony Luck commit 99fbe1ac217e8b9d4141504e879327cb4e42d4ff Author: Dave Jones Date: Mon May 14 18:27:29 2007 -0400 [CPUFREQ] Correct revision mask for powernow-k8 Mark Langsdorf points out that the correct define for this revision bump is 0x80000. Also to save us having to keep renaming the #define, give it a more meaningful name. Signed-off-by: Dave Jones commit faa8b6c3c2e1454175609167a25ae525d075f045 Author: Linus Torvalds Date: Mon May 14 15:24:24 2007 -0700 Revert "ipmi: add new IPMI nmi watchdog handling" This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen Cc: Mathieu Desnoyers Cc: Corey Minyard Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7c5b9ef8577bfa7b74ea58fc9ff2934ffce13532 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IPoIB/cm: Optimize stale connection detection In the presence of some running RX connections, we repeat queue_delayed_work calls each 4 RX WRs, which is a waste. It's enough to start stale task when a first passive connection is added, and rerun it every IPOIB_CM_RX_DELAY as long as there are outstanding passive connections. This removes some code from RX data path. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd18c112774db5bb887adb981ffbe9bfe00b2f3a Author: Michael S. Tsirkin Date: Mon May 14 17:14:50 2007 +0300 IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ mthca_cq_clean() updates the CQ consumer index without moving CQEs back to HW ownership. As a result, the same WRID might get reported twice, resulting in a use-after-free. This was observed in IPoIB CM. Fix by moving all freed CQEs to HW ownership. This fixes Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3e28c56b9b67347b42ba06f9a9373b408902beee Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix posting >255 recv WRs for Tavor Fix posting lists of > 255 receive WRs for Tavor: rq.next_ind must be updated each doorbell, otherwise the next doorbell will use an incorrect index. Found by Ronni Zimmermann at Mellanox. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 6c719f5c6c823901fac2d46b83db5a69ba7e9152 Author: Sean Hefty Date: Mon May 7 11:49:27 2007 -0700 RDMA/cma: Add check to validate that cm_id is bound to a device Several checks in the rdma_cm check against the state of the cm_id, but only to validate that the cm_id is bound to an underlying transport specific CM and an RDMA device. Make the check explicit in what we're trying to check for, since we're not synchronizing against the cm_id state. This will allow a user to disconnect a cm_id or reject a connection after receiving a device removal event. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit be65f086f2a50c478b2f5ecf4c55a52a4e95059a Author: Sean Hefty Date: Mon May 7 11:49:12 2007 -0700 RDMA/cma: Fix synchronization with device removal in cma_iw_handler The cma_iw_handler needs to validate the state of the rdma_cm_id before processing a new connection request to ensure that a device removal is not already being processed for the same rdma_cm_id. Without the state check, the user can receive simultaneous callbacks for the same cm_id, or a callback after they've destroyed the cm_id. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8aa08602bdd617a9cdd147f19076a8c8a70e03ef Author: Sean Hefty Date: Mon May 7 11:49:00 2007 -0700 RDMA/cma: Simplify device removal handling code Add a new routine and rename another to encapsulate common code for synchronizing with device removal. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e430dcb7b132a4076e533a9d69907acecbe71be Author: Joachim Fenkes Date: Wed May 9 13:48:31 2007 +0200 IB/ehca: Disable scaling code by default, bump version number - Scaling code is still considered experimental, so disable it by default - Increase version to SVNEHCA_0023 Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit bba9b6013e604fadb298191c058149acf1cdfced Author: Joachim Fenkes Date: Wed May 9 13:48:25 2007 +0200 IB/ehca: Beautify sysfs attribute code and fix compiler warnings eHCA's sysfs attributes are now being created via sysfs_create_group(), making the process neatly table-driven. The return value is checked, thus fixing a few compiler warnings. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c7a14939e78e75dd90b54cb0df371019bc6d3e89 Author: Joachim Fenkes Date: Wed May 9 13:48:20 2007 +0200 IB/ehca: Remove _irqsave, move #ifdef - In ehca_process_eq(), we're IRQ safe throughout the whole function, so we don't need another _irqsave in the middle of flight. - take_over_work() is only called by comp_pool_callback(), so it can move into the same #ifdef block. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c55a0ddd8ebdd657224449c2fbfcd427e054c8cc Author: Hoang-Nam Nguyen Date: Wed May 9 13:48:11 2007 +0200 IB/ehca: Fix AQP0/1 QP number AQP0/1 should report qp_num={0|1} and the actual QP# should be stored in struct ehca_qp, not the other way round. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 92761cdaf215599a1bd81d383facb32adabfa620 Author: Joachim Fenkes Date: Wed May 9 13:48:01 2007 +0200 IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() The driver needs to always supply the "GRH present" flag to the hypervisor, whether it's true or false. Not supplying it (i.e. not setting the corresponding mask bit) amounts to a "perhaps", which we don't want. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 5d88278e3bdb6f2e4ed43306659e930ecd715f0c Author: Stefan Roscher Date: Wed May 9 13:47:56 2007 +0200 IB/ehca: Serialize hypervisor calls in ehca_register_mr() Some pSeries hypervisor versions show a race condition in the allocate MR hCall. Serialize this call per adapter to circumvent this problem. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 8f140b407f3be04e7202be9aa0cfef3006d14c9f Author: Arthur Jones Date: Thu May 10 12:10:49 2007 -0700 IB/ipath: Shadow the gpio_mask register Once upon a time, GPIO interrupts were rare. But then a chip bug in the waldo series forced the use of a GPIO interrupt to signal packet reception. This greatly increased the frequency of GPIO interrupts which have the gpio_mask bits set on the waldo chips. Other bits in the gpio_status register are used for I2C clock and data lines, these bits are usually on. An "unlikely" annotation leftover from the old days was improperly applied to these bits, and an unnecessary chip mmio read was being accessed in the interrupt fast path on waldo. Remove the stagnant unlikely annotation in the interrupt handler and keep a shadow copy of the gpio_mask register to avoid the slow mmio read when testing for interruptable GPIO bits. Signed-off-by: Arthur Jones Signed-off-by: Roland Dreier commit 26c6bc7b812b4157ba929035e467c0f4dd165916 Author: Jack Morgenstein Date: Sun May 13 17:18:23 2007 +0300 IB/mlx4: Fix uninitialized spinlock for 32-bit archs uar_lock spinlock was used in mlx4_ib_cq_arm without being initialized (this only affects 32-bit archs, because uar_lock is not used on 64-bit archs and MLX4_INIT_DOORBELL_LOCK() is a NOP). Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 Author: Stephen Rothwell Date: Mon May 14 13:47:47 2007 +1000 Declare another couple of compat syscalls. compat_sys_signalfd and compat_sys_timerfd need declarations before PowerPC can wire them up. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a34be83a9cfa15d596bfeb498b13380f0544249f Author: Dave Jones Date: Sun May 13 19:07:46 2007 -0400 MAINTAINERS update. I've not really 'maintained' this code for years, and others are doing a much more thorough job these days. Removing myself might stem some of the crazier emails I get. Signed-off-by: Dave Jones Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d10ff3fb62bd38415c0f7be3d75d107e1f67e59a Author: Thomas Gleixner Date: Mon May 14 11:10:02 2007 +0200 timekeeping fix patch got mis-applied The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds commit 90e07d9f54c61449dd48eff82e2354d0124d4f7e Author: Nicolas Pitre Date: Sun May 13 18:03:08 2007 +0200 pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response ... and make it depend on the response flag instead of the command type. Signed-off-by: Nicolas Pitre Signed-off-by: Pierre Ossman commit fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd Author: Pierre Ossman Date: Mon May 14 17:27:29 2007 +0200 mmc: use assigned major for block device The MMC block devices now have an assigned major. Make sure we actually use it. Signed-off-by: Pierre Ossman commit 6ba736a10e4ae63b38ccfee9f22b3263a6e5d050 Author: Pierre Ossman Date: Sun May 13 22:39:23 2007 +0200 sdhci: handle dma boundary interrupts When the device hits certain memory boundaries, it signals an interrupt and expects to be serviced. We don't need the feature but we need to make sure the device doesn't stall. Signed-off-by: Pierre Ossman commit c0f3b6c777af071063984fdbc4efb6c904f665f4 Author: Yoichi Yuasa Date: Sun May 13 18:23:15 2007 +0200 mmc: au1xmmc command types check from data flags This patch has changed command types check from data flags. MMC_STOP_TRANSMISSION is never passed to au1xmmc_send_command(). SEND_STOP() is used for MMC_STOP_TRANSMISSION. Signed-off-by: Yoichi Yuasa Signed-off-by: Pierre Ossman commit be35cf01a9889e82da3bbda1d7b161f036424225 Author: David S. Miller Date: Mon May 14 04:19:01 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit d0842f40a025521beb48063e02a8cc57ebd075e0 Author: David S. Miller Date: Mon May 14 04:18:38 2007 -0700 [VIDEO]: XVR-500 and XVR-2500 need FB=y. Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790 Author: David S. Miller Date: Mon May 14 03:53:47 2007 -0700 [SPARC32]: asm/system.h needs asm/smp.h To get hard_smp_processor_id() even on UP builds. Signed-off-by: David S. Miller commit 2b6d868fa62b51500dd95a036229adc4a4a7bdae Author: David S. Miller Date: Mon May 14 03:53:12 2007 -0700 [SPARC32]: Update defconfig. Signed-off-by: David S. Miller commit 19fce2b96655d2b3b758e0f783314678d89b47c5 Author: Robert Reif Date: Mon May 14 03:22:08 2007 -0700 [SPARC32]: Fix sparc32 kdebug changes. Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit d831666e98b4f1e19ebdd2349735f47bf37cd293 Author: Mitsuru Chinen Date: Mon May 14 03:07:30 2007 -0700 [IPV4] SNMP: Display new statistics at /proc/net/netstat This displays the statistics specified in the updated IP-MIB RFC (RFC4293) in /proc/net/netstat. The reason why these are not displayed in /proc/net/snmp is that some existing utilities are developed under the assumption which ipstat items in /proc/net/snmp is unchanged. Signed-off-by: Mitsuru Chinen Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ae7bf20a6316272acfcaef5d265b18aaa54b41e4 Author: Corey Mutter Date: Mon May 14 03:00:27 2007 -0700 [IPV6]: Reverse sense of promisc tests in ip6_mc_input Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 3e5c2d3bdbe2c047b9853c4248f881f5ac645c89 Author: Jamal Hadi Salim Date: Mon May 14 02:57:19 2007 -0700 [NET_SCHED]: prio qdisc boundary condition This fixes an out-of-boundary condition when the classified band equals q->bands. Caught by Alexey Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9ac6d4a4b85004dbb907f1d3b34412afe16f3758 Author: David S. Miller Date: Mon May 14 02:56:03 2007 -0700 [SPARC64]: Accept ebus_bus_type for generic DMA ops. Based upon a bug report by Meelis Roos. Signed-off-by: David S. Miller commit 6253db055eb62a1bd0a18a1d8489565303b2b1dd Author: Herbert Xu Date: Mon May 14 02:19:11 2007 -0700 [IPSEC]: Don't warn if high-order hash resize fails Multi-page allocations are always likely to fail. Since such failures are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about them. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b5505c6e1071b32176c7548a3aaf0be49f7c763e Author: Herbert Xu Date: Mon May 14 02:15:47 2007 -0700 [IPSEC]: Check validity of direction in xfrm_policy_byid The function xfrm_policy_byid takes a dir argument but finds the policy using the index instead. We only use the dir argument to update the policy count for that direction. Since the user can supply any value for dir, this can corrupt our policy count. I know this is the problem because a few days ago I was deleting policies by hand using indicies and accidentally typed in the wrong direction. It still deleted the policy and at the time I thought that was cool. In retrospect it isn't such a good idea :) I decided against letting it delete the policy anyway just in case we ever remove the connection between indicies and direction. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 17f34f0ec96783851abcabf9878f8237ac67e4e7 Author: David S. Miller Date: Mon May 14 02:01:52 2007 -0700 [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. Signed-off-by: David S. Miller commit ec6fb1ad84551741c14a05918cc0e04dea928fc0 Author: David S. Miller Date: Sun May 13 23:52:14 2007 -0700 [SCSI]: Add help text for SCSI_ESP_CORE. Signed-off-by: David S. Miller commit 3049f89df13bb8f5ded8737631a6c2dd6209b5ca Author: David S. Miller Date: Sun May 13 22:22:47 2007 -0700 [SPARC] SBUS: display7seg.c needs asm/io.h Signed-off-by: David S. Miller commit 4b5dff76a70cb1d8b935b8b93fe0df0bbe66640d Author: David S. Miller Date: Sun May 13 22:22:13 2007 -0700 [SPARC] SBUS: bbc_i2c.c needs asm/io.h Signed-off-by: David S. Miller commit 49d23cfcec5d36a91e118d28148d353bf8f0bc03 Author: David S. Miller Date: Sun May 13 22:01:18 2007 -0700 [SPARC64]: Be more resiliant with PCI I/O space regs. If we miss on the ranges, just toss the translation up to the parent instead of failing. Signed-off-by: David S. Miller commit 7a05b591a3de20466a775f62369a42ea0fe1345d Author: David S. Miller Date: Sun May 13 21:27:37 2007 -0700 [SERIAL] SUNHV: Add an ID string. The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller commit 51a41e7d39ce0da1198837aaa495fe6dbcc4f802 Author: Paul Mundt Date: Mon May 14 10:15:18 2007 +0900 sh64: Add .gitignore entry for syscalltab. Signed-off-by: Paul Mundt commit 6c645ac72582bacb85b90a1cf88e81a13045aba4 Author: Paul Mundt Date: Mon May 14 09:55:35 2007 +0900 sh64: generic quicklist support. Signed-off-by: Paul Mundt commit 049fa57ce3b22d9f5acb251070941b630ee71d6e Author: Kristoffer Ericson Date: Sat May 12 20:28:05 2007 +0900 input: hp680_ts compile fixes. Trivial fix to follow the DECLARE_WORK changes, this makes the HD64461 touchscreen driver work properly again. As pointed out by David Howells. Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt commit ad05acd6e95e99f56da304ec3566d81061ab67f9 Author: kogiidena Date: Sat May 12 20:25:11 2007 +0900 sh: landisk: Header cleanups. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit ad47c12b3596269b975c21fba8f3cf09befdc1f2 Author: kogiidena Date: Sat May 12 20:24:15 2007 +0900 sh: landisk: rtc-rs5c313 support. Add the rs5c313 platform device to the landisk setup code. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit 38c425f69c8d949620384f917e00652eaf390ec9 Author: Paul Mundt Date: Fri May 11 11:26:10 2007 +0900 sh: Kill off pmb slab cache destructor. This is the last remaining slab destructor in the kernel, which we kill off and move the resultant list tracking logic up to the pmb_alloc()/pmb_free() paths. As Christoph Lameter pointed out, it's potentially unsafe to be taking the list lock in the destructor anyways, so this is also more fundamentally correct. With this in place, we're all set for killing off slab destructors from the kernel entirely. Signed-off-by: Paul Mundt commit 0facbe3a34556bbc30333971e32c5430b087fcb1 Author: Paul Mundt Date: Fri May 11 11:23:05 2007 +0900 sh: Fix up psw build rules for r7780rp. When reordering the Makefile rules, the psw support was being clobbered. Fix it up so it's linked in again. Signed-off-by: Paul Mundt commit b8947444a738c6407466244c60e9e4a2999af555 Author: Paul Mundt Date: Thu May 10 14:25:01 2007 +0900 sh: Shut up compiler warnings in __do_page_fault(). GCC doesn't seem to be able to figure this one out for itself, so just shut it up.. CC arch/sh/mm/fault.o arch/sh/mm/fault.c: In function '__do_page_fault': arch/sh/mm/fault.c:288: warning: 'ptl' may be used uninitialized in this function Signed-off-by: Paul Mundt commit e827f20f1d34e91fbbb0df4674ddd8c3aad517da Author: Paul Mundt Date: Mon May 14 09:14:29 2007 +0900 sh64: Update cayman defconfig. Signed-off-by: Paul Mundt commit 2f32834a32dfc289ea73839dbcb98d135742947b Author: Paul Mundt Date: Mon May 14 09:13:54 2007 +0900 sh64: Fixup sh-sci build. sh-sci needs asm/sci.h, borrow this from sh so we can build again. Signed-off-by: Paul Mundt commit c18fe9a0467afaec7de05ec76cd994ae7c866760 Author: Paul Mundt Date: Mon May 14 09:12:39 2007 +0900 sh64: ppoll/pselect6() and restartable syscalls. This patch was hanging around for some time while we were waiting for the compiler situation to improve.. now that all is well again, finally merge it. Signed-off-by: Paul Mundt commit 599c26d32950c33bdd2a5ac6939bfe15ecf057e0 Author: Paul Mundt Date: Mon May 14 09:10:46 2007 +0900 sh64: dma-mapping updates. Follow the noncoherent changes from sh. Signed-off-by: Paul Mundt commit a226d33abccff1959cec911da4143ea06ab22052 Author: Paul Mundt Date: Mon May 14 09:10:01 2007 +0900 sh64: Fixups for the irq_regs changes. A few interrupt handlers were never updated, fix them up. We were missing the irq_regs conversion also, so do that at the same time. Signed-off-by: Paul Mundt commit 6b5d1a0a2ff4fc5a26029f62eef033224ce0fa97 Author: Paul Mundt Date: Mon May 14 09:07:27 2007 +0900 sh64: Wire up many new syscalls. This has suffered a bit of bitrot, so we're a bit behind on the syscalls. There were a few that were wrapped incorrectly as well, caught by the syscall checker. Fix them all up. Signed-off-by: Paul Mundt commit 0a354775af0d3e84158ff87115bdb022b2a517ee Author: Simon Arlott Date: Mon May 14 08:25:48 2007 +0900 spelling fixes: arch/sh64/ Spelling fixes in arch/sh64/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mundt commit 47e77eeecf0b7892bba8a697c228ab846fea7a0f Author: Milind Arun Choudhary Date: Mon May 14 08:24:59 2007 +0900 sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c ROUND_UP macro cleanup, use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit bbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 Author: Gabriel Mansi Date: Mon May 7 18:55:13 2007 -0300 [AGPGART] Fix wrong ID in via-agp.c there is a wrong id in drivers/char/agp/via-agp.c #define PCI_DEVICE_ID_VIA_CX700 0x8324 It must be 0x0324 Notice that PCI_DEVICE_ID_VIA_CX700 is also used in drivers/i2c/busses/i2c-viapro.c and drivers/ide/pci/via82cxxx.c So, I think that constant must be renamed to avoid conflicting. I attached a proposed patch. Signed-off-by: Dave Jones commit dc2585eb478cfeb45b3d6e235ac7b5918fb859f7 Author: Daniel Drake Date: Wed May 2 23:19:05 2007 +0100 [CPUFREQ] powernow-k7: fix MHz rounding issue with perflib When the PST tables are broken, powernow-k7 uses ACPI's processor_perflib to deduce the available frequency multipliers from the _PSS tables. Upon frequency change, processor_perflib performs some verification on the frequency (checks that it's within allowable bounds). powernow-k7 deals with absolute frequencies in KHz, whereas perflib only deals with MHz values. When performing the above verification, perflib multiplies the MHz values by 1000 to obtain the KHz value. We then end up with situations like the following: - powernow-k7 multiplies the multiplier by the FSB, and obtains a value such as 1266768 KHz - perflib belives the same state has frequency of 1266 MHz - acpi_processor_ppc_notifier calls cpufreq_verify_within_limits to verify that 1266768 is in the allowable range of 0 to 1266000 (i.e. 1266 * 1000) - it's not, so that frequency is rejected - the maximum CPU frequency is not reachable This patch solves the problem by rounding up the MHz values stored in perflib's tables. Additionally it corrects a broken URL. It also fixes http://bugzilla.kernel.org/show_bug.cgi?id=8255 although this case is a bit different: the frequencies in the _PSS tables are wildly wrong, but we get better results if we force ACPI to respect the fsb * multiplier calculations (even though it seems that the multiplier values aren't entirely correct either). Signed-off-by: Daniel Drake Signed-off-by: Dave Jones commit 705962ccc9d21a08b74b6b6e1d3cf10f98968a67 Author: Al Viro Date: Sun May 13 05:52:32 2007 -0400 fix deadlock in loop.c ... doh Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but cause lockdep to complain. Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which, we probably want to s/lock/pin/ in drivers/base/map.c to avoid such brainos again. And yes, this stuff needs clear documentation. Will try to put one together once I get some sleep... Signed-off-by: Al Viro Cc: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 30046e5885848fe5c2c66177dca6b277323e31ab Author: Dave Jones Date: Sun May 13 11:55:14 2007 -0400 [CPUFREQ] Support rev H AMD64s in powernow-k8 Reported-by: Calvin Dodge Signed-off-by: Dave Jones commit 20eebcf09c2d329e4dcdd765634c0a524195e16d Author: Roland Dreier Date: Sun May 13 08:54:18 2007 -0700 mlx4_core: Remove unused doorbell_lock struct mlx4_priv.doorbell_lock is never used, so delete it. Signed-off-by: Roland Dreier commit f550d94cf9f86bc54e31dae2aee1a03d678c6e7f Author: Paul Mundt Date: Thu May 10 12:50:28 2007 +0900 net: Trivial MLX4_DEBUG dependency fix. CONFIG_MLX4_DEBUG works out to a def_bool y for those that have CONFIG_EMBEDDED set. Make it depend on MLX4_CORE. Signed-off-by: Paul Mundt Signed-off-by: Roland Dreier commit 78c129b949bdee21dd996ac5f5cfc655cd5bd42e Author: Haavard Skinnemoen Date: Sun May 13 16:33:33 2007 +0200 [AVR32] Wire up signalfd, timerfd and eventfd Signed-off-by: Haavard Skinnemoen commit 9caebec7b8093574fca5a334a1939530872d75e3 Author: Christoph Hellwig Date: Sat May 12 17:56:11 2007 +0200 [AVR32] optimize pagefault path Avoid the costly notifier list in the pagefault path and call the kprobes code directly. The same change went into the 2.6.22 cycle for powerpc, 2s390 and sparc64 already. Signed-off-by: Christoph Hellwig Signed-off-by: Haavard Skinnemoen commit 5d1938c83ca826891a02badef7c9ea8ed57e01a2 Author: Haavard Skinnemoen Date: Sun May 13 16:05:59 2007 +0200 [AVR32] Remove bogus comment in arch/avr32/kernel/irq.c The comment at the top of arch/avr32/kernel/irq.c doesn't really make sense anymore since most of the actual interrupt handling code is elsewhere. Signed-off-by: Haavard Skinnemoen commit 39403865d2e4590802553370a56c9ab93131e4ee Author: Linus Torvalds Date: Sat May 12 18:45:56 2007 -0700 Linux 2.6.22-rc1 .. close the merge window commit 78db2ad6f4df9145bfd6aab1c0f1c56d615288ec Author: Daniel Walker Date: Sat May 12 16:28:35 2007 -0700 include/linux: trivial repair whitespace damage Adding tabs where spaces currently are. Signed-off-by: Daniel Walker Signed-off-by: Linus Torvalds commit 07002e995638b83a6987180f43722a0eb39d4932 Author: Al Viro Date: Sat May 12 16:23:15 2007 -0400 fix the dynamic allocation and probe in loop.c Signed-off-by: Al Viro Acked-by: Ken Chen Signed-off-by: Linus Torvalds commit f1d1a842d85acf34dd185027cb2c9b4fd13130ef Author: Christoph Lameter Date: Sat May 12 11:15:24 2007 -0700 SLUB: i386 support SLUB cannot run on i386 at this point because i386 uses the page->private and page->index field of slab pages for the pgd cache. Make SLUB run on i386 by replacing the pgd slab cache with a quicklist. Limit the changes as much as possible. Leave the improvised linked list in place etc etc. This has been working here for a couple of weeks now. Acked-by: William Lee Irwin III Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8df767dd759c1390f604814ee5b2d1489f9a59f7 Author: Heiko Carstens Date: Sat May 12 10:37:02 2007 -0700 compat signalfd and timerfd are cond syscalls Add missing cond_syscall statements for compat_sys_signalfd and compat_sys_timerfd. Cc: Davide Libenzi Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10fb62e5b72c2485c3e0efd8b103254c0d087676 Author: Christian Krafft Date: Sat May 12 10:37:01 2007 -0700 IPMI: Add PPC openfirmware unregister When trying to load the ipmi_si module on a powerpc with no BMC (baseboard management controller) the driver failes to load correctly, but doesn't unregister itself from of_platform. So, on a second modprobe the kernel crashes. This patch adds the missing unregister call. Signed-off-by: Christian Krafft Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fe1425a60fdf6c51a41b95542416d7124587c34 Author: Corey Minyard Date: Sat May 12 10:36:58 2007 -0700 IPMI: fix SI address space settings Fix a rather obvious error that Patrick found in the setup routines. Need to set the proper address space in the ACPI case. Signed-off-by: Corey Minyard Cc: Patrick Schoeller Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6d1c9a44744224d83125a5a89c1a6cc4db27361 Author: Stephen Rothwell Date: Sat May 12 10:36:57 2007 -0700 MAINTAINERS: remove invalid list address for TPM This address bounces with "550 Unknown user". Signed-off-by: Stephen Rothwell Cc: Kylene Hall Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddf526e992c1ea10e31478f4753fd717373f9e8b Author: Stephen Rothwell Date: Sat May 12 10:36:56 2007 -0700 Missing include file in tpm_atmel.h On PPC64, we need to include asm/prom.h for function definitions. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5c34d4862e18ef07c1276d233507f540fb5a532 Author: Paul Fulghum Date: Sat May 12 10:36:55 2007 -0700 tty: flush flip buffer on ldisc input queue flush Flush the tty flip buffer when the line discipline input queue is flushed, including the user call tcflush(TCIFLUSH/TCIOFLUSH). This prevents unexpected stale data after a user application calls tcflush(). Signed-off-by: Alan Cox Cc: Antonino Ingargiola Signed-off-by: Paul Fulghum Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3bf460f3eb86cdbc76725a0dac1f191e796676c Author: Nate Diller Date: Sat May 12 10:36:54 2007 -0700 ntfs: use zero_user_page Use zero_user_page() instead of open-coding it. [akpm@linux-foundation.org: kmap-type fixes] Signed-off-by: Nate Diller Acked-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d690dcac92a84f98fd774862628ff871b713660 Author: Akinobu Mita Date: Sat May 12 10:36:53 2007 -0700 fault injection: disable stacktrace filter for x86-64 Disable stacktrace filter support for x86-64 for now. Will be enable when we can get the dwarf2 unwinder back. Signed-off-by: Akinobu Mita Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae7d5c8622a518601a21f14de5c70de5f1c967bf Author: Heiko Carstens Date: Sat May 12 17:27:41 2007 +0200 x86_64: use signalfd and timerfd compat syscalls Looks like these two are wired up in a wrong way. Cc: Davide Libenzi Cc: Andi Kleen Signed-off-by: Heiko Carstens Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0a203a4ce1787acb49db6df8f5c064e9243db130 Author: Andi Kleen Date: Sat May 12 17:27:40 2007 +0200 x86_64: Add asm/mtrr.h include for some builds The earlier change to call the bp mtrr init from bugs.c broke on some configurations due to missing includes. Noticed by "Avuton Olrich" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7248d497499a58a6f3bc3a05fdccb9a9b6306509 Author: Antonino A. Daplas Date: Sat May 12 22:03:48 2007 +0800 pm3fb: Fix compile error if module pm3fb_setup() should only compiled if pm3fb is built statically in the kernel. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 641e79129a56a4c50be1aed0fa713f440b46a440 Author: Russell King Date: Sat May 12 15:25:50 2007 +0100 [ARM] Use new get_irqnr_preamble Use the new get_irqnr_preamble macro to move the address of the IRQ controller outside the IRQ handling loop. Signed-off-by: Russell King commit 3b938be69e46b64a516b6e3ed6d93c40c091f22c Author: Russell King Date: Sat May 12 11:25:44 2007 +0100 [ARM] Ensure machine class menu is sorted alphabetically Signed-off-by: Russell King commit 8354c5b72636e5321e9b16dae1da1445506f6af6 Author: David S. Miller Date: Fri May 11 22:06:51 2007 -0700 [SPARC]: Wire up signalfd/timerfd/eventfd syscalls. Signed-off-by: David S. Miller commit d037e0532e7dbb5a7936cbc6747206d2352f2974 Author: David S. Miller Date: Fri May 11 21:18:50 2007 -0700 [SPARC64]: Add support for bq4802 TOD chip, as found on ultra45. Signed-off-by: David S. Miller commit 95d71e663e79b3e8c64bd7b7321389394b16276e Author: David S. Miller Date: Fri May 11 21:02:09 2007 -0700 [SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset. Signed-off-by: David S. Miller commit e1a39fbb029fce40150d9163d39a68e2b76cd0b5 Author: David S. Miller Date: Fri May 11 16:34:35 2007 -0700 [SPARC64]: envctrl.c needs asm/io.h Signed-off-by: David S. Miller commit d77311f942731064f4fb904de2ebbb238ee1d03e Author: David S. Miller Date: Fri May 11 14:32:07 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 7cac4ce59b3bc2b5c91b7e0cf4e6943e223076ec Author: David S. Miller Date: Fri May 11 14:30:57 2007 -0700 [TTY]: Export proc_clear_tty() to modulea. A use was added to the solaris syscall module which can be built modular. Signed-off-by: David S. Miller commit f16537bac7742501c8eb7200341ae1eb9b1e43c3 Author: David S. Miller Date: Fri May 11 14:29:43 2007 -0700 [SPARC64]: pci_resource_adjust() cannot be __init. Noticed by Meelis Roos. Signed-off-by: David S. Miller commit e5dd42e4fb242ae07a09928616570348ffe8aeee Author: Simon Arlott Date: Fri May 11 13:52:08 2007 -0700 [SPARC64]: Spelling fixes. Spelling fixes in arch/sparc64/. Signed-off-by: Simon Arlott Signed-off-by: David S. Miller commit d1a78c32edcabea8c7c6449c967191a47f83a77f Author: Simon Arlott Date: Fri May 11 13:51:23 2007 -0700 [SPARC]: Spelling fixes. Spelling fixes in arch/sparc/. Signed-off-by: Simon Arlott Signed-off-by: David S. Miller commit e9429eacd7996d4c22f69ef57cd0aeacde50ceb7 Author: David S. Miller Date: Thu May 10 17:30:50 2007 -0700 [SPARC64]: Kill LARGE_ALLOCS and update defconfig. Let's use SLUB, since it works now, in order to get it tested a bit. Signed-off-by: David S. Miller commit fd4ba7e2b7ce9a48b8c60d5fcd65feda5746812e Author: Dale Farnsworth Date: Sat May 12 10:58:43 2007 +1000 [POWERPC] Add arch/powerpc support for the Motorola PrPMC2800 This finally adds the PPC_PRPMC2800 Kconfig option, the board setup code (the setup and reset functions) and the defconfig, to support the Motorola PrPMC2800 platform. Signed-off-by: Dale Farnsworth Signed-off-by: Paul Mackerras commit c368d921daed3c7cfba9752a45b2a8804cd54128 Author: Mark A. Greer Date: Sat May 12 10:58:18 2007 +1000 [POWERPC] Add bootwrapper support for Motorola PrPMC2800 platform The Motorola PrPMC280 and PrPMC2800 processor modules sit on an F101 or PrPMC2800 baseboard, respectively. There are several variants of each type of processor module which can have different amounts of memory, amounts of FLASH, cpu frequencies, and an mv64360 or an mv64362. The bootwrapper code for that platform reads VPD from an I2C EEPROM to determine the processor module variant. From the variant, the amount of memory, etc. is determined and the device tree is updated accordingly. If the variant cannot be determined (e.g., corrupted VPD or a previously unknown variant), the property values already in the device tree are used. Also, the firmware for those platforms does not completely configure the mv64x60 host bridge so that configuration is done here. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 3f456cc18f63bebdf71d788098c72d7ecd83c9b6 Author: Mark A. Greer Date: Sat May 12 10:57:58 2007 +1000 [POWERPC] Add DTS file for the Motorola PrPMC2800 platform Add the device tree source file for the prpmc2800 line of processor PMCs. Several of the property values are updated by the bootwrapper but sane defaults have been chosen in case the bootwrapper can't determine the exact processor board variant. The defaults should allow the kernel to boot despite having non-optimal device tree property values. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 06cce43cf0980d0ed3581458fd23522ca2d24e42 Author: Dale Farnsworth Date: Sat May 12 10:57:35 2007 +1000 [POWERPC] Check cache coherency of kernel vs firmware check_cache_coherency() verifies that the cache coherency setting of the kernel (CONFIG_NOT_COHERENT_CACHE) matches that left by the firmware, as indicated by coherency-off device tree property. Signed-off-by: Dale Farnsworth Signed-off-by: Paul Mackerras commit e1a3107b06a9619773596cd46a9ce0574419aed4 Author: Dale Farnsworth Date: Sat May 12 10:57:12 2007 +1000 [POWERPC] Add Marvell mv64x60 PCI bridge support This patch adds PCI bridge support for the Marvell mv64x60 chip. We also provide the ability to read/write the mv64x60 hotswap register via sysfs if the hs_reg_valid property is set in the device tree. Signed-off-by: Dale Farnsworth Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 01f0e78e15c52af480c867af5bd406afec80d9cc Author: Dale Farnsworth Date: Sat May 12 10:56:47 2007 +1000 [POWERPC] Create Marvell mv64x60 I2C platform_data This patch creates platform_device entries for the Marvell mv64x60 I2C ports, based on information contained in device tree. This driver (like the other mv64x60 drivers) are unusual in that it works on both the MIPS and PowerPC architectures. Because of that, the drivers do not support the normal PowerPC of_platform_bus_type. They support platform_bus_type instead. Signed-off-by: Dale Farnsworth Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 649c8e0289eeee2ab3d4c6c6e062df24dd602233 Author: Dale Farnsworth Date: Sat May 12 10:56:24 2007 +1000 [POWERPC] Create Marvell mv64x60 ethernet platform_data This patch creates platform_device entries for the Marvell mv64x60 ethernet controller ports, based on information contained in the device tree. This driver (like the other mv64x60 drivers) are unusual in that it works on both the MIPS and PowerPC architectures. Because of that, the drivers do not support the normal PowerPC of_platform_bus_type. They support platform_bus_type instead. Signed-off-by: Dale Farnsworth Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 52d3aff903171af13b56c5a4d6fb828461406c65 Author: Dale Farnsworth Date: Sat May 12 10:55:53 2007 +1000 [POWERPC] Create Marvell mv64x60 MPSC (serial) platform_data This patch creates platform_device entries for the Marvell mv64x60 MPSC (multi-protocol serial controller) ports, based on information contained in the device tree. This driver (like the other mv64x60 drivers) are unusual in that it works on both the MIPS and PowerPC architectures. Because of that, the drivers do not support the normal PowerPC of_platform_bus_type. They support platform_bus_type instead. Signed-off-by: Dale Farnsworth Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e44b8941908ec9ccf03b52713c9e7d3471bada8c Author: Dale Farnsworth Date: Sat May 12 10:55:24 2007 +1000 [POWERPC] Add interrupt support for Marvell mv64x60 chips There are 3 interrupt groups each with its own status/mask registers. We use a separate struct irq_chip for each interrupt group and handle interrupts in two stages or levels: level 1 selects the appropriate struct irq_chip, and level 2 selects individual interrupts within that irq_chip. Signed-off-by: Dale Farnsworth Signed-off-by: Paul Mackerras commit ae4b3fbc7a91ea4e5685edb0310bb185a12e5943 Author: Mark A. Greer Date: Sat May 12 10:54:53 2007 +1000 [POWERPC] Add bootwrapper support for Marvell/mv64x60 I2C Some platforms support a variety processor modules with no method of determining which exact processor module is being used except by examining Vital Product Data (VPD). The modules may have different amounts of memory, clock frequencies, etc. so reading the VPD becomes necessary to correctly set properties in the device tree before its passed to the kernel. Often the VPD is stored in I2C EEPROMs so an I2C driver becomes necessary. This I2C driver is for the I2C controller that's embedded on the Marvel mv64x60 line of host bridges. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit e12deb840ceed7051ab4799ae71b675a83c58c7c Author: Mark A. Greer Date: Sat May 12 10:54:31 2007 +1000 [POWERPC] Add bootwrapper support for Marvell MPSC The bootwrapper requires a serial driver to allow cmdline editing and information reporting on the console. This driver is required by platforms that boot a zImage and use the MPSC for the console. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 0f81b11d2a14adaa9b2c944f104e13d72fedc769 Author: Mark A. Greer Date: Sat May 12 10:54:05 2007 +1000 [POWERPC] Add bootwrapper support for Marvell/mv64x60 hostbridge The mv64x60 host bridge has many windows between its various components (cpu, system memory, ethernet ctlr, MPSC, DMA ctlr, PCI MEM, PCI I/O). Unfortunately, the firmware on some of mv64x60-based platforms do not properly or completely configure those windows (e.g., MPSC->system memory windows not configured or CPU->PCI MEM space not configured). So, the missing configuration needs to be done in either the bootwrapper or in the kernel. To keep the kernel as clean as possible, it is done in the bootwrapper. Note that I/O controller configuration is NOT being done, its only the windows to allow the I/O controllers and other components to access memory, etc. that is being done--drivers assume that their controllers can already access system memory). Table of routines and the windows they configure: mv64x60_config_ctlr_windows() ENET->System Memory MPSC->System Memory IDMA->System Memory mv64x60_config_pci_windows() PCI MEM->System Memory PCI I/O->Bridge's Registers mv64x60_config_cpu2pci_window() CPU->PCI MEM CPU->PCI I/O Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 916066d5913c37a6b3907eb6695cc9ecaaa4d8ca Author: Mark A. Greer Date: Sat May 12 10:53:36 2007 +1000 [POWERPC] Add Makefile rules to wrap dts file in zImage Add 'zImage.dts' and 'zImage.dts_initrd' build rules that automatically compile and wrap a dts file from arch/powerpc/boot/dts into the zImage file. The resulting zImage will be arch/powerpc/boot/zImage.dts. and arch/powerpc/boot/zImage.dts_initrd., respectively. Having separate rules allows the user to choose whether to include a device tree--and which device tree--at build time. This is useful when one Makefile target builds a zImage that runs on several platforms except for differing device trees. By just setting CONFIG_DEVICE_TREE and running "make zImage.dts" the exact zImage you want is built without Makefile bloat or manually running the wrapper script. The dts file is expected to be arch/powerpc/boot/dts/$(CONFIG_DEVICE_TREE) Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit a8de5ce9895367191df9b30804a0c67cfcc9f27a Author: Simon Arlott Date: Sat May 12 05:42:54 2007 +1000 [POWERPC] Spelling fixes: arch/ppc/ Spelling fixes in arch/ppc/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mackerras commit dab4d7984ee61c8eb25569b12e7a996f5aaef2ba Author: Scott Wood Date: Sat May 12 03:52:03 2007 +1000 [POWERPC] U-boot passes the initrd as start/end, not start/size. The boot wrapper platform init code on 83xx and 85xx using the cuboot platform type was incorrectly assuming that u-boot supplied the size of the initrd, whereas it actually supplies the end address. This fixes it. Signed-off-by: Scott Wood Signed-off-by: Paul Mackerras commit 36bd2836f39d9c256689475432dd7d36eda1c491 Author: Geoff Levand Date: Sat May 12 03:42:03 2007 +1000 [POWERPC] PS3: Update ps3_defconfig Update ps3_defconfig. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 28820d9f793b4d9998d5d4132b8bab0ec9bf6ec3 Author: Geoff Levand Date: Sat May 12 03:41:59 2007 +1000 [POWERPC] PS3: Fix request_irq warning Fix compiler warning: ps3/smp.c:122: warning: ignoring return value of 'request_irq' Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit fd6e9d3945ee122eb513ada8b17296d243c1ce5e Author: Kim Phillips Date: Sat May 12 03:19:38 2007 +1000 [POWERPC] Don't complain if size-cells == 0 in prom_parse() An mdio bus scan was added with ucc_geth phylib migration patches, now machines complain on boot, saying: prom_parse: Bad cell count for /qe@e0100000/mdio@2120/ethernet-phy@00 prom_parse: Bad cell count for /qe@e0100000/mdio@2120/ethernet-phy@01 since size-cells can indeed be 0, this patch fixes the check. Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit e147ec8f18082efb700763bed4fe24f73ca50a2c Author: will schmidt Date: Fri May 11 23:34:16 2007 +1000 [POWERPC] Simplify smp_space_timers Greatly simplify the function smp_space_timers. The stolen time calculation (per comment within the code) doesn't need the half-jiffy stagger any more. There isn't an issue with bouncing off global locks, so we really shouldn't need any sort of staggering at all. However, the last_jiffy value still needs to be set. This removes the extra stagger logic, and just sets the values. This change should benefit applications that rely on barrier synchronization, and will help cut down OS jitter. Boot tested across the board (G5,power3,power4,power5,970mp blade). Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit 435e0b2b165bcac86eeddf675383070f60587cbb Author: Stephen Rothwell Date: Fri May 11 15:42:44 2007 +1000 [POWERPC] Trivial ps3 warning fixes Fixes warnings: arch/powerpc/platforms/ps3/system-bus.c: In function 'ps3_map_sg': arch/powerpc/platforms/ps3/system-bus.c:278: warning: unused variable 'i' arch/powerpc/platforms/ps3/system-bus.c:277: warning: unused variable 'dev' arch/powerpc/platforms/ps3/setup.c:103: warning: 'prealloc' defined but not used Signed-off-by: Stephen Rothwell Acked-by: Geoff Levand Signed-off-by: Paul Mackerras commit bff8dde8fb0ee9429837051b6054d770755d6e7f Author: Stephen Rothwell Date: Fri May 11 15:40:36 2007 +1000 [POWERPC] Add missed include fixes: arch/powerpc/platforms/pasemi/idle.c: In function 'pasemi_system_reset_exception': arch/powerpc/platforms/pasemi/idle.c:55: warning: implicit declaration of function 'do_IRQ' Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8980ae86779288b19554426d71986f04c05f7a49 Author: Stephen Rothwell Date: Fri May 11 15:38:34 2007 +1000 [POWERPC] Remove unused variable in hpte_decode() Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0c12fe5697f12c7d1d203d8152dc6382244ec1d3 Author: Stephen Rothwell Date: Fri May 11 15:37:38 2007 +1000 [POWERPC] Assign correct variable in hpte_decode() This case will never be hit, but it should be corrected anyway. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b3b7cc7b4138f4171da5813b5ec2a14835e02482 Author: David Miller Date: Fri May 11 13:26:44 2007 -0700 Fix assertion failure with MSI on sparc64 Today's find is a triggered assertion in msi_free_irqs() when the system doesn't support MSI, in which case arch_setup_msi_irqs() always returns an error. The problem is that when this happens we branch into msi_free_irqs(), to which you added the following assertion loop: list_for_each_entry(entry, &dev->msi_list, list) BUG_ON(irq_has_action(entry->irq)); Well, if arch_setup_msi_irqs() fails, entry->irq will be zero and although that's never assigned to any normal devices we use that IRQ number for the timer interrupt on sparc64 so this assertion triggers. Better to test for zero before doing the irq_has_action() assertion thing. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit b9a3b4d1453689f2927668fcdc4827fdccf44d1b Author: Olof Johansson Date: Wed May 9 23:00:20 2007 -0500 pata_platform: don't use generic ata_port_start I have a system where I have a simple IDE controller that sits on a local bus without bus master dma capability, and thus no dma_mapping ops defined for the device/bus. pata_platform works great for me, with the exception of using the generic ata_port_start which tries to do a dmam_alloc_coherent. Looks like it doesn't need to allocate a prd table at all, so replace it with a dummy function instead. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit b196fc69f7be7b4454781add9c2d5173f44d509b Author: Jan Engelhardt Date: Thu May 10 22:48:54 2007 -0700 Use menuconfig objects: libata Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2bcfdde6767f2f07891d2753c25220012fe5e6d2 Author: Henry Su Date: Thu May 10 22:48:51 2007 -0700 add the ATI SB700 SATA controller device id to AHCI pci table Add the device ID to AHCI pci table for ATI SB700 SATA controller, the subsequent chipset of SB600. Signed-off-by: henry su Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 823777181b4c0200923dcb026efa5b37f55c0ecf Author: Henry Su Date: Thu May 10 22:48:50 2007 -0700 Add the combined mode for ATI SB700 Besides those modes in ATI SB600 SATA controller, ATI SB700 supports one more mode:the combined mode. The combined mode is a Legacy IDE mode used for compatibility with some old OS without AHCI driver, but now it is not necessary for Linux since the kernel has supported AHCI. Signed-off-by: Luugi Marsan Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 48aaae7a2fa46e1ed0d0b7677fde79ccfcb8c963 Author: Aeschbacher, Fabrice Date: Thu May 10 22:48:48 2007 -0700 pata_pcmcia: recognize 2GB CompactFlash from Transcend Allow the pata_pcmcia driver to automatically detect 2GB CompactFlash cards from Transcend. Signed-off-by: Fabrice Aeschbacher Cc: "Peter Stuge" Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1d30c33d8d07868199560b24f10ed6280e78a89c Author: Andrew Morton Date: Thu May 10 22:48:43 2007 -0700 git-libata-all: sata_via build fix Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3a32a8e96694a243ec7e7feb6d76dfc4b1fe90c1 Author: Tejun Heo Date: Sat May 5 23:50:38 2007 +0900 libata-acpi: clean up parameters and misc stuff This patch cleans up libata-acpi such that it looks similar to other libata files. This patch doesn't introuce any behavior changes. * make libata-acpi functions take ata_device instead of ata_port + device index * s/atadev/dev/ * de-indent local variable declarations Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e92351bb53c0849fabfa80be53cbf3b0aa166e54 Author: Tejun Heo Date: Sat May 5 23:50:38 2007 +0900 libata-acpi: s/CONFIG_SATA_ACPI/CONFIG_ATA_ACPI/ ACPI applies to both SATA and PATA. Drop the 'S' from the config variable. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8575b814097af648dad284bd3087875a11b13d18 Author: Tejun Heo Date: Fri May 11 14:46:51 2007 +0200 libata: give devices one last chance even if recovery failed with -EINVAL After certain errors, some devices report complete garbage on IDENTIFY. This can cause ata_dev_read_id() to fail with -EINVAL resulting in immediate disabling of the device. Give the device one last chance after -EINVAL to allow recovery from such situations. As -EINVAL is triggered very rarely, this shouldn't cause any noticeable affect on more common error paths. Signed-off-by: Tejun Heo Cc: Harald Dunkel Signed-off-by: Jeff Garzik commit 54936f8b099325992f0f212a5e366fd5257c6c9c Author: Tejun Heo Date: Fri May 11 14:35:29 2007 +0200 libata: fallback to the other IDENTIFY on device error, take#2 It seems the world isn't as frank as we thought and some devices lie about who they are. Fallback to the other IDENTIFY if IDENTIFY is aborted by the device. As this is the strategy used by IDE for a long time, it shouldn't cause too much problem. Signed-off-by: Tejun Heo Cc: William Thompson Signed-off-by: Jeff Garzik commit f4d6d00466ef4879e4289f18c2f59210a06a7ada Author: Tejun Heo Date: Tue May 1 11:50:15 2007 +0200 libata: ignore EH scheduling during initialization libata enables SCSI host during ATA host activation which happens after IRQ handler is registered and IRQ is enabled. All ATA ports are in frozen state when IRQ is enabled but frozen ports may raise limited number of IRQs after being frozen - IOW, ->freeze() is not responsible for clearing pending IRQs. During normal operation, the IRQ handler is responsible for clearing spurious IRQs on frozen ports and it usually doesn't require any extra code. Unfortunately, during host initialization, the IRQ handler can end up scheduling EH for a port whose SCSI host isn't initialized yet. This results in OOPS in the SCSI midlayer. This is relatively short window and scheduling EH for probing is the first thing libata does after initialization, so ignoring EH scheduling until initialization is complete solves the problem nicely. This problem was spotted by Berck E. Nash in the following thread. http://thread.gmane.org/gmane.linux.kernel/519412 Signed-off-by: Tejun Heo Cc: Berck E. Nash Signed-off-by: Jeff Garzik commit 1626aeb881236c8cb022b5e4ca594146a951d669 Author: Tejun Heo Date: Fri May 4 12:43:58 2007 +0200 libata: clean up SFF init mess The intention of using port_mask in SFF init helpers was to eventually support exoctic configurations such as combination of legacy and native port on the same controller. This never became actually necessary and the related code always has been subtly broken one way or the other. Now that new init model is in place, there is no reason to make common helpers capable of handling all corner cases. Exotic cases can simply dealt within LLDs as necessary. This patch removes port_mask handling in SFF init helpers. SFF init helpers don't take n_ports argument and interpret it into port_mask anymore. All information is carried via port_info. n_ports argument is dropped and always two ports are allocated. LLD can tell SFF to skip certain port by marking it dummy. Note that SFF code has been treating unuvailable ports this way for a long time until recent breakage fix from Linus and is consistent with how other drivers handle with unavailable ports. This fixes 1-port legacy host handling still broken after the recent native mode fix and simplifies SFF init logic. The following changes are made... * ata_pci_init_native_host() and ata_init_legacy_host() both now try to initialized whatever they can and mark failed ports dummy. They return 0 if any port is successfully initialized. * ata_pci_prepare_native_host() and ata_pci_init_one() now doesn't take n_ports argument. All info should be specified via port_info array. Always two ports are allocated. * ata_pci_init_bmdma() exported to be used by LLDs in exotic cases. * port_info handling in all LLDs are standardized - all port_info arrays are const stack variable named ppi. Unless the second port is different from the first, its port_info is specified as NULL (tells libata that it's identical to the last non-NULL port_info). * pata_hpt37x/hpt3x2n: don't modify static variable directly. Make an on-stack copy instead as ata_piix does. * pata_uli: It has 4 ports instead of 2. Don't use ata_pci_prepare_native_host(). Allocate the host explicitly and use init helpers. It's simple enough. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 920a4b1038e442700a1cfac77ea7e20bd615a2c3 Author: Tejun Heo Date: Fri May 4 21:28:48 2007 +0200 libata: implement libata.spindown_compat Now that libata uses sd->manage_start_stop, libata spins down disk on shutdown. In an attempt to compensate libata's previous shortcoming, some distros sync and spin down disks attached via libata in their shutdown(8). Some disks spin back up just to spin down again on STANDBYNOW1 if the command is issued when the disk is spun down, so this double spinning down causes problem. This patch implements module parameter libata.spindown_compat which, when set to one (default value), prevents libata from spinning down disks on shutdown thus avoiding double spinning down. Note that libata spins down disks for suspend to mem and disk, so with libata.spindown_compat set to one, disks should be properly spun down in all cases without modifying shutdown(8). shutdown(8) should be fixed eventually. Some drive do spin up on SYNCHRONZE_CACHE even when their cache is clean. Those disks currently spin up briefly when sd tries to shutdown the device and then the machine powers off immediately, which can't be good for the head. We can't skip SYNCHRONIZE_CACHE during shudown as it can be dangerous data integrity-wise. So, this spindown_compat parameter is already scheduled for removal by the end of the next year and here's what shutdown(8) should do. * Check whether /sys/modules/libata/parameters/spindown_compat exists. If it does, write 0 to it. * For each libata harddisk { * Check whether /sys/class/scsi_disk/h:c:i:l/manage_start_stop exists. Iff it doesn't, synchronize cache and spin the disk down as before. } The above procedure will make shutdown(8) work properly with kernels before this change, ones with this workaround and later ones without it. To accelerate shutdown(8) updates, if the compat mode is in use, this patch prints BIG FAT warning for five seconds during shutdown (the optimal interval to annoy the user just the right amount discovered by hours of tireless usability testing). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9666f4009c22f6520ac3fb8a19c9e32ab973e828 Author: Tejun Heo Date: Fri May 4 21:27:47 2007 +0200 libata: reimplement suspend/resume support using sdev->manage_start_stop Reimplement suspend/resume support using sdev->manage_start_stop. * Device suspend/resume is now SCSI layer's responsibility and the code is simplified a lot. * DPM is dropped. This also simplifies code a lot. Suspend/resume status is port-wide now. * ata_scsi_device_suspend/resume() and ata_dev_ready() removed. * Resume now has to wait for disk to spin up before proceeding. I couldn't find easy way out as libata is in EH waiting for the disk to be ready and sd is waiting for EH to complete to issue START_STOP. * sdev->manage_start_stop is set to 1 in ata_scsi_slave_config(). This fixes spindown on shutdown and suspend-to-disk. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 72fdbdce3d52282f8ea95f512e871791256754e6 Author: Simon Arlott Date: Fri May 11 14:55:43 2007 -0700 [IA64] spelling fixes: arch/ia64/ Spelling and apostrophe fixes in arch/ia64/. Signed-off-by: Simon Arlott Signed-off-by: Tony Luck commit 12414db11da8789d9a6b549c4899250f6e116630 Author: Kim Phillips Date: Thu May 10 15:16:04 2007 -0500 Add support for the Davicom DM9161A PHY Distinguish between the Davicom DM9161A PHY and the DM9161E. Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit f30cac6fbf30d92d517768fdbd616cd196b43d1d Author: Stephen Hemminger Date: Fri May 11 11:21:47 2007 -0700 sky2: only disable 88e8056 on some boards Use DMI to add a blacklist of broken boards (so far only one). Hopefully, the problems will be solved later, and the the whole blacklist can disappear. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 78f0b62d4c15580369acf830f73a1f22570f201e Author: Stephen Hemminger Date: Fri May 11 11:21:46 2007 -0700 sky2: 88e8071 support not ready The driver is not ready to support 88e8071 chip. If this chip is present, system will hang on boot. So remove it from PCI device id's for now. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e3b7df17c8344fbcc00e871e03f5f88d58905277 Author: Stephen Hemminger Date: Fri May 11 11:21:45 2007 -0700 skge: crash on shutdown/suspend If device is not fails during module startup (like unsupported chip version) then driver would crash dereferencing a null pointer, on shutdown or suspend/resume. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 549a68c3fe2ca320b0764d1289d17af797daa5d1 Author: Stephen Hemminger Date: Fri May 11 11:21:44 2007 -0700 sky2: fix oops on shutdown If the device is fails during module startup for some reason like unsupported chip version then the driver would crash dereferencing a null pointer, on shutdown or suspend/resume. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4093785dd16d0b7058eb92331bfd7b40b12151f3 Author: Andrew Morton Date: Thu May 10 22:53:01 2007 -0700 mlx4: don't use deprecated IRQ flags Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1c8e039a4bce0dae0d49c5df451f338a5d19363a Author: Andrew Morton Date: Thu May 10 22:53:00 2007 -0700 netxen_nic_main don't use deprecated irq flags drivers/net/netxen/netxen_nic_main.c: In function 'netxen_nic_open': drivers/net/netxen/netxen_nic_main.c:738: warning: 'deprecated_irq_flag' is deprecated (declared at include/linux/interrupt.h:66) drivers/net/netxen/netxen_nic_main.c:738: warning: 'deprecated_irq_flag' is deprecated (declared at include/linux/interrupt.h:66) Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e6c5fb3bd0dcf1bf3d6848fe890bf73051877a4a Author: Jan Engelhardt Date: Thu May 10 22:52:59 2007 -0700 Use menuconfig objects II - netdev/wan Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Cc: Krzysztof Halasa Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit be3b6c14ab4fd5d542652180f33fee8e32182d84 Author: Jan Engelhardt Date: Thu May 10 22:52:58 2007 -0700 Use menuconfig objects II - netdev/pcmcia Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4151ce3159c18a990da7fd6f0fe36c73d1c40f87 Author: Jan Engelhardt Date: Thu May 10 22:52:57 2007 -0700 Use menuconfig objects II - netdev/atm Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu", so that the user can disable all the options in that menu at once instead of having to disable each option separately. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit f30486d57bceec2364aa696403d64429ada61b60 Author: Jan Engelhardt Date: Thu May 10 22:52:56 2007 -0700 Use menuconfig objects: netdev Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 53f99941c1d0bd1d75c9ea7bf4dfcb3ce3ec4b05 Author: Jan Engelhardt Date: Thu May 10 22:52:55 2007 -0700 Use menuconfig objects: PHY Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a1c38a4a5dd36487b65c4b48e37ecfdd080817f3 Author: Ishizaki Kou Date: Thu May 10 12:18:48 2007 -0500 spidernet: remove unnecessary accesses to phy This patch removes unnecessary accesses to phy registers. Signed-off-by: Kou Ishizaki Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 491976b2bce07f2c44e32a987fa6eb9edf8b0aeb Author: Sreenivasa Honnur Date: Thu May 10 04:22:25 2007 -0400 S2IO: Statistics for link up/down and memory allocated/freed 1. Added statistics for link up/down, last link up/down. 2. Statistics for memory allocated/freed. 3. Changed level of some DBG_PRINTs. Signed-off-by: Sreenivasa Honnur Signed-off-by: Jeff Garzik commit c53d49453f738555c252304357cd7da6ba1f1ee0 Author: Sreenivasa Honnur Date: Thu May 10 04:18:54 2007 -0400 S2IO: statistics for memory allocation failuers 1. Added code to count the number of memory failures. 2. Added watchdog_timer counter. 3. Changed debug level for some DBG_PRINTS. Signed-off-by: Sreenivasa Honnur Signed-off-by: Jeff Garzik commit 0cec35ebf341726e2490a4b01296a6dc132d1127 Author: Sreenivasa Honnur Date: Thu May 10 04:06:28 2007 -0400 S2IO: getringparam ethtool option Adding get_ringparam ethtool option. Signed-off-by: Sreenivasa Honnur Signed-off-by: Jeff Garzik commit 9bf77ee6c24b33758a432f106fb765bf32550508 Author: Andrew Victor Date: Fri May 11 21:14:53 2007 +0100 [ARM] 4333/2: KS8695: Micrel Development board Board support and default configuration file for the Micrel/Kendin KS8695 Development board. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2c7ee6ab7cb7261aacea91d41da8df1874772f3f Author: Andrew Victor Date: Fri May 11 21:37:25 2007 +0100 [ARM] 4332/2: KS8695: Serial driver A driver for the KS8695 internal UART. Based on the 2.6.9 driver from Micrel. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c53c9cf60e49119e97d38390849cac5b2f0a0981 Author: Andrew Victor Date: Fri May 11 21:01:28 2007 +0100 [ARM] 4331/3: Support for Micrel/Kendin KS8695 processor Add core support for the Kendin/Micrel KS8695 processor family. It is an ARM922-T based SoC with integrated USART, 4-port Ethernet Switch, WAN Ethernet port, and optional PCI Host bridge, etc. http://www.micrel.com/page.do?page=product-info/sys_on_chip.jsp This patch is based on earlier patches from Lennert Buytenhek, Ben Dooks and Greg Ungerer posted to the arm-linux-kernel mailing list in March 2006; and Micrel's 2.6.9 port. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c42dcb3dcfd3a473ab7c79c2ae91fc1c2e4dc5db Author: Andrew Victor Date: Fri May 11 19:24:18 2007 +0100 [ARM] 4371/1: AT91: Support for Atmel AT91SAM9RL-EK development board Add support for the Atmel AT91SAM9RL-EK development board. Signed-off-by: Nicolas Ferre Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 54cb128037de499ea81626b0f37f9bb90e8db3d3 Author: Andrew Victor Date: Fri May 11 20:09:41 2007 +0100 [ARM] 4372/1: Define byte sizes in asm-arm/sizes.h Define SZ_512, SZ_256 and SZ_16 in asm-arm/sizes.h. Remove the definitions from the at91*_devices.c files. (Dependent on ARM patch #4370/2) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 877d7720f5f67793b9b6027840d2c88ea25dc4c8 Author: Andrew Victor Date: Fri May 11 20:49:56 2007 +0100 [ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors. Add support for Atmel's new AT91SAM9RL range of processors. Includes similar peripherals as other AT91SAM9 processors, but with a High-speed USB controller and various sizes of internal SRAM. Signed-off-by: Nicolas Ferre Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 8bd994815987dda0947bd9afd887b1410713d4f7 Author: Andi Kleen Date: Fri May 11 11:23:20 2007 +0200 x86_64: Don't call mtrr_bp_init from identify_cpu The code was ok, but triggered warnings for calling __init from __cpuinit. Instead call it from check_bugs instead. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 547c5355d1b1167af39e315c82aa9ff1398596f4 Author: Andrew Hastings Date: Fri May 11 11:23:19 2007 +0200 x86_64: off-by-two error in aperture.c I'm using a custom BIOS to configure the northbridge GART at address 0x80000000, size 2G. Linux complains: "Aperture from northbridge cpu 0 beyond 4GB. Ignoring." I think there's an off-by-two error in arch/x86_64/kernel/aperture.c: AK: use correct types for i386 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fd0581bbb40d8f4b0e4b3a4de2258a50df37bb57 Author: Andi Kleen Date: Fri May 11 11:23:18 2007 +0200 i386: Fix compilation of verify_cpu.S on old binutils Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 Author: Wim Van Sebroeck Date: Fri May 11 18:59:24 2007 +0000 [WATCHDOG] iTCO_wdt.c - fix ACPI Base register The ACPI/PM base I/O address which is the base for the TCO registers is defined as bits [15:7] (highest bit is 31, lowest is 0) The code however only reads bits [14:7]. So base_address &= 0x00007f80; needs to be: base_address &= 0x0000ff80; This patch fixes this. Signed-off-by: Ate Wijma Signed-off-by: Wim Van Sebroeck commit 4269e2ad83036e1d8c076b1f1348f879a93be008 Author: Dan Williams Date: Thu May 10 23:10:18 2007 -0400 [PATCH] libertas: 64-bit cleanups Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit c4aa7051b6d5697d2c0c169153e727c2e4175c5b Author: Dan Williams Date: Thu May 10 23:09:33 2007 -0400 [PATCH] libertas: sparse fixes Fix various issues reported by sparse. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 12a4d265e5ca354fb9225732b7e625bd00002bc4 Author: Dan Williams Date: Thu May 10 23:08:54 2007 -0400 [PATCH] libertas: fix missing unlock in TX error path Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 5bdb3efe9dc117afeb043b54034249d24fdf80d6 Author: Dan Williams Date: Thu May 10 23:08:05 2007 -0400 [PATCH] libertas: make debugfs.c sparse-clean made debugfs.c sparse-clean, found an unused function that way Signed-off-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 3a8b9a4a6b4e7cfd147f94f5772641a34e12efe4 Author: Dan Williams Date: Thu May 10 23:05:55 2007 -0400 [PATCH] libertas: Clean up debug defines Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 4f3465f80564e07a5756b11365cd24f9d693a9bb Author: Dan Williams Date: Thu May 10 23:05:22 2007 -0400 [PATCH] libertas: remove SUPPORT_BOOT_COMMAND Remove the static definition of SUPPORT_BOOT_COMMAND. Signed-off-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 4b19fcc363e9d3886d45818ad72633d5f0cba88d Author: Dan Williams Date: Thu May 10 23:04:39 2007 -0400 [PATCH] libertas: Purge non-mesh ioctls Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 3ce4023275a9d65d913d738846cea4a844e24b51 Author: Dan Williams Date: Thu May 10 23:03:07 2007 -0400 [PATCH] libertas: Get rid of version.h Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 0dc5a29044d56912bf0d4e5cd19127f82b90c29c Author: Dan Williams Date: Thu May 10 22:58:02 2007 -0400 [PATCH] libertas: remove WLAN_802_11_NETWORK_INFRASTRUCTURE enum Use standard IW_MODE_* constants instead. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 889c05bdf3056b029b9fa95096eac4f0dfd3fb6f Author: Dan Williams Date: Thu May 10 22:57:23 2007 -0400 [PATCH] libertas: remove WLAN_802_11_WEP_STATUS enum Also change WEPstatus to "wep_enabled"; it's clearer and consistent with the WPAenabled and WPA2enabled members. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 6affe785aaf983253b27e71e67bf5fceaee6ff88 Author: Dan Williams Date: Thu May 10 22:56:42 2007 -0400 [PATCH] libertas: remove WLAN_802_11_AUTHENTICATION_MODE Remove WLAN_802_11_AUTHENTICATION_MODE enum and use IW_AUTH_ALG_* instead. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 43631e15c1cd056a76272047c6ebe9edbaa06f25 Author: Dan Williams Date: Thu May 10 22:56:01 2007 -0400 [PATCH] libertas: remove setwpaie private ioctl Obsoleted by SIOCSIWGENIE. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 9408c297f6cee8e91ab2c51ec8d56e8c23c19a53 Author: Dan Williams Date: Thu May 10 22:55:20 2007 -0400 [PATCH] libertas: remove custom encryption mode stuff Remove setencryptionmode private ioctl and Encryptionmode variable. Mostly unused, and its functionality is provided by other internal members like WEPstatus, WPAenabled, WPA2enabled, and SIOCSIWGENIE. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 2a6f7ea1a0562abe6afbd2bbe01f6d300de12228 Author: Dan Williams Date: Thu May 10 23:12:27 2007 -0400 [PATCH] libertas: remove incorrect vi modelines Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 69f88dc5f9816ed6b137c095e8f6f289958d8108 Author: Dan Williams Date: Thu May 10 23:11:46 2007 -0400 [PATCH] libertas: remove setauthalg private ioctl Obsoleted by SIOCSIWAUTH's IW_AUTH_80211_AUTH_ALG option introduced by WE-18. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 1d42b8f293c55226d18d97127419157fa4e47b41 Author: Dan Williams Date: Thu May 10 22:53:14 2007 -0400 [PATCH] libertas: remove 8021xauthalgs private ioctl Useless; it set an internal variable that was unused anyway. A supplicant handles all 802.1x authentication, not the driver. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit ad1f3298959cf4321359da3288fd57acf2636369 Author: Dan Williams Date: Thu May 10 22:52:37 2007 -0400 [PATCH] libertas: fix size of SSID comparison in stop_adhoc check Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 4684c23dd472815755728fe954dfd2944956b4aa Author: Dan Williams Date: Thu May 10 22:52:04 2007 -0400 [PATCH] libertas: use for MAX_WPA_IE_LEN Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 51b0c9d09d0a889a232605e71555e390b3b110fb Author: Dan Williams Date: Thu May 10 22:51:28 2007 -0400 [PATCH] libertas: remove WPA_SUPPLICANT structure Start to normalize bss_descriptor with ieee80211_network so we can eventually replace bss_descriptor more easily. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 9da7cf23a4f9690ceecfd0184cd050be564416f1 Author: Russell King Date: Fri May 11 19:54:39 2007 +0100 [ARM] Update mach-types Signed-off-by: Russell King commit 487194a19d2069bfcc9791c3ab2204bed59b136a Author: Frederik Deweerdt Date: Fri May 11 19:10:52 2007 +0200 [ARM] export symbol csum_partial_copy_from_user I've got the following linking error when building 2.6.21-mm2 on ARM: ERROR: "csum_partial_copy_from_user" [net/rxrpc/af-rxrpc.ko] undefined! Linking fails because "csum_partial_copy_from_user" is not exported to modules. This patch adds it to the list of exported symbols. Signed-off-by: Frederik Deweerdt Signed-off-by: Russell King commit 1039592d6fe3221c406b02d7341ef4212bc25020 Author: David Woodhouse Date: Fri May 11 19:09:46 2007 +0200 further UTF-8 fixes and name correction > -** Copyright 1994 by Bj<94>rn Brauel > +** Copyright 1994 by Bj”rn Brauel I think these were cp437, and it should read 'Björn'. (asm-m68k/atari*.h) Also note that Arnaldo just put more legacy noise into CREDITS... Signed-off-by: Adrian Bunk commit b7cc4a879c4fed0adea23e9931d7b1944d103d2b Author: Satyam Sharma Date: Fri May 11 19:07:14 2007 +0200 Fix wrong identifier name in Documentation/kref.txt There's a typo / wrong identifier name in Documentation/kref.txt. Fix it. Signed-off-by: Satyam Sharma Acked-by: Corey Minyard Signed-off-by: Adrian Bunk commit 2fd0237538480c8d704c385b6f9abc3f6c46b760 Author: Daniel Wolstenholme Date: Thu May 10 22:33:02 2007 -0700 [ARM] iop13xx: msi support Enable devices to signal interrupts via PCI memory cycles. rev6: * fix enable/disable typo, Michael Ellerman rev5: * fix up ack, enable, and disable for iop13xx_msi_chip rev4: * move smp compile fix to separate patch * use dynamic_irq_init in create_irq() * hookup mask/unmask routines in iop13xx_msi_chip rev3: * change msi.c to use linux/smp.h instead of asm/smp.h * call dynamic_irq_cleanup at destroy_irq time rev2: * destroy_irq did not take the full 128 bits of msi_irq_in_use into account * added missing '&' for calls to test_and_set_bit and clear_bit [ebiederm@xmission.com: review comments/suggestions] [dan.j.williams@intel.com: cleanups/forward port to 2.6-git] Signed-off-by: Daniel Wolstenholme Signed-off-by: Dan Williams Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 2bd62a40f63bd628c43a2f3637b252d0967659b0 Author: Christoph Lameter Date: Thu May 10 22:42:53 2007 -0700 [IA64] Quicklist support for IA64 IA64 is the origin of the quicklist implementation. So cut out the pieces that are now in core code and modify the functions called. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit fac0779029749dfe8d77a35c26606ebda7a8e176 Author: Andrew Morton Date: Thu May 10 22:33:05 2007 -0700 [ARM] stacktrace fix ab1b6f03a10ba1f5638188ab06bf46e33ac3a160 said - remove the unused task argument to save_stack_trace, it's always current then broke arm: arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace' include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace' include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Russell King commit cdc7dbdfe6edac177acb32e4ca56b525d0743fe7 Author: Anil S Keshavamurthy Date: Fri May 11 09:38:40 2007 -0700 [IA64] fix Kprobes reentrancy In case of reentrance i.e when a probe handler calls a functions which inturn has a probe, we save a previous kprobe information and just single step the reentrant probe without calling the actual probe handler. During this reentracy period, if an interrupt occurs and if probe happens to trigger in the inturrupt path, then we were corrupting the previous kprobe( as we were overriding the previous kprobe info) info their by crashing the system. This patch fixes this issues by having a an array of previous kprobe info struct(with the array size of 2). This similar technique is not needed on i386 and x86_64 because by default interrupts are turn off in the break/int3 exception handler. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 87b247c41674e29f90bf4938799ab079951ccc6b Author: Thomas Gleixner Date: Thu May 10 22:33:04 2007 -0700 [ARM] Spinlock initializer cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Russell King commit a0d6333742c68b321043e4982ec413951ee9afb0 Author: Robert P. J. Day Date: Thu May 10 22:33:03 2007 -0700 [ARM] remove useless config option GENERIC_BUST_SPINLOCK Remove the apparently useless config option GENERIC_BUST_SPINLOCK, since nothing in the source tree refers to it. Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 25d61578daae697c4a0eb817f42a868af9824f82 Author: John Keller Date: Thu May 10 22:42:44 2007 -0700 [IA64] SN: validate smp_affinity mask on intr redirect On SN, only allow one bit to be set in the smp_affinty mask when redirecting an interrupt. Currently setting multiple bits is allowed, but only the first bit is used in determining the CPU to redirect to. This has caused confusion among some customers. [akpm@linux-foundation.org: fixes] Signed-off-by: John Keller Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 7c6337e225364870e9bf02a3ae277d9fdea483f8 Author: Kevin Hilman Date: Mon Apr 30 19:37:19 2007 +0100 [ARM] 4303/3: base kernel support for TI DaVinci Add base kernel support for the TI DaVinci platform. This patch only includes interrupts, timers, CPU identification, serial support and basic power and sleep controller init. More drivers to come. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit 030f4810e782e541468d36c27e721b582b7820a4 Author: Andrew Victor Date: Fri May 11 13:21:27 2007 +0100 [ARM] 4369/1: AT91: Fix circular dependency in header files Resolve the circular dependency in the AT91 header files (io.h and hardware.h) by moving the at91_sys_read() and at91_sys_write() functions to io.h Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f7538ac95200fd122fd84c8f85ff1130ee7645b5 Author: Arnaud Patard Date: Thu May 10 20:38:53 2007 +0100 [ARM] 4368/1: S3C24xx: build fix Trying to build current git tree fails. The failure is due to commit 25ff0a653067eec56efc730dbed664d5cc77e9f3. The patch title say it's for OMAP board while it's applied on S3C2410 Kconfig entry. Moreover, the OMAP entry is already selecting GENERIC_TIME. This patch reverts the offending commit. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit 302c0ef7317ddd49c0ae82004cfe308b5a2b6ab3 Author: Andrew Victor Date: Wed May 9 11:42:53 2007 +0100 [ARM] 4364/1: AT91: LEDS on AT91SAM9261-EK Attached you can find a patch needed to make the LEDS for 'CPU-Idle' and 'Timer' work on the AT91SAM9261-EK board. The kernel configuration options are already there, but the implementation is not available. Signed-off-by: Remy Bohmer Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f75fd965d500d33720948f30d409c6c7729a80af Author: Russell King Date: Wed May 9 20:21:11 2007 +0100 [ARM] Fix iop32x/iop33x build arch/arm/plat-iop/io.c:26: error: conflicting types for '__iop3xx_ioremap' Signed-off-by: Russell King commit 3b11e449b3a8d9b912d80e28f62985f22a70e87f Author: Russell King Date: Wed May 9 20:18:05 2007 +0100 [ARM] EBSA110: fix build errors caused by missing "const" arch/arm/mach-ebsa110/io.c:106: error: conflicting types for 'readsw' arch/arm/mach-ebsa110/io.c:116: error: conflicting types for 'readsl' arch/arm/mach-ebsa110/io.c:161: error: conflicting types for 'writesw' arch/arm/mach-ebsa110/io.c:171: error: conflicting types for 'writesl' Signed-off-by: Russell King commit 7fdc7849d2f9f926cbaec224bbcbacb164b07b23 Author: Arnaud Patard Date: Wed May 9 21:41:03 2007 +0100 [ARM] 4359/3: H1940: Add bluetooth support This patch adds a small driver responsible for configuring the UART used for the bluetooth chip and for enabling the bluetooth chipset. Additionnaly, can trigger a led if the H1940 led driver is enabled. Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b8b6970b4fe08397554295b0c5169bec7575f7c9 Author: Graeme Gregory Date: Wed May 9 15:55:24 2007 +0100 [ARM] 4365/1: Add AC97 clock to s3c2443 machine This adds the ac97 clock to the s3c2443 machine files. It seems to have been simply missed out previously. Signed-off-by: Graeme Gregory Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c9184f58cac9efa5d7d90a0e979f398a99d91641 Author: Jürgen Schindele Date: Mon May 7 19:48:44 2007 +0100 [ARM] 4362/1: trizeps4 update This update for trizeps4 SoM contains: - support for new TFT on more recent ConXS evalboard - correct partition of flash device - update of "trizeps4_defconfig" Signed-off-by: Jrgen Schindele (linux@schindele.name) Signed-off-by: Russell King commit f95637d2c68be5165d7de228374254c68561b387 Author: Russell King Date: Thu May 10 19:32:36 2007 +0100 [ARM] pata_icside: fix build errors Building on the previous two ecard infrastructure changes, this patch fixes the pata_icside build errors caused by the recent libata changes. Signed-off-by: Russell King commit 10bdaaa0fad620145cf10e2b573266b2d80b44de Author: Russell King Date: Thu May 10 18:40:51 2007 +0100 [ARM] ecard: add ecardm_iomap() / ecardm_iounmap() Add devres ecardm_iomap() and ecardm_iounmap() for Acorn expansion cards. Convert all expansion card drivers to use them. Signed-off-by: Russell King commit c7b87f3d5037a35b5c7bb916ffc826be3fcb208d Author: Russell King Date: Thu May 10 16:46:13 2007 +0100 [ARM] ecard: add helper function for setting ecard irq ops Rather than having every driver fiddle about setting its private IRQ operations and data, provide a helper function to contain this functionality in one place. Arrange to remove the driver-private IRQ operations and data when the device is removed from the driver, and remove the driver private code to do this. This fixes potential problems caused by drivers forgetting to remove these hooks. Signed-off-by: Russell King commit bf61f8d357e5d71d74a3ca3be3cce52bf1a2c01a Author: Kenichi Nagai Date: Fri May 11 01:12:15 2007 -0400 Input: evdev - fix overflow in compat_ioctl When exporting input device bitmaps via compat_ioctl on BIG_ENDIAN platforms evdev calculates data size incorrectly. This causes buffer overflow if user specifies buffer smaller than maxlen. Signed-off-by: Kenichi Nagai Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit df9f54084f1faf611cedd846d38b0631f9d4e9a5 Author: Ralf Baechle Date: Fri May 11 15:48:58 2007 +0100 Convert SGI IP22 and specific drivers to platform_device. Signed-off-by: Ralf Baechle commit 435b71be20f2ad3688acd94c05e968e029464d60 Author: NeilBrown Date: Thu May 10 22:23:31 2007 -0700 md: improve the is_mddev_idle test During a 'resync' or similar activity, md checks if the devices in the array are otherwise active and winds back resync activity when they are. This test in done in is_mddev_idle, and it is somewhat fragile - it sometimes thinks there is non-sync io when there isn't. The test compares the total sectors of io (disk_stat_read) with the sectors of resync io (disk->sync_io). This has problems because total sectors gets updated when a request completes, while resync io gets updated when the request is submitted. The time difference can cause large differenced between the two which do not actually imply non-resync activity. The test currently allows for some fuzz (+/- 4096) but there are some cases when it is not enough. The test currently looks for any (non-fuzz) difference, either positive or negative. This clearly is not needed. Any non-sync activity will cause the total sectors to grow faster than the sync_io count (never slower) so we only need to look for a positive differences. If we do this then the amount of in-flight sync io will never cause the appearance of non-sync IO. Once enough non-sync IO to worry about starts happening, resync will be slowed down and the measurements will thus be more precise (as there is less in-flight) and control of resync will still be suitably responsive. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11fe250d89cdce3d6bb43bd674f3dcdcaa78dbc8 Author: Robert P. J. Day Date: Thu May 10 22:23:30 2007 -0700 VIDEO: remove archaic if[] construct from Kconfig file Remove the obsolete "if [ ]" construct from the video console Kconfig file. Signed-off-by: Robert P. J. Day Acked-by: James Simmons Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03b9ae4b80dd5b20d7bf7e15902592d50c66780d Author: Antonino A. Daplas Date: Thu May 10 22:23:29 2007 -0700 pm2fb: fb_sync added Convert internal wait_pm2() function to fb API fb_sync() method. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 647f2e7aeef833272c17a5366680321c3def3f23 Author: Jean Delvare Date: Thu May 10 22:23:29 2007 -0700 nvidiafb: Enable debugging messages a Kconfig option Let the user enable debugging messages in nvidiafb. Signed-off-by: Jean Delvare Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 213b8a9af600316902e08e010fbcd216e42e41f7 Author: Jean Delvare Date: Thu May 10 22:23:28 2007 -0700 rivafb: Fix I2C getscl callback function Fix rivafb's I2C getscl callback function, as was done in nvidiafb recently. Signed-off-by: Jean Delvare Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14340586148e7c88d7b1b752876f5b5227b200b9 Author: Nicolas Ferre Date: Thu May 10 22:23:26 2007 -0700 atmel_lcdfb: AT91/AT32 LCD Controller framebuffer driver Adds a framebuffer driver to ATMEL AT91SAM9x and AT32 aka AVR32 platforms. Those chips share quite the same IP and this code is suitable for both architectures. Signed-off-by: Nicolas Ferre Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f23a06f076173c1f56572556169bf9e1793c5d59 Author: Krzysztof Helt Date: Thu May 10 22:23:25 2007 -0700 pm3fb: Preliminary 2.4 to 2.6 port This is a basic port from 2.4 kernel to 2.6. Acceleration is lost and big endian support probably too. The driver works in 8, 16 and 32 bit mode. [adaplas] - change VESA_* to FB_BLANK_* constants - removed unused function clear_memory - fix uninitialized variable compiler warning - some whitespace cleaning [akpm@linux-foundation.org: Nuke pestiferous CVS string] Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e98e267c6f76f509cea4b4022ca502b1aa221d77 Author: Michal Piotrowski Date: Thu May 10 22:23:24 2007 -0700 fbdev: geforce 7300 cleanup ups... coding style. Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7699acd1341c63fdbcfc56994fb2989ec59d2a43 Author: Davide Libenzi Date: Thu May 10 22:23:23 2007 -0700 epoll cleanups: epoll remove static pre-declarations and akpm-ize the code Re-arrange epoll code to avoid static functions pre-declarations, and apply akpm-filter on it. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea69241870e55638156a026814551d6c575fd7f Author: Davide Libenzi Date: Thu May 10 22:23:22 2007 -0700 epoll cleanups: epoll no module Epoll is either compiled it, or not (if EMBEDDED). Remove the module code and use fs_initcall(). Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da66f7cb0f69ab27dbf5b9d0b85c4b97716c44d1 Author: Davide Libenzi Date: Thu May 10 22:23:21 2007 -0700 epoll: use anonymous inodes Cut out lots of code from epoll, by reusing the anonymous inode source patch (fs/anon_inodes.c). Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c3060bedd84144653a2ad7bea32389f65598d40 Author: Davide Libenzi Date: Thu May 10 22:23:21 2007 -0700 signal/timer/event: KAIO eventfd support example This is an example about how to add eventfd support to the current KAIO code, in order to enable KAIO to post readiness events to a pollable fd (hence compatible with POSIX select/poll). The KAIO code simply signals the eventfd fd when events are ready, and this triggers a POLLIN in the fd. This patch uses a reserved for future use member of the struct iocb to pass an eventfd file descriptor, that KAIO will use to post events every time a request completes. At that point, an aio_getevents() will return the completed result to a struct io_event. I made a quick test program to verify the patch, and it runs fine here: http://www.xmailserver.org/eventfd-aio-test.c The test program uses poll(2), but it'd, of course, work with select and epoll too. This can allow to schedule both block I/O and other poll-able devices requests, and wait for results using select/poll/epoll. In a typical scenario, an application would submit KAIO request using aio_submit(), and will also use epoll_ctl() on the whole other class of devices (that with the addition of signals, timers and user events, now it's pretty much complete), and then would: epoll_wait(...); for_each_event { if (curr_event_is_kaiofd) { aio_getevents(); dispatch_aio_events(); } else { dispatch_epoll_event(); } } Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdb902b1225e1668315f38e96d2f439452c03a15 Author: Davide Libenzi Date: Thu May 10 22:23:20 2007 -0700 signal/timer/event: eventfd wire up x86 arches This patch wires the eventfd system call to the x86 architectures. Signed-off-by: Davide Libenzi Cc: Michael Kerrisk Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1ad7468c77ddb94b0615d5f50fa255525fde0f0 Author: Davide Libenzi Date: Thu May 10 22:23:19 2007 -0700 signal/timer/event: eventfd core This is a very simple and light file descriptor, that can be used as event wait/dispatch by userspace (both wait and dispatch) and by the kernel (dispatch only). It can be used instead of pipe(2) in all cases where those would simply be used to signal events. Their kernel overhead is much lower than pipes, and they do not consume two fds. When used in the kernel, it can offer an fd-bridge to enable, for example, functionalities like KAIO or syslets/threadlets to signal to an fd the completion of certain operations. But more in general, an eventfd can be used by the kernel to signal readiness, in a POSIX poll/select way, of interfaces that would otherwise be incompatible with it. The API is: int eventfd(unsigned int count); The eventfd API accepts an initial "count" parameter, and returns an eventfd fd. It supports poll(2) (POLLIN, POLLOUT, POLLERR), read(2) and write(2). The POLLIN flag is raised when the internal counter is greater than zero. The POLLOUT flag is raised when at least a value of "1" can be written to the internal counter. The POLLERR flag is raised when an overflow in the counter value is detected. The write(2) operation can never overflow the counter, since it blocks (unless O_NONBLOCK is set, in which case -EAGAIN is returned). But the eventfd_signal() function can do it, since it's supposed to not sleep during its operation. The read(2) function reads the __u64 counter value, and reset the internal value to zero. If the value read is equal to (__u64) -1, an overflow happened on the internal counter (due to 2^64 eventfd_signal() posts that has never been retired - unlickely, but possible). The write(2) call writes an __u64 count value, and adds it to the current counter. The eventfd fd supports O_NONBLOCK also. On the kernel side, we have: struct file *eventfd_fget(int fd); int eventfd_signal(struct file *file, unsigned int n); The eventfd_fget() should be called to get a struct file* from an eventfd fd (this is an fget() + check of f_op being an eventfd fops pointer). The kernel can then call eventfd_signal() every time it wants to post an event to userspace. The eventfd_signal() function can be called from any context. An eventfd() simple test and bench is available here: http://www.xmailserver.org/eventfd-bench.c This is the eventfd-based version of pipetest-4 (pipe(2) based): http://www.xmailserver.org/pipetest-4.c Not that performance matters much in the eventfd case, but eventfd-bench shows almost as double as performance than pipetest-4. [akpm@linux-foundation.org: fix i386 build] [akpm@linux-foundation.org: add sys_eventfd to sys_ni.c] Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83f5d1266926c75890f1bc4678e49d79483cb573 Author: Davide Libenzi Date: Thu May 10 22:23:18 2007 -0700 signal/timer/event: timerfd compat code This patch implements the necessary compat code for the timerfd system call. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57ac8898508638ca6d15ecd8b911a431d673ff30 Author: Davide Libenzi Date: Thu May 10 22:23:17 2007 -0700 signal/timer/event: timerfd wire up x86 arches This patch wires the timerfd system call to the x86 architectures. Signed-off-by: Davide Libenzi Cc: Andi Kleen Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b215e283992899650c4271e7385c79e26fb9a88e Author: Davide Libenzi Date: Thu May 10 22:23:16 2007 -0700 signal/timer/event: timerfd core This patch introduces a new system call for timers events delivered though file descriptors. This allows timer event to be used with standard POSIX poll(2), select(2) and read(2). As a consequence of supporting the Linux f_op->poll subsystem, they can be used with epoll(2) too. The system call is defined as: int timerfd(int ufd, int clockid, int flags, const struct itimerspec *utmr); The "ufd" parameter allows for re-use (re-programming) of an existing timerfd w/out going through the close/open cycle (same as signalfd). If "ufd" is -1, s new file descriptor will be created, otherwise the existing "ufd" will be re-programmed. The "clockid" parameter is either CLOCK_MONOTONIC or CLOCK_REALTIME. The time specified in the "utmr->it_value" parameter is the expiry time for the timer. If the TFD_TIMER_ABSTIME flag is set in "flags", this is an absolute time, otherwise it's a relative time. If the time specified in the "utmr->it_interval" is not zero (.tv_sec == 0, tv_nsec == 0), this is the period at which the following ticks should be generated. The "utmr->it_interval" should be set to zero if only one tick is requested. Setting the "utmr->it_value" to zero will disable the timer, or will create a timerfd without the timer enabled. The function returns the new (or same, in case "ufd" is a valid timerfd descriptor) file, or -1 in case of error. As stated before, the timerfd file descriptor supports poll(2), select(2) and epoll(2). When a timer event happened on the timerfd, a POLLIN mask will be returned. The read(2) call can be used, and it will return a u32 variable holding the number of "ticks" that happened on the interface since the last call to read(2). The read(2) call supportes the O_NONBLOCK flag too, and EAGAIN will be returned if no ticks happened. A quick test program, shows timerfd working correctly on my amd64 box: http://www.xmailserver.org/timerfd-test.c [akpm@linux-foundation.org: add sys_timerfd to sys_ni.c] Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d18c9220965b437287c3a7e803725c24992ceac Author: Davide Libenzi Date: Thu May 10 22:23:15 2007 -0700 signal/timer/event: signalfd compat code This patch implements the necessary compat code for the signalfd system call. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2121e24bd8dd16b4e3f8d995428e2a748d5180cc Author: Davide Libenzi Date: Thu May 10 22:23:14 2007 -0700 signal/timer/event: signalfd wire up x86 arches This patch wires the signalfd system call to the x86 architectures. Signed-off-by: Davide Libenzi Cc: Michael Kerrisk Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fba2afaaec790dc5ab4ae8827972f342211bbb86 Author: Davide Libenzi Date: Thu May 10 22:23:13 2007 -0700 signal/timer/event: signalfd core This patch series implements the new signalfd() system call. I took part of the original Linus code (and you know how badly it can be broken :), and I added even more breakage ;) Signals are fetched from the same signal queue used by the process, so signalfd will compete with standard kernel delivery in dequeue_signal(). If you want to reliably fetch signals on the signalfd file, you need to block them with sigprocmask(SIG_BLOCK). This seems to be working fine on my Dual Opteron machine. I made a quick test program for it: http://www.xmailserver.org/signafd-test.c The signalfd() system call implements signal delivery into a file descriptor receiver. The signalfd file descriptor if created with the following API: int signalfd(int ufd, const sigset_t *mask, size_t masksize); The "ufd" parameter allows to change an existing signalfd sigmask, w/out going to close/create cycle (Linus idea). Use "ufd" == -1 if you want a brand new signalfd file. The "mask" allows to specify the signal mask of signals that we are interested in. The "masksize" parameter is the size of "mask". The signalfd fd supports the poll(2) and read(2) system calls. The poll(2) will return POLLIN when signals are available to be dequeued. As a direct consequence of supporting the Linux poll subsystem, the signalfd fd can use used together with epoll(2) too. The read(2) system call will return a "struct signalfd_siginfo" structure in the userspace supplied buffer. The return value is the number of bytes copied in the supplied buffer, or -1 in case of error. The read(2) call can also return 0, in case the sighand structure to which the signalfd was attached, has been orphaned. The O_NONBLOCK flag is also supported, and read(2) will return -EAGAIN in case no signal is available. If the size of the buffer passed to read(2) is lower than sizeof(struct signalfd_siginfo), -EINVAL is returned. A read from the signalfd can also return -ERESTARTSYS in case a signal hits the process. The format of the struct signalfd_siginfo is, and the valid fields depends of the (->code & __SI_MASK) value, in the same way a struct siginfo would: struct signalfd_siginfo { __u32 signo; /* si_signo */ __s32 err; /* si_errno */ __s32 code; /* si_code */ __u32 pid; /* si_pid */ __u32 uid; /* si_uid */ __s32 fd; /* si_fd */ __u32 tid; /* si_fd */ __u32 band; /* si_band */ __u32 overrun; /* si_overrun */ __u32 trapno; /* si_trapno */ __s32 status; /* si_status */ __s32 svint; /* si_int */ __u64 svptr; /* si_ptr */ __u64 utime; /* si_utime */ __u64 stime; /* si_stime */ __u64 addr; /* si_addr */ }; [akpm@linux-foundation.org: fix signalfd_copyinfo() on i386] Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dc8bf8132d59c03fe2562bce165c2f03f021687 Author: Davide Libenzi Date: Thu May 10 22:23:11 2007 -0700 signal/timer/event fds: anonymous inode source This patch add an anonymous inode source, to be used for files that need and inode only in order to create a file*. We do not care of having an inode for each file, and we do not even care of having different names in the associated dentries (dentry names will be same for classes of file*). This allow code reuse, and will be used by epoll, signalfd and timerfd (and whatever else there'll be). Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 325aa33da784e5997c756a151bc46e9cc9b79db2 Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:10 2007 -0700 Don't init pgrp and __session in INIT_SIGNALS Remove initialization of pgrp and __session in INIT_SIGNALS, as these are later set by the call to __set_special_pids() in init/main.c by the patch: explicitly-set-pgid-and-sid-of-init-process.patch Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Eric Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa0334f19f0e1a1e570fc2a160dfe53536599ade Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:08 2007 -0700 Replace pid_t in autofs with struct pid reference Make autofs container-friendly by caching struct pid reference rather than pid_t and using pid_nr() to retreive a task's pid_t. ChangeLog: - Fix Eric Biederman's comments - Use find_get_pid() to hold a reference to oz_pgrp and release while unmounting; separate out changes to autofs and autofs4. - Fix Cedric's comments: retain old prototype of parse_options() and move necessary change to its caller. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Eric Biederman Cc: containers@lists.osdl.org Acked-by: Eric W. Biederman Cc: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d78e53c89a820471837e0cb91fe36b7be1a7c9de Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:06 2007 -0700 Fix some coding-style errors in autofs Fix coding style errors (extra spaces, long lines) in autofs and autofs4 files being modified for container/pidspace issues. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Cc: Eric W. Biederman Cc: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93ba0881176ace057bc3111c8bdd717a23cb75ed Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:05 2007 -0700 Kill unused sesssion and group values in rocket driver The process_session() and process_group() values are not really used by the driver. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Cc: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0800d30832ddecf2d9dc40068fed9df95930a8f1 Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:04 2007 -0700 Use task_pgrp() task_session() in copy_process() Use task_pgrp() and task_session() in copy_process(), and avoid find_pid() call when attaching the task to its process group and session. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85868995d9d82de5b0de38d695559daddffef893 Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:03 2007 -0700 Use struct pid parameter in copy_process() Modify copy_process() to take a struct pid * parameter instead of a pid_t. This simplifies the code a bit and also avoids having to call find_pid() to convert the pid_t to a struct pid. Changelog: - Fixed Badari Pulavarty's comments and passed in &init_struct_pid from fork_idle(). - Fixed Eric Biederman's comments and simplified this patch and used a new patch to remove the likely(pid) check. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Eric Biederman Cc: Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e29b24aa6b3eb6c161cbb9e42fc20b47e67a7c6 Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:01 2007 -0700 Explicitly set pgid and sid of init process Explicitly set pgid and sid of init process to 1. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Eric Biederman Cc: Herbert Poetzl Cc: Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 820e45db2380eb1545fa2bc5d34b8b2f2933faeb Author: Sukadev Bhattiprolu Date: Thu May 10 22:23:00 2007 -0700 statically initialize struct pid for swapper Statically initialize a struct pid for the swapper process (pid_t == 0) and attach it to init_task. This is needed so task_pid(), task_pgrp() and task_session() interfaces work on the swapper process also. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Eric Biederman Cc: Herbert Poetzl Cc: Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e713d0dab21a68500720e222fa02567fc7dfb14b Author: Sukadev Bhattiprolu Date: Thu May 10 22:22:58 2007 -0700 attach_pid() with struct pid parameter attach_pid() currently takes a pid_t and then uses find_pid() to find the corresponding struct pid. Sometimes we already have the struct pid. We can then skip find_pid() if attach_pid() were to take a struct pid parameter. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ac24b3ba9016881b11646114bb5cd12cf23edd9 Author: kogiidena Date: Thu May 10 22:22:57 2007 -0700 rtc-rs5c313.c: add error handling to avoid hardware hangup Add error processing. Hanging up by an infinite loop is evaded. Signed-off-by: kogiidena Cc: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a6a078950d769ff211c1cbd9468e31162481f8d Author: kogiidena Date: Thu May 10 22:22:56 2007 -0700 rtc-rs5c313.c: rtc_time value are fixed Correct an initial value of suruct rtc_ time. Signed-off-by: kogiidena Cc: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a3f1d53dbf112d2387f8b80682afc1084f9dfc3 Author: kogiidena Date: Thu May 10 22:22:54 2007 -0700 rtc-rs5c313.c: error and warning are fixed Correct a compile error and warning. Signed-off-by: kogiidena Cc: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e88c553db938ad016026375f0545304b9030b42 Author: Daniel Walker Date: Thu May 10 22:22:53 2007 -0700 use defines in sys_getpriority/sys_setpriority Switch to the defines for these two checks, instead of hard coding the values. [akpm@linux-foundation.org: add missing include] Signed-off-by: Daniel Walker Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00b8fd236764e3d5bc1d30dc65e256e283de4c3d Author: Dragos Carp Date: Thu May 10 22:22:52 2007 -0700 MPC52xx PSC SPI master driver SPI master driver for MPC52xx using its Programmable Serial Controller. Signed-off-by: David Brownell Signed-off-by: Dragos Carp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ea971801625184a91a6d80ea85e53875caa0bf5 Author: Miklos Szeredi Date: Thu May 10 22:22:51 2007 -0700 consolidate generic_writepages and mpage_writepages Clean up massive code duplication between mpage_writepages() and generic_writepages(). The new generic function, write_cache_pages() takes a function pointer argument, which will be called for each page to be written. Maybe cifs_writepages() too can use this infrastructure, but I'm not touching that with a ten-foot pole. The upcoming page writeback support in fuse will also want this. Signed-off-by: Miklos Szeredi Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e10cc1df1d2014f68a4bdcf73f6dd122c4561f94 Author: Paul Fulghum Date: Thu May 10 22:22:50 2007 -0700 tty: add compat_ioctl Add compat_ioctl method for tty code to allow processing of 32 bit ioctl calls on 64 bit systems by tty core, tty drivers, and line disciplines. Based on patch by Arnd Bergmann: http://www.uwsg.iu.edu/hypermail/linux/kernel/0511.0/1732.html [akpm@linux-foundation.org: make things static] Signed-off-by: Paul Fulghum Acked-by: Arnd Bergmann Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 108f39a1b3b1e4b28ca8cc156f06171445499d21 Author: Rene Herman Date: Thu May 10 22:22:50 2007 -0700 module_author: don't advise putting in an email address module_author: don't advise putting in an email address It's information that's easily outdated and easily mistaken for a driver contact which is a problem especially for modules with multiple current and non-current authors as well as for modules with a maintainer who may not even be a module author. Signed-off-by: Rene Herman Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98091696653e8ac32a2653589923acd8198777ac Author: Andrew Morton Date: Thu May 10 22:22:49 2007 -0700 SubmitChecklist: add -W help Help people to work out how to use `gcc -W'. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84ea77635b91a6ca1c0c592ee5ddc0c780856b97 Author: Eric Sesterhenn / Snakebyte Date: Thu May 10 22:22:48 2007 -0700 Overrun in drivers/char/rio/riocmd.c This got somehow lost in the noise. This fixes coverity bug id #1025, if Rup is greater or equal to MAX_RUP, we run past the Mapping Array. Signed-off-by: Eric Sesterhenn Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a12bb44471b819c7f33d8a83044e7116c124e3d5 Author: Benjamin Herrenschmidt Date: Thu May 10 22:22:47 2007 -0700 stop_machine() now uses hard_irq_disable Add a call to hard_irq_disable() to stop_machine so that we make sure IRQs are really disabled and not only lazy-disabled on archs like powerpc as some users of stop_machine() may rely on that. [akpm@linux-foundation.org: build fix] Signed-off-by: Benjamin Herrenschmidt Acked-by: Rusty Russell Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d3fbbb391e280724f7f7804ab00ff61cf1b6a4c Author: Benjamin Herrenschmidt Date: Thu May 10 22:22:46 2007 -0700 Add hard_irq_disable() Some architectures, like powerpc, implement lazy disabling of interrupts. That means that on those, local_irq_disable() doesn't actually disable interrupts on the CPU, but only sets some per CPU flag which cause them to be disabled only if an interrupt actually occurs. However, in some cases, such as stop_machine, we really want interrupts to be fully disabled. For example, I have code using stop machine to do ECC error injection, used to verify operations of the ECC hardware, that sort of thing. It really needs to make sure that nothing is actually writing to memory while the injection happens. Similar examples can be found in other low level bits and pieces. This patch implements a generic hard_irq_disable() function which is meant to be called -after- local_irq_disable() and ensures that interrupts are fully disabled on that CPU. The default implementation is a nop, though powerpc does already provide an appropriate one. Signed-off-by: Benjamin Herrenschmidt Cc: Rusty Russell Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1fa2e136ff64a3814a98c03d46320b9e80d29c8 Author: Benjamin Herrenschmidt Date: Thu May 10 22:22:45 2007 -0700 powerpc: fixup hard_irq_disable semantics This patch renames the raw hard_irq_{enable,disable} into __hard_irq_{enable,disable} and introduces a higher level hard_irq_disable() function that can be used by any code to enforce that IRQs are fully disabled, not only lazy disabled. The difference with the __ versions is that it will update some per-processor fields so that the kernel keeps track and properly re-enables them in the next local_irq_disable(); This prepares powerpc for my next patch that introduces hard_irq_disable() generically. Signed-off-by: Benjamin Herrenschmidt Cc: Rusty Russell Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2acdb1694494eb6f17b44b2b3065879af32d0d46 Author: Paul Fulghum Date: Thu May 10 22:22:43 2007 -0700 synclink_gt: add compat_ioctl Add support for 32 bit ioctl on 64 bit systems for synclink_gt Cc: Arnd Bergmann Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c64c30a5c96bb798cbd6097d4996205b5359fa2 Author: Olaf Hering Date: Thu May 10 22:22:42 2007 -0700 small cleanup in gpt partition handling Remove unused argument in is_pmbr_valid() Remove unneeded initialization of local variable legacy_mbr Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04dd08b45be863f016df648a149ade1411608d00 Author: Stephen Rothwell Date: Thu May 10 22:22:40 2007 -0700 Consolidate asm/poll.h These files are almost all the same. This patch could be made even simpler if we don't mind POLLREMOVE turning up in a few architectures that didn't have it previously (which should be OK as POLLREMOVE is not used anywhere in the current tree). Signed-off-by: Stephen Rothwell Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99eaf3c45fe806c4a7f39b9be4a1bd0dfc617699 Author: Randy Dunlap Date: Thu May 10 22:22:39 2007 -0700 lib/hexdump Based on ace_dump_mem() from Grant Likely for the Xilinx SystemACE CompactFlash interface. Add print_hex_dump() & hex_dumper() to lib/hexdump.c and linux/kernel.h. This patch adds the functions print_hex_dump() & hex_dumper(). print_hex_dump() can be used to perform a hex + ASCII dump of data to syslog, in an easily viewable format, thus providing a common text hex dump format. hex_dumper() provides a dump-to-memory function. It converts one "line" of output (16 bytes of input) at a time. Example usages: print_hex_dump(KERN_DEBUG, DUMP_PREFIX_ADDRESS, frame->data, frame->len); hex_dumper(frame->data, frame->len, linebuf, sizeof(linebuf)); Example output using %DUMP_PREFIX_OFFSET: 0009ab42: 40414243 44454647 48494a4b 4c4d4e4f-@ABCDEFG HIJKLMNO Example output using %DUMP_PREFIX_ADDRESS: ffffffff88089af0: 70717273 74757677 78797a7b 7c7d7e7f-pqrstuvw xyz{|}~. [akpm@linux-foundation.org: cleanups, add export] Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6eaeeaba39e5fa3d52a0bb8de15e995516ae251a Author: Eric Dumazet Date: Thu May 10 22:22:37 2007 -0700 getrusage(): fill ru_inblock and ru_oublock fields if possible If CONFIG_TASK_IO_ACCOUNTING is defined, we update io accounting counters for each task. This patch permits reporting of values using the well known getrusage() syscall, filling ru_inblock and ru_oublock instead of null values. As TASK_IO_ACCOUNTING currently counts bytes counts, we approximate blocks count doing : nr_blocks = nr_bytes / 512 Example of use : ---------------------- After patch is applied, /usr/bin/time command can now give a good approximation of IO that the process had to do. $ /usr/bin/time grep tototo /usr/include/* Command exited with non-zero status 1 0.00user 0.02system 0:02.11elapsed 1%CPU (0avgtext+0avgdata 0maxresident)k 24288inputs+0outputs (0major+259minor)pagefaults 0swaps $ /usr/bin/time dd if=/dev/zero of=/tmp/testfile count=1000 1000+0 enregistrements lus 1000+0 enregistrements écrits 512000 octets (512 kB) copiés, 0,00326601 seconde, 157 MB/s 0.00user 0.00system 0:00.00elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+3000outputs (0major+299minor)pagefaults 0swaps Signed-off-by: Eric Dumazet Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02239c29967418284c05d58971894d658575e78c Author: Jeff Dike Date: Thu May 10 22:22:35 2007 -0700 uml: shrink kernel stacks Make kernel stacks be 1 page on i386 and 2 pages on x86_64. These match the host values. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c14b84949e127560084c7c56b365931c71c60768 Author: Jeff Dike Date: Thu May 10 22:22:34 2007 -0700 uml: iRQ stacks Add a separate IRQ stack. This differs from i386 in having the entire interrupt run on a separate stack rather than starting on the normal kernel stack and switching over once some preparation has been done. The underlying mechanism, is of course, sigaltstack. Another difference is that interrupts that happen in userspace are handled on the normal kernel stack. These cause a wait wakeup instead of a signal delivery so there is no point in trying to switch stacks for these. There's no other stuff on the stack, so there is no extra stack consumption. This quirk makes it possible to have the entire interrupt run on a separate stack - process preemption (and calls to schedule()) happens on a normal kernel stack. If we enable CONFIG_PREEMPT, this will need to be rethought. The IRQ stack for CPU 0 is declared in the same way as the initial kernel stack. IRQ stacks for other CPUs will be allocated dynamically. An extra field was added to the thread_info structure. When the active thread_info is copied to the IRQ stack, the real_thread field points back to the original stack. This makes it easy to tell where to copy the thread_info struct back to when the interrupt is finished. It also serves as a marker of a nested interrupt. It is NULL for the first interrupt on the stack, and non-NULL for any nested interrupts. Care is taken to behave correctly if a second interrupt comes in when the thread_info structure is being set up or taken down. I could just disable interrupts here, but I don't feel like giving up any of the performance gained by not flipping signals on and off. If an interrupt comes in during these critical periods, the handler can't run because it has no idea what shape the stack is in. So, it sets a bit for its signal in a global mask and returns. The outer handler will deal with this signal itself. Atomicity is had with xchg. A nested interrupt that needs to bail out will xchg its signal mask into pending_mask and repeat in case yet another interrupt hit at the same time, until the mask stabilizes. The outermost interrupt will set up the thread_info and xchg a zero into pending_mask when it is done. At this point, nested interrupts will look at ->real_thread and see that no setup needs to be done. They can just continue normally. Similar care needs to be taken when exiting the outer handler. If another interrupt comes in while it is copying the thread_info, it will drop a bit into pending_mask. The outer handler will check this and if it is non-zero, will loop, set up the stack again, and handle the interrupt. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ea5bc5e5bb51492f189bba44045e0de7decf4a0 Author: Jeff Dike Date: Thu May 10 22:22:32 2007 -0700 uml: tidy IRQ code Some tidying of the irq code before introducing irq stacks. Mostly style fixes, but the timer handler calls the timer code directly rather than going through the generic sig_handler_common_skas. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1a79c400a86f2f6a6735480e31f6ee159e76fa2 Author: Jeff Dike Date: Thu May 10 22:22:31 2007 -0700 uml: use UM_THREAD_SIZE in userspace code Now that we have UM_THREAD_SIZE, we can replace the calculations in user-space code (an earlier patch took care of the kernel side of the house). Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57598fd7b31f6437874308a79ca23e51c74da59b Author: Jeff Dike Date: Thu May 10 22:22:30 2007 -0700 uml: remove task_protections Replaced task_protections with stack_protections since they do the same thing, and task_protections was misnamed anyway. This needs THREAD_SIZE, so that's imported via common-offsets.h Also tidied up the code in the vicinity. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22258d406f91d7f7ee8e58f18b3722d0647f6a9a Author: Geert Uytterhoeven Date: Thu May 10 22:22:28 2007 -0700 Let SYSV68_PARTITION default to yes on VME only Don't enable SYSV68 partition table support on all m68k boxes by default, only on Motorola VME boards. Signed-off-by: Geert Uytterhoeven Cc: Philippe De Muyter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23c9bbbac57ae50dceadfda37b49785ec04dd42f Author: Hirokazu Takata Date: Thu May 10 22:22:28 2007 -0700 m32r: fix pte_to_pgoff(), pgoff_to_pte() and __swp_type() macros This patch is required to handle file-mapped or swapped-out pages correctly. - Fix pte_to_pgoff() and pgoff_to_pte() macros not to include _PAGE_PROTNONE bit of PTE. Mask value for { ACCESSED, N, (R, W, X), L, G } is not 0xef but 0x7f. - Fix __swp_type() macro for MAX_SWAPFILES_SHIFT(=5), which is defined in include/linux/swap.h. * M32R TLB format [0] [1:19] [20:23] [24:31] +-----------------------+----+-------------+ | VPN |0000| ASID | +-----------------------+----+-------------+ +-+---------------------+----+-+---+-+-+-+-+ |0 PPN |0000|N|AC |L|G|V| | +-+---------------------+----+-+---+-+-+-+-+ || RWX | | * software bits in PTE || | +-- _PAGE_FILE | _PAGE_DIRTY || +---- _PAGE_PRESENT |+---------------- _PAGE_ACCESSED +----------------- _PAGE_PROTNONE Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d4f64681695b0e389f7121eb647b27c602990bc Author: Hirokazu Takata Date: Thu May 10 22:22:26 2007 -0700 m32r: fix tme_handler to check _PAGE_PRESENT bit Fix the tlb-miss handler (tme_handler) to check _PAGE_PRESENT bit in order to handle file-mapped or swapped-out pages correctly. This patch is required to fix unexpected page errors for m32r. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43c09ce7927912c7867617cba0a265beea38a154 Author: Hirokazu Takata Date: Thu May 10 22:22:25 2007 -0700 m32r: fix switch_to macro to push/pop frame pointer if needed This patch fixes a rarely-happened but severe scheduling problem of the recent m32r kernel of 2.6.17-rc3 or later. In the following previous m32r patch, the switch_to macro was modified not to do unnecessary push/pop operations for tuning. > [PATCH] m32r: update switch_to macro for tuning > 4127272c38619c56f0c1aa01d01c7bd757db70a1 In this modification, only 'lr' and 'sp' registers are push/pop'ed, assuming that the m32r kernel is always compiled with -fomit-frame-pointer option. However, in 2.6 kernel, kernel/sched.c is irregularly compiled with -fno-omit-frame-pointer if CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER is not defined. -- kernel/Makefile -- : ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra , the -fno-omit-frame-pointer is # needed for x86 only. Why this used to be enabled for all architectures is beyond # me. I suspect most platforms don't need this, but until we know that for sure # I turn this off for IA-64 only. Andreas Schwab says it's also needed on m68k # to get a correct value for the wait-channel (WCHAN in ps). --davidm CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer endif : --- Therefore, for the recent m32r kernel, we have to push/pop 'fp' (frame pointer) if CONFIG_FRAME_POINTER is defined or CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER is not defined. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44316634460a6b368ad3160da6cba3b4725a1433 Author: Yoshinori Sato Date: Thu May 10 22:22:23 2007 -0700 h8300 syscall update h8300 systemcall entry table update. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a9d6e7cb0d1e5acc61d481d7a1ea25c294c3dff Author: David Rientjes Date: Thu May 10 22:22:22 2007 -0700 frv: gdb: use __maybe_unused Replace function instances of __attribute__((unused)) with __maybe_unused to suppress warnings. Cc: David Howells Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39bf6270f524bbe2682b56f2a979703abf937dd1 Author: Christoph Lameter Date: Thu May 10 22:22:21 2007 -0700 VM statistics: Make timer deferrable VM statistics updates do not matter if the kernel is in idle powersaving mode. So allow the timer to be deferred. It would be better though if we could switch the timer between deferrable and nondeferrable based on differentials present. The timer would start out nondeferrable and if we find that there were no updates in the last statistics interval then we would switch the timer to deferrable. If the timer later finds again that there are differentials then go to nondeferrable again. And yet another way would be to run the timer shortly before going to idle? The solution here means that the VM counters may be slightly off during idle since differentials may be still pending while the timer is deferred. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45222b9e02fb282eb0a8007a3d992dd229ec2410 Author: David Howells Date: Thu May 10 22:22:20 2007 -0700 AFS: implement statfs Implement the statfs() op for AFS. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f300ca9284caabdd2c07c7f91b90f1f530f614e Author: David Howells Date: Thu May 10 22:22:20 2007 -0700 AFS: fix a couple of problems with unlinking AFS files Fix a couple of problems with unlinking AFS files. (1) The parent directory wasn't being updated properly between unlink() and the following lookup(). It seems that, for some reason, invalidate_remote_inode() wasn't discarding the directory contents correctly, so this patch calls invalidate_inode_pages2() instead on non-regular files. (2) afs_vnode_deleted_remotely() should handle vnodes that don't have a source server recorded without oopsing. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d577b6a31a53a19d3b0fe414d645a61ef201846 Author: David Howells Date: Thu May 10 22:22:19 2007 -0700 AFS: fix interminable loop in afs_write_back_from_locked_page() Following bug was uncovered by compiling with '-W' flag: CC [M] fs/afs/write.o fs/afs/write.c: In function ‘afs_write_back_from_locked_page’: fs/afs/write.c:398: warning: comparison of unsigned expression >= 0 is always true Loop variable 'n' is unsigned, so wraps around happily as far as I can see. Trival fix attached (compile tested only). Signed-off-by: Mika Kukkonen Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9393e1dc8e394bd59217178b26b2476dc43e8667 Author: Andi Kleen Date: Thu May 10 22:22:18 2007 -0700 x86_64: new syscall Add epoll_pwait() (akpm: stolen from Andi's queue, because I want to send the signalfd patches which also add syscalls. Not sure what the __IGNORE_getcpu is for). Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32993b793fb07784fd1380004f5b34f31f9105d5 Author: David Brownell Date: Thu May 10 22:22:17 2007 -0700 Documentation/gpio.txt mentions GENERIC_GPIO Documentation/gpio.txt should mention the Kconfig GENERIC_GPIO flag, for platforms to declare when relevant. This should help minimize goofs like omitting it, or not depending on it when needed. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7faaa5f0bf4db6ac4908038e2139adc46c165ff4 Author: Mika Kukkonen Date: Thu May 10 22:22:17 2007 -0700 Bug in mm/thrash.c function grab_swap_token() Following bug was uncovered by compiling with '-W' flag: CC mm/thrash.o mm/thrash.c: In function ‘grab_swap_token’: mm/thrash.c:52: warning: comparison of unsigned expression < 0 is always false Variable token_priority is unsigned, so decrementing first and then checking the result does not work; fixed by reversing the test, patch attached (compile tested only). I am not sure if likely() makes much sense in this new situation, but I'll let somebody else to make a decision on that. Signed-off-by: Mika Kukkonen Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 069f11f9d66bc582fb40a37a7b92363f5d321969 Author: Vivek Goyal Date: Thu May 10 22:22:15 2007 -0700 x86_64: display more intuitive error message if kernel is not 2MB aligned o x86_64 kernel needs to be compiled for 2MB aligned addresses. Currently we are using BUILD_BUG_ON() to warn the user if he has not done so. But looks like folks are not finding message very intutive and don't open the respective c file to find problem source. (Bug 8439) arch/x86_64/kernel/head64.c: In function 'x86_64_start_kernel': arch/x86_64/kernel/head64.c:70: error: size of array 'type name' is negative o Using preprocessor directive #error to print a better message if CONFIG_PHYSICAL_START is not aligned to 2MB boundary. Signed-off-by: Vivek Goyal Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6041b57c6c99dcb59524f1bb0db0628c2689a464 Author: Joerg Roedel Date: Thu May 10 22:22:14 2007 -0700 i386: work around miscompilation of alternatives code A recent change makes my Dell 1501 hang on boot. It's an AMD MK-36. I use an x86_64 kernel. It is 100% reproducible. I debugged this problem a bit and my compiler[1]interprets the =A constraint as %rax instead of %edx:%eax on x86_64 which causes the problem. The appended patch provides a workaround for this and fixed the hang on my machine. [1] gcc version 4.1.3 20070429 (prerelease) (Debian 4.1.2-5) Signed-off-by: Joerg Roedel Cc: Andi Kleen Cc: Benny Halevy Cc: Pete Zaitcev Cc: "Joerg Roedel" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c911d1e16dfc1f0338bbc245ff724322c0113395 Author: Jaroslav Kysela Date: Fri May 11 16:56:18 2007 +0200 [ALSA] version 1.0.14rc4 Signed-off-by: Jaroslav Kysela commit 81937d3bac582ea2249dc2c8891d3371635e8b64 Author: Steve Longerbeam Date: Tue May 8 15:33:03 2007 +0200 [ALSA] Add speaker pin sequencing to hda_codec.c:snd_hda_parse_pin_def_config() Some verb tables (such as an Asus VT sent by IDT) contain only speaker outs in the default pin configs, and no line-outs. In such a case the speaker sequence numbers have to be used to order the speaker out pins, just as is being done for line-out pins. Then, when speaker-outs are copied to line-outs, the line-outs will be ordered properly. Signed-off-by: Steve Longerbeam Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bdd148a307e230517bf891c108e0eec68ba5d10f Author: Kailang Yang Date: Tue May 8 15:19:08 2007 +0200 [ALSA] hda-codec - Add ALC861VD Lenovo support - Added ALC861VD Lenovo support (17aa:3802, 17aa:2066) - Modify alc_subsystem_id Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0bbed758c024bb72cec8219879dc87cb04c6dd5c Author: Takashi Iwai Date: Tue May 8 15:17:15 2007 +0200 [ALSA] hda-codec - Fix connection list in generic parser Fix the retrival of widget connection list in the generic parser. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 490cbd92ed4d9915b582f4e40c605eeb977e5d40 Author: Clemens Ladisch Date: Mon May 7 09:29:32 2007 +0200 [ALSA] usb-audio: work around wrong wMaxPacketSize on ESI M4U Add a workaround for the ESI M4U that claims to support 32-byte packets but ignores the remaining bytes of packets bigger than four bytes. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit d05cc104320210e1c38ff9675c5038cffb2d86dc Author: Clemens Ladisch Date: Mon May 7 09:28:53 2007 +0200 [ALSA] usb-audio: work around broken M-Audio MidiSport Uno firmware The firmware of the M-Audio USB Uno MIDI Interface has, at least in hardware revision 1.25, a bug that garbles its USB output. When it receives a Note On MIDI message that uses running status, the resulting USB MIDI packet has a wrong CIN (4 instead of 9) and a wrong length (2 bytes, the status byte is still missing). This patch adds a workaround to track the CINs and the MIDI messages of received USB MIDI packets to detect whether a packet with CIN 4 is a correct SysEx packet or a buggy running status packet. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit a91214589e6527b18f52bc0b31253f9dfb4665e6 Author: Daniel Drake Date: Mon May 7 09:27:05 2007 +0200 [ALSA] usb-audio: explicitly match Logitech QuickCam Commit 93c8bf45e083b89dffe3a708363c15c1b220c723 modified the USB device matching behaviour to ignore interface class matches if the device class is vendor-specific. This patch adds explicit ID matches for Logitech QuickCam devices, which have a vendor specific device class (but standards-compliant audio interfaces). This fixes a 2.6.20 regression where the audio component of these devices was no longer usable. http://bugs.gentoo.org/show_bug.cgi?id=175715 https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/93822 https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3040 Based on a patch from sergiom Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit d427c77eb2484c37d76b8e157e2b0b82c9b03062 Author: Takashi Iwai Date: Sat May 5 12:19:52 2007 +0200 [ALSA] hda-codec - Fix a typo The AMP mute bit is bit 7. No real influence since no one uses this definition yet, though... Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 458a4fabf185d90234225d7e05d81188b4dad9f1 Author: Takashi Iwai Date: Sat May 5 12:18:40 2007 +0200 [ALSA] hda-codec - Fix ALC880 uniwill auto-mutes Fix the auto-mute controls of ALC880 uniwill model. Split to two individual functions to handle HP and front-mic mutes. For front-mic mute, use snd_hda_codec_amp_update() to be consistent with mixer. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 35b26722a1716b45b5b92d5af2f1ea1fdd4d0a25 Author: Takashi Iwai Date: Sat May 5 12:17:17 2007 +0200 [ALSA] hda-codec - Fix AD1988 SPDIF playback route control Fix AD1988 SPDIF playback route control for selecting ADC1-3. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 713fb93936bebc158b4bbae6be61a6310923543c Author: Andrew Morton Date: Sat May 5 12:02:25 2007 +0200 [ALSA] wm8750 typo fix I quuestion the testing status of that patch! Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2393144deac0903d944cbd578db49cf738811999 Author: David Rientjes Date: Fri May 4 09:35:54 2007 +0200 [ALSA] wavefront: only declare isapnp on CONFIG_PNP From: David Rientjes isapnp[] is only used for CONFIG_PNP. If this configuration option is not set, do not declare the array. Cc: Adam Belay Cc: Takashi Iwai Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Jaroslav Kysela commit 7b043899992e5d9c0b1a620cdad9158d2e5484d7 Author: Steve Longerbeam Date: Thu May 3 20:50:03 2007 +0200 [ALSA] hda-codec - bug fixes for stac92xx HDA codecs. * fixed surround playback on stac922x. Pin direction control bits were not being set correctly in stac92xx_set_pinctl(). Specifically it would refuse to set the port as an output if the port was already configured as an input. Last hunk (#8). * fixed an input mux bug on 92xx codecs. When there is more than one possible input calculated for the muxes, the actual mux widget never gets set from its reset default, which is index 0, in the stac9221 case that is port E. So alsamixer/amixer/gnome-mixer report the Mic as being the selected input source, but in fact is something else (line-in port E in stac9221 case). Another problem with this is that if you actually try to set the mux input to 'Mic', nothing happens because *cur_val == idx (see snd_hda_input_mux_put). You have to actually toggle input source to line-in then back to mic to actually set the mux widget. Hunk #7. * fixed some typos in patch_sigmatel.c. Hunk #6. * fix to stac92xx_add_dyn_out_pins() that fixes surround playback on codecs with less that 4 DACs (stac9205 for example). It reads the widget caps cache created by hda_codec to count the total number of analog DACs found. It then uses that to determine whether there will be enough independent DACs available for line/mic switch controls. Hunk #1, #2, and #3. * improvements to stac92xx_auto_fill_dac_nids() to make it more general. This fixes surround playback on some codecs in combination with the fix to stac92xx_add_dyn_out_pins() above. It reads the full connection list now, instead of just the first entry, and then locates an analog DAC in the list. If one is found and it's free, assign it to that line-out. If no free DAC is found for the line-out, return -ENODEV. It also makes sure to actually select the chosen DAC if more than one DAC is input to the pin. Hunks #4, #5. Signed-off-by: Steve Longerbeam Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7e0af29d6f3964bec3d72c6caeb87a603e660fdf Author: Clemens Ladisch Date: Thu May 3 17:59:54 2007 +0200 [ALSA] add MODULE_FIRMWARE entries Add MODULE_FIRMWARE() entries, where appropriate. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 1327e2b859d725f94687f80e7719a367501b3be2 Author: Clemens Ladisch Date: Thu May 3 17:56:59 2007 +0200 [ALSA] do not depend on FW_LOADER when internal firmware images are used Since request_firmware() is no longer used when the internal firmware images are used, it is no longer necessary to depend on FW_LOADER in this case. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 5d403b1923fa352b2cbaf8d0945f7ff872049dae Author: Takashi Iwai Date: Thu May 3 12:32:29 2007 +0200 [ALSA] hda-codec - Fix resume of STAC92xx codecs Added a missing call to resume mixer controls for STAC92xx codecs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 81c4899f7ef3675fdc574de2671ff9fa45996cc5 Author: Takashi Iwai Date: Thu May 3 12:26:14 2007 +0200 [ALSA] usbaudio - Revert the minimal period size fix patch The last patch didn't really work (false report). Although the hardware supports 125us minimum period, the current usb-audio driver code assumes the 1ms period in many places. Rollback the change. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4d69d756d19a4f457749f3667ad7fc8984bba15c Author: Tobin Davis Date: Thu May 3 12:17:11 2007 +0200 [ALSA] hda-codec - Add support for new HP DV series laptops This patch adds support for 3 new HP laptops to the Conexant 'Venice' driver. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6b9fa70a73e8627c2823ee95e7c55d77e0716f1c Author: Takashi Iwai Date: Wed May 2 12:09:48 2007 +0200 [ALSA] usb-audio - Fix the minimum period size per transfer mode The minimal period size is 125us for high-speed mode while 1ms for full-speed mode. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 27fe0f4b985d8427d93ff6c9457e198ab8ffe035 Author: Adrian Bunk Date: Wed May 2 12:07:55 2007 +0200 [ALSA] sound/pcmcia/vx/vxpocket.c: fix an if() condition It seems noone ever tried to use this driver with more than one device. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 82c8c74107c31673478031e90e24a2b74ca680f2 Author: James Courtier-Dutton Date: Thu Apr 19 11:14:41 2007 +0100 [ALSA] snd-emu10k1: Prevent E-Mu 1010 Notebook card from hanging PC. E-Mu 1010 is not currently supported yet. Needs development work. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit 86f55319011499662ec7f78db1640b1d158fcba0 Author: Takashi Iwai Date: Fri Apr 27 14:23:55 2007 +0200 [ALSA] Add description of imac-intel model Added the description of missing imac-intel model for hda-intel driver. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f16928fb53111bc23516372df7f6fed86bdfa661 Author: Sylvain FORET Date: Fri Apr 27 14:22:36 2007 +0200 [ALSA] snd_hda_intel: fix for intel imac Add handling of Intel-iMac-specific pinconfig of the sound card. Intel-iMac now handled as a separated subsystem. Signed-off-by: Sylvain FORET Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e6db1119318abdc445d541b560744bd6551b1b3d Author: Wolke Liu Date: Fri Apr 27 12:20:57 2007 +0200 [ALSA] hda-intel - Add ATI RS780,R600 HDMI audio support This patch is for ATI RS780 and R600 HDMI support. Signed-off-by: Wolke Liu Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 43ea1d478fe5eaf4441263cf6ddad7dd05e1a399 Author: Takashi Iwai Date: Thu Apr 26 19:12:08 2007 +0200 [ALSA] hda-codec - Prefer audio codec name as the mixer name Prefer the name of audio codecs as the mixer name even if modem codecs are probed before the audio codecs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b7dd2b349a9fa9e4347780c2bbb41e51484b5bb5 Author: Takashi Iwai Date: Thu Apr 26 14:13:44 2007 +0200 [ALSA] Don't use request_firmware if internal firmwares are defined Don't use request_firmware() if the internal firmwares are defined via Kconfig. Otherwise it results in a significant delay at loading time (minutes). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f223a9fc3d5707c354588570e2cf1f3abf6b1f84 Author: Takashi Iwai Date: Wed Apr 25 13:38:31 2007 +0200 [ALSA] hda-codec - Fix model for ASUS A9rp Fixed the model (asus-laptop) for ASUS A9rp with ALC660 codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b7589ceba035d3f5f1baf69cc67991abd2ce6688 Author: Tobin Davis Date: Tue Apr 24 17:56:55 2007 +0200 [ALSA] HDA-Intel: Fix headphone squeal on Conexant audio This patch fixes the headphone squeal and noise on Conexant CX20551 (Waikiki) audio. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c5a30f85fd56c06efddbe6f4885c7968245c2d8a Author: Pavel Hofman Date: Tue Apr 24 12:27:36 2007 +0200 [ALSA] ice1724 - Misc fixes for Prodigy192 - always set 256fs in SPDIF master clock mode - disable deemphasis filter in AK4114 for Prodigy192 Signed-off-by: Pavel Hofman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bccad14e9a931027b72f20fe7caba68fea760e7b Author: Takashi Iwai Date: Tue Apr 24 12:23:53 2007 +0200 [ALSA] hda-intel - Fix detection of audio codec on Toshiba A100 Some boards have the audio codec on slot #3 while the modem codec on slot #0. The driver should continue to probe the slots when no audio codec is found. This fixes the problem of no device on Toshiba A100 (and some other ATI SB450 devices). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit baba8ee9d12d17cac1042a5c816aef7d6610a6c3 Author: Takashi Iwai Date: Mon Apr 23 17:17:48 2007 +0200 [ALSA] hda-codec - Fix output pin types in auto configuration Use PIN_HP output type for HP pin widgets accordingly, instead of always applying PIN_OUT. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d258e24a39a75834f25c39f90a3a429978e9b896 Author: Takashi Iwai Date: Mon Apr 23 17:16:21 2007 +0200 [ALSA] hda-codec - Add line_out_type to auto_pin_cfg struct Added line_out_type field to auto_pin_cfg struct to provide the pin type of default line_outs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 658fba0efe93fdef44f65cff391ae2a881e30d90 Author: Tobin Davis Date: Mon Apr 23 16:41:12 2007 +0200 [ALSA] hda-codec - Add support for Asus A8JN Laptop This patch adds support for the Asus A8JN Laptop. Other modes were tested, this one worked best. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 479ef4369f65abf4c3e7bbe44ef934a465257ee1 Author: Akinobu Mita Date: Mon Apr 23 11:54:41 2007 +0200 [ALSA] sound: fix incorrect use of platform_device_register() The platform_device allocated by platform_device_alloc() should be added to the device hierarchy by platform_device_add() instead of platform_device_register(). Otherwise it will hit WARN_ON() in platform_device_register(). by illegal refcount. This patch fixes such incorrect usages in portman2x4 and mts64 drivers. Also it removes unnecessary trailing whitespaces. Signed-off-by: Akinobu Mita Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9422db4018cbfaa1a330b018a2bf6527d282b417 Author: Takashi Iwai Date: Fri Apr 20 16:11:43 2007 +0200 [ALSA] hda-codec - Fix 8-channel auto-configuration Fix the auto-configuration of 8-channel devices. The sequence numbers of usual 7.1 outputs are: 0/1/2/4 = Front/CLFE/Rear/Side Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2078f38c8008f5c54d9523ae19af32b9a0c5530e Author: Takashi Iwai Date: Fri Apr 20 12:30:28 2007 +0200 [ALSA] intel8x0 - Fix Oops in crash kernel When intel8x0 driver is loaded in the crash kernel, it gets Oops occasionally. This is because the irq handler gets called before the proper hardware initialization. Now defer it after snd_intel8x0_chip_init(). (reference: http://lkml.org/lkml/2007/3/5/252) Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c9758b2182bdcccce31e1be474bfcd75b69cff0c Author: Milind Arun Choudhary Date: Thu Apr 19 15:22:56 2007 +0200 [ALSA] sound: SPIN_LOCK_UNLOCKED cleanup SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead Signed-off-by: Milind Arun Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 57b14f24d2a7aca65ddc6432fa89ebedf1219cc7 Author: Tobin Davis Date: Wed Apr 18 23:05:36 2007 +0200 [ALSA] hda-codec - Add support for Gigabyte S-Series GA-M57SLI-S4 motherboard Added the support for Gigabyte S-Series GA-M57SLI-S4 motherboard (model=6stack-dig). Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fb956c16d92c6c8c8d30e938cce5c17cf737b646 Author: Takashi Iwai Date: Wed Apr 18 23:03:56 2007 +0200 [ALSA] hda-codec - Fix surround output on AD1986A Fix surround output on AD1986A codec 3stack model. The following bugs are fixed: - init verbs for 3stack disabled the shared surround outputs - a channel mode change resulted in the mute of surrounds Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 43a23389003f92cc26a84a680008330e094db38d Author: Liam Girdwood Date: Tue Apr 17 15:41:52 2007 +0200 [ALSA] ASoC Kconfig description This patch makes the ASoC Kconfig descriptions a little more meaningful. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e81208fe5881b700cfb25db1ecb769ecbfff40cc Author: Graeme Gregory Date: Tue Apr 17 12:35:48 2007 +0200 [ALSA] ASoC Samsung S3C24xx updates - i2s This patch adds DMA size fields to the S3C24xx audio DMA params and exports the S3C24xx I2S digital audio interface. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7f1bc26e7df85957bcc48442f135e7a6f85e5edc Author: Graeme Gregory Date: Tue Apr 17 12:35:18 2007 +0200 [ALSA] ASoC Samsung S3c24xx updates - audio DMA cleanup This patch cleans up the audio DMA for the Samsung S3C24xx platform. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c45e20eb214648014d2df54ddb9f8665b231629f Author: Abhijit Bhopatkar Date: Tue Apr 17 11:57:16 2007 +0200 [ALSA] hda-codec - Add first generation macbook subsystem ID First generation MacBooks were getting ignored by sigmatel drivers and wrongly being identified as MACMINI. This patch makes them identify as MACBOOK. Signed-off-by: Abhijit Bhopatkar Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5d0cedee53938832acc4a5081658f0ce31680c0f Author: Graeme Gregory Date: Mon Apr 16 19:20:17 2007 +0200 [ALSA] ASoC export AC97 DAI This patch exports the ASoC AC97 Digital Audio Interface as a GPL'ed symbol. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 33703b73980f0a84251c298d00ad5fbcce81ca31 Author: Liam Girdwood Date: Mon Apr 16 19:18:15 2007 +0200 [ALSA] ASoC WM8753 codec - build changes This patch adds the WM8753 codec driver to the kernel build system. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1f53aee0e0b398bad0c6ec2cd5ca2bccd4fbd56b Author: Liam Girdwood Date: Mon Apr 16 19:17:44 2007 +0200 [ALSA] SoC WM8753 codec support This patch series adds support for the WM8753 codec as found on the OpenMoko Neo 1973 (other Neo 1973 and Samsung S3C24xx patches to follow today) as well other new devices. Features:- o HiFi and Voice DAI supported (inc runtime switching of DAI mode) o DAPM o All mixers o PLL calculator o 16,20 and 24bit samples. o WM8753 I2C ID added to include/linux/i2c-id.h From: Liam Girdwood Signed-off-by: Harald Welte Signed-off-by: Graeme Gregory Signed-off-by: Seth Forshee Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1a236566ea320a05f3892d8dedd4b5c6bff8706b Author: Frank Mandarino Date: Mon Apr 16 17:20:09 2007 +0200 [ALSA] ASoC AT91xxxx build fix This patch by Frank Madarino updates the AT91xxxx Makefile and Kconfig to build the renamed SSC files. Changes:- o Rename various i2s labels to ssc Signed-off-by: Frank Mandarino Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit eb831da553d1526b9acd5ee4cd83ff52ae446c5f Author: Frank Mandarino Date: Mon Apr 16 17:19:42 2007 +0200 [ALSA] ASoC AT91xxxx eti B1 machine SSC changes This patch by Frank Madarino updates the eti B1 machine to use the newer AT91xxxx SSC core with the DSP/PCM audio hardware changes. Changes:- o #include 'at91-ssc.h' instead of 'at91-i2s.h' o Rename various I2S labels to SSC Signed-off-by: Frank Mandarino Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 36b8a8bbb402911e59acf13b5074eb8915e47a6a Author: Frank Mandarino Date: Mon Apr 16 17:18:52 2007 +0200 [ALSA] ASoC AT91xxxx - SSC port DSP support This patch series by Frank Madarino updates the AT91xxxx core to add DSP/PCM audio hardware formats. Changes:- o Rename at19-i2s.c -> at91-ssc.c o Rename at91-i2s.h -> at91-ssc.h o Add DSP hardware formats. o Rename various I2S labels to SSC Signed-off-by: Frank Mandarino Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1e39221eba72e4af37b40e71749b0c18bb16b9a6 Author: Seth Forshee Date: Mon Apr 16 15:36:42 2007 +0200 [ALSA] ASoC DAPM switching for reentrant codec paths This patch fixes an issue whereby power was applied to any inactive analog path that would leave and reenter a codec (e.g. ACOP -> ACIN on WM8753). This change now checks for such paths and DAPM will power them down when not in use. Signed-off-by: Seth Forshee Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 30652c4506c8bbfdf869ddc4c238e07de038f02a Author: Graeme Gregory Date: Mon Apr 16 15:35:46 2007 +0200 [ALSA] ASoC WM9712 kmemdup This patch creates the WM9712 codec register cache using kmemdup instead of doing a kzalloc followed by a memcpy. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 826220463f619d14c5efea51aac6277b441052b8 Author: Takashi Iwai Date: Mon Apr 16 12:32:52 2007 +0200 [ALSA] Fix alsa-devel ML address Fixed MAINTAINERS, alsa-devel ML is now subscribers-only. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0ba21762d3966d242cb2486a76f83e5a34933f95 Author: Takashi Iwai Date: Mon Apr 16 11:29:14 2007 +0200 [ALSA] hda-codec - Code clean up Trivial code clean-ups to follow the standard coding styles. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 756e2b014349e90aca1d0432498d1b35e5445566 Author: Takashi Iwai Date: Mon Apr 16 11:27:07 2007 +0200 [ALSA] hda-intel - Merge hda-codec module to a single module Merge hda-codec module to a single hda-intel module since this is the only user right now. Although hda-codec stuff is designed to be used universally from different controller drivers, currently only one controller interface (and compatibles) are used. So, let's merge them to a single module to save memory. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5930ca41857f57e130b4438a9a261b2ab91f6fcf Author: Takashi Iwai Date: Mon Apr 16 11:23:56 2007 +0200 [ALSA] hda-codec - Allow opening SPDIF while analog dup mode Allow opening the dedicated SPDIF stream while running on analog dup mode. Then the SPDIF stream is once reset and assigned for the new stream. It's useful for exclusive SPDIF output like AC3/DTS. (In the former version, you had to close once the analog stream to play the exclusive digital stream.) Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f12ab1e07dadecc3ac4774a7354c61baa83ff11f Author: Takashi Iwai Date: Thu Apr 12 15:51:47 2007 +0200 [ALSA] hda-codec - clean up patch_realtek.c Trivial code clean-ups of patch_realtek.c: indent and whitespace fixes. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a961f9fe8c6b0f3138a97582e1ddf05c4560593b Author: Takashi Iwai Date: Thu Apr 12 13:08:09 2007 +0200 [ALSA] hda-codec - Add support of 96kHz back Added the support of 96kHz sample rate back. Although the rate isn't listed in the ACC_PAR_PCM bits but si3054 codecs do support this rate explicitly. Now fixed the deteciton code not to check this extra bit. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bc9f98a9815c452a74e5eb9cbd2ed61b337fdcd2 Author: Kailang Yang Date: Thu Apr 12 13:06:07 2007 +0200 [ALSA] hda-codec - Add ALC662 support - Add ALC662 support - Fixed no sound for [0x1631, 0xc017, 'PB V7900', ALC260_WILL] - Fixed no sound for [0x161f, 0x2057, 'Replacer 672V', ALC260_REPLACER_672V] - Add SKU ID for auto mode Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7d4b4380d37025f0b13ae951e0cb2ff7184dc5bb Author: Pavel Hofman Date: Tue Apr 10 11:39:58 2007 +0200 [ALSA] ice1724 - Functioning support for Prodigy 192 Fixes: -------- * correct card specific ice1724 initialization * working IEC958 output of the card * renamed capture controls New features: ------------------ * analog input switch (line-in/mic) * optional ak4114 based MI/ODI/O card detection & support: IEC958 input, digital input switch (toslink/coax) Unresolved issues ----------------------- * Analog and digital input enums are listed on playback panel of alsamixer, I do not know how to push them onto the capture one. Signed-off-by: Pavel Hofman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f06934bd3cf773c297683d1345bf61c7807d7e75 Author: Takashi Iwai Date: Tue Apr 10 11:15:34 2007 +0200 [ALSA] ice1724 - Add comments for naming of PCM streams Added some comments regarding naming of PCM streams on vt172x chip. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fdd4bb49ec3f401379875990fcece611c623e32f Author: Takashi Iwai Date: Thu Apr 5 17:08:57 2007 +0200 [ALSA] ice1724 - call snd_ak4114_build() in juli Call snd_ak4114_build() in juli support code to build proper mixer elements for SPDIF inputs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c4116ae717d6456884232642bae806125d39f1d3 Author: Pavel Hofman Date: Thu Apr 5 17:07:30 2007 +0200 [ALSA] Fix misc bugs in i2c/others/ak4114.c * correct register for 'IEC958 Non-PCM Bitstream', 'IEC958 DTS Bitstream' to use AK4114_REG_RCS0 * correct check for control name: if (strstr(kctl->id.name, 'Playback')) * correct check: if (!chip->init) in snd_ak4114_external_rate * added PCM control 'IEC958 PPL Lock Status' Signed-off-by: Pavel Hofman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 208eee2a9db7e70109583e3481371967cd1d4764 Author: Frederik Deweerdt Date: Thu Apr 5 16:57:41 2007 +0200 [ALSA] pcm_native: lockdep warning when launching jack When launching 'jackd -d alsa', lockdep issues the following warning: [39701.405086] ============================================= [39701.405093] [ INFO: possible recursive locking detected ] [39701.405107] 2.6.21-rc5-mm4 #2 [39701.405109] --------------------------------------------- [39701.405112] jackd/17366 is trying to acquire lock: [39701.405114] (&substream->self_group.lock){....}, at: [] snd_pcm_action_group+0x90/0x240 [39701.405131] [39701.405131] but task is already holding lock: [39701.405134] (&substream->self_group.lock){....}, at: [] snd_pcm_action_lock_irq+0x3f/0xb0 [39701.405141] [39701.405142] other info that might help us debug this: [39701.405145] 3 locks held by jackd/17366: [39701.405147] #0: (snd_pcm_link_rwlock){....}, at: [] snd_pcm_action_lock_irq+0x27/0xb0 [39701.405155] #1: (&substream->group->lock){....}, at: [] snd_pcm_action_lock_irq+0x38/0xb0 [39701.405163] #2: (&substream->self_group.lock){....}, at: [] snd_pcm_action_lock_irq+0x3f/0xb0 [39701.405171] [39701.405171] stack backtrace: [39701.405174] [] show_trace_log_lvl+0x1a/0x30 [39701.405179] [] show_trace+0x12/0x20 [39701.405183] [] dump_stack+0x16/0x20 [39701.405187] [] __lock_acquire+0xbd0/0x1040 [39701.405193] [] lock_acquire+0x70/0x90 [39701.405197] [] _spin_lock+0x36/0x50 [39701.405203] [] snd_pcm_action_group+0x90/0x240 [39701.405207] [] snd_pcm_action_lock_irq+0x53/0xb0 [39701.405211] [] snd_pcm_common_ioctl1+0x35f/0xfb0 [39701.405215] [] snd_pcm_playback_ioctl1+0x34/0x420 [39701.405219] [] snd_pcm_playback_ioctl+0x43/0x50 [39701.405223] [] do_ioctl+0x28/0x80 [39701.405229] [] vfs_ioctl+0x57/0x290 [39701.405233] [] sys_ioctl+0x39/0x60 [39701.405237] [] sysenter_past_esp+0x5d/0x99 [39701.405240] ======================= The attached lockdep annotation silences the warning. Signed-off-by: Frederik Deweerdt Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6b97eb45f2edca51250b6c1e3142801f069245fe Author: Takashi Iwai Date: Thu Apr 5 14:51:48 2007 +0200 [ALSA] hda-codec - Fix SPDIF output Fix SPDIF output (at least on Realtek codecs). The DIGI_CONVERT verbs have to be reset before the PCM stream is set up. Otherwise the digital setup is screwed up. Also, check the AMP capability before setting AMP of the digital out widget. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f9ab2b1c3ab5345f9003bf7ebc1eaa0f9b8cf99e Author: Takashi Iwai Date: Tue Apr 3 13:20:49 2007 +0200 [ALSA] ali5451 - Code clean up, irq handler fix - Clean up ali5451.c, following the standard coding style, unneeded codes reduced, and removal of redundant variable initializations. Hungarian notation isn't fixed yet ;) - Fix irq handler to return IRQ_NONE properly for shared irqs. Also check the hardware availability in irq handler to avoid possible initialization races at loading the driver. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 51354ae3b8fdbeaf96e23ddf787432a38eba31f5 Author: Takashi Iwai Date: Fri Mar 30 15:38:39 2007 +0200 [ALSA] ak4114 - Fix possible Oops with callbacks ak4114 code may trigger Oops when the parameters are changed without call of snd_ak4114_build(). Now it checks the existence of kctl element, and the workq is triggered after building the necessary kcontrols. Also, did some code clean up. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a971c3d42524afc5619fa271d59d29be3c1661e3 Author: Karsten Wiese Date: Thu Mar 29 17:02:45 2007 +0200 [ALSA] snd-usb-caiaq: Make playback work some typo fixes. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c052f046240b094b2ec12e0004e47756302e2b55 Author: Takashi Iwai Date: Thu Mar 29 12:34:15 2007 +0200 [ALSA] ice1724 - Fix AP192 4wire mode access ap192_4wire_start() in ice1712/revo.c returns unsigned char whereas it should return unsigned int. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b07a14a549589e23be40f6b344df9512ba462e3f Author: Takashi Iwai Date: Wed Mar 28 17:19:29 2007 +0200 [ALSA] pcxhr - Minor optimization in trigger callback Minor optimization in trigger start callback. This fixes a nasty compile warning, too. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b942cf815b5775288550f99f3790e29815bb70cb Author: Rene Herman Date: Wed Mar 28 15:23:53 2007 +0200 [ALSA] es1968 - Fix stuttering capture Looks like the buffer size for the stereo capture has to be a power of two. Now added a constraint to buffer bytes. Also removed unnecessary #if 0 lines. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d3091fad4a4902185c3ce0b77a847ecafcb3f006 Author: Takashi Iwai Date: Wed Mar 28 15:11:53 2007 +0200 [ALSA] hda-codec - Fix missing array terminators Added missing array terminators in patch_conexant.c. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e3f9678c36dc81fde5dc86848d6d6077659ecaf0 Author: Johannes Berg Date: Wed Mar 28 13:42:25 2007 +0200 [ALSA] snd-aoa-i2sbus: use MODULE_DEVICE_TABLE instead of plain MODULE_ALIAS This patch changes snd-aoa-i2sbus to use MODULE_DEVICE_TABLE instead of a hardcoded MODULE_ALIAS. Thanks to Sylvain Munaut for pointing this out. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6d5fc07aee79327eba5e50a3afa4c1f11b4291d6 Author: Takashi Iwai Date: Tue Mar 27 15:54:27 2007 +0200 [ALSA] ak4114 - Fix a typo in DIF2 bit definition Fixed a typo in AK4114_DIF2 bit definition. This may fix some problems for Audiophile 192 and Juli boards. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 023ff3eee6255390384e050d9daab1490c88edf8 Author: Jean Delvare Date: Tue Mar 27 11:50:19 2007 +0200 [ALSA] sound: strlcpy is smart enough strlcpy already accounts for the trailing zero in its length computation, so there is no need to substract one to the buffer size. Signed-off-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 523f1dce37434a9a6623bf46e7893e2b4b10ac3c Author: Daniel Mack Date: Mon Mar 26 19:11:24 2007 +0200 [ALSA] Add Native Instrument usb audio device support Add snd-usb-caiaq driver to support caiaq usb-audio devices from Native Instrument: * Native Instruments RigKontrol2 * Native Instruments Kore Controller * Native Instruments Audio Kontrol 1 * Native Instruments Audio 8 DJ Signed-off-by: Daniel Mack Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e24a121aa1070fc91b6461b8b88bb6ffa61b4b49 Author: Andreas Mohr Date: Mon Mar 26 12:49:45 2007 +0200 [ALSA] azt3328.c: small cleanup patch - change 'PCM' mixer control (pre/post 3D) to 'PCM Output Route' - improve snd_azf3328_debug_show_ports - less aggressive module init message - document Bass/Treble non-bug (prompted by user report - Thank You!!) - add some items to card description - add some I/O register documentation - enhance copyright Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1aba2bc32144ed13f1c0e581471fe943e738ff42 Author: Andrea Arcangeli Date: Thu Mar 22 01:02:58 2007 +0100 [ALSA] hda-codec - Fix front/rear mic inputs on AD1986A codec Fix the front/rear mic inputs on ASUS M2NPV-VM board with AD1986A codec chip (3stack model). Signed-off-by: Andrea Arcangeli Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 19a982b69442d39b3bb6e710677320182480576b Author: Takashi Iwai Date: Wed Mar 21 15:14:35 2007 +0100 [ALSA] hda-intel - Probe additional slots only if necessary Probing the codec slots on ATI controller causes problems on some devices like Acer laptops. On these devices, reading from codec slot 3 results in the communication failure with the codec chip. Meanwhile, some laptops (e.g. Gateway) have the codec connection only on slot 3, and probing this slot is mandatory for them. The patch improves the probing robustness. The additional slots are now checked only when no codecs are found in the primary three slots. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4505179c73197c39272e8e66a172ab788009e07e Author: Rene Herman Date: Wed Mar 21 12:05:06 2007 +0100 [ALSA] Fix alsa-devel ML address This replaces all occurences of alsa-devel@lists.s[ource]f[orge].net that a simple recursive grep found in the current HG ALSA repos by alsa-devel@alsa-project.org. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 97a1dd5bee9edab5172553cbdcfc858393814556 Author: David Brownell Date: Wed Mar 21 11:54:04 2007 +0100 [ALSA] fix SND_SOC Kconfig The new ALSA 'SOC' support has bogus Kconfig ... it should not be presenting anything AT91-related except on AT91, or anything PXA-related except on PXA. Right now, x86 sees both of those menus, as do all other platforms. This patch removes needless Kconfig layering, and the related inappropriate choice presentation. Signed-off-by: David Brownell Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 83c51c0ab08f55468d8f5444ff2f70a36841a21f Author: Rene Herman Date: Tue Mar 20 11:33:46 2007 +0100 [ALSA] isa_bus device/driver naming isa_bus: delete snd_ prefix from the (sysfs visible) device/driver names. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e4b6088c8cf16781f7f7b887811b164daf625968 Author: Julian Cable Date: Mon Mar 19 11:44:40 2007 +0100 [ALSA] hdsp - Add support for fine tuning of sample rate support to HDSP 9632 Add 'DDS Sample Rate Offset' control. Allows values in Hz from -5000 to +5000. The value is added to the nominal sample rate and written to the DDS register. Signed-off-by: Julian Cable Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 02a5039fc72611801e20679d2030d627ed043463 Author: Takashi Iwai Date: Mon Mar 19 11:42:18 2007 +0100 [ALSA] hda-codec - Fix Macmini and Macbook pin configs Original idea from Nicolas Boichat . The pin configurations of Macmini and MacBook (1st generation, at least) seem identical with MacBook Pro (1st generation). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2944275b146f4c0bb229a862bd8b3930c157d2a1 Author: Rask Ingemann Lambertsen Date: Mon Mar 19 11:38:11 2007 +0100 [ALSA] ad1816a: Fix modprobe snd_mpu401 && modprobe snd_ad1816a The ad1816a driver fails if the mpu401 driver has been loaded first. This patch against linux 2.6.20 fixes it by just ignoring the MPU-401 device in that case, so that the rest of the sound card can be used. The ad1816a driver already handles the MPU-401 device being unavailable due to lack of resources in the same way. Signed-off-by: Rask Ingemann Lambertsen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1b60f6b0904737cb76cd4cd46b57592318c9a20e Author: Takashi Iwai Date: Tue Mar 13 22:13:47 2007 +0100 [ALSA] Fix conflicts between const and __devinitdata Marvin told with a depressed face, gcc doesn't like both __devinitdata and const in the same line. So, remove const from all over places now... Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bf748ed73e6978657102bddb1c4cc8a8f342c484 Author: Ralf Baechle Date: Tue Mar 13 15:31:08 2007 +0100 [ALSA] ice1712: build fixes CC [M] sound/pci/ice1712/ice1712.o sound/pci/ice1712/ice1712.c:290: error: snd_ice1712_mixer_digmix_route_ac97 causes a section type conflict sound/pci/ice1712/ice1712.c:1630: error: snd_ice1712_eeprom causes a section type conflict ... Gcc like its __devinitdata readable not const, it seems. An alternative fix would be to remove the __devinitdata attribute but that would result in slight runtime bloat. Signed-off-by: Ralf Baechle Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 623ec04798bc21a611a5409f39bd3069cc64a80f Author: Ralf Baechle Date: Tue Mar 13 15:29:47 2007 +0100 [ALSA] hda_intel: build fix CC [M] sound/pci/hda/hda_intel.o sound/pci/hda/hda_intel.c:1508: error: position_fix_list causes a section type conflict Gcc like its __devinitdata readable not const, it seems. An alternative fix would be to remove the __devinitdata attribute but that would result in slight runtime bloat. Signed-off-by: Ralf Baechle Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 345a1e150ed722bded478e23d3d75b6b73c63d5c Author: Robert P. J. Day Date: Mon Mar 12 12:54:23 2007 +0100 [ALSA] Delete unused header file sound/pci/au88x0/au88x0_sb.h Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3396b33c8eab1b06f7cd2a63069fd7a04f02d8fb Author: Robert P. J. Day Date: Mon Mar 12 12:53:38 2007 +0100 [ALSA] remove unused header file: sound/pci/cs46xx/imgs/cwcemb80.h Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2549413ea6c17c94e42ab14611e487d96c787578 Author: Takashi Iwai Date: Mon Mar 12 12:36:16 2007 +0100 [ALSA] hda-codec - Code clean up of patch_sigmatel.c - Remove superfluous array member in stac9205_dmic_nids[] - Use ARRAY_SIZE() instead of hard-coded numbers Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e9024ccc2d54a71dfac583ede6082e265264d871 Author: John Utz Date: Mon Mar 12 12:30:06 2007 +0100 [ALSA] ac97 - Smart 5.1 for VIA 1617a codec This patch provides a single 8 way enum called 'Smart 5.1 Select' with some reasonable names for each enum that allows the user to choose which of the 8 possible settings for vt1617a's version of what via calls 'Smart 5.1'. Signed-off-by: John Utz Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7f29673b2b20071a407af0a0a6acab8230912c6e Author: Tobin Davis Date: Mon Mar 12 11:39:01 2007 +0100 [ALSA] hda-codec - Conexant improvements This patch further improves on the Conexant Audio driver. Adds support for Fujistu Siemens Si1520 series laptops. Adds support for mic/line in on CX20549 based systems (aka 5045). removes duplicated or unused controls (gpio, spdif) from test model. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 68e22543eec3e44508d0d4ed584562478b942b09 Author: Tobin Davis Date: Mon Mar 12 11:36:39 2007 +0100 [ALSA] hda-codec - Add Sony VGC-LA1 to patch_sigmatel.c This patch adds the Sony Vaio VGC-LA1 to the stac9872_cfg_tbl. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 592a82e8b6f4b5376e2faa2467b816cc8b73eaa6 Author: Takashi Iwai Date: Mon Mar 12 11:33:32 2007 +0100 [ALSA] ac97 - Fix MSI L720 laptop Fix internal speaker output of MSI L720 laptop with ALC655 codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d65b790adbd8ea4b4c9687eda722d7b2a730ed02 Author: Clemens Ladisch Date: Mon Mar 12 08:30:58 2007 +0100 [ALSA] Kconfig: clarify help text for external firmware entries The external firmware files are not in the alsa-plugins but in the alsa-firmware package. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit badec46ddf7c2d1cb0b944332746828c48debe40 Author: Clemens Ladisch Date: Mon Mar 12 08:30:16 2007 +0100 [ALSA] Kconfig: fix FW_LOADER dependencies Move the FW_LOADER dependencies out of the *_FIRMWARE_IN_KERNEL entries because these drivers use the firmware loader regardless of whether there is an in-kernel firmware image. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 4d02031fe25c01eaa946a25e2052dd8e706edfca Author: Takashi Iwai Date: Thu Mar 8 12:53:55 2007 +0100 [ALSA] soc - Fix dependencies in s3c24xx/Kconfig Fixed dependencies in soc/s3c24xx/Kconfig file. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ffb2c3c07f6ffd61923de736139248b31dc6f642 Author: Remy Bruno Date: Wed Mar 7 19:08:46 2007 +0100 [ALSA] hdspm - Support for Master mode of AES32 and recent MADI The current MADI driver was found not to completely work, at least on recent MADI cards (rev 204), in particular at 96kHz. This patch solves this: * Add support of DDS feature * Channel map fixed * Channel/rate rules fixed * DMA allocation fixed (need to alloc for all channels and not only for the used ones) Full support for AES32 master mode was added: * Add support of DDS feature * Channel map fixed * Channel/rate rules fixed Signed-off-by: Remy Bruno Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 59ae9d05918aca6790fece86b6b3f7daef66d6a8 Author: Giuliano Pochini Date: Wed Mar 7 18:20:59 2007 +0100 [ALSA] echoaudio - increase sleep time at loading firmware The new ASIC code needs more time to set up. (Note: the driver still works fine with the old firmware after this change. The opposite is not true.) From: Giuliano Pochini Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e378ad1dcb7f5cf6de4974832d01be04e112c4c2 Author: Johannes Berg Date: Wed Mar 7 16:23:50 2007 +0100 [ALSA] aoa: fix a sparse warning This fixes a warning sparse gives. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a43ae90543f4c5eccbc050eda088c07cf45b61c0 Author: Takashi Iwai Date: Wed Mar 7 15:58:40 2007 +0100 [ALSA] Fix compilation error in sparc/cs4231.c Removed the unnecessary line I forgot in the last clean-up patch wrt snd_pcm_group_for_each_entry(). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d5ad630b6dd00ea41e0c58b45c0912f72757b5cd Author: Takashi Iwai Date: Wed Mar 7 15:55:59 2007 +0100 [ALSA] Fix NULL dereference with null modelname Fix the NULL dereference of modelname option. The check is moved to find_codec_preset() now, too. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6d7b1d7d09e00034325b09a3a7ac7b0ea5e29506 Author: Takashi Iwai Date: Mon Feb 26 15:56:46 2007 +0100 [ALSA] hda-codec - Allow model=generic always for generic parser Accept model=generic option to specify the generic parser regardless of codec chips. This is helpful for testing and debugging. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 Author: Takashi Iwai Date: Mon Feb 26 15:55:43 2007 +0100 [ALSA] Enable Kconfig options for external firmwares Some drivers are already ifdefs for enabling external firmwares but not defined in Kconfig. Now they appear as the kernel configs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8f7ba051d2abb3d3bde9b95e47246c60b704d2b4 Author: Takashi Iwai Date: Thu Feb 22 16:07:21 2007 +0100 [ALSA] mpu401 - Add MPU401_INFO_UART_ONLY bitflag Added MPU401_INFO_UART_ONLY bitflag to avoid issueing UART_ENTER command at opening streams. Some devices support only UART mode and give errors to UART_ENTER. A new module option, uart_enter, is added to snd-mpu401 driver. For UART-only devices, set uart_enter=0. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 76e630677419ecf2cf8c0b738536eee34dc048e6 Author: Takashi Iwai Date: Thu Feb 22 13:31:08 2007 +0100 [ALSA] bt87x - Add ATI TV-Wonder to the supported list Added ATI TV-Wonder (1002:0001) to the supported list. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 62e96a1caab86e0d3688d59fcb6f682cc52d4917 Author: vignesh babu Date: Thu Feb 22 13:23:01 2007 +0100 [ALSA] is_power_of_2 in rtctimer.c Replacing (n & (n-1)) in the context of power of 2 checks with is_power_of_2 Signed-off-by: vignesh babu Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ac519028a4e7b919eaff65a1535824259df326c6 Author: Takashi Iwai Date: Thu Feb 22 12:58:27 2007 +0100 [ALSA] ac97 - Make patch functions static Include ac97_patch.c from the main ac97_codec.c in order to make bunch of patch_*() functions static. This helps optimization. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ef991b95aa1351a5782cfaccb9aefba76ca8b990 Author: Takashi Iwai Date: Thu Feb 22 12:52:53 2007 +0100 [ALSA] Add snd_pcm_group_for_each_entry() for code cleanup Added a new macro snd_pcm_group_for_each_entry() just for code cleanup. Old macros, snd_pcm_group_for_each() and snd_pcm_group_substream_entry(), are removed. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5e24c1c1c496c4603395d6e9cc320f85008fc891 Author: Takashi Iwai Date: Thu Feb 22 12:50:54 2007 +0100 [ALSA] Port the rest of ALSA ISA drivers to isa_driver Port the rest of ALSA ISA drivers to use isa_driver framework instead of platform_driver. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 442f4f36bed8bcadcbda299c615c12fae95eda99 Author: Rene Herman Date: Mon Feb 19 13:07:50 2007 +0100 [ALSA] gusextreme: set codec_flag The gusextreme driver neglects to set the gus->codec_flag meaning snd_gf1_pcm_new() allocates a second 'PCM Playback Volume' control, which makes the driver fail to load. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b44dfe1a4a39dbf55d204486a45aa3263eb12df0 Author: Rene Herman Date: Mon Feb 19 13:07:17 2007 +0100 [ALSA] isa_bus: gusextreeme gusextreme: port to isa_bus infrastructure Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 93f02c6e7e5665edfe299f4e2bac22152a90d4e2 Author: Rene Herman Date: Mon Feb 19 13:05:02 2007 +0100 [ALSA] isa_bus: gusclassic gusclassic: port to isa_bus infrastructure Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 019608b6379fcc3ba7f4db51540e509e93f4ab3c Author: Rene Herman Date: Mon Feb 19 13:01:45 2007 +0100 [ALSA] es1688 - code clean-up Seperate out the legacy probing into its own function, improving readability. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 07e038b349f8fadf0b5c100dc9c3cab47327a244 Author: Takashi Iwai Date: Thu Feb 15 18:23:41 2007 +0100 [ALSA] hda-codec - Fix models for some lpatops/mobos Added the missing models for some laptops / mobos: ASUS z35m, ASRock board Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ae5961869c353001e9bf1eb5bafe068959a5417f Author: Rene Herman Date: Wed Feb 14 13:26:17 2007 +0100 [ALSA] isa_bus: es1688 es1688: port to isa_bus infrastructure. very slight reorganization of the auto-probe code to be a bit easier on the eye (if not the senses). Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d63898c9d4ac7ac98608c29a2abb3c42b2bb3646 Author: Rene Herman Date: Wed Feb 14 13:23:38 2007 +0100 [ALSA] isa_bus: cs4231 cs4231: port to isa_bus infrastructure. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ab7942b202874f47d38c7ff06ccacdfbced1c4f4 Author: Rene Herman Date: Wed Feb 14 13:23:16 2007 +0100 [ALSA] isa_bus: adlib adlib: port to isa_bus infrastructure. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e2759e3366eda66b3e000171961ce92b2e01f05f Author: Rene Herman Date: Wed Feb 14 13:22:41 2007 +0100 [ALSA] isa_bus: ad1848 ad1848: port to isa_bus infrastructure Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 86e1f0df2f88fd86657ddb993bba468a75128e02 Author: Graeme Gregory Date: Wed Feb 14 13:20:46 2007 +0100 [ALSA] ASoC Samsung S3C24xx build This patch builds the Samsung S3C24xx audio DMA and I2S drivers. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c0f41bb1717ae31f806615e81b808753271dd3d9 Author: Ben Dooks Date: Wed Feb 14 13:20:03 2007 +0100 [ALSA] ASoC Samsung S3C24xx audio DMA This patch by Ben Dooks from Simtec Electronics adds ASoC audio DMA support for the Samsung S3C24xx CPU. Signed-off-by: Ben Dooks Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c1422a6658ef6101fc5a979021487c732cb177a1 Author: Ben Dooks Date: Wed Feb 14 13:17:49 2007 +0100 [ALSA] ASoC Samsung S3C24xx I2S support This patch by Ben Dooks from Simtec Electronics adds ASoC I2S support for the Samsung S3C24xx CPU. Signed-off-by: Ben Dooks Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3f2d560e9029ec0b7edf8be0c32425f4bb57d582 Author: Yoichi Yuasa Date: Fri May 11 21:43:09 2007 +0900 [MIPS] Rework cobalt_board_id This patch has reworked cobalt_board_id. The cobalt_board_id is read from PCI config register. It should be in PCI routine. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit b0cc114c04c114b933661eba329d9776c0eab74c Author: Yoichi Yuasa Date: Fri May 11 21:33:30 2007 +0900 [MIPS] Use RTC_CMOS for Cobalt Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit fb82a3a7674e754729c2e31183b538e39a900e5b Author: Yoichi Yuasa Date: Fri May 11 21:29:59 2007 +0900 [MIPS] Use platform_device for Cobalt UART Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c3543e253a79e1383300953fb9c6f688e8be312d Author: Yoichi Yuasa Date: Fri May 11 20:44:30 2007 +0900 [MIPS] Separate Alchemy processor based boards config Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 7b239bb1068eda3f7e8befd9b43671093c206f0e Author: Atsushi Nemoto Date: Thu May 10 23:47:45 2007 +0900 [MIPS] Fix build error in atomic64_cmpxchg Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit fcbee6410d5c4112593e7082fb8d96dfdc6c1c25 Author: Atsushi Nemoto Date: Fri May 11 01:02:34 2007 +0900 [MIPS] Run checksyscalls for N32 and O32 ABI On 64-bit MIPS, only N64 ABI is checked by default. This patch adds some rules for other ABIs. This results in these warnings at the moment: CALL-N32 /home/git/linux-mips/scripts/checksyscalls.sh :148:2: warning: #warning syscall time not implemented :424:2: warning: #warning syscall select not implemented :440:2: warning: #warning syscall uselib not implemented :856:2: warning: #warning syscall vfork not implemented :868:2: warning: #warning syscall truncate64 not implemented :872:2: warning: #warning syscall ftruncate64 not implemented :876:2: warning: #warning syscall stat64 not implemented :880:2: warning: #warning syscall lstat64 not implemented :884:2: warning: #warning syscall fstat64 not implemented :980:2: warning: #warning syscall getdents64 not implemented :1176:2: warning: #warning syscall fadvise64_64 not implemented :1284:2: warning: #warning syscall fstatat64 not implemented :1364:2: warning: #warning syscall utimensat not implemented CALL-O32 /home/git/linux-mips/scripts/checksyscalls.sh :424:2: warning: #warning syscall select not implemented :856:2: warning: #warning syscall vfork not implemented :1176:2: warning: #warning syscall fadvise64_64 not implemented :1364:2: warning: #warning syscall utimensat not implemented CALL /home/git/linux-mips/scripts/checksyscalls.sh :148:2: warning: #warning syscall time not implemented :424:2: warning: #warning syscall select not implemented :440:2: warning: #warning syscall uselib not implemented :856:2: warning: #warning syscall vfork not implemented :980:2: warning: #warning syscall getdents64 not implemented :1364:2: warning: #warning syscall utimensat not implemented Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit e8b6d40a007774bde5110c110290f8090c7e48ad Author: David Rientjes Date: Thu May 10 22:51:05 2007 -0700 [MIPS] tlbex: use __maybe_unused Replace function instances of __attribute__((unused)) with __maybe_unused. Acked-by: Ralf Baechle Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Ralf Baechle commit f6d376aac33ccdce95b42fdcc916d4ee98c05623 Author: David Rientjes Date: Thu May 10 22:51:04 2007 -0700 [MIPS] excite: use __maybe_unused Replace variable instances of __attribute__((unused)) with __maybe_unused. Acked-by: Ralf Baechle Cc: Thomas Koeller Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Ralf Baechle commit 44320f2bcbc05c3f4d62fcdd06fe440d9a803ce0 Author: Yoichi Yuasa Date: Thu May 10 20:00:55 2007 +0900 [MIPS] Add extern cobalt_board_id Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f009bbf10fe2321a536b4bd922fc8d070ebe27fd Author: Atsushi Nemoto Date: Wed May 9 23:42:38 2007 +0900 [MIPS] Remove unused CONFIG_TOSHIBA_BOARDS Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 717644dde1811c254102ea81d74a274fdae7d13c Author: Yoichi Yuasa Date: Wed May 9 23:37:15 2007 +0900 [MIPS] Rename tb0229_defconfig to tb0219_defconfig tb0219 is the real board name. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit e7ed61f49246184326d64d9f53b0ff7ecf5230b6 Author: Yoichi Yuasa Date: Wed May 9 23:31:46 2007 +0900 [MIPS] Update tb0229_defconfig; add CONFIG_GPIO_TB0219. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit d94cf2c32b1ce9bf1a251c190008482c058dbb33 Author: Atsushi Nemoto Date: Wed May 9 23:58:47 2007 +0900 [MIPS] Add minimum defconfig for RBHMA4200 Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a1b53a7b22934504d8c4e065759e8674e665506d Author: Ralf Baechle Date: Wed May 9 17:49:53 2007 +0100 [MIPS] SB1: Build fix. Signed-off-by: Ralf Baechle commit f543110da7a53acb8c6d367e740ca9e110f0bb3a Author: Atsushi Nemoto Date: Thu May 10 01:20:30 2007 +0900 [MIPS] Drop __devinit tag from allocate_irqno() and free_irqno() This fix these warnings: WARNING: arch/mips/kernel/built-in.o - Section mismatch: reference to .init.text:free_irqno from __ksymtab_gpl between '__ksymtab_free_irqno' (at offset 0x0) and '__ksymtab_allocate_irqno' WARNING: arch/mips/kernel/built-in.o - Section mismatch: reference to .init.text:allocate_irqno from __ksymtab_gpl after '__ksymtab_allocate_irqno' (at offset 0x8) Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 55d0b4e3f6526daf1cc7449028bf5d4c304a6a69 Author: Franck Bui-Huu Date: Fri May 4 17:36:44 2007 +0200 [MIPS] clocksource: use CLOCKSOURCE_MASK() macro Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 599ca0fb639ba843da46c3ad1a53590763539750 Author: Franck Bui-Huu Date: Mon May 7 18:01:53 2007 +0200 [MIPS] Remove LIMITED_DMA support This code was needed only by Jaguar ATX. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit bef964e55ac128b1a6894c68171d0b22263449f8 Author: Franck Bui-Huu Date: Mon May 7 18:01:52 2007 +0200 [MIPS] Remove Momenco Jaguar ATX support It has some hackish code and it odd DMA results in the need to support old features in kernel code. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 1e54f778af4467b816bf1289e7c4bf7e50067b7b Author: Franck Bui-Huu Date: Mon May 7 18:01:51 2007 +0200 [MIPS] Remove Momenco Ocelot G support Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 0b6249567b4ecf6e9d5a8efcf149f3e7cf788cc0 Author: Chris Dearman Date: Tue May 8 16:09:13 2007 +0100 [MIPS] FPU hazard handling Move FPU hazard handling to hazards.h and provide proper support for MIPSR2 processors Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit d725cf3818b12a17d78b87a2de19e8eec17126ae Author: Chris Dearman Date: Tue May 8 14:05:39 2007 +0100 [MIPS] MT: Reenable EIC support and add support for SOCit SC. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit ef300e42234eac066b193c871714203d999b481c Author: Ralf Baechle Date: Sun May 6 18:31:18 2007 +0100 [MIPS] Define and use vi_handler_t for vectored interrupt handlers. Signed-off-by: Ralf Baechle commit 856a514b408fd1b147bf95916811980982fa40d0 Author: Ralf Baechle Date: Sun May 6 17:51:59 2007 +0100 [MIPS] Fix do_default_vi to use get_irq_regs to get the irq register ptr. Harmless bug because this function is only called in case of another kernel bug anyway which is also why this was missed for so long. Signed-off-by: Ralf Baechle commit 99af900aef048f4923e71bb72f88cc556241a0d4 Author: Ralf Baechle Date: Sun May 6 17:18:16 2007 +0100 [MIPS] Make do_default_vi static Signed-off-by: Ralf Baechle commit df6b106bf01a17a157013245c2851dec4d7b5a2b Author: Thiemo Seufer Date: Tue May 1 19:14:16 2007 +0100 [MIPS] Add __ucmpdi2 implementation Recent GCC SVN versions may generate calls to __ucmpdi2. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 774583f8bcfbdc423e51cb8b924d8c6cea4afbac Author: Ralf Baechle Date: Thu May 3 18:13:08 2007 +0100 [MIPS] Delete Documentation/mips/pci/pci.README This file, and reality are different universes ... Signed-off-by: Ralf Baechle commit 36ea1d57a4bb7d033b5f99f13c08f9af56cd70d7 Author: Franck Bui-Huu Date: Thu May 3 13:01:32 2007 +0200 [MIPS] early_printk: allow the early console to run earlier Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit ca4437d4a58147aa975f3b4ad8f6cb35dfa43bdc Author: Franck Bui-Huu Date: Thu May 3 12:58:54 2007 +0200 [MIPS] early_printk: use init section Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 87c1efbfeac49849b981a7eac8cba42d4a49b2e9 Author: Jens Axboe Date: Fri May 11 13:29:54 2007 +0200 Fix compile/link of init/do_mounts.c with !CONFIG_BLOCK We need a stub function for when CONFIG_BLOCK isn't set. Signed-off-by: Jens Axboe commit d89d87965dcbe6fe4f96a2a7e8421b3a75f634d1 Author: Neil Brown Date: Tue May 1 09:53:42 2007 +0200 When stacked block devices are in-use (e.g. md or dm), the recursive calls to generic_make_request can use up a lot of space, and we would rather they didn't. As generic_make_request is a void function, and as it is generally not expected that it will have any effect immediately, it is safe to delay any call to generic_make_request until there is sufficient stack space available. As ->bi_next is reserved for the driver to use, it can have no valid value when generic_make_request is called, and as __make_request implicitly assumes it will be NULL (ELEVATOR_BACK_MERGE fork of switch) we can be certain that all callers set it to NULL. We can therefore safely use bi_next to link pending requests together, providing we clear it before making the real call. So, we choose to allow each thread to only be active in one generic_make_request at a time. If a subsequent (recursive) call is made, the bio is linked into a per-thread list, and is handled when the active call completes. As the list of pending bios is per-thread, there are no locking issues to worry about. I say above that it is "safe to delay any call...". There are, however, some behaviours of a make_request_fn which would make it unsafe. These include any behaviour that assumes anything will have changed after a recursive call to generic_make_request. These could include: - waiting for that call to finish and call it's bi_end_io function. md use to sometimes do this (marking the superblock dirty before completing a write) but doesn't any more - inspecting the bio for fields that generic_make_request might change, such as bi_sector or bi_bdev. It is hard to see a good reason for this, and I don't think anyone actually does it. - inspecing the queue to see if, e.g. it is 'full' yet. Again, I think this is very unlikely to be useful, or to be done. Signed-off-by: Neil Brown Cc: Jens Axboe Cc: Alasdair G Kergon said: I can see nothing wrong with this in principle. For device-mapper at the moment though it's essential that, while the bio mappings may now get delayed, they still get processed in exactly the same order as they were passed to generic_make_request(). My main concern is whether the timing changes implicit in this patch will make the rare data-corrupting races in the existing snapshot code more likely. (I'm working on a fix for these races, but the unfinished patch is already several hundred lines long.) It would be helpful if some people on this mailing list would test this patch in various scenarios and report back. Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit acaebfd8a7af0019b2edfcf4045c56c3e18375c5 Author: David Howells Date: Thu May 10 22:51:50 2007 -0700 [MTD] generalise the handling of MTD-specific superblocks Generalise the handling of MTD-specific superblocks so that JFFS2 and ROMFS can both share it. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 33672f72b24191fb17c3666ec1c620f3fa617b50 Author: Mike Frysinger Date: Thu May 10 22:51:53 2007 -0700 [MTD] [MAPS] don't force uclinux mtd map to be root dev The cheesy uclinux mtd maps can be used for more than just the root device, so I think we should drop the forcing. Also, I feel like this is a policy decision that shouldnt be in the kernel in the first place. People who have been lazy and boot with uclinux mtd maps and dont put root= into their commandline can simply add the appropriate root= line either into their bootloader or into the compiled in bootargs. Signed-off-by: Mike Frysinger Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 0a4ff8c2598b72f2fa9d50aae9e1809e684dbf41 Author: Steve Grubb Date: Thu Apr 19 10:28:21 2007 -0400 [PATCH] Abnormal End of Processes Hi, I have been working on some code that detects abnormal events based on audit system events. One kind of event that we currently have no visibility for is when a program terminates due to segfault - which should never happen on a production machine. And if it did, you'd want to investigate it. Attached is a patch that collects these events and sends them into the audit system. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 5712e88f2b0f626a4857c24128810bbf8ce09537 Author: Amy Griffis Date: Tue Feb 13 14:15:22 2007 -0500 [PATCH] match audit name data Make more effort to detect previously collected names, so we don't log multiple PATH records for a single filesystem object. Add audit_inc_name_count() to reduce duplicate code. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 4fc03b9beb2314f3adb9e72b7935a80c577954d1 Author: Amy Griffis Date: Tue Feb 13 14:15:01 2007 -0500 [PATCH] complete message queue auditing Handle the edge cases for POSIX message queue auditing. Collect inode info when opening an existing mq, and for send/receive operations. Remove audit_inode_update() as it has really evolved into the equivalent of audit_inode(). Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 510f4006e7a82b37b53c17bbe64ec20f3a59302b Author: Amy Griffis Date: Tue Feb 13 14:14:41 2007 -0500 [PATCH] audit inode for all xattr syscalls Collect inode info for the remaining xattr syscalls that operate on a file descriptor. These don't call a path_lookup variant, so they aren't covered by the general audit hook. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit e41e8bde43026d5d2e41464e6105a50b31e34102 Author: Amy Griffis Date: Tue Feb 13 14:14:09 2007 -0500 [PATCH] initialize name osid Audit contexts can be reused, so initialize a name's osid to the default in audit_getname(). This ensures we don't log a bogus object label when no inode data is collected for a name. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit e54dc2431d740a79a6bd013babade99d71b1714f Author: Amy Griffis Date: Thu Mar 29 18:01:04 2007 -0400 [PATCH] audit signal recipients When auditing syscalls that send signals, log the pid and security context for each target process. Optimize the data collection by adding a counter for signal-related rules, and avoiding allocating an aux struct unless we have more than one target process. For process groups, collect pid/context data in blocks of 16. Move the audit_signal_info() hook up in check_kill_permission() so we audit attempts where permission is denied. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 7f13da40e36c84d0d046b7adbd060af7d3717250 Author: Amy Griffis Date: Thu Mar 29 18:00:37 2007 -0400 [PATCH] add SIGNAL syscall class (v3) Add a syscall class for sending signals. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit a5cb013da773a67ee48d1c19e96436c22a73a7eb Author: Al Viro Date: Tue Mar 20 13:58:35 2007 -0400 [PATCH] auditing ptrace Signed-off-by: Al Viro commit da0dd231436ba7e81789e93dd933d7a275e1709d Author: Patrick McHardy Date: Thu May 10 14:17:58 2007 -0700 [NETFILTER]: xt_conntrack: add compat support Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 802169a4b0f71d25a0f798a9c0657a565b1e79bc Author: Patrick McHardy Date: Thu May 10 14:17:36 2007 -0700 [NETFILTER]: iptable_raw: ignore short packets sent by SOCK_RAW sockets iptables matches and targets expect packets to have at least a full IP header and a valid header length. Ignore packets sent through raw sockets for which this isn't true as in the other tables. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4a176c1a61ed279f4d98b6adf9be84fb905d921c Author: Patrick McHardy Date: Thu May 10 14:16:56 2007 -0700 [NETFILTER]: iptable_{filter,mangle}: more descriptive "happy cracking" message Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5d78a84913abc1b2ef1ec0c14a78ec99517cc122 Author: Yasuyuki Kozakai Date: Thu May 10 14:16:24 2007 -0700 [NETFILTER]: nf_nat: Clears helper private area when NATing Some helpers (eg. ftp) assume that private area in conntrack is filled with zero. It should be cleared when helper is changed. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit df293bbb6ff80f40a2308140ba4cbc2d3c1b18da Author: Yasuyuki Kozakai Date: Thu May 10 14:15:58 2007 -0700 [NETFILTER]: ctnetlink: clear helper area and handle unchanged helper This patch - Clears private area for helper even if no helper is assigned to conntrack. It might be used by old helper. - Unchanges if the same helper as the used one is specified. - Does not find helper if no helper is specified. And it does not require private area for helper in that case. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fda61436835f6d46b6d85d4fe9206ffe682fe7f0 Author: Yasuyuki Kozakai Date: Thu May 10 14:15:30 2007 -0700 [NETFILTER]: nf_conntrack: Removes unused destroy operation of l3proto Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c874d5f726ebaa5487d9fb7b057e28c25c4975a2 Author: Yasuyuki Kozakai Date: Thu May 10 14:15:08 2007 -0700 [NETFILTER]: nf_conntrack: Removes duplicated declarations These are also in include/net/netfilter/nf_conntrack_helper.h Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ba4c7cbadd2c025321809b522c398fc81cd5d75d Author: Yasuyuki Kozakai Date: Thu May 10 14:14:45 2007 -0700 [NETFILTER]: nf_nat: remove unused argument of function allocating binding nf_nat_rule_find, alloc_null_binding and alloc_null_binding_confirmed do not use the argument 'info', which is actually ct->nat.info. If they are necessary to access it again, we can use the argument 'ct' instead. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3c2ad469c317147fc1de19579f8173ddb68a9e91 Author: Patrick McHardy Date: Thu May 10 14:14:16 2007 -0700 [NETFILTER]: Clean up table initialization - move arp_tables initial table structure definitions to arp_tables.h similar to ip_tables and ip6_tables - use C99 initializers - use initializer macros where possible Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 41a23b0788610b27ecb4c4ee857f3fe7168f1070 Author: Herbert Xu Date: Thu May 10 14:12:47 2007 -0700 [NET_SCHED]: Avoid requeue warning on dev_deactivate When we relinquish queue_lock in qdisc_restart and then retake it for requeueing, we might race against dev_deactivate and end up requeueing onto noop_qdisc. This causes a warning to be printed. This patch fixes this by checking this before we requeue. As an added bonus, we can remove the same check in __qdisc_run which was added to prevent dev->gso_skb from being requeued when we're shutting down. Even though we've had to add a new conditional in its place, it's better because it only happens on requeues rather than every single time that qdisc_run is called. For this to work we also need to move the clearing of gso_skb up in dev_deactivate as now qdisc_restart can occur even after we wait for __LINK_STATE_QDISC_RUNNING to clear (but it won't do anything as long as the queue and gso_skb is already clear). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit cce1fa36a8ed36e8a3f64455e2a830f48e904c64 Author: Herbert Xu Date: Thu May 10 14:11:16 2007 -0700 [NET_SCHED]: Reread dev->qdisc for NETDEV_TX_OK Now that we return the queue length after NETDEV_TX_OK we better make sure that we have the right queue. Otherwise we can cause a stall after a really quick dev_deactive/dev_activate. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d90df3ad07a20cd93921e05ff2b12ca7030b4fd7 Author: Herbert Xu Date: Thu May 10 04:55:14 2007 -0700 [NET_SCHED]: Rationalise return value of qdisc_restart The current return value scheme and associated comment was invented back in the 20th century when we still had that tbusy flag. Things have changed quite a bit since then (even Tony Blair is moving on now, not to mention the new French president). All we need to indicate now is whether the caller should continue processing the queue. Therefore it's sufficient if we return 0 if we want to stop and non-zero otherwise. This is based on a patch by Krishna Kumar. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5830725f8a36908111ecccf2899d06d6dcf54d45 Author: Thomas Graf Date: Thu May 10 04:02:41 2007 -0700 [NET]: Fix dev->qdisc race for NETDEV_TX_LOCKED case When transmit fails with NETDEV_TX_LOCKED the skb is requeued to dev->qdisc again. The dev->qdisc pointer is protected by the queue lock which needs to be dropped when attempting to transmit and acquired again before requeing. The problem is that qdisc_restart() fetches the dev->qdisc pointer once and stores it in the `q' variable which is invalidated when dropping the queue_lock, therefore the variable needs to be refreshed before requeueing. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit fc038410b4b1643766f8033f4940bcdb1dace633 Author: David S. Miller Date: Wed May 9 16:42:20 2007 -0700 [UDP]: Fix AF-specific references in AF-agnostic code. __udp_lib_port_inuse() cannot make direct references to inet_sk(sk)->rcv_saddr as that is ipv4 specific state and this code is used by ipv6 too. Use an operations vector to solve this, and this also paves the way for ipv6 support for non-wild saddr hashing in UDP. Signed-off-by: David S. Miller commit a2af421f1819946556c6f467b1efdd0dc84af4d5 Author: Alex Villac�s Lasso Date: Wed May 9 16:18:21 2007 -0700 [IrDA]: KingSun/DonShine USB IrDA dongle support. This dongle does not follow the usb-irda specification, so it needs its own special driver. In addition, it uses interrupt endpoints instead of bulk ones as the rest of USB IrDA dongles supported by Linux (just to be different?) and data reads need to be parsed to extract the valid bytes before being unwrapped (details in the comment at the start of the source). No speed commands have been discovered for this dongle, and I suspect it does not have any at all. On plugin, this dongle reports vendor and device IDs: 0x07c0:0x4200 . The Windows driver that is used normally to control this dongle has a filename of DSIR620.SYS . Signed-off-by: Alex Villac�s Lasso Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 9a6bf6fe716ea09160ee11660ee66a930167692b Author: YOSHIFUJI Hideaki Date: Wed May 9 14:03:28 2007 -0700 [IPV6] ROUTE: Assign rt6i_idev for ip6_{prohibit,blk_hole}_entry. I think this is less critical, but is also suitable for -stable release. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e76b2b2567b83448c2ee85a896433b96150c92e6 Author: YOSHIFUJI Hideaki Date: Wed May 9 14:01:59 2007 -0700 [IPV6]: Do no rely on skb->dst before it is assigned. Because skb->dst is assigned in ip6_route_input(), it is really bad to use it in hop-by-hop option handler(s). Closes: Bug #8450 (Eric Sesterhenn ) Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 5bb1ab09e4f6287c0b6c9cdbd463147cbd003f54 Author: David L Stevens Date: Wed May 9 13:53:44 2007 -0700 [IPV6]: Send ICMPv6 error on scope violations. When an IPv6 router is forwarding a packet with a link-local scope source address off-link, RFC 4007 requires it to send an ICMPv6 destination unreachable with code 2 ("not neighbor"), but Linux doesn't. Fix below. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit ac40e41f4ddec8882d3f7bc8fa98a4fce8796aff Author: Vlad Yasevich Date: Wed May 9 13:52:35 2007 -0700 [SCTP]: Do not include ABORT chunk header in the notification. The socket API draft is unclear about whether to include the chunk header or not. Recent discussion on the sctp implementors mailing list clarified that the chunk header shouldn't be included, but the error parameter header still needs to be there. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 70b57b814ed5a93bf21d9dc5f8a7d23620a77e44 Author: Vlad Yasevich Date: Wed May 9 13:51:31 2007 -0700 [SCTP]: Correctly copy addresses in sctp_copy_laddrs I broke the non-wildcard case recently. This is to fixes it. Now, explictitly bound addresses can ge retrieved using the API. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 8dc4984a6bdcaf56cdb458a7338c32c16f32540c Author: Vlad Yasevich Date: Wed May 9 13:50:20 2007 -0700 [SCTP]: Prevent OOPS if hmac modules didn't load SCTP was checking for NULL when trying to detect hmac allocation failure where it should have been using IS_ERR. Also, print a rate limited warning to the log telling the user what happend. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit d9568ba91b1fdd1ea4fdbf9fcc76b867cca6c1d5 Author: Herbert Xu Date: Wed May 9 00:17:30 2007 -0700 [NET] link_watch: Always schedule urgent events Urgent events may be delayed if we already have a non-urgent event queued for that device. This patch changes this by making sure that an urgent event is always looked at immediately. I've replaced the LW_RUNNING flag by LW_URGENT since whether work is scheduled is already kept track by the work queue system. The only complication is that we have to provide some exclusion for the setting linkwatch_nextevent which is available in the actual work function. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit db0ccffed91e234cad99a35f07d5a322f410baa2 Author: Herbert Xu Date: Tue May 8 23:22:43 2007 -0700 [NET] link_watch: Eliminate potential delay on wrap-around When the jiffies wrap around or when the system boots up for the first time, down events can be delayed indefinitely since we no longer update linkwatch_nextevent when only urgent events are processed. This patch fixes this by setting linkwatch_nextevent when a wrap-around occurs. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4cd8c9e87be7ea891050ff1bebbf767a837eb5cf Author: Krishna Kumar Date: Tue May 8 18:57:50 2007 -0700 [NET_SCHED]: teql_enqueue can check limits before skb enqueue Optimize teql_enqueue so that it first checks limits before enqueing. Signed-off-by: Krishna Kumar Signed-off-by: David S. Miller commit 5b323edbf9daf287fed50dcc63a85589ba24887b Author: Geert Uytterhoeven Date: Tue May 8 18:40:27 2007 -0700 [MAC80211]: include instead of | CC net/mac80211/ieee80211_sta.o | In file included from linux/net/mac80211/ieee80211_sta.c:31: | include2/asm/delay.h: In function '__const_udelay': | include2/asm/delay.h:33: error: 'loops_per_jiffy' undeclared (first use in this function) | include2/asm/delay.h:33: error: (Each undeclared identifier is reported only once | include2/asm/delay.h:33: error: for each function it appears in.) Signed-off-by: Geert Uytterhoeven Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 294cc44b7e48a6e7732499eebcf409b231460d8e Author: Herbert Xu Date: Tue May 8 18:36:28 2007 -0700 [NET]: Remove link_watch delay for up even when we're down Currently all link carrier events are delayed by up to a second before they're processed to prevent link storms. This causes unnecessary packet loss during that interval. In fact, we can achieve the same effect in preventing storms by only delaying down events and unnecssary up events. The latter is defined as up events when we're already up. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 572a103ded0ad880f75ce83e99f0512fbb80b5b0 Author: Herbert Xu Date: Tue May 8 18:34:17 2007 -0700 [NET] link_watch: Move link watch list into net_device These days the link watch mechanism is an integral part of the network subsystem as it manages the carrier status. So it now makes sense to allocate some memory for it in net_device rather than allocating it on demand. In fact, this is necessary because we can't tolerate a memory allocation failure since that means we'd have to potentially throw a link up event away. It also simplifies the code greatly. In doing so I discovered a subtle race condition in the use of singleevent. This race condition still exists (and is somewhat magnified) without singleevent but it's now plugged thanks to an smp_mb__before_clear_bit. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c33be3c362f1bc98f6e2d731a274ef138ae80741 Author: Marcel Holtmann Date: Wed May 9 09:15:45 2007 +0200 [Bluetooth] Fix unintentional fall-through in HCI line discipline A trivial fix to (what looks like) an unintentional fall-through in the HCI line discipline. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Marcel Holtmann commit 22ad42033b7d2b3d7928fba9f89d1c7f8a3c9581 Author: Marcel Holtmann Date: Wed May 9 09:15:40 2007 +0200 [Bluetooth] Fix NULL pointer dereference in HCI line discipline Normally a serial Bluetooth device is opened, TIOSETD'ed to N_HCI line discipline, HCIUARTSETPROTO'ed and finally closed. In case the device fails to HCIUARTSETPROTO, closing it produces a NULL pointer dereference. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Marcel Holtmann commit d215874460e7657b8e104de024140e0932690450 Author: Marcel Holtmann Date: Wed May 9 09:15:35 2007 +0200 [Bluetooth] Add HCIUARTGETDEVICE support for HCI line discipline Adding HCIUARTGETDEVICE makes it possible to get the HCI device number that is attached to a given serial device. This is required during the initialization process of some Bluetooth chips. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Marcel Holtmann commit 5be3946647424b08db0f62c545215cf506af8a52 Author: Marcel Holtmann Date: Wed May 9 09:15:30 2007 +0200 [Bluetooth] Switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers and do not use kfree() on input device, use input_free_device() instead. Signed-off-by: Dmitry Torokhov Signed-off-by: Marcel Holtmann commit 129a84de2347002f09721cda3155ccfd19fade40 Author: J. Bruce Fields Date: Thu May 10 18:38:43 2007 -0400 locks: fix F_GETLK regression (failure to find conflicts) In 9d6a8c5c213e34c475e72b245a8eb709258e968c we changed posix_test_lock to modify its single file_lock argument instead of taking separate input and output arguments. This makes it no longer safe to set the output lock's fl_type to F_UNLCK before looking for a conflict, since that means searching for a conflict against a lock with type F_UNLCK. This fixes a regression which causes F_GETLK to incorrectly report no conflict on most filesystems (including any filesystem that doesn't do its own locking). Also fix posix_lock_to_flock() to copy the lock type. This isn't strictly necessary, since the caller already does this; but it seems less likely to cause confusion in the future. Thanks to Doug Chapman for the bug report. Signed-off-by: "J. Bruce Fields" Acked-by: Doug Chapman Signed-off-by: Linus Torvalds commit e3318fb40092fecbf5069e7a5daa0040a427d1b4 Author: Tony Lindgren Date: Thu May 10 16:32:54 2007 -0700 ARM: OMAP: Fix section mismatch warning Fix section mismatch warning Signed-off-by: Tony Lindgren commit 7bbb3cc5c816fc167601ce9519adae5eced3ea6d Author: Kyungmin Park Date: Wed Dec 6 17:13:54 2006 -0800 ARM: OMAP: 24xx pinmux updates Add some OMAP 24xx pin mux declarations to support: - TUSB 6010 EVM (on H4) - All three full speed USB ports - GPIOs used with USB0 on Apollon and H4 For OMAP2, issue MUX_WARNINGS and debug messages correctly; and make the message look more like the OMAP1 message. Signed-off-by: Kyungmin Park Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit d30c7369666ff1687f668ea5a65b99d1f7e06144 Author: Tony Lindgren Date: Thu May 10 15:50:16 2007 -0700 ARM: OMAP: Remove old PM_SUSPEND_DISK Remove old PM_SUSPEND_DISK. Also some minor cosmetic clean-up. Signed-off-by: Tony Lindgren commit 0695de32579edefd137f7e9fa056e6d204011d70 Author: Tony Lindgren Date: Mon May 7 18:24:14 2007 -0700 ARM: OMAP: Fix warning in dma.c Fix warning: 'offset' might be uninitialized Signed-off-by: Tony Lindgren commit d9de2622bd4fd29cab4ef7db66a9f916cb38e032 Author: Simon Horman Date: Thu May 10 11:51:11 2007 -0700 Allow compat_ioctl.c to compile without CONFIG_NET A small regression appears to have been introduced in the recent patch "cleanup compat ioctl handling", which was included in Linus' tree after 2.6.20. siocdevprivate_ioctl() is no longer defined if CONFIG_NET is undefined, whereas previously it was a dummy function in this case. This causes compilation with CONFIG_COMPAT but without CONFIG_NET to fail. fs/compat_ioctl.c: In function `compat_sys_ioctl': fs/compat_ioctl.c:3571: warning: implicit declaration of function `siocdevprivate_ioctl' Cc: Christoph Hellwig Acked-by: Arnd Bergmann Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 643bd27298bdcc4e75b3e6a7ca459675eb5378c3 Author: Frederik Deweerdt Date: Thu May 10 11:51:08 2007 -0700 Fix ixp4xx compile error drivers/input/misc/ixp4xx-beeper.c: In function 'ixp4xx_spkr_event': drivers/input/misc/ixp4xx-beeper.c:54: error: 'input_dev' undeclared (first use in this function) drivers/input/misc/ixp4xx-beeper.c:54: error: (Each undeclared identifier is reported only once drivers/input/misc/ixp4xx-beeper.c:54: error: for each function it appears in.) Signed-off-by: Frederik Deweerdt Acked-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e3d32770204ea24cf71919a90d9ccfc2bd407dd Author: Tony Luck Date: Thu May 10 13:23:05 2007 -0700 [IA64] drivers/char/snsc_event.c:206: warning: unused variable `p' Signed-off-by: Tony Luck commit 34eac2abcba1c07c47bfff86701a4f80f5553fa6 Author: Tony Luck Date: Thu May 10 13:20:19 2007 -0700 [IA64] mca.c:121: warning: 'cpe_poll_timer' defined but not used Only shows up while building sim_defconfig because CONFIG_ACPI=n there, and all of the uses of cpe_poll_timer are inside #ifdef CONFIG_ACPI. Signed-off-by: Tony Luck commit 9a86bbb90f3c42e10fce2b9634961ec18f5ca2cb Author: Tony Luck Date: Thu May 10 11:57:58 2007 -0700 [IA64] Fix - Section mismatch: reference to .init.data:mvec_name machvec_init() should be __init. And then so should hwsw_init(). Signed-off-by: Tony Luck commit b9ae3bd255c3e25880b60a997f1b34ad9535b249 Author: Tony Luck Date: Thu May 10 11:47:38 2007 -0700 [IA64] more warning cleanups arch/ia64/sn/kernel/xpc_partition.c:578: warning: long unsigned int format, different type arg (arg 3) arch/ia64/sn/kernel/xpnet.c:349: warning: int format, different type arg (arg 7) arch/ia64/sn/kernel/xpnet.c:349: warning: int format, different type arg (arg 8) Signed-off-by: Tony Luck commit 472118e63de7938c89f0f4fd3e0a80986e4c600f Author: Tony Luck Date: Thu May 10 09:44:42 2007 -0700 [IA64] Wire up epoll_pwait and utimensat Another day, another pair of new system calls. Signed-off-by: Tony Luck commit 34ef30ca4a0b7f8c0efc97a4a1355a4c4300c2ff Author: Tony Luck Date: Thu May 10 09:39:41 2007 -0700 [IA64] Fix warnings resulting from type-checking in dev_dbg() Lots of places where we passed a "struct pci_device *" rather than a "struct device *". One place where we used a "%s" in the format, but forgot to provide an argument. Acked-by: John Keller Signed-off-by: Tony Luck commit 8ee4dc393b90c4bce313ef1044d068b9e68e1b5f Author: Tony Luck Date: Thu May 10 09:35:30 2007 -0700 [IA64] typo s/kenrel/kernel/ Spotted by alert reader Robert Day. Signed-off-by: Tony Luck commit e9910846fdb19f7c5810cbe4c95e4ca6dab6a00f Author: akpm@linux-foundation.org Date: Thu May 10 03:16:01 2007 -0700 timer: revert parenthesis fix in tbase_get_deferrable() etc On 09-05-2007 21:10, Pallipadi, Venkatesh wrote: ... > On a 64 bit system, converting pointer to int causes unnecessary > compiler warning, and intermediate long conversion was to avoid that. > I will have to rephrase my comment to remove 32 bit value and use int, > as that is what the function returns. So, this patch reverts all changes done by my previous patch. I apologize for my wrong comment about "logical error" here. Cc: "Pallipadi, Venkatesh" Cc: Satyam Sharma Cc: Oleg Nesterov Signed-off-by: Jarek Poplawski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c91e23c63f77a7643d857a082248cf2cdb71b67c Author: Alexey Dobriyan Date: Thu May 10 03:15:58 2007 -0700 i2c-at91: compile fix (IS_ERR) CC drivers/i2c/busses/i2c-at91.o drivers/i2c/busses/i2c-at91.c: In function 'at91_i2c_probe': drivers/i2c/busses/i2c-at91.c:213: warning: implicit declaration of function 'IS_ERR' Signed-off-by: Alexey Dobriyan Cc: David Brownell Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e99806ebb33c1b4906ce4f99eec65d4962f12b9 Author: David Brownell Date: Thu May 10 03:15:52 2007 -0700 i2c-at91 supports new-style i2c drivers Make i2c-at91 register as i2c adapter zero (none of these chips seem to have more than one TWI controllers) to let it kick in any board-specific device declarations; also make it hotplug/coldplug. Signed-off-by: David Brownell Acked-by: Jean Delvare Cc: Andrew Victor Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd00a99e7a4b739bd41ef4093760efc7e447f963 Author: NeilBrown Date: Thu May 10 03:15:50 2007 -0700 md: avoid a possibility that a read error can wrongly propagate through md/raid1 to a filesystem. When a raid1 has only one working drive, we want read error to propagate up to the filesystem as there is no point failing the last drive in an array. Currently the code perform this check is racy. If a write and a read a both submitted to a device on a 2-drive raid1, and the write fails followed by the read failing, the read will see that there is only one working drive and will pass the failure up, even though the one working drive is actually the *other* one. So, tighten up the locking. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5ddb547e899993be56dc7d0bf72bfd7a8d4ae1e Author: Dmitry Torokhov Date: Thu May 10 03:15:47 2007 -0700 drivers/hwmon: switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Signed-off-by: Dmitry Torokhov Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcf889f96597137760c6edfdd0ee59fd37cb108c Author: Christoph Lameter Date: Thu May 10 03:15:44 2007 -0700 SLUB: remove nr_cpu_ids hack This was in SLUB in order to head off trouble while the nr_cpu_ids functionality was not merged. Its merged now so no need to still have this. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4751a2797bc0a37a8e85783d65ffaa9de689e60 Author: Christoph Lameter Date: Thu May 10 03:15:40 2007 -0700 SLUB: SLUB_DEBUG must depend on SLUB Otherwise people get asked about SLUB_DEBUG even if they have another slab allocator enabled. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a18c92aab13aac7917bc87ceefa23da68698be4 Author: Eric W. Biederman Date: Thu May 10 03:15:36 2007 -0700 Revert "[PATCH] paravirt: Add startup infrastructure for paravirtualization" This reverts commit c9ccf30d77f04064fe5436027ab9d2230c7cdd94. Entering the kernel at startup_32 without passing our real mode data in %esi, and without guaranteeing that physical and virtual addresses are identity mapped makes head.S impossible to maintain. The only user of this infrastructure is lguest which is not merged so nothing we currently support will break by removing this over designed nightmare, and only the pending lguest patches will be affected. The pending Xen patches have a different entry point that they use. We are currently discussing what Xen and lguest need to do to boot the kernel in a more normal fashion so using startup_32 in this weird manner is clearly not their long term direction. So let's remove this code in head.S before it causes brain damage to people trying to maintain head.S Cc: Chris Wright Cc: Andi Kleen Cc: Jeremy Fitzhardinge Cc: Zachary Amsden CC: H. Peter Anvin Signed-off-by: Eric W. Biederman Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cfe61e1a72b345073bb7900a7887da8541abc7a Author: Russell King Date: Thu May 10 03:15:32 2007 -0700 arm: fix i2c-pxa build From commit 7d054817b780e664bed6701b2aa637718e1905b7: > According to the PXA27x developer's manual, we shall do so. We shall also at least compile test our changes. Signed-off-by: Russell King Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4a7f5eb5f6a02dcc3a35e47c37c3d221ebc1cc2 Author: Randy Dunlap Date: Thu May 10 03:15:30 2007 -0700 ocfs2: kobject/kset foobar Fix gcc warning and Oops that it causes: fs/ocfs2/cluster/masklog.c:161: warning: assignment from incompatible pointer type [ 2776.204120] OCFS2 Node Manager 1.3.3 [ 2776.211729] BUG: spinlock bad magic on CPU#0, modprobe/4424 [ 2776.214269] lock: ffff810021c8fe18, .magic: ffffffff, .owner: /6394416, .owner_cpu: 0 [ 2776.217864] [ 2776.217865] Call Trace: [ 2776.219662] [] spin_bug+0x9e/0xe9 [ 2776.221921] [] _raw_spin_lock+0x23/0xf9 [ 2776.224417] [] _spin_lock+0x9/0xb [ 2776.226676] [] kobject_shadow_add+0x98/0x1ac [ 2776.229367] [] kobject_add+0xb/0xd [ 2776.231665] [] kset_add+0xd/0xf [ 2776.233845] [] kset_register+0x23/0x28 [ 2776.236309] [] :ocfs2_nodemanager:mlog_sys_init+0x68/0x6d [ 2776.239518] [] :ocfs2_nodemanager:o2cb_sys_init+0x32/0x4a [ 2776.242726] [] :ocfs2_nodemanager:init_o2nm+0xa6/0xd5 [ 2776.245772] [] sys_init_module+0x1471/0x15d2 [ 2776.248465] [] simple_strtoull+0x0/0xdc [ 2776.250959] [] system_call+0x7e/0x83 Signed-off-by: Randy Dunlap Acked-by: Mark Fasheh Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f076f5dd9d227cea2704061048894b00cc0d62b Author: Stephen Rothwell Date: Thu May 10 03:15:27 2007 -0700 early_pfn_to_nid needs to be __meminit Since it is referenced by memmap_init_zone (which is __meminit) via the early_pfn_in_nid macro when CONFIG_NODES_SPAN_OTHER_NODES is set (which basically means PowerPC 64). This removes a section mismatch warning in those circumstances. Signed-off-by: Stephen Rothwell Cc: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6a62b69b9f1b0cec0a119c5f4cd2f17d091e8f5 Author: David Howells Date: Thu May 10 03:15:25 2007 -0700 AF_RXRPC: reduce debugging noise Reduce debugging noise generated by AF_RXRPC. Signed-off-by: David Howells Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bbf5d39f88af9e8173f7331a3741a8b3ff16a1c Author: David Howells Date: Thu May 10 03:15:23 2007 -0700 AFS: further write support fixes Further fixes for AFS write support: (1) The afs_send_pages() outer loop must do an extra iteration if it ends with 'first == last' because 'last' is inclusive in the page set otherwise it fails to send the last page and complete the RxRPC op under some circumstances. (2) Similarly, the outer loop in afs_pages_written_back() must also do an extra iteration if it ends with 'first == last', otherwise it fails to clear PG_writeback on the last page under some circumstances. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9b1f8d5930a813879278d0cbfc8c658d6a038dc Author: David Howells Date: Thu May 10 03:15:21 2007 -0700 AFS: write support fixes AFS write support fixes: (1) Support large files using the 64-bit file access operations if available on the server. (2) Use kmap_atomic() rather than kmap() in afs_prepare_page(). (3) Don't do stuff in afs_writepage() that's done by the caller. [akpm@linux-foundation.org: fix right shift count >= width of type] Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218e180e7ea5334e1f94121940ba82cd1f0f4e58 Author: Andrew Morton Date: Thu May 10 03:15:18 2007 -0700 add upper-32-bits macro We keep on getting "right shift count >= width of type" warnings when doing things like sector_t s; x = s >> 56; because with CONFIG_LBD=n, s is only 32-bit. Similar problems can occur with dma_addr_t's. So add a simple wrapper function which code can use to avoid this warning. The above example would become x = upper_32_bits(s) >> 24; The first user is in fact AFS. Cc: James Bottomley Cc: "Cameron, Steve" Cc: "Miller, Mike (OS Dev)" Cc: Hisashi Hifumi Cc: Alan Cox Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894b8788d7f265eb7c6f75a9a77cedeb48f51586 Author: Christoph Lameter Date: Thu May 10 03:15:16 2007 -0700 slub: support concurrent local and remote frees and allocs on a slab Avoid atomic overhead in slab_alloc and slab_free SLUB needs to use the slab_lock for the per cpu slabs to synchronize with potential kfree operations. This patch avoids that need by moving all free objects onto a lockless_freelist. The regular freelist continues to exist and will be used to free objects. So while we consume the lockless_freelist the regular freelist may build up objects. If we are out of objects on the lockless_freelist then we may check the regular freelist. If it has objects then we move those over to the lockless_freelist and do this again. There is a significant savings in terms of atomic operations that have to be performed. We can even free directly to the lockless_freelist if we know that we are running on the same processor. So this speeds up short lived objects. They may be allocated and freed without taking the slab_lock. This is particular good for netperf. In order to maximize the effect of the new faster hotpath we extract the hottest performance pieces into inlined functions. These are then inlined into kmem_cache_alloc and kmem_cache_free. So hotpath allocation and freeing no longer requires a subroutine call within SLUB. [I am not sure that it is worth doing this because it changes the easy to read structure of slub just to reduce atomic ops. However, there is someone out there with a benchmark on 4 way and 8 way processor systems that seems to show a 5% regression vs. Slab. Seems that the regression is due to increased atomic operations use vs. SLAB in SLUB). I wonder if this is applicable or discernable at all in a real workload?] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b67325a6d34f2ae67484a8802b6ffc9ce9931d Author: Mathieu Desnoyers Date: Thu May 10 03:15:15 2007 -0700 x86_64: fix default_do_nmi() missing return after an if () Signed-off-by: Mathieu Desnoyers Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d79406dd140a3e6eed6f26b17f0c6620fe30b50c Author: Kristian Høgsberg Date: Wed May 9 19:23:15 2007 -0400 firewire: Convert OHCI driver to use standard goto unwinding for error handling. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 2d826cc5c791bdc5f5651324c485746be9492be0 Author: Kristian Høgsberg Date: Wed May 9 19:23:14 2007 -0400 firewire: Always use parens with sizeof. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 213d7bbd76673fb1b26f1786af180bac07e57652 Author: Kristian Høgsberg Date: Wed May 9 19:23:11 2007 -0400 firewire: Drop single buffer request support. The SCSI layer only passes sg requests down, so drop the use_sg == 0, request_bufflen != 0 case. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 36abb3b18e26bf980e8529512853c5d73971a48b Author: Kristian Høgsberg, Stefan Richter Date: Wed May 9 19:23:10 2007 -0400 firewire: Add a comment to describe why we split the sg list. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit e1b68c4dcfb8bb7d79b6771e48767039ffbe00a8 Author: Kristian Høgsberg Date: Wed May 9 19:23:09 2007 -0400 firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 95ffc5e314e2bba87ec012c6e3adc487c5a7b4bb Author: Kristian Høgsberg Date: Wed May 9 19:23:08 2007 -0400 firewire: Handle the last few DMA mapping error cases. This should be the last missing checks. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit ad85274fb7f1b3c8c03f6f516dc6196a19ea4296 Author: Kristian Høgsberg Date: Wed May 9 19:23:07 2007 -0400 firewire: Allocate scsi_host up front and allocate the sbp2_device as hostdata. Avoids an extra allocation and simplifies lifetime rules for the scsi_host. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 1e4c7b0dabb46eb3a2a15cf5efbd3945b13373a0 Author: Olaf Hering Date: Sat May 5 23:17:13 2007 +0200 firewire: Provide module aliase for backwards compatibility. This patch loads fw-sbp2 if sbp2 is still in the config file. So one can go back and forth between releases without worry about the root filesystem drivers. Signed-off-by: Kristian Hoegsberg Existing mkinitrd scripts still have to be adapted, unless they grok module aliases. Signed-off-by: Stefan Richter commit 58e313b36237ec0a2dc12fd4f7f06d875ce54bd1 Author: Kristian Høgsberg Date: Mon May 7 20:33:38 2007 -0400 firewire: Add to fw-core-y instead of assigning fw-core-objs in Makefile. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 4c5a443e80e6d85e5c84a56bf30b61fe84c1f292 Author: Kristian Høgsberg Date: Mon May 7 20:33:37 2007 -0400 firewire: Break out shared IEEE1394 constant to separate header file. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 04dfb8dbd200c574b2f292146ef817d9745c8936 Author: Kristian Høgsberg Date: Mon May 7 20:33:36 2007 -0400 firewire: Use linux/*.h instead of asm/*.h header files. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit a77754a75d58d534fd34a5add8ac1bb91d4ffc0f Author: Kristian Høgsberg Date: Mon May 7 20:33:35 2007 -0400 firewire: Uppercase most macro names. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit a98e27198771d066934a263177673ebde797e8fb Author: Kristian Høgsberg Date: Mon May 7 20:33:34 2007 -0400 firewire: Coding style cleanup: no spaces after function names. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 6a5033be96edb3536d158072ee796393fdffe1ca Author: Kristian Høgsberg Date: Mon May 7 20:33:33 2007 -0400 firewire: Convert card_rwsem to a regular mutex. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit c781c06d119d04601727f2fbc30151e6760d536d Author: Kristian Høgsberg Date: Mon May 7 20:33:32 2007 -0400 firewire: Clean up comment style. Drop filenames from file preamble, drop editor annotations and use standard indent style for block comments. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter (fixed typo) commit e175569c4639872b5cf242c9d4a71cc40c5f3c29 Author: Kristian Høgsberg Date: Mon May 7 20:33:31 2007 -0400 firewire: Use lib/ implementation of CRC ITU-T. With the CRC ITU-T implementation available in lib/ we can use that instead. This also fixes a bug in the topology map crc computation. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter (fixed Kconfig) commit 3e7cbae7c6dda18d427335b3ad98f1a0d40ef30c Author: Ivo van Doorn Date: Mon Jun 12 16:17:04 2006 +0200 CRC ITU-T V.41 This will add the CRC calculation according to the CRC ITU-T V.41 to the kernel lib/ folder. This code has been derived from the rt2x00 driver, currently found only in the wireless-dev tree, but this library is generic and could be used by more drivers who currently use their own implementation. Signed-off-by: Ivo van Doorn Also useful for the new firewire stack. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 906fc9e92f0e8b618d4025c3aa6289415ecd8152 Author: Martin Schwidefsky Date: Thu May 10 15:46:02 2007 +0200 [S390] update default configuration. Signed-off-by: Martin Schwidefsky commit f54bfc0e34dbd15e9df099a8e36a346c6c583f3c Author: Martin Schwidefsky Date: Thu May 10 15:46:01 2007 +0200 [S390] Kconfig: no wireless on s390. Hide the config menues for wireless on s390. Cc: John W. Linville Signed-off-by: Martin Schwidefsky commit 61d48c2c31799ab9dbddbbcfccfd8042a5c6b75a Author: Martin Schwidefsky Date: Thu May 10 15:46:00 2007 +0200 [S390] Kconfig: use common Kconfig files for s390. Disband drivers/s390/Kconfig, use the common Kconfig files. The s390 specific config options from drivers/s390/Kconfig are moved to the respective common Kconfig files. Signed-off-by: Martin Schwidefsky commit abf3ea1b549afc62dc7304fddab1cdaf23d0cc84 Author: Martin Schwidefsky Date: Thu May 10 15:45:59 2007 +0200 [S390] Kconfig: common config options for s390. Disable some configuration options in the common Kconfig files that are of no interest to a s390 machine. Enable hangcheck timer. Signed-off-by: Martin Schwidefsky commit 9556fb73edfc37410cab3b47ae5e94bcecd8edf2 Author: Martin Schwidefsky Date: Thu May 10 15:45:58 2007 +0200 [S390] Kconfig: unwanted menus for s390. Disable some more menus in the configuration files that are of no interest to a s390 machine. Signed-off-by: Martin Schwidefsky commit e25df1205f37c7bff3ab14fdfc8a5249f3c69c82 Author: Martin Schwidefsky Date: Thu May 10 15:45:57 2007 +0200 [S390] Kconfig: menus with depends on HAS_IOMEM. Add "depends on HAS_IOMEM" to a number of menus to make them disappear for s390 which does not have I/O memory. Signed-off-by: Martin Schwidefsky commit eeca7a36a86db8bfc1945dd7f6f0c22a6b66b31d Author: Martin Schwidefsky Date: Thu May 10 15:45:56 2007 +0200 [S390] Kconfig: refine depends statements. Refine some depends statements to limit their visibility to the environments that are actually supported. Signed-off-by: Martin Schwidefsky commit 490f03d6595fade75a9b26e6ea9c9ebb1e4fd05a Author: Heiko Carstens Date: Thu May 10 15:45:48 2007 +0200 [S390] Avoid compile warning. arch/s390/mm/fault.c: In function `signal_return': arch/s390/mm/fault.c:256: warning: unused variable `compat' Signed-off-by: Heiko Carstens commit 853944cc40ef563f4046a0ada4c1e391419f6a25 Author: Ursula Braun Date: Thu May 10 15:45:47 2007 +0200 [S390] qdio: re-add lost perf_stats.tl_runs change in qdio_handle_pci Statement has been inadvertently lost with commit 00c0c6466c66bdf05f2a3dcf59e6895179ea8b76. Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit 763968e217c6657afaff90fbbec93531b3d6ce70 Author: Heiko Carstens Date: Thu May 10 15:45:46 2007 +0200 [S390] Avoid sparse warnings. Monthly sparse warning avoidance patch. Sigh. Signed-off-by: Heiko Carstens commit aaff0f644a182015622d7686a66986319a1085d1 Author: Cornelia Huck Date: Thu May 10 15:45:45 2007 +0200 [S390] dasd: Fix modular build. Add missing export of dasd_generic_read_dev_chars(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 9b0c455a04d73d8ffa388a1006925620ad684ad8 Author: Martin Schwidefsky Date: Thu May 10 15:45:44 2007 +0200 [S390] monreader inlining cleanup. Signed-off-by: Martin Schwidefsky commit f7e5d67c7928bfdbcdfd95a0b3d75122238e23e0 Author: Cornelia Huck Date: Thu May 10 15:45:43 2007 +0200 [S390] cio: Make some structures and a function static. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 9a92fe48b92993bb3d20fd7021e22a1ab8a473df Author: Cornelia Huck Date: Thu May 10 15:45:42 2007 +0200 [S390] cio: Get rid of _ccw_device_get_device_number(). The function shouldn't have existed in the first place (not MSS-aware). Introduce a new function ccw_device_get_id() that extracts the ccw_dev_id structure of a ccw device and convert all users of _ccw_device_get_device_number to ccw_device_get_id. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 0b0bb3c6bd66bd28062a71c2ca3878d31e2081ee Author: Cornelia Huck Date: Thu May 10 15:45:41 2007 +0200 [S390] fix subsystem removal fallout This patch fixes compilation on s390 after the removal of struct subsystem. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f64071200acc124bd0d641ef7d750f38fbf5f8b8 Author: Paul Mackerras Date: Thu May 10 22:17:18 2007 +1000 [POWERPC] Fix compile error with kexec and CONFIG_SMP=n Commit 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f moved the definition of hard_smp_processor_id() for the UP case from include/linux/smp.h to include/asm/smp.h. However, include/linux/smp.h only includes include/asm/smp.h in the SMP case, so code that wants to use hard_smp_processor_id() has to include explicitly to be sure of getting the definition. Signed-off-by: Paul Mackerras commit 40472a55461a672c929a092e648f6c5d21c9c310 Author: Michael Ellerman Date: Thu May 10 17:06:30 2007 +1000 [POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning If CONFIG_BLK_DEV_INITRD is not defined the prop variable in early_init_dt_scan_chosen() is unused, causing a compiler warning. So split the initrd logic into a separate function, allowing us to declare prop only when we need it. Built for both cases and booted with an initrd. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 2454c7e98c0dd0aff29dfe1ee369801507f4d6a5 Author: Paul Mackerras Date: Thu May 10 15:28:44 2007 +1000 [POWERPC] Fix warning in hpte_decode(), and generalize it This adds the necessary support to hpte_decode() to handle 1TB segments and 16GB pages, and removes an uninitialized value warning on avpn. We don't have any code to generate HPTEs for 1TB segments or 16GB pages yet, so this is mostly for completeness, and to fix the warning. Signed-off-by: Paul Mackerras Acked-by: Benjamin Herrenschmidt commit de1132173a81ae11aaa6af11ed9ded5f0c565c87 Author: Michael Neuling Date: Thu May 10 15:16:27 2007 +1000 [POWERPC] Minor pSeries IOMMU debug cleanup pci is not initialized before being used here, so this debug print is bogus at the current location. Move it to where it makes sense. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 6e66837b2669d6c07177ada4db9ec47ce9c31873 Author: Geoff Levand Date: Thu May 10 06:09:14 2007 +1000 [POWERPC] PS3: Fix sys manager build error Fix a PS3 build error when CONFIG_PS3_SYS_MANAGER=n. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 17213c3bf67bd532d4d04c286663f9bbf92b9c18 Author: Linas Vepstas Date: Thu May 10 02:38:11 2007 +1000 [POWERPC] Assorted janitorial EEH cleanups Assorted minor cleanups to EEH code; -- use literals, use kerneldoc format. Signed-off-by: Linas Vepstas ---- arch/powerpc/platforms/pseries/eeh.c | 13 ++++++++++--- arch/powerpc/platforms/pseries/eeh_driver.c | 7 ++++--- include/asm-powerpc/ppc-pci.h | 18 +++++++++++++++--- 3 files changed, 29 insertions(+), 9 deletions(-) Signed-off-by: Paul Mackerras commit 979ee32f7f8e9582a0cadd4ed9a158ddc3036ad1 Author: Stephen Rothwell Date: Thu May 10 02:21:00 2007 +1000 [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID so this declaration is not needed. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 49d687b636c1f7e9a14faab7bd654f9fb88ecd11 Author: Stephen Rothwell Date: Thu May 10 02:19:51 2007 +1000 [POWERPC] pmu_sys_suspended is only defined for PPC32 thus we get a link error on ppc64 with CONFIG_PM=y. This fixes it. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 31e92e0a1f40ecbef415cd99dc886b14963dc594 Author: Paul Mackerras Date: Wed May 9 21:47:15 2007 +1000 [POWERPC] Fix incorrect calculation of I/O window addresses My patch "Cope with PCI host bridge I/O window not starting at 0" introduced a bug in the calculation of the virtual addresses for the I/O windows of PCI host bridges other than the first, because it didn't account for the fact that hose->io_resource gets offset so that it reflects the range of global I/O port numbers assigned to the bridge. This fixes it and simplifies get_bus_io_range() in the process. Signed-off-by: Paul Mackerras commit 4cc81aac8bd2022d5365ad23b7ce6406676e0aa8 Author: Ishizaki Kou Date: Wed May 9 17:41:16 2007 +1000 [POWERPC] celleb: Update celleb_defconfig Updates for celleb_defconfig. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit b4f8b1087f0413f6f2a2423da66eed5c1fb70b06 Author: Ishizaki Kou Date: Wed May 9 17:38:03 2007 +1000 [POWERPC] celleb: Fix parsing of machine type hack command line option This is a bugfix to install Fedora Core 6 by using kernel command line 'celleb_machine_type_hack=CHRP'. Yes, this is a one-character fix to add forgotten '='. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit 0f6e74a3e0c5e805d5f67f7631259c886158a47b Author: Ishizaki Kou Date: Wed May 9 17:36:40 2007 +1000 [POWERPC] celleb: Fix PCI config space accesses to subordinate buses Checking whether bus->self is NULL is not enough to know "bus" is the primary bus. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit d1af5b4ea970d8cccdacf243ae42899f3784ad85 Author: Ishizaki Kou Date: Wed May 9 17:34:08 2007 +1000 [POWERPC] celleb: Fix support for multiple PCI domains Celleb has multiple PCI host bridges (phbs). Previous boot logic gives non-overlapped bus IDs between PCI host bridges so you can identify PHB by bus ID. But newer boot logic gives same bus ID between PHBs (it gives bus ID 0 as root bus.) So we have to set 'phb->buid' as non-zero. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit ab5570f093585a124cd440f5229393e36c5d600e Author: Stephen Rothwell Date: Wed May 9 17:32:33 2007 +1000 [POWERPC] Wire up sys_utimensat Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 26e6385f14b991e30450daee4348cbbc4bc4bb09 Author: David S. Miller Date: Thu May 10 02:16:27 2007 -0700 [SPARC64]: Use alloc_pci_dev() in PCI bus probes. Otherwise MSI explodes because pci_msi_init_pci_dev() does not get invoked. Signed-off-by: David S. Miller commit 9245df0cd385419f9cdd83512feb80bbb719417e Author: David S. Miller Date: Thu May 10 00:55:59 2007 -0700 [SPARC64]: Bump PROMINTR_MAX to 32. Some devices have more than 15 which was the previous setting. Signed-off-by: David S. Miller commit aa5242e78f8667ba771e4c0d44bf45871abceb7e Author: David S. Miller Date: Thu May 10 00:53:29 2007 -0700 [SPARC64]: Fix recursion in PROM tree building. Use iteration for scanning of PROM node siblings. Based upon a patch by Greg Onufer, who found this bug. Signed-off-by: David S. Miller commit 00eb43a1897a8845d0edb198cec69ac5f1f299dd Author: Lennart Poettering Date: Fri May 4 14:16:19 2007 +0200 acpi,msi-laptop: Fall back to EC polling mode for MSI laptop specific EC commands The ACPI EC that is used in MSI laptops knows some non-standard commands for changing the screen brighntess and a few other things, which are used by the msi-laptop.c driver. Unfortunately for these commands no GPE events for IBF and OBF are triggered. Since nowadays the EC code uses the ec_intr=1 mode by default, this causes these operations to timeout, although they don't fail. In result, all operations that you can do with the msi-laptop.c driver take more or less 1s to complete, which is awfully slow. In one of the more recent kernels (2.6.20?) the EC subsystem has been revamped. With that change the EC timeout has been increased. before that increase the MSI EC accesses were slow -- but not *that* slow, hence I took notice of this limitation of the MSI EC hardware only very recently. The standard EC operations on the MSI EC as defined in the ACPI spec support GPE events properly. The following patch adds a new argument "force_poll" to the ec_transaction() function (and friends). If set to 1, the function will poll for IBF/OBF even if ec_intr=1 is enabled. If set to 0 the current behaviour is used. The msi-laptop driver is modified to make use of this new flag, so that OBF/IBF is polled for the special MSI EC transactions -- but only for them. Signed-off-by: Lennart Poettering Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit cdcb44e87bedcf5070eece61f89f9373a3810031 Author: Jiri Kosina Date: Thu May 10 08:45:56 2007 +0200 USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release() There is a small race window in which hiddev_release() could corrupt the list that is being processed for new event in hiddev_send_event(). Synchronize the operations over this list. Signed-off-by: Jiri Kosina commit a64e62a07097f67108f0b68bc15216c3a4a5299b Author: Mattia Dongili Date: Tue May 1 11:19:53 2007 +0900 sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit f398532722b44aa797915d6b784e8694b277c2c7 Author: Corentin Chary Date: Sun May 6 14:48:22 2007 +0200 asus-laptop: version bump and lindent Version bump, lindent, etc .. Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit 832d995029466e12aef66187bc9103487bf7be9f Author: Corentin Chary Date: Sun May 6 14:47:29 2007 +0200 asus-laptop: fix light sens init Fix a stupid light sens detection bug. Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit e539c2f69ca17f71dd41ba89cde67612a1326c57 Author: Corentin Chary Date: Sun May 6 14:47:06 2007 +0200 asus-laptop: add GPS support Just adds GPS support found in R2H thanks to Sam Lin. It will make a "gps" file in /sys/devices/platform/asus-laptop/. Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit a9dbcb37a45f45813fc64d672a1f7ae6135650b1 Author: Corentin Chary Date: Sun May 6 14:46:41 2007 +0200 asus-laptop: notify ALL events We need to handle all events, because some dsdt use events >= 0x80 Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit 32a56ebb24f23da1bbaf24292acf85b6c04526ab Author: Kumar Gala Date: Wed May 9 23:44:58 2007 -0500 [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning cpm_uart_init_portdesc is referenced from non-init code and thus we were getting the following warning: WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:cpm_uart_init_portdesc from .text between 'cpm_uart_init' (at offset 0x18020) and 'cpm_uart_drv_remove' Signed-off-by: Kumar Gala commit b99ab6a8c7f24d1dd2e435c1d04877bc034a8dd8 Author: Kumar Gala Date: Wed May 9 23:28:17 2007 -0500 [POWERPC] User rheap from arch/powerpc/lib Removed rheap in arch/ppc/lib and changed build system to use the one in arch/powerpc/lib. Signed-off-by: Kumar Gala commit 3fae4210ba620fde5122e4c4f564a85c18901940 Author: Scott Wood Date: Tue May 1 12:49:04 2007 -0500 [POWERPC] 83xx: Fix the PCI ranges in the MPC834x_MDS device tree. The MPC834x_MDS device tree's PCI non-prefetchable MMIO range was specified incorrectly. Both the local and bus addresses start at 0x90000000. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit d985f68e349ef60f69eef269d2f45e90bca619c9 Author: Scott Wood Date: Tue May 1 12:48:47 2007 -0500 [POWERPC] 83xx: Fix the PCI ranges in the MPC832x_MDS device tree. The MPC832x_MDS device tree's PCI non-prefetchable MMIO range was specified incorrectly. Both the local and bus addresses start at 0x90000000. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 1bda8f3056126ccdbe10c747e00dd9e61cca48ca Author: Scott Wood Date: Tue May 8 12:19:21 2007 -0500 [POWERPC] CPM_UART: cpm_uart_set_termios should take ktermios, not termios This eliminates some warnings. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 4c35630ccda56ed494f6102d2e147fefe14b78d2 Author: Timur Tabi Date: Tue May 8 14:46:36 2007 -0500 [POWERPC] Change rheap functions to use ulongs instead of pointers The rheap allocation functions return a pointer, but the actual value is based on how the heap was initialized, and so it can be anything, e.g. an offset into a buffer. A ulong is a better representation of the value returned by the allocation functions. This patch changes all of the relevant rheap functions to use a unsigned long integers instead of a pointer. In case of an error, the value returned is a negative error code that has been cast to an unsigned long. The caller can use the IS_ERR_VALUE() macro to check for this. All code which calls the rheap functions is updated accordingly. Macros IS_MURAM_ERR() and IS_DPERR(), have been deleted in favor of IS_ERR_VALUE(). Also added error checking to rh_attach_region(). Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 742226c579c573c24386aaf41969a01ee058b97e Author: Jason Jin Date: Wed May 2 16:53:38 2007 -0500 [POWERPC] 86xx: Enable the AC97 interface on 8641D board. HD interface and AC97 interface share some pins and they are enabled at the same time, In order to use AC97 interface, we need to disable the HD interface first. Signed-off-by:Jason Jin Acked-by: Jon Loeliger Signed-off-by: Kumar Gala commit 828765269efaafbf8973bb6e41d10970ee4effc3 Author: Becky Bruce Date: Wed May 9 14:31:19 2007 -0500 [POWERPC] Move reg_booke.h to include/asm-powerpc This patch moves a copy of reg_booke.h to include/asm-powerpc and fixes up the ifdef protection. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit c9ec87e5121b1777172fc07a14322ebb32a04ba9 Author: Kumar Gala Date: Wed May 9 22:48:53 2007 -0500 [POWERPC] 83xx: Suppress warning when CONFIG_ options aren't defined Suppress warning when CONFIG_PCI & CONFIG_QUICC_ENGINE is not defined Signed-off-by: Kumar Gala commit b38d06d8c48e8a866bf8f0ae5dabd9eea9c63f7c Author: Li Yang Date: Thu May 10 11:14:57 2007 +0800 [POWERPC] 83xx: Suppress warning when CONFIG_PCI is not defined Suppress warning when CONFIG_PCI is not defined. Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit fd3509436fde38d4c854bf5a6b83d2c779904f8e Author: Len Brown Date: Wed May 9 23:34:35 2007 -0400 ACPICA: Lindent Signed-off-by: Len Brown commit 88db5e1489f23876a226f5393fd978ddc09dc5f9 Author: Alexey Starikovskiy Date: Wed May 9 23:31:03 2007 -0400 ACPI: created a dedicated workqueue for notify() execution HP nx6125/nx6325/... machines have a _GPE handler with an infinite loop sending Notify() events to different ACPI subsystems. Notify handler in ACPI driver is a C-routine, which may call ACPI interpreter again to get access to some ACPI variables (acpi_evaluate_xxx). On these HP machines such an evaluation changes state of some variable and lets the loop above break. In the current ACPI implementation Notify requests are being deferred to the same kacpid workqueue on which the above GPE handler with infinite loop is executing. Thus we have a deadlock -- loop will continue to spin, sending notify events, and at the same time preventing these notify events from being run on a workqueue. All notify events are deferred, thus we see increase in memory consumption noticed by author of the thread. Also as GPE handling is bloked, machines overheat. Eventually by external poll of the same acpi_evaluate, kacpid is released and all the queued notify events are free to run, thus 100% cpu utilization by kacpid for several seconds or more. To prevent all these horrors it's needed to not put notify events to kacpid workqueue by either executing them immediately or putting them on some other thread. It's dangerous to execute notify events in place, as it will put several ACPI interpreter stacks on top of each other (at least 4 in case of nx6125), thus causing kernel stack overflow. First attempt to create a new thread was done by Peter Wainwright He created a bunch of threads, which were stealing work from a kacpid workqueue. This patch appeared in 2.6.15 kernel shipped with Ubuntu 6.06 LTS. Second attempt was done by me, I created a new thread for each Notify event. This worked OK on HP nx machines, but broke Linus' Compaq n620c, by producing threads with a speed what they stopped the machine completely. Thus this patch was reverted from 18-rc2 as I remember. I re-made the patch to create second workqueue just for notify events, thus hopping it will not break Linus' machine. Patch was tested on the same HP nx machines in #5534 and #7122, but I did not received reply from Linus on a test patch sent to him. Patch went to 19-rc and was rejected with much fanfare again. There was 4th patch, which inserted schedule_timeout(1) into deferred execution of kacpid, if we had any notify requests pending, but Linus decided that it was too complex (involved either changes to workqueue to see if it's empty or atomic inc/dec). Now you see last variant which adds yield() to every GPE execution. http://bugzilla.kernel.org/show_bug.cgi?id=5534 http://bugzilla.kernel.org/show_bug.cgi?id=8385 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 262a7a28de060f3a63cae20035876d6f22fd7670 Author: Len Brown Date: Wed May 9 23:01:59 2007 -0400 Revert "ACPICA: fix AML mutex re-entrancy" This reverts commit c0d127b56937c3e72c2b1819161d2f6718eee877. These changes to AML locking were made to allow Notify handlers to be called on the stack and not deadlock. However, that scheme turns out to be flawed and was reverted by the previous commit, so this commit restores the locking to it previous design. Signed-off-by: Len Brown commit 40d07080e585396dc58bc64befa1de0695318b3b Author: Len Brown Date: Wed May 9 22:59:38 2007 -0400 Revert "Execute AML Notify() requests on stack." This reverts commit 5f7748cf91558a5026ded5be93c5bf6c1ac34edf. While that change fixed the HP http://bugzilla.kernel.org/show_bug.cgi?id=5534 it broke the ACER: http://bugzilla.kernel.org/show_bug.cgi?id=8385 which as AML that caused Linux go recursive and stack fault. So this commit by itself will restore the ACER and again break the HP, which we'll fix another way. Signed-off-by: Len Brown commit 4d2acd9ea539e0f59178b126f6750ccc41eefcdd Author: Len Brown Date: Wed May 9 22:56:38 2007 -0400 Revert "ACPICA: revert "acpi_serialize" changes" This reverts commit a8f4af6dc6600980885c594f52eecd60edd62013. Thus restoring ACPICA's new acpi_serialize code. This commit by itself may cause a regression, but it is reverted in this order so that subsequent reverts reverts under this one can be made without conflict. Signed-off-by: Len Brown commit 44ce6294d07555c3d313757105fd44b78208407f Author: Linus Torvalds Date: Wed May 9 18:51:36 2007 -0700 Revert "md: improve partition detection in md array" This reverts commit 5b479c91da90eef605f851508744bfe8269591a0. Quoth Neil Brown: "It causes an oops when auto-detecting raid arrays, and it doesn't seem easy to fix. The array may not be 'open' when do_md_run is called, so bdev->bd_disk might be NULL, so bd_set_size can oops. This whole approach of opening an md device before it has been assembled just seems to get more and more painful. I think I'm going to have to come up with something clever to provide both backward comparability with usage expectation, and sane integration into the rest of the kernel." Signed-off-by: Linus Torvalds commit 5b2fc499917e5897a13add780e181b4cef197072 Author: Jeff Garzik Date: Wed May 9 21:31:55 2007 -0400 Move USB network drivers to drivers/net/usb. It is preferable to group drivers by usage (net, scsi, ATA, ...) than by bus. When reviewing drivers, the [PCI|USB|PCMCIA|...] maintainer is probably less qualified on networking issues than a networking maintainer. Also, from a practical standpoint, chips often appear on multiple buses, which is why we do not put drivers into drivers/pci/net. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jeff Garzik commit e0863397cb8f3ede356ef2cb7dcdccc9956cdc6d Author: Jesse Barnes Date: Tue May 1 14:34:39 2007 -0700 Doc Fix: remove mention of combined mode-related kernel parameters Looks like you removed the combined_mode quirk (yay!) but didn't update kernel-parameters.txt... might confuse people. Here's a patch to remove mention of it from the documentation. Signed-off-by: Jesse Barnes Signed-off-by: Jeff Garzik commit 6b38d1d1d50234453e12ccdbbb162d10ece6430f Author: Randy Dunlap Date: Tue May 1 17:35:55 2007 -0700 libata: fix kernel-doc parameters Warning(linux-2.6.21-git4//drivers/ata/libata-core.c:904): No description found for parameter 'new_sectors' Warning(linux-2.6.21-git4//drivers/ata/libata-core.c:941): No description found for parameter 'new_sectors' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 6878cce57b43b24eee1a4de6d189051c4646b575 Author: Samuel Thibault Date: Thu May 3 11:30:25 2007 +0200 Fix pata_qdi.c probe code There is a small typo in the probe code of pata_qdi.c, here is a patch. Signed-off-by: Jeff Garzik commit 0397bad5b413226b8f55f599b185ab506d13b078 Author: Alexey Dobriyan Date: Thu May 3 23:44:59 2007 +0400 pata_scc: fix compilation Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit e1e143cf976ed635a45b768b4a26684173320d6f Author: Tejun Heo Date: Fri May 4 15:30:34 2007 +0200 sata_via: add missing PM hooks For some reason, sata_via is missing PM hooks. Add them. Spotted by Jeroen Janssen . Signed-off-by: Tejun Heo Cc: Jeroen Janssen Signed-off-by: Jeff Garzik commit 53014e2526dff68628adb11c44bd1e8f2a2a9ae9 Author: Robert Hancock Date: Sat May 5 15:36:36 2007 -0600 sata_nv: fix ADMA freeze/thaw/irq_clear issues This patch fixes some problems with ADMA-capable controllers with regard to freeze, thaw and irq_clear libata callbacks. Freeze and thaw didn't switch the ADMA-specific interrupts on or off, and more critically the irq_clear function didn't respect the restriction that the notifier clear registers for both ports have to be written at the same time even when only one port is being cleared. This could result in timeouts on one port when error handling (i.e. as a result of hotplug) occurred on the other port. As well, this fixes some issues in the interrupt handler: we shouldn't check any ADMA status if the port has ADMA switched off because of an ATAPI device, and it also checks to see if any ADMA interrupt has been raised even when we are in port-register mode. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 7871e74acbf5013970daaa1d032854210282340c Author: Richard Kennedy Date: Tue May 8 15:20:56 2007 +0100 pata_pcmcia.c: add card ident for jvc cdrom update pata_pcmcia to add card ident for JVC MP-CDX1 cdrom drive card info: PRODID_1="KME" PRODID_2="KXLC005" PRODID_3="00" MANFID=0032,2904 Signed-off-by: Richard Kennedy Signed-off-by: Jeff Garzik commit 5ac2fe57569c5fbbd4288e3e7fead332b4300ef0 Author: Mikael Pettersson Date: Sun May 6 22:14:01 2007 +0200 sata_promise: SATAII-150/300 TX4 port numbering fix There is a known problem with sata_promise on SATAII-150/300 TX4 controller cards: it enumerates drives in an order that differs from the port numbers printed on the controller cards. However, Promise's BIOS and Linux driver both get the order right. I investigated Promise's Linux driver (v1.01.0.23), and found that it explicitly changes the mapping from logical port number to ATA engine MMIO address on the SATAII TX4 cards. It does this on all SATAII TX4 cards, without inspecting revision etc. The SATAII TX2plus cards continue to use the same mapping that was used for the first-generation chips. This patch updates sata_promise to use the new port number to ATA engine mapping on SATAII TX4 cards, which fixes the drive enumeration order problem on those cards. Tested on several 1st and 2nd generation TX2plus and TX4 chips. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 8ffcfd9d0dc735071379760c23317f15904f9056 Author: Mikael Pettersson Date: Sun May 6 22:12:31 2007 +0200 sata_promise: fix another error decode regression The sata_promise error decode update changed pdc_host_intr() to return and not complete the qc after detecting an error. Unfortunately not completing the qc:s causes them to always time out on error, which is wrong and has nasty side-effects. This patch updates pdc_error_intr() to call ata_port_abort(), similar to ahci and sata_sil24. Doing this is important as it makes EH see the original error and not a bogus timeout. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 48be6b18336567a795bc41e4526f9adfb3a3d68e Author: Tejun Heo Date: Mon Apr 23 02:06:46 2007 +0900 libata-acpi: fix _GTF command protocol for ATAPI devices _GTF command is never ATA_PROT_ATAPI_NODATA whether the device is ATAPI or not. It's always ATA_PROT_NODATA. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 497f050c42e46a4b1f6a9bcd8827fa5d97fe1feb Author: Alexey Dobriyan Date: Wed May 9 18:52:35 2007 +0400 atl1: add netconsole support Copied from b44 driver, but it works: netconsole: device eth0 not up yet, forcing it atl1: eth0 link is up 100 Mbps full duplex netconsole: network logging started Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit 5bebf82fff53a96f330c0879ffe870bdf3aaeab6 Author: Paul Walmsley Date: Wed May 9 10:47:16 2007 -0600 Fix hang on IBM Token Ring PCMCIA card ejection Ejecting a PCMCIA IBM Token Ring card that has not had its dev->open() called will reliably trigger an uninitialized spinlock oops when spinlock debugging is enabled. The system then hangs, occasionally softlockup oopsing. Apparently ibmtr.c:tok_interrupt() doesn't expect to be called before tok_open(), but tok_interrupt() gets called anyway when the card is ejected. So, set an already-existing flag which causes tok_interrupt() to bail out early upon card ejection. Tested by inserting and removing the PCMCIA card several times. Signed-off-by: Paul Walmsley Signed-off-by: Jeff Garzik commit 5b982c5bb7db5cfbc15236d9d45cec32e5472ed5 Author: Stephen Hemminger Date: Tue May 8 13:36:20 2007 -0700 skge: default WOL should be magic only (rev2) By default, the skge driver now enables wake on magic and wake on PHY. This is a bad default (bug), wake on PHY means machine will never shutdown if connected to a switch. Signed-off-by: Stephen Hemminger a Signed-off-by: Jeff Garzik commit 317a46a200e6514a1acf50ed30291160185a5c73 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:11 2007 +0200 ide: fix PIO setup on resume for ATAPI devices PIO should be restored also for ATAPI devices during resume, fix it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6d208b39c45edee5def6c201fcd51561c5a39828 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:11 2007 +0200 ide: legacy PCI bus order probing fixes IDE PCI host drivers should register themselves with IDE core only when IDE driver is built-in, otherwise (IDE driver is modular and thus IDE PCI host drivers are also modular) the code has no effect and just complicates the probing. Fix it by adding new config option CONFIG_IDEPCI_PCIBUS (defined only when needed and invisible to the user) and covering by #ifdef/#endif the code in question. It turned out that "ide=reverse" was silently accepted but did nothing in case when IDE driver was modular, this is fixed now. Signed-off-by: Bartlomiej Zolnierkiewicz commit 5cbf79cdb37be2aa2a1b4fa94144526b14557060 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:11 2007 +0200 ide: add ide_proc_register_port() * create_proc_ide_interfaces() tries to add /proc entries for every probed and initialized IDE port, replace it by ide_proc_register_port() which does it only for the given port (also rename destroy_proc_ide_interface() to ide_proc_unregister_port() for consistency) * convert {create,destroy}_proc_ide_interface[s]() users to use new functions * pmac driver depended on proc_ide_create() to add /proc port entries, fix it * au1xxx-ide, swarm and cs5520 drivers depended indirectly on ide-generic driver (CONFIG_IDE_GENERIC=y) to add port /proc entries, fix them * there is now no need to add /proc entries for IDE ports in proc_ide_create() so don't do it * proc_ide_create() needs now to be called before drivers are probed - fix it, while at it make proc_ide_create() create /proc "ide" directory Signed-off-by: Bartlomiej Zolnierkiewicz commit 869c56ee9de1b72cd3f8ab9cdfbd3601e55c61f2 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:10 2007 +0200 ide: add "initializing" argument to ide_register_hw() Add "initializing" argument to ide_register_hw() and use it instead of ide.c wide variable of the same name. Update all users of ide_register_hw() accordingly. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7f8f48af0861c38c28d4abd550102643e0ea9e6a Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:10 2007 +0200 ide: cable detection fixes (take 2) Tejun's recent eighty_ninty_three() fix has inspired me to do more thorough review of the cable detection code... * print user-friendly warning about limiting the maximum transfer speed to UDMA33 (and the reason behind it) when 80-wire cable is not detected, also while at it cleanup eighty_ninty_three() a bit * use eighty_ninty_three() in ide_ata66_check(), this actually fixes 3 bugs: - bit 14 (word 93 validity check) == 1 && bit 13 (80-wire cable test) == 1 were used as 80-wire cable present test for CONFIG_IDEDMA_IVB=n case (please see FIXME comment in eighty_ninty_three() for more details) - CONFIG_IDEDMA_IVB=y/n cases were interchanged - check for SATA devices was missing * remove private cable warnings from pdc_202xx{old,new} drivers now that core code provides this functionality (plus, in pdc202xx_new case the test could give false warnings for ATAPI devices because pdc202xx_new driver doesn't even support ATAPI DMA) Cc: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 7662d046df09e80680b77b68de896beab45e675e Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:10 2007 +0200 ide: move IDE settings handling to ide-proc.c * move __ide_add_setting() ide_add_setting() __ide_remove_setting() auto_remove_settings() ide_find_setting_by_name() ide_read_setting() ide_write_setting() set_xfer_rate() ide_add_generic_settings() ide_register_subdriver() ide_unregister_subdriver() from ide.c to ide-proc.c * set_{io_32bit,pio_mode,using_dma}() cannot be marked static now, fix it * rename ide_[un]register_subdriver() to ide_proc_[un]register_driver(), update device drivers to use new names * add CONFIG_IDE_PROC_FS=n versions of ide_proc_[un]register_driver() and ide_add_generic_settings() * make ide_find_setting_by_name(), ide_{read,write}_setting() and ide_{add,remove}_proc_entries() static * cover IDE settings code in device drivers with CONFIG_IDE_PROC_FS #ifdef, also while at it cover with CONFIG_IDE_PROC_FS #ifdef ide_driver_t.proc * remove bogus comment from ide.h * cover with CONFIG_IDE_PROC_FS #ifdef .proc and .settings in ide_drive_t Besides saner code this patch results in the IDE core smaller by ~2 kB (on x86-32) and IDE disk driver by ~1 kB (ditto) when CONFIG_IDE_PROC_FS=n. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1497943ee692aa7519fa972d0e3a339649bf3a96 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:10 2007 +0200 ide: split off ioctl handling from IDE settings (v2) * do write permission and min/max checks in ide_procset_t functions * ide-disk.c: drive->id is always available so cleanup "multcount" setting accordingly * ide-disk.c: "address" setting was incorrectly defined as type TYPE_INTA, fix it by using type TYPE_BYTE and updating ide_drive_t->adressing field, the bug didn't trigger because this IDE setting uses custom ->set function * ide.c: add set_ksettings() for handling HDIO_SET_KEEPSETTINGS ioctl * ide.c: add set_unmaskirq() for handling HDIO_SET_UNMASKINTR ioctl * handle ioctls directly in generic_ide_ioclt() and idedisk_ioctl() instead of using IDE settings to deal with them * remove no longer needed ide_find_setting_by_ioctl() and {read,write}_ioctl fields from ide_settings_t, also remove now unused TYPE_INTA handling v2: * add missing EXPORT_SYMBOL_GPL(ide_setting_sem) needed now for ide-disk Signed-off-by: Bartlomiej Zolnierkiewicz commit ecfd80e4a514123070b4cfb674b817ba75055df2 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:09 2007 +0200 ide: make /proc/ide/ optional All important information/features should be already available through sysfs and ioctl interfaces. Add CONFIG_IDE_PROC_FS (CONFIG_SCSI_PROC_FS rip-off) config option, disabling it makes IDE driver ~5 kB smaller (on x86-32). While at it add CONFIG_PROC_FS=n versions of proc_ide_{create,destroy}() and remove no longer needed #ifdefs. Signed-off-by: Bartlomiej Zolnierkiewicz commit 29e744d088e3555f4efbdf390f01088dd66993b6 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:09 2007 +0200 ide: add ide_tune_dma() helper After reworking the code responsible for selecting the best DMA transfer mode it is now possible to add generic ide_tune_dma() helper. Convert some IDE PCI host drivers to use it (the ones left need more work). Signed-off-by: Bartlomiej Zolnierkiewicz commit 2d5eaa6dd744a641e75503232a01f52d0768884c Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:08 2007 +0200 ide: rework the code for selecting the best DMA transfer mode (v3) Depends on the "ide: fix UDMA/MWDMA/SWDMA masks" patch. * add ide_hwif_t.udma_filter hook for filtering UDMA mask (use it in alim15x3, hpt366, siimage and serverworks drivers) * add ide_max_dma_mode() for finding best DMA mode for the device (loosely based on some older libata-core.c code) * convert ide_dma_speed() users to use ide_max_dma_mode() * make ide_rate_filter() take "ide_drive_t *drive" as an argument instead of "u8 mode" and teach it to how to use UDMA mask to do filtering * use ide_rate_filter() in hpt366 driver * remove no longer needed ide_dma_speed() and *_ratemask() * unexport eighty_ninty_three() v2: * rename ->filter_udma_mask to ->udma_filter [ Suggested by Sergei Shtylyov . ] v3: * updated for scc_pata driver (fixes XFER_UDMA_6 filtering for user-space originated transfer mode change requests when 100MHz clock is used) Signed-off-by: Bartlomiej Zolnierkiewicz commit 18137207236285989dfc0ee7f929b954199228f3 Author: Bartlomiej Zolnierkiewicz Date: Thu May 10 00:01:07 2007 +0200 ide: fix UDMA/MWDMA/SWDMA masks (v3) * use 0x00 instead of 0x80 to disable ->{ultra,mwdma,swdma}_mask * add udma_mask field to ide_pci_device_t and use it to initialize ->ultra_mask in aec62xx, cmd64x, pdc202xx_{new,old} and piix drivers * fix UDMA masks to match with chipset specific *_ratemask() (alim15x3, hpt366, serverworks and siimage drivers need UDMA mask filtering method - done in the next patch) v2: * piix: fix cable detection for 82801AA_1 and 82372FB_1 [ Noticed by Sergei Shtylyov . ] * cmd64x: use hwif->cds->udma_mask [ Suggested by Sergei Shtylyov . ] * aec62xx: fix newly introduced bug - check DMA status not command register [ Noticed by Sergei Shtylyov . ] v3: * piix: use hwif->cds->udma_mask [ Suggested by Sergei Shtylyov . ] Signed-off-by: Bartlomiej Zolnierkiewicz commit 7a13e932281e7042a592f4f14db0b348199e7aac Author: Jesper Juhl Date: Thu Apr 26 00:29:02 2007 -0700 NFS: Kill the obsolete NFS_PARANOIA Signed-off-by: Jesper Juhl Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit fee7f23feaf0845fdfd47d20cddc75652552fbb8 Author: Milind Arun Choudhary Date: Thu Apr 26 00:29:03 2007 -0700 NFS: use __set_current_state() use __set_current_state(TASK_*) instead of current->state = TASK_*, in fs/nfs Signed-off-by: Milind Arun Choudhary Cc: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit ddce40df6e14dd474bbd9daa006dcc290dea6326 Author: Peter Zijlstra Date: Wed May 9 08:30:11 2007 +0200 sunrpc: fix crash in rpc_malloc() While the comment says: * To prevent rpciod from hanging, this allocator never sleeps, * returning NULL if the request cannot be serviced immediately. The function does not actually check for NULL pointers being returned. Signed-off-by: Peter Zijlstra Signed-off-by: Trond Myklebust commit e4cc6ee2e40bdd57990577b7f851fa2ca48edf47 Author: Chuck Lever Date: Tue May 8 18:23:28 2007 -0400 NFS: Clean up NFSv4 XDR error message Make it more useful for debugging purposes. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 6ce7dc940701cf3fde3c6e826a696b333092cbb1 Author: Chuck Lever Date: Tue May 8 18:23:28 2007 -0400 NFS: NFS client underestimates how large an NFSv4 SETATTR reply can be The maximum size of an NFSv4 SETATTR compound reply should include the GETATTR operation that we send. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit aa3d1faebe6e214cd96be0e587571477ff6fd9fc Author: Chuck Lever Date: Tue May 8 18:23:28 2007 -0400 SUNRPC: Fix pointer arithmetic bug recently introduced in rpc_malloc/free Use a cleaner method to find the size of an rpc_buffer. This actually works on x86-64! Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit e70c490810dc683fad39e57cf00e69d5f120c542 Author: Trond Myklebust Date: Wed May 9 09:00:18 2007 -0400 NFS: Remove redundant check in nfs_check_verifier() The check for nfs_attribute_timeout(dir) in nfs_check_verifier is redundant: nfs_lookup_revalidate() will already call nfs_revalidate_inode() on the parent dir when necessary. The only case where this is not done is the case of a negative dentry. Fix this case by moving up the revalidation code. Signed-off-by: Trond Myklebust commit e62c2bba1fb7cf068eb78d731da46e4447a9efb1 Author: Trond Myklebust Date: Wed May 9 09:00:17 2007 -0400 NFS: Fix a jiffie wraparound issue dentry verifiers are always set to the parent directory's cache_change_attribute. There is no reason to be testing for anything other than equality when we're trying to find out if the dentry has been checked since the last time the directory was modified. Signed-off-by: Trond Myklebust commit 5329571b3c978635f6d832cc884fdd61ff94e0da Author: akpm@linux-foundation.org Date: Wed May 9 00:43:17 2007 -0700 [IA64] sa_interrupt is deprecated Seems more than just deprecated, we can't build using SA_INTERUPT. Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 7cc5c8559c62289d027812bfdd4eb6a28c5769b6 Author: Mark Fortescue Date: Wed May 9 13:49:04 2007 -0700 [SERIAL] sunzilog: Interrupt enable before ISR handler installed This patch changes the interrupt enable sequence for the sunzilog driver so that interrupts are not enabled untill after the interrupt handler has been installed. If this is not done, some SS1 and SS2 sun4c systems panic on un-handled interrupt before the handler gets installed preventing boot. It also adds in support for the ESCC version of the zilog chips. The changes mean that the FIFO will be enabled for ESCC versions of the SCC UART. My interpretation of the SCC manual and the existing interrupt handler code is that it sould be able to make good use of the FIFO without issues. Signed-off-by: Mark Fortescue Signed-off-by: David S. Miller commit c855ff3718e5f667b463b20b9de516b4cd7625ad Author: David Howells Date: Wed May 9 13:42:20 2007 +0100 Fix a bad error case handling in read_cache_page_async() Commit 6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2 introduced a nasty bug in read_cache_page_async(). It added a "mark_page_accessed(page)" at the final return path in read_cache_page_async(). But in error cases, 'page' holds the error code, and you can't mark it accessed. [ and Glauber de Oliveira Costa points out that we can use a return instead of adding more goto's ] Signed-off-by: David Howells Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit b0b73cb41d56ee391f20cbd3e4304e2303a8829b Author: H. Peter Anvin Date: Wed May 9 00:02:11 2007 -0700 i386: msr.h: be paranoid about types and parentheses When implementing things as macros, make sure we use typecasts and parentheses where needed. The macros as defined were vulnerable to surreptitious promotion causing problems. Avoid macros where practical; e.g. wrmsr() can be an inline instead. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 29bd44337799e4cb85aec5157a9c88a0da66642a Author: H. Peter Anvin Date: Wed May 9 00:02:06 2007 -0700 i386: remove unused rdtsc() macro All users to the two-part rdtsc() macro have already switched to using rdtscl() or rdtscll(). Remove the now-obsolete macro. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 21c42bd8db2acd7c884d132efbf7aee9ca970b06 Author: H. Peter Anvin Date: Wed May 9 00:02:00 2007 -0700 i386: cpu/transmeta.c: fix definition of USER686 The definition of USER686 is supposed to be a mask of feature bits, not an OR of feature numbers! It happened to work anyway on the only processor affected, simply by pure coincidence. Fix. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 5b479c91da90eef605f851508744bfe8269591a0 Author: NeilBrown Date: Wed May 9 02:35:39 2007 -0700 md: improve partition detection in md array md currently uses ->media_changed to make sure rescan_partitions is call on md array after they are assembled. However that doesn't happen until the array is opened, which is later than some people would like. So use blkdev_ioctl to do the rescan immediately that the array has been assembled. This means we can remove all the ->change infrastructure as it was only used to trigger a partition rescan. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08a02ecd28bad35a47357e611044dcbeab06e3d7 Author: NeilBrown Date: Wed May 9 02:35:38 2007 -0700 md: allow reshape_position for md arrays to be set via sysfs "reshape_position" records how much progress has been made on a "reshape" (adding drives, changing layout or chunksize). When it is set, the number of drives, layout and chunksize can have two possible values, an old an a new. So allow these different values to be visible, and allow both old and new to be set: Set the old ones first, then the reshape_position, then the new values. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42b9bebe3fea3d3ce381bc6735a3fb50e6613f06 Author: NeilBrown Date: Wed May 9 02:35:37 2007 -0700 md: remove the slash from the name of a kmem_cache used by raid5 SLUB doesn't like slashes as it wants to use the cache name as the name of a directory (or symlink) in sysfs. Signed-off-by: Neil Brown Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d167f09375bd6c18447d3fcc18baaf3acd15fbc Author: NeilBrown Date: Wed May 9 02:35:37 2007 -0700 md: stop using csum_partial for checksum calculation in md If CONFIG_NET is not selected, csum_partial is not exported, so md.ko cannot use it. We shouldn't really be using csum_partial anyway as it is an internal-to-networking interface. So replace it with C code to do the same thing. Speed is not crucial here, so something simple and correct is best. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e11e93facc38fb264a5ff1e154ebb2f11dc5cffa Author: NeilBrown Date: Wed May 9 02:35:36 2007 -0700 md: move test for whether level supports bitmap to correct place We need to check for internal-consistency of superblock in load_super. validate_super is for inter-device consistency. With the test in the wrong place, a badly created array will confuse md rather an produce sensible errors. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3f94b40e1676172dfa88abfffd8baffe7ac607c Author: Martin Peschke Date: Wed May 9 02:35:35 2007 -0700 md: cleanup: use seq_release_private() where appropriate We can save some lines of code by using seq_release_private(). Signed-off-by: Martin Peschke Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50511da3da4d984fb944b2e373781b60915daf65 Author: Ahmed S. Darwish Date: Wed May 9 02:35:34 2007 -0700 drivers/md.c: Use ARRAY_SIZE macro when appropriate Use ARRAY_SIZE macro already defined in kernel.h Signed-off-by: Ahmed S. Darwish Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc0ca06e24545117b69c94b1219dbe19392a0c5a Author: Michal Piotrowski Date: Wed May 9 02:35:34 2007 -0700 frame buffer: geforce 7300 gt My geforce isn't supported by nvidia frame buffer. /sbin/lspci 01:00.0 VGA compatible controller: nVidia Corporation Unknown device 02e2 (rev a2) /usr/sbin/fbset -i mode "1024x768-60" # D: 65.003 MHz, H: 48.365 kHz, V: 60.006 Hz geometry 1024 768 1024 32767 8 timings 15384 160 24 29 3 136 6 accel true rgba 8/0,8/0,8/0,0/0 endmode Frame buffer device information: Name : NV2e Address : 0xe0000000 Size : 134217728 Type : PACKED PIXELS Visual : PSEUDOCOLOR XPanStep : 8 YPanStep : 1 YWrapStep : 0 LineLength : 1024 MMIO Address: 0xf6000000 MMIO Size : 16777216 Accelerator : Unknown (46) Here is a patch for this problem. Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 880169dd2edc4297b7811a0542be9766ca6945bc Author: Haavard Skinnemoen Date: Wed May 9 02:35:33 2007 -0700 fbdev: add support for AVR32 Provide framebuffer page protection flags and definitions of fb_readl/fb_writel for AVR32. Signed-off-by: Haavard Skinnemoen Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a87ede94595f58934000e26e8b13398e63868b5 Author: Antonino A. Daplas Date: Wed May 9 02:35:32 2007 -0700 svgalib: move fb_get_caps to svgalib Move fb_get_caps() method to svgalib.c as svga_get_caps() so it can be used by s3fb, arkfb and vt8623fb. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 681e14730c73cc2c71af282c001de6bc71c22f00 Author: Ondrej Zajicek Date: Wed May 9 02:35:31 2007 -0700 arkfb: new framebuffer driver for ARK Logic cards This patch adds fbdev driver for graphics cards with ARK Logic 2000PV graphics chip with ICS 5342 ramdac. [adaplas@gmail.com: build fixes] Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558b7bd86c32978648cda5deb5c758d77ef0c165 Author: Ondrej Zajicek Date: Wed May 9 02:35:31 2007 -0700 vt8623fb: new framebuffer driver for VIA VT8623 This patch adds fbdev driver for graphics core in VIA VT8623 [adaplas@gmail.com: build fixes] Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3c117f06e95ea993ba4ed3b246fd76f87a4683f Author: David Rientjes Date: Wed May 9 02:35:30 2007 -0700 i386 mmzone: use __maybe_unused Replace automatic variable instances of __attribute__ ((unused)) with __maybe_unused. Cc: Andy Whitcroft Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit affd872ebbe4f045d70a3f4b33b20f5f6c894bcc Author: David Rientjes Date: Wed May 9 02:35:29 2007 -0700 i386: voyager: use __maybe_unused Replace automatic variable instances of __attribute__((unused)) with __maybe_unused in mca_nmi_hook(). Cc: James Bottomley Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d16aaffa752c7fd50df951e631dd0c11f80d9cbf Author: David Rientjes Date: Wed May 9 02:35:28 2007 -0700 sh: dma: use __maybe_unused There is no such thing as labeling a variable as __attribute__((used)). Since ts_shift is not referenced in inline assembly, we assume that we're simply suppressing a warning here if the variable is declared but unreferenced. Cc: Paul Mundt Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6744c02bc50797c1a83f8303ebcc96673ca0524 Author: David Rientjes Date: Wed May 9 02:35:28 2007 -0700 i386 pci: use __maybe_unused Use the new macro here Cc: Andi Kleen Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d7ebbbc6eaa5539f78ab20ed6ff1725a4e332ef Author: David Rientjes Date: Wed May 9 02:35:27 2007 -0700 compiler: introduce __used and __maybe_unused __used is defined to be __attribute__((unused)) for all pre-3.3 gcc compilers to suppress warnings for unused functions because perhaps they are referenced only in inline assembly. It is defined to be __attribute__((used)) for gcc 3.3 and later so that the code is still emitted for such functions. __maybe_unused is defined to be __attribute__((unused)) for both function and variable use if it could possibly be unreferenced due to the evaluation of preprocessor macros. Function prototypes shall be marked with __maybe_unused if the actual definition of the function is dependant on preprocessor macros. No update to compiler-intel.h is necessary because ICC supports both __attribute__((used)) and __attribute__((unused)) as specified by the gcc manual. __attribute_used__ is deprecated and will be removed once all current code is converted to using __used. Cc: Rusty Russell Cc: Adrian Bunk Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7e4217b007d1f73e7e3cf10ba4fea4a608c603f Author: Roman Zippel Date: Wed May 9 02:35:17 2007 -0700 rename thread_info to stack This finally renames the thread_info field in task structure to stack, so that the assumptions about this field are gone and archs have more freedom about placing the thread_info structure. Nonbroken archs which have a proper thread pointer can do the access to both current thread and task structure via a single pointer. It'll allow for a few more cleanups of the fork code, from which e.g. ia64 could benefit. Signed-off-by: Roman Zippel [akpm@linux-foundation.org: build fix] Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Haavard Skinnemoen Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: "Luck, Tony" Cc: Hirokazu Takata Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Greg Ungerer Cc: Ralf Baechle Cc: Ralf Baechle Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Andi Kleen Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9f4f06d3191bd91c1a081b54a6c8e913e7b8a83 Author: Roman Zippel Date: Wed May 9 02:35:16 2007 -0700 wrap access to thread_info Recently a few direct accesses to the thread_info in the task structure snuck back, so this wraps them with the appropriate wrapper. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61a1c1c4f240cec61300c8f27518c3e47570fd4 Author: Roman Zippel Date: Wed May 9 02:35:15 2007 -0700 Allow arch to initialize arch field of the module structure This will later allow an arch to add module specific information via linker generated tables instead of poking directly in the module object structure. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b52f52a093bb1e841e014c2087b5bee7162da413 Author: Thomas Gleixner Date: Wed May 9 02:35:15 2007 -0700 clocksource: fix resume logic We need to make sure that the clocksources are resumed, when timekeeping is resumed. The current resume logic does not guarantee this. Add a resume function pointer to the clocksource struct, so clocksource drivers which need to reinitialize the clocksource can provide a resume function. Add a resume function, which calls the maybe available clocksource resume functions and resets the watchdog function, so a stable TSC can be used accross suspend/resume. Signed-off-by: Thomas Gleixner Cc: john stultz Cc: Andi Kleen Cc: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4037d452202e34214e8a939fa5621b2b3bbb45b7 Author: Christoph Lameter Date: Wed May 9 02:35:14 2007 -0700 Move remote node draining out of slab allocators Currently the slab allocators contain callbacks into the page allocator to perform the draining of pagesets on remote nodes. This requires SLUB to have a whole subsystem in order to be compatible with SLAB. Moving node draining out of the slab allocators avoids a section of code in SLUB. Move the node draining so that is is done when the vm statistics are updated. At that point we are already touching all the cachelines with the pagesets of a processor. Add a expire counter there. If we have to update per zone or global vm statistics then assume that the pageset will require subsequent draining. The expire counter will be decremented on each vm stats update pass until it reaches zero. Then we will drain one batch from the pageset. The draining will cause vm counter updates which will then cause another expiration until the pcp is empty. So we will drain a batch every 3 seconds. Note that remote node draining is a somewhat esoteric feature that is required on large NUMA systems because otherwise significant portions of system memory can become trapped in pcp queues. The number of pcp is determined by the number of processors and nodes in a system. A system with 4 processors and 2 nodes has 8 pcps which is okay. But a system with 1024 processors and 512 nodes has 512k pcps with a high potential for large amount of memory being caught in them. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77461ab33229d48614402decfb1b2eaa6d446861 Author: Christoph Lameter Date: Wed May 9 02:35:13 2007 -0700 Make vm statistics update interval configurable Make it configurable. Code in mm makes the vm statistics intervals independent from the cache reaper use that opportunity to make it configurable. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1187ed21026fd512b87851d0ca26d9ae16f9059 Author: Christoph Lameter Date: Wed May 9 02:35:12 2007 -0700 vmstat: use our own timer events vmstat is currently using the cache reaper to periodically bring the statistics up to date. The cache reaper does only exists in SLUB as a way to provide compatibility with SLAB. This patch removes the vmstat calls from the slab allocators and provides its own handling. The advantage is also that we can use a different frequency for the updates. Refreshing vm stats is a pretty fast job so we can run this every second and stagger this by only one tick. This will lead to some overlap in large systems. F.e a system running at 250 HZ with 1024 processors will have 4 vm updates occurring at once. However, the vm stats update only accesses per node information. It is only necessary to stagger the vm statistics updates per processor in each node. Vm counter updates occurring on distant nodes will not cause cacheline contention. We could implement an alternate approach that runs the first processor on each node at the second and then each of the other processor on a node on a subsequent tick. That may be useful to keep a large amount of the second free of timer activity. Maybe the timer folks will have some feedback on this one? [jirislaby@gmail.com: add missing break] Cc: Arjan van de Ven Signed-off-by: Christoph Lameter Signed-off-by: Jiri Slaby Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 455c017ae3934797653549704c286e7bcc3a9397 Author: Rafael J. Wysocki Date: Wed May 9 02:35:11 2007 -0700 microcode: use suspend-related CPU hotplug notifications Make the microcode driver use the suspend-related CPU hotplug notifications to handle the CPU hotplug events occuring during system-wide suspend and resume transitions. Remove the global variable suspend_cpu_hotplug previously used for this purpose. Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bb7844286fb8c9fce6f65d8288aeb09d03a5e0d Author: Rafael J. Wysocki Date: Wed May 9 02:35:10 2007 -0700 Add suspend-related notifications for CPU hotplug Since nonboot CPUs are now disabled after tasks and devices have been frozen and the CPU hotplug infrastructure is used for this purpose, we need special CPU hotplug notifications that will help the CPU-hotplug-aware subsystems distinguish normal CPU hotplug events from CPU hotplug events related to a system-wide suspend or resume operation in progress. This patch introduces such notifications and causes them to be used during suspend and resume transitions. It also changes all of the CPU-hotplug-aware subsystems to take these notifications into consideration (for now they are handled in the same way as the corresponding "normal" ones). [oleg@tv-sign.ru: cleanups] Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Cc: Pavel Machek Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f37bc2712b54ec641e0c0c8634f1a4b61d9956c0 Author: Nate Diller Date: Wed May 9 02:35:09 2007 -0700 fs: deprecate memclear_highpage_flush Now that all the in-tree users are converted over to zero_user_page(), deprecate the old memclear_highpage_flush() call. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2fff596955867d407cc7e8e426097bd9ad2be9b Author: Nate Diller Date: Wed May 9 02:35:09 2007 -0700 reiserfs: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c11d7a9e9e9793219baf715048c190a84bead57 Author: Nate Diller Date: Wed May 9 02:35:08 2007 -0700 ext3: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f36dca90e674a1a62cad810f630629c0008b2128 Author: Nate Diller Date: Wed May 9 02:35:07 2007 -0700 affs: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01f2705daf5a36208e69d7cf95db9c330f843af6 Author: Nate Diller Date: Wed May 9 02:35:07 2007 -0700 fs: convert core functions to zero_user_page It's very common for file systems to need to zero part or all of a page, the simplist way is just to use kmap_atomic() and memset(). There's actually a library function in include/linux/highmem.h that does exactly that, but it's confusingly named memclear_highpage_flush(), which is descriptive of *how* it does the work rather than what the *purpose* is. So this patchset renames the function to zero_user_page(), and calls it from the various places that currently open code it. This first patch introduces the new function call, and converts all the core kernel callsites, both the open-coded ones and the old memclear_highpage_flush() ones. Following this patch is a series of conversions for each file system individually, per AKPM, and finally a patch deprecating the old call. The diffstat below shows the entire patchset. [akpm@linux-foundation.org: fix a few things] Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38a23e311b6cd389b9d8af2ea6c28c8cffbe581c Author: Jarek Poplawski Date: Wed May 9 02:35:05 2007 -0700 timer: parenthesis fix in tbase_get_deferrable() etc Signed-off-by: Jarek Poplawski Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34f01cc1f512fa783302982776895c73714ebbc2 Author: Eric Dumazet Date: Wed May 9 02:35:04 2007 -0700 FUTEX: new PRIVATE futexes Analysis of current linux futex code : -------------------------------------- A central hash table futex_queues[] holds all contexts (futex_q) of waiting threads. Each futex_wait()/futex_wait() has to obtain a spinlock on a hash slot to perform lookups or insert/deletion of a futex_q. When a futex_wait() is done, calling thread has to : 1) - Obtain a read lock on mmap_sem to be able to validate the user pointer (calling find_vma()). This validation tells us if the futex uses an inode based store (mapped file), or mm based store (anonymous mem) 2) - compute a hash key 3) - Atomic increment of reference counter on an inode or a mm_struct 4) - lock part of futex_queues[] hash table 5) - perform the test on value of futex. (rollback is value != expected_value, returns EWOULDBLOCK) (various loops if test triggers mm faults) 6) queue the context into hash table, release the lock got in 4) 7) - release the read_lock on mmap_sem 8) Eventually unqueue the context (but rarely, as this part  may be done by the futex_wake()) Futexes were designed to improve scalability but current implementation has various problems : - Central hashtable : This means scalability problems if many processes/threads want to use futexes at the same time. This means NUMA unbalance because this hashtable is located on one node. - Using mmap_sem on every futex() syscall : Even if mmap_sem is a rw_semaphore, up_read()/down_read() are doing atomic ops on mmap_sem, dirtying cache line : - lot of cache line ping pongs on SMP configurations. mmap_sem is also extensively used by mm code (page faults, mmap()/munmap()) Highly threaded processes might suffer from mmap_sem contention. mmap_sem is also used by oprofile code. Enabling oprofile hurts threaded programs because of contention on the mmap_sem cache line. - Using an atomic_inc()/atomic_dec() on inode ref counter or mm ref counter: It's also a cache line ping pong on SMP. It also increases mmap_sem hold time because of cache misses. Most of these scalability problems come from the fact that futexes are in one global namespace. As we use a central hash table, we must make sure they are all using the same reference (given by the mm subsystem). We chose to force all futexes be 'shared'. This has a cost. But fact is POSIX defined PRIVATE and SHARED, allowing clear separation, and optimal performance if carefuly implemented. Time has come for linux to have better threading performance. The goal is to permit new futex commands to avoid : - Taking the mmap_sem semaphore, conflicting with other subsystems. - Modifying a ref_count on mm or an inode, still conflicting with mm or fs. This is possible because, for one process using PTHREAD_PROCESS_PRIVATE futexes, we only need to distinguish futexes by their virtual address, no matter the underlying mm storage is. If glibc wants to exploit this new infrastructure, it should use new _PRIVATE futex subcommands for PTHREAD_PROCESS_PRIVATE futexes. And be prepared to fallback on old subcommands for old kernels. Using one global variable with the FUTEX_PRIVATE_FLAG or 0 value should be OK. PTHREAD_PROCESS_SHARED futexes should still use the old subcommands. Compatibility with old applications is preserved, they still hit the scalability problems, but new applications can fly :) Note : the same SHARED futex (mapped on a file) can be used by old binaries *and* new binaries, because both binaries will use the old subcommands. Note : Vast majority of futexes should be using PROCESS_PRIVATE semantic, as this is the default semantic. Almost all applications should benefit of this changes (new kernel and updated libc) Some bench results on a Pentium M 1.6 GHz (SMP kernel on a UP machine) /* calling futex_wait(addr, value) with value != *addr */ 433 cycles per futex(FUTEX_WAIT) call (mixing 2 futexes) 424 cycles per futex(FUTEX_WAIT) call (using one futex) 334 cycles per futex(FUTEX_WAIT_PRIVATE) call (mixing 2 futexes) 334 cycles per futex(FUTEX_WAIT_PRIVATE) call (using one futex) For reference : 187 cycles per getppid() call 188 cycles per umask() call 181 cycles per ni_syscall() call Signed-off-by: Eric Dumazet Pierre Peiffer Cc: "Ulrich Drepper" Cc: "Nick Piggin" Cc: "Ingo Molnar" Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0aa7a70bf03b9de9e995ab272293be1f7937822 Author: Pierre Peiffer Date: Wed May 9 02:35:02 2007 -0700 futex_requeue_pi optimization This patch provides the futex_requeue_pi functionality, which allows some threads waiting on a normal futex to be requeued on the wait-queue of a PI-futex. This provides an optimization, already used for (normal) futexes, to be used with the PI-futexes. This optimization is currently used by the glibc in pthread_broadcast, when using "normal" mutexes. With futex_requeue_pi, it can be used with PRIO_INHERIT mutexes too. Signed-off-by: Pierre Peiffer Cc: Ingo Molnar Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c19384b5b296905d4988c7c684ff540a0f9d65be Author: Pierre Peiffer Date: Wed May 9 02:35:02 2007 -0700 Make futex_wait() use an hrtimer for timeout This patch modifies futex_wait() to use an hrtimer + schedule() in place of schedule_timeout(). schedule_timeout() is tick based, therefore the timeout granularity is the tick (1 ms, 4 ms or 10 ms depending on HZ). By using a high resolution timer for timeout wakeup, we can attain a much finer timeout granularity (in the microsecond range). This parallels what is already done for futex_lock_pi(). The timeout passed to the syscall is no longer converted to jiffies and is therefore passed to do_futex() and futex_wait() as an absolute ktime_t therefore keeping nanosecond resolution. Also this removes the need to pass the nanoseconds timeout part to futex_lock_pi() in val2. In futex_wait(), if there is no timeout then a regular schedule() is performed. Otherwise, an hrtimer is fired before schedule() is called. [akpm@linux-foundation.org: fix `make headers_check'] Signed-off-by: Sebastien Dugue Signed-off-by: Pierre Peiffer Cc: Ingo Molnar Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec92d08292d3e9b0823eba138a4564d2d39f25c7 Author: Pierre Peiffer Date: Wed May 9 02:35:00 2007 -0700 futex priority based wakeup Today, all threads waiting for a given futex are woken in FIFO order (first waiter woken first) instead of priority order. This patch makes use of plist (pirotity ordered lists) instead of simple list in futex_hash_bucket. All non-RT threads are stored with priority MAX_RT_PRIO, causing them to be woken last, in FIFO order (RT-threads are woken first, in priority order). Signed-off-by: Sebastien Dugue Signed-off-by: Pierre Peiffer Cc: Ingo Molnar Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f34c506b0385b43abd25c490335036ecbb173aed Author: Andrew Morton Date: Wed May 9 02:34:59 2007 -0700 declare struct ktime Some smarty went and inflicted ktime_t as a typedef upon us, so we cannot forward declare it. Create a new `union ktime', map ktime_t onto that. Now we need to kill off this ktime_t thing. Cc: Ingo Molnar Cc: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8522ead3534c6cd06752b47a3bc380956191a2a Author: Andrew Morton Date: Wed May 9 02:34:58 2007 -0700 aio is unlikely Stick an unlikely() around is_aio(): I assert that most IO is synchronous. Cc: Suparna Bhattacharya Cc: Ingo Molnar Cc: Benjamin LaHaise Cc: Zach Brown Cc: Ulrich Drepper Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41eeef14d7c73af6d16c7d02b7a939082a137ff Author: NeilBrown Date: Wed May 9 02:34:57 2007 -0700 knfsd: avoid Oops if buggy userspace performs confusing filehandle->dentry mapping When a lookup request arrives, nfsd uses information provided by userspace (mountd) to find the right filesystem. It then assumes that the same filehandle type as the incoming filehandle can be used to create an outgoing filehandle. However if mountd is buggy, or maybe just being creative, the filesystem may not support that filesystem type, and the kernel could oops, particularly if 'ex_uuid' is NULL but a FSID_UUID* filehandle type is used. So add some proper checking that the fsid version/type from the incoming filehandle is actually supportable, and ignore that information if it isn't supportable. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 072f62ed85a71bbb3429a52678500ec9f9441e0d Author: NeilBrown Date: Wed May 9 02:34:57 2007 -0700 knfsd: various nfsd xdr cleanups 1/ decode_sattr and decode_sattr3 never return NULL, so remove several checks for that. ditto for xdr_decode_hyper. 2/ replace some open coded XDR_QUADLEN calls with calls to XDR_QUADLEN 3/ in decode_writeargs, simply an 'if' to use a single calculation. .page_len is the length of that part of the packet that did not fit in the first page (the head). So the length of the data part is the remainder of the head, plus page_len. 3/ other minor cleanups. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f725b217b16e2cb1777c5a6e13c99f7913f1514a Author: Christoph Hellwig Date: Wed May 9 02:34:56 2007 -0700 knfsd: trivial makefile cleanup kbuild directly interprets -y as objects to build into a module, no need to assign it to the old foo-objs variable. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05ed690efbb28b54af79f97af8c9705e82a6fbd7 Author: NeilBrown Date: Wed May 9 02:34:55 2007 -0700 knfsd: simplify a 'while' condition in svcsock.c This while loop has an overly complex condition, which performs a couple of assignments. This hurts readability. We don't really need a loop at all. We can just return -EAGAIN and (providing we set SK_DATA), the function will be called again. So discard the loop, make the complex conditional become a few clear function calls, and hopefully improve readability. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5e434c98b49f4877ea1614a629499e082b1a818 Author: Wei Yongjun Date: Wed May 9 02:34:54 2007 -0700 knfsd: rpcgss: RPC_GSS_PROC_ DESTROY request will get a bad rpc If I send a RPC_GSS_PROC_DESTROY message to NFSv4 server, it will reply with a bad rpc reply which lacks an authentication verifier. Maybe this patch is needed. Send/recv packets as following: send: RemoteProcedureCall xid rpcvers = 2 prog = 100003 vers = 4 proc = 0 cred = AUTH_GSS version = 1 gss_proc = 3 (RPCSEC_GSS_DESTROY) service = 1 (RPC_GSS_SVC_NONE) verf = AUTH_GSS checksum reply: RemoteProcedureReply xid msg_type reply_stat accepted_reply Signed-off-by: Wei Yongjun Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54f9247b3f6e51b24a4b7e873b3ab34d8e59dc45 Author: Frank Filz Date: Wed May 9 02:34:53 2007 -0700 knfsd: fix resource leak resulting in module refcount leak for rpcsec_gss_krb5.ko I have been investigating a module reference count leak on the server for rpcsec_gss_krb5.ko. It turns out the problem is a reference count leak for the security context in net/sunrpc/auth_gss/svcauth_gss.c. The problem is that gss_write_init_verf() calls gss_svc_searchbyctx() which does a rsc_lookup() but never releases the reference to the context. There is another issue that rpc.svcgssd sets an "end of time" expiration for the context By adding a cache_put() call in gss_svc_searchbyctx(), and setting an expiration timeout in the downcall, cache_clean() does clean up the context and the module reference count now goes to zero after unmount. I also verified that if the context expires and then the client makes a new request, a new context is established. Here is the patch to fix the kernel, I will start a separate thread to discuss what expiration time should be set by rpc.svcgssd. Acked-by: "J. Bruce Fields" Signed-off-by: Frank Filz Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 153e44d22fb5f98198f90fbf56e89b345e48534d Author: NeilBrown Date: Wed May 9 02:34:52 2007 -0700 knfsd: rpc: fix server-side wrapping of krb5i replies It's not necessarily correct to assume that the xdr_buf used to hold the server's reply must have page data whenever it has tail data. And there's no need for us to deal with that case separately anyway. Acked-by: "J. Bruce Fields" Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 402acd29e552cb80109d1d5c0ada53f634465d87 Author: NeilBrown Date: Wed May 9 02:34:52 2007 -0700 knfsd: avoid use of unitialised variables on error path when nfs exports We need to zero various parts of 'exp' before any 'goto out', otherwise when we go to free the contents... we die. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bd5f5812bfa753218e02cb773e06ede48055798 Author: Akinobu Mita Date: Wed May 9 02:34:51 2007 -0700 sunrpc: fix error path in module_init register_rpc_pipefs() needs to clean up rpc_inode_cache by kmem_cache_destroy() on register_filesystem() failure. init_sunrpc() needs to unregister rpc_pipe_fs by unregister_rpc_pipefs() when rpc_init_mempool() returns error. Signed-off-by: Akinobu Mita Cc: Neil Brown Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd123012d99fde4759500fee611e724e4f3016e3 Author: Jeff Layton Date: Wed May 9 02:34:50 2007 -0700 RPC: add wrapper for svc_reserve to account for checksum When the kernel calls svc_reserve to downsize the expected size of an RPC reply, it fails to account for the possibility of a checksum at the end of the packet. If a client mounts a NFSv2/3 with sec=krb5i/p, and does I/O then you'll generally see messages similar to this in the server's ring buffer: RPC request reserved 164 but used 208 While I was never able to verify it, I suspect that this problem is also the root cause of some oopses I've seen under these conditions: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=227726 This is probably also a problem for other sec= types and for NFSv4. The large reserved size for NFSv4 compound packets seems to generally paper over the problem, however. This patch adds a wrapper for svc_reserve that accounts for the possibility of a checksum. It also fixes up the appropriate callers of svc_reserve to call the wrapper. For now, it just uses a hardcoded value that I determined via testing. That value may need to be revised upward as things change, or we may want to eventually add a new auth_op that attempts to calculate this somehow. Unfortunately, there doesn't seem to be a good way to reliably determine the expected checksum length prior to actually calculating it, particularly with schemes like spkm3. Signed-off-by: Jeff Layton Acked-by: Neil Brown Cc: Trond Myklebust Acked-by: J. Bruce Fields Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 669716433598a1498049e75a84a5aaf69c8da173 Author: Eric W. Biederman Date: Wed May 9 02:34:49 2007 -0700 nfsd/nfs4state: remove unnecessary daemonize call Acked-by: Neil Brown Cc: Trond Myklebust Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ac1bea5507218da03f6005d228789da5a831c3f Author: NeilBrown Date: Wed May 9 02:34:48 2007 -0700 knfsd: rename sk_defer_lock to sk_lock Now that sk_defer_lock protects two different things, make the name more generic. Also don't bother with disabling _bh as the lock is only ever taken from process context. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f34b95689d2ce001c157b1604289ff240b4bdee0 Author: Peter Staubach Date: Wed May 9 02:34:48 2007 -0700 The NFSv2/NFSv3 server does not handle zero length WRITE requests correctly The NFSv2 and NFSv3 servers do not handle WRITE requests for 0 bytes correctly. The specifications indicate that the server should accept the request, but it should mostly turn into a no-op. Currently, the server will return an XDR decode error, which it should not. Attached is a patch which addresses this issue. It also adds some boundary checking to ensure that the request contains as much data as was requested to be written. It also correctly handles an NFSv3 request which requests to write more data than the server has stated that it is prepared to handle. Previously, there was some support which looked like it should work, but wasn't quite right. Signed-off-by: Peter Staubach Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8842c9655b2b7f0e8e6c50a773b649e5d8a57678 Author: Adrian Bunk Date: Wed May 9 02:34:46 2007 -0700 remove nfs4_acl_add_ace() nfs4_acl_add_ace() can now be removed. Signed-off-by: Adrian Bunk Acked-by: Neil Brown Acked-by: J. Bruce Fields Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e84d644b5929789398914b0ccf447355dec6fb0 Author: Oleg Nesterov Date: Wed May 9 02:34:46 2007 -0700 make cancel_rearming_delayed_work() reliable Thanks to Jarek Poplawski for the ideas and for spotting the bug in the initial draft patch. cancel_rearming_delayed_work() currently has many limitations, because it requires that dwork always re-arms itself via queue_delayed_work(). So it hangs forever if dwork doesn't do this, or cancel_rearming_delayed_work/ cancel_delayed_work was already called. It uses flush_workqueue() in a loop, so it can't be used if workqueue was freezed, and it is potentially live- lockable on busy system if delay is small. With this patch cancel_rearming_delayed_work() doesn't make any assumptions about dwork, it can re-arm itself via queue_delayed_work(), or queue_work(), or do nothing. As a "side effect", cancel_work_sync() was changed to handle re-arming works as well. Disadvantages: - this patch adds wmb() to insert_work(). - slowdowns the fast path (when del_timer() succeeds on entry) of cancel_rearming_delayed_work(), because wait_on_work() is called unconditionally. In that case, compared to the old version, we are doing "unneeded" lock/unlock for each online CPU. On the other hand, this means we don't need to use cancel_work_sync() after cancel_rearming_delayed_work(). - complicates the code (.text grows by 130 bytes). [akpm@linux-foundation.org: fix speling] Signed-off-by: Oleg Nesterov Cc: David Chinner Cc: David Howells Cc: Gautham Shenoy Acked-by: Jarek Poplawski Cc: Srivatsa Vaddagiri Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b0834c26fd796c79dfcc3939ed2b9122b75246f Author: Gautham R Shenoy Date: Wed May 9 02:34:41 2007 -0700 Remove kthread_bind() call from _cpu_down() We are anyway kthread_stop()ping other per-cpu kernel threads after move_task_off_dead_cpu(), so we can do it with the stop_machine_run thread as well. I just checked with Vatsa if there was any subtle reason why they had put in the kthread_bind() in cpu.c. Vatsa cannot seem to recollect any and I can't see any. So let us just remove the kthread_bind. Signed-off-by: Gautham R Shenoy Cc: Oleg Nesterov Cc: "Eric W. Biederman" Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ab825bdef8df510f99c703a5a2d9b13a4e31a5 Author: Oleg Nesterov Date: Wed May 9 02:34:37 2007 -0700 change kernel threads to ignore signals instead of blocking them Currently kernel threads use sigprocmask(SIG_BLOCK) to protect against signals. This doesn't prevent the signal delivery, this only blocks signal_wake_up(). Every "killall -33 kthreadd" means a "struct siginfo" leak. Change kthreadd_setup() to set all handlers to SIG_IGN instead of blocking them (make a new helper ignore_signals() for that). If the kernel thread needs some signal, it should use allow_signal() anyway, and in that case it should not use CLONE_SIGHAND. Note that we can't change daemonize() (should die!) in the same way, because it can be used along with CLONE_SIGHAND. This means that allow_signal() still should unblock the signal to work correctly with daemonize()ed threads. However, disallow_signal() doesn't block the signal any longer but ignores it. NOTE: with or without this patch the kernel threads are not protected from handle_stop_signal(), this seems harmless, but not good. Signed-off-by: Oleg Nesterov Acked-by: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5de18d169739293e27e0cf9acfc75a2d2f4aa572 Author: Oleg Nesterov Date: Wed May 9 02:34:36 2007 -0700 worker_thread: don't play with SIGCHLD and numa policy worker_thread() inherits ignored SIGCHLD and numa_default_policy() from its parent, kthreadd. No need to setup this again. Signed-off-by: Oleg Nesterov Acked-by: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90cce03d9bfcb28600a56efef6b0a5a4fbf6c2b1 Author: Oleg Nesterov Date: Wed May 9 02:34:36 2007 -0700 wait_for_helper: remove unneeded do_sigaction() allow_signal(SIGCHLD) does all necessary job, no need to call do_sigaction() prior to. Signed-off-by: Oleg Nesterov Cc: Rusty Russell Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8a124da9261873e3e3541898d5c46d273afee34 Author: Oleg Nesterov Date: Wed May 9 02:34:35 2007 -0700 usbatm_heavy_init: don't use CLONE_SIGHAND usbatm_do_heavy_init() calls allow_signal() which plays with parent process's ->sighand. Signed-off-by: Oleg Nesterov Acked-by: Duncan Sands Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d769d52e16efabd3ad47b7995522fff771371d Author: Eric W. Biederman Date: Wed May 9 02:34:33 2007 -0700 Change reparent_to_init to reparent_to_kthreadd When a kernel thread calls daemonize, instead of reparenting the thread to init reparent the thread to kthreadd next to the threads created by kthread_create. This is really just a stop gap until daemonize goes away, but it does ensure no kernel threads are under init and they are all in one place that is easy to find. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73c279927f89561ecb45b2dfdf9314bafcfd9f67 Author: Eric W. Biederman Date: Wed May 9 02:34:32 2007 -0700 kthread: don't depend on work queues Currently there is a circular reference between work queue initialization and kthread initialization. This prevents the kthread infrastructure from initializing until after work queues have been initialized. We want the properties of tasks created with kthread_create to be as close as possible to the init_task and to not be contaminated by user processes. The later we start our kthreadd that creates these tasks the harder it is to avoid contamination from user processes and the more of a mess we have to clean up because the defaults have changed on us. So this patch modifies the kthread support to not use work queues but to instead use a simple list of structures, and to have kthreadd start from init_task immediately after our kernel thread that execs /sbin/init. By being a true child of init_task we only have to change those process settings that we want to have different from init_task, such as our process name, the cpus that are allowed, blocking all signals and setting SIGCHLD to SIG_IGN so that all of our children are reaped automatically. By being a true child of init_task we also naturally get our ppid set to 0 and do not wind up as a child of PID == 1. Ensuring that tasks generated by kthread_create will not slow down the functioning of the wait family of functions. [akpm@linux-foundation.org: use interruptible sleeps] Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c93465181fed0f8f5942a41108943dadea0aa345 Author: Oleg Nesterov Date: Wed May 9 02:34:23 2007 -0700 ____call_usermodehelper: don't flush_signals() ____call_usermodehelper() has no reason for flush_signals(). It is a fresh forked process which is going to exec a user-space application or exit on failure. Signed-off-by: Oleg Nesterov Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28e53bddf814485699a4142bc056fd37d4e11dd4 Author: Oleg Nesterov Date: Wed May 9 02:34:22 2007 -0700 unify flush_work/flush_work_keventd and rename it to cancel_work_sync flush_work(wq, work) doesn't need the first parameter, we can use cwq->wq (this was possible from the very beginnig, I missed this). So we can unify flush_work_keventd and flush_work. Also, rename flush_work() to cancel_work_sync() and fix all callers. Perhaps this is not the best name, but "flush_work" is really bad. (akpm: this is why the earlier patches bypassed maintainers) Signed-off-by: Oleg Nesterov Cc: Jeff Garzik Cc: "David S. Miller" Cc: Jens Axboe Cc: Tejun Heo Cc: Auke Kok , Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5830c5902138f80b0a097b797200c739466beedd Author: Christoph Lameter Date: Wed May 9 02:34:22 2007 -0700 slab: shut down cache_reaper when cpu goes down Shutdown the cache_reaper if the cpu is brought down and set the cache_reap.func to NULL. Otherwise hotplug shuts down the reaper for good. Signed-off-by: Christoph Lameter Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4798833d26b293fd18b7bf102991426aa0b56fd Author: Oleg Nesterov Date: Wed May 9 02:34:21 2007 -0700 zap_other_threads: remove unneeded ->exit_signal change We already depend on fact that all sub-threads have ->exit_signal == -1, no need to set it in zap_other_threads(). Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85f4186af944c1240c84934a9ab578743df2d69b Author: Oleg Nesterov Date: Wed May 9 02:34:20 2007 -0700 worker_thread: fix racy try_to_freeze() usage worker_thread() can miss freeze_process()->signal_wake_up() if it happens between try_to_freeze() and prepare_to_wait(). We should check freezing() before entering schedule(). This race was introduced by me in [PATCH 1/1] workqueue: don't migrate pending works from the dead CPU Looks like mm/vmscan.c:kswapd() has the same race. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9aac8e0d32499217417ff0b494731811f185b18 Author: Oleg Nesterov Date: Wed May 9 02:34:20 2007 -0700 worker_thread: don't play with signals worker_thread() doesn't need to "Block and flush all signals", this was already done by its caller, kthread(). Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23b2e5991afde5af91a1a661d7f47ee56120759e Author: Oleg Nesterov Date: Wed May 9 02:34:19 2007 -0700 workqueue: kill NOAUTOREL works We don't have any users, and it is not so trivial to use NOAUTOREL works correctly. It is better to simplify API. Delete NOAUTOREL support and rename work_release to work_clear_pending to avoid a confusion. Signed-off-by: Oleg Nesterov Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c214b2cc5f9be7c236f9b91acf524688ff0e3e72 Author: Oleg Nesterov Date: Wed May 9 02:34:18 2007 -0700 ipvs: flush defense_work before module unload net/ipv4/ipvs/ip_vs_core.c module_exit ip_vs_cleanup ip_vs_control_cleanup cancel_rearming_delayed_work // done This is unsafe. The module may be unloaded and the memory may be freed while defense_work's handler is still running/preempted. Do flush_work(&defense_work.work) after cancel_rearming_delayed_work(). Alternatively, we could add flush_work() to cancel_rearming_delayed_work(), but note that we can't change cancel_delayed_work() in the same manner because it may be called from atomic context. Signed-off-by: Oleg Nesterov Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1634c48f8b85dcb05101f1eb2eab9af40b5976da Author: Oleg Nesterov Date: Wed May 9 02:34:18 2007 -0700 make cancel_rearming_delayed_work() work on any workqueue, not just keventd_wq cancel_rearming_delayed_workqueue(wq, dwork) doesn't need the first parameter. We don't hang on un-queued dwork any longer, and work->data doesn't change its type. This means we can always figure out "wq" from dwork when it is needed. Remove this parameter, and rename the function to cancel_rearming_delayed_work(). Re-create an inline "obsolete" cancel_rearming_delayed_workqueue(wq) which just calls cancel_rearming_delayed_work(). Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a848e3b67c07ed79374bd0f9b82f9ce45a419643 Author: Oleg Nesterov Date: Wed May 9 02:34:17 2007 -0700 workqueue: introduce wq_per_cpu() helper Cleanup. A number of per_cpu_ptr(wq->cpu_wq, cpu) users have to check that cpu is valid for this wq. Make a simple helper. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63bc0362521cbaae3ed17b8de7b094f9492453f0 Author: Oleg Nesterov Date: Wed May 9 02:34:16 2007 -0700 unify queue_delayed_work() and queue_delayed_work_on() Change queue_delayed_work() to use queue_delayed_work_on() to avoid the code duplication (saves 133 bytes). Q: queue_delayed_work() enqueues &dwork->work directly when delay == 0, why? [jirislaby@gmail.com: oops fix] Signed-off-by: Oleg Nesterov Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed7c0feede39d70092d048ec30f59bb1df69eec6 Author: Oleg Nesterov Date: Wed May 9 02:34:16 2007 -0700 make queue_delayed_work() friendly to flush_fork() Currently typeof(delayed_work->work.data) is "struct workqueue_struct" when the timer is pending "struct cpu_workqueue_struct" whe the work is queued This makes impossible to use flush_fork(delayed_work->work) in addition to cancel_delayed_work/cancel_rearming_delayed_work, not good. Change queue_delayed_work/delayed_work_timer_fn to use cwq, not wq. This complicates (and uglifies) these functions a little bit, but alows us to use flush_fork(dwork) and imho makes the whole code more consistent. Also, document the fact that cancel_rearming_delayed_work() doesn't garantee the completion of work->func() upon return. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06ba38a9a0f6ceffe70343f684c5a690e3710ef4 Author: Oleg Nesterov Date: Wed May 9 02:34:15 2007 -0700 workqueues: shift kthread_bind() from CPU_UP_PREPARE to CPU_ONLINE CPU_UP_PREPARE binds cwq->thread to the new CPU. So CPU_UP_CANCELED tries to wake up the task which is bound to the failed CPU. With this patch we don't bind cwq->thread until CPU becomes online. The first wake_up() after kthread_create() is a bit special, make a simple helper for that. Signed-off-by: Oleg Nesterov Cc: Gautham R Shenoy Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c12920d19078eb8fd99560ec232a6e05c6ff1aa8 Author: Oleg Nesterov Date: Wed May 9 02:34:14 2007 -0700 workqueue: make init_workqueues() __init The only caller of init_workqueues() is do_basic_setup(). Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cce1a1656c9a3fdc6c6c1029b576e4ab6ecaac37 Author: Oleg Nesterov Date: Wed May 9 02:34:13 2007 -0700 workqueue: introduce workqueue_struct->singlethread Add explicit workqueue_struct->singlethread flag. This lessens .text a little, but most importantly this allows us to manipulate wq->list without changine the meaning of is_single_threaded(). Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1f4ec172f75bc2f5cc4f4be69b5587660a955d2 Author: Oleg Nesterov Date: Wed May 9 02:34:12 2007 -0700 workqueue: introduce cpu_singlethread_map The code like if (is_single_threaded(wq)) do_something(singlethread_cpu); else { for_each_cpu_mask(cpu, cpu_populated_map) do_something(cpu); } looks very annoying. We can add "static cpumask_t cpu_singlethread_map" and simplify the code. Lessens .text a bit, and imho makes the code more readable. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfb4b82e1c631b1a6057e77212996a890aa515b7 Author: Oleg Nesterov Date: Wed May 9 02:34:11 2007 -0700 workqueue: make cancel_rearming_delayed_workqueue() work on idle dwork cancel_rearming_delayed_workqueue(dwork) will hang forever if dwork was not scheduled, because in that case cancel_delayed_work()->del_timer_sync() never returns true. I don't know if there are any callers which may have problems, but this is not so convenient, and the fix is very simple. Q: looks like we don't need "struct workqueue_struct *wq" parameter. If the timer was aborted successfully, get_wq_data() == wq. Is it worth to add the new function? Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f293ea92007419e4f9c52db0cf57af17f45b9f94 Author: Oleg Nesterov Date: Wed May 9 02:34:10 2007 -0700 workqueue: don't save interrupts in run_workqueue() work->func() may sleep, it's a bug to call run_workqueue() with irqs disabled. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7097a87afe937a5879528d52880c2d95f089e96c Author: Oleg Nesterov Date: Wed May 9 02:34:10 2007 -0700 workqueue: kill run_scheduled_work() Because it has no callers. Actually, I think the whole idea of run_scheduled_work() was not right, not good to mix "unqueue this work and execute its ->func()" in one function. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3af24433efac62f451bfdb1cf1edb7181fb73645 Author: Oleg Nesterov Date: Wed May 9 02:34:09 2007 -0700 workqueue: don't migrate pending works from the dead CPU Currently CPU_DEAD uses kthread_stop() to stop cwq->thread and then transfers cwq->worklist to another CPU. However, it is very unlikely that worker_thread() will notice kthread_should_stop() before flushing cwq->worklist. It is only possible if worker_thread() was preempted after run_workqueue(cwq), a new work_struct was added, and CPU_DEAD happened before cwq->thread has a chance to run. This means that take_over_work() mostly adds unneeded complications. Note also that kthread_stop() is not good per se, wake_up_process() may confuse work->func() if it sleeps waiting for some event. Remove take_over_work() and migrate_sequence complications. CPU_DEAD sets the cwq->should_stop flag (introduced by this patch) and waits for cwq->thread to flush cwq->worklist and exit. Because the dead CPU is not on cpu_online_map, no more works can be added to that cwq. cpu_populated_map was introduced to optimize for_each_possible_cpu(), it is not strictly needed, and it is more a documentation in fact. Saves 418 bytes. Signed-off-by: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: "Pallipadi, Venkatesh" Cc: Gautham shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36aa9dfc39bf473780439f5629c30f59d677e793 Author: Oleg Nesterov Date: Wed May 9 02:34:08 2007 -0700 workqueue: don't clear cwq->thread until it exits Pointed out by Srivatsa Vaddagiri. cleanup_workqueue_thread() sets cwq->thread = NULL and does kthread_stop(). This breaks the "if (cwq->thread == current)" logic in flush_cpu_workqueue() and leads to deadlock. Kill the thead first, then clear cwq->thread. workqueue_mutex protects us from create_workqueue_thread() so we don't need cwq->lock. Signed-off-by: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: "Pallipadi, Venkatesh" Cc: Gautham shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d721304dce0ced0b3b0366996cc02929669708a8 Author: Oleg Nesterov Date: Wed May 9 02:34:07 2007 -0700 workqueue: fix flush_workqueue() vs CPU_DEAD race Many thanks to Srivatsa Vaddagiri for the helpful discussion and for spotting the bug in my previous attempt. work->func() (and thus flush_workqueue()) must not use workqueue_mutex, this leads to deadlock when CPU_DEAD does kthread_stop(). However without this mutex held we can't detect CPU_DEAD in progress, which can move pending works to another CPU while the dead one is not on cpu_online_map. Change flush_workqueue() to use for_each_possible_cpu(). This means that flush_cpu_workqueue() may hit CPU which is already dead. However in that case !list_empty(&cwq->worklist) || cwq->current_work != NULL means that CPU_DEAD in progress, it will do kthread_stop() + take_over_work() so we can proceed and insert a barrier. We hold cwq->lock, so we are safe. Also, add migrate_sequence incremented by take_over_work() under cwq->lock. If take_over_work() happened before we checked this CPU, we should see the new value after spin_unlock(). Further possible changes: remove CPU_DEAD handling (along with take_over_work, migrate_sequence) from workqueue.c. CPU_DEAD just sets cwq->please_exit_after_flush flag. CPU_UP_PREPARE->create_workqueue_thread() clears this flag, and creates the new thread if cwq->thread == NULL. This way the workqueue/cpu-hotplug interaction is almost zero, workqueue_mutex just protects "workqueues" list, CPU_LOCK_ACQUIRE/CPU_LOCK_RELEASE go away. Signed-off-by: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: "Pallipadi, Venkatesh" Cc: Gautham shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 319c2a986eb45989690c955d9667b814ef0ed56f Author: Oleg Nesterov Date: Wed May 9 02:34:06 2007 -0700 workqueue: fix freezeable workqueues implementation Currently ->freezeable is per-cpu, this is wrong. CPU_UP_PREPARE creates cwq->thread which is not freezeable. Move ->freezeable to workqueue_struct. Signed-off-by: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: "Pallipadi, Venkatesh" Cc: Gautham shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38c3bd96a0a7d375e12f173c34fbebf9f153cb56 Author: Heiko Carstens Date: Wed May 9 02:34:05 2007 -0700 slab: use CPU_LOCK_[ACQUIRE|RELEASE] Looks like this was forgotten when CPU_LOCK_[ACQUIRE|RELEASE] was introduced. Cc: Pekka Enberg Cc: Srivatsa Vaddagiri Cc: Gautham Shenoy Signed-off-by: Heiko Carstens Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7407dcc69e077ac34a527842db916abfbc458df Author: Heiko Carstens Date: Wed May 9 02:34:04 2007 -0700 call cpu_chain with CPU_DOWN_FAILED if CPU_DOWN_PREPARE failed This makes cpu hotplug symmetrical: if CPU_UP_PREPARE fails we get CPU_UP_CANCELED, so we can undo what ever happened on PREPARE. The same should happen for CPU_DOWN_PREPARE. [akpm@linux-foundation.org: fix for reduce-size-of-task_struct-on-64-bit-machines] Cc: Srivatsa Vaddagiri Cc: Gautham Shenoy Signed-off-by: Heiko Carstens Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5be9361cdff17fc76fa0c3e262ead94158555f16 Author: Gautham R Shenoy Date: Wed May 9 02:34:04 2007 -0700 Eliminate lock_cpu_hotplug in kernel/schedc Eliminate lock_cpu_hotplug from kernel/sched.c and use sched_hotcpu_mutex instead to postpone a hotplug event. In the migration_call hotcpu callback function, take sched_hotcpu_mutex while handling the event CPU_LOCK_ACQUIRE and release it while handling CPU_LOCK_RELEASE event. [akpm@linux-foundation.org: fix deadlock] Signed-off-by: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baaca49f415b25fdbe2a8f3c22b39929e450fbfd Author: Gautham R Shenoy Date: Wed May 9 02:34:03 2007 -0700 Define and use new events,CPU_LOCK_ACQUIRE and CPU_LOCK_RELEASE This is an attempt to provide an alternate mechanism for postponing a hotplug event instead of using a global mechanism like lock_cpu_hotplug. The proposal is to add two new events namely CPU_LOCK_ACQUIRE and CPU_LOCK_RELEASE. The notification for these two events would be sent out before and after a cpu_hotplug event respectively. During the CPU_LOCK_ACQUIRE event, a cpu-hotplug-aware subsystem is supposed to acquire any per-subsystem hotcpu mutex ( Eg. workqueue_mutex in kernel/workqueue.c ). During the CPU_LOCK_RELEASE release event the cpu-hotplug-aware subsystem is supposed to release the per-subsystem hotcpu mutex. The reasons for defining new events as opposed to reusing the existing events like CPU_UP_PREPARE/CPU_UP_FAILED/CPU_ONLINE for locking/unlocking of per-subsystem hotcpu mutexes are as follow: - CPU_LOCK_ACQUIRE: All hotcpu mutexes are taken before subsystems start handling pre-hotplug events like CPU_UP_PREPARE/CPU_DOWN_PREPARE etc, thus ensuring a clean handling of these events. - CPU_LOCK_RELEASE: The hotcpu mutexes will be released only after all subsystems have handled post-hotplug events like CPU_DOWN_FAILED, CPU_DEAD,CPU_ONLINE etc thereby ensuring that there are no subsequent clashes amongst the interdependent subsystems after a cpu hotplugs. This patch also uses __raw_notifier_call chain in _cpu_up to take care of the dependency between the two consequetive calls to raw_notifier_call_chain. [akpm@linux-foundation.org: fix a bug] Signed-off-by: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f7cc11aa6c7d5002e16096c7590944daece70ed Author: Gautham R Shenoy Date: Wed May 9 02:34:02 2007 -0700 Extend notifier_call_chain to count nr_calls made Since 2.6.18-something, the community has been bugged by the problem to provide a clean and a stable mechanism to postpone a cpu-hotplug event as lock_cpu_hotplug was badly broken. This is another proposal towards solving that problem. This one is along the lines of the solution provided in kernel/workqueue.c Instead of having a global mechanism like lock_cpu_hotplug, we allow the subsytems to define their own per-subsystem hot cpu mutexes. These would be taken(released) where ever we are currently calling lock_cpu_hotplug(unlock_cpu_hotplug). Also, in the per-subsystem hotcpu callback function,we take this mutex before we handle any pre-cpu-hotplug events and release it once we finish handling the post-cpu-hotplug events. A standard means for doing this has been provided in [PATCH 2/4] and demonstrated in [PATCH 3/4]. The ordering of these per-subsystem mutexes might still prove to be a problem, but hopefully lockdep should help us get out of that muddle. The patch set to be applied against linux-2.6.19-rc5 is as follows: [PATCH 1/4] : Extend notifier_call_chain with an option to specify the number of notifications to be sent and also count the number of notifications actually sent. [PATCH 2/4] : Define events CPU_LOCK_ACQUIRE and CPU_LOCK_RELEASE and send out notifications for these in _cpu_up and _cpu_down. This would help us standardise the acquire and release of the subsystem locks in the hotcpu callback functions of these subsystems. [PATCH 3/4] : Eliminate lock_cpu_hotplug from kernel/sched.c. [PATCH 4/4] : In workqueue_cpu_callback function, acquire(release) the workqueue_mutex while handling CPU_LOCK_ACQUIRE(CPU_LOCK_RELEASE). If the per-subsystem-locking approach survives the test of time, we can expect a slow phasing out of lock_cpu_hotplug, which has not yet been eliminated in these patches :) This patch: Provide notifier_call_chain with an option to call only a specified number of notifiers and also record the number of call to notifiers made. The need for this enhancement was identified in the post entitled "Slab - Eliminate lock_cpu_hotplug from slab" (http://lkml.org/lkml/2006/10/28/92) by Ravikiran G Thirumalai and Andrew Morton. This patch adds two additional parameters to notifier_call_chain API namely - int nr_to_calls : Number of notifier_functions to be called. The don't care value is -1. - unsigned int *nr_calls : Records the total number of notifier_funtions called by notifier_call_chain. The don't care value is NULL. [michal.k.k.piotrowski@gmail.com: build fix] Credit: Andrew Morton Signed-off-by: Gautham R Shenoy Signed-off-by: Michal Piotrowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c9cb38302e78d24e37f7d8a2ea7eed4ae5f2fa7 Author: Tom Zanussi Date: Wed May 9 02:34:01 2007 -0700 relay: use plain timer instead of delayed work relay doesn't need to use schedule_delayed_work() for waking readers when a simple timer will do. Signed-off-by: Tom Zanussi Cc: Satyam Sharma Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0758bc334780d70266c1d1b974ed26f740a0819 Author: Andrew Morton Date: Wed May 9 02:34:00 2007 -0700 phy: use flush_work_keventd() (akpm: bypassed maintainers, sorry. There are other patches which depend on this) Cc: "Maciej W. Rozycki" Cc: David Howells Cc: Jeff Garzik Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67ac58edf771b10f8e89bf9fe1ccf6c9b92ce063 Author: Andrew Morton Date: Wed May 9 02:33:59 2007 -0700 libata: use flush_work() (akpm: bypassed maintainers, sorry. There are other patches which depend on this) Cc: "Maciej W. Rozycki" Cc: David Howells Cc: Jeff Garzik Cc: Oleg Nesterov Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9ef8b92887c35f113cb749270530f87961f7a0a Author: Andrew Morton Date: Wed May 9 02:33:58 2007 -0700 e1000: use flush_work_keventd() Switch e1000 over to flush_work_keventd(). This probably fixes a netdev-close versus linkwatch rtnl_lock() deadlock which nobody knew about. (akpm: bypassed maintainers, sorry. There are other patches which depend on this) Cc: "Maciej W. Rozycki" Cc: David Howells Cc: "David S. Miller" Cc: Jeff Garzik Acked-by: Auke Kok Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b3cb2e778811a1df99e37fd7c359837501ab103 Author: Andrew Morton Date: Wed May 9 02:33:57 2007 -0700 tg3: use flush_work_keventd() Convert tg3 over to flush_work_keventd(). Remove nasty now-unneeded deadlock avoidance logic. (akpm: bypassed maintainers, sorry. There are other patches which depend on this) Cc: "Maciej W. Rozycki" Cc: David Howells Cc: "David S. Miller" Cc: Michael Chan Cc: Jeff Garzik Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19a75d83ffeab004cfcfac64024ad3997bac7220 Author: Andrew Morton Date: Wed May 9 02:33:56 2007 -0700 kblockd: use flush_work Switch the kblockd flushing from a global flush to a more specific flush_work(). (akpm: bypassed maintainers, sorry. There are other patches which depend on this) Cc: "Maciej W. Rozycki" Cc: David Howells Cc: Jens Axboe Cc: Nick Piggin Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9df62c7585e6caa1e7d2425b2b14460ec3afc20 Author: Andrew Morton Date: Wed May 9 02:33:54 2007 -0700 aio: use flush_work() Migrate AIO over to use flush_work(). Cc: "Maciej W. Rozycki" Cc: David Howells Cc: Zach Brown Cc: Benjamin LaHaise Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83c22520c51bf67529367e8237f95c03fe44e2da Author: Oleg Nesterov Date: Wed May 9 02:33:54 2007 -0700 flush_cpu_workqueue: don't flush an empty ->worklist Now when we have ->current_work we can avoid adding a barrier and waiting for its completition when cwq's queue is empty. Note: this change is also useful if we change flush_workqueue() to also check the dead CPUs. Signed-off-by: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: Gautham Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edab2516a6c1752e8e5e3d55727cabf12346e5df Author: Andrew Morton Date: Wed May 9 02:33:53 2007 -0700 flush_workqueue(): use preempt_disable to hold off cpu hotplug Cc: Oleg Nesterov Cc: Srivatsa Vaddagiri Cc: Gautham Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b89deed32ccc96098bd6bc953c64bba6b847774f Author: Oleg Nesterov Date: Wed May 9 02:33:52 2007 -0700 implement flush_work() A basic problem with flush_scheduled_work() is that it blocks behind _all_ presently-queued works, rather than just the work whcih the caller wants to flush. If the caller holds some lock, and if one of the queued work happens to want that lock as well then accidental deadlocks can occur. One example of this is the phy layer: it wants to flush work while holding rtnl_lock(). But if a linkwatch event happens to be queued, the phy code will deadlock because the linkwatch callback function takes rtnl_lock. So we implement a new function which will flush a *single* work - just the one which the caller wants to free up. Thus we avoid the accidental deadlocks which can arise from unrelated subsystems' callbacks taking shared locks. flush_work() non-blockingly dequeues the work_struct which we want to kill, then it waits for its handler to complete on all CPUs. Add ->current_work to the "struct cpu_workqueue_struct", it points to currently running "struct work_struct". When flush_work(work) detects ->current_work == work, it inserts a barrier at the _head_ of ->worklist (and thus right _after_ that work) and waits for completition. This means that the next work fired on that CPU will be this barrier, or another barrier queued by concurrent flush_work(), so the caller of flush_work() will be woken before any "regular" work has a chance to run. When wait_on_work() unlocks workqueue_mutex (or whatever we choose to protect against CPU hotplug), CPU may go away. But in that case take_over_work() will move a barrier we queued to another CPU, it will be fired sometime, and wait_on_work() will be woken. Actually, we are doing cleanup_workqueue_thread()->kthread_stop() before take_over_work(), so cwq->thread should complete its ->worklist (and thus the barrier), because currently we don't check kthread_should_stop() in run_workqueue(). But even if we did, everything should be ok. [akpm@osdl.org: cleanup] [akpm@osdl.org: add flush_work_keventd() wrapper] Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc2e4d70410546307344821eed6fd23803a45286 Author: Oleg Nesterov Date: Wed May 9 02:33:51 2007 -0700 reimplement flush_workqueue() Remove ->remove_sequence, ->insert_sequence, and ->work_done from struct cpu_workqueue_struct. To implement flush_workqueue() we can queue a barrier work on each CPU and wait for its completition. The barrier is queued under workqueue_mutex to ensure that per cpu wq->cpu_wq is alive, we drop this mutex before going to sleep. If CPU goes down while we are waiting for completition, take_over_work() will move the barrier on another CPU, and the handler will wake up us eventually. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e18f3ffb9c3ddfc1b4ad8f38f5f2acae8c16f0c9 Author: Andrew Morton Date: Wed May 9 02:33:50 2007 -0700 schedule_on_each_cpu(): use preempt_disable() We take workqueue_mutex in there to keep CPU hotplug away. But preempt_disable() will suffice for that. Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1e3cf418fc1e6b13bdc472ffb60bd02735e41a6 Author: Haavard Skinnemoen Date: Wed May 9 02:33:50 2007 -0700 atmel_spi: remove unnecessary (and wrong) #ifdefs Now that the cpu_is_xxx() macros are available both on AVR32 and AT91, we can remove a couple of #ifdefs from this driver. One of them is actually wrong -- new_1 should be set on AVR32 but isn't. This causes the bus clock to run at twice the speed it is configured to. Signed-off-by: Haavard Skinnemoen Cc: David Brownell Acked-by: Andrew Victor Cc: Nicolas Ferre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7498281d3caec1141d7542ec494c4e4a1d404c9 Author: Haavard Skinnemoen Date: Wed May 9 02:33:47 2007 -0700 Use common cpu_is_xxx() macros on AT91 and AVR32 Several drivers shared between AT91 and AVR32 chips use cpu_is_xxx() to handle CPU-specific differences. Currently, such code needs to be inside #ifdef CONFIG_ARCH_AT91 because the macros don't exist on AVR32. By defining the same macros on both AT91 and AVR32, these #ifdefs can be eliminated. Since the macros will evaluate to a constant value for CPUs that aren't supported by the current architecture, any code that is only needed on AT91 will be optimized away on AVR32 and vice versa. Signed-off-by: Haavard Skinnemoen Cc: David Brownell Acked-by: Andrew Victor Cc: Nicolas Ferre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31143d5d515ece617ffccb7df5ff75e4d1dfa120 Author: David Howells Date: Wed May 9 02:33:46 2007 -0700 AFS: implement basic file write support Implement support for writing to regular AFS files, including: (1) write (2) truncate (3) fsync, fdatasync (4) chmod, chown, chgrp, utime. AFS writeback attempts to batch writes into as chunks as large as it can manage up to the point that it writes back 65535 pages in one chunk or it meets a locked page. Furthermore, if a page has been written to using a particular key, then should another write to that page use some other key, the first write will be flushed before the second is allowed to take place. If the first write fails due to a security error, then the page will be scrapped and reread before the second write takes place. If a page is dirty and the callback on it is broken by the server, then the dirty data is not discarded (same behaviour as NFS). Shared-writable mappings are not supported by this patch. [akpm@linux-foundation.org: fix a bunch of warnings] Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 416351f28d2b31d15ff73e9aff699b2163704c95 Author: David Howells Date: Wed May 9 02:33:45 2007 -0700 AFS: AFS fixups Make some miscellaneous changes to the AFS filesystem: (1) Assert RCU barriers on module exit to make sure RCU has finished with callbacks in this module. (2) Correctly handle the AFS server returning a zero-length read. (3) Split out data zapping calls into one function (afs_zap_data). (4) Rename some afs_file_*() functions to afs_*() where they apply to non-regular files too. (5) Be consistent about the presentation of volume ID:vnode ID in debugging output. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef71c15c46a053818f7e69098ebb052b31ffa56b Author: David Howells Date: Wed May 9 02:33:44 2007 -0700 AFS: export a couple of core functions for AFS write support Export a couple of core functions for AFS write support to use: find_get_pages_contig() find_get_pages_tag() Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b04bd27564cfd7224e0135ba37df778f1d490bf Author: David Miller Date: Wed May 9 02:33:43 2007 -0700 Fix printk format warnings in timer_list.c u64 and s64 are not necessarily 'long long' on some 64-bit platforms, so explicit the type to kill the compiler warnings. Also consistently use '%Lu' which is unsigned. Signed-off-by: David S. Miller Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0366299bd2de283091f4394c0f446e58b5f94815 Author: Borislav Petkov Date: Wed May 9 02:33:43 2007 -0700 kernel-doc: small kernel-doc optimization Get the kernel version string only once from the environment, thus slightly speeding up kernel-doc. Signed-off-by: Borislav Petkov Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66effdc6a6a79c11f1c0d607d0de299108d69507 Author: Randy Dunlap Date: Wed May 9 02:33:42 2007 -0700 doc: what a patch series is It seems that we need to clarify that a patch series is a series of related patches rather than "here are some of my patches as multiple (numbered) emails." Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dfdd266b9a2f2d93a3fdbee89969f6ea9ec5377 Author: Josef 'Jeff' Sipek Date: Wed May 9 02:33:41 2007 -0700 fs: use path_walk in do_path_lookup Since path_walk sets the total_link_count to 0 and calls link_path_walk, we can just call path_walk directly. Signed-off-by: Josef 'Jeff' Sipek Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62ce39c531860aee6c12128c629b0a82f656a306 Author: Josef 'Jeff' Sipek Date: Wed May 9 02:33:41 2007 -0700 fs: fix indentation in do_path_lookup Signed-off-by: Josef 'Jeff' Sipek Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35c35d1afa8f9afe01d922ff9668a14c5d879b02 Author: Daniel Walker Date: Wed May 9 02:33:40 2007 -0700 clocksource: spelling error in watchdog code There's more that need fixing, and fix my own subject spelling error too. Signed-off-by: Daniel Walker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18d8362d517cb2bd97761294924fe6c2a6ee5e3c Author: Andrew Morton Date: Wed May 9 02:33:39 2007 -0700 mutex_lock_interruptible(): add __must_check It's not sane to use mutex_lock_interruptible() and to then ignore the result. Ditto down_interruptible(), but I'm lazy. Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae030e435f5400cff77c52506a8d3d7278f0947c Author: Paul Fulghum Date: Wed May 9 02:33:38 2007 -0700 tty_set_ldisc() receive_room fix Fix tty_set_ldisc in tty_io.c so that tty->receive_room is only cleared if actually changing line disciplines. Without this fix a problem occurs when requesting the line discipline to change to the same line discipline. In this case tty->receive_room is cleared but ldisc->open() is not called to set tty->receive_room back to a sane value. The result is that tty->receive_room is stuck at 0 preventing the tty flip buffer from passing receive data to the line discipline. For example: a switch from N_TTY to N_TTY followed by a select() call for read input results in data never being received because tty->receive_room is stuck at zero. A switch from N_TTY to N_TTY followed by a read() call works because the read() call itself sets tty->receive_room correctly (but select does not). Previously (< 2.6.18) this was not a problem because the tty flip buffer pushed data to the line discipline without regard for tty->receive room. Signed-off-by: Paul Fulghum Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55c0d1f83e481dd6c77f52f7dcfeb043b8b740fa Author: Roland McGrath Date: Wed May 9 02:33:37 2007 -0700 Move sig_kernel_* et al macros to linux/signal.h This patch moves the sig_kernel_* and related macros from kernel/signal.c to linux/signal.h, and cleans them up slightly. I need the sig_kernel_* macros for default signal behavior in the utrace code, and want to avoid duplication or overhead to share the knowledge. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84963048ca8093e0aa71ac90c2a5fe7af5f617c3 Author: WANG Cong Date: Wed May 9 02:33:36 2007 -0700 nbd: check the return value of sysfs_create_file [akpm@linux-foundation.org: fix it] Signed-off-by: WANG Cong Cc: Paul Clements Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8cb34481edfee6692c83d3b283e29820e840280 Author: Olof Johansson Date: Wed May 9 02:33:35 2007 -0700 pasemi: hardware rng driver Driver for the on-chip hardware random number generator on PA Semi PA6T-1682M. Signed-off-by: Egor Martovetsky Signed-off-by: Olof Johansson Signed-off-by: Michael Buesch Cc: Paul Mackerras Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d3556329926bde7c1e80cd6c650525326652ea4 Author: Roland Dreier Date: Wed May 9 02:33:35 2007 -0700 Add info about whitespace to SubmitChecklist Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a63011275e1a0ec9389e8c7d9b08caab8957ca0 Author: Ken Chen Date: Wed May 9 02:33:34 2007 -0700 pretend cpuset has some form of hugetlb page reservation When cpuset is configured, it breaks the strict hugetlb page reservation as the accounting is done on a global variable. Such reservation is completely rubbish in the presence of cpuset because the reservation is not checked against page availability for the current cpuset. Application can still potentially OOM'ed by kernel with lack of free htlb page in cpuset that the task is in. Attempt to enforce strict accounting with cpuset is almost impossible (or too ugly) because cpuset is too fluid that task or memory node can be dynamically moved between cpusets. The change of semantics for shared hugetlb mapping with cpuset is undesirable. However, in order to preserve some of the semantics, we fall back to check against current free page availability as a best attempt and hopefully to minimize the impact of changing semantics that cpuset has on hugetlb. Signed-off-by: Ken Chen Cc: Paul Jackson Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85badbdf5120d246ce2bb3f1a7689a805f9c9006 Author: Akinobu Mita Date: Wed May 9 02:33:33 2007 -0700 use simple_read_from_buffer in kernel/ Cleanup using simple_read_from_buffer() for /dev/cpuset/tasks and /proc/config.gz. Cc: Paul Jackson Cc: Randy Dunlap Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92f4c701aad794de9e4cf7341d0a486aed027c46 Author: Akinobu Mita Date: Wed May 9 02:33:32 2007 -0700 use simple_read_from_buffer() in fs/ Cleanup using simple_read_from_buffer() in binfmt_misc, configfs, and sysfs. Cc: Greg Kroah-Hartman Cc: Joel Becker Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 884c3d751093446918c2f7a4b2c745f28cf91c39 Author: Akinobu Mita Date: Wed May 9 02:33:32 2007 -0700 cm4000_cs: use bitrev Cleanup using bitrev8 in cm4000_cs driver. Cc: Harald Welte Signed-off-by: Akinobu Mita Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54493c10069741a02cd34c2b44a6bfdb85e7de6a Author: Akinobu Mita Date: Wed May 9 02:33:31 2007 -0700 cm4000_cs: fix error paths This patch fixes error paths in module_init and probe functions in cm4000_cs and cm4040_cs drivers. Cc: Harald Welte Signed-off-by: Akinobu Mita Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8813d1c00ca923c1683da625ff85959be1db9a49 Author: James Bottomley Date: Wed May 9 02:33:30 2007 -0700 mca: add integrated device bus matching The MCA bus has a few "integrated" functions, which are effectively virtual slots on the bus. The problem is that these special functions don't have dedicated pos IDs, so we have to manufacture ids for them outside the pos space ... and these ids can't be matched by the standard matching function, so add a special registration that requests a list of pos ids or a particular integrated function. Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit 809aa5048fb7e7fd3bf0aa1fb169c42db0f63b08 Author: James Bottomley Date: Wed May 9 02:33:29 2007 -0700 mca: fix bus matching There's a bug in the MCA bus matching algorithm in that it promotes from signed short to int before comparing with the actual id and does sign extension on anything > 0x7fff (which means that pos ids > 0x7fff never get correctly matched). Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 818563dceccf695a71f8bd683a249e7bb09e3240 Author: Fernando Luis Vazquez Cao Date: Wed May 9 02:33:28 2007 -0700 Always ask the hardware to obtain hardware processor id - ia64 Always ask the hardware to determine the hardware processor id in both UP and SMP kernels. Signed-off-by: Fernando Luis Vazquez Cao Cc: "Luck, Tony" Cc: Andi Kleen Cc: "Eric W. Biederman" Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd988528f4a7d64908b427c251d727f3c3e88add Author: Fernando Luis Vazquez Cao Date: Wed May 9 02:33:28 2007 -0700 Use the APIC to determine the hardware processor id - x86_64 hard_smp_processor_id used to be just a macro that hard-coded hard_smp_processor_id to 0 in the non SMP case. When booting non SMP kernels on hardware where the boot ioapic id is not 0 this turns out to be a problem. This is happens frequently in the case of kdump and once in a great while in the case of real hardware. Use the APIC to determine the hardware processor id in both UP and SMP kernels to fix this issue. Notice that hard_smp_processor_id is only used by SMP code or by code that works with apics so we do not need to handle the case when apics are not present and hard_smp_processor_id should never be called there. Signed-off-by: Fernando Luis Vazquez Cao Cc: "Luck, Tony" Acked-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a36166c6ef45081fea6eeaf5ca785d7ed786b6e2 Author: Fernando Luis Vazquez Cao Date: Wed May 9 02:33:27 2007 -0700 Use the APIC to determine the hardware processor id - i386 hard_smp_processor_id used to be just a macro that hard-coded hard_smp_processor_id to 0 in the non SMP case. When booting non SMP kernels on hardware where the boot ioapic id is not 0 this turns out to be a problem. This is happens frequently in the case of kdump and once in a great while in the case of real hardware. Use the APIC to determine the hardware processor id in both UP and SMP kernels to fix this issue. Notice that hard_smp_processor_id is only used by SMP code or by code that works with apics so we do not need to handle the case when apics are not present and hard_smp_processor_id should never be called there. Signed-off-by: Fernando Luis Vazquez Cao Cc: "Luck, Tony" Acked-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f Author: Fernando Luis Vazquez Cao Date: Wed May 9 02:33:25 2007 -0700 Remove hardcoding of hard_smp_processor_id on UP systems With the advent of kdump, the assumption that the boot CPU when booting an UP kernel is always the CPU with a particular hardware ID (often 0) (usually referred to as BSP on some architectures) is not valid anymore. The reason being that the dump capture kernel boots on the crashed CPU (the CPU that invoked crash_kexec), which may be or may not be that particular CPU. Move definition of hard_smp_processor_id for the UP case to architecture-specific code ("asm/smp.h") where it belongs, so that each architecture can provide its own implementation. Signed-off-by: Fernando Luis Vazquez Cao Cc: "Luck, Tony" Acked-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd2a345f8f002845636dbf5d2d768bb5cd8a5f59 Author: Dave Gilbert Date: Wed May 9 02:33:24 2007 -0700 Display all possible partitions when the root filesystem failed to mount Display all possible partitions when the root filesystem is not mounted. This helps to track spell'o's and missing drivers. Updated to work with newer kernels. Example output: VFS: Cannot open root device "foobar" or unknown-block(0,0) Please append a correct "root=" boot option; here are the available partitions: 0800 8388608 sda driver: sd 0801 192748 sda1 0802 8193150 sda2 0810 4194304 sdb driver: sd Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) [akpm@linux-foundation.org: cleanups, fix printk warnings] Signed-off-by: Jan Engelhardt Cc: Dave Gilbert Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e7d18b57c39bedcbd181e3c06d13572b33e5380 Author: Miklos Szeredi Date: Wed May 9 02:33:22 2007 -0700 uml: turn build warnings into comments These haven't been fixed for ages. Just make comments out of them. arch/um/kernel/skas/process.c:181:2: warning: #warning Need to look up +userspace_pid by cpu arch/um/kernel/skas/process.c:187:2: warning: #warning Need to look up +userspace_pid by cpu arch/um/kernel/skas/process.c:194:2: warning: #warning need to loop over +userspace_pids in kill_off_processes_skas Signed-off-by: Miklos Szeredi Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb0c78cc94a63871cad051674516b38e4a8aef95 Author: Jeff Dike Date: Wed May 9 02:33:22 2007 -0700 Fix Linuxdoc comment A linuxdoc comment had fallen out of date - it refers to an argument which no longer exists. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 231f7e9d029a710c14352bff3b8d3753cb9bfde8 Author: Jeff Dike Date: Wed May 9 02:33:21 2007 -0700 uml: mark a tt-only function Mark another function as tt-mode only. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ff563830209d2f5ea2ece071f7ea71aff934544 Author: Peter Zijlstra Date: Wed May 9 02:33:20 2007 -0700 uml: turn on SCSI support Enable (i)SCSI on UML, dunno why SCSI was deemed broken, it works like a charm. Signed-off-by: Peter Zijlstra Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e0cb0c3bf04850fa6fb300293d9e85ba81b605f Author: Jeff Dike Date: Wed May 9 02:33:19 2007 -0700 uml: fix build breakage UML now needs required-features.h to build - an empty one suffices. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3d25c275d383975504dc53c25b691df59bd3c48 Author: Rafael J. Wysocki Date: Wed May 9 02:33:18 2007 -0700 PM: Separate hibernation code from suspend code [ With Johannes Berg ] Separate the hibernation (aka suspend to disk code) from the other suspend code. In particular: * Remove the definitions related to hibernation from include/linux/pm.h * Introduce struct hibernation_ops and a new hibernate() function to hibernate the system, defined in include/linux/suspend.h * Separate suspend code in kernel/power/main.c from hibernation-related code in kernel/power/disk.c and kernel/power/user.c (with the help of hibernation_ops) * Switch ACPI (the only user of pm_ops.pm_disk_mode) to hibernation_ops Signed-off-by: Rafael J. Wysocki Cc: Greg KH Cc: Pavel Machek Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d60846c4d16f9518b098b905af2b87cb6bf6dc42 Author: Andrew Morton Date: Wed May 9 02:33:17 2007 -0700 swsusp: clean up printk Remove an inexplicable / Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ace4bd29c248b51db3f8a97e9b59740dc6caa074 Author: Ken Chen Date: Wed May 9 02:33:09 2007 -0700 fix leaky resv_huge_pages when cpuset is in use The internal hugetlb resv_huge_pages variable can permanently leak nonzero value in the error path of hugetlb page fault handler when hugetlb page is used in combination of cpuset. The leaked count can permanently trap N number of hugetlb pages in unusable "reserved" state. Steps to reproduce the bug: (1) create two cpuset, user1 and user2 (2) reserve 50 htlb pages in cpuset user1 (3) attempt to shmget/shmat 50 htlb page inside cpuset user2 (4) kernel oom the user process in step 3 (5) ipcrm the shm segment At this point resv_huge_pages will have a count of 49, even though there are no active hugetlbfs file nor hugetlb shared memory segment in the system. The leak is permanent and there is no recovery method other than system reboot. The leaked count will hold up all future use of that many htlb pages in all cpusets. The culprit is that the error path of alloc_huge_page() did not properly undo the change it made to resv_huge_page, causing inconsistent state. Signed-off-by: Ken Chen Cc: David Gibson Cc: Adam Litke Cc: Martin Bligh Acked-by: David Gibson Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba8b45cea5f632540d561d37d94c71c07f6af1aa Author: Jonathan Brassow Date: Wed May 9 02:33:08 2007 -0700 dm log: fix resume failed log device This patch removes the possibility of having uninitialized log state if the log device has failed. When a mirror resumes operation, it calls 'resume' on the logging module. If disk based logging is being used, the log device is read to fill in the log state. If the log device has failed, we cannot simply return, because this would leave the in-memory log state uninitialized. Instead, we assume all regions are out-of-sync and reset the log state. Failure to do this could result in the logging code reporting a region as in-sync, even though it isn't; which could result in a corrupted mirror. Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b997b82d266c9fb910fc2ad95b9bb93b3bccf9be Author: Jonathan Brassow Date: Wed May 9 02:33:08 2007 -0700 dm raid1: switch rh_in_sync to blocking in do_reads The call to rh_in_sync() in do_reads() should be allowed to block. It is in the mirror worker thread which already permits blocking operations. This will be needed to support clustered mirroring which will perform network operations. Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5353cd7c9cd10cdf9d62a5487f3db77b7b68105 Author: Jonathan Brassow Date: Wed May 9 02:33:07 2007 -0700 dm raid1: fix to commit pending clear region requests With the code as it is, it is possible for oustanding clear region requests never to get flushed when a mirror is deactivated or suspended. This means there will always be some resync work required when a mirror is activated, even though it may very well be in-sync. Always requesting the flush doesn't hurt us. This is because the log tracks whether any changes occurred and, if not, no flush is performed. Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26b9f228703f0518a90e7513d6fe7b6abeed5138 Author: Heinz Mauelshagen Date: Wed May 9 02:33:06 2007 -0700 dm: delay target New device-mapper target that can delay I/O (for testing). Reads can be separated from writes, redirected to different underlying devices and delayed by differing amounts of time. Signed-off-by: Heinz Mauelshagen Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ba699347e96b5468b42b3decf1f381abbf99652 Author: Heinz Mauelshagen Date: Wed May 9 02:33:05 2007 -0700 dm: bio list helpers More bio_list helper functions for new targets (including dm-delay and dm-loop) to manipulate lists of bios. Signed-off-by: Heinz Mauelshagen Signed-off-by: Bryn Reeves Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf17ce3a604d943f29bf1bc1a66a4e0d2ad4ec96 Author: Milan Broz Date: Wed May 9 02:33:05 2007 -0700 dm io: remove old interface Remove old dm-io interface. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88be163abb5324bab09f5eff9646590eec5314eb Author: Milan Broz Date: Wed May 9 02:33:04 2007 -0700 dm raid1: update dm io interface This patch ports dm-raid1.c to the new dm-io interface. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d234d1e03d0a4cef4da32177be6657b45cc513f Author: Heinz Mauelshagen Date: Wed May 9 02:33:03 2007 -0700 dm log: update dm io interface This patch ports dm-log.c to the new dm-io interface in order to make it scalable to have a large number of persistent dirty logs active in parallel. Signed-off-by: Heinz Mauelshagen Cc: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cca1e7af543aa396b3e4919c251080741a49e69 Author: Heinz Mauelshagen Date: Wed May 9 02:33:02 2007 -0700 dm exception store: update dm io interface This patch ports dm-exception-store.c to the new, scalable dm_io() interface. It replaces dm_io_get()/dm_io_put() by dm_io_client_create()/dm_io_client_destroy() calls and dm_io_sync_vm() by dm_io() to achive this. Signed-off-by: Heinz Mauelshagen Cc: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 373a392bd76c4cc2cbbdab3906aee2ae4dc6702e Author: Milan Broz Date: Wed May 9 02:33:02 2007 -0700 dm kcopyd: update dm io interface This patch ports kcopyd.c to the new, scalable dm_io() interface. Signed-off-by: Milan Broz Signed-off-by: Heinz Mauelshagen Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8b03afe3d38a635861e4bfa5c563d844e754a91 Author: Heinz Mauelshagen Date: Wed May 9 02:33:01 2007 -0700 dm io: new interface Add a new API to dm-io.c that uses a private mempool and bio_set for each client. The new functions to use are dm_io_client_create(), dm_io_client_destroy(), dm_io_client_resize() and dm_io(). Signed-off-by: Heinz Mauelshagen Signed-off-by: Alasdair G Kergon Cc: Milan Broz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 891ce207011d3d9219f79fd5114c8594bbacc653 Author: Heinz Mauelshagen Date: Wed May 9 02:33:00 2007 -0700 dm io: prepare for new interface Introduce struct dm_io_client to prepare for per-client mempools and bio_sets. Temporary functions bios() and io_pool() choose between the per-client structures and the global ones so the old and new interfaces can co-exist. Make error_bits optional. Signed-off-by: Heinz Mauelshagen Signed-off-by: Alasdair G Kergon Cc: Milan Broz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c897feb3dcf3c3300849056ee82b01df7bf66d3c Author: Heinz Mauelshagen Date: Wed May 9 02:33:00 2007 -0700 dm io: delay dec_count Delay decrementing the 'struct io' reference count until after the bio has been freed so that a bio destructor function may reference it. Required by a later patch. Signed-off-by: Heinz Mauelshagen Signed-off-by: Alasdair G Kergon Cc: Milan Broz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8e6afa2363de7ee0dea1a3297f6236f421c2dd4 Author: Jonathan E Brassow Date: Wed May 9 02:32:59 2007 -0700 dm raid1: add handle_errors feature flag This patch adds the ability to specify desired features in the mirror constructor/mapping table. The first feature of interest is "handle_errors". Currently, mirroring will ignore any I/O errors from the devices. Subsequent patches will check for this flag and handle the errors. If flag/feature is not present, mirror will do nothing - maintaining backwards compatibility. Signed-off-by: Jonathan E Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 315dcc226f066c1d3cef79283dcde807fe0e32d1 Author: Jonathan E Brassow Date: Wed May 9 02:32:58 2007 -0700 dm log: report fault status This patch reports the status of the log device so that userspace can detect the error and take appropriate action. Signed-off-by: Jonathan E Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01d03a660e73fb524957c09825a3eb7c2ae7c205 Author: Jonathan E Brassow Date: Wed May 9 02:32:57 2007 -0700 dm log: fault detection This patch gives the disk logging code the ability to store the fact that an error occured on the log device. In addition, an event is raised when an error is encountered during I/O to the log device. Signed-off-by: Jonathan E Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cd54d9bedb79a97f014e86c0da393416b264eb3 Author: Mike Anderson Date: Wed May 9 02:32:57 2007 -0700 dm: allow offline devices Allow check_device_area to succeed if a device has an i_size of zero. This addresses an issue seen on DASD devices setting up a multipath table for paths in online and offline state. Signed-off-by: Mike Anderson Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79eb885c96b5ccf8bbffd0dddc4c15a5dd436a1c Author: Edward Goggin Date: Wed May 9 02:32:56 2007 -0700 dm mpath: log device name Make the mapped device structure accessible to hardware handlers so error messages can include the device name. Signed-off-by: Edward Goggin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46b477306afcd0516924b26792c7a42f4dbfa9f0 Author: Ludwig Nussel Date: Wed May 9 02:32:55 2007 -0700 dm crypt: add null iv Add a new IV generation method 'null' to read old filesystem images created with SuSE's loop_fish2 module. Signed-off-by: Ludwig Nussel Acked-By: Christophe Saout Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f97380bcadd6bd2e368727de4061aaba4989c426 Author: Olaf Kirch Date: Wed May 9 02:32:54 2007 -0700 dm crypt: use smaller bvecs in clones Allocate smaller clones With the previous dm-crypt fixes, there is no need for the clone bios to have the same bvec size as the original - we just need to make them big enough for the remaining number of pages. The only requirement is that we clear the "out" index in convert_context, so that crypt_convert starts storing data at the right position within the clone bio. Signed-off-by: Olaf Kirch Signed-off-by: Alasdair G Kergon Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f9941b6c55d70103c1bc3f2c7676acd9f20bf8a Author: Olaf Kirch Date: Wed May 9 02:32:53 2007 -0700 dm crypt: fix remove first_clone Get rid of first_clone in dm-crypt This gets rid of first_clone, which is not really needed. Apparently, cloned bios used to share their bvec some time way in the past - this is no longer the case. Contrarily, this even hurts us if we try to create a clone off first_clone after it has completed, and crypt_endio has destroyed its bvec. Signed-off-by: Olaf Kirch Signed-off-by: Alasdair G Kergon Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98221eb757de03d9aa6262b1eded2be708640ccc Author: Olaf Kirch Date: Wed May 9 02:32:52 2007 -0700 dm crypt: fix avoid cloned bio ref after free Do not access the bio after generic_make_request We should never access a bio after generic_make_request - there's no guarantee it still exists. Signed-off-by: Olaf Kirch Signed-off-by: Alasdair G Kergon Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 027581f3515b5ec2218847dab578afa439a9d6b9 Author: Olaf Kirch Date: Wed May 9 02:32:52 2007 -0700 dm crypt: fix call to clone_init Call clone_init early We need to call clone_init as early as possible - at least before call bio_put(clone) in any error path. Otherwise, the destructor will try to dereference bi_private, which may still be NULL. Signed-off-by: Olaf Kirch Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c89f8be1a7d14aad9d2c3f7d90d7d88f82c61e2 Author: Milan Broz Date: Wed May 9 02:32:51 2007 -0700 dm crypt: disable barriers Disable barriers in dm-crypt because of current workqueue processing can reorder requests. This must be addresed later but for now disabling barriers is needed to prevent data corruption. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ad36fe2b451cc85cc7b14f4128286759e217124 Author: Holger Smolinski Date: Wed May 9 02:32:50 2007 -0700 dm raid1: one kmirrord per mirror This patch replaces the single instance of kmirrord by one instance per mirror set. This change is required to avoid a deadlock in kmirrord when the persistent dirty log of a mirror itself resides on a mirror. The single instance of kmirrord then issues a sync write to the dirty log in write_bits which gets deferred to kmirrord itself later in the call chain. But kmirrord never does the deferred work because it is still waiting for the sync write_bits. _mirror_sets is removed as it no longer needed, and we always flush the workqueue before destroying it to ensure all work is complete before destroying it. Signed-off-by: Holger Smolinski Signed-off-by: Alasdair G Kergon Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8defab33774a5c33920196a2ee9c0a946d22ba67 Author: Christoph Lameter Date: Wed May 9 02:32:48 2007 -0700 FRV: Replace pgd management via slabs through quicklists This is done in order to be able to run SLUB which expects no modifications to its page structs. Signed-off-by: Christoph Lameter Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34013886ef47ea72e412beb04558431b57a68d51 Author: Christoph Lameter Date: Wed May 9 02:32:47 2007 -0700 Fix spellings of slab allocator section in init/Kconfig Fix some of the spelling issues. Fix sentences. Discourage SLOB use since SLUB can pack objects denser. Signed-off-by: Christoph Lameter Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ae439ce0c01d7db0c70d1542985969e95ef750d Author: Pekka J Enberg Date: Wed May 9 02:32:46 2007 -0700 krealloc: fix kerneldoc comments No "blank" (or "*") line is allowed between the function name and lines for it parameter(s). Cc: Randy Dunlap Signed-off-by: Pekka Enberg Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e6d444ea1f72b8148354a9baf0ea8fa3dd0425b Author: Christoph Lameter Date: Wed May 9 02:32:46 2007 -0700 SLUB: rework slab order determination In some cases SLUB is creating uselessly slabs that are larger than slub_max_order. Also the layout of some of the slabs was not satisfactory. Go to an iterarive approach. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45edfa580b8e638c44ec26872bfe75b307ba12d1 Author: Christoph Lameter Date: Wed May 9 02:32:45 2007 -0700 SLUB: include lifetime stats and sets of cpus / nodes in tracking output We have information about how long an object existed and about the nodes and cpus where the allocations and frees took place. Add that information to the tracking output in /sys/slab/xx/alloc_calls and /sys/slab/free_calls This will then enable slabinfo to output nice reports like this: christoph@qirst:~/slub$ ./slabinfo kmalloc-128 Slabcache: kmalloc-128 Aliases: 0 Order : 0 Sizes (bytes) Slabs Debug Memory ------------------------------------------------------------------------ Object : 128 Total : 12 Sanity Checks : On Total: 49152 SlabObj: 200 Full : 7 Redzoning : On Used : 24832 SlabSiz: 4096 Partial: 4 Poisoning : On Loss : 24320 Loss : 72 CpuSlab: 1 Tracking : On Lalig: 13968 Align : 8 Objects: 20 Tracing : Off Lpadd: 1152 kmalloc-128 has no kmem_cache operations kmalloc-128: Kernel object allocation ----------------------------------------------------------------------- 6 param_sysfs_setup+0x71/0x130 age=284512/284512/284512 pid=1 nodes=0-1,3 11 percpu_populate+0x39/0x80 age=283914/284428/284512 pid=1 nodes=0 21 __register_chrdev_region+0x31/0x170 age=282896/284347/284473 pid=1-1705 nodes=0-2 1 sys_inotify_init+0x76/0x1c0 age=283423 pid=1004 nodes=0 19 as_get_io_context+0x32/0xd0 age=6/247567/283988 pid=1-11782 nodes=0,2 10 ida_pre_get+0x4a/0x80 age=277666/283773/284526 pid=0-2177 nodes=0,2 24 kobject_kset_add_dir+0x37/0xb0 age=282727/283860/284472 pid=1-1723 nodes=0-2 1 acpi_ds_build_internal_buffer_obj+0xd3/0x11d age=284508 pid=1 nodes=0 24 con_insert_unipair+0xd7/0x110 age=284438/284438/284438 pid=1 nodes=0,2 1 uart_open+0x2d2/0x4b0 age=283896 pid=1 nodes=0 26 dma_pool_create+0x73/0x1a0 age=282762/282833/282916 pid=1705-1723 nodes=0 1 neigh_table_init_no_netlink+0xd2/0x210 age=284461 pid=1 nodes=0 2 neigh_parms_alloc+0x2b/0xe0 age=284410/284411/284412 pid=1 nodes=2 2 neigh_resolve_output+0x1e1/0x280 age=276289/276291/276293 pid=0-2443 nodes=0 1 netlink_kernel_create+0x90/0x170 age=284472 pid=1 nodes=0 4 xt_alloc_table_info+0x39/0xf0 age=283958/283958/283959 pid=1 nodes=1 3 fn_hash_insert+0x473/0x720 age=277653/277661/277666 pid=2177-2185 nodes=0 1 get_mtrr_state+0x285/0x2a0 age=284526 pid=0 nodes=0 1 cacheinfo_cpu_callback+0x26d/0x3e0 age=284458 pid=1 nodes=0 29 kernel_param_sysfs_setup+0x25/0x90 age=284511/284511/284512 pid=1 nodes=0-1,3 5 process_zones+0x5e/0x170 age=284546/284546/284546 pid=0 nodes=0 1 drm_core_init+0x48/0x160 age=284421 pid=1 nodes=2 kmalloc-128: Kernel object freeing ------------------------------------------------------------------------ 163 age=4295176847 pid=0 nodes=0-3 1 __vunmap+0x6e/0xf0 age=282907 pid=1723 nodes=0 28 free_as_io_context+0x12/0x90 age=9243/262197/283474 pid=42-11754 nodes=0 1 acpi_get_object_info+0x1b7/0x1d4 age=284475 pid=1 nodes=0 1 do_acpi_find_child+0x45/0x4e age=284475 pid=1 nodes=0 NUMA nodes : 0 1 2 3 ------------------------------------------ All slabs 7 2 2 1 Partial slabs 2 2 0 0 Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41ecc55b8a8ca618e6d490982c7ce45d230d4399 Author: Christoph Lameter Date: Wed May 9 02:32:44 2007 -0700 SLUB: add CONFIG_SLUB_DEBUG CONFIG_SLUB_DEBUG can be used to switch off the debugging and sysfs components of SLUB. Thus SLUB will be able to replace SLOB. SLUB can arrange objects in a denser way than SLOB and the code size should be minimal without debugging and sysfs support. Note that CONFIG_SLUB_DEBUG is materially different from CONFIG_SLAB_DEBUG. CONFIG_SLAB_DEBUG is used to enable slab debugging in SLAB. SLUB enables debugging via a boot parameter. SLUB debug code should always be present. CONFIG_SLUB_DEBUG can be modified in the embedded config section. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02cbc874463924de2c3403379b698bce3cd277a5 Author: Christoph Lameter Date: Wed May 9 02:32:43 2007 -0700 SLUB: move tracking definitions and check_valid_pointer() away from debug code Move the tracking definitions and the check_valid_pointer() function away from the debugging related functions. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 636f0d7de8dc0282cce9905e035c04dd60db19dd Author: Christoph Lameter Date: Wed May 9 02:32:42 2007 -0700 SLUB: consolidate trace code Trace in both slab_alloc and slab_free has a lot of common code. Use a single function for both. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35e5d7ee27680aef6dc3fab45a5ecd9952d9791a Author: Christoph Lameter Date: Wed May 9 02:32:42 2007 -0700 SLUB: introduce DebugSlab(page) This replaces the PageError() checking. DebugSlab is clearer and allows for future changes to the page bit used. We also need it to support CONFIG_SLUB_DEBUG. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b345970905e34c1b632fe4d80e2af14c7de99b45 Author: Christoph Lameter Date: Wed May 9 02:32:41 2007 -0700 SLUB: move resiliency check into SYSFS section Move the resiliency check into the SYSFS section after validate_slab that is used by the resiliency check. This will avoid a forward declaration. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7656c72b5a631452ace361037ccf8384454d0f72 Author: Christoph Lameter Date: Wed May 9 02:32:40 2007 -0700 SLUB: add macros for scanning objects in a slab Scanning of objects happens in a number of functions. Consolidate that code. DECLARE_BITMAP instead of coding the declaration for bitmaps. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 672bba3a4b2e65ed95ebd0cf764bd628bd1da74f Author: Christoph Lameter Date: Wed May 9 02:32:39 2007 -0700 SLUB: update comments Update comments throughout SLUB to reflect the new developments. Fix up various awkward sentences. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26a7bd030254c462a9e771f6edc54cb972044034 Author: Christoph Lameter Date: Wed May 9 02:32:39 2007 -0700 SLUB: get rid of finish_bootstrap Its only purpose was to bring some sort of symmetry to sysfs usage when dealing with bootstrapping per cpu flushing. Since we do not time out slabs anymore we have no need to run finish_bootstrap even without sysfs. Fold it back into slab_sysfs_init and drop the initcall for the !SYFS case. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f99a283dc13b167b93b2e453a30782955f165c2 Author: Christoph Lameter Date: Wed May 9 02:32:38 2007 -0700 SLUB: clean up krealloc We really do not need all this gaga there. ksize gives us all the information we need to figure out if the object can cope with the new size. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abcd08a6f564171ffa05bc77d1c2ba4cfa949653 Author: Christoph Lameter Date: Wed May 9 02:32:37 2007 -0700 SLUB: use check_valid_pointer in kmem_ptr_validate We needlessly duplicate code. Also make check_valid_pointer inline. Signed-off-by: Christoph LAemter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a87615b8f9e2349f6d3770af3d72fd6a41ab4239 Author: Christoph Lameter Date: Wed May 9 02:32:37 2007 -0700 SLUB: slabinfo upgrade -e Show empty slabs -d Modification of slab debug options at runtime -o Operations. Display of ctor / dtor etc. -r Report: Display all available information about a slabcache. Cleanup tracking display and make it work right. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be7b3fbcef34452127bed93632b8e788f685d70e Author: Christoph Lameter Date: Wed May 9 02:32:36 2007 -0700 SLUB: after object padding only needed for Redzoning If no redzoning is selected then we do not need padding before the next object. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65c02d4cfbbd10188ded3d6577922ab034d943ba Author: Christoph Lameter Date: Wed May 9 02:32:35 2007 -0700 SLUB: add support for dynamic cacheline size determination SLUB currently assumes that the cacheline size is static. However, i386 f.e. supports dynamic cache line size determination. Use cache_line_size() instead of L1_CACHE_BYTES in the allocator. That also explains the purpose of SLAB_HWCACHE_ALIGN. So we will need to keep that one around to allow dynamic aligning of objects depending on boot determination of the cache line size. [akpm@linux-foundation.org: need to define it before we use it] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97416ce82e20a9511ec369822098a8d20998398a Author: Stephen Rothwell Date: Wed May 9 02:32:35 2007 -0700 Declare {compat_}sys_utimensat This is needed before Powerpc can wire up the syscall. Signed-off-by: Stephen Rothwell Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01f41ec7b36e14da18a4e162ef697ae358f36e37 Author: Andrew Morton Date: Wed May 9 02:32:34 2007 -0700 mmc build fix Cc: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbe2486fe3bd6c7cffaf4123b7e86a55c209ed44 Author: Trent Piepho Date: Fri Apr 27 22:56:29 2007 -0300 V4L/DVB (5571): V4l1-compat: Make VIDIOCSPICT return errors in a useful way Among other things, VIDIOCSPICT sets the pixel format. Some drivers don't support all formats, e.g. cx88 doesn't support the planar formats. The compat code that translates VIDIOCSPICT into V4L2 ioctls doesn't pass on any errors, so a userspace program doesn't know if it has selected an unsupported pixel format. VIDIOCSPICT sets both the memory capture and overlay formats, and it's possible that one will be set while the other will fail, e.g. cx88 doesn't even support overlay. Also, trying to set the overlay format will fail for non-root users. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 9d3eb99b36c73843cd73f45dad8ca9dde1ce3888 Author: Douglas Landgraf Date: Mon May 7 16:44:12 2007 -0300 V4L/DVB (5624): Radio-maestro.c cleanup Removed unnecessary semaphore. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 7002a4f350c56e36155c177071534f71d3f939bb Author: Douglas Landgraf Date: Mon May 7 16:43:01 2007 -0300 V4L/DVB (5623): Dsbr100.c Replace usb_dsbr100_do_ioctl to use video_ioctl2 Convert dsbr100 to use video_ioctl2 Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 2437c6d47cc594c9072fa9cb79928487cf51f1f9 Author: Douglas Landgraf Date: Mon May 7 16:34:05 2007 -0300 V4L/DVB (5622): Radio-zoltrix.c cleanup Removed unnecessary .hardware member from struct zoltrix_radio (video_device). Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit c1c4fd3eee302b285a20f17a838ef7cc423a28b3 Author: Douglas Landgraf Date: Mon May 7 16:17:16 2007 -0300 V4L/DVB (5621): Radio-cadet.c Replace cadet_do_ioctl to use video_ioctl2 Convert radio-cadet to use video_ioctl2 Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 09129f0d14147732e0dff0feb9ca1347089a9c23 Author: Michael Krufky Date: Fri May 4 22:51:04 2007 -0300 V4L/DVB (5619): Dvb-usb: fix typo replace "streaming_crtl" with "streaming_ctrl" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ed69686a16e09005419d36be6a94d35c18fedabc Author: Jean Delvare Date: Mon May 7 10:56:42 2007 -0300 V4L/DVB (5618): Cx88: Drop the generic i2c client from cx88-vp3054-i2c Drop the generic client declared in cx88-vp3054-i2c: it's not used anywhere. This shrinks cx88-vp3054-i2c.o by 29% on x86_64. Unless it was there for later use? Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 57e45b31c1f32d15b6642c3af1578ee40be35dfb Author: Jiri Slaby Date: Mon May 7 10:55:49 2007 -0300 V4L/DVB (5617): V4L2: videodev, allow debugging videodev, allow debugging fix typo? in videodev.c to allow debugging Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit 14c4ffbe68247776ad45f1e9c4b6a74abb6936c0 Author: Nick Andrew Date: Sat May 5 09:24:27 2007 -0300 V4L/DVB (5614): M920x: Disable second adapter on LifeView TV Walker Twin Disable second adapter on LifeView TV Walker Twin while it doesn't work properly. Signed-off-by: Aapo Tahkola Signed-off-by: Nick Andrew Signed-off-by: Mauro Carvalho Chehab commit 9ad4eef2f429bdab5279fcde38b7ba789e2658f7 Author: Aapo Tahkola Date: Fri Apr 20 13:34:25 2007 -0300 V4L/DVB (5613): M920x: loosen up 80-col limit Do not follow 80-col limit where it would cause inconsistency. Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 4fd74a776f8f451e424ec6cd6bdff690c83b07c2 Author: Aapo Tahkola Date: Mon Mar 26 17:05:59 2007 -0300 V4L/DVB (5612): M920x: rename function prefixes from m9206_foo to m920x_foo Signed-off-by: Aapo Tahkola Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bf2b4f67a48043f3446075b02c1d0fbe07c80819 Author: Aapo Tahkola Date: Mon Mar 26 16:59:16 2007 -0300 V4L/DVB (5611): M920x: replace deb_rc with deb deb_rc is used by the dvb-usb core framework. This patch replaces all occurances of deb_rc with deb, in m920x.c, so that its clear that we're not using dvb-usb's deb_rc. Signed-off-by: Aapo Tahkola Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e7b419b69212f3c3489ae808f26d2a0d2b52fe9c Author: Michael Krufky Date: Mon Mar 26 16:39:20 2007 -0300 V4L/DVB (5610): M920x: remove duplicated code Some of the devices supported by the m920x driver have identical functions used for tuner_attach and frontend_attach. This patch consolidates the functions in question, and updates the debug code to be generic for each. This patch decreases the size of the kernel. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5afb707120ec269725c71a2282ee3473c5bc04c1 Author: Michael Krufky Date: Mon Mar 26 16:35:29 2007 -0300 V4L/DVB (5609): M920x: group like functions together - Group the tuner configurations together. - Group the demod configurations together. - Group the device-specific initialization functions together. - Group demod_attach functions together. - Group tuner_attach functions together. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d3911eaa0d7d0e6963f194e748cf21d7502584bf Author: Michael Krufky Date: Thu Mar 22 19:03:37 2007 -0300 V4L/DVB (5608): M920x: various whitespace cleanups - 80-column cleanups - spaces between operators - tabbing style Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f8e0bd5db4cc636fec35264c2396adb1b633ee05 Author: Aapo Tahkola Date: Thu Mar 22 17:37:58 2007 -0300 V4L/DVB (5607): M920x: Initial support for devices likely manufactured by Dposh These devices are sold by various companies and chains not involved in hardware manufacturing business. This particular device owned by winisch (from irc) had a sticker with text "TCM 234292" on it. This device was never opened so it is possible that Dposh did not manufacture this stick. However, the bundled software and their product line points into that direction. Also thanks to Michael Krufky for spotting this hw filtering problem and thus avoiding hair loss. Hardware pid filters and the bundled remote controller are not currently supported on this device. Signed-off-by: Aapo Tahkola Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ce9c27503491ea342b18b892f973acf5b3afc0f1 Author: Michael Krufky Date: Thu Mar 22 17:18:26 2007 -0300 V4L/DVB (5606): M920x: add "c-basic-offset: 8" to help emacs to enforce tabbing Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit aa50ec2b4998f3937d7050826db190c82bed64e7 Author: Nick Andrew Date: Thu Mar 22 17:09:35 2007 -0300 V4L/DVB (5605): M920x: Add support for LifeView TV Walker Twin Add support for "LifeView TV Walker Twin" (USB IDs 10fd:0513, 10fd:0514) Signed-off-by: Nick Andrew Signed-off-by: Aapo Tahkola Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 36a63ee34b568de8d0762f9b07f34ae5caae7724 Author: Sakari Ailus Date: Fri May 4 12:19:59 2007 -0300 V4L/DVB (5603): V4L: Prevent queueing queued buffers. videobuf_qbuf queues buffers to q->stream but does not properly check the state of the buffer before queueing. It was possible to queue buffers that already were in the queue. Only buffers that are in states STATE_NEEDS_INIT and STATE_IDLE can be queued. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 5ad5e4845b441a00e4165e2c2e3ac8507db9cbe6 Author: Pat Erley Date: Tue May 8 09:36:09 2007 -0300 V4L/DVB (5602): Enable DiSEqC in Starbox II (vp7021a) Uncomments code in vp702x-fe.c to enable DiSEqC in vp7021a Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Pat Erley Signed-off-by: Patrick Boettcher commit 9a95735dde206d2b3575c6368172206535c9bb4e Author: Mauro Carvalho Chehab Date: Thu May 3 16:01:02 2007 -0300 V4L/DVB (5601): Create a menu for DAB DABUSB driver were a little lost at Multimedia core menu. Signed-off-by: Mauro Carvalho Chehab commit 523b78d1d202dedcd9e549576d6179d68210c038 Author: Mauro Carvalho Chehab Date: Thu May 3 15:59:37 2007 -0300 V4L/DVB (5600): Allow compiling just DVB CORE Allow compiling just DVB CORE without needing to compile the drivers Signed-off-by: Mauro Carvalho Chehab commit 6b6bcb16c6b528fb5832244db949366bf0e42f44 Author: Jan Engelhardt Date: Wed May 2 10:11:47 2007 -0300 V4L/DVB (5599): Use menuconfig objects II - DVB Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Also remove one indirection (CONFIG_DVB) that does not seem to be really used inside the kernel. Signed-off-by: Jan Engelhardt Signed-off-by: Mauro Carvalho Chehab commit 910a7b68350516e114294064fbec4a9e58f59efc Author: Oliver Endriss Date: Thu May 3 13:16:12 2007 -0300 V4L/DVB (5593): Budget-ci: Fix tuning for TDM 1316 (160..200 MHz) Revert changeset http://linuxtv.org/hg/v4l-dvb?cmd=changeset;node=e7c424bbf9aa;style=gitweb Petri Helin found that this changeset broke tuning: 'Well, after going through the changes that might have had effect on tuning, I found out the one which had caused this problem. I do not know the actual reason behind the change, but the changelog says that it was meant to "Fix TD1316 tuner for DVBC". But at least in my case it seams to have broken the tuner instead.' Signed-off-by: Oliver Endriss Thanks-to: Petri Helin Acked-by: e9hack Acked-by: Thomas Kaiser Signed-off-by: Mauro Carvalho Chehab commit 87c3019d7b1acb7704a257d78c482112e9b0c227 Author: Jon Burgess Date: Thu May 3 12:23:44 2007 -0300 V4L/DVB (5592): DMA: Correctly free resources on error, sync PCI streamed data I added saa7146_vmalloc_destroy_pgtable() which frees the resources allocated by saa7146_vmalloc_build_pgtable() and updated the callers in budget-core.c and av7110.c. I have also been through the updated functions and updated the error paths to ensure they free all allocated resources on error. I also realised that there are other callers to saa7146_pgtable_free() which did not have any sg DMA mapped so it seems wrong to add the pci_unmap_sg() into that function. Instead I created saa7146_vmalloc_destroy_pgtable() to do this. Also included in this patch are the previous fixes for pci_unmap_sg() and syncing the PCI streamed data to work with a SWIOTLB and match the requirements documented in DMA-API.txt. Signed-off-by: Jon Burgess Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 32a1db42480dc972e8e92be68d9e604f6aff5381 Author: Adrian Bunk Date: Tue May 1 22:13:47 2007 -0300 V4L/DVB (5591): Saa7146: proper prototype for saa7146_video_do_ioctl() This patch adds a proper prototype for saa7146_video_do_ioctl() in include/media/saa7146_vv.h. Signed-off-by: Adrian Bunk Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit ff01652cf856bf2da3b7411255c239d717d08241 Author: Mauro Carvalho Chehab Date: Wed May 2 15:14:06 2007 -0300 V4L/DVB (5587): Add help for RADIO_ADAPTERS and VIDEO_CAPTURE_DRIVERS Add a small help for those two new Kconfig vars. Signed-off-by: Mauro Carvalho Chehab commit c5da5afb9d7b244cfe3334c77e90b4296cf5f263 Author: Jan Engelhardt Date: Wed May 2 10:06:23 2007 -0300 V4L/DVB (5586): Use menuconfig objects II - V4L Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Mauro Carvalho Chehab commit 480b55c26e2f6408e86f22a69fcecc29e019e819 Author: Luca Risolia Date: Wed May 2 10:04:03 2007 -0300 V4L/DVB (5585): SN9C1xx driver updates * Default color improvements to the OV7660 @ Fix sn9c102_write_reg() @ Fix sn9c102_i2c_try_raw_read() @ Fix MI-0343 + Add support for pair MI0360+SN9C120 + Add more USB ids Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit b3785596e3964656b9901f4eff73bf40b654d425 Author: Robert P. J. Day Date: Wed May 2 09:47:16 2007 -0300 V4L/DVB (5583): VIDEO4LINUX-2: Replace MINOR() with a call to iminor(). Replace the call to MINOR() with a call to the inline iminor() routine. Signed-off-by: Robert P. J. Day Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 53958b35e4f8fa14ebcc098018635b306db2bde1 Author: James T Klaas Date: Tue May 1 10:48:09 2007 -0300 V4L/DVB (5582): Added support for Sabrent TV-PCB05 card. Maintainer's notice: I needed to re-number the board, since the board number conflicted with a patch committed previously. Signed-off-by: James T Klaas Signed-off-by: Mauro Carvalho Chehab commit b39423a95c1fd2508e463130b77d8256ef3fcead Author: Simon Farnsworth Date: Tue May 1 10:01:20 2007 -0300 V4L/DVB (5580): Add support for three cards to saa7134 driver Add support for the "Elitegroup ECS TVP3XP FM1246", the "KWorld DVB-T 210", and the Animation Technologies LR214 Rev F onwards (SAA7131) to the saa7134 driver. Also rename the LR214WF to the LR214 Rev E or ealier (SAA7135), to match what we've seen on boards in the field. Changed the comment on the Lifeview cards to indicate Rev E and earlier versus Rev F and later, together with a chip indicator, following feedback from Peter Missel . Signed-off-by: Simon Farnsworth Signed-off-by: Mauro Carvalho Chehab commit 4d8451700171d6bbc254191880f86bfdeec2f74f Author: holger@muscate-magnussen.de Date: Tue May 1 09:25:56 2007 -0300 V4L/DVB (5578): Workaround for bad hardare/firmware on some pluto2 devices pluto2_driver: Workaround for pluto2 card reporting wrong number of received packets and flooding system with interrupts. This patch constitutes a workaround for a hardware/firmware problem of the pluto2-based card (e.g., Satelco EasyWatch). It can happen in rare cases that the card gets into a mode where it always reports back a number of received packets (nbpackets) which is larger than the maximum permissible number of packets (TS_DMA_PACKETS). The workaround that is already in the driver in function pluto_dma_end reports back zero received packets. In spite of the (in reality) zero received packets the card continues to generate interrupts at a very high rate, which can effectively stall the system. The patch resets the TS logic, which puts the card back into normal operations. Signed-off-by: Holger Magnussen Signed-off-by: Andreas Oberritter Signed-off-by: Mauro Carvalho Chehab commit ba70d59bb987110c4394e896b299f9726609aa33 Author: Servaas Vandenberghe Date: Sun Apr 29 16:27:30 2007 -0300 V4L/DVB (5576): Improve / fix support for PAL-60 in cx25840 This causes the cx25840 module to treat V4L2_STD_PAL_60 similar to other 60Hz timings, and it fixes a wrongly-named variable (timings are independant of color system). Acked-by: Hans Verkuil Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 5c808e641741ecd7a7d5e65e38f740378d7406fc Author: Mike Isely Date: Sat Apr 28 20:11:03 2007 -0300 V4L/DVB (5575): Pvrusb2: Implement ability to disable IR receiver Anyone using multiple PVR USB2 devices really only want one of them acting as the actual IR receiver. Implemented here is a new per-instance module option (ir_mode) which is a flag to enable the IR receiver. The default is enabled. IR reception is disabled by blocking access to the IR receiver chip in the device. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit db71b7df76dab261cc9f27525765211bd58345b1 Author: Mike Isely Date: Sat Apr 28 20:08:33 2007 -0300 V4L/DVB (5574): Pvrusb2: Improve handling of PAL-60 video standard This patch originated with Servaas Vandenberghe and has been further developed a bit (to preserve saa7115 behavior). These changes allow for correct operation of PAL-60 video (Servaas tested this against a PAL-B/G tuner with the video standard overridden as a module option). Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4f393828d1dae28905447fcc9845ba0b5f414c62 Author: Tejun Heo Date: Sat Apr 28 20:04:48 2007 -0300 V4L/DVB (5573): Pvrusb2: kill unnecessary attribute->owner sysfs is now completely out of driver/module lifetime game. After deletion, a sysfs node doesn't access anything outside sysfs proper, so there's no reason to hold onto the attribute owners. Note that often the wrong modules were accounted for as owners leading to accessing removed modules. This patch kills now unnecessary attribute->owner. Note that with this change, userland holding a sysfs node does not prevent the backing module from being unloaded. For more info regarding lifetime rule cleanup, please read the following message: http://article.gmane.org/gmane.linux.kernel/510293 Signed-off-by: Tejun Heo Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 8df0c87cc33646a19a59c0f93c4f9a330d5ca5eb Author: Matthias Kaehlcke Date: Sat Apr 28 20:00:18 2007 -0300 V4L/DVB (5572): Pvrusb2: use mutex instead of semaphore The pvrusb2 driver use a semaphore as mutex. use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 5f12491c36acb94670d822a90c9295f6fd671c8a Author: Trent Piepho Date: Fri Apr 27 22:56:28 2007 -0300 V4L/DVB (5570): V4l1-compat: misc fixes for pixelformat function Mark the palette2pixelformat lookup table as const pixelformat is unsigned, adjust the palette2pixelformat table and pixelformat_to_palette() palette_to_pixelformat() is a pure function pixelformat_to_palette() is a const function Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 452c0fb46b1d68b1dae37cea7ccebd70a80397e4 Author: Mauro Carvalho Chehab Date: Tue May 1 08:55:00 2007 -0300 V4L/DVB (5569): Fix: v4l1_compat should be called only if V4L1_COMPAT Added also some explanations about V4L1 handling Signed-off-by: Mauro Carvalho Chehab commit 1088b1373506fd75d2ac80433b847f116b917bc9 Author: Sam Revitch Date: Tue May 1 08:46:30 2007 -0300 V4L/DVB (5568): VIDIOCGMBUF handling in video_ioctl2() Correct handling of VIDIOCGMBUF in video_ioctl2(). Signed-off-by: Sam Revitch Signed-off-by: Mauro Carvalho Chehab commit 9df2ead585515f32d6c9092780c3d13a9627a4a9 Author: Adrian Bunk Date: Tue May 1 08:35:10 2007 -0300 V4L/DVB (5567): Cx88-mpeg.c: make 2 functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit b71ed5cfe651051cd90b0e31c3cdb74953d6416f Author: Thomas Gleixner Date: Tue May 1 08:34:15 2007 -0300 V4L/DVB (5566): MEDIA: Spinlock initializer cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Mauro Carvalho Chehab commit 45e95980f2c89c2cb6e770f4c67982eb0b72ce28 Author: Alexey Dobriyan Date: Tue May 1 08:32:24 2007 -0300 V4L/DVB (5565): Cx88: fix compilation on alpha error: 'DMA_32BIT_MASK' undeclared Signed-off-by: Alexey Dobriyan Signed-off-by: Mauro Carvalho Chehab commit b7aa48be1e7a11e36448a7db58931bbf735d2718 Author: David Woodhouse Date: Wed May 9 13:34:37 2007 +0100 [MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp) Signed-off-by: David Woodhouse commit 42f209d3c94516affeb5e578fae62925f531a2d9 Author: Robert P. J. Day Date: Fri May 4 15:49:38 2007 -0400 [MTD] Delete allegedly obsolete "bank_size" field of mtd_info. Delete the allegedly obsolete "bank_size" member of struct mtd_info. Signed-off-by: Robert P. J. Day Signed-off-by: David Woodhouse commit 36200b76008d52d16b170d4f7dae9cfe00f5eb2b Author: Robert P. J. Day Date: Thu May 3 15:58:49 2007 -0400 [MTD] Remove unnecessary user space check from mtd.h. Since the header file include/linux/mtd/mtd.h is not exported to user space, remove the user space check and error. Signed-off-by: Robert P. J. Day Signed-off-by: David Woodhouse commit a3cf4ea8729a5d448742fd5a0a003827c9f25cb6 Author: Paul Mundt Date: Wed May 9 18:55:14 2007 +0900 sh: Fix stacktrace simplification fallout. When the stacktrace simplification changes went in the function definition on SH got skipped, fix it up so things build again. Signed-off-by: Paul Mundt commit cc150b03ae79b20e4c023f71913c1225f8a19a6b Author: David Brownell Date: Wed Mar 28 16:38:14 2007 -0700 ARM: OMAP: Fix GCC-reported compile time bug Fix GCC-reported compile time bug which prevents booting when the framebuffer code is disabled. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 25ff0a653067eec56efc730dbed664d5cc77e9f3 Author: David Brownell Date: Wed Mar 28 13:21:20 2007 -0700 ARM: OMAP: restore CONFIG_GENERIC_TIME Somehow this got lost in a merge ... Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit e0b50d3c644f10a0022b23fccb58c8003741db52 Author: David Brownell Date: Wed Mar 28 13:09:36 2007 -0700 ARM: OMAP: partial LED fixes Partial fix for CONFIG_LEDS breakage ... at least allow platforms using the debug-leds support (H4 for now) to build with the generic LED support, and default the LED that would be the timer LED to trigger using the "heartbeat" (timer driven, rate depends on load). Right now only H2 and P2 seem to have working LED support; this at least makes H4 less broken. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b1465bf7098fa761962f09a6bb2c0e831af85e63 Author: Imre Deak Date: Tue Mar 6 03:52:01 2007 -0800 ARM: OMAP: add SoSSI clock (call propagate_rate for childrens) Clocks with the follow parent rate mode were not updating their children at propagate rate time. Signed-off-by: Imre Deak Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b7cc6d46b4f8157bfc58a6ed143ffa83575e236a Author: Imre Deak Date: Tue Mar 6 03:16:36 2007 -0800 ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations) - in addition to fixed FB regions - as passed by the bootloader - allow dynamic allocations - do some more checking against overlapping / reserved regions - move the FB specific parts out from sram.c to fb.c Signed-off-by: Imre Deak Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b01d96d653b1387ee0a91094ee54a8c523c3be09 Author: Kai Svahn Date: Thu Feb 1 16:19:15 2007 -0800 ARM: OMAP: Sync framebuffer headers with N800 tree This patch syncs framebuffer headers with N800 tree. Signed-off-by: Kai Svahn Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit d82973d1cdc149d06ac9685ae008105d382c4236 Author: Tony Lindgren Date: Fri Jan 26 12:01:17 2007 -0800 ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree Mostly cosmetic to sync up with linux-omap tree Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 39b8e6986739c34da4e45eb4b8d2bb707292c591 Author: Tony Lindgren Date: Tue Dec 12 23:02:43 2006 -0800 ARM: OMAP: Fix gpmc header Fix gpmc header Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 340a614ac6766df18cba87ff7e66182193c2bd6d Author: Hiroshi DOYU Date: Thu Dec 7 15:43:59 2006 -0800 ARM: OMAP: Add mailbox support for IVA This patch adds a generic mailbox interface for for DSP and IVA (Image Video Accelerator). This patch itself doesn't contain any IVA driver. Signed-off-by: Hiroshi DOYU Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit ca3dd88e411648c76e1911a729440e3763ba5049 Author: David S. Miller Date: Wed May 9 02:35:27 2007 -0700 [SPARC64] PCI: Consolidate PCI access code into pci_common.c All the sun4u controllers do the same thing to compute the physical I/O address to poke, and we can move the sun4v code into this common location too. This one needs a bit of testing, in particular the Sabre code had some funny stuff that would break up u16 and/or u32 accesses into pieces and I didn't think that was needed any more. If it is we need to find out why and add back code to do it again. Signed-off-by: David S. Miller commit fe7ba31feadcc2cdb7749a8ed14960f989cbd021 Author: Marvin Raaijmakers Date: Wed May 9 10:57:20 2007 +0200 HID: add hooks for getkeycode() and setkeycode() methods Provide hooks for getkeycode() and setkeycode() methods to input_dev. Signed-off-by: Marvin Raaijmakers Signed-off-by: Jiri Kosina commit 23688e999eda70f1ce1c61a68b865b996e3c6c4c Author: Catalin Marinas Date: Tue May 8 22:45:26 2007 +0100 [ARM] armv7: add Makefile and Kconfig entries This patch adds the necessary lines to the Makefile and Kconfig files for enabling the compilation of the ARMv7 CPU support. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 065cf519c32984b7a78777aae3859baf5f5fd3d3 Author: Catalin Marinas Date: Wed May 9 09:50:23 2007 +0100 [ARM] armv7: add support for asid-tagged VIVT I-cache ARMv7 can have VIPT, PIPT or ASID-tagged VIVT I-cache. This patch adds the necessary invalidation of the I-cache when the ASID numbers are re-used. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 025257c7a7665a117b72097cc12021140eac8a34 Author: David Gibson Date: Wed May 9 17:13:31 2007 +1000 [MTD] [MAPS] Remove flash maps for no longer supported 405LP boards drivers/mtd/maps includes flash maps for the Beech and Arctic PowerPC 405LP based boards. However, the 405LP was discontinued before any quantity were distributed and those boards no longer have kernel support in general. Therefore, this patch removes this obsolete code. Signed-off-by: David Gibson Signed-off-by: David Woodhouse commit 2d0fa586facb740b9ef9a01dcedc94c126c6f148 Author: David Gibson Date: Wed May 9 11:55:51 2007 +1000 [MTD] [MAPS] Fix missing printk() parameter in physmap_of.c MTD driver Squashes a compiler warning, and provides more useful information in the case messed up device tree information. Signed-off-by: David Gibson Signed-off-by: David Woodhouse commit fc467a2623029976899261d6d379779c950ddcba Author: Manuel Lauss Date: Wed May 9 17:36:15 2007 +0900 sh: SH7760 DMABRG support. The DMABRG is a special DMA unit within the SH7760 which does data transfers from main memory to Audio units and USB shared memory. It has 3 IRQ lines which generate 10 events, which have to be masked unmasked and acked in a single 32bit register. It works independently from the tradition SH DMAC, but blocks usage of DMAC channel 0. This patch adds 2 functions to associate callbacks with DMABRG events and initialization. Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt commit 57be2b484a417bffae66359b9b89e7239480b729 Author: Paul Mundt Date: Wed May 9 17:33:24 2007 +0900 sh: clockevent/clocksource/hrtimers/nohz TMU support. This adds basic support for clockevents and clocksources, presently only implemented for TMU-based systems (which are the majority of SH-3 and SH-4 systems). The old NO_IDLE_HZ implementation is also dropped completely, the only users of this were on TMU-based systems anyways. More work needs to be done to generalize the TMU handling, in that the current implementation is rather tied to the notion of TMU0 and TMU1 utilization. Additionally, as more SH timers switch over to this scheme, we'll be able to gut most of the remaining system timer infrastructure that existed before. Signed-off-by: Paul Mundt commit 47cc3e780474be2e462278d63d77c27a493b28ed Author: Haavard Skinnemoen Date: Wed May 9 10:23:11 2007 +0200 [AVR32] Wire up sys_utimensat Tested with a slightly hacked version of the test case included with the original utimensat patch. All OK. Signed-off-by: Haavard Skinnemoen commit e071298589418076ef0a9813677f2d7032b65baa Author: Dmitry Torokhov Date: Wed May 9 10:17:31 2007 +0200 HID: switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion switch to using input_dev->dev.parent when specifying device position in sysfs tree. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit b3cfe0cb37ac7c3ca05a29e308f01c8eb27e06d4 Author: Haavard Skinnemoen Date: Wed May 9 09:26:18 2007 +0200 [AVR32] Fix section mismatch .taglist -> .init.text Rename .taglist to .taglist.init to silence section mismatch warnings. The .taglist.init section was already placed in the .init output section along with .init.text, so the warning didn't indicate any real problems. Signed-off-by: Haavard Skinnemoen commit 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a Author: John Anthony Kazos Jr Date: Wed May 9 08:41:36 2007 +0200 sound: convert "sound" subdirectory to UTF-8 Convert the "sound" subdirectory to UTF-8. Signed-off-by: John Anthony Kazos Jr. Signed-off-by: Adrian Bunk commit 9ae5e3bc316e753d76950ded0ea75d77e9459ba6 Author: Simon Arlott Date: Wed May 9 08:38:10 2007 +0200 MAINTAINERS: Add cxacru website/mailing list Signed-off-by: Simon Arlott Signed-off-by: Adrian Bunk commit 121e70b69aef898a3c02fa90d0a2108381bcf975 Author: John Anthony Kazos Jr Date: Wed May 9 08:30:57 2007 +0200 include files: convert "include" subdirectory to UTF-8 Convert the "include" subdirectory to UTF-8. Signed-off-by: John Anthony Kazos Jr. Signed-off-by: Adrian Bunk commit f42df9e658be10ca10d0d9b19a0e9d484694f04f Author: John Anthony Kazos Jr Date: Wed May 9 08:23:08 2007 +0200 general: convert "kernel" subdirectory to UTF-8 Convert the "kernel" subdirectory of the tree to UTF-8. The only file modified is . Signed-off-by: John Anthony Kazos Jr. Signed-off-by: Adrian Bunk commit be2a608bd08ec00e19e14b322e07f443d2711084 Author: John Anthony Kazos Jr Date: Wed May 9 08:50:42 2007 +0200 documentation: convert the Documentation directory to UTF-8 Convert files within the Documentation directory to UTF-8. Adrian Bunk: small additional fixes Signed-off-by: John Anthony Kazos Jr. Signed-off-by: Adrian Bunk commit dd4ef01c4004410e6515d9dd0d92dec133c60b9b Author: John Anthony Kazos Jr Date: Wed May 9 08:06:37 2007 +0200 Convert the toplevel files CREDITS and MAINTAINERS to UTF-8. Signed-off-by: John Anthony Kazos Jr. Signed-off-by: Adrian Bunk commit 2c2a8c531e953c753b06605c8ad6a9161ca527fa Author: Markus Dahms Date: Wed May 9 07:58:10 2007 +0200 remove broken URLs from net drivers' output Remove broken URLs (www.scyld.com) from network drivers' logging output. URLs in comments and other strings are left intact. Signed-off-by: Markus Dahms Acked-by: Jesper Juhl Acked-by: Alan Cox igned-off-by: Adrian Bunk commit b96687768a9ac0fdd005c7700093ebb24b93450f Author: Jesper Juhl Date: Wed May 9 07:54:49 2007 +0200 Magic number prefix consistency change to Documentation/magic-number.txt Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit a7bc02f4f47fd0e7860c6589f0ad000d1476f7a3 Author: Artem Bityutskiy Date: Wed May 9 07:53:16 2007 +0200 trivial: s/i_sem /i_mutex/ This patch substitutes i_sem by i_mutex in Documentation/filesystems/Locking. The patch also removes a couple of trailing white-spaces. Signed-off-by: Artem Bityutskiy Signed-off-by: Adrian Bunk commit 5886269962f94fa9185c32db3ec936c612503235 Author: Uwe Kleine-König Date: Wed May 9 07:51:49 2007 +0200 fix file specification in comments Many files include the filename at the beginning, serveral used a wrong one. Signed-off-by: Uwe Kleine-König Signed-off-by: Adrian Bunk commit 01afd80626e98c2347bc25be92ee4a3faf314514 Author: Márton Németh Date: Wed May 9 07:48:05 2007 +0200 drivers/base/platform.c: fix small typo in doc Typo: iwithout -> without. Signed-off-by: Márton Németh Signed-off-by: Adrian Bunk commit a982ac06b069f6ee9ea1b64f4ce68cdf2e138742 Author: Matt LaPlante Date: Wed May 9 07:35:06 2007 +0200 misc doc and kconfig typos Fix various typos in kernel docs and Kconfigs, 2.6.21-rc4. Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk commit 148e423f909e14564d8af13239c5d060f7df273e Author: Alexander E. Patrakov Date: Wed May 9 07:31:54 2007 +0200 Remove obsolete fat_cvf help text The text removed by the following patch refers to functionality that never worked, to non-existing documentation file, and to mount options marked as obsolete in the module. Signed-off-by: Alexander E. Patrakov Signed-off-by: Adrian Bunk commit 59c51591a0ac7568824f541f57de967e88adaa07 Author: Michael Opdenacker Date: Wed May 9 08:57:56 2007 +0200 Fix occurrences of "the the " Signed-off-by: Michael Opdenacker Signed-off-by: Adrian Bunk commit a492dbb9e3d04db138f2841648d1904d38a5295d Author: Haavard Skinnemoen Date: Tue Mar 20 14:41:13 2007 +0100 [AVR32] Implement dma_{alloc,free}_writecombine() Implement dma_alloc_writecombine() and its dma_free_writecombine() counterpart. These will do basically the same thing as dma_alloc_coherent() except that the virtual mapping will allow write buffering, causing better performance for certain use cases like frame buffers. The same API is already available on ARM. Signed-off-by: Haavard Skinnemoen commit e89b064a4fd18b9c57b7aecbe7101d782759cf81 Author: Thomas Gleixner Date: Sun Apr 29 16:10:34 2007 +0000 AVR32: Spinlock initializer cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Haavard Skinnemoen commit c19aa754f32ff1dd7cb8e96454f5eba95c20585e Author: Haavard Skinnemoen Date: Mon Apr 30 17:15:46 2007 +0200 [AVR32] Use correct config symbol when setting cpuflags As Robert P. J. Day pointed out, the CONFIG_CPU_AT32AP7000 symbol wasn't used for anything. It should have been used to select the correct -mcpu= options for CFLAGS. -mcpu=ap7000 is the default anyway, so this patch shouldn't really make any difference, but it's always nice to do things correctly. Signed-off-by: Haavard Skinnemoen commit f1a1eb299a8422c3e8d41753095bec44b2493398 Author: David Gibson Date: Wed May 9 15:20:37 2007 +1000 [POWERPC] Further fixes for the removal of 4level-fixup hack from ppc32 Commit d1953c8888ef034b912ee33bc2ea2cce6a414402 removed the use of 4level-fixup.h for 32-bit systems under arch/powerpc. However, I missed a few things activated on some configurations, resulting in some warnings (at least with STRICT_MM_TYPECHECKS enabled) and build errors in some circumstances. This fixes it. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit fcf9892b553ba638e6c8f9b6a140c99927c69693 Author: Linas Vepstas Date: Wed May 9 09:36:21 2007 +1000 [POWERPC] EEH: log all PCI-X and PCI-E AER registers When an EEH event is detected, and after the device driver has been notified, but before the device is reset, enable MMIO to the adapter, and grab the contents of the PCI status and command registers, the PCI-X status and command, and the PCI-E capability 10 and AER registers. Pass these up to the RTAS error log, and also printk them. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit d99bb1db798f49eacb27e087da7e62433361174d Author: Linas Vepstas Date: Wed May 9 09:35:32 2007 +1000 [POWERPC] EEH: capture and log pci state on error If an EEH event is observed, capture PCI config space info about the device, wrap it up and pass it to the event logger. This pach just slots in the basic logging function. A later patch will provide for more through data gathering. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit b455b24cf2512e9578a4ddd66ec91c3100c78127 Author: Linas Vepstas Date: Wed May 9 09:34:40 2007 +1000 [POWERPC] EEH: Split up long error msg Make some minor adjustments to the EEH error messages. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit ede8ca269f9f3e3fa4fb8561671f0699eefc32c5 Author: Linas Vepstas Date: Wed May 9 09:33:29 2007 +1000 [POWERPC] EEH: log error only after driver notification. It turns out many/most versions of firmware enable MMIO when the slto-error-detail rtas call is made (in violation of the architecture). Thus, it would be best to call slot-error-detail only after notifying device drivers of a freeze, as otherwise, a variety of strange and unexpected things may happen. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit b7a6912969af7586ade62667d6d1c7ecc534faa1 Author: Scott Wood Date: Wed May 9 03:15:34 2007 +1000 [POWERPC] fsl_soc: Make mac_addr const in fs_enet_of_init(). of_get_mac_address() returns a const pointer, so the result should be stored in a const pointer. Signed-off-by: Scott Wood Signed-off-by: Paul Mackerras commit 517e22638c282bb07c52a11f928961ed4822196b Author: Hugh Dickins Date: Wed May 9 14:38:48 2007 +1000 [POWERPC] Don't use SLAB/SLUB for PTE pages The SLUB allocator relies on struct page fields first_page and slab, overwritten by ptl when SPLIT_PTLOCK: so the SLUB allocator cannot then be used for the lowest level of pagetable pages. This was obstructing SLUB on PowerPC, which uses kmem_caches for its pagetables. So convert its pte level to use normal gfp pages (whereas pmd, pud and 64k-page pgd want partpages, so continue to use kmem_caches for pmd, pud and pgd). Signed-off-by: Hugh Dickins Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f1fa74f4afe96b0e4ac2beaa61fa4f4667acdcbb Author: Benjamin Herrenschmidt Date: Tue May 8 16:27:29 2007 +1000 [POWERPC] Spufs support for 64K LS mappings on 4K kernels This adds an option to spufs when the kernel is configured for 4K page to give it the ability to use 64K pages for SPE local store mappings. Currently, we are optimistic and try order 4 allocations when creating contexts. If that fails, the code will fallback to 4K automatically. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 16c2d476232523260c495eafbf9cdc1be984b7df Author: Benjamin Herrenschmidt Date: Tue May 8 16:27:28 2007 +1000 [POWERPC] Add ability to 4K kernel to hash in 64K pages This adds the ability for a kernel compiled with 4K page size to have special slices containing 64K pages and hash the right type of hash PTEs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d0f13e3c20b6fb73ccb467bdca97fa7cf5a574cd Author: Benjamin Herrenschmidt Date: Tue May 8 16:27:27 2007 +1000 [POWERPC] Introduce address space "slices" The basic issue is to be able to do what hugetlbfs does but with different page sizes for some other special filesystems; more specifically, my need is: - Huge pages - SPE local store mappings using 64K pages on a 4K base page size kernel on Cell - Some special 4K segments in 64K-page kernels for mapping a dodgy type of powerpc-specific infiniband hardware that requires 4K MMU mappings for various reasons I won't explain here. The main issues are: - To maintain/keep track of the page size per "segment" (as we can only have one page size per segment on powerpc, which are 256MB divisions of the address space). - To make sure special mappings stay within their allotted "segments" (including MAP_FIXED crap) - To make sure everybody else doesn't mmap/brk/grow_stack into a "segment" that is used for a special mapping Some of the necessary mechanisms to handle that were present in the hugetlbfs code, but mostly in ways not suitable for anything else. The patch relies on some changes to the generic get_unmapped_area() that just got merged. It still hijacks hugetlb callbacks here or there as the generic code hasn't been entirely cleaned up yet but that shouldn't be a problem. So what is a slice ? Well, I re-used the mechanism used formerly by our hugetlbfs implementation which divides the address space in "meta-segments" which I called "slices". The division is done using 256MB slices below 4G, and 1T slices above. Thus the address space is divided currently into 16 "low" slices and 16 "high" slices. (Special case: high slice 0 is the area between 4G and 1T). Doing so simplifies significantly the tracking of segments and avoids having to keep track of all the 256MB segments in the address space. While I used the "concepts" of hugetlbfs, I mostly re-implemented everything in a more generic way and "ported" hugetlbfs to it. Slices can have an associated page size, which is encoded in the mmu context and used by the SLB miss handler to set the segment sizes. The hash code currently doesn't care, it has a specific check for hugepages, though I might add a mechanism to provide per-slice hash mapping functions in the future. The slice code provide a pair of "generic" get_unmapped_area() (bottomup and topdown) functions that should work with any slice size. There is some trickiness here so I would appreciate people to have a look at the implementation of these and let me know if I got something wrong. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 16f1c746755836aa823658000493cdab8ce7b098 Author: Benjamin Herrenschmidt Date: Tue May 8 16:27:27 2007 +1000 [POWERPC] Small fixes & cleanups in segment page size demotion The code for demoting segments to 4K had some issues, like for example, when using _PAGE_4K_PFN flag, the first CPU to hit it would do the demotion, but other CPUs hitting the same page wouldn't properly flush their SLBs if mmu_ci_restriction isn't set. There are also potential issues with hash_preload not handling _PAGE_4K_PFN. All of these are non issues on current hardware but might bite us in the future. This patch thus fixes it by: - Taking the test comparing the mm and current CPU context page sizes to decide to flush SLBs out of the mmu_ci_restrictions test since that can also be triggered by _PAGE_4K_PFN pages - Due to the above being done all the time, demote_segment_4k doesn't need update the context and flush the SLB - demote_segment_4k can be static and doesn't need an EXPORT_SYMBOL - Making hash_preload ignore anything that has either _PAGE_4K_PFN or _PAGE_NO_CACHE set, thus avoiding duplication of the complicated logic in hash_page() (and possibly making hash_preload a little bit faster for the normal case). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b15f792fafb7e0524907ddd9e035d73dddeed89c Author: Stephen Rothwell Date: Tue May 8 15:05:31 2007 +1000 [POWERPC] iSeries: Make HVC_ISERIES the default This makes the new iSeries virtual console drivers (nvc_iseries) the default and prevents viocons being built unless explicitly selected. Also it makes no sense to have the console as a module. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8cf44080ebc372d4d0d2997a0c015add0afcd65d Author: Stephen Rothwell Date: Thu May 3 15:19:05 2007 +1000 [POWERPC] iSeries: suppress build warning in lparmap.c lparmap.c: Assembler messages: lparmap.c:51: Warning: ignoring changed section attributes for .text Idea from Segher Boessenkool. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 4e8ad3e816cca76ff8550e531103fc5e20471654 Author: Johannes Berg Date: Tue May 8 19:25:00 2007 +1000 [POWERPC] Mark pages that don't exist as nosave On some powerpc architectures (notably 64-bit powermac) there is a memory hole, for example on powermacs between 2G and 4G. Since we use the flat memory model regardless, these pages must be marked as nosave (for suspend to disk.) Signed-off-by: Johannes Berg Cc: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 940d67f6b95166475ff6e600ef7658e1cd441278 Author: Johannes Berg Date: Tue May 8 19:23:49 2007 +1000 [POWERPC] swsusp: Introduce register_nosave_region_late This patch introduces a new register_nosave_region_late function that can be called from initcalls when register_nosave_region can no longer be used because it uses bootmem. Signed-off-by: Johannes Berg Acked-by: Rafael J. Wysocki Signed-off-by: Paul Mackerras commit 02a3e59a088749c08b0293ee1535f5bf48f5926c Author: Robert P. J. Day Date: Wed May 9 07:26:28 2007 +0200 Fix minor typoes in kernel/module.c Fix minor (comment) typoes in kernel/module.c. Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit b0e37650404b2302416ad3dbe649fdecba8d35d4 Author: Robert P. J. Day Date: Wed May 9 07:25:13 2007 +0200 Kconfig: Remove reference to external mqueue library Remove the reference to an external mqueue library since that was merged into glibc in 2004. Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit fd2dbc92e318ee9d306c4c3f393eef7294a5a30c Author: Robert P. J. Day Date: Wed May 9 07:23:41 2007 +0200 Kconfig: A couple of grammatical fixes in arch/i386/Kconfig Fix a couple grammatical errors in arch/i386/Kconfig. Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit c685ce059d42ebda7822786498dfd366695457f6 Author: Robert P. J. Day Date: Wed May 9 07:21:11 2007 +0200 Correct comments in genrtc.c to refer to correct /proc file. Correct documentation in genrtc.c to refer to the correct /proc file that's used to export information: /proc/driver/rtc. Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit 8b60756a628a73bc8bf8b59d8716cb3f09b7e7eb Author: Randy Dunlap Date: Wed May 9 07:19:14 2007 +0200 Fix more "deprecated" spellos. Signed-off-by: Randy Dunlap Signed-off-by: Adrian Bunk commit 1591275cb57bc5df7ff59774b85c8af84bc45e87 Author: Robert P. J. Day Date: Wed May 9 07:18:01 2007 +0200 Fix "deprecated" typoes. Fix remaining misspellings of "depreciated" to "deprecated." Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit beb7dd86a101263bf63a78c7c6d4da3849b35bd6 Author: Robert P. J. Day Date: Wed May 9 07:14:03 2007 +0200 Fix misspellings collected by members of KJ list. Fix the misspellings of "propogate", "writting" and (oh, the shame :-) "kenrel" in the source tree. Signed-off-by: Robert P. J. Day Signed-off-by: Adrian Bunk commit 3dde6ad8fc3939d345a3768464ecff43c91d511a Author: David Sterba Date: Wed May 9 07:12:20 2007 +0200 Fix trivial typos in Kconfig* files Fix several typos in help text in Kconfig* files. Signed-off-by: David Sterba Signed-off-by: Adrian Bunk commit ccf6780dc3d228f380e17b6858b93fc48e40afd4 Author: WANG Cong Date: Wed May 9 07:10:02 2007 +0200 Style fix in fs/select.c Signed-off-by: WANG Cong Signed-off-by: Adrian Bunk commit d3e6975e0f25044c4c86f5a42c9917090973636b Author: Randy Dunlap Date: Wed May 9 07:02:59 2007 +0200 devres: kernel-doc and DocBook Make devres.c ready for adding to DocBook. Add devres.c to DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Adrian Bunk commit 0f8952c2fa981c75dbbb363ac83b320068fffa69 Author: Ronni Nielsen Date: Wed May 9 06:44:57 2007 +0200 fs/libfs.c: >80 columns line break fix Signed-off-by: Ronni Nielsen Signed-off-by: Adrian Bunk commit 1ce7ddd5f4cc754b6afe9eec5cee89ede75348ea Author: Paul Mundt Date: Wed May 9 13:20:52 2007 +0900 sh: Truncate MAX_ACTIVE_REGIONS for the common case. Most SH platforms aren't going to need more than a single active region, ones that need more can pad this out as necessary. Signed-off-by: Paul Mundt commit de372ecd80a42c4fb485c7232475301a18d05184 Author: H. Peter Anvin Date: Tue May 8 20:37:02 2007 -0700 Documentation/i386/boot.txt: update and correct In the process of rewriting the x86 setup code, I found a number of inaccuracies and outdated recommendations in the boot protocol documentation. Revamp to make it more up to date. In particular, the common use of the heap actually requires (slightly) more than 4K of heap plus stack, which is the recommended amount in the document; currently the code compensates by being smaller than specified, but we can't assume that will be true forever. Thus, recommend that if we have a modern bzImage kernel, that the bootloader maximizes the available space. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d5f9f942c601fdebe57f7805e4b4fbad9c28ada8 Author: Andrew Morton Date: Tue May 8 20:27:06 2007 -0700 revert 'sched: redundant reschedule when set_user_nice() boosts a prio of a task from the "expired" array' Revert commit bd53f96ca54a21c07e7a0ae1886fa623d370b85f. Con says: This is no good, sorry. The one I saw originally was with the staircase deadline cpu scheduler in situ and was different. #define TASK_PREEMPTS_CURR(p, rq) \ ((p)->prio < (rq)->curr->prio) (((p)->prio < (rq)->curr->prio) && ((p)->array == (rq)->active)) This will fail to wake up a runqueue for a task that has been migrated to the expired array of a runqueue which is otherwise idle which can happen with smp balancing, Cc: Dmitry Adamushko Cc: Con Kolivas Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da4e8ca376a1b3dca470eba14dcec321a6a27b8b Author: Jean Delvare Date: Tue May 8 20:27:05 2007 -0700 applesmc: Use standard sysfs names for labels We have a standard suffix to associate a designation string to a sensor: _label. Use it instead of _position so that libsensors will catch it. (This isn't implemented yet, but should be soon.) Signed-off-by: Jean Delvare Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddfbf2afd538b38139267f71a185eb9434465440 Author: Jean Delvare Date: Tue May 8 20:27:04 2007 -0700 applesmc: Use the address as platform device ID Let the applesmc device export its address to userspace. libsensors needs this to recognize the device and give it a unique ID. Signed-off-by: Jean Delvare Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d364954f5a2a97b4e378f34a13fbf296aa16ec Author: Tilman Schmidt Date: Tue May 8 20:27:03 2007 -0700 usb_gigaset: don't kmalloc(0) Zero-sized allocations are pointless anyway, and the SLUB allocator complains about them, so stop doing that. Signed-off-by: Tilman Schmidt Signed-off-by: Hansjoerg Lipp Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b590d2baf17f8890f648e76436abdb8674d564eb Author: Geert Uytterhoeven Date: Tue May 8 20:27:03 2007 -0700 m68k: needs The recent cleanup uncovered that include/asm-m68k/scatterlist.h needs to include Signed-off-by: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5616df204ecf164ef2b124a17fd3cadd87954628 Author: David Howells Date: Tue May 8 20:27:02 2007 -0700 FRV: Miscellaneous fixes Miscellaneous fixes to bring FRV up to date: (1) Copy the new syscall numbers from i386 to asm-frv/unistd.h and fill out the syscall table in entry.S too. (2) Mark __frv_uart0 and __frv_uart1 __pminitdata rather than __initdata so that determine_clocks() can access them when CONFIG_PM=y. (3) Make arch/frv/mm/elf-fdpic.c include asm/mman.h so that MAP_FIXED is available (fixes commit 2fd3bebaad9da3b3b99c46a3389099424bf7ee35). Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b8df8915a6980f476e1fa8f4d156e36cb63bf76 Author: David Rientjes Date: Tue May 8 20:27:01 2007 -0700 smaps: only define clear_refs for CONFIG_MMU /proc/pid/clear_refs is only defined in the CONFIG_MMU case, so make sure we don't have any references to clear_refs_smap() in generic procfs code. Signed-off-by: David Rientjes Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e81ab9d3d9a22fb7b20c56f0cabc8ef51954014 Author: Yasunori Goto Date: Tue May 8 20:27:01 2007 -0700 Fix unnecesary meminit This is to fix unnecessary __meminit definition. These are exported for kernel modules. I compiled on ia64/x86-64 with memory hotplug on/off. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a361a68bc510b91b50462433cfa65c6b620a80c3 Author: Paul Mundt Date: Wed May 9 12:37:53 2007 +0900 rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq(). When the rtc_update_irq() callsites stopped passing in the class_dev, the rtc_dev references weren't fixed. Fix it up, so we pass in the proper pointer. Signed-off-by: Paul Mundt commit 7d7b33d6d558ea43018c3b2a94c6d52e78128cbe Author: Dmitry Torokhov Date: Tue May 8 23:34:30 2007 -0400 Input: adbhid - do not access input_dev->private directly Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov commit 18cc6757532e3b0e7a569b1631869c812b777196 Author: Peter Samuelson Date: Tue May 8 23:34:18 2007 -0400 Input: logips2pp - add type 72 (PS/2 TrackMan Marble) This is purely cosmetic: this is standard 3-button, no wheel or other such features, so it already _worked_ just fine. This patch suppresses a warning about the unknown model, and changes the printk from "Mouse" to "TrackMan". Signed-off-by: Peter Samuelson Signed-off-by: Dmitry Torokhov commit 01e73be3c8f254ef19d787f9b6757468175267eb Author: Linus Torvalds Date: Tue May 8 20:12:30 2007 -0700 Revert "fbdev: ignore VESA modes if framebuffer is disabled" This reverts commit 464bdd33e9baad9806c7adbd8dfc37081a55f27e. Peter Anvin correctly points out that VESA modes have nothing to do with frame buffers per se - they are often just regular extended text modes. Disabling them just because we don't have frame buffer support is very wrong. Cc: H. Peter Anvin Cc: Antonino A. Daplas , Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7b82dc0e64e93f430182f36b46b79fcee87d3532 Author: Linus Torvalds Date: Tue May 8 20:10:00 2007 -0700 Remove suid/sgid bits on [f]truncate() .. to match what we do on write(). This way, people who write to files by using [f]truncate + writable mmap have the same semantics as if they were using the write() family of system calls. Signed-off-by: Linus Torvalds commit 1605b8471d64c855bc2493abf3adf6a1ebc3e645 Author: Herbert Xu Date: Wed May 9 13:04:39 2007 +1000 [CRYPTO] cryptomgr: Fix use after free By the time kthread_run returns the param may have already been freed so writing the returned thread_struct pointer to param is wrong. In fact, we don't need it in param anyway so this patch simply puts it on the stack. Signed-off-by: Herbert Xu commit b118ca572db5af832c6fc1af7b301105378d1a08 Author: Paul Mundt Date: Wed May 9 10:55:38 2007 +0900 sh: Convert to common die chain. This went in immediately after SH added the die chain notifiers, so move over to that instead.. Signed-off-by: Paul Mundt commit 21ec4c6453790cb9bfa996ab8f27f22dd47c516a Author: Paul Mundt Date: Wed May 9 10:42:48 2007 +0900 sh: Wire up utimensat syscall. Signed-off-by: Paul Mundt commit f6a3c1ca00ce9a43942364a0cc15601b291df281 Author: kogiidena Date: Tue May 8 20:49:46 2007 +0900 sh: landisk mv_nr_irqs definition. Fix up the landisk build. When NR_IRQS was removed, landisk got missed in the updates. Update the machvec for the landisk IRQs to get it working again. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit c71861e65e2898850478a7ac6c4b8cc9f7007e9e Author: kogiidena Date: Tue May 8 20:45:46 2007 +0900 sh: Fixup ndelay() xloops calculation for alternate HZ. Currently the xloops calculation in ndelay() gets set to 0 when calculated with HZ=250, fix up how we do the HZ factoring in order to get this right for differing values. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit 074f98df0547b7d15f78db9a17e985da0c22af28 Author: Paul Mundt Date: Tue May 8 15:45:33 2007 +0900 sh: Add 32-bit opcode feature CPU flag. Add a CPU flag for the CPUs that support 32-bit opcodes, which gets passed down to userspace. Signed-off-by: Paul Mundt commit 53f983a90d7908bcece51f86180c7c9b575a1e4d Author: Paul Mundt Date: Tue May 8 15:31:48 2007 +0900 sh: Fix PC adjustments for varying opcode length. There are a few different cases for figuring out how to size the instruction. We read in the instruction located at regs->pc - 4 when rewinding the opcode to figure out if there's a 32-bit opcode before the faulting instruction, with a default of a - 2 adjustment on a mismatch. In practice this works for the cases where pc - 4 is just another 16-bit opcode, or we happen to have a 32-bit and a 16-bit immediately preceeding the pc value. In the cases where we aren't rewinding, this is much less ugly.. We also don't bother fixing up the places where we're explicitly dealing with 16-bit instructions, since this might lead to confusion regarding the encoding size possibilities on other CPU variants. Signed-off-by: Paul Mundt commit bd0799977cb9b68aa6a39e9630aeea4778a58385 Author: Paul Mundt Date: Tue May 8 14:50:59 2007 +0900 sh: Support for SH-2A 32-bit opcodes. SH-2A supports both 16 and 32-bit instructions, add a simple helper for figuring out the instruction size in the places where there are hardcoded 16-bit assumptions. Signed-off-by: Paul Mundt commit 51c8b856f5edfa45d956721aa6d6ebaa15699062 Author: Paul Mundt Date: Tue May 8 13:16:57 2007 +0900 sh: Kill off redundant __div64_32 symbol export. modpost noticed that __div64_32 was being exported twice: WARNING: lib/built-in: '__div64_32' exported twice. Previous export was in arch/sh/kernel/built-in.ko kill off the duplicate. Signed-off-by: Paul Mundt commit 00bf0610e4cdbb9fd79ce4718e12b24cd7876dd7 Author: Paul Mundt Date: Tue May 8 13:01:37 2007 +0900 sh: Share exception vector table for SH-3/4. The only difference between these at the moment are the FPU exceptions, and these are hidden away under CONFIG_SH_FPU (which is only set for the SH-4 case anyways..). This consolidates the two tables, and updates SH-4 to use the updated copy. Signed-off-by: Paul Mundt commit 44530c696b3fc2c8a45bdc798af85528e065ed80 Author: Paul Mundt Date: Tue May 8 12:14:54 2007 +0900 sh: Always define TRAPA_BUG_OPCODE. Previously this was only set when CONFIG_BUG=y. While we rely on that for handle_BUG() dispatch, we still want to hand the opcode off to the die chain notifier for determining the trap value. Signed-off-by: Paul Mundt commit 1039b9a9d830e906efa770db75db8a3e11c47c1a Author: Paul Mundt Date: Tue May 8 12:07:21 2007 +0900 sh: __GFP_REPEAT for pte allocations, too. This got dropped in the quicklist conversion, add it back in.. Signed-off-by: Paul Mundt commit 435c55d1ef3ec5460fab8c332a693ef5fad18454 Author: Paul Mundt Date: Tue May 8 11:56:27 2007 +0900 rtc: rtc-sh: Fix up dev_dbg() warnings. Signed-off-by: Paul Mundt commit 5f8c9908f200b775a3d6c345bc6f3e928e2426a9 Author: Paul Mundt Date: Tue May 8 11:55:21 2007 +0900 sh: generic quicklist support. This moves SH over to the generic quicklists. As per x86_64, we have special mappings for the PGDs, so these go on their own list.. Signed-off-by: Paul Mundt commit 127cda1e8cc282de1ca7a9dcc3866841977b9fcc Author: David S. Miller Date: Tue May 8 18:25:14 2007 -0700 [SPARC64]: Optimize fault kprobe handling just like powerpc. And eliminate DIE_GPF while we're at it. Signed-off-by: David S. Miller commit 225c7b1feef1b41170f7037a5b10a65cd8a42c54 Author: Roland Dreier Date: Tue May 8 18:00:38 2007 -0700 IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters Add an InfiniBand driver for Mellanox ConnectX adapters. Because these adapters can also be used as ethernet NICs and Fibre Channel HBAs, the driver is split into two modules: mlx4_core: Handles low-level things like device initialization and processing firmware commands. Also controls resource allocation so that the InfiniBand, ethernet and FC functions can share a device without stepping on each other. mlx4_ib: Handles InfiniBand-specific things; plugs into the InfiniBand midlayer. Signed-off-by: Roland Dreier commit 1bf66a30421ca772820f489d88c16d0c430d6a67 Author: Roland Dreier Date: Wed Apr 18 20:20:28 2007 -0700 IB: Put rlimit accounting struct in struct ib_umem When memory pinned with ib_umem_get() is released, ib_umem_release() needs to subtract the amount of memory being unpinned from mm->locked_vm. However, ib_umem_release() may be called with mm->mmap_sem already held for writing if the memory is being released as part of an munmap() call, so it is sometimes necessary to defer this accounting into a workqueue. However, the work struct used to defer this accounting is dynamically allocated before it is queued, so there is the possibility of failing that allocation. If the allocation fails, then ib_umem_release has no choice except to bail out and leave the process with a permanently elevated locked_vm. Fix this by allocating the structure to defer accounting as part of the original struct ib_umem, so there's no possibility of failing a later allocation if creating the struct ib_umem and pinning memory succeeds. Signed-off-by: Roland Dreier commit f7c6a7b5d59980b076abbf2ceeb8735591290285 Author: Roland Dreier Date: Sun Mar 4 16:15:11 2007 -0800 IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules Export ib_umem_get()/ib_umem_release() and put low-level drivers in control of when to call ib_umem_get() to pin and DMA map userspace, rather than always calling it in ib_uverbs_reg_mr() before calling the low-level driver's reg_user_mr method. Also move these functions to be in the ib_core module instead of ib_uverbs, so that driver modules using them do not depend on ib_uverbs. This has a number of advantages: - It is better design from the standpoint of making generic code a library that can be used or overridden by device-specific code as the details of specific devices dictate. - Drivers that do not need to pin userspace memory regions do not need to take the performance hit of calling ib_mem_get(). For example, although I have not tried to implement it in this patch, the ipath driver should be able to avoid pinning memory and just use copy_{to,from}_user() to access userspace memory regions. - Buffers that need special mapping treatment can be identified by the low-level driver. For example, it may be possible to solve some Altix-specific memory ordering issues with mthca CQs in userspace by mapping CQ buffers with extra flags. - Drivers that need to pin and DMA map userspace memory for things other than memory regions can use ib_umem_get() directly, instead of hacks using extra parameters to their reg_phys_mr method. For example, the mlx4 driver that is pending being merged needs to pin and DMA map QP and CQ buffers, but it does not need to create a memory key for these buffers. So the cleanest solution is for mlx4 to call ib_umem_get() in the create_qp and create_cq methods. Signed-off-by: Roland Dreier commit fed76ab3b206bd0c5a9e3be17cead0a22d7593c5 Author: Jan Kratochvil Date: Wed May 9 02:50:49 2007 +0200 USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk Logitech wheel (product id 0xc294) doesn't like to be polled for reports, otherwise it slows down initialization of this device to ten seconds. This patch adds HID_QUIRK_NOGET flag for this wheel. Signed-off-by: Jan Kratochvil Signed-off-by: Jiri Kosina commit 6675c5bd2a0ec223888b42cf97bc7dc900bf31fb Author: Dmitry Torokhov Date: Thu May 3 01:04:52 2007 -0400 USB HID: usb_buffer_free() cleanup usb_buffer_free() now handles NULLs so remove unneeded checks form callers. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 66da876962f782a3974b4a957d12f20656584a4d Author: Jiri Kosina Date: Wed May 2 11:55:42 2007 +0200 USB HID: report descriptor of Cypress USB barcode readers needs fixup Certain versions of Cypress USB barcode readers (this problem is known to happen at least with PIDs 0xde61 and 0xde64) have report descriptor which has swapped usage min and usage max tag. This results in HID parser failing for report descriptor of these devices, as it (wrongly) requires allocating more usages than HID_MAX_USAGES. Solve this by walking through the report descriptor for such devices, and swap the usage min and usage max items (and their values) to be in proper order. Reported-by: Bret Towe Signed-off-by: Jiri Kosina commit 3b180bff4c606b2596c40b26f85af6bc7d8cc50b Author: Jiri Kosina Date: Tue May 8 19:51:23 2007 +0200 Bluetooth HID: HIDP - don't initialize force feedback The current implementation of force feedback for HID devices is USB-transport only and therefore calling hid_ff_init() from hidp code is not going to work (plus it creates unwanted dependency of hidp on usbhid). Remove the hid_ff_init() until either the hid-ff is made transport-independent, or at least support for bluetooth transport is added. Signed-off-by: Jiri Kosina Signed-off-by: Marcel Holtmann commit 59e7e36c325b4d447a490ee163eac23025763681 Author: Noel Kothe Date: Mon May 7 23:26:03 2007 +0200 USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description This option is needed on the Apple Intel Laptops too. Signed-off-by: Noel Kothe Signed-off-by: Jiri Kosina commit 529fa5473123a9e81e711a92e46fba732c4264ed Author: Charles Pillar Date: Thu May 3 17:30:12 2007 +0200 HID: add input mappings for non-working keys on Logitech S510 remote HID-input mapping for non-working S510 remote control buttons. Signed-off-by: Charles Pillar Signed-off-by: Jiri Kosina commit 6c1142602c9c8faedbc1321892a169652a173fc7 Author: David S. Miller Date: Tue May 8 17:50:14 2007 -0700 [SPARC]: Wire up utimensat syscall. Signed-off-by: David S. Miller commit af80318eb71e234a59957cd1d2d7c3fa2ea27313 Author: David S. Miller Date: Tue May 8 17:23:31 2007 -0700 [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code. Signed-off-by: David S. Miller commit c57c2ffb153a99769a15a2ff1729371ddee5601a Author: David S. Miller Date: Tue May 8 00:43:56 2007 -0700 [SPARC64]: Kill asm-sparc64/pbm.h Everything it contains can be hidden in pci_impl.h Signed-off-by: David S. Miller commit 63c3f460cb47c2e06f1726e18534d0e1fe8652a7 Author: David S. Miller Date: Tue May 8 00:37:23 2007 -0700 [ATYFB]: Fix sparc includes. No need to use asm/pbm.h here. Signed-off-by: David S. Miller commit 15576bc8adb33d58867942385ae849cc48379610 Author: David S. Miller Date: Tue May 8 00:36:49 2007 -0700 [QLA2XXX]: Fix build on sparc. We now use pci_device_to_OF_node() to get properties and of_get_property() returns const pointers. Signed-off-by: David S. Miller commit 28113a9941c8cb6ca90ab4a66876db84342a084b Author: David S. Miller Date: Tue May 8 00:19:02 2007 -0700 [SPARC64]: Removal of trivial pci_controller_info uses. Signed-off-by: David S. Miller commit 6c108f1299754877bb5f73ccac5621eb603b97eb Author: David S. Miller Date: Mon May 7 23:49:01 2007 -0700 [SPARC64]: Move index info pci_pbm_info. Signed-off-by: David S. Miller commit e9870c4c0aef94580e28be11a1c6246dcabbe528 Author: David S. Miller Date: Mon May 7 23:28:50 2007 -0700 [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info. Signed-off-by: David S. Miller commit f1cd8de2c951e206b57fd76aff279cf13ea25815 Author: David S. Miller Date: Mon May 7 23:24:05 2007 -0700 [SPARC64]: Move pci_ops into pci_pbm_info. Signed-off-by: David S. Miller commit 96a496fd49fb2c3178128237ae4691b7c7df3a3d Author: David S. Miller Date: Mon May 7 23:08:39 2007 -0700 [SPARC64] SBUS: Error interrupt registry cleanups. Do not use IRQF_SHARED, these interrupt numbers should all be unique. Also use name strings without spaces in them just like PCI controller drivers do, for consistency. Signed-off-by: David S. Miller commit 34768bc8329194b14e42ee408a84edfa40059046 Author: David S. Miller Date: Mon May 7 23:06:27 2007 -0700 [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's The idea is to move more and more things into the pbm, with the eventual goal of eliminating the pci_controller_info entirely as there really isn't any need for it. This stage of the transformations requires some reworking of the PCI error interrupt handling. It might be tricky to get rid of the pci_controller_info parenting for a few reasons: 1) When we get an uncorrectable or correctable error we want to interrogate the IOMMU and streaming cache of both PBMs for error status. These errors come from the UPA front-end which is shared between the two PBM PCI bus segments. Historically speaking this is why I choose the datastructure hierarchy of pci_controller_info-->pci_pbm_info 2) The probing does a portid/devhandle match to look for the 'other' pbm, but this is entirely an artifact and can be eliminated trivially. What we could do to solve #1 is to have a "buddy" pointer from one pbm to another. Signed-off-by: David S. Miller commit 5a4a3e592d0d66653297049373caa7ac5b4febe0 Author: David S. Miller Date: Mon May 7 21:54:28 2007 -0700 [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX. They are totally unused. Signed-off-by: David S. Miller commit cfa0652c4eb4ca37f88fcdd7d871cf98d9d98c0e Author: David S. Miller Date: Mon May 7 21:51:41 2007 -0700 [SPARC64] PCI: Use common routine to fetch PBM properties. Namely bus-range and ino-bitmap. This allows us also to eliminate pci_controller_info's pci_{first,last}_busno fields as only the pbm ones are used now. Signed-off-by: David S. Miller commit e180583b85f4a48bd55924712c88e5d8eb182e08 Author: Alexey Kuznetsov Date: Tue May 8 15:57:59 2007 -0700 [IA64] wire up pselect, ppoll Signed-off-by: Alexey Kuznetsov Signed-off-by: Alexey Dobriyan Signed-off-by: Tony Luck commit 56163fcf194fb688fcf3cefa9b90c5ad41f74059 Author: Catalin Marinas Date: Tue May 8 22:53:44 2007 +0100 [ARM] armv7: add dedicated ARMv7 barrier instructions Starting with ARMv7, there are dedicated instruction for the ISB, DSB and DMB barriers and there is no need to execute them as CP15 operations. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit aaf83acba9fb1f93d2e656c7e4dda4e38c1cb490 Author: Catalin Marinas Date: Tue May 8 22:38:40 2007 +0100 [ARM] armv7: Add ARMv7 cacheid macros This patch renames the old __cacheid_* macros to __cacheid_*_prev7 and adds support for the new format. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit bbe888864ec32435e93923c40b9d6ce2bb73844b Author: Catalin Marinas Date: Tue May 8 22:27:46 2007 +0100 [ARM] armv7: add support for ARMv7 cores. This patch adds support for the ARMv7 cores. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 4a177cbf84f827cf9f1d6cfa5264fafd3cc33ce0 Author: Alexey Dobriyan Date: Tue Jan 23 19:03:17 2007 +0300 [IA64] Add TIF_RESTORE_SIGMASK Preparation for pselect and ppoll. ia32 compat code not tested. :-( Signed-off-by: Alexey Kuznetsov Signed-off-by: Alexey Dobriyan Signed-off-by: Tony Luck commit 690def21414fa43fac1b8053fd952c0366c476de Author: Kirill Korotaev Date: Mon Mar 19 14:04:20 2007 +0300 [IA64] unwind did not work for processes born with CLONE_STOPPED Minor problem for mainstream. Big problem for checkpoint/restore, because all the stopped/traced processes are born in this state, hence they cannot be checkpointed again due to failing unwind. The problem was identified as assumption in kernel unwind library that top level frame is different of syscall frame. It is the case unless process was born with CLONE_STOPPED. Author: Alexey Kuznetsov Signed-Off-By: Alexey Kuznetsov Signed-Off-By: Kirill Korotaev Signed-off-by: Tony Luck commit 3be44b9cc33d26930cb3bb014f35f582c6522481 Author: Jack Steiner Date: Tue May 8 14:50:43 2007 -0700 [IA64] Optional method to purge the TLB on SN systems This patch adds an optional method for purging the TLB on SN IA64 systems. The change should not affect any non-SN system. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit c5f125031f416ba6350e84462e9039737b6e2bab Author: Kevin Welton Date: Tue May 8 22:05:25 2007 +0100 [ARM] Fix ARM branch relocation range Branches in the ARM architecture are restricted to a range of +/- 32MB. However, the code in .../arch/arm/kernel/module.c::apply_relocate() was checking offset against a range of +/- 64MB. Signed-off-by: Kevin Welton Signed-off-by: Russell King commit 1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9 Author: Pierre Ossman Date: Tue May 8 22:35:17 2007 +0200 mmc: use lock instead of claim in debug check As mmc_detect_change() can be called from irq context, using claim (which can sleep) is inherently unsafe. Use the host spinlock instead, which also is faster. Signed-off-by: Pierre Ossman commit 790864dcc2b3fe65355dd84ef8481e54b1bc61b6 Author: Jan Engelhardt Date: Tue May 8 22:30:32 2007 +0200 mmc: Use menuconfig objects Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Pierre Ossman commit 055b8224140e7a7515bf8113ce675d58abffedf1 Author: Alex Dubov Date: Tue May 1 20:14:55 2007 -0700 disable socket power in adapter driver instead of media one Socket power must be fully controlled by adapter driver. This also prevents unnecessary power-off of the socket when media driver is unloaded, yet media remains in the socket. Signed-off-by: Alex Dubov Signed-off-by: Pierre Ossman commit b85fe92766dfc0c4e803cb0cead4c780cd0c02f9 Author: Andrew Victor Date: Tue May 8 07:51:23 2007 +0100 [ARM] 4363/1: AT91: Remove legacy PIO definitions Remove the legacy PIO pin definitions for the AT91 processors. The standard (and portable between the different AT91 processors) method is to use the AT91_PIN_* defines and the GPIO API. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 8eef3896b352a8760ab04293174444da4e8c8127 Author: Andrew Victor Date: Mon May 7 15:17:47 2007 +0100 [ARM] 4361/1: AT91: Build error Fix a build error due to a missing semicolon. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c40fae9525e6c29c87a4f4361ff0a8d67a36e448 Author: Tony Lindgren Date: Thu Dec 7 13:58:10 2006 -0800 ARM: OMAP: Sync core code with linux-omap This patch syncs omap specific core code with linux-omap. Most of the changes are needed to fix bitrot caused by driver updates in linux-omap tree. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit f4e4c324a5f81f18156499d1ade3732ba1f5b523 Author: Tony Lindgren Date: Thu Dec 7 13:57:38 2006 -0800 ARM: OMAP: Sync headers with linux-omap This patch syncs omap specific headers with linux-omap. Most of the changes needed because of bitrot caused by driver changes in linux-omap tree. Integrating this is needed for adding support for various omap drivers. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 994c84ea526ea1c348f63dc3aa7cfeec931bb612 Author: David Brownell Date: Wed Dec 6 17:14:03 2006 -0800 ARM: OMAP: h4 must have blinky leds!! This adds generic support for the "debug board" LEDs used by most of TI's OMAP reference boards, and board-specific support for the H4. It's derived from the not-as-generic stuff used by OMAP1 H2/H3/P2. Those should be able to switch easily to this version, and clean up some of the omap1-specific code. In addition to H4 support, one key improvement is supporting not just the "old" ARM debug LED API (with timer and idle LEDs, plus four that can be handy for kernel debugging), but it also supports the "new" generic LED API (most useful for usermode stuff IMO). Either or both APIs can be enabled. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 771af222eb98a60629aa1437901c7f266ff4dc89 Author: Imre Deak Date: Wed Dec 6 17:13:50 2006 -0800 ARM: OMAP: FB: add controller platform data Add controller platform data Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 0ce3356394dadc4704d42beb3788d7d78bda8ff2 Author: Juha Yrjola Date: Wed Dec 6 17:13:49 2006 -0800 ARM: OMAP: Add function to print clock usecounts Useful for debugging power management code. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 3151369d7467a37386e955e6f1ba5b9b5bea7500 Author: Juha Yrjola Date: Wed Dec 6 17:13:47 2006 -0800 ARM: OMAP: Add DMA IRQ sanity checks Add DMA IRQ sanity checks Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 277d58efadd67e73aa2860e41042d8d7fc750cea Author: David Brownell Date: Wed Dec 6 17:13:59 2006 -0800 ARM: OMAP: gpio init section cleanups Minor GPIO cleanups: remove needless #include, and omap_gpio_init() should be __init, as well as all the board init code calling it. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 215d06780d13fd7de629b02b61b7b7bf88ce5039 Author: Geert Uytterhoeven Date: Tue May 8 11:37:26 2007 +0200 Fix sunrpc warning noise Commit c5a4dd8b7c15927a8fbff83171b57cad675a79b9 introduced the following compiler warnings: net/sunrpc/sched.c:766: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'size_t' net/sunrpc/sched.c:785: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'size_t' - Use %zu to format size_t - Kill 2 useless casts Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8678c1f04277daaa914abb107fb9fe71298d916d Author: Russell King Date: Tue May 8 20:03:09 2007 +0100 [ARM] Fix ASID version switch Close a hole in the ASID version switch, particularly the following scenario: CPU0 MM PID CPU1 MM PID idle A pid(A) A idle(lazy tlb) * new asid version triggered by B * B pid(B) A pid(A) * MM A gets new asid version * A idle(lazy tlb) A pid(A) * CPU1 doesn't see the new ASID * The result is that CPU1 continues running with the hardware set for the original (stale) ASID value, but mm->context.id contains the new ASID value. The result is that the next MM fault on CPU1 updates the page table entries, but flush_tlb_page() fails due to wrong ASID. There is a related case with a threaded application is allocated a new ASID on one CPU while another of its threads is running on some different CPU. This scenario is not fixed by this commit. Signed-off-by: Russell King commit 8737d59579c5e61ea3d5da4bd63303159fd1cf7e Author: Milind Arun Choudhary Date: Sun Apr 15 22:51:23 2007 +0530 [IA64] SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64 SPIN_LOCK_UNLOCKED macro cleanup, use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Milind Arun Choudhary Signed-off-by: Tony Luck commit 1cfb9c94b6525763ee0eb9551842ded093c5827f Author: vignesh babu Date: Tue May 8 11:53:27 2007 -0700 [IA64-SN2][KJ] mmtimer.c-kzalloc Replacing kmalloc/memset combination with kzalloc. Signed-off-by: vignesh babu Signed-off-by: Tony Luck commit 74add80cbd7fe246c893b93ee75ac59acdd01dd4 Author: Roland McGrath Date: Tue May 8 11:19:38 2007 -0700 Remove unused variable in get_unmapped_area Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 66761522a7bca951c1214498b80260533957e3ad Author: Markus F.X.J. Oberhumer Date: Mon Apr 23 12:00:05 2007 +0200 [IA64] fix stack alignment for ia32 signal handlers This fixes the setup of the alignment of the signal frame, so that all signal handlers are run with a properly aligned stack frame. The current code "over-aligns" the stack pointer so that the stack frame is effectively always mis-aligned by 4 bytes. But what we really want is that on function entry ((sp + 4) & 15) == 0, which matches what would happen if the stack were aligned before a "call" instruction. i386 and x86_64 are already fixed by d347f372273c2b3d86a66e2e1c94c790c208e166 Signed-off-by: Markus F.X.J. Oberhumer Signed-off-by: Tony Luck commit be3478ddb8a3902b588c840b42e166a0e64a87b3 Author: Andrew Morton Date: Tue May 8 00:40:22 2007 -0700 sm501fb printk warning fixes drivers/video/sm501fb.c: In function 'sm501fb_cursor': drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 147394c8ece44be85d692cc92cc0d047e4d8fb69 Author: Andrei Konovalov Date: Tue May 8 00:40:18 2007 -0700 xilinxfb: xilinx framebuffer device driver Add support for the video controller IP block included into Xilinx ML300 and ML403 reference designs. Signed-off-by: Andrei Konovalov Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 Author: Krzysztof Helt Date: Tue May 8 00:40:16 2007 -0700 pm2fb: fix of jumps in pm2fb_probe This patch fixes incorrect targets of jumps when an error occurs in the pm2fb_probe. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c1a8b3122e7b2007cfd2836da2318816f324cc Author: Krzysztof Helt Date: Tue May 8 00:40:14 2007 -0700 skeletonfb: improvements This patch adds a macro to register PCI ids table and corrects type of xxxfb_fix variable to avoid modpost warnings. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4560daaf07ab68bef5e70355d1565b2e0a1a3bcf Author: Krzysztof Helt Date: Tue May 8 00:40:12 2007 -0700 pm2fb: removal of pm2fb_par fields This patch removes two redundant fields in the pm2fb_par structure. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7bf38699aed591b6624add40acfa71fe6d902c Author: Krzysztof Helt Date: Tue May 8 00:40:10 2007 -0700 skeletonfb: more corrections More corrections to skeletonfb.c file: - fixed types of more arguments - removed returned values in void functions - removed not existing fb_poll function - fixed closing comment typo - corrected misleading constant name ADDR Signed-off-by: Krzysztof Helt Acked-By: James Simmons Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e645ffd83f987c8650e9dd0f22a0c57296ed458 Author: Antonino A. Daplas Date: Tue May 8 00:40:08 2007 -0700 vga16fb: actually support widths in multiples of 8 vga16fb does not just support 8-pixel wide rectangles, but rectangles with widths in multiples of 8. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae854777592856ad8ce4d4cdb6114804e2e28f6 Author: Antonino A. Daplas Date: Tue May 8 00:40:06 2007 -0700 vgacon: disallow console operations when in KD_GRAPHICS mode Reported by James Pearson as: boot to run level 3 if not root, then make sure /dev/console is writeable login and type: setterm -blank 0 start X type into an xterm: while true; do echo "" > /dev/console; usleep 100000; done while the above loop is running switch to the text console and back again (Ctrl-Alt-F1 then Ctrl-Alt-F7) ... and the screen will be shifting (and wrapping) to the left. This problem stems from continuously writing text to the system console (which is in KD_TEXT mode) while the foreground console is in KD_GRAPHICS mode. Somewhere along the way, console printing got confused and omitted the KD_GRAPHICS/KD_TEXT test. Thus, vgacon attempted to scroll the screen of X, which causes X to shift. Fix by disallowing vgacon to touch the hardware when the vc is in KD_GRAPHICS mode. A definitive fix entails a full audit of the console code. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dd38030b3b4ca0aa18a5402059de27bf69ed6b Author: Jan Engelhardt Date: Tue May 8 00:40:04 2007 -0700 Use menuconfig objects II: video/logo Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87a7cc685a847800482db1fd74504b9b4b42264e Author: Krzysztof Helt Date: Tue May 8 00:40:02 2007 -0700 pm2fb: accelerated fillrect and copyarea This is a port of accelerated functions from 2.4 kernel. Only fillrect and copyarea are accelerated. Fillrect is not accelerated in 24-bit mode. [adaplas] Add appropriate flags Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ed25f50b347c7e1ff78f9308e025ddd57c2f20 Author: Ondrej Zajicek Date: Tue May 8 00:40:00 2007 -0700 s3fb: updates Move s3fb_get_tilemax to svgalib.c as svga_get_tilemax, because it reports limitation of other code from svgalib (svga_settile, svga_tilecopy, ...) Limit font width to 8 pixels in 4 bpp mode. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a31f0f7679aeaf79c613feaa3f4170741ccb218 Author: Krzysztof Helt Date: Tue May 8 00:39:57 2007 -0700 pm2fb: memclock setting corrections This patch disables a memory clock setting if a board has been initialized by BIOS. This allows using the memory clock set by manufacturer of the board. This patch also sets default clock for 3dlabs Permedia 2V reference board's clock to 75MHz (BIOS setting for EONtronic Permedia 2Vboard), because the default 83MHz can be too high. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76c7d3ffe3acddf5619bd796e0b8fa5dc6ecdb39 Author: krzysztof.h1@wp.pl Date: Tue May 8 00:39:56 2007 -0700 pm2fb: reset transparency settings This patch resets transparency settings when depth changes. Otherwise the 16 and 24-bit modes work incorrectly after switching from 32-bit mode. Signed-off-by: Krzysztof Helt < krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 167f07f1bc20ea1ab51d833deb0c18f5ab93618f Author: Antonino A. Daplas Date: Tue May 8 00:39:54 2007 -0700 fbcon: check console-fb mapping in fbcon_get_requirement - Check the console-to-fb mapping in fbcon_get_requirement(), otherwise the value returned may not be valid for the driver. - Minor cleanup Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e7223f28b4ed5073d2029a3597bf514ff514f2 Author: Antonino A. Daplas Date: Tue May 8 00:39:52 2007 -0700 fbdev: clean up exit patch of fb_set_var Clean up exit patch of fb_set_var(): - consolidate all return values into a single local variable - ensure that return values are valid error codes - fix fb_set_var() returning success when fb_check_caps() failed Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0959f0ca29244ae983b406fba313816a29244be7 Author: Adrian Bunk Date: Tue May 8 00:39:50 2007 -0700 drivers/video/sis/: remove more kernel 2.4 code Signed-off-by: Adrian Bunk Cc: Thomas Winischhofer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c831c338f0ad299fcd1592c6e4f30657480f39af Author: Matthias Kaehlcke Date: Tue May 8 00:39:49 2007 -0700 use mutex instead of semaphore in virtual console driver The virtual console driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 159dde93692ef549a0b2012c9f25feb4df638c9c Author: Ville Syrjala Date: Tue May 8 00:39:47 2007 -0700 atyfb: halve XCLK with Mobility and 32bit memory Laptops with Rage Mobility and 32bit memory interface seem to require halved XCLK to operate correctly. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4e124c138558a0cff51398ddff9a8e44ed0b529 Author: Ville Syrjala Date: Tue May 8 00:39:45 2007 -0700 atyfb: reorganize clock init Reorganize atyfb clock init code so command line clock overrides are effective for all chips. The old code would silently ignore some of the command line clock overrides with some chips. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94f45bcd1c29e773b6bf189ef7b9a3437d016320 Author: Ville Syrjala Date: Tue May 8 00:39:44 2007 -0700 atyfb: increase SPLL delay Wait 5 ms instead of 500 us for the SPLL to lock. This matches the recommendation in mach64 programmer's guide. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2620c6e31735248ac26403558bd4279a8af619d8 Author: Antonino A. Daplas Date: Tue May 8 00:39:42 2007 -0700 nvidiafb: fix return value of nvidiafb_open() Fix return value of nvidiafb_open(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0449359f053829ec89c026b5fb80bbe7190a5fe8 Author: Ondrej Zajicek Date: Tue May 8 00:39:41 2007 -0700 vga: vgastate fix 1) sets 'palette access disabled' during read from AR10. This is usually documented as needed for access AR01-AR0F, but on ARK Logic card it is needed for AR10 (otherwise read returns some nonsence and save_vga_text() returns before do anything). 2) do not restore AR10, because it was not changed during 3) remove modification of misc reg: /* force graphics mode */ vga_w(state->vgabase, VGA_MIS_W, misc | 1); as comment is misleading - LSB of misc reg does not set/reset graphics mode, but set color/mono adresses of CRT and some other regs. but these regs are not used during save/restore fonts. (it worked even when (misc | 1) was replaced by (misc & ~1) ). Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56c7554938e5945b770365e326f0c3d031ca231f Author: Antonino A. Daplas Date: Tue May 8 00:39:39 2007 -0700 s3fb: implement fb_get_caps Implement fb_get_caps(). This will allow the driver to tell upper layer that it can only support 256 8x16 bitmaps when in tileblitting mode (var->bits_per_pixel == 0); Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38a3dc51852d8350b156ea909c5aa8767d71b005 Author: Antonino A. Daplas Date: Tue May 8 00:39:37 2007 -0700 fbdev: fbcon: check if mode can handle new screen Check if the mode can properly display the screen. This will be needed by drivers where the capability is not constant with each mode. The function fb_set_var() will query fbcon the requirement, then it will query the driver (via a new hook fb_get_caps()) its capability. If the driver's capability cannot handle fbcon's requirement, then fb_set_var() will fail. For example, if a particular driver supports 2 modes where: mode1 = can only display 8x16 bitmaps mode2 = can display any bitmap then if current mode = mode2 and current font = 12x22 fbset /* mode1 cannot handle 12x22 */ fbset will fail Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e15de77e74d429f14641ebe7a29ccd8aa6656f3c Author: Dave Jones Date: Tue May 8 00:39:35 2007 -0700 nvidiafb: prevent triggering of softlockup If the chip locks up, we get into a long polling loop, where the softlockup detector kicks in. See https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=151878 for an example. [adaplas] Chip lockup can occur at 3 points (flush, sync, and wait). Consolidate and allow the driver to go to safe mode cleanly. Signed-off-by: Dave Jones Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4a96b53125c3d31266c05f2a8432d956dd26141 Author: Krzysztof Helt Date: Tue May 8 00:39:33 2007 -0700 pm2fb: pixclock setting restriction This patch adds restrictions to calculations of m, n and p factors which sets the pixclock for the Permedia 2V. I found during tests that synchronization is unstable if m (divisor) is bigger than half of the n (numerator). The patch disallows such settings combination. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d809d774fc8aa76899bde3235afb046728feed Author: Krzysztof Helt Date: Tue May 8 00:39:32 2007 -0700 pm2fb: Permedia 2V memory clock setting Permedia 2V uses its own registers to set a memory clock. The patch adds these registers and uses them in the set_memclock() function. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c15f938d810b5eb38c85a28e5e9d2af07d135a Author: Krzysztof Helt Date: Tue May 8 00:39:30 2007 -0700 pm2fb: 3dlabs Permedia 2V reference board added This patch adds support for 3dlabs Permedia reference board. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d37363409bacd1142c6e49edfb3e1f8b153d47dc Author: Alan Cox Date: Tue May 8 00:39:28 2007 -0700 nvidiafb/rivafb: switch to pci_get refcounting Switch to pci_get refcounting APIs [adaplas] Fix a long-standing bug where the return value of pci_find_slot()/pci_get_bus_and_slot() is ignored. Signed-off-by: Alan Cox Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbe7e429fedb3fbc93b496cc1c3eb4fc28333ac0 Author: Alan Hourihane Date: Tue May 8 00:39:25 2007 -0700 vmlfb: framebuffer driver for Intel Vermilion Range Add the Intel Vermilion Range framebuffer support. Signed-off-by: Alan Hourihane Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249bdbbf0dbab5554a4bfe55639e324d4758da96 Author: Ondrej Zajicek Date: Tue May 8 00:39:24 2007 -0700 s3fb: driver fixes This fixes broken fbcon on Virge VX in 24 bpp mode, and contains several other small updates. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4941cb7a18fd84d4d8cd097d2beada3c79c8f781 Author: Antonino A. Daplas Date: Tue May 8 00:39:22 2007 -0700 fbdev: save the activate field before calling fb_check_var() Some drivers may reset the var->activate field on fb_check_var(). This can lead to undefined behavior. For example, doing fbset -a