commit 18a4144028f056b77d6576d4eb284246e9c7ea97 tree 85277bf6b49982753d762d58a14aa642e79c037e parent 02829f73774fa1f6c0a28f4018caaa7c94399c4a parent 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a author Linus Torvalds Thu, 19 Jan 2006 22:19:26 -0800 committer Linus Torvalds Thu, 19 Jan 2006 22:19:26 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 02829f73774fa1f6c0a28f4018caaa7c94399c4a tree c6eeee5cda3a0516a63ccc5e08d5d3855b957122 parent 497992917edf03994088ec8757b8262e1d9f568a parent 2d7d5f05111a9d913131a2764d8b20157f8f758d author Linus Torvalds Thu, 19 Jan 2006 22:17:38 -0800 committer Linus Torvalds Thu, 19 Jan 2006 22:17:38 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 497992917edf03994088ec8757b8262e1d9f568a tree 7e82975f98d3d3c9f80e10c981601db23eef5bd1 parent 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a parent 386d1d50c8eef254653b1015fde06622ef38ba76 author Linus Torvalds Thu, 19 Jan 2006 22:16:58 -0800 committer Linus Torvalds Thu, 19 Jan 2006 22:16:58 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a tree f1f15646c7a9488cf0cd0838d04b8bde1193ef21 parent 0f36b018b2e314d45af86449f1a97facb1fbe300 author David S. Miller Thu, 19 Jan 2006 16:40:42 -0800 committer Linus Torvalds Thu, 19 Jan 2006 22:11:31 -0800 [PATCH] Fix regression added by ppoll/pselect code. The compat layer timeout handling changes in: 9f72949f679df06021c9e43886c9191494fdb007 are busted. This is most easily seen with an X application that uses sub-second select/poll timeout such as emacs. You hit a key and it takes a second or so before the app responds. The two ROUND_UP() calls upon entry are using {tv,ts}_sec where it should instead be using {tv_usec,ts_nsec}, which perfectly explains the observed incorrect behavior. Another bug shot down with git bisect. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a tree 248d57059e14782130b08084617b252ded7dfeb6 parent cf9e50a920be24b734fb91f19b8844f8509cb981 author David S. Miller Thu, 19 Jan 2006 16:58:37 -0800 committer David S. Miller Thu, 19 Jan 2006 16:58:37 -0800 [NETFILTER] x_tables: Make XT_ALIGN align as strictly as necessary. Or else we break on ppc32 and other 32-bit platforms. Based upon a patch from Harald Welte. Signed-off-by: David S. Miller commit cf9e50a920be24b734fb91f19b8844f8509cb981 tree a077c31bcfe9844bcfa7ff1fe07364b5b7958622 parent 0f36b018b2e314d45af86449f1a97facb1fbe300 parent a7d1f1b66c05ef4ebb58a34be7caad9af15546a4 author David S. Miller Thu, 19 Jan 2006 16:53:02 -0800 committer David S. Miller Thu, 19 Jan 2006 16:53:02 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6 commit 386d1d50c8eef254653b1015fde06622ef38ba76 tree 1ca8afb829cb19bfe42ebdbde0216a3bf8a12b59 parent 60f1c4443c4d391d8dfbe709f13296067b6c8021 author John Hawkes Wed, 18 Jan 2006 23:46:53 -0800 committer Tony Luck Thu, 19 Jan 2006 11:18:25 -0800 [IA64] eliminate softlockup warning Fix an unnecessary softlockup watchdog warning in the ia64 uncached_build_memmap() that occurs occasionally at 256p and always at 512p. The problem occurs at boot time. Signed-off-by: John Hawkes Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 60f1c4443c4d391d8dfbe709f13296067b6c8021 tree d8c65c092fa1af315c994d9f6001c89999e22e20 parent 92ff2ecd0deddc4c5fb2140d5861d0ddd50e9e57 author Jes Sorensen Wed, 18 Jan 2006 23:46:52 -0800 committer Tony Luck Thu, 19 Jan 2006 11:17:56 -0800 [IA64] sem2mutex: arch/ia64/kernel/perfmon.c Migrate perfmon from using an old semaphore to a completion handler. Signed-off-by: Jes Sorensen Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 92ff2ecd0deddc4c5fb2140d5861d0ddd50e9e57 tree 3a0188cd0d3be4da5c8d2320d1de7b4b7cae11ba parent 4b16bfbf8f8013fefb49592d030ff87651ab48cb author Jes Sorensen Wed, 18 Jan 2006 23:46:51 -0800 committer Tony Luck Thu, 19 Jan 2006 11:17:33 -0800 [IA64] sem2mutex: arch/ia64/ia32/sys_ia32.c Migrate arch/ia64/ia32/sys_ia32 to using a mutex for mmap protection. Signed-off-by: Jes Sorensen Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 2d7d5f05111a9d913131a2764d8b20157f8f758d tree 792deb7a3b9f72894d16affff1569a15b35e428b parent f7111ceb5266750db2a1d193b98fb6a3d9b5a56a author David S. Miller Thu, 19 Jan 2006 02:42:49 -0800 committer David S. Miller Thu, 19 Jan 2006 02:42:49 -0800 [SPARC]: Add support for *at(), ppoll, and pselect syscalls. This also includes by necessity _TIF_RESTORE_SIGMASK support, which actually resulted in a lot of cleanups. The sparc signal handling code is quite a mess and I should clean it up some day. Signed-off-by: David S. Miller commit f7111ceb5266750db2a1d193b98fb6a3d9b5a56a tree 96ee5dd93511ab2c234906111e3b59bfaa023123 parent 0f36b018b2e314d45af86449f1a97facb1fbe300 author David S. Miller Wed, 18 Jan 2006 21:57:37 -0800 committer David S. Miller Wed, 18 Jan 2006 21:57:37 -0800 [SPARC]: sparc32 needs PROMDEV_{I,O}RSC defines too. Signed-off-by: David S. Miller commit 0f36b018b2e314d45af86449f1a97facb1fbe300 tree b6a8f59834c3de2ca83e680007b8165de0097d47 parent 648bf4fb21f5ce993403901ed82399abaa150b63 parent 47c886b3123a335f0622136e021e7691d60d742c author Linus Torvalds Wed, 18 Jan 2006 19:37:57 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:37:57 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 commit 648bf4fb21f5ce993403901ed82399abaa150b63 tree e896329de403d15cd68d70b5de3b585190aa4428 parent da9bb1d27b21cb24cbb6a2efb5d3c464d357a01e author mark gross Sun, 15 Jan 2006 17:37:30 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:25:49 -0800 [PATCH] tlclk driver update some driver clean ups, and a re-posting of changes that are needed to match the updated TPS. Signed-off-by: Mark Gross Signed-off-by: Linus Torvalds commit da9bb1d27b21cb24cbb6a2efb5d3c464d357a01e tree 016b66985a651d071d3873e74b115108ddf0b3f5 parent 2f768af73fea4c70f9046388a7ff648ad11f028e author Alan Cox Wed, 18 Jan 2006 17:44:13 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:31 -0800 [PATCH] EDAC: core EDAC support code This is a subset of the bluesmoke project core code, stripped of the NMI work which isn't ready to merge and some of the "interesting" proc functionality that needs reworking or just has no place in kernel. It requires no core kernel changes except the added scrub functions already posted. The goal is to merge further functionality only after the core code is accepted and proven in the base kernel, and only at the point the upstream extras are really ready to merge. From: doug thompson This converts EDAC to sysfs and is the final chunk neccessary before EDAC has a stable user space API and can be considered for submission into the base kernel. Signed-off-by: Alan Cox Signed-off-by: Adrian Bunk Signed-off-by: Jesper Juhl Signed-off-by: doug thompson Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f768af73fea4c70f9046388a7ff648ad11f028e tree 5b9b95b99a39bb46a1dfca6416f4d8c9d29be6ad parent 0d88a10e566d46bffc214c974e5cf5abe38d8da8 author Alan Cox Wed, 18 Jan 2006 17:44:12 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:31 -0800 [PATCH] EDAC: drivers for Radisys 82600 Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d88a10e566d46bffc214c974e5cf5abe38d8da8 tree 63a6c0ad4fbd33c192c2ed62808f0220364ba07e parent 806c35f5057a64d3061ee4e2b1023bf6f6d328e2 author Alan Cox Wed, 18 Jan 2006 17:44:10 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:31 -0800 [PATCH] EDAC: drivers for Intel i82860, i82875 Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 806c35f5057a64d3061ee4e2b1023bf6f6d328e2 tree 89bc8ffd498475ca04a2760dabfd882e9de5e8b1 parent 715b49ef2de6fcead0776d9349071670282faf65 author Alan Cox Wed, 18 Jan 2006 17:44:08 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:31 -0800 [PATCH] EDAC: drivers for AMD 76x and Intel E750x, E752x Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 715b49ef2de6fcead0776d9349071670282faf65 tree d09b77c804aba3b191dc0ceb294387cf730ede4b parent 3213e913b0d6baeb28aa1affbdd4bfa7efedc35f author Alan Cox Wed, 18 Jan 2006 17:44:07 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] EDAC: atomic scrub operations EDAC requires a way to scrub memory if an ECC error is found and the chipset does not do the work automatically. That means rewriting memory locations atomically with respect to all CPUs _and_ bus masters. That means we can't use atomic_add(foo, 0) as it gets optimised for non-SMP This adds a function to include/asm-foo/atomic.h for the platforms currently supported which implements a scrub of a mapped block. It also adjusts a few other files include order where atomic.h is included before types.h as this now causes an error as atomic_scrub uses u32. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3213e913b0d6baeb28aa1affbdd4bfa7efedc35f tree 2be3ac9ecc2c4d60f7e73582d2d04d5e1efd46bb parent 9f72949f679df06021c9e43886c9191494fdb007 author David Woodhouse Wed, 18 Jan 2006 17:44:06 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] Add pselect/ppoll system calls on i386 Add the sys_pselect6() and sys_poll() calls to the i386 syscall table. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f72949f679df06021c9e43886c9191494fdb007 tree f4d76ed281b34e195db7741b69a7d095e168a864 parent 36a7878a224c18aa4a5e098dc93d19cf5601462b author David Woodhouse Wed, 18 Jan 2006 17:44:05 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] Add pselect/ppoll system call implementation The following implementation of ppoll() and pselect() system calls depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the thread_info. These system calls have to change the signal mask during their operation, and signal handlers must be invoked using the new, temporary signal mask. The old signal mask must be restored either upon successful exit from the system call, or upon returning from the invoked signal handler if the system call is interrupted. We can't simply restore the original signal mask and return to userspace, since the restored signal mask may actually block the signal which interrupted the system call. The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit path to trap into do_signal() just as TIF_SIGPENDING does, and by causing do_signal() to use the saved signal mask instead of the current signal mask when setting up the stack frame for the signal handler -- or by causing do_signal() to simply restore the saved signal mask in the case where there is no handler to be invoked. The first patch implements the sys_pselect() and sys_ppoll() system calls, which are present only if TIF_RESTORE_SIGMASK is defined. That #ifdef should go away in time when all architectures have implemented it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC kernel (in the -mm tree), and the third patch then removes the arch-specific implementations of sys_rt_sigsuspend() and replaces them with generic versions using the same trick. The fourth and fifth patches, provided by David Howells, implement TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch adds the syscalls to the i386 syscall table. This patch: Add the pselect() and ppoll() system calls, providing core routines usable by the original select() and poll() system calls and also the new calls (with their semantics w.r.t timeouts). Signed-off-by: David Woodhouse Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36a7878a224c18aa4a5e098dc93d19cf5601462b tree 25b6339902dc1a517da33f631021e90b34456e99 parent 2fc10620e741153329e2f1cbcde76e526f501410 author Jeff Dike Wed, 18 Jan 2006 17:44:03 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] uml: use generic sys_rt_sigsuspend Use the generic sys_rt_sigsuspend. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2fc10620e741153329e2f1cbcde76e526f501410 tree d93344bc160f4f2455d4a4947d6347c1ff9b6fd2 parent f27201da5c8f118cfe266f51447bdd108d5f081d author Jeff Dike Wed, 18 Jan 2006 17:44:02 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] uml: add TIF_RESTORE_SIGMASK support Add support for TIF_RESTORE_SIGMASK. I copy the i386 handling of the flag. sys_sigsuspend is also changed to follow i386. Also a bit of cleanup - turn an if into a switch get rid of a couple more emacs formatting comments Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f27201da5c8f118cfe266f51447bdd108d5f081d tree 9d889f4afec179b5b6f422b58dd36fa7606f3eee parent 283828f3c19ceb3a64a8544d42cc189003e8b0fe author David Woodhouse Wed, 18 Jan 2006 17:44:01 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:30 -0800 [PATCH] TIF_RESTORE_SIGMASK support for arch/powerpc Implement the TIF_RESTORE_SIGMASK flag in the new arch/powerpc kernel, for both 32-bit and 64-bit system call paths. Signed-off-by: David Woodhouse Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 283828f3c19ceb3a64a8544d42cc189003e8b0fe tree a3ba8f54e809bc1036bce6a404d88c93d578b0c2 parent a411aee96ea7fe6fe065df65bf29ea755bcdb554 author David Howells Wed, 18 Jan 2006 17:44:00 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] Handle TIF_RESTORE_SIGMASK for i386 Handle TIF_RESTORE_SIGMASK as added by David Woodhouse's patch entitled: [PATCH] 2/3 Add TIF_RESTORE_SIGMASK support for arch/powerpc [PATCH] 3/3 Generic sys_rt_sigsuspend It does the following: (1) Declares TIF_RESTORE_SIGMASK for i386. (2) Invokes it over to do_signal() when TIF_RESTORE_SIGMASK is set. (3) Makes do_signal() support TIF_RESTORE_SIGMASK, using the signal mask saved in current->saved_sigmask. (4) Discards sys_rt_sigsuspend() from the arch, using the generic one instead. (5) Makes sys_sigsuspend() save the signal mask and set TIF_RESTORE_SIGMASK rather than attempting to fudge the return registers. (6) Makes sys_sigsuspend() return -ERESTARTNOHAND rather than looping intrinsically. (7) Makes setup_frame(), setup_rt_frame() and handle_signal() return 0 or -EFAULT rather than true/false to be consistent with the rest of the kernel. Due to the fact do_signal() is then only called from one place: (8) Makes do_signal() no longer have a return value is it was just being ignored; force_sig() takes care of this. (9) Discards the old sigmask argument to do_signal() as it's no longer necessary. (10) Makes do_signal() static. (11) Marks the second argument to do_notify_resume() as unused. The unused argument should remain in the middle as the arguments are passed in as registers, and the ordering is specific in entry.S Given the way do_signal() is now no longer called from sys_{,rt_}sigsuspend(), they no longer need access to the exception frame, and so can just take arguments normally. This patch depends on sys_rt_sigsuspend patch. Signed-off-by: David Howells Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a411aee96ea7fe6fe065df65bf29ea755bcdb554 tree 3a6cfece835c6d896a035e05fbcfe34a4c691bfc parent 150256d8aadb3a337c31efa9e175cbd25bf06b06 author David Howells Wed, 18 Jan 2006 17:43:59 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] Handle TIF_RESTORE_SIGMASK for FRV Handle TIF_RESTORE_SIGMASK as added by David Woodhouse's patch entitled: [PATCH] 2/3 Add TIF_RESTORE_SIGMASK support for arch/powerpc [PATCH] 3/3 Generic sys_rt_sigsuspend It does the following: (1) Declares TIF_RESTORE_SIGMASK for FRV. (2) Invokes it over to do_signal() when TIF_RESTORE_SIGMASK is set. (3) Makes do_signal() support TIF_RESTORE_SIGMASK, using the signal mask saved in current->saved_sigmask. (4) Discards sys_rt_sigsuspend() from the arch, using the generic one instead. (5) Makes sys_sigsuspend() save the signal mask and set TIF_RESTORE_SIGMASK rather than attempting to fudge the return registers. (6) Makes sys_sigsuspend() return -ERESTARTNOHAND rather than looping intrinsically. (7) Makes setup_frame(), setup_rt_frame() and handle_signal() return 0 or -EFAULT rather than true/false to be consistent with the rest of the kernel. Due to the fact do_signal() is then only called from one place: (8) Make do_signal() no longer have a return value is it was just being ignored; force_sig() takes care of this. (9) Discards the old sigmask argument to do_signal() as it's no longer necessary. This patch depends on the FRV signalling patches as well as the sys_rt_sigsuspend patch. Signed-off-by: David Howells Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 150256d8aadb3a337c31efa9e175cbd25bf06b06 tree 8cd7e2a0bc6af23984682c5ea3ca687809580c5a parent a60fc5190a31d98508ea6a76f74217f4104e74b7 author David Woodhouse Wed, 18 Jan 2006 17:43:57 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] Generic sys_rt_sigsuspend() The TIF_RESTORE_SIGMASK flag allows us to have a generic implementation of sys_rt_sigsuspend() instead of duplicating it for each architecture. This provides such an implementation and makes arch/powerpc use it. It also tidies up the ppc32 sys_sigsuspend() to use TIF_RESTORE_SIGMASK. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a60fc5190a31d98508ea6a76f74217f4104e74b7 tree 1c28d9124ad642e36f027f16c7c51837dc51d549 parent 4f085507231e8003c66ed12e38c73b76e938ee95 author Ulrich Drepper Wed, 18 Jan 2006 17:43:56 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] vfs: *at functions: x86_64 Wire up the x86_64 syscalls. Signed-off-by: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f085507231e8003c66ed12e38c73b76e938ee95 tree 313adf0043c586fa751d8e750e54d6d27d2a0087 parent 5590ff0d5528b60153c0b4e7b771472b5a95e297 author Ulrich Drepper Wed, 18 Jan 2006 17:43:55 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] vfs: *at functions: i386 Wire up the x86 syscalls Signed-off-by: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5590ff0d5528b60153c0b4e7b771472b5a95e297 tree 5fdccf2354269702f71beb8e0a2942e4167fd992 parent e2f99018eb7b29954747a2dd78e9fc0c36a60f0f author Ulrich Drepper Wed, 18 Jan 2006 17:43:53 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:29 -0800 [PATCH] vfs: *at functions: core Here is a series of patches which introduce in total 13 new system calls which take a file descriptor/filename pair instead of a single file name. These functions, openat etc, have been discussed on numerous occasions. They are needed to implement race-free filesystem traversal, they are necessary to implement a virtual per-thread current working directory (think multi-threaded backup software), etc. We have in glibc today implementations of the interfaces which use the /proc/self/fd magic. But this code is rather expensive. Here are some results (similar to what Jim Meyering posted before). The test creates a deep directory hierarchy on a tmpfs filesystem. Then rm -fr is used to remove all directories. Without syscall support I get this: real 0m31.921s user 0m0.688s sys 0m31.234s With syscall support the results are much better: real 0m20.699s user 0m0.536s sys 0m20.149s The interfaces are for obvious reasons currently not much used. But they'll be used. coreutils (and Jeff's posixutils) are already using them. Furthermore, code like ftw/fts in libc (maybe even glob) will also start using them. I expect a patch to make follow soon. Every program which is walking the filesystem tree will benefit. Signed-off-by: Ulrich Drepper Signed-off-by: Alexey Dobriyan Cc: Christoph Hellwig Cc: Al Viro Acked-by: Ingo Molnar Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2f99018eb7b29954747a2dd78e9fc0c36a60f0f tree 6e74677c01a13d2ec5285df9bffd34357b966e57 parent 846f2fcd77850ef8f0aab46df9cadd5c35a5fef0 author Christoph Hellwig Wed, 18 Jan 2006 17:43:52 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:28 -0800 [PATCH] exportfs: add find_acceptable_alias helper find_exported_dentry contains two duplicate loops to find an alias that the acceptable callback likes. Split this out to a new helper and switch from list_for_each to list_for_each_entry to make it more readable. Signed-off-by: Christoph Hellwig Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 846f2fcd77850ef8f0aab46df9cadd5c35a5fef0 tree 45fec50c1f597c2aa3b0aa731f00b9d24c9aa668 parent 45bd3b3dffaa9fb1706fe001bf66276d0997a850 author David Shaw Wed, 18 Jan 2006 17:43:51 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:28 -0800 [PATCH] knfsd: Provide missing NFSv2 part of patch for checking vfs_getattr. A recent patch which checked the return status of vfs_getattr in nfsd, completely missed the nfsproc.c (NFSv2) part. Here is it. This patch moved the call to vfs_getattr from the xdr encoding (at which point it is too late to return an error) to the call handling. This means several calls to vfs_getattr are needed in nfsproc.c. Many are encapsulated in nfsd_return_attrs and nfsd_return_dirop. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45bd3b3dffaa9fb1706fe001bf66276d0997a850 tree 9b5a8dc7f619cea36b3ad87d0dbd4545e24d0336 parent 7fcd53303de8dbbed863f6471ca92eb96a1faa28 author NeilBrown Wed, 18 Jan 2006 17:43:50 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:28 -0800 [PATCH] knfsd: Fix some more errno/nfserr confusion in vfs.c nfsd_sync* return an errno, which usually needs to be converted to an errno, sometimes immediately, sometimes a little later. Also, nfsd_setattr returns an nfserr which SHOULDN'T be converted from an errno (because it isn't one). Also some tidyups of the form: err = XX err = nfserrno(err) and err = XX if (err) err = nfserrno(err) become err = nfserrno(XX) Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fcd53303de8dbbed863f6471ca92eb96a1faa28 tree 6a2b08da2310c5dc5b57b11558ecc09ebd6ecba7 parent de1ae286f863c46b7c8f9bed97df17d7f5ea510c author Al Viro Wed, 18 Jan 2006 17:43:48 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:28 -0800 [PATCH] nfsd4_lock() returns bogus values to clients missing nfserrno() in default case of a switch by return value of posix_lock_file(); as the result we send negative host-endian to clients that expect positive network-endian, preferably mentioned in RFC... BTW, that case is not impossible - posix_lock_file() can return -ENOLCK and we do not handle that one explicitly. Signed-off-by: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de1ae286f863c46b7c8f9bed97df17d7f5ea510c tree 602de8f33e97b5138d465137dad7d0cc43411696 parent 9246585a117f182d26a5a5c15872c3e8fcf44dd6 author Al Viro Wed, 18 Jan 2006 17:43:47 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:28 -0800 [PATCH] NFSERR_SERVERFAULT returned host-endian ->rp_status is network-endian and nobody byteswaps it before sending to client; putting NFSERR_SERVERFAULT instead of nfserr_serverfault in there is not nice... Signed-off-by: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9246585a117f182d26a5a5c15872c3e8fcf44dd6 tree fe8d8ce681a9bf48f64d270fd95e128864962dfa parent d75f2b9f5da71667aba7e97a962c49f1e17aa4ca author Al Viro Wed, 18 Jan 2006 17:43:46 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:27 -0800 [PATCH] nfsd4_truncate() bogus return value -EINVAL (in host order, no less) is not a good thing to return to client. nfsd4_truncate() returns it in one case and its callers expect nfs_.... from it. AFAICS, it should be nfserr_inval Signed-off-by: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d75f2b9f5da71667aba7e97a962c49f1e17aa4ca tree 41f72cd81aa07f0476fc240c391cbc66cc5d02fd parent 5274881992b8a632620f69346401da66e480a23b author Al Viro Wed, 18 Jan 2006 17:43:44 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:27 -0800 [PATCH] nfsd/vfs.c: endianness fixes Several failure exits return -E instead of nfserr_ and vice versa. Signed-off-by: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5274881992b8a632620f69346401da66e480a23b tree dc9535fb2c9f018d671f7864e1ee8c1395a6afc5 parent 34081efc12aaaa12f20e5b59f3cb98ba6e27fb34 author Fred Isaman Wed, 18 Jan 2006 17:43:43 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:27 -0800 [PATCH] nfsd4: clean up settattr code Clean up some unnecessary special-casing in the setattr code.. Signed-off-by: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34081efc12aaaa12f20e5b59f3cb98ba6e27fb34 tree d3aaba6619f0fc3b5ad5d3bd1868bf196bb5d40c parent 6c26d08f02f829a833d393c3f1b196538a9ec2c4 author Fred Isaman Wed, 18 Jan 2006 17:43:40 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:27 -0800 [PATCH] nfsd4: Fix bug in rdattr_error return Fix bug in rdattr_error return which causes correct error code to be overwritten by nfserr_toosmall. Signed-off-by: Fred Isaman Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c26d08f02f829a833d393c3f1b196538a9ec2c4 tree 6425e263f072a73db7ced341c4df9507ae46ccef parent fb553c0f17444e090db951b96df4d2d71b4f4b6b author J. Bruce Fields Wed, 18 Jan 2006 17:43:38 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:27 -0800 [PATCH] nfsd4: fix open_downgrade Bad bookkeeping of the share reservations when handling open upgrades was causing open downgrade to fail. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb553c0f17444e090db951b96df4d2d71b4f4b6b tree 4eb83eab183f5dd8786aef63768a15fca1155fa6 parent 0f442aa299bb47046db4077d9c122a1b539311ce author J. Bruce Fields Wed, 18 Jan 2006 17:43:36 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: don't create on open that fails due to ERR_GRACE In an earlier patch (commit b648330a1d741d5df8a5076b2a0a2519c69c8f41) I noted that a too-early grace-period check was preventing us from bumping the sequence id on open. Unfortunately in that patch I stupidly moved the grace-period check back too far, so now an open for create can succesfully create the file while still returning ERR_GRACE. The correct place for that check is after we've set the open_owner and handled any replays, but before we actually start mucking with the filesystem. Thanks to Avishay Traeger for reporting the bug. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f442aa299bb47046db4077d9c122a1b539311ce tree e7c04435a41d5084690ae0a70b593898dc25b0e7 parent 375c5547cbf39423078535affac66c8afdc8fafb author J. Bruce Fields Wed, 18 Jan 2006 17:43:34 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: simplify process-open1 logic nfsd4_process_open1 is very highly nested; flatten it out a bit. Also, the preceding comment, which just outlines the logic, seems redundant. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 375c5547cbf39423078535affac66c8afdc8fafb tree 2893ae003e8d2dc4ef6d5d1d1e6fa34656034a85 parent ae8b625313db4dd4b060962c2a02f3a2837ca61b author J. Bruce Fields Wed, 18 Jan 2006 17:43:33 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: nfs4state.c miscellaneous goto removals Remove some goto's that made the logic here a little more tortuous than necessary. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae8b625313db4dd4b060962c2a02f3a2837ca61b tree 537c4cc4225321099423d37f85da9264e2b69c2b parent a525825df15221a95d4c1f5a291d9fde77ef10bc author J. Bruce Fields Wed, 18 Jan 2006 17:43:32 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: no replays on unconfirmed owners We shouldn't check for replays until after checking whether the open owner is confirmed. Clients are allowed to reuse openowners without bumping the seqid. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a525825df15221a95d4c1f5a291d9fde77ef10bc tree 00e204fc158629b999b27f20f99412cbf5ed0c57 parent c2642ab05b855d2d3b850ddf90dbb02b1b9358ac author J. Bruce Fields Wed, 18 Jan 2006 17:43:30 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: handle replays of failed open reclaims We need to make sure open reclaims are marked confirmed immediately so that we can handle replays even if they fail (e.g. with a seqid-incrementing error). (See 8.1.8.) Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2642ab05b855d2d3b850ddf90dbb02b1b9358ac tree 38625ce3e2d5adb2d669875a41b2698b289d8ddb parent d22749b62f3e12de26b86a200f9a5bf7afe3590e author J. Bruce Fields Wed, 18 Jan 2006 17:43:29 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: recovery lookup dir check Make sure we get a directory when we look up the recovery directory. Thanks to Christoph Hellwig for the bug report. Based on feedback from Christoph and others, we may remove the need for this lookup and just pass in a file descriptor from userspace instead, and/or completely move the directory handling to userspace. For now we're just fixing the obvious bugs. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d22749b62f3e12de26b86a200f9a5bf7afe3590e tree dba05760944d9c91565955de182b2684af0bb19a parent 5fb8b49e2955cc473929c5994b8389111daed59d author J. Bruce Fields Wed, 18 Jan 2006 17:43:27 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:26 -0800 [PATCH] nfsd4: fix open of recovery directory We should be opening this directory RDONLY, not RDWR. Thanks to Christoph Hellwig for the bug report. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fb8b49e2955cc473929c5994b8389111daed59d tree 49f9baa70e18a42f0be0643c8334a6e9c3f46a73 parent 91a4762e0ab0880fa00e8f0b7a052e4929d867a6 author J. Bruce Fields Wed, 18 Jan 2006 17:43:26 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] svcrpc: gss: svc context creation error handling Allow mechanisms to return more varied errors on the context creation downcall. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91a4762e0ab0880fa00e8f0b7a052e4929d867a6 tree 994b9183eddb0b5c2e14d43c522a16528a297dd6 parent 822f1005ae1f3a4a8b136f38a6933d3f719f4c4a author Kevin Coffman Wed, 18 Jan 2006 17:43:25 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] svcrpc: gss: server context init failure handling We require the server's gssd to create a completed context before asking the kernel to send a final context init reply. However, gssd could be buggy, or under some bizarre circumstances we might purge the context from our cache before we get the chance to use it here. Handle this case by returning GSS_S_NO_CONTEXT to the client. Also move the relevant code here to a separate function rather than nesting excessively. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 822f1005ae1f3a4a8b136f38a6933d3f719f4c4a tree 34265fcf1cd957c7b34101b2152b4e5cc9c45086 parent fd44527707f2697fd2959e8bdb321ae588d150e2 author Andy Adamson Wed, 18 Jan 2006 17:43:24 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] svcrpc: gss: handle the GSS_S_CONTINUE Kerberos context initiation is handled in a single round trip, but other mechanisms (including spkm3) may require more, so we need to handle the GSS_S_CONTINUE case in svcauth_gss_accept. Send a null verifier. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd44527707f2697fd2959e8bdb321ae588d150e2 tree 8a1746a9afdc3024829002f3940ffa1e03965ccf parent 796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf author J. Bruce Fields Wed, 18 Jan 2006 17:43:23 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] nfsd4: operation debugging Simple, useful debugging printk: print the number of each op as we process it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf tree ff9d4c34f8b598aca7481d6b2bf41dd31a483c82 parent 04ef59548470b81829e8593c1b39776ce0534d68 author J. Bruce Fields Wed, 18 Jan 2006 17:43:22 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] nfsd4: fix check_for_locks Fix some bad logic. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04ef59548470b81829e8593c1b39776ce0534d68 tree 846dbe3d17ac1a745c2f23642129b15c3c150d19 parent 3a65588adc4401622b204caa897123e16a4a0318 author J. Bruce Fields Wed, 18 Jan 2006 17:43:21 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:25 -0800 [PATCH] nfsd4: remove release_state_owner() It's confusing having both release_stateowner() and release_state_owner(). And as it turns out, release_state_owner() is short and only called from one place; so just remove it. Also note the confirmed check is superfluous there--preprocess_seqid_op already check this. And remove a redundant comment and a superfluous line assignment while we're at it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a65588adc4401622b204caa897123e16a4a0318 tree a96a8d4a28608b49440062273c70565c1129165d parent 8a280510852959c0d51b1d625e90c0491c238368 author J. Bruce Fields Wed, 18 Jan 2006 17:43:19 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] nfsd4: rename lk_stateowner One of the things that's confusing about nfsd4_lock is that the lk_stateowner field could be set to either of two different lockowners: the open owner or the lock owner. Rename to lk_replay_owner and add a comment to make it clear that it's used for whichever stateowner has its sequence id bumped for replay detection. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a280510852959c0d51b1d625e90c0491c238368 tree e24b9167f5f979cc126f07ef32c851ab249a7766 parent a6f6ef2f1d7329111fcad7db48fb7adba5062d0a author J. Bruce Fields Wed, 18 Jan 2006 17:43:18 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] nfsd4: fix nfsd4_lock cleanup on failure release_state_owner also puts the lock owner on the close_lru. There's no need for that, though; replays of the failed lock would be handled by the openowner not the lockowner. Also consolidate the cleanup a bit, fixing leaks that can happen if errors occur between the time a new lock owner is allocated and the lock is done. Remove a comment and dprintk that look a little redundant. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6f6ef2f1d7329111fcad7db48fb7adba5062d0a tree 7fd08104892870699c8f191e2e23b753b5b119d5 parent 1918e341383ab787d6c5b17200f4ed901b10c777 author Andy Adamson Wed, 18 Jan 2006 17:43:17 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] nfsd4: misc lock fixes Logic fixes for LOCK and UNLOCK. - Move the permission check on the current file handle outside of nfs4_lock_state() - remove the file manager fl_release_private calls; fl_ops is not set. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1918e341383ab787d6c5b17200f4ed901b10c777 tree 5644f3d1ecfbc104ed956ad674785ee69348df41 parent 7e8f05934d540aeb45c1cc3cc3a0e811bd61866b author J. Bruce Fields Wed, 18 Jan 2006 17:43:16 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] svcrpc: save and restore the daddr field when request deferred The server code currently keeps track of the destination address on every request so that it can reply using the same address. However we forget to do that in the case of a deferred request. Remedy this oversight. >From folks at PolyServe. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e8f05934d540aeb45c1cc3cc3a0e811bd61866b tree ad42fb96609dc9bf1f7a9c775fcee72f04ee4656 parent f193fbab2e4710f629e7c1859d4908646b47b126 author NeilBrown Wed, 18 Jan 2006 17:43:14 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] nfsd: remove inline from a couple of large NFS functions These are both called from two places close together. I could rearrange that code so there is only one call site, but just removing the 'inline' is probably best. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f193fbab2e4710f629e7c1859d4908646b47b126 tree f452b246ad608d2b53cf80a2ac79f77b347739df parent 6b192832daae6d141063c49ae1ded6f7dddee50e author YAMAMOTO Takashi Wed, 18 Jan 2006 17:43:13 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:24 -0800 [PATCH] nfsd: check error status from nfsd_sync_dir Change nfsd_sync_dir to return an error if ->sync fails, and pass that error up through the stack. This involves a number of rearrangements of error paths, and care to distinguish between Linux -errno numbers and NFSERR numbers. In the 'create' routines, we continue with the 'setattr' even if a previous sync_dir failed. This patch is quite different from Takashi's in a few ways, but there is still a strong lineage. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b192832daae6d141063c49ae1ded6f7dddee50e tree a7c1557e42ba0681eaa3d64cc4abbd5bbc255c02 parent af8c85bb6d4e5352551277edd8448c4dfb2328ab author Roman Zippel Wed, 18 Jan 2006 17:43:12 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:23 -0800 [PATCH] hfs: set type/creator for symlinks Set the correct type and creator for symlinks. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af8c85bb6d4e5352551277edd8448c4dfb2328ab tree 1fb10ca9fb7890db706db358c944308dc0cf616c parent 9a4cad95c9338077487226e22d4e01bc9edebf21 author Roman Zippel Wed, 18 Jan 2006 17:43:10 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:23 -0800 [PATCH] hfs: set correct create date for links HFS+ also requires the correct creation date so recent version of OS X recognize it as link. Improve link handling: - if something is wrong with the link, ignore the link attribute and treat it as regular file (this also fixes a missing unlock during lookup). - check for incorrect link counts during unlink. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a4cad95c9338077487226e22d4e01bc9edebf21 tree 7153b1e890ab17910935494c433c23eb9cf94014 parent 2179d372d9f8b5fc5c189c89bc6a565a42151b23 author Roman Zippel Wed, 18 Jan 2006 17:43:09 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:23 -0800 [PATCH] hfs: set correct ctime Read the correct ctime from disk (it was written but never read for some reason). Read also creation date, which is used in the next patch. (Problem found by Olivier Castan ) Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2179d372d9f8b5fc5c189c89bc6a565a42151b23 tree 2b09f55702890e7edbae9b9e396bfe958f53608a parent 7cf3cc3036cb7b1147350bf7c3f1ab98c160eb7b author David Elliott Wed, 18 Jan 2006 17:43:08 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:23 -0800 [PATCH] hfs: add HFSX support Add support for HFSX, which allows for case-sensitive filenames. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cf3cc3036cb7b1147350bf7c3f1ab98c160eb7b tree 16bf33c636dec614c47959edfab9c2ef724ac93d parent 634725a92938b0f282b17cec0b007dca77adebd2 author Roman Zippel Wed, 18 Jan 2006 17:43:07 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:23 -0800 [PATCH] hfs: cleanup HFS prints Add the log level and a "hfs: " prefix to all kernel prints. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 634725a92938b0f282b17cec0b007dca77adebd2 tree c4dacf0c74ae3d322c37c010ee5cada2280eccca parent 5131cf154ad1c6e584efa58d17a469d0b80f49bd author Roman Zippel Wed, 18 Jan 2006 17:43:05 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:22 -0800 [PATCH] hfs: cleanup HFS+ prints Add the log level and a "hfs: " prefix to all kernel prints. (HFS and HFS+ will use the same prefix, as they share some code and could be merged at some point.) Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5131cf154ad1c6e584efa58d17a469d0b80f49bd tree d9134f74d0b04c571407fd5fbf494f1714523211 parent c21761f168894b356626c847fe13be39605d76b4 author Arnd Bergmann Wed, 18 Jan 2006 17:43:04 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:22 -0800 [PATCH] add missing syscall declarations All standard system calls should be declared in include/linux/syscalls.h. Add some of the new additions that were previously missed. Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c21761f168894b356626c847fe13be39605d76b4 tree 7b3a1efba6ae34ca313619474b0060beff8267af parent 147b31cf09ee493aa71c87c0dd2eef74b6b2aeba author Jason Baron Wed, 18 Jan 2006 17:43:03 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:22 -0800 [PATCH] fix sched_setscheduler semantics Currently, a negative policy argument passed into the 'sys_sched_setscheduler()' system call, will return with success. However, the manpage for 'sys_sched_setscheduler' says: EINVAL The scheduling policy is not one of the recognized policies, or the parameter p does not make sense for the policy. Signed-off-by: Jason Baron Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 147b31cf09ee493aa71c87c0dd2eef74b6b2aeba tree 7a16e9b3855588a24568905bb72841acdc6ec3a8 parent a374a48ffbd7d1ffd40d1d30d2751df159a1aca7 author Eric Van Hensbergen Wed, 18 Jan 2006 17:43:02 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:22 -0800 [PATCH] v9fs: add readpage support v9fs mmap support was originally removed from v9fs at Al Viro's request, but recently there have been requests from folks who want readpage functionality (primarily to enable execution of files mounted via 9P). This patch adds readpage support (but not writepage which contained most of the objectionable code). It passes fsx-linux (and other regressions) so it should be relatively safe. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a374a48ffbd7d1ffd40d1d30d2751df159a1aca7 tree df16dafb952dbe530796cdcd853a9e04a5811810 parent 4833aff757b747b51b878a13f3a6e2b1a2abb619 author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:43:01 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml ubd code: fix a bit of whitespace Correct a bit of whitespace problems while working here. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4833aff757b747b51b878a13f3a6e2b1a2abb619 tree caec57a746cb04ef62e04fc5cf14a6acc555de46 parent ce2d2aedcc3ca582fed90f44970e8b3e4f006a7d author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:43:00 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: allow again to move backing file and to override saved location When the user specifies both a COW file and its backing file, if the previous backing file is not found, currently UML tries again to use it and fails. This can be corrected by changing same_backing_files() return value in that case, so that the caller will try to change the COW file to point to the new location, as already done in other cases. Additionally, given the change in the meaning of the func, change its name, invert its return value, so all values are inverted except when stat(from_cow,&buf2) fails. And add some comments and two minor bugfixes - remove a fd leak (return err rather than goto out) and a repeated check. Tested well. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce2d2aedcc3ca582fed90f44970e8b3e4f006a7d tree d62b397ea52aa09ebe466b6a4a79505e3c76e15c parent b63162939cd797c8269964ce856ed1f2fec5f70e author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:59 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: arch Kconfig menu cleanups *) mark as "EXPERIMENTAL" various items that either aren't very stable or that are actively crashing the setup of users which don't really need them (i.e. HIGHMEM and 3-level pagetables on x86 - nobody needs either, everybody reports "I'm using it and getting trouble"). *) move net/Kconfig near to the rest of network configurations, and drivers/block/Kconfig near "Block layer" submenu. *) it's useless and doesn't work well to force NETDEVICES on and to disable the prompt like it's done. Better remove the attempt, and change that to a simple "default y if UML". *) drop the warning about "report problems about HPPFS" - it's redundant anyway, as that's the usual procedure, and HPPFS users are especially technical (i.e. they know reporting bugs is _good_). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b63162939cd797c8269964ce856ed1f2fec5f70e tree 666dd2919bd156aa183a87576224d0fad3c4cf72 parent b6a2b13778873bd9edd0b4a7d24a7bd730369021 author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:58 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: avoid malloc to sleep in atomic sections Ugly trick to help make malloc not sleeping - we can't do anything else. But this is not yet optimal, since spinlock don't trigger in_atomic() when preemption is disabled. Also, even if ugly, this was already used in one place, and was even more bogus. Fix it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a2b13778873bd9edd0b4a7d24a7bd730369021 tree dc534ba13079c9fcecb2c02798c5021a26a95ae4 parent 71c8d4c3aad3132765d30b05dce98bb8a9508f02 author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:57 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: sigio code - reduce spinlock hold time In a previous patch I shifted an allocation to being atomic. In this patch, a better but more intrusive solution is implemented, i.e. hold the lock only when really needing it, especially not over pipe operations, nor over the culprit allocation. Additionally, while at it, add a missing kfree in the failure path, and make sure that if we fail in forking, write_sigio_pid is -1 and not, say, -ENOMEM. And fix whitespace, at least for things I was touching anyway. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71c8d4c3aad3132765d30b05dce98bb8a9508f02 tree d9b21742707b5de48511663f2fcd1627fb9a5a86 parent e56a78855a4f72fc658bfd21d08939dd6e09fa4c author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:56 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: fix spinlock recursion and sleep-inside-spinlock in error path In this error path, when the interface has had a problem, we call dev_close(), which is disallowed for two reasons: *) takes again the UML internal spinlock, inside the ->stop method of this device *) can be called in process context only, while we're in interrupt context. I've also thought that calling dev_close() may be a wrong policy to follow, but it's not up to me to decide that. However, we may end up with multiple dev_close() queued on the same device. But the initial test for (dev->flags & IFF_UP) makes this harmless, though - and dev_close() is supposed to care about races with itself. So there's no harm in delaying the shutdown, IMHO. Something to mark the interface as "going to shutdown" would be appreciated, but dev_deactivate has the same problems as dev_close(), so we can't use it either. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e56a78855a4f72fc658bfd21d08939dd6e09fa4c tree fcb56d8a23bad9824e72ef8fb26e688726061d9d parent c42791b6ec5453cd7910eac7bfdd88f27173f81c author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:55 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:21 -0800 [PATCH] uml: networking - clear transport-specific structure Pre-clear transport-specific private structure before passing it down. In fact, I just got a slab corruption and kernel panic on exit because kfree() was called on a pointer which probably was never allocated, BUT hadn't been set to NULL by the driver. As the code is full of such errors, I've decided for now to go the safe way (we're talking about drivers), and to do the simple thing. I'm also starting to fix drivers, and already sent a patch for the daemon transport. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c42791b6ec5453cd7910eac7bfdd88f27173f81c tree f874b541bfacb27df2bcfdf6fe5823353d431635 parent 3b948068b84b9759cdf0965abf3074dcb9230e98 author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:53 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: make daemon transport behave properly Avoid uninitialized data in the daemon_data structure. I used this transport before doing proper setup before-hand, and I got some very nice SLAB corruption due to freeing crap pointers. So just make sure to clear everything when appropriate. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b948068b84b9759cdf0965abf3074dcb9230e98 tree 2d95a403f0d130261b9d7cd9efa2af0005e75b65 parent 097fdf06c63741e6ac1a4e01c2255861dd0a1c49 author Paolo 'Blaisorblade' Giarrusso Wed, 18 Jan 2006 17:42:52 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: remove leftover from patch revertal I added this line to share this file with UML, but now it's no longer shared so remove this useless leftover. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 097fdf06c63741e6ac1a4e01c2255861dd0a1c49 tree 0aa53ac292ce1dd31cc5a416231ffc47eb0da940 parent c83d4635ee8c8fe16046ff6cabcff708be16df75 author Bodo Stroesser Wed, 18 Jan 2006 17:42:51 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: TT mode softint fixes Some fixes to make softints work in tt mode. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c83d4635ee8c8fe16046ff6cabcff708be16df75 tree 8853be96da3194a4a9f08d3e2bf7f4d54dafcad6 parent 1d7173baf286c8b720f97f119ec92be43076ebde author Jeff Dike Wed, 18 Jan 2006 17:42:50 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: use setjmp/longjmp instead of sigsetjmp/siglongjmp Now that we are doing soft interrupts, there's no point in using sigsetjmp and siglongjmp. Using setjmp and longjmp saves a sigprocmask on every jump. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d7173baf286c8b720f97f119ec92be43076ebde tree 4d562c25063c73a690fe1777fa86c3f48dfbbf13 parent 09ee011eb322c2072ec184a88763c250a5485d8b author Jeff Dike Wed, 18 Jan 2006 17:42:49 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: implement soft interrupts This patch implements soft interrupts. Interrupt enabling and disabling no longer map to sigprocmask. Rather, a flag is set indicating whether interrupts may be handled. If a signal comes in and interrupts are marked as OK, then it is handled normally. If interrupts are marked as off, then the signal handler simply returns after noting that a signal needs handling. When interrupts are enabled later on, this pending signals flag is checked, and the IRQ handlers are called at that point. The point of this is to reduce the cost of local_irq_save et al, since they are very much more common than the signals that they are enabling and disabling. Soft interrupts produce a speed-up of ~25% on a kernel build. Subtleties - UML uses sigsetjmp/siglongjmp to switch contexts. sigsetjmp has been wrapped in a save_flags-like macro which remembers the interrupt state at setjmp time, and restores it when it is longjmp-ed back to. The enable_signals function has to loop because the IRQ handler disables interrupts before returning. enable_signals has to return with signals enabled, and signals may come in between the disabling and the return to enable_signals. So, it loops for as long as there are pending signals, ensuring that signals are enabled when it finally returns, and that there are no pending signals that need to be dealt with. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09ee011eb322c2072ec184a88763c250a5485d8b tree ea13731ab3d7fe143b27b0f060956b3cec0f727a parent abaf69773d8dda98b917d94c07757f6520da7bec author Jeff Dike Wed, 18 Jan 2006 17:42:48 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:20 -0800 [PATCH] uml: eliminate some globals Stop using global variables to hold the file descriptor and offset used to map the skas0 stubs. Instead, calculate them using the page physical addresses. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abaf69773d8dda98b917d94c07757f6520da7bec tree 1000669c13511044d1f545cff6af26c1b1d946fb parent f45d9fc9d80678c2ee22c578e503055207c46fd0 author Gennady Sharapov Wed, 18 Jan 2006 17:42:46 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: move libc-dependent skas process handling The serial UML OS-abstraction layer patch (um/kernel/skas dir). This moves all systemcalls from skas/process.c file under os-Linux dir and join skas/process.c and skas/process_kern.c files. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f45d9fc9d80678c2ee22c578e503055207c46fd0 tree e67a7783c2866af94092801a519f04bb77109ade parent 4abfbf4034b419736de5797a3860ab0bcf5c5c8d author Gennady Sharapov Wed, 18 Jan 2006 17:42:45 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: move libc-dependent skas memory mapping code The serial UML OS-abstraction layer patch (um/kernel/skas dir). This moves all systemcalls from skas/mem_user.c file under os-Linux dir and join skas/mem_user.c and skas/mem.c files. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4abfbf4034b419736de5797a3860ab0bcf5c5c8d tree 4cc593f696c92dc2f3db63f9c89bc5862ea73801 parent 2c332a251302873cf8301c2aad27737b6df70255 author Gennady Sharapov Wed, 18 Jan 2006 17:42:44 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: move headers to arch/um/include The serial UML OS-abstraction layer patch (um/kernel dir). This moves skas headers to arch/um/include. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c332a251302873cf8301c2aad27737b6df70255 tree 8c641abe3d27bf44a7a55f4f6354dc5de7ccc260 parent cff65c4f0ea6662124bbb7bf3806e5df1c6d735d author Bodo Stroesser Wed, 18 Jan 2006 17:42:43 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: change interface to boot_timer_handler Current implementation of boot_timer_handler isn't usable for s390. So I changed its name to do_boot_timer_handler, taking (struct sigcontext *)sc as argument. do_boot_timer_handler is called from new boot_timer_handler() in arch/um/os-Linux/signal.c, which uses the same mechanisms as other signal handler to find out sigcontext pointer. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cff65c4f0ea6662124bbb7bf3806e5df1c6d735d tree 5f19b3facdfa6a50ad1668b28d1ff74a92a90271 parent 4fef0c10fa174b57a10854b8b4b2b90d155706e0 author Gennady Sharapov Wed, 18 Jan 2006 17:42:42 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: move libc-dependent time code The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from time.c file under os-Linux dir and joins time.c and tine_kernel.c files Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fef0c10fa174b57a10854b8b4b2b90d155706e0 tree 02cfcc989114da9a6d46484753937cc0e3a60b52 parent 12919aa6e015dd85170fc3b1a3e10a5dfd116c72 author Gennady Sharapov Wed, 18 Jan 2006 17:42:41 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:19 -0800 [PATCH] uml: move libc-dependent utility procedures The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from user_util.c file under os-Linux dir Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12919aa6e015dd85170fc3b1a3e10a5dfd116c72 tree 07072818e5155f55f7c9867d216725f1261ec009 parent ea1eae75eb596e0628dc5e01d32c78b1f6b257fb author Bodo Stroesser Wed, 18 Jan 2006 17:42:39 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:18 -0800 [PATCH] uml: move LDT creation s390 doesn't have a LDT. So MM_COPY_SEGMENTS will not be supported on s390. The only user of MM_COPY_SEGMENTS is new_mm(), but that's no longer useful, as arch/sys-i386/ldt.c defines init_new_ldt(), which is called immediately after new_mm(). So we should copy host's LDT in init_new_ldt(), if /proc/mm is available, to have this subarch specific call in subarch code. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea1eae75eb596e0628dc5e01d32c78b1f6b257fb tree ebd55d53c349548af8685f1705dc9c682eb8649b parent 86c562a9d6683063e071692fe14e0a18e64ee1be author Jeff Dike Wed, 18 Jan 2006 17:42:38 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:18 -0800 [PATCH] uml: add __raw_writel definition Add implementations of the write* and __raw_write* functions. __raw_writel is needed by lib/iocopy.c, which shouldn't be used in UML, but which is unconditionally linked in anyway. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c562a9d6683063e071692fe14e0a18e64ee1be tree dd64f8bff4624f17f2245aeadf962e0d6d5974a0 parent dc85da15d42b0efc792b0f5eab774dc5dbc1ceec author Christoph Lameter Wed, 18 Jan 2006 17:42:37 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:18 -0800 [PATCH] mm: optimize numa policy handling in slab allocator Move the interrupt check from slab_node into ___cache_alloc and adds an "unlikely()" to avoid pipeline stalls on some architectures. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc85da15d42b0efc792b0f5eab774dc5dbc1ceec tree 4b347b10dadf3cc7bdbff36709e8cee2bc673996 parent fc0abb1451c64c79ac80665d5ba74450ce274e4d author Christoph Lameter Wed, 18 Jan 2006 17:42:36 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:18 -0800 [PATCH] NUMA policies in the slab allocator V2 This patch fixes a regression in 2.6.14 against 2.6.13 that causes an imbalance in memory allocation during bootup. The slab allocator in 2.6.13 is not numa aware and simply calls alloc_pages(). This means that memory policies may control the behavior of alloc_pages(). During bootup the memory policy is set to MPOL_INTERLEAVE resulting in the spreading out of allocations during bootup over all available nodes. The slab allocator in 2.6.13 has only a single list of slab pages. As a result the per cpu slab cache and the spinlock controlled page lists may contain slab entries from off node memory. The slab allocator in 2.6.13 makes no effort to discern the locality of an entry on its lists. The NUMA aware slab allocator in 2.6.14 controls locality of the slab pages explicitly by calling alloc_pages_node(). The NUMA slab allocator manages slab entries by having lists of available slab pages for each node. The per cpu slab cache can only contain slab entries associated with the node local to the processor. This guarantees that the default allocation mode of the slab allocator always assigns local memory if available. Setting MPOL_INTERLEAVE as a default policy during bootup has no effect anymore. In 2.6.14 all node unspecific slab allocations are performed on the boot processor. This means that most of key data structures are allocated on one node. Most processors will have to refer to these structures making the boot node a potential bottleneck. This may reduce performance and cause unnecessary memory pressure on the boot node. This patch implements NUMA policies in the slab layer. There is the need of explicit application of NUMA memory policies by the slab allcator itself since the NUMA slab allocator does no longer let the page_allocator control locality. The check for policies is made directly at the beginning of __cache_alloc using current->mempolicy. The memory policy is already frequently checked by the page allocator (alloc_page_vma() and alloc_page_current()). So it is highly likely that the cacheline is present. For MPOL_INTERLEAVE kmalloc() will spread out each request to one node after another so that an equal distribution of allocations can be obtained during bootup. It is not possible to push the policy check to lower layers of the NUMA slab allocator since the per cpu caches are now only containing slab entries from the current node. If the policy says that the local node is not to be preferred or forbidden then there is no point in checking the slab cache or local list of slab pages. The allocation better be directed immediately to the lists containing slab entries for the allowed set of nodes. This way of applying policy also fixes another strange behavior in 2.6.13. alloc_pages() is controlled by the memory allocation policy of the current process. It could therefore be that one process is running with MPOL_INTERLEAVE and would f.e. obtain a new page following that policy since no slab entries are in the lists anymore. A page can typically be used for multiple slab entries but lets say that the current process is only using one. The other entries are then added to the slab lists. These are now non local entries in the slab lists despite of the possible availability of local pages that would provide faster access and increase the performance of the application. Another process without MPOL_INTERLEAVE may now run and expect a local slab entry from kmalloc(). However, there are still these free slab entries from the off node page obtained from the other process via MPOL_INTERLEAVE in the cache. The process will then get an off node slab entry although other slab entries may be available that are local to that process. This means that the policy if one process may contaminate the locality of the slab caches for other processes. This patch in effect insures that a per process policy is followed for the allocation of slab entries and that there cannot be a memory policy influence from one process to another. A process with default policy will always get a local slab entry if one is available. And the process using memory policies will get its memory arranged as requested. Off-node slab allocation will require the use of spinlocks and will make the use of per cpu caches not possible. A process using memory policies to redirect allocations offnode will have to cope with additional lock overhead in addition to the latency added by the need to access a remote slab entry. Changes V1->V2 - Remove #ifdef CONFIG_NUMA by moving forward declaration into prior #ifdef CONFIG_NUMA section. - Give the function determining the node number to use a saner name. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc0abb1451c64c79ac80665d5ba74450ce274e4d tree 30301b6134b122a638104645bd6bd4b45014dd2c parent 1743660b911bfb849b1fb33830522254561b9f9b author Ingo Molnar Wed, 18 Jan 2006 17:42:33 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:18 -0800 [PATCH] sem2mutex: mm/slab.c Convert mm/swapfile.c's swapon_sem to swapon_mutex. Signed-off-by: Ingo Molnar Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1743660b911bfb849b1fb33830522254561b9f9b tree 82bfd84f534e7a571667916f90e2492c7148cbac parent 9eeff2395e3cfd05c9b2e6074ff943a34b0c5c21 author Christoph Lameter Wed, 18 Jan 2006 17:42:32 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] Zone reclaim: proc override proc support for zone reclaim This patch creates a proc entry /proc/sys/vm/zone_reclaim_mode that may be used to override the automatic determination of the zone reclaim made on bootup. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9eeff2395e3cfd05c9b2e6074ff943a34b0c5c21 tree 20160098ec6ed8738cfecfc5f81181ad22b44e60 parent f1fd1067ece574ab56e4a70878b9a5a1ed4c3c42 author Christoph Lameter Wed, 18 Jan 2006 17:42:31 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] Zone reclaim: Reclaim logic Some bits for zone reclaim exists in 2.6.15 but they are not usable. This patch fixes them up, removes unused code and makes zone reclaim usable. Zone reclaim allows the reclaiming of pages from a zone if the number of free pages falls below the watermarks even if other zones still have enough pages available. Zone reclaim is of particular importance for NUMA machines. It can be more beneficial to reclaim a page than taking the performance penalties that come with allocating a page on a remote zone. Zone reclaim is enabled if the maximum distance to another node is higher than RECLAIM_DISTANCE, which may be defined by an arch. By default RECLAIM_DISTANCE is 20. 20 is the distance to another node in the same component (enclosure or motherboard) on IA64. The meaning of the NUMA distance information seems to vary by arch. If zone reclaim is not successful then no further reclaim attempts will occur for a certain time period (ZONE_RECLAIM_INTERVAL). This patch was discussed before. See http://marc.theaimsgroup.com/?l=linux-kernel&m=113519961504207&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113408418232531&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113389027420032&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113380938612205&w=2 Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1fd1067ece574ab56e4a70878b9a5a1ed4c3c42 tree f7f9d092ac0ed8bd734245d803b563b5e751c8ad parent fc3012896337c83a056c496d7cfb0072e1591181 author Christoph Lameter Wed, 18 Jan 2006 17:42:30 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] Zone reclaim: resurrect may_swap Zone reclaim has a huge impact on NUMA performance (f.e. our maximum throughput with XFS is raised from 4GB to 6GB/sec / page cache contamination of numa nodes destroys locality if one just does a large copy operation which results in performance dropping for good until reboot). This patch: Resurrect may_swap in struct scan_control Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc3012896337c83a056c496d7cfb0072e1591181 tree 5b774e59ba982fd4330eb96abace9cda9d744b0f parent 053837fce7aa79025ed57656855df09f80175527 author Christoph Lameter Wed, 18 Jan 2006 17:42:29 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] Simplify migrate_page_add Simplify migrate_page_add after feedback from Hugh. This also allows us to drop one parameter from migrate_page_add. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 053837fce7aa79025ed57656855df09f80175527 tree 05d7615894131a368fc4943f641b11acdd2ae694 parent e236a166b2bc437769a9b8b5d19186a3761bde48 author Nick Piggin Wed, 18 Jan 2006 17:42:27 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] mm: migration page refcounting fix Migration code currently does not take a reference to target page properly, so between unlocking the pte and trying to take a new reference to the page with isolate_lru_page, anything could happen to it. Fix this by holding the pte lock until we get a chance to elevate the refcount. Other small cleanups while we're here. Signed-off-by: Nick Piggin Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e236a166b2bc437769a9b8b5d19186a3761bde48 tree 326c45b5592650dc28f0ece22e8d9b5cd810a09d parent c2aeacd48ca2418fbac985a58d2200c263444d65 author Andrew Morton Wed, 18 Jan 2006 17:42:26 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:17 -0800 [PATCH] mm: dirty_exceeded speedup Ravikiran reports that this variable is bouncing all around nodes on NUMA machines, causing measurable performance problems. Fix that up by only writing to it when it actually changed. And put it in a new cacheline to prevent it sharing with other things (this happened). Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2aeacd48ca2418fbac985a58d2200c263444d65 tree 3a0087d607c16ad91fe908daa38fe985156539d0 parent 35fbd397f0ce2addd5ab889bf0bcd95f45837e3e author Jon Mason Wed, 18 Jan 2006 17:42:25 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] Prevent trident driver from grabbing pcnet32 hardware Some pcnet32 hardware erroneously has the Vendor ID for Trident. The pcnet32 driver looks for the PCI ethernet class before grabbing the hardware, but the current trident driver does not check against the PCI audio class. This allows the trident driver to claim the pcnet32 hardware. This patch prevents that. This revised version of the OSS Trident patch includes PCI_DEVICE Macro usage. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35fbd397f0ce2addd5ab889bf0bcd95f45837e3e tree b1c45201b5e2daaf9341104b9bca6be80eb27f01 parent c8d338c8dbc4461a6de1171c2332b8ed547f8f3b author Paul Fulghum Wed, 18 Jan 2006 17:42:24 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] synclink_gt fix size of register value storage Fix incorrect variable size used to hold register value. This bug might wipe out a portion of the TCR value when setting the interface options. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8d338c8dbc4461a6de1171c2332b8ed547f8f3b tree 50ca842e3868220c44b9f29e69b504a6542e6c21 parent ab26a20bb0ca0cafb3190972c982f9bfb819040f author Andrew Morton Wed, 18 Jan 2006 17:42:22 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] scsi_transport_spi build fix On alpha: In file included from drivers/scsi/sym53c8xx_2/sym_glue.h:59, from drivers/scsi/sym53c8xx_2/sym_fw.c:40: include/scsi/scsi_transport_spi.h:57: error: field `dv_mutex' has incomplete type Cc: James Bottomley Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab26a20bb0ca0cafb3190972c982f9bfb819040f tree cbeca78a6c4cb925bb13b01da643fac874c1a2d5 parent 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 author Jan Beulich Wed, 18 Jan 2006 17:42:21 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] x86_64: Fix MCE exception stack for boot CPU Fix a typo/mis-merge in one of the previous patches. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 tree 06c78af9eeab5ad504e949a78e4ffa1e3cbb6067 parent 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b author Jan Kara Wed, 18 Jan 2006 17:42:20 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] jbd: remove_transaction fix We have to check that also the second checkpoint list is non-empty before dropping the transaction. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b tree d338bd23c63a24e08962ab2dfa429ddcf7aed5ad parent 2149bcabc5f6fd635935d57480044ba4c11bc020 author Jan Kara Wed, 18 Jan 2006 17:42:19 -0800 committer Linus Torvalds Wed, 18 Jan 2006 19:20:16 -0800 [PATCH] jbd: log_do_checkpoint fix While checkpointing we have to check that our transaction still is in the checkpoint list *and* (not or) that it's not just a different transaction with the same address. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2149bcabc5f6fd635935d57480044ba4c11bc020 tree d0313441c6b8b39dbf3bd840627e57af92a6b929 parent 2333f2120759bb2a3edcc0d32b2f310048ee610d parent d9004eb466d03b7900ed432fecec6819012b4ed3 author Linus Torvalds Wed, 18 Jan 2006 15:19:40 -0800 committer Linus Torvalds Wed, 18 Jan 2006 15:19:40 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 2333f2120759bb2a3edcc0d32b2f310048ee610d tree 9dfd3df0d0702c45fbfdff00f5b5038de01301c5 parent 097916ecafd3bbedbde3ba068522093bf72319b3 parent 37b797b270a81248f839629ddeb382a35c7b0d30 author Linus Torvalds Wed, 18 Jan 2006 15:18:53 -0800 committer Linus Torvalds Wed, 18 Jan 2006 15:18:53 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 097916ecafd3bbedbde3ba068522093bf72319b3 tree 95b8f52826883ccb04086725f0b94186adc1566f parent 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c parent 29f8f63272bd286549d1c7f75ad22686191d35d8 author Linus Torvalds Wed, 18 Jan 2006 15:08:16 -0800 committer Linus Torvalds Wed, 18 Jan 2006 15:08:16 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c tree 787bfa0d16f3d980db0de3853382279c3e117095 parent 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 parent 959a85ada599fd5bab7fab8251795c3a58af28d4 author Linus Torvalds Wed, 18 Jan 2006 15:08:02 -0800 committer Linus Torvalds Wed, 18 Jan 2006 15:08:02 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 959a85ada599fd5bab7fab8251795c3a58af28d4 tree b216eddba948d81655ca9af31fdcc84193992cf8 parent c126cf80d450a4d0aac3de7162d4c14b5c971b24 author David S. Miller Wed, 18 Jan 2006 14:58:05 -0800 committer David S. Miller Wed, 18 Jan 2006 14:58:05 -0800 [SPARC64]: Fix build with CONFIG_COMPAT disabled. Based upon a report and preliminary patch from Jim Gifford. Signed-off-by: David S. Miller commit 37b797b270a81248f839629ddeb382a35c7b0d30 tree b77e2126c5e15697901b6f96cdbbda38414d2850 parent 1e74c891252941ac195bb47978f079c592271a3f parent 30ff720b40ba64b0e9c8974673b95970e68503ac author Russell King Wed, 18 Jan 2006 22:56:29 +0000 committer Russell King Wed, 18 Jan 2006 22:56:29 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream commit c126cf80d450a4d0aac3de7162d4c14b5c971b24 tree dfac36b98cd1ff6d05d2a15482c39c2ecedc5cb3 parent c07a8475ddcadb55b11379c35c9586971a9cedbf author Eddie C. Dost Wed, 18 Jan 2006 14:54:31 -0800 committer David S. Miller Wed, 18 Jan 2006 14:54:31 -0800 [SPARC64]: Serial Console for E250 Patch From: Eddie C. Dost I have the following patch for serial console over the RSC (remote system controller) on my E250 machine. It basically adds support for input-device=rsc and output-device=rsc from OBP, and allows 115200,8,n,1,- serial mode setting. Signed-off-by: David S. Miller commit 29f8f63272bd286549d1c7f75ad22686191d35d8 tree 315f91f6f2aa458e6b1bcf572ff1c7ae1d9d7d7a parent d5ca3117b07ebb0e7dcd5e7a1219277cc4478266 author John W. Linville Wed, 18 Jan 2006 14:52:48 -0800 committer David S. Miller Wed, 18 Jan 2006 14:52:48 -0800 [MAINTAINERS]: add entry for wireless networking Add an entry to MAINTAINERS for wireless networking, just so people know whom to bless with patches. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit d5ca3117b07ebb0e7dcd5e7a1219277cc4478266 tree 3a08615d8376d383164f1a16c7fa8f9e1f28d7df parent 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f author John W. Linville Wed, 18 Jan 2006 14:52:18 -0800 committer David S. Miller Wed, 18 Jan 2006 14:52:18 -0800 [MAINTAINERS]: correct location for net-2.6.git Correct location info for net-2.6 git tree. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 1e74c891252941ac195bb47978f079c592271a3f tree e8b6d56cfe360b19fb9c824afc28f8da5ac51556 parent 265d5e48dd1fd4c53f2b454e1e82b7713ddca37e author David Vrabel Wed, 18 Jan 2006 22:46:43 +0000 committer Russell King Wed, 18 Jan 2006 22:46:43 +0000 [ARM] 3281/1: ixp4xx: export ixp4xx_exp_bus_size for modules Patch from David Vrabel Export ixp4xx_exp_bus_size so modules can use the IXP4XX_EXP_BUS_BASE(n) macro. Also, fix a printk format warning. Signed-off-by: David Vrabel Signed-off-by: Russell King commit 265d5e48dd1fd4c53f2b454e1e82b7713ddca37e tree 4500f524f9aee7f4d0a818381f77c156cc946fa7 parent 5e0974459df9acd6cd0952c98a58816ad820ae66 author Nicolas Pitre Wed, 18 Jan 2006 22:38:51 +0000 committer Russell King Wed, 18 Jan 2006 22:38:51 +0000 [ARM] 3272/1: fix kernel decompressor crash Patch from Nicolas Pitre Commit f4619025a51747a3788fd1bb6bdc46e368a889a7 broke the kernel decompressor (at least on PXA). Here's the fix. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 5e0974459df9acd6cd0952c98a58816ad820ae66 tree ac4ae7f47f6060e529694884b70c0cda6278fbd0 parent fcca538b83f2984095f15f0f90f6c7686e3a32d4 author Nicolas Pitre Wed, 18 Jan 2006 22:38:49 +0000 committer Russell King Wed, 18 Jan 2006 22:38:49 +0000 [ARM] 3271/1: ARM EABI: fix calling of cmpxchg syscall emulation Patch from Nicolas Pitre This is kernel provided user space code. Since a syscall is used, it has to be updated to work with EABI. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit fcca538b83f2984095f15f0f90f6c7686e3a32d4 tree bf113e29cb4cc4b13900814a3c7ada4884c94a18 parent 1230b4046b9da77ccb83ef2eaffc54dc4a96093a author Nicolas Pitre Wed, 18 Jan 2006 22:38:47 +0000 committer Russell King Wed, 18 Jan 2006 22:38:47 +0000 [ARM] 3270/1: ARM EABI: fix sigreturn and rt_sigreturn Patch from Nicolas Pitre The signal return path consists of user code provided by the kernel. Since a syscall is used, it has to be updated to work with EABI. Noticed by Daniel Jacobowitz. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 1230b4046b9da77ccb83ef2eaffc54dc4a96093a tree 19d70c8ca074d8770c17a9c39715f0ed04e0e457 parent 68477d11769ce8c6830523f08637894c43885c7e author Andrew Victor Wed, 18 Jan 2006 22:38:46 +0000 committer Russell King Wed, 18 Jan 2006 22:38:46 +0000 [ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12 Patch from Andrew Victor This patch fixes two small issues with 2.6.15-git12. 1) Corrected major/minor numbers for ttyAT devices in the KConfig help. (Patch from Karl Olsen) 2) tty->flip.count has been removed. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 68477d11769ce8c6830523f08637894c43885c7e tree a2e36829cc638c37e673a749306e31226d0ee2da parent 7eb9b2f56c9812d03ac63031869bcc42151067b1 author David Vrabel Wed, 18 Jan 2006 22:38:44 +0000 committer Russell King Wed, 18 Jan 2006 22:38:44 +0000 [ARM] 3267/1: PXA27x SSP controller register defines Patch from David Vrabel PXA27x SSP controller has a few different registers, including SCR (serial clock rate) in SSCR0. Signed-off-by: David Vrabel Signed-off-by: Russell King commit 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f tree 8107ee11c3fe7d3b4be36054af4475326af86d53 parent ad12583f46bcb6ce93ccd99fa063c0d701146b2e parent 4323add67792ced172d0d93b8b2e6187023115f1 author David S. Miller Wed, 18 Jan 2006 14:23:54 -0800 committer David S. Miller Wed, 18 Jan 2006 14:23:54 -0800 Merge git://tipc.cslab.ericsson.net/pub/git/tipc commit ad12583f46bcb6ce93ccd99fa063c0d701146b2e tree 58d68cf1a60cd3cf2b8ee0e9fbdcb38454e2082e parent 7ac5459ec0f074022818af35c589b9e2b406d7c3 author David L Stevens Wed, 18 Jan 2006 14:20:56 -0800 committer David S. Miller Wed, 18 Jan 2006 14:20:56 -0800 [IPV4]: Fix multiple bugs in IGMPv3 1) fix "mld_marksources()" to a) send nothing when all queried sources are excluded b) send full exclude report when source queried sources are not excluded c) don't schedule a timer when there's nothing to report 2) fix "add_grec()" to send empty-source records when it should The original check doesn't account for a non-empty source list with all sources inactive; the new code keeps that short-circuit case, and also generates the group header with an empty list if needed. 3) fix mca_crcount decrement to be after add_grec(), which needs its original value 4) add/remove delete records and prevent current advertisements when an exclude-mode filter moves from "active" to "inactive" or vice versa based on new filter additions. Items 1-3 are just IPv4 versions of the IPv6 bugs found by Yan Zheng and fixed earlier. Item #4 is a related bug that affects exclude-mode change records only (but not queries) and also occurs in IPv6 (IPv6 version coming soon). Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 47c886b3123a335f0622136e021e7691d60d742c tree f8fb888829092493333e1cd63389f7cff39fdecd parent d65177c1ae7f085723154105c5dc8d9e16ae8265 author Steve French Wed, 18 Jan 2006 14:20:39 -0800 committer Steve French Wed, 18 Jan 2006 14:20:39 -0800 [CIFS] Fix oops in cifs_readpages caused by not checking buf_type in an error path of new cifs_readpages code. Signed-off-by: Steve French commit 7ac5459ec0f074022818af35c589b9e2b406d7c3 tree 2b623adcfcce2185b60b1aceed01f3a68b471f4e parent e048a374d0d7beb9cf3529eac71ddd79699c8669 author David S. Miller Wed, 18 Jan 2006 14:19:10 -0800 committer David S. Miller Wed, 18 Jan 2006 14:19:10 -0800 [PKTGEN]: Respect hard_header_len of device. Don't assume 16. Found by Ben Greear. Signed-off-by: David S. Miller commit e048a374d0d7beb9cf3529eac71ddd79699c8669 tree c6b52c48f38cca2c46df4d3d56a504e54916cd29 parent fa4f0774d7c6cccb4d1fda76b91dd8eddcb2dd6a author Stephen Hemminger Wed, 18 Jan 2006 14:06:59 -0800 committer David S. Miller Wed, 18 Jan 2006 14:06:59 -0800 [IRDA]: maintainer status Jean says he really doesn't have time to much IRDA any more. The following would help motivate someone who has more time. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fa4f0774d7c6cccb4d1fda76b91dd8eddcb2dd6a tree e3f60e76951c59347901b944cb96ad30f4895bd1 parent dbd2915ce87e811165da0717f8e159276ebb803e author Nick Piggin Wed, 18 Jan 2006 14:05:16 -0800 committer David S. Miller Wed, 18 Jan 2006 14:05:16 -0800 [CASSINI]: dont touch page_count Remove page refcount manipulations from cassini driver by using another field in struct page. Needed for lockless pagecache. Signed-off-by: Nick Piggin Signed-off-by: David S. Miller commit c07a8475ddcadb55b11379c35c9586971a9cedbf tree 9ff097a7b61c54cee8e13402134764948e1401f4 parent 7eb9b2f56c9812d03ac63031869bcc42151067b1 author David S. Miller Wed, 18 Jan 2006 13:41:36 -0800 committer David S. Miller Wed, 18 Jan 2006 13:41:36 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 tree 7c5c95dfe9b8c6bd66e0a19dc9846173634b52df parent 86c3d59ff54c31f07d0f0483dd3f668107c8cf85 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:45 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:58 -0500 [PATCH] e1000: fix compile warning Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 86c3d59ff54c31f07d0f0483dd3f668107c8cf85 tree e252d9716ae573fa0d44240ab2793ab3b7504f4d parent 73629bbc84a7d4026ad08edbfefc642eec60f246 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:43 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:58 -0500 [PATCH] e1000: fix receive breakage in attempting to not send the "prefetch" patch, we broke the receive code, this patch fixes that issue. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 73629bbc84a7d4026ad08edbfefc642eec60f246 tree 96ba9765aa0908b76e74a368c867a47ae3b69fc8 parent 96838a40f02950f4ff501f62a7e59ac4d508e8b7 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:41 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:58 -0500 [PATCH] e1000: Added driver comments Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 96838a40f02950f4ff501f62a7e59ac4d508e8b7 tree 9a86ecbe58a1d63159fc6c8c10223efa0344586d parent 6150f038158ad8ad4b74d6b76a67e2f68fd1d8e2 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:39 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:58 -0500 [PATCH] e1000: Fix whitespace Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 6150f038158ad8ad4b74d6b76a67e2f68fd1d8e2 tree eda3d1cf163efa97d6048814a43a70a234a1f175 parent 2f82665fe51b65921e64d5ceb3a6db98f72c4d61 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:37 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:57 -0500 [PATCH] e1000: Added functions declarations Added e1000_mc_addr_list_update Added e1000_read_reg_io Added e1000_enable_pciex_master These are not static functions, that is why we have them declared in the header. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 2f82665fe51b65921e64d5ceb3a6db98f72c4d61 tree 2b179bb39363508ca188a0ade30e98e36a0bf601 parent b92ff8ee5763ee0b408f3cf2360f58dd7ea9c5da author Jesse Brandeburg Wed, 18 Jan 2006 13:01:34 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:57 -0500 [PATCH] e1000: Added functions to save and restore config These functions help restore the driver to active configuration when coming out of resume for power management. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b92ff8ee5763ee0b408f3cf2360f58dd7ea9c5da tree e6e8a694181ea93265f786ddadfb7e66fb1c78aa parent 35ec56bb78fda9c88cd1ad30e048ce5b4398d33f author Jesse Brandeburg Wed, 18 Jan 2006 13:01:32 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:57 -0500 [PATCH] e1000: Added RX buffer enhancements Align the prefetches to a dword to help speed them up. Recycle skb's and early replenish. Force memory writes to complete before fetching more descriptors. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 35ec56bb78fda9c88cd1ad30e048ce5b4398d33f tree 8dab8de21d249b735a33c262837c991e5b23aa17 parent 7eb9b2f56c9812d03ac63031869bcc42151067b1 author Jesse Brandeburg Wed, 18 Jan 2006 13:01:30 -0800 committer Jeff Garzik Wed, 18 Jan 2006 16:17:57 -0500 [PATCH] e1000: Added disable packet split capability Adds the ability to disability packet split at compile time and use the legacy receive path on PCI express hardware. Made this a CONFIG option and modified the Kconfig, to reflect the new option. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d9004eb466d03b7900ed432fecec6819012b4ed3 tree a8ef7fedce08730cf92df2385b39be154a248caf parent bc965a7f43d3fc37584f9c16c6d7a84a911a9d9c author Alon Bar-Lev Wed, 18 Jan 2006 11:47:33 +0000 committer Russell King Wed, 18 Jan 2006 11:47:33 +0000 [SERIAL] Add 8250 support for Decision Computer International Co. PCCOM2 There is a new device which is look like: Serial controller: Decision Computer International Co. PCCOM2 (rev 02) (prog-if 02 [16550]) 0700: 6666:0004 (rev 02) (prog-if 02) Flags: medium devsel, IRQ 177 Memory at fe000000 (32-bit, non-prefetchable) [size=128] I/O ports at e880 [size=128] I/O ports at e400 [size=256] It has two 16550A, and is not listed in kernel, although the manufacturer clams that it is supported... I've created the following patch, it only add the new PCI id and the card to the repository, it seems to work. Signed-off-by: Alon Bar-Lev Signed-off-by: Russell King commit bc965a7f43d3fc37584f9c16c6d7a84a911a9d9c tree 9d7ac6b356c9a884941b374555cebb5d3f465d61 parent 7eb9b2f56c9812d03ac63031869bcc42151067b1 author Russell King Wed, 18 Jan 2006 09:54:29 +0000 committer Russell King Wed, 18 Jan 2006 09:54:29 +0000 [SERIAL] Fix serial8250 driver initialisation ordering Commit 7493a314cb83797ce612a577475aacaedc553fed changed the ordering of the registration of the platform device driver vs the 8250 drivers internal initialisation. This led to the probe function being called before the driver had finished its internal initialisation, causing mayhem. Revert the ordering change. Signed-off-by: Russell King commit dbd2915ce87e811165da0717f8e159276ebb803e tree 81214471e4f7510d4231020cacf2a52cf43d7715 parent 7eb9b2f56c9812d03ac63031869bcc42151067b1 author Andrew Morton Tue, 17 Jan 2006 21:58:01 -0800 committer David S. Miller Tue, 17 Jan 2006 22:46:49 -0800 [IPV4]: RT_CACHE_STAT_INC() warning fix BUG: using smp_processor_id() in preemptible [00000001] code: rpc.statd/2408 And it _is_ a bug, but I guess we don't care enough to add preempt_disable(). Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d65177c1ae7f085723154105c5dc8d9e16ae8265 tree 14408129d880d89cc5e937f2810f243ed1e6fcde parent d41f084a74de860fe879403fbbad13abdf7aea8e parent 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b author Steve French Tue, 17 Jan 2006 19:49:59 -0800 committer Steve French Tue, 17 Jan 2006 19:49:59 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git Signed-off-by: Steve French commit 7eb9b2f56c9812d03ac63031869bcc42151067b1 tree c9e1ae248e586b9ca3ac0420c88c1b171dca47af parent 728c7763e7234cf8d34fa159660df736556563c9 parent d88992f660936049f5f38d74ea5a86b5c1491a48 author Linus Torvalds Tue, 17 Jan 2006 19:48:07 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:48:07 -0800 Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 commit 728c7763e7234cf8d34fa159660df736556563c9 tree fe66af9029dd1aea787d2a231a82dcaf5dc4c9ee parent d1138cf035ad5a8dc0796b213bd078a2fb92eb7c parent a1bd9e68573239320d18823c73eb06d8e56cc9e2 author Linus Torvalds Tue, 17 Jan 2006 19:47:31 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:47:31 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit d1138cf035ad5a8dc0796b213bd078a2fb92eb7c tree 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 parent 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b parent 77783a78ded96a56e3a1a0c03bbe87c56896fe6e author Linus Torvalds Tue, 17 Jan 2006 19:46:46 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:46:46 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit d41f084a74de860fe879403fbbad13abdf7aea8e tree dd5e36f5a6bbd917daa605ec4e5483edc9a52d92 parent eeac8047fcf4c659eb15f2e27a0ef4aeba64157f author Steve French Tue, 17 Jan 2006 19:16:53 -0800 committer Steve French Tue, 17 Jan 2006 19:16:53 -0800 [CIFS] Remove compiler warning Signed-off-by: Benoit Boissinot Signed-off-by: Steve French commit d88992f660936049f5f38d74ea5a86b5c1491a48 tree 3c3ac2e25d33e4bd59193b9d4ecf7a1bee3e4d0e parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author David Chinner Wed, 18 Jan 2006 13:38:12 +1100 committer Nathan Scott Wed, 18 Jan 2006 13:38:12 +1100 [XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O for a page while we are still submitting other buffers on the same page for I/O. SGI-PV: 948197 SGI-Modid: xfs-linux-melb:xfs-kern:25004a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b tree d938e61f953ca63a745e7ace4a78c16876509ed5 parent 8f28afac3494f573ac774030a1f840b7d6237da2 parent 3860288ee8298bf2784e9a0c37d26d3a82941e35 author Linus Torvalds Tue, 17 Jan 2006 17:32:22 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:32:22 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 8f28afac3494f573ac774030a1f840b7d6237da2 tree 3a405d14b578d4d3b7bf1884667ad43022cc65f2 parent c6b3feaf5774508ab5a955a81e45ffefa3b12eaa parent 4f3f2f6f3e7ce68c533e7786114f05181772ff6f author Linus Torvalds Tue, 17 Jan 2006 17:19:53 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:19:53 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit c6b3feaf5774508ab5a955a81e45ffefa3b12eaa tree f2b275db2e425b1441f9a1ab40a377a232c2bc38 parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Bryan O'Sullivan Tue, 17 Jan 2006 17:00:05 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:18:25 -0800 [PATCH] Fix sparse parse error in lppaca.h sparse can't parse a struct definition in include/asm-powerpc/lppaca.h, even though gcc can accept it. The form looks like this: struct __attribute__((whatever)) foo { }; An equivalent that both gcc and sparse can handle is struct foo { } __attribute__((whatever)); This is the only definition of this type in the tree, and fixing it is easier than fixing sparse. Signed-off-by: Bryan O'Sullivan [ Side note: fixing sparse wouldn't be hard, but the "attribute at the end" version is the canonical one, and the one that makes sense. So let's just fix the kernel instead. Luc Van Oostenryck already sent out a sparse patch to the sparse mailing list in case anybody cares. -- Linus ] Signed-off-by: Linus Torvalds commit 77783a78ded96a56e3a1a0c03bbe87c56896fe6e tree 6a18c269adc45b438dc77355756dcf3957d4aad3 parent 22d4d77183f0af8b3b643544a5ae64ec6105d88b author Stephen Hemminger Thu, 05 Jan 2006 16:26:05 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:52:56 -0500 [PATCH] skge: fix dma mask setup. There are a couple of problems in the DMA setup code for skge. * In the 64 bit case, it doesn't set the consistent mask. * In the 32 bit case, the error check is backwards! It likely will only be visible as a bug on 64 bit platforms. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a1bd9e68573239320d18823c73eb06d8e56cc9e2 tree 9c9138c9239c586a66fd372549544254d10304e4 parent 9d824d0710a9e780451533ae4c5cdc5c2ff9062e author Alan Cox Tue, 17 Jan 2006 20:53:50 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Code for the IRQ mask flag Signed-off-by: Alan Cox Somewhat cleaner in the resync as someone cleaned up the pio xfer users Signed-off-by: Jeff Garzik commit 9d824d0710a9e780451533ae4c5cdc5c2ff9062e tree b786d00ffce075c3f2031d672cccd3814ba01a53 parent 8d238e012469a9a332c78d6a69a8a46ac4b1e9c2 author Alan Cox Tue, 17 Jan 2006 20:51:55 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Fix sector lock to apply to both drives not drive 0 twice Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 8d238e012469a9a332c78d6a69a8a46ac4b1e9c2 tree a882e4ec38a87d5ee61653ff9b16ccea57c2bf04 parent 012b265f76ce5d497b182569dc77f2c68662bead author Alan Cox Tue, 17 Jan 2006 20:50:31 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add IRQ flag for next diff Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 012b265f76ce5d497b182569dc77f2c68662bead tree e361d2f2208983c66c9110fce91bb7213f62976a parent 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 author Jason Gaston Tue, 17 Jan 2006 12:28:48 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:31:54 -0500 [PATCH] Intel ICH8 SATA: add PCI device IDs Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit 22d4d77183f0af8b3b643544a5ae64ec6105d88b tree 147b99fdd2dcbaeeac0f23e67bfa0147d23748bc parent 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba author Alan Cox Tue, 17 Jan 2006 17:53:56 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:28:50 -0500 [PATCH] Fix warning with b44.c on 64bit boxes sizeof() return is not an int, so use max_t to get the types right. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba tree d8b98dc9709b9f28fc0aef3d5052bc9271930ea1 parent 302d12522a36790858ce93b69ebf2220f9e5173a author Stephen Hemminger Tue, 17 Jan 2006 13:43:21 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:31 -0500 [PATCH] sky2: 0.13 version Signed-off-by: Jeff Garzik commit 302d12522a36790858ce93b69ebf2220f9e5173a tree 29b049801298aff6e889f9c15bcd5963cb33aebc parent 28bd181a8e4abf1126de56f0934ba7c910276475 author Stephen Hemminger Tue, 17 Jan 2006 13:43:20 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: more conservative transmit locking Be more careful about transmit locking, this solves a possible race between tx_complete and transmit, that would cause a tx timeout. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 28bd181a8e4abf1126de56f0934ba7c910276475 tree e9e938691446ada18cae5d8dafaa2d79b00f12ce parent 6aad85d6730d47d4867f24eeda517766aa89f8d0 author Stephen Hemminger Tue, 17 Jan 2006 13:43:19 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: don't inline so much Don't need to inline quite so many routines, let the compiler decide Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6aad85d6730d47d4867f24eeda517766aa89f8d0 tree 4bc4dff2f0dad994abb3bca18b710ce85f14546a parent 3be92a70237a1bd813e46d6683a55b508627013a author Stephen Hemminger Tue, 17 Jan 2006 13:43:18 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: use kzalloc Can use kzalloc here. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3be92a70237a1bd813e46d6683a55b508627013a tree 1a7995f8b2c646e892f36543a0d70626b7b93aa5 parent a036119f977eeeae2089ddf5b4759de9ca5fbdb6 author Stephen Hemminger Tue, 17 Jan 2006 13:43:17 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: ratelimit error messages Make sure and rate limit all the error messages that might occur. If a problem occurs then a few messages are enough. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a036119f977eeeae2089ddf5b4759de9ca5fbdb6 tree b2375e6d37a5e79fb1a3e890c00c15c15ca2d57a parent dc4d5ea2218b80eb8cd323082f09c506ba75fb6f author Stephen Hemminger Tue, 17 Jan 2006 13:43:16 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: optimize for 32 bit dma Small optimization, if dma addresses are 32 bits, then high bits are always zero. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit dc4d5ea2218b80eb8cd323082f09c506ba75fb6f tree 67ddc5608641b91b05a066a3dd34c9e80908e504 parent 762c2de2e61ef5f3c866d00861e6b1509cd8eacf author Stephen Hemminger Tue, 17 Jan 2006 13:43:15 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: don't bother clearing status ring elements Don't need to zero out the status ring entries after processing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 762c2de2e61ef5f3c866d00861e6b1509cd8eacf tree 7e995313877766e8013fa03b8305fbaa1139b808 parent 1c28f6ba600d05be2dc7ab0592e4d845f668a485 author Stephen Hemminger Tue, 17 Jan 2006 13:43:14 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: write barrier's Be more careful about memory barriers. The only place we really need them is before and after updating the chip's ring interface. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1c28f6ba600d05be2dc7ab0592e4d845f668a485 tree 4dab29ea4d4d83588ef478ac34d5f99961416b45 parent e0c94455ce2a0e5734eeb236fb49a4613e20e7b0 author Stephen Hemminger Tue, 17 Jan 2006 13:43:13 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: fix ram buffer for Yukon FE rev 2 Fix problems with Yukon FE rev 2 chipset. Don't cut and paste bugs in from sk98lin driver. Change how the ram buffer is divided up, and make the math clearer. Also, set the thresholds where rx takes precedence. The threshold values are just guesses at this point, it might be worth tuning them later. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e0c94455ce2a0e5734eeb236fb49a4613e20e7b0 tree 431f470cf0cc5deb4c4b8e27758e8b37c5cb2102 parent d1f3d4ddddc3c86e25ce2a41dc129cbe10e24991 author Stephen Hemminger Tue, 17 Jan 2006 13:43:12 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: version 0.12 Version update. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d1f3d4ddddc3c86e25ce2a41dc129cbe10e24991 tree 61da5eb8cf7c8424fbb66a2ab59635985136bdbf parent 82788c7a47e50ee8d42e3be23afb23448d651c4c author Stephen Hemminger Tue, 17 Jan 2006 13:43:11 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: call pci_set_consistent_dma_mask Need to call pci_set_consistent_dma_mask in the case of 64 bit DMA. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 82788c7a47e50ee8d42e3be23afb23448d651c4c tree 90c7f6e7f6a1755914677d33a7899e7d82376f9f parent 0547993820378ef8140b0470b604737bf1fa6c85 author Stephen Hemminger Tue, 17 Jan 2006 13:43:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:28 -0500 [PATCH] sky2: receive buffer alignment Need to make sure that sky2 receive buffers are 64 bit aligned. Also, don't need to start off with GFP_ATOMIC on initial setup. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 0547993820378ef8140b0470b604737bf1fa6c85 tree ac942ba856056d984a6b204c50b1f33b4fcc12cd parent 3435dbcec199740d3100e0a2f316e795286b5424 author Jesse Brandeburg Tue, 17 Jan 2006 15:01:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:16 -0500 [PATCH] e100: e100 whitespace fixes e100: e100 whitespace fixes These are whitespace only fixes. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 3435dbcec199740d3100e0a2f316e795286b5424 tree 4cdce308bb06510dd5cf1e4de68e792565b08b03 parent 24180333206519e6b0c4633eab81e773b4527cac author Jesse Brandeburg Tue, 17 Jan 2006 15:01:08 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:15 -0500 [PATCH] e100: Handle the return values from pci_* functions e100: Handle the return values from pci_* functions This is to resolve warnings during compile time. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 24180333206519e6b0c4633eab81e773b4527cac tree 903edfa6bac60f0583a69614503a6ee1af2711a4 parent 2610c733023850be2db9fef9c81f851a64bb9f67 author Jesse Brandeburg Tue, 17 Jan 2006 15:01:06 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:15 -0500 [PATCH] e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue) e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue) Set the end of list bit to cause the hardware's transmit state machine to work correctly and not prevent management (BMC) traffic. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4f3f2f6f3e7ce68c533e7786114f05181772ff6f tree 7035a782b79c770f98d34847ae0b88b3ad6b8384 parent c7006638a50cbf16bb420fa91e5af2dd22d28621 author David S. Miller Tue, 17 Jan 2006 15:55:58 -0800 committer David S. Miller Tue, 17 Jan 2006 15:55:58 -0800 [SOUND]: sparc/cs4231: Fix some typos which wrecked the build. Signed-off-by: David S. Miller commit c7006638a50cbf16bb420fa91e5af2dd22d28621 tree ba8a5d030087634a2e0fe63ad6ce1cd9c6758bbf parent 1ae613883468eab2fb8a077aad9fdedfbfa73d1b author David S. Miller Tue, 17 Jan 2006 15:53:11 -0800 committer David S. Miller Tue, 17 Jan 2006 15:53:11 -0800 [SPARC]: Fix sbusfb build. sbusfb_compat_ioctl() needs to return int, not long, as that is what the fb_ops->fb_compat_ioctl method prototype wants. Need to git rid of the "struct file *file" first argument to fbiogetputcmap() and fbiogscursor() to match calls done in sbusfb_compat_ioctl(). Signed-off-by: David S. Miller commit 4323add67792ced172d0d93b8b2e6187023115f1 tree 13224010f6f18029fb710a1e0b48392aea90b486 parent 1e63e681e06d438fdc542d40924a4f155d461bbd author Per Liden Wed, 18 Jan 2006 00:38:21 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:16 +0100 [TIPC] Avoid polluting the global namespace This patch adds a tipc_ prefix to all externally visible symbols. Signed-off-by: Per Liden commit 1e63e681e06d438fdc542d40924a4f155d461bbd tree 5e874ae6e02e244184dcb9b5049bdf805053a305 parent c11ac3f236d73dd00c21ab4f06166606dea71ef3 author Per Liden Mon, 16 Jan 2006 16:39:13 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Group protocols with sub-options in Kconfig This is just a cosmetic change that moves the TIPC configuration entry next to the other protocols that also have sub-options. Makes the the networking options menu look a bit better. Signed-off-by: Per Liden commit c11ac3f236d73dd00c21ab4f06166606dea71ef3 tree 3cf6098061e418c06cf4d6f25fd1a755d1a13d01 parent 50f9bcddf8be147678c2d4ef8ac5279222d0ae3a author Per Liden Mon, 16 Jan 2006 16:32:18 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Add help text for TIPC configuration option Signed-off-by: Per Liden commit 50f9bcddf8be147678c2d4ef8ac5279222d0ae3a tree a1a8c38cc00ccc824303720b5595924c37617694 parent 33a9c4da5ab16192ef1e961d4c4e45c18031cd67 author Per Liden Mon, 16 Jan 2006 12:42:35 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Remove unused #includes Signed-off-by: Per Liden commit 33a9c4da5ab16192ef1e961d4c4e45c18031cd67 tree 825c24cd6cf5700a0c8f6ac1c11a18cb46235d4a parent 7c2b2aaee45c365596a83bcf8758b1f222e0eca4 author Per Liden Mon, 16 Jan 2006 11:42:12 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Move ethernet protocol id to linux/if_ether.h Signed-off-by: Per Liden commit 7c2b2aaee45c365596a83bcf8758b1f222e0eca4 tree c2e840ce2a26905a190c8ad47123ffd6acd3a690 parent 16cb4b333c9e7a00ce3b1d74ec0c9b4c2e956910 author Per Liden Sat, 14 Jan 2006 12:42:21 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Provide real email addresses in MAINTAINERS Signed-off-by: Per Liden commit 16cb4b333c9e7a00ce3b1d74ec0c9b4c2e956910 tree f7684c0b2c205719c4807f25626af2a08fe6a277 parent 5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1 author Per Liden Fri, 13 Jan 2006 22:22:22 +0100 committer Per Liden Wed, 18 Jan 2006 00:45:15 +0100 [TIPC] Updated link priority macros Added macros for min/default/max link priority in tipc_config.h. Also renamed TIPC_NUM_LINK_PRI to TIPC_MEDIA_LINK_PRI since that is a more accurate description of what it is used for. Signed-off-by: Per Liden commit 5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1 tree de2954670c63c9f9c584c7cec633f72047215aa3 parent 3860288ee8298bf2784e9a0c37d26d3a82941e35 author Jon Maloy Fri, 13 Jan 2006 10:45:44 +0000 committer Per Liden Wed, 18 Jan 2006 00:45:14 +0100 [TIPC] Minor changes to #includes Signed-off-by: Jon Maloy commit 1ae613883468eab2fb8a077aad9fdedfbfa73d1b tree 137e13bddb040f4ae9a997473e847304dcd7c19e parent 9eb3394bf2037120881a8846bc67064f49325366 author Eric Sesterhenn Tue, 17 Jan 2006 15:36:05 -0800 committer David S. Miller Tue, 17 Jan 2006 15:36:05 -0800 [SPARC]: change if() BUG(); to BUG_ON in iommu.c this patch changes if() BUG(); constructs in iommu.c to BUG_ON(); so it gets save to define BUG() and BUG_ON() to nullstatements. Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit 30ff720b40ba64b0e9c8974673b95970e68503ac tree 686cfd46b78caff7a2bd436b84f47aa848a68b03 parent fde0fd49419177ddd69254b8d532edde9ce6a543 author Tony Lindgren Tue, 17 Jan 2006 15:33:51 -0800 committer Tony Lindgren Tue, 17 Jan 2006 15:33:51 -0800 ARM: OMAP: 4/4 Fix clock framework to use clk_enable/disable misc This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren commit fde0fd49419177ddd69254b8d532edde9ce6a543 tree 6d7f3cd6d3d6b1d97748d766e034a05b38ed22a0 parent 10b55794134b279e2ce37713972e324c0dd507ab author Tony Lindgren Tue, 17 Jan 2006 15:31:18 -0800 committer Tony Lindgren Tue, 17 Jan 2006 15:31:18 -0800 ARM: OMAP: 3/4 Fix clock framework to use clk_enable/disable for omap2 This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren commit 10b55794134b279e2ce37713972e324c0dd507ab tree 07de99dfff4d141585ff5458c08f06045ecba553 parent f07adc591e6ff100773b93b643f58d9773df6e21 author Tony Lindgren Tue, 17 Jan 2006 15:30:42 -0800 committer Tony Lindgren Tue, 17 Jan 2006 15:30:42 -0800 ARM: OMAP: 2/4 Fix clock framework to use clk_enable/disable for omap1 This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren commit f07adc591e6ff100773b93b643f58d9773df6e21 tree 78f20f5c07e211d0a5eb69620168fcfb1da0da7b parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Tony Lindgren Tue, 17 Jan 2006 15:27:09 -0800 committer Tony Lindgren Tue, 17 Jan 2006 15:27:09 -0800 ARM: OMAP: 1/4 Fix clock framework to use clk_enable/disable This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Instances of clk_use/unuse are renamed to clk_enable/disable, and references clk_use/unuse are removed. Signed-off-by: Tony Lindgren commit 9eb3394bf2037120881a8846bc67064f49325366 tree 6782663f5b5a13cf8f98c4341637322650b42f9a parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Richard Mortimer Tue, 17 Jan 2006 15:21:01 -0800 committer David S. Miller Tue, 17 Jan 2006 15:21:01 -0800 [SPARC64]: Eliminate race condition reading Hummingbird STICK register Ensure a consistent value is read from the STICK register by ensuring that both high and low are read without high changing due to a roll over of the low register. Various Debian/SPARC users (myself include) have noticed problems with Hummingbird based systems. The symptoms are that the system time is seen to jump forward 3 days, 6 hours, 11 minutes give or take a few seconds. In many cases the system then hangs some time afterwards. I've spotted a race condition in the code to read the STICK register. I could not work out why 3d, 6h, 11m is important but guess that it is due to the 2^32 jump of STICK (forwards on one read and then the next read will seem to be backwards) during a timer interrupt. I'm guessing that a change of -2^32 will get converted to a large unsigned increment after the arithmetic manipulation between STICK, nanoseconds, jiffies etc. I did a test where I modified __hbird_read_stick to artificially inject rollover faults forcefully every few seconds. With this I saw the clock jump over 6 times in 12 hours compared to once every month or so. Signed-off-by: Richard Mortimer Signed-off-by: David S. Miller commit 3860288ee8298bf2784e9a0c37d26d3a82941e35 tree 418993a3f8a15e01a8678c5750399ac7a6ae6811 parent 64af4c13622511257daba762b32d9d20f2d0c4b5 author Kris Katterjohn Tue, 17 Jan 2006 15:15:38 -0800 committer David S. Miller Tue, 17 Jan 2006 15:15:38 -0800 [NET]: Use is_zero_ether_addr() in net/core/netpoll.c This replaces a memcmp() with is_zero_ether_addr(). Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 64af4c13622511257daba762b32d9d20f2d0c4b5 tree b305487a9130b824f71418303178bd0b19791048 parent f404e9a67ffdc0bb0302a5ad1f7eaf58e5a59109 author Andrew Morton Tue, 17 Jan 2006 15:14:49 -0800 committer David S. Miller Tue, 17 Jan 2006 15:14:49 -0800 [CASSINI]: Fix printk warning. drivers/net/cassini.c:1930: warning: long unsigned int format, different type arg (arg 4) Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4b16bfbf8f8013fefb49592d030ff87651ab48cb tree ce9150f8ceac6150261f5bc69afdf9d2e95def19 parent 8d08aed8d7714683b33666cc066e20f957dda01d author Zoltan Menyhart Fri, 13 Jan 2006 17:25:23 +0100 committer Tony Luck Tue, 17 Jan 2006 14:04:00 -0800 [IA64] Fix bug in ia64 specific down() function Chen, Kenneth W wrote: > The memory order semantics for include/asm-ia64/semaphore.h:down() > doesn't look right. It is using atomic_dec_return, which eventually > translate into ia64_fetch_and_add() that uses release semantics. > Shouldn't it use acquire semantics? Use ia64_fetchadd() instead of atomic_dec_return() Acked-by: Ken Chen Signed-off-by: Tony Luck commit 8d08aed8d7714683b33666cc066e20f957dda01d tree 31b8a773a09575f94adce8e00c52fb0010bd5a5f parent d171e519da635a82ab759cbfd46617ac160c9ec0 author Jack Steiner Tue, 17 Jan 2006 15:42:46 -0600 committer Tony Luck Tue, 17 Jan 2006 13:55:46 -0800 [IA64] Zonelists for nodes without cpus If a node runs out of memory, ensure that memory on nodes w/o cpus is used before using memory on nodes with cpus. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit d171e519da635a82ab759cbfd46617ac160c9ec0 tree 129540046270818c36f0bb9d29c8b387e664725a parent f9e505a9a03df5acace6e758c8d12982635a1c64 author Jes Sorensen Tue, 17 Jan 2006 13:05:12 -0500 committer Tony Luck Tue, 17 Jan 2006 13:54:41 -0800 [IA64-SGI] sn_console.c minor cleanup Fix printk level and remove unnecessary CONFIG_SMP|CONFIG_PREEMPT tests as this is taken care through the spinlock macros anyway. Signed-off-by: Jes Sorensen Signed-off-by: Pat Gefre Signed-off-by: Tony Luck commit f9e505a9a03df5acace6e758c8d12982635a1c64 tree c336b36fd18dd1fc1f316cb55ad52c67da2ffd8a parent ac354a899b91239aac4d5893fc4288bc400e82b4 author Jes Sorensen Tue, 17 Jan 2006 12:52:21 -0500 committer Tony Luck Tue, 17 Jan 2006 13:53:24 -0800 [IA64-SGI] sn2 mutex conversion Migrate sn2 code to use mutex and completion events rather than semaphores. Signed-off-by: Jes Sorensen Acked-by: Dean Nelson Signed-off-by: Tony Luck commit f404e9a67ffdc0bb0302a5ad1f7eaf58e5a59109 tree 4406dc808ccf1654c3648fcea12e68ff5a56fdee parent a8fc3d8decfd5601fb14a2163952f81fa6b971bb author Kris Katterjohn Tue, 17 Jan 2006 13:04:57 -0800 committer David S. Miller Tue, 17 Jan 2006 13:04:57 -0800 [PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALEN This replaces some tests with is_zero_ether_addr(), memcmp(one, two, 6) with compare_ether_addr(one, two), and 6 with ETH_ALEN where appropriate. Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit a8fc3d8decfd5601fb14a2163952f81fa6b971bb tree 9666ef0fefde06061b0fc3e1a6ef3c1f8e9cfb0a parent ab67a4d511188680beb8a0d82a90f55dbeb53d5c author Kris Katterjohn Tue, 17 Jan 2006 13:03:54 -0800 committer David S. Miller Tue, 17 Jan 2006 13:03:54 -0800 [NET]: "signed long" -> "long" Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit ab67a4d511188680beb8a0d82a90f55dbeb53d5c tree c2a9842b9877df27a50448506c3cfe3a6f00f6df parent ae82af54d73becd66804d942cf39b049e625fa89 author Patrick McHardy Tue, 17 Jan 2006 13:01:31 -0800 committer David S. Miller Tue, 17 Jan 2006 13:01:31 -0800 [EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log} Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae82af54d73becd66804d942cf39b049e625fa89 tree d987461ee9dfbfb963bb96052cf92bca176469ff parent 2f970d83576cf4938fd75551c465050f6a16c33c author Patrick McHardy Tue, 17 Jan 2006 13:01:06 -0800 committer David S. Miller Tue, 17 Jan 2006 13:01:06 -0800 [PKT_SCHED]: Handle SCTP/DCCP in sfq_hash Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a7d1f1b66c05ef4ebb58a34be7caad9af15546a4 tree 10395b7c00460c63576b06e7e252b9de60a2504a parent c4d2444e992c4eda1d7fc3287e93ba58295bf6b9 author Tsutomu Fujii Tue, 17 Jan 2006 11:57:09 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:57:09 -0800 [SCTP]: Fix sctp_rcv_ootb() to handle the last chunk of a packet correctly. Signed-off-by: Tsutomu Fujii Signed-off-by: Sridhar Samudrala commit c4d2444e992c4eda1d7fc3287e93ba58295bf6b9 tree 04f2096c141ede308356bd2d8277d4c291fae24d parent 313e7b4d2588539e388d31c1febd50503a0083fc author Sridhar Samudrala Tue, 17 Jan 2006 11:56:26 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:56:26 -0800 [SCTP]: Fix couple of races between sctp_peeloff() and sctp_rcv(). Validate and update the sk in sctp_rcv() to avoid the race where an assoc/ep could move to a different socket after we get the sk, but before the skb is added to the backlog. Also migrate the skb's in backlog queue to new sk when doing a peeloff. Signed-off-by: Sridhar Samudrala commit 313e7b4d2588539e388d31c1febd50503a0083fc tree aa39d488fbb9f3ad48afdec3ef48b49f6fb4a197 parent 8116ffad4180b39d7a755345c1fde09da83930c0 author Vlad Yasevich Tue, 17 Jan 2006 11:55:57 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:55:57 -0800 [SCTP]: Fix machine check/connection hang on IA64. sctp_unpack_cookie used an on-stack array called digest as a result/out parameter in the call to crypto_hmac. However, hmac code (crypto_hmac_final) assumes that the 'out' argument is in virtual memory (identity mapped region) and can use virt_to_page call on it. This does not work with the on-stack declared digest. The problems observed so far have been: a) incorrect hmac digest b) machine check and hardware reset. Solution is to define the digest in an identity mapped region by kmalloc'ing it. We can do this once as part of the endpoint structure and re-use it when verifying the SCTP cookie. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit 8116ffad4180b39d7a755345c1fde09da83930c0 tree c99ff688ff5a4602c2c8ed52bd2e17d8273e64a6 parent 38b0e42aba928d9929a26ec23b850c36a31fca5f author Vlad Yasevich Tue, 17 Jan 2006 11:55:17 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:55:17 -0800 [SCTP]: Fix bad sysctl formatting of SCTP timeout values on 64-bit m/cs. Change all the structure members that hold jiffies to be of type unsigned long. This also corrects bad sysctl formating on 64 bit architectures. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit 38b0e42aba928d9929a26ec23b850c36a31fca5f tree 934a3678968b7f5f19bf6543f527c0cef39b25c8 parent 49392e5ecf608da6770fd8723b534a0fc851edc4 author Vlad Yasevich Tue, 17 Jan 2006 11:54:06 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:54:06 -0800 [SCTP]: Fix sctp_assoc_seq_show() panics on big-endian systems. This patch corrects the panic by casting the argument to the pointer of correct size. On big-endian systems we ended up loading only 32 bits of data because we are treating the pointer as an int*. By treating this pointer as loff_t*, we'll load the full 64 bits and then let regular integer demotion take place which will give us the correct value. Signed-off-by: Vlad Yaseivch Signed-off-by: Sridhar Samudrala commit 49392e5ecf608da6770fd8723b534a0fc851edc4 tree 9d7484b86d279bee8e5612ce4bf6dae4efc3f1f7 parent 9834a2bb4970547540222fcba04e0a37d04cb0a0 author Vlad Yasevich Tue, 17 Jan 2006 11:53:06 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:53:06 -0800 [SCTP]: sctp doesn't show all associations/endpoints in /proc When creating a very large number of associations (and endpoints), /proc/assocs and /proc/eps will not show all of them. As a result netstat will not show all of the either. This is particularly evident when creating 1000+ associations (or endpoints). As an example with 1500 tcp style associations over loopback, netstat showed 1420 on my system instead of 3000. The reason for this is that the seq_operations start method is invoked multiple times bacause of the amount of data that is provided. The start method always increments the position parameter and since we use the position as the hash bucket id, we end up skipping hash buckets. This patch corrects this situation and get's rid of the silly hash-1 decrement. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit 9834a2bb4970547540222fcba04e0a37d04cb0a0 tree d86a2a4de740c815cead2748952035b1216269ef parent 7a48f923b8b27bfaa5f7b2a449a6fe268724ddd5 author Vlad Yasevich Tue, 17 Jan 2006 11:52:12 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:52:12 -0800 [SCTP]: Fix sctp_cookie alignment in the packet. On 64 bit architectures, sctp_cookie sent as part of INIT-ACK is not aligned on a 64 bit boundry and thus causes unaligned access exceptions. The layout of the cookie prameter is this: |<----- Parameter Header --------------------|<--- Cookie DATA -------- ----------------------------------------------------------------------- | param type (16 bits) | param len (16 bits) | sig [32 bytes] | cookie.. ----------------------------------------------------------------------- The cookie data portion contains 64 bit values on 64 bit architechtures (timeval) that fall on a 32 bit alignment boundry when used as part of the on-wire format, but align correctly when used in internal structures. This patch explicitely pads the on-wire format so that it is properly aligned. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit 7a48f923b8b27bfaa5f7b2a449a6fe268724ddd5 tree 005774759b9f0bba685adc9d9bccbe208a787c2f parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Sridhar Samudrala Tue, 17 Jan 2006 11:51:28 -0800 committer Sridhar Samudrala Tue, 17 Jan 2006 11:51:28 -0800 [SCTP]: Fix potential race condition between sctp_close() and sctp_rcv(). Do not release the reference to association/endpoint if an incoming skb is added to backlog. Instead release it after the chunk is processed in sctp_backlog_rcv(). Signed-off-by: Sridhar Samudrala Signed-off-by: Vlad Yasevich commit ac354a899b91239aac4d5893fc4288bc400e82b4 tree 95f6bd5c6a6a5576beb4d61f23cc8bb753a8cfbc parent 5f7f5b0c99c9c913b649d065a9773e6ed4ed8168 author Mike Habeck Wed, 11 Jan 2006 16:40:24 -0600 committer Tony Luck Tue, 17 Jan 2006 10:22:46 -0800 [IA64-SGI] pass segment# on SN_SAL_IOIF_SLOT_{DIS,EN}ABLE calls Bugfix... the altix SN_SAL_IOIF_SLOT_ENABLE & SN_SAL_IOIF_SLOT_DISABLE SAL calls need to pass the segment# down Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit 5f7f5b0c99c9c913b649d065a9773e6ed4ed8168 tree 60ea9e7eba43503d5b1d3d1a3b557a363d34c810 parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Prarit Bhargava Mon, 16 Jan 2006 15:31:52 -0500 committer Tony Luck Tue, 17 Jan 2006 10:08:37 -0800 [IA64-SGI] Older PROM WAR for device flush code Work-around to temporarily support older PROMs with new flush device code. This code allows systems running older PROMs to continue to run on the new kernel base until a new official PROM is released. Signed-off-by: Prarit Bhargava Acked-by: Jes Sorensen Signed-off-by: Tony Luck commit 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 tree 03bd5a2d64c52dff3c68a66e37f43b4109854170 parent ffa29456cd316a5394cdd489de5af3bf87d3c485 author Alan Cox Mon, 09 Jan 2006 17:18:14 +0000 committer Jeff Garzik Tue, 17 Jan 2006 08:25:39 -0500 [PATCH] libata: add a function to decide if we need iordy This ought to be simple but for PIO2 we have to poke around the drive data to get it 100% correct. Signed-off-by: Jeff Garzik commit ffa29456cd316a5394cdd489de5af3bf87d3c485 tree d051d85afb7337bde4e536b16db0f48becf5692e parent 5a46fe89a73dc984a2b9ef0fde9b9e58bd4ff98f author Alan Cox Mon, 09 Jan 2006 17:14:40 +0000 committer Jeff Garzik Tue, 17 Jan 2006 08:25:39 -0500 [PATCH] libata: Pre UDMA EIDE PIO mode selection I misread the spec when doing the original. I've tested the corrected version with pre UDMA drives and it now picks the right modes. This is a specific bug fix rather than an update or new feature item. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 5a46fe89a73dc984a2b9ef0fde9b9e58bd4ff98f tree 71e4811ed304d8c8db4f82bbc0d2fd51f71a2285 parent 88b52877fa1a8894600362a5c9addbab1fcf8b54 author Yusuf Iskenderoglu Tue, 17 Jan 2006 08:06:21 -0500 committer Jeff Garzik Tue, 17 Jan 2006 08:06:21 -0500 [libata] sata_promise: add pci id commit 2610c733023850be2db9fef9c81f851a64bb9f67 tree 62db077203a86e8b67cde10941f7034caed02c4e parent 38bd3b2629702894ca3528358ffc447bbacc9442 author Javier Achirica Tue, 17 Jan 2006 08:01:01 -0500 committer Jeff Garzik Tue, 17 Jan 2006 08:01:01 -0500 airo: Off-by-one channel fix commit 88b52877fa1a8894600362a5c9addbab1fcf8b54 tree 24522f6a3de5455c8e4730223c8a857822f62db5 parent f285757cab254470a10f711cd3cbaf9d92f7aa06 author Oliver Weihe Tue, 17 Jan 2006 07:58:42 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:58:42 -0500 [libata] sata_svw: add pci id commit f285757cab254470a10f711cd3cbaf9d92f7aa06 tree ad439542415d3b9118ae266f56319fd9ef1b3145 parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Jason Gaston Mon, 09 Jan 2006 11:09:13 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:54:42 -0500 [PATCH] ahci: AHCI mode SATA patch for Intel ICH8 This patch adds the Intel ICH8 DID's to the ahci.c file for AHCI mode SATA support. Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit 38bd3b2629702894ca3528358ffc447bbacc9442 tree a07e27fcd3fcc94dfb9fd6b204cc670f7d3b7ff6 parent 8241e35e0c6ae7531fe270de34608edfdc2ea483 author Jeff Kirsher Thu, 12 Jan 2006 16:51:37 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:04 -0500 [PATCH] e1000: Removed unused variables and initialized variables Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 8241e35e0c6ae7531fe270de34608edfdc2ea483 tree 9a87f5b49d41f3b37c6ae643fc5e3111ace5afde parent a292ca6efbc1f259ddfb9c902367f2588e0e8b0f author Jeff Kirsher Thu, 12 Jan 2006 16:51:34 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:03 -0500 [PATCH] e1000: Cleaned up code and removed hard coded numbers Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a292ca6efbc1f259ddfb9c902367f2588e0e8b0f tree 02d26f87e4b3931c54923c5f97557eae0eff39f0 parent 240b1710f56b359685bc698e2a1473a2f3f2b8d7 author Jeff Kirsher Thu, 12 Jan 2006 16:51:30 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:03 -0500 [PATCH] e1000: Added copy break code Improves small packet performance with large amounts of reassembly being done in the stack. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 240b1710f56b359685bc698e2a1473a2f3f2b8d7 tree 150d74c7d736bde01f18edfee510cbe868f4fb87 parent fb3d47d4c4cd79eeddd0ee1b470e157840dccf21 author Jeff Kirsher Thu, 12 Jan 2006 16:51:28 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added variable to handle return values for pci_enable_* functions This was to fix compilation warnings. Also added log messages when pci_enable_* functions return with an error. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit fb3d47d4c4cd79eeddd0ee1b470e157840dccf21 tree 7328582b0ce82e9956b8fda1a129c6f6a335c368 parent a2917e22dcaa53e8ad2d8dc3bcfa55a4b04e6d0f author Jeff Kirsher Thu, 12 Jan 2006 16:51:25 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added PCIe bus information This is two patches, the first is adding additional bus information for the 8257{1|2|3} controllers. The second patch was orginally a community patch to print bus type/speed/width, and enhanced by us. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a2917e22dcaa53e8ad2d8dc3bcfa55a4b04e6d0f tree 75114ad5813ca2eb417bbeb602ba66329832cf47 parent b7ee49db8b4b21dad3284d5507e7ea2946031f6e author Jeff Kirsher Thu, 12 Jan 2006 16:51:23 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added firmware version reporting for 8257{1|2|3} controllers The EEPROM image version is reported as a firmware version for these controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b7ee49db8b4b21dad3284d5507e7ea2946031f6e tree 1608149c1afea7bb19888664f89d18c14e0d1e88 parent 72d64a436724da72f876c85a73895a622da6a673 author Jeff Kirsher Thu, 12 Jan 2006 16:51:21 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added hardware support for PCI express, 82546GB, and 82571 Fiber Added 82571 fiber to WOL fix for dual port adapters. Added support for 82546GB (Quad Copper). Added PCIe typedef for x2, igp cable length 115, and extended TX CTRL registers. Added parity error detection and PCIe CTRL registers. Added EEPROM config registers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 72d64a436724da72f876c85a73895a622da6a673 tree c59dde1b1c116036dfd4400b35df002549e4c9ec parent 1e613fd9d64aba9945ddb3b7f1107127ee8a9835 author Jeff Kirsher Thu, 12 Jan 2006 16:51:19 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Added cleaned_count to RX buffer allocation Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 1e613fd9d64aba9945ddb3b7f1107127ee8a9835 tree aa6de84f7790d96daffcb20a6ffc22ee498db724 parent e8da8be146e6043fb4b60a222be0014a0fb46d24 author Jeff Kirsher Thu, 12 Jan 2006 16:51:16 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Added interrupt auto mask support Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit e8da8be146e6043fb4b60a222be0014a0fb46d24 tree 7d0a184d6a1f02ad770e53034281cd15516cc46b parent ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799 author Jeff Kirsher Thu, 12 Jan 2006 16:51:14 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Fix Netpoll issue Fixed an issue netpoll would error out during communication, generating the following error: --netdump[14973]: Got toomany timeouts in handshaking, ... Even after a kernel panic, netpoll requires two way communication to successfully transfer the crash log to the remote server. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799 tree 16f6e2b774929766aafe834f1749a5c9805fd774 parent ff14701350eef6df9b7fc0ae118e1689e141a54c author Jeff Kirsher Thu, 12 Jan 2006 16:51:12 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Fixed frame size logic Simplified the logic used to assign the frame_size. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ff14701350eef6df9b7fc0ae118e1689e141a54c tree 2c49417d650df54c2ce85d06fd4983df13ae1493 parent d74bbd3bbfd70470446e0d8153f91967d53c0798 author Jeff Kirsher Thu, 12 Jan 2006 16:51:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:02 -0500 [PATCH] e1000: Fix VLAN support Fixed VLAN support by switching control over to the firmware. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d74bbd3bbfd70470446e0d8153f91967d53c0798 tree d09f79b0d7d4c3e63f9dbe038a5f3bdd9a091d84 parent 0fadb0597d240d4ed279042cab632d567510a1a3 author Jeff Kirsher Thu, 12 Jan 2006 16:51:07 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:02 -0500 [PATCH] e1000: Fix __pskb_pull_tail Fixed by moving code to correct location (for 82572 and 82571 controllers). Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 0fadb0597d240d4ed279042cab632d567510a1a3 tree 83786788f8bf5ef24b3b2cc871b84030c4d59fdf parent 47028635d17c7b9c7ffc67499be5fed579bdfe72 author Jeff Kirsher Thu, 12 Jan 2006 16:51:05 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix collision distance Fixed the collision distance for 82543 controllers and newer. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 47028635d17c7b9c7ffc67499be5fed579bdfe72 tree 0ac186eda8ed3530f05af8323b06190b1bccf1a8 parent f5645110aa2ed2dcc3e0373821474506ed4dc512 author Jeff Kirsher Thu, 12 Jan 2006 16:51:03 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix bit 22 (TXDCTL) for 82571 & 82572 controllers Removed duplicate code, TXDCTL and TXDCTL_COUNT_DESC are the same bit and there is no need to set it twice. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f5645110aa2ed2dcc3e0373821474506ed4dc512 tree 9f613bb98018b7cb86df4f023ffa1dd77d659fd6 parent 392137fa9b966cf03f020f9a9a2619099b996266 author Jeff Kirsher Thu, 12 Jan 2006 16:51:01 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix desc. clean up These were two separate community submitted patches. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 392137fa9b966cf03f020f9a9a2619099b996266 tree 4afd28f3f674919ec8b799740ebf39aae620e32d parent 997f5cbdded3d8282dc56b741d332e51014ea64b author Jeff Kirsher Thu, 12 Jan 2006 16:50:57 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix TX timeout logic Fixed the TX timeout logic to use "end of packet" rather than "next to clean". Updated message log. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 997f5cbdded3d8282dc56b741d332e51014ea64b tree e542e0cc14bba8ed70f52933bdd2dd6b76a94ced parent 66a2b0a30fcc37876d3639ea375a9d24649b53bf author Jeff Kirsher Thu, 12 Jan 2006 16:50:55 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix Desc. Rings and Jumbo Frames This patch contains two fixes. The first fix is to the tx and rx descriptor rings clean up process. The second fix is to jumbo frames, which cleans up the code logic and removes most of the fifo related limitations on jumbo frames. This is because the driver code now supports splitting a packet across multiple descriptors. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 66a2b0a30fcc37876d3639ea375a9d24649b53bf tree dab5bdcbf8d2db73cc22b1030bb679ad81eeffb9 parent f11b7f8535fab0f9196a7387e93dca5deaa5fff2 author Jeff Kirsher Thu, 12 Jan 2006 16:50:53 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix TX queue length based on link speed 10/100 speeds seem to have some problems reporting false tx timeouts especially at half duplex. Fixed by using a timeout factor to attempt to mitigate the false timeouts. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f11b7f8535fab0f9196a7387e93dca5deaa5fff2 tree ff4f599bb8d8a7abd6d97d78756a9376f1bf8947 parent 4d351858e41145fa236730b7749e3aed18edef43 author Jeff Kirsher Thu, 12 Jan 2006 16:50:51 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix flow control water marks Fixed flow control water marks based on PBA size. Store flow control state in original_fc in addition to fc. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4d351858e41145fa236730b7749e3aed18edef43 tree ecab4b750bc11feadcd5400bdbd516d0aa5a5c6b parent 526f99572e9f18f42c8da2c9adafbe64482c0737 author Jeff Kirsher Thu, 12 Jan 2006 16:50:48 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix EEPROM read logic Fixed read_eeprom logic to test use_eerd instead of testing for 82573 controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 526f99572e9f18f42c8da2c9adafbe64482c0737 tree b6b76704aa4ca03d3b66eaedb34b3d77237dc7a0 parent 492731632cce0a7c8817376e1316f0af093830c4 author Jeff Kirsher Thu, 12 Jan 2006 16:50:46 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:49 -0500 [PATCH] e1000: Fix PHY reset when blocked Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 492731632cce0a7c8817376e1316f0af093830c4 tree 2b823e84446b2812067d4c47a62c8361bb7d8d84 parent 7bfa48162d4924e8cc7fb8eccc8c8f66cc111eb4 author Jeff Kirsher Thu, 12 Jan 2006 16:50:44 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:49 -0500 [PATCH] e1000: Fix loopback logic Fixed the loopback logic to work for the PCI express adapters. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7bfa48162d4924e8cc7fb8eccc8c8f66cc111eb4 tree 906365b7e1c17f15fa470dbad448cafa3310f011 parent f56799ea39a85a6f3760a134aa0e6d1c17eea369 author Jeff Kirsher Thu, 12 Jan 2006 16:50:41 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix mulitple queues Fixed stats when using multiple queues. When multiple queues are enabled, log a message in syslog. Fixed memory allocation for multiple queues. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f56799ea39a85a6f3760a134aa0e6d1c17eea369 tree 5d7ed643eb04aed2a7d5c129dd997e1f7d3cf76c parent d8c2bd3d3aa49e18ffebb999979b976f04280284 author Jeff Kirsher Thu, 12 Jan 2006 16:50:39 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix adapter structure and prepare for multique fix Fix adapter structure to handle multiple queues and prepping the driver for full multiple queue support, some changes are ifdef'd our unless you define CONFIG_E1000_MQ. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d8c2bd3d3aa49e18ffebb999979b976f04280284 tree a188305d413f0a54d1708a78c959fc45295cda2d parent 6b7660cd4df23ee92ddc0ba4b4ec31e3adee7bc9 author Jeff Kirsher Thu, 12 Jan 2006 16:50:37 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix LED functionality for 82573 Fixed adapter identification issue. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 6b7660cd4df23ee92ddc0ba4b4ec31e3adee7bc9 tree 624a74e76fa9d5fdcc3f6c9142148cfaafc9a01d parent 7892f59c5ea86115450293441ca10654168e00da author Jeff Kirsher Thu, 12 Jan 2006 16:50:35 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] Fix e1000 stats Updated the e1000_stats structure and removed mpx for rx_errors and rx_dropped. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7892f59c5ea86115450293441ca10654168e00da tree 8bb3ee008714f43f1c3542335e2d4ac44032d9ea parent b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 author Jeff Kirsher Thu, 12 Jan 2006 16:50:32 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix PHY config for 82573 controller Added a delay to allow PHY configuration to complete before accessing NVM. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 tree 838628fd9bfbfc60f84f251fddd56edf6906b9a0 parent 571281972e2ca590ef160dcd6669b9f724b64283 author Jeff Kirsher Thu, 12 Jan 2006 16:50:30 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix ASF/AMT for 8257{1|2|3} controllers The 82573 controller required different logic than 82571|2 controllers. Corrected the reset logic for 8257{1|2|3} controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 571281972e2ca590ef160dcd6669b9f724b64283 tree cdb4f140fee6c924257ea52d40c56c031101d018 parent 545c67c0a3550545fe50d28c874b0664bc5dc882 author Jeff Kirsher Thu, 12 Jan 2006 16:50:28 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix SoL/IDER link and loopback Fix so that if a SoL/IDER session is active, do not allow operations which require a PHY reset and instead log a message. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 545c67c0a3550545fe50d28c874b0664bc5dc882 tree e0ffa97a1137bccbdd0574434bf481cb6e52a56d parent 9a3056da0d7fde1e19e806824c41857b239954ed author Jeff Kirsher Thu, 12 Jan 2006 16:50:25 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: General Fixes These fixes update the TX and RX ring structures. Prepare driver for up-coming fixes. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9a3056da0d7fde1e19e806824c41857b239954ed tree a416cf97788135fa3635a78c9c55f0624a10f837 parent 4ee9c02007249cf9c66e368b5d433c6956e05586 author Jeff Kirsher Thu, 12 Jan 2006 16:50:23 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix TSO Fixed the TSO workaround for 82571/2 controllers. Fixed TSO issue where a non-tso packet in a linear SKB which followed a TSO packet would get written back prematurely. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4ee9c02007249cf9c66e368b5d433c6956e05586 tree b11e5a80e6528e5e810726761347e6d68a34dc83 parent 7c5c220e254b2cdcf7083dcaf445820b899f7e8b author Jeff Kirsher Thu, 12 Jan 2006 16:50:18 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:09 -0500 [PATCH] e1000: Fix jumbo frame performance Partition PBA for Jumbo frames based on MTU size. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7c5c220e254b2cdcf7083dcaf445820b899f7e8b tree 80a5f7527129299ef29911fde0a1ad87cde63759 parent 11f1a52b87eaf830bd03d4e01d563437c30f7728 author Arnd Bergmann Thu, 12 Jan 2006 17:16:45 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:01 -0500 [PATCH] spidernet: fix missing include This is now required to avoid drivers/net/spider_net.c:844: error: 'IPPROTO_TCP' undeclared Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 11f1a52b87eaf830bd03d4e01d563437c30f7728 tree f251162b093f1ac7153d17de8d046f16f3e2e17e parent 8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 author Arnd Bergmann Thu, 12 Jan 2006 17:16:44 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:01 -0500 [PATCH] spidernet: performance optimizations Performance optimizations, changes in these areas: - RX and TX checksum offload - correct maximum MTU - don't use TX interrupts anymore, use a timer instead - remove some superfluous barriers - improve RX RAM full handling From: Utz Bacher Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 tree 76964e5d482023c895487a7392a3e3e18d7dc599 parent 030d6753f8b6251927330431a7e5f0ac86bc6da9 author Arnd Bergmann Thu, 12 Jan 2006 17:16:43 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: fix HW structures for 64 bit dma_addr_t The driver incorrectly used dma_addr_t to describe HW structures and consequently broke when that type was changed in 2.6.15-rc. This changed spidernet to use u32 for 32 bit HW defined structure elements. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 030d6753f8b6251927330431a7e5f0ac86bc6da9 tree 12cab3e13f51b63ced212d2ac909c42ca8c10857 parent 0d3ea1666f1894a874681fe33e2cb7fee41a0c73 author Arnd Bergmann Thu, 12 Jan 2006 17:16:42 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: read firmware from the OF device tree request_firmware() is sometimes problematic, especially in initramfs, reading the firmware from Open Firmware is much preferrable. We still try to get the firmware from the file system first, in order to support old SLOF releases and to allow updates of the spidernet firmware without reflashing the system. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 0d3ea1666f1894a874681fe33e2cb7fee41a0c73 tree 6a206ebf46fe622ae6d06923c92b8a737f63ce86 parent c2e5b352fcefb644959a0c8b1bb2e297f0d4ac3d author Arnd Bergmann Thu, 12 Jan 2006 17:16:41 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: check if firmware was loaded correctly Uploading the device firmware may fail if wrong input data was provided by the user. This checks for the condition. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit c2e5b352fcefb644959a0c8b1bb2e297f0d4ac3d tree 65972fbb796b4f08e66600faf53e7046fcb0702c parent ab4384a6588925607f734e195f49e34a80f31e84 author Dale Farnsworth Mon, 16 Jan 2006 17:00:24 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:39 -0500 [PATCH] mv643xx_eth: Remove needless mask of extended intr register All interrupts controlled by the extended mask register are also masked by a bit in the main mask register, so there is no need to directly manipulate the extended mask register. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 81 ++++++++++++++++++---------------------------------------- 1 file changed, 26 insertions(+), 55 deletions(-) Signed-off-by: Jeff Garzik commit ab4384a6588925607f734e195f49e34a80f31e84 tree e0fc58cb591c725a4e7a2437099af4eb1febf280 parent 4476e0e4c7e6a2c22288391b853b6e071622f079 author Dale Farnsworth Mon, 16 Jan 2006 16:59:21 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Merge open and stop helper functions Move code from helper functions mv643xx_eth_real_open and mv643xx_eth_real_stop as they are no longer needed. Signed-off-by Dale Farnsworth mv643xx_eth.c | 109 +++++++++++++++++++++++----------------------------------- 1 file changed, 45 insertions(+), 64 deletions(-) Signed-off-by: Jeff Garzik commit 4476e0e4c7e6a2c22288391b853b6e071622f079 tree e51ce4e1b1b50ea539ff179ccff3a4fffceae7bb parent 63890576a3bfd5c6aea86fb72236682480865bc0 author Dale Farnsworth Mon, 16 Jan 2006 16:58:24 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Fix transmit skb accounting Signed-off-by: Dale Farnsworth mv643xx_eth.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik commit 63890576a3bfd5c6aea86fb72236682480865bc0 tree 1d9142884b2d831b7f9b55714baa110457e35710 parent 8f5187035ad475c90ca865318daa09ba43bc3e68 author Wolfram Joost Mon, 16 Jan 2006 16:57:41 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Request HW checksum generation only for IPv4 This patch removes the NETIF_F_HW_CSUM flag to be able to use other protocols than IPv4. Hardware checksums for IPv4 should continue to work because NETIF_F_IP_CSUM is still set. The sanity-check has been enhanced to check the used protocol and to not access skb->iph for non-ipv4-packets. Signed-off-by: Wolfram Joost Signed-off-by: Dale Farnsworth mv643xx_eth.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) Signed-off-by: Jeff Garzik commit 8f5187035ad475c90ca865318daa09ba43bc3e68 tree 43b304d094d8fec20a2589239f56ff31bc4aa8d1 parent dd09b1de08b28ccfb130ca97d617dc3283165d22 author Dale Farnsworth Mon, 16 Jan 2006 16:56:30 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Hold spinlocks only where needed This driver has historically held a spin_lock during the entire open and stop functions and while receiving multiple packets. This is unecessarily long and holds locks during calls that may sleep. This patch reduces the size of windows where locks are held. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 172 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 91 insertions(+), 81 deletions(-) Signed-off-by: Jeff Garzik commit dd09b1de08b28ccfb130ca97d617dc3283165d22 tree de89ba2464dc96d991e982182d4db6c3ce872c70 parent f7ea333765438232ac346a2f23cfec3e2012758f author Dale Farnsworth Mon, 16 Jan 2006 16:53:15 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: iounmap the correct SRAM buffer Signed-off-by: Dale Farnsworth mv643xx_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit f7ea333765438232ac346a2f23cfec3e2012758f tree 9a1f685e3220e9b6b4170586e7f4b4d19fc6e753 parent b44cd572623cb6a931a947d9108595517fd945f8 author Paul Janzen Mon, 16 Jan 2006 16:52:13 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Fix handling of small, unaligned fragments Fix handling of small, unaligned fragments. It also solves a potential deadlock if skb_linearize() returns -ENOMEM. Signed-off-by: Paul Janzen Signed-off-by: Dale Farnsworth mv643xx_eth.c | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) Signed-off-by: Jeff Garzik commit b44cd572623cb6a931a947d9108595517fd945f8 tree fc4a28e35531ad9bc3596b262ad834aff82d4662 parent 16e0301831767ee1b8e5e022cc08e76f9f8a8938 author Dale Farnsworth Mon, 16 Jan 2006 16:51:22 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Receive buffers require 8 byte alignment The Marvell mv643xx ethernet hardware requires that DMA buffers be aligned to 8-byte boundaries. This patch satisfies this requirement. Buffers allocated by dev_alloc_skb() only have 4-byte alignment when slab debugging is enabled. Also, document that the 2-byte offset to align the IP packets on receive is a hardware feature and is not tied to NET_IP_ALIGN. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik commit 16e0301831767ee1b8e5e022cc08e76f9f8a8938 tree 3562f2195c66c8486b83b960e20e67b62054e01e parent 4eaa3cb35b22cccc53846ce2820e244b1fb04f0b author Dale Farnsworth Mon, 16 Jan 2006 16:50:02 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Add multicast support This code is adapted from code in a ppc-specific version of the driver. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 197 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 4eaa3cb35b22cccc53846ce2820e244b1fb04f0b tree 65aa1145fbf4eed0700ced76dd9a6e9b6a3dfbb2 parent cb415d30048f0c1f80fd2f5340a982e8c9617d0d author Paolo Galtieri Mon, 16 Jan 2006 16:48:58 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Fix a NULL pointer dereference Fix a NULL pointer dereference. Fill in the buf_ptr and byte_cnt fields of pkt_info in eth_tx_return_desc(). Signed-off-by: Paolo Galtieri Signed-off-by: Dale Farnsworth mv643xx_eth.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) Signed-off-by: Jeff Garzik commit cb415d30048f0c1f80fd2f5340a982e8c9617d0d tree 652413a7b26def01c70e1c5296822b0258c54475 parent 78a5e534758349fd3effc90ce1152b55368f52ee author Paolo Galtieri Mon, 16 Jan 2006 16:48:02 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: Fix dma_map/dma_unmap relations If you do a dma_map_single you must do dma_unmap_single and if you do a dma_map_page you must do a dma_unmap_page. Signed-off-by: Paolo Galtieri Signed-off-by: Dale Farnsworth mv643xx_eth.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) Signed-off-by: Jeff Garzik commit 78a5e534758349fd3effc90ce1152b55368f52ee tree 7aab67ad32e58e8f87eb69a93e17958a2e6c7774 parent b60d6975e80ac69e4b797173857eeb5362e265a2 author Olaf Hering Mon, 16 Jan 2006 16:47:00 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: 2.6.16 needs ip.h and in.h Signed-off-by: Olaf Hering Signed-off-by: Dale Farnsworth mv643xx_eth.c | 2 ++ 1 file changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit b60d6975e80ac69e4b797173857eeb5362e265a2 tree cde2a625c95c05e7d9734db4de2933218b45ffbf parent 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 author Dale Farnsworth Mon, 16 Jan 2006 16:45:45 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: Add Dale Farnsworth as a maintainer MAINTAINERS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 tree 4135d9bb556c42359a955e72eb20ff745d9b58bf parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 parent 5fad5a2e1f34b333a801b749c4e143c2ac3e8a4f author Jeff Garzik Tue, 17 Jan 2006 07:22:26 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:22:26 -0500 Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6 commit 2f970d83576cf4938fd75551c465050f6a16c33c tree 7bb43aabfbd8afdab49549e4d56c0a15015d5995 parent 8243126c5e29030bf1a3fb75187a513966dcba62 author Eric Dumazet Tue, 17 Jan 2006 02:54:36 -0800 committer David S. Miller Tue, 17 Jan 2006 02:54:36 -0800 [IPV4]: rt_cache_stat can be statically defined Using __get_cpu_var(obj) is slightly faster than per_cpu_ptr(obj, raw_smp_processor_id()). 1) Smaller code and memory use For static and small objects, DEFINE_PER_CPU(type, object) is preferred over a alloc_percpu() : Better and smaller code to access them, and no extra memory (storing the pointer, and the percpu array of pointers) x86_64 code before patch mov 1237577(%rip),%rax # ffffffff803e5990 not %rax # part of per_cpu machinery mov %gs:0x3c,%edx # get cpu number movslq %edx,%rdx # extend 32 bits cpu number to 64 bits mov (%rax,%rdx,8),%rax # get the pointer for this cpu incl 0x38(%rax) x86_64 code after patch mov $per_cpu__rt_cache_stat,%rdx mov %gs:0x48,%rax # get percpu data offset incl 0x38(%rax,%rdx,1) 2) False sharing avoidance for SMP : For a small NR_CPUS, the array of per cpu pointers allocated in alloc_percpu() can be <= 32 bytes. This let slab code gives a part of a cache line. If the other part of this 64 bytes (or 128 bytes) cache line is used by a mostly written object, we can have false sharing and expensive per_cpu_ptr() operations. Size of rt_cache_stat is 64 bytes, so this patch is not a danger of a too big increase of bss (in UP mode) or static per_cpu data for SMP (PERCPU_ENOUGH_ROOM is currently 32768 bytes) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8243126c5e29030bf1a3fb75187a513966dcba62 tree 39750d44770efcdac150f041f71b7272c8da20f9 parent f09484ff87f677056ce631aa3d8e486861501b51 author David S. Miller Tue, 17 Jan 2006 02:54:21 -0800 committer David S. Miller Tue, 17 Jan 2006 02:54:21 -0800 [NET]: Make second arg to skb_reserved() signed. Some subsystems, such as PPP, can send negative values here. It just happened to work correctly on 32-bit with an unsigned value, but on 64-bit this explodes. Figured out by Paul Mackerras based upon several PPP crash reports. Signed-off-by: David S. Miller commit f09484ff87f677056ce631aa3d8e486861501b51 tree 9c9d208a5e4f2d359087e3e9b00d7b00b4a2ec93 parent ec41c7dfd525468decb9da9281dbc9ed82d98c98 author David S. Miller Tue, 17 Jan 2006 02:42:02 -0800 committer David S. Miller Tue, 17 Jan 2006 02:42:02 -0800 [NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.h Signed-off-by: David S. Miller commit ec41c7dfd525468decb9da9281dbc9ed82d98c98 tree 02ac7f0b1318c69d53a2405972f8a6880dc8b7c6 parent f0daaa654af68c1651add9d21188d81c19672551 author Michael Chan Tue, 17 Jan 2006 02:40:55 -0800 committer David S. Miller Tue, 17 Jan 2006 02:40:55 -0800 [TG3]: Refine nvram locking Add nvram lock count so that calls to tg3_nvram_lock()/unlock() can be nested. Add error checking to all callers of tg3_nvram_lock() where appropriate. To prevent nvram lock failures after halting the firmware, it is also necessary to release firmware's nvram lock in tg3_halt_cpu(). Update version to 3.48. Based on David Miller's initial patch. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f0daaa654af68c1651add9d21188d81c19672551 tree 50eebd2b494c15498c96a82bdaf5315b39b0e0fa parent e0069caede8387c585060b7e2e87729e9efcebc6 author Yasuyuki Kozakai Tue, 17 Jan 2006 02:39:39 -0800 committer David S. Miller Tue, 17 Jan 2006 02:39:39 -0800 [NETFILTER] ip6tables: whitespace and indent cosmetic cleanup Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e0069caede8387c585060b7e2e87729e9efcebc6 tree dec3b2bd98aa2081519a370569c70640592c0909 parent 6dd42af7904336c6f59a01f9fd3599ee650e78ed author Yasuyuki Kozakai Tue, 17 Jan 2006 02:39:19 -0800 committer David S. Miller Tue, 17 Jan 2006 02:39:19 -0800 [NETFILTER] ip6tables: remove unused definitions These definitions ware used for only internal use in kernel <= 2.6.13, which had not introduced the unified parser of IPv6 extension header yet. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 6dd42af7904336c6f59a01f9fd3599ee650e78ed tree b8688c0fc87a67352a26f4772f02c2232a7bafc5 parent ccc91324a1b44d345ab4f814eb2ff453c7e98f9e author Yasuyuki Kozakai Tue, 17 Jan 2006 02:38:56 -0800 committer David S. Miller Tue, 17 Jan 2006 02:38:56 -0800 [NETFILTER] Makefile cleanup These are replaced with x_tables matches and no longer exist. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ccc91324a1b44d345ab4f814eb2ff453c7e98f9e tree 24ac07d2a014a5f6b8dcc685fb76afea1048485d parent e35bedf369b17120dbd7d554bee45407a3825267 author Benoit Boissinot Tue, 17 Jan 2006 02:26:34 -0800 committer David S. Miller Tue, 17 Jan 2006 02:26:34 -0800 [NETFILTER] ip[6]t_policy: Fix compilation warnings ip[6]t_policy argument conversion slipped when merging with x_tables Signed-off-by: Benoit Boissinot Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e35bedf369b17120dbd7d554bee45407a3825267 tree 5ac5aa1c71c0e2d349a13b9103147c0346129326 parent dd914b4082cfbe28849898a0a98757827829c813 author Kris Katterjohn Tue, 17 Jan 2006 02:25:52 -0800 committer David S. Miller Tue, 17 Jan 2006 02:25:52 -0800 [NET]: Fix whitespace issues in net/core/filter.c This fixes some whitespace issues in net/core/filter.c Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit dd914b4082cfbe28849898a0a98757827829c813 tree b1a022975ab230e9496fdcddbb057f0b0b0d7e41 parent 9343e79a7bb2d3268d68997163608b87d58d8098 author Amnon Aaronsohn Tue, 17 Jan 2006 02:24:26 -0800 committer David S. Miller Tue, 17 Jan 2006 02:24:26 -0800 [PKT_SCHED] sch_prio: fix qdisc bands init Currently when PRIO is configured to use N bands, it lets the packets be directed to any of the bands 0..N-1. However, PRIO attaches a fifo qdisc only to the bands that appear in the priomap; the rest of the N bands remain with a noop qdisc attached. This patch changes PRIO's behavior so that it attaches a fifo qdisc to all of the N bands. Signed-off-by: Amnon Aaronsohn Signed-off-by: David S. Miller commit 9343e79a7bb2d3268d68997163608b87d58d8098 tree 1016bc38ce877e988e26ec644a48e73cc1c1545d parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author YOSHIFUJI Hideaki Tue, 17 Jan 2006 02:10:53 -0800 committer David S. Miller Tue, 17 Jan 2006 02:10:53 -0800 [IPV6]: Preserve procfs IPV6 address output format Procfs always output IPV6 addresses without the colon characters, and we cannot change that. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 5fad5a2e1f34b333a801b749c4e143c2ac3e8a4f tree 6f54bc291ad4ea7b5e892ea1ebbb3f3fec48616e parent 8aec938389d8409d5d036131c0d16c8b6748703f author Adrian Bunk Sat, 14 Jan 2006 03:09:34 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:54 -0500 [PATCH] hostap: don't #include C files in hostap_main.c This patch contains an attempt to properly build hostap.o without #include'ing C files. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit 8aec938389d8409d5d036131c0d16c8b6748703f tree 246dcce1c4d889fd5784f1e8e758b7213a76262e parent d6a13a24b76236ade7fd70081ba41a51e8215578 author Adrian Bunk Sat, 14 Jan 2006 16:20:53 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:54 -0500 [PATCH] ipw2100: remove code for WIRELESS_EXT < 18 WIRELESS_EXT < 18 will never be true in the kernel. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit d6a13a24b76236ade7fd70081ba41a51e8215578 tree 85c495d422a6e152789108b8623245886afcd554 parent a485cde662f5b6b2299ee01a7e9e2c11683f807b author Dan Williams Thu, 12 Jan 2006 15:00:58 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] drivers/net/wireless: correct reported ssid lengths ESSIDs can technically include NULL characters. Drivers should not be adjusting the length of the ESSID before reporting it in their SIOCGIWESSID handlers. Breaks stuff like wpa_supplicant. Note that ipw drivers, which seem to currently be the "most correct", don't have this problem. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit a485cde662f5b6b2299ee01a7e9e2c11683f807b tree 359f04714e13c7010fa0f63d6968211d658c3af7 parent d834a41c966c6a20368fadb59248740935e6fbae author Pavel Roskin Fri, 30 Dec 2005 18:22:26 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] hostap: allow flashing firmware Host AP driver has code to support writing firmware to non-volatile memory, a.k.a. flash. This code has been extensively tested when Host AP was a standalone driver. Add a configuration option to the kernel to allow enabling this functionality. Improve the description of the RAM download option. Mention cards that require it. Remove obsolete scary comment. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d834a41c966c6a20368fadb59248740935e6fbae tree 53163530c274c0f9b7eeed35e0fd9564f48a7192 parent 0b8d3256a0c1d75bbe8ef5b0de64843e3fc9f47b author Olaf Kirch Mon, 09 Jan 2006 17:00:37 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] ipw2200: do not sleep in ipw_request_direct_scan Drivers should not sleep for very long inside an ioctl - so return EAGAIN and let wpa_supplicant handle the problem. Signed-off-by: Olaf Kirch Signed-off-by: John W. Linville commit 0b8d3256a0c1d75bbe8ef5b0de64843e3fc9f47b tree 2bb5a1943f7b3a7898b92b68e17d03648feb31b9 parent caa06b619f20f21c741e0d7457a0ef633d50ba70 author Pete Zaitcev Thu, 12 Jan 2006 22:17:43 -0800 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] iw_handler.h: SIOCSIWNAME -> SIOCSIWCOMMIT in comment The ioctl was renamed from SIOCSIWNAME to SIOCSIWCOMMIT. Signed-off-by: Pete Zaitcev Signed-off-by: John W. Linville commit caa06b619f20f21c741e0d7457a0ef633d50ba70 tree 7763fee18e161586d292de72e95ac23a3623df0e parent 4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d author Graham Gower Mon, 16 Jan 2006 16:41:37 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] prism54/islpci_eth.c: dev_kfree_skb used with interrupts disabled dev_kfree_skb should not be used with interrupts disabled. Change to use dev_kfree_skb_irq instead. Signed-off-by: Graham Gower Signed-off-by: John W. Linville commit eeac8047fcf4c659eb15f2e27a0ef4aeba64157f tree 91b1e32bb9f2d6f9e9a122bd5e737df40701ab11 parent 84153973a29dfb3f3d9fe2fe75c2cd613a3cdf27 author Steve French Fri, 13 Jan 2006 21:34:58 -0800 committer Steve French Fri, 13 Jan 2006 21:34:58 -0800 [CIFS] Fix CIFS to recognize share mode security Fix Samba bugzilla bug 3301 In share mode encrypted password must be sent on tree connection (in our case only the NTLM password is sent, not the older LANMAN one). Signed-off-by: Steve French commit 84153973a29dfb3f3d9fe2fe75c2cd613a3cdf27 tree 37f89bc8a37ebdf0934f6590d10f9300b5075273 parent 0a4b92c05ed02ad7abdd165823eaf4bbcb33ae5c author Steve French Thu, 12 Jan 2006 20:57:56 -0800 committer Steve French Thu, 12 Jan 2006 20:57:56 -0800 [CIFS] Fix typo Signed-off-by: Steve French commit 0a4b92c05ed02ad7abdd165823eaf4bbcb33ae5c tree b9f82422eaa28c88edc6b92e55d9ff57939b865f parent 94bc2be31a01a3055ec94176e595dfe208e92d3b author Steve French Thu, 12 Jan 2006 15:44:21 -0800 committer Steve French Thu, 12 Jan 2006 15:44:21 -0800 [CIFS] Add worker function for Get ACL cifs style Signed-off-by: Steve French commit 94bc2be31a01a3055ec94176e595dfe208e92d3b tree ebfbe81c6718a6390bfa1b99c6d228237d818576 parent c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 parent 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 author Steve French Thu, 12 Jan 2006 14:47:08 -0800 committer Steve French Thu, 12 Jan 2006 14:47:08 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git Signed-off-by: Steve French commit c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 tree 97addaf85d16d817d4a51d5d04d4e8ceb1edfe17 parent f3f6ec4b77f627a6427460d6f8884e1042eef134 author Steve French Thu, 12 Jan 2006 14:41:28 -0800 committer Steve French Thu, 12 Jan 2006 14:41:28 -0800 [CIFS] Allow local filesize for file that is open for write to be updated from server when mount forcedirectio. Allowing update of file size with non forcedirectio mounts should be allowed in the fiture but requires carefully writing out the last page in the local file if it is a partial page in order to avoid corruption and careful serialization Thanks to Maximiliano Curia who suggested similar changes and provided a testcase. Signed-off-by: Steve French commit f3f6ec4b77f627a6427460d6f8884e1042eef134 tree 6359972462635ba3c812fc6113e1c139aa0679e1 parent a6230af7bdffcd3837cb9fbefc17aa6aaada486c author Steve French Sun, 08 Jan 2006 20:12:58 -0800 committer Steve French Sun, 08 Jan 2006 20:12:58 -0800 [CIFS] Fix cifs trying to write to f_ops patch 2ea55c01e0c5dfead8699484b0bae2a375b1f61c fixed CIFS clobbering the global fops structure for some per mount setting, by duplicating and having 2 fops structs. However the write to the fops was left behind, which is a NOP in practice (due to the fact that we KNOW the fops has that field set to NULL already due to the duplication). So remove it... In addition, another instance of the same bug was forgotten in november. Signed-off-by: Arjan van de Ven Signed-off-by: Steve French commit a6230af7bdffcd3837cb9fbefc17aa6aaada486c tree 2f91d33b1d025a5f9110c139f5fbb427ca37e5b3 parent fdf7f2e91981938702ab2f58f44dc5685dd1bdc1 author Steve French Sun, 08 Jan 2006 20:04:55 -0800 committer Steve French Sun, 08 Jan 2006 20:04:55 -0800 [CIFS] Minor cleanup to new cifs acl header. Signed-off-by: Steve French commit fdf7f2e91981938702ab2f58f44dc5685dd1bdc1 tree 0c2477ede373c5e13e5ed2924ea04d42f8d81f40 parent eea60caef610c7a6c58c0de9c80ae1e438e01301 author Steve French Sat, 31 Dec 2005 10:29:42 -0800 committer Steve French Sat, 31 Dec 2005 10:29:42 -0800 [CIFS] Fix typos in rfc1002pdu.h Pointed out by Leo Comitale Signed-off-by: Steve French commit eea60caef610c7a6c58c0de9c80ae1e438e01301 tree 25e19289bba003fe085e589430d0d981fd6b73a7 parent da8543ef125afc7bba4da526b61a1ae07dc25109 parent 82c9df820112c6286a8e8fbe482e94b65b49062c author Steve French Sat, 31 Dec 2005 10:27:22 -0800 committer Steve French Sat, 31 Dec 2005 10:27:22 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git Signed-off-by: Steve French commit da8543ef125afc7bba4da526b61a1ae07dc25109 tree 6aec5867f8e054c22c6208032280ed1434c14a58 parent ec637e3ffb6b978143652477c7c5f96c9519b691 parent 90ac8f7741be4ff66de1f52904f4f67f272f74ce author Steve French Tue, 13 Dec 2005 10:15:39 -0800 committer Steve French Tue, 13 Dec 2005 10:15:39 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git Signed-off-by: Steve French commit ec637e3ffb6b978143652477c7c5f96c9519b691 tree 32533b8f101e1d85b3499050eef29e78480e5cae parent c89a86bb96307019867d11874ef0b86adaa0598e author Steve French Mon, 12 Dec 2005 20:53:18 -0800 committer Steve French Mon, 12 Dec 2005 20:53:18 -0800 [CIFS] Avoid extra large buffer allocation (and memcpy) in cifs_readpages Signed-off-by: Steve French commit c89a86bb96307019867d11874ef0b86adaa0598e tree c44c1a825e8a143a4c52bcb8692292aeb77fa64e parent 07475ffba5800c53573180dd521273642adcd0e9 parent e4f5c82a92c2a546a16af1614114eec19120e40a author Steve French Mon, 05 Dec 2005 11:15:30 -0800 committer Steve French Mon, 05 Dec 2005 11:15:30 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git Signed-off-by: Steve French commit 07475ffba5800c53573180dd521273642adcd0e9 tree c8e204621bcc30fc2591f19c4d3f9620589876d6 parent 4498eed50a114565debd38f173acd62cce6e7cb8 author Steve French Sat, 03 Dec 2005 14:11:37 -0800 committer Steve French Sat, 03 Dec 2005 14:11:37 -0800 [CIFS] Display large/small total buffer allocations in /proc/fs/cifs/Stats when CONFIG_CIFS_STATS2 is on (helps in debugging performance) Signed-off-by: Steve French commit 4498eed50a114565debd38f173acd62cce6e7cb8 tree 8a94482e9a7b98bb32aab518a0fce74075eabd2f parent 84afc29b185334f489975a003b128e1b15e24a54 author Steve French Sat, 03 Dec 2005 13:58:57 -0800 committer Steve French Sat, 03 Dec 2005 13:58:57 -0800 [CIFS] Add extended stats (STATS2) for total buffer allocations for better performance debugging. Signed-off-by: Steve French commit 84afc29b185334f489975a003b128e1b15e24a54 tree ab9544be46e3c52fcf799bb9bbf14c0db7b94b37 parent bf8206791750854bc6668266b694e8fe2cacb924 author Steve French Fri, 02 Dec 2005 13:32:45 -0800 committer Steve French Fri, 02 Dec 2005 13:32:45 -0800 [CIFS] Readpages and readir performance improvements - eliminate extra memcpy. Part 1 Signed-off-by: Steve French commit bf8206791750854bc6668266b694e8fe2cacb924 tree 6fd0a4193b07e071e4a947d3df2bb62934b6bd93 parent 83451879ab213e152c6fe5c743f257ba58d7acd1 author Steve French Thu, 01 Dec 2005 22:32:42 -0800 committer Steve French Thu, 01 Dec 2005 22:32:42 -0800 [CIFS] Kerberos and CIFS ACL support part 1 Signed-off-by: Steve French commit 83451879ab213e152c6fe5c743f257ba58d7acd1 tree 8b50b75368d74607dfda6b7bc5647419ebfa015a parent 5666c0947ede0432ba5148570aa66ffb9febff5b author Steve French Thu, 01 Dec 2005 17:12:59 -0800 committer Steve French Thu, 01 Dec 2005 17:12:59 -0800 [CIFS] Use fsuid (fsgid) more consistently instead of uid/gid in assembling smb requests when setuids and Linux protocol extensions enabled and in checking more matching sessions in multiuser mount mode. Pointed out by Shaggy. Signed-off-by: Steve French