commit da1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 tree 82483083e7d06663222654066823d565567e4b0a parent 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 parent 1656fa579e44691a860b095016eee910bc0b2793 author Linus Torvalds Mon, 05 Sep 2005 00:18:09 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:18:09 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 tree 98658d9009182e79cb443cef67afbdc4bb3b8a48 parent babf68de5848f7e4b97c9c4a2d5e30598b825387 parent 664399e1fbdceb18da9c9c5534dedd62327c63e8 author Linus Torvalds Mon, 05 Sep 2005 00:17:25 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:17:25 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit babf68de5848f7e4b97c9c4a2d5e30598b825387 tree 9e5bb2d6eedc8fb91d81cd34c74f361a4ad81241 parent e766f1cc596078b1603ac2c96617660c4c7e2d81 parent 9b4e3b13b147e9b737de63188a9ae740eaa8c36d author Linus Torvalds Mon, 05 Sep 2005 00:14:47 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:14:47 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit e766f1cc596078b1603ac2c96617660c4c7e2d81 tree 86f24a621dbe39fd25dcec539c2f969f50bfbcab parent 48467641bcc057f7cba3b6cbbe66cb834d64cc81 parent ebede60741e2cec6d210f137fd22a30e37abc0be author Linus Torvalds Mon, 05 Sep 2005 00:12:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:12:58 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 48467641bcc057f7cba3b6cbbe66cb834d64cc81 tree f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 parent 3863e72414fa2ebf5f3b615d1bf99de32e59980a parent d70063c4634af060a5387337b7632f6334ca3458 author Linus Torvalds Mon, 05 Sep 2005 00:11:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:11:50 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 3863e72414fa2ebf5f3b615d1bf99de32e59980a tree fe8cdcee6d7c446621a2a254b238b3b2417bc6fc parent 9513e5e3f5a6b429da8a9fd4330f71f1e547c8e0 author Martin Schwidefsky Sat, 03 Sep 2005 15:58:06 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:29 -0700 [PATCH] s390: disconnected 3270 console Fix reboot with a disconnected 3270 console. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9513e5e3f5a6b429da8a9fd4330f71f1e547c8e0 tree 7585e2271d2fc3393aa2368cd7dad85d7552cd97 parent c563077e526d130b8c9aab4e75116551eb5fdc2d author Heiko Carstens Sat, 03 Sep 2005 15:58:05 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:29 -0700 [PATCH] s390: spinlock corner case On s390 the lock value used for spinlocks consists of the lower 32 bits of the PSW that holds the lock. If this address happens to be on a four gigabyte boundary the lock is left unlocked. This allows other cpus to grab the same lock and enter a lock protected code path concurrently. In theory this can happen if the vmalloc area for the code of a module crosses a 4 GB boundary. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c563077e526d130b8c9aab4e75116551eb5fdc2d tree d4296f485f97a1d56db6eda5c7ad7b28a14be454 parent 2dee702fcb197d80c1a94650fb611539dd8135ce author Heiko Carstens Sat, 03 Sep 2005 15:58:04 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:29 -0700 [PATCH] s390: compat system calls Use TIF bit to tell if a process is running in 31 bit mode instead of checking the addressing mode bits of the PSW. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dee702fcb197d80c1a94650fb611539dd8135ce tree 86ca24687aa6d8d6a4bd09c3cc63cd4c4475e19a parent b6d09449d53f5aa7c67b1be3e90d7b7ab2aad09c author Eric Rossman Sat, 03 Sep 2005 15:58:03 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:29 -0700 [PATCH] s390: crypto driver update crypto device driver update: - Suppress syslog messages for some return codes. - Fix incorrect bounds checking in /proc interface. - Remove hotplug calls. - Remove linux version checks. - Remove device workqueue on module unload. Signed-off-by: Eric Rossman Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6d09449d53f5aa7c67b1be3e90d7b7ab2aad09c tree 37386fada73b07e6028b76ed58a9f59215f8de43 parent 4c24da79e29537f0e240a331220a1c46cb9bc085 author Martin Schwidefsky Sat, 03 Sep 2005 15:58:02 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:28 -0700 [PATCH] s390: pfault interrupt race There is a race in pfault_interrupt. That function gets called two times for each pfault notification. Once with a subcode of 0 to indicate that a real page is not available and once with a subcode of 0x80 to indicate that the page is present again. Since the two external interrupts can be delivered on two different cpus the order in which the two calls are made is unpredictable. It is possible that the subcode 0x80 interrupt is completed before the subcode 0x00 interrupt has done the wake_up() call. To avoid calling wake_up() on an already removed task structure proper task structure reference counting is needed. Increase the reference counter in the subcode 0x00 interrupt before setting pfault_wait to zero and return the reference after the wake_up call. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c24da79e29537f0e240a331220a1c46cb9bc085 tree c71f0c6433274a5f029884f630a3a03c7bba8a30 parent fd49f41aa0c125ec649c56a45337b3024d6b1736 author Cornelia Huck Sat, 03 Sep 2005 15:58:01 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:28 -0700 [PATCH] s390: reIPL fix and extern/static inline Common i/o layer changes: - Collect the irb at the correct subchannel when waiting for the clear interrupt during subchannel cleaning befor reIPL - don't stop at the first interrupt that comes in. - Change "extern __inline__" to "static inline". - Remove unneeded qdio includes. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd49f41aa0c125ec649c56a45337b3024d6b1736 tree 7400ce289ba77474c3adf6a5a7f1ff8d5215cc28 parent c6eb7b7703ac4b3401b74f411c8c51ded214bf19 author Horst Hummel Sat, 03 Sep 2005 15:58:00 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:27 -0700 [PATCH] s390: 64 bit diag250 support Add support for diag 250 access to dasd devices for 64 bit kernels. In addition fix detach/attach for diag disks. The VM control block needs to get recreated by a call to mdsk_init_io. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6eb7b7703ac4b3401b74f411c8c51ded214bf19 tree 1cb3563cb83f80347dbc3e4bd30c4635d401e87a parent 942eaabd5d77522223a311ed9bddaaa3cefde27d author Horst Hummel Sat, 03 Sep 2005 15:57:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:26 -0700 [PATCH] s390: deadlock in dasd_devmap Reintroduce a read-only copy of the devmap features in the device struct. This is necessary to solve a deadlock on the dasd_devmap_lock which is acquired by dasd_get_features called from the dasd tasklet. The current implementation of devmap doesn't allow to call any devmap function from interrupt or softirq context. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 942eaabd5d77522223a311ed9bddaaa3cefde27d tree 2b16d5c788d79d9670b3b816851ae0c8a4ef0ef2 parent ae6aa2ea8973e200cb3d0564a64a1b441d233428 author Michael Holzheu Sat, 03 Sep 2005 15:57:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:26 -0700 [PATCH] s390: debug feature changes debug feature changes/bug fixes: - Use get_clock() function instead of private inline assembly. - Use 'struct timeval' instead of 'struct timespec' for call to tod_to_timeval(). Now the microsecond part of the timestamp is correct again. - Fix a locking problem: when creating a snapshot of the current content of the debug areas, lock the entire debug_info object. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae6aa2ea8973e200cb3d0564a64a1b441d233428 tree 2bd12e22134b4f087c2179af0a304ca6dd9ca585 parent 4c139862b8831261d57de02716b92f82e5fb463b author Martin Schwidefsky Sat, 03 Sep 2005 15:57:56 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:25 -0700 [PATCH] s390: machine check handler bugs The new machine check handler still has a few bugs. 1) The system entry time has to be stored in the machine check handler, 2) the machine check return psw may not be stored at the usual place because it might overwrite the return psw of the interrupted context, 3) the return address for the call to s390_handle_mcck in the i/o interrupt handler is not correct, 4) the system call cleanup has to take the different save area of the machine check handler into account, 5) the machine check handler may not call UPDATE_VTIME before CREATE_STACK_FRAME, and 6) the io leave path needs a critical section cleanup to make sure that the TIF_MCCK_PENDING bit is really checked before switching back to user space. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c139862b8831261d57de02716b92f82e5fb463b tree 2ced4e225faa24c90f8b641206fbb849000c6e0b parent d99cf715a0751b0c819cdd8616c8870c1dd51910 author Adrian Bunk Sat, 03 Sep 2005 15:57:55 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:25 -0700 [PATCH] xtensa: delete accidental file This file seems to be an accident. Signed-off-by: Adrian Bunk Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d99cf715a0751b0c819cdd8616c8870c1dd51910 tree 7250fa334b00690e4e586d45c3eb6aa9770df17f parent 7ef939054139ef857cebbec07cbd12d7cf7beedd author Adrian Bunk Sat, 03 Sep 2005 15:57:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:25 -0700 [PATCH] xtensa: replace 'extern inline' with 'static inline' "extern inline" doesn't make sense. Signed-off-by: Adrian Bunk Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ef939054139ef857cebbec07cbd12d7cf7beedd tree c6e1c0722336b6155b0f7cf985b2ea4eb9c5d9e1 parent f9dfefe423a7633d81310c7b06c5566c74f9167b author Jeff Dike Sat, 03 Sep 2005 15:57:52 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: fix x86_64 page leak We were leaking pmd pages when 3_LEVEL_PGTABLES was enabled. This fixes that. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9dfefe423a7633d81310c7b06c5566c74f9167b tree 268a3b4389621aa31e82808c7223484808758046 parent d9838d86536fe17e76d19bf3e737100fae618396 author Bodo Stroesser Sat, 03 Sep 2005 15:57:51 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: fix advanced sysemu check cleanup and fix the check for advanced sysemu (PTRACE_SYSEMU_SINGLESTEP option) Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9838d86536fe17e76d19bf3e737100fae618396 tree d4609ec951f07bb1df284719eca0ed779992245e parent 07bf731e4b95d7c9ea9dbacd1fc4a041120dfffb author Bodo Stroesser Sat, 03 Sep 2005 15:57:51 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: allow host capability usage to be disabled Add new cmdline setups: - noprocmm - noptracefaultinfo In case of testing, they can be used to switch off usage of /proc/mm and PTRACE_FAULTINFO independently. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07bf731e4b95d7c9ea9dbacd1fc4a041120dfffb tree 25ae7f2000421d45e484abac0b7252809476c0d0 parent 8b51304ed3184826fb262c1e9d3e58b0b00fd083 author Bodo Stroesser Sat, 03 Sep 2005 15:57:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: skas0 stubs now check system call return values Change syscall-stub's data to include a "expected retval". Stub now checks syscalls retval and aborts execution of syscall list, if retval != expected retval. run_syscall_stub prints the data of the failed syscall, using the data pointer and retval written by the stub to the beginning of the stack. one_syscall_stub is removed, to simplify code, because only some instructions are saved by one_syscall_stub, no host-syscall. Using the stub with additional data (modify_ldt via stub) is prepared also. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b51304ed3184826fb262c1e9d3e58b0b00fd083 tree 2fd338bf425794146ba4d8b1a2fb3a81fb8c3fa4 parent 60d339f6fe0831060600c62418b71a62ad26c281 author Bodo Stroesser Sat, 03 Sep 2005 15:57:49 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: increase granularity of host capability checking This change enables SKAS0/SKAS3 to work with all combinations of /proc/mm and PTRACE_FAULTINFO being available or not. Also it changes the initialization of proc_mm and ptrace_faultinfo slightly, to ease forcing SKAS0 on a patched host. Forcing UML to run without /proc/mm or PTRACE_FAULTINFO by cmdline parameter can be implemented with a setup resetting the related variable. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60d339f6fe0831060600c62418b71a62ad26c281 tree a2f9527bbcfe85b3eb7c063b8af7d2f499ba4cbb parent 09ace81c1d737bcbb2423db235ac980cac4d5de9 author Gennady Sharapov Sat, 03 Sep 2005 15:57:47 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:24 -0700 [PATCH] uml: move libc-dependent startup and signal code The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from process.c file under os-Linux dir and join process.c and process_kern.c files. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09ace81c1d737bcbb2423db235ac980cac4d5de9 tree d31987b15d57429bd40843c02b2283b8e2d90cb0 parent 75e5584c89d213d6089f64f22cd899fb172e4c95 author Jeff Dike Sat, 03 Sep 2005 15:57:46 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:23 -0700 [PATCH] uml: add host AIO support to block driver This adds AIO support to the ubd driver. The driver breaks a struct request into IO requests to the host, based on the hardware segments in the request and on any COW blocks covered by the request. The ubd IO thread is gone, since there is now an equivalent thread in the AIO module. There is provision for multiple outstanding requests now. Requests aren't retired until all pieces of it have been completed. The AIO requests have a shared count, which is decremented as IO operations come in until it reaches 0. This can be possibly moved to the request struct - haven't looked at this yet. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e5584c89d213d6089f64f22cd899fb172e4c95 tree 22bb81b9c699e06b3c8163933654fe3f84ae469d parent 30f7dabb083f8ff4ce541b5ac4e5d70cc173051a author Jeff Dike Sat, 03 Sep 2005 15:57:45 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:23 -0700 [PATCH] uml: use host AIO support This patch makes UML use host AIO support when it (and /usr/include/linux/aio_abi.h) are present. This is only the support, with no consumers - a consumer is coming in the next patch. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30f7dabb083f8ff4ce541b5ac4e5d70cc173051a tree d4d457762926f694e6d12db8ff781d04ca31172d parent e32dacb9f481fd6decb41adb28e720c923d34f54 author Al Viro Sat, 03 Sep 2005 15:57:43 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:23 -0700 [PATCH] uml: build cleanups Added missing include list to uml AFLAGS Killed magic for stubs. [So] - it was needed only because of messed AFLAGS Switched segv_stubs.c to kernel CFLAGS sans profile, instead of user ones Killed STUBS_CFLAGS - it's not needed and the only remaining use had been gratitious - it only polluted CFLAGS Signed-off-by: Al Viro Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e32dacb9f481fd6decb41adb28e720c923d34f54 tree 77594001f5c670380897d84367442725740383d9 parent 08964c565b2fe49e338ffbe4907adcc19647ef16 author Jeff Dike Sat, 03 Sep 2005 15:57:42 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:23 -0700 [PATCH] uml: system call path cleanup This merges two sets of files which had no business being split apart in the first place. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08964c565b2fe49e338ffbe4907adcc19647ef16 tree dd37fefc7f654c8662154dd92efd0258e81a0ff4 parent c56004901fa5dcf55f92318f192ab3c0e87db2d1 author Jeff Dike Sat, 03 Sep 2005 15:57:41 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: merge duplicated page table code There is a lot of code which is duplicated between the 2 and 3 level implementation, with the only difference that the 3-level implementation is a bit more generalized (instead of accessing directly pte_t.pte, it uses the appropriate access macros). So this code is joined together. As obvious, a "core code nice cleanup" is not a "stability-friendly patch" so usual care applies. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c56004901fa5dcf55f92318f192ab3c0e87db2d1 tree ac53ded16ab9886ce05d4b2d424dfed80dce9e57 parent 77fa5adcda6d686d2f45a2b55dcb9a03e7d33fa1 author Jeff Dike Sat, 03 Sep 2005 15:57:36 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: TLB operation batching This adds VM op batching to skas0. Rather than having a context switch to and from the userspace stub for each address space change, we write a number of operations to the stub data page and invoke a different stub which loops over them and executes them all in one go. The operations are stored as [ system call number, arg1, arg2, ... ] tuples. The set is terminated by a system call number of 0. Single operations, i.e. page faults, are handled in the old way, since that is slightly more efficient. For a kernel build, a minority (~1/4) of the operations are part of a set. These sets averaged ~100 in length, so for this quarter, the context switching overhead is greatly reduced. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77fa5adcda6d686d2f45a2b55dcb9a03e7d33fa1 tree 0ec2e51f5ec929a657a5cb4565c73e4314afb82f parent 02edeb586ae4cdd17778923674700edb732a4741 author Jeff Dike Sat, 03 Sep 2005 15:57:34 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: remove duplicated exports Al Viro spotted a bunch of duplicated exports - this removes them. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02edeb586ae4cdd17778923674700edb732a4741 tree fe55ef9ca0d35901b835984026d76387aa2311b8 parent 13abf8130139c2ccd4962a7e5a8902be5e6cb5a7 author Jeff Dike Sat, 03 Sep 2005 15:57:33 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: mark SMP on UML/x86_64 as broken Noticed by Al Viro - SMP on x86_64 is fundamentally broken due to UML's reuse of the host arch's percpu stuff. This is OK on x86, but the x86_64 pda stuff just won't work for UML. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13abf8130139c2ccd4962a7e5a8902be5e6cb5a7 tree 88e543ac8ba2bcfd8ec7853d3a065cca2460f90d parent 93ea5a5b5c71ddbefd4082627d8f33e4bc038a6f author Al Viro Sat, 03 Sep 2005 15:57:31 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: remove libc reference in build Remove an unneeded reference to libc. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93ea5a5b5c71ddbefd4082627d8f33e4bc038a6f tree 59e759fdfba04c7ed4a13cffa716f6f0272c5494 parent ec7cf783dd6cf5c8fb6b6767560686ed28d1cd6d author Al Viro Sat, 03 Sep 2005 15:57:30 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:22 -0700 [PATCH] uml: build cleanup Build cleanups Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec7cf783dd6cf5c8fb6b6767560686ed28d1cd6d tree 80cd4175dade9146e0353771e69080deda037374 parent 7efd08c85523f9468a6a8748d6f02b3e73967569 author Jeff Dike Sat, 03 Sep 2005 15:57:29 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: error path cleanup This cleans up the error path in ubd_open, causing it now to call ubd_close appropriately when something fails. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7efd08c85523f9468a6a8748d6f02b3e73967569 tree 6ee5b4cadfc78665a4a85a2f5901b2441c4e4f79 parent e54a5dfb960053437f464a7ce372a8acc293fdcb author Al Viro Sat, 03 Sep 2005 15:57:28 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: fix a macro typo Fix a macro typo which could break if the macro is passed arguments with side-effects. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e54a5dfb960053437f464a7ce372a8acc293fdcb tree 01432a58e039716ab0a02347a027e84da10c370f parent 3b52166cf72f0826c6d8fa0541c7d4ae39c5a146 author Al Viro Sat, 03 Sep 2005 15:57:27 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: fix signal frame copy_user The copy_user stuff in the signal frame code was broke. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b52166cf72f0826c6d8fa0541c7d4ae39c5a146 tree 9245ab972eff25c3c9c751f29f135868774067dd parent 1e40cd383ccc7c9f8b338c56ce28c326e25eb2fe author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:57:26 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: fault handler micro-cleanups Avoid chomping low bits of address for functions doing it by themselves, fix whitespace, add a correctness checking. I did this for remap-file-pages protection support, it was useful on its own too. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e40cd383ccc7c9f8b338c56ce28c326e25eb2fe tree 8dab0fb849ccc25febf6c8f8865094141a50b8d2 parent ed1b58d8b53519e10a35c6a2bb49cac35f439621 author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:57:25 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: fixes performance regression in activate_mm and thus exec() Normally, activate_mm() is called from exec(), and thus it used to be a no-op because we use a completely new "MM context" on the host (for instance, a new process), and so we didn't need to flush any "TLB entries" (which for us are the set of memory mappings for the host process from the virtual "RAM" file). Kernel threads, instead, are usually handled in a different way. So, when for AIO we call use_mm(), things used to break and so Benjamin implemented activate_mm(). However, that is only needed for AIO, and could slow down exec() inside UML, so be smart: detect being called for AIO (via PF_BORROWED_MM) and do the full flush only in that situation. Comment also the caller so that people won't go breaking UML without noticing. I also rely on the caller's locks for testing current->flags. Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed1b58d8b53519e10a35c6a2bb49cac35f439621 tree 30eacf51f9e7d11fcfe2c795e3da48e1e7363daf parent 0221575903ad68debea57679b5b46575bf57afb1 author Bodo Stroesser Sat, 03 Sep 2005 15:57:24 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:21 -0700 [PATCH] uml: fix SIGWINCH handler race while waiting for signals. If a SIGWINCH comes in, while winch_thread() isn't waiting in wait(), winch_thread could miss signals. It isn't very probable, that anyone will see this causing trouble, as it would need a very special timing, that a missed SIGWINCH results in a wrong window size. So, this is a minor problem. But why not fix, as it can be done so easy? Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0221575903ad68debea57679b5b46575bf57afb1 tree a461b5c395a098e7888bc62c5f27549510eeb28c parent 640aa46e25922a00b805e6b0d0b5181ad9cf736a author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:57:23 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] uml: workaround GDB problems on debugging Apparently, GDB gets confused when we do an execvp() on ourselves. Since it's simply done to allocate further space for command line arguments (which we'll use to allow gathering the startup command line for guest processes through the host), allow the user to disable that to get a debuggable UML binary. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 640aa46e25922a00b805e6b0d0b5181ad9cf736a tree b8551775b41651905d7de27331eea1dd92c0c4d2 parent ab1c23c24471c760c573f4fb0dd78e166ddfd844 author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:57:22 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] uml: SYSEMU: slight cleanup and speedup As a follow-up to "UML Support - Ptrace: adds the host SYSEMU support, for UML and general usage" (i.e. uml-support-* in current mm). Avoid unconditionally jumping to work_pending and code copying, just reuse the already existing resume_userspace path. One interesting note, from Charles P. Wright, suggested that the API is improvable with no downsides for UML (except that it will have to support yet another host API, since dropping support for the current API, for UML, is not reasonable from users' point of view). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Charles P. Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab1c23c24471c760c573f4fb0dd78e166ddfd844 tree fad0953ece8710b58a14a2a9eed1b1f83fb47f4b parent 1b38f0064e4e0b9ec626e39f0740b1cf2e295743 author Bodo Stroesser Sat, 03 Sep 2005 15:57:21 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] SYSEMU: fix sysaudit / singlestep interaction Paolo 'Blaisorblade' Giarrusso This is simply an adjustment for "Ptrace - i386: fix Syscall Audit interaction with singlestep" to work on top of SYSEMU patches, too. On this patch, I have some doubts: I wonder why we need to alter that way ptrace_disable(). I left the patch this way because it has been extensively tested, but I don't understand the reason. The current PTRACE_DETACH handling simply clears child->ptrace; actually this is not enough because entry.S just looks at the thread_flags; actually, do_syscall_trace checks current->ptrace but I don't think depending on that is good, at least for performance, so I think the clearing is done elsewhere. For instance, on PTRACE_CONT it's done, but doing PTRACE_DETACH without PTRACE_CONT is possible (and happens when gdb crashes and one kills it manually). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b38f0064e4e0b9ec626e39f0740b1cf2e295743 tree b5e3af88b23bd47d91c4745a3e0c61512f58ff21 parent c8c86cecd1d1a2722acb28a01d1babf7b6993697 author Bodo Stroesser Sat, 03 Sep 2005 15:57:20 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] Uml support: add PTRACE_SYSEMU_SINGLESTEP option to i386 This patch implements the new ptrace option PTRACE_SYSEMU_SINGLESTEP, which can be used by UML to singlestep a process: it will receive SINGLESTEP interceptions for normal instructions and syscalls, but syscall execution will be skipped just like with PTRACE_SYSEMU. Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8c86cecd1d1a2722acb28a01d1babf7b6993697 tree e51097940d245b298278ffaac27d2992b0ac257b parent ed75e8d58010fdc06e2c3a81bfbebae92314c7e3 author Bodo Stroesser Sat, 03 Sep 2005 15:57:19 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] Uml support: reorganize PTRACE_SYSEMU support With this patch, we change the way we handle switching from PTRACE_SYSEMU to PTRACE_{SINGLESTEP,SYSCALL}, to free TIF_SYSCALL_EMU from double use as a preparation for PTRACE_SYSEMU_SINGLESTEP extension, without changing the behavior of the host kernel. Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed75e8d58010fdc06e2c3a81bfbebae92314c7e3 tree 3f6f8dc5a34c9e03f613d4b907e02802ab075a9e parent 94c80b2598dbd2b8a6fe5f5c2c3af1beb37f66c7 author Laurent Vivier Sat, 03 Sep 2005 15:57:18 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:20 -0700 [PATCH] UML Support - Ptrace: adds the host SYSEMU support, for UML and general usage Jeff Dike , Paolo 'Blaisorblade' Giarrusso , Bodo Stroesser Adds a new ptrace(2) mode, called PTRACE_SYSEMU, resembling PTRACE_SYSCALL except that the kernel does not execute the requested syscall; this is useful to improve performance for virtual environments, like UML, which want to run the syscall on their own. In fact, using PTRACE_SYSCALL means stopping child execution twice, on entry and on exit, and each time you also have two context switches; with SYSEMU you avoid the 2nd stop and so save two context switches per syscall. Also, some architectures don't have support in the host for changing the syscall number via ptrace(), which is currently needed to skip syscall execution (UML turns any syscall into getpid() to avoid it being executed on the host). Fixing that is hard, while SYSEMU is easier to implement. * This version of the patch includes some suggestions of Jeff Dike to avoid adding any instructions to the syscall fast path, plus some other little changes, by myself, to make it work even when the syscall is executed with SYSENTER (but I'm unsure about them). It has been widely tested for quite a lot of time. * Various fixed were included to handle the various switches between various states, i.e. when for instance a syscall entry is traced with one of PT_SYSCALL / _SYSEMU / _SINGLESTEP and another one is used on exit. Basically, this is done by remembering which one of them was used even after the call to ptrace_notify(). * We're combining TIF_SYSCALL_EMU with TIF_SYSCALL_TRACE or TIF_SINGLESTEP to make do_syscall_trace() notice that the current syscall was started with SYSEMU on entry, so that no notification ought to be done in the exit path; this is a bit of a hack, so this problem is solved in another way in next patches. * Also, the effects of the patch: "Ptrace - i386: fix Syscall Audit interaction with singlestep" are cancelled; they are restored back in the last patch of this series. Detailed descriptions of the patches doing this kind of processing follow (but I've already summed everything up). * Fix behaviour when changing interception kind #1. In do_syscall_trace(), we check the status of the TIF_SYSCALL_EMU flag only after doing the debugger notification; but the debugger might have changed the status of this flag because he continued execution with PTRACE_SYSCALL, so this is wrong. This patch fixes it by saving the flag status before calling ptrace_notify(). * Fix behaviour when changing interception kind #2: avoid intercepting syscall on return when using SYSCALL again. A guest process switching from using PTRACE_SYSEMU to PTRACE_SYSCALL crashes. The problem is in arch/i386/kernel/entry.S. The current SYSEMU patch inhibits the syscall-handler to be called, but does not prevent do_syscall_trace() to be called after this for syscall completion interception. The appended patch fixes this. It reuses the flag TIF_SYSCALL_EMU to remember "we come from PTRACE_SYSEMU and now are in PTRACE_SYSCALL", since the flag is unused in the depicted situation. * Fix behaviour when changing interception kind #3: avoid intercepting syscall on return when using SINGLESTEP. When testing 2.6.9 and the skas3.v6 patch, with my latest patch and had problems with singlestepping on UML in SKAS with SYSEMU. It looped receiving SIGTRAPs without moving forward. EIP of the traced process was the same for all SIGTRAPs. What's missing is to handle switching from PTRACE_SYSCALL_EMU to PTRACE_SINGLESTEP in a way very similar to what is done for the change from PTRACE_SYSCALL_EMU to PTRACE_SYSCALL_TRACE. I.e., after calling ptrace(PTRACE_SYSEMU), on the return path, the debugger is notified and then wake ups the process; the syscall is executed (or skipped, when do_syscall_trace() returns 0, i.e. when using PTRACE_SYSEMU), and do_syscall_trace() is called again. Since we are on the return path of a SYSEMU'd syscall, if the wake up is performed through ptrace(PTRACE_SYSCALL), we must still avoid notifying the parent of the syscall exit. Now, this behaviour is extended even to resuming with PTRACE_SINGLESTEP. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94c80b2598dbd2b8a6fe5f5c2c3af1beb37f66c7 tree 7e4221c42418898084961f66670c7f66042f164c parent 08b178ebf37bbfb78329e0ae6ea688b103d205bf author Bodo Stroesser Sat, 03 Sep 2005 15:57:13 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] Ptrace/i386: fix "syscall audit" interaction with singlestep Paolo 'Blaisorblade' Giarrusso Avoid giving two traps for singlestep instead of one, when syscall auditing is enabled. In fact no singlestep trap is sent on syscall entry, only on syscall exit, as can be seen in entry.S: # Note that in this mask _TIF_SINGLESTEP is not tested !!! <<<<<<<<<<<<<< testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),TI_flags(%ebp) jnz syscall_trace_entry ... syscall_trace_entry: ... call do_syscall_trace But auditing a SINGLESTEP'ed process causes do_syscall_trace to be called, so the tracer will get one more trap on the syscall entry path, which it shouldn't. Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08b178ebf37bbfb78329e0ae6ea688b103d205bf tree e11c4ac3015681bd60b66c47a1131d221435e916 parent 96e59245e1abf3ea2e98c4b9ee2ebd975db653db author Jeff Dike Sat, 03 Sep 2005 15:57:12 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] uml: Rename Kconfig files to be like the other arches To the extent that sub-Kconfig files exist elsewhere in the tree, they are named Kconfig.foo, rather than the Kconfig_foo that UML has. This patch brings the names in line with the rest of the tree. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96e59245e1abf3ea2e98c4b9ee2ebd975db653db tree baf413905e87b039f83d81d24e8dcbd2dca06e49 parent 49f9ebc894ecdb985475060d051a571dc231cce7 author Jeff Dike Sat, 03 Sep 2005 15:57:12 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] uml: remove debugging code from page fault path This eliminates the segfault info ring buffer, which added a system call to each page fault, and which hadn't been useful for debugging in ages. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49f9ebc894ecdb985475060d051a571dc231cce7 tree 29267431e0a13965fb65a0f5d71d69f540725360 parent 072dffda1d35c391fe893ec9b1d098145e668fef author Adrian Bunk Sat, 03 Sep 2005 15:57:10 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug This patch converts arch/cris/Kconfig.debug to using lib/Kconfig.debug. This should fix a compile error in 2.6.13-rc4 caused by a missing CONFIG_LOG_BUF_SHIFT definition. While I was editing this file, I also converted some spaces to tabs. Signed-off-by: Adrian Bunk Acked-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 072dffda1d35c391fe893ec9b1d098145e668fef tree 2eee1530619abb7cf751db022216ab483e6fc823 parent 2855b97020f6d4a4dfb005fb77c0b79c8cb9d13f author Roman Zippel Sat, 03 Sep 2005 15:57:10 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] m68k: cleanup inline mem functions Use the builtin functions for memset/memclr/memcpy, special optimizations for page operations have dedicated functions now. Uninline memmove/memchr and move all functions into a single file and clean it up a little. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2855b97020f6d4a4dfb005fb77c0b79c8cb9d13f tree 6746ded865a27cb23f1646ea2b9e10f76c9d9601 parent 69f447cffb911bb2d9737fa905f6d983ec2aa5d3 author Roman Zippel Sat, 03 Sep 2005 15:57:09 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] m68k: move cache functions into separate file Move a few cache functions into its own file and fix flush_icache_range() so it can handle both kernel and user addresses correctly (assuming context is set correctly). Turn copy_to_user_page/copy_from_user_page into inline functions and add a missing cache flush. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69f447cffb911bb2d9737fa905f6d983ec2aa5d3 tree ee1f932ab2ffb6ff923ef20c708787875f3862bb parent b3319f50acbe3a26c258cdd899b9baa2e5e94efc author Roman Zippel Sat, 03 Sep 2005 15:57:08 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:19 -0700 [PATCH] m68k: sys_ptrace cleanup - create helper function singlestep_disable() - move variable definitions to the top of the function - use "out_eio" label as common error destination - don't clear failure value for PTRACE_SETREGS/PTRACE_GETREGS Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3319f50acbe3a26c258cdd899b9baa2e5e94efc tree 7ef77c9cc60055323b40cb5a0a6760b56c37da31 parent c3c433e4f33afe255389ba3b1a003dc8deb3de9a author Roman Zippel Sat, 03 Sep 2005 15:57:07 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:18 -0700 [PATCH] m68k: indent sys_ptrace This reformats and properly indents sys_ptrace (only whitespace changes). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3c433e4f33afe255389ba3b1a003dc8deb3de9a tree 071304e15e21e0a93c17050000a682f4ae1a98c1 parent 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919 author Shaohua Li Sat, 03 Sep 2005 15:57:07 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:18 -0700 [PATCH] add suspend/resume for timer The timers lack .suspend/.resume methods. Because of this, jiffies got a big compensation after a S3 resume. And then softlockup watchdog reports an oops. This occured with HPET enabled, but it's also possible for other timers. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919 tree 916c1435e9cba3dd050e526637ee8bf51db140e8 parent 6161b2ce8116b9a623260ab811e2c035b3fac2e5 author Pavel Machek Sat, 03 Sep 2005 15:57:06 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:18 -0700 [PATCH] pm: clean up /sys/power/disk Clean code up a bit, and only show suspend to disk as available when it is configured in. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6161b2ce8116b9a623260ab811e2c035b3fac2e5 tree 8cb36b11631c0843fb5a7e600626a2f6a230846b parent 99dc7d63e0dcb457580241055b2a39d011309db8 author Pavel Machek Sat, 03 Sep 2005 15:57:05 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:17 -0700 [PATCH] pm: fix process freezing If process freezing fails, some processes are frozen, and rest are left in "were asked to be frozen" state. Thats wrong, we should leave it in some consistent state. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99dc7d63e0dcb457580241055b2a39d011309db8 tree 3be63831f5fa823ef7e5c99339e9a71c29d3ad08 parent dd5d666b7995e542b7f81a4bb1c7ad634f4f6c51 author Pavel Machek Sat, 03 Sep 2005 15:57:05 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:17 -0700 [PATCH] swsusp: fix error handling and cleanups Drop printing during normal boot (when no image exists in swap), print message when drivers fail, fix error paths and consolidate near-identical functions in disk.c (and functions with just one statement). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd5d666b7995e542b7f81a4bb1c7ad634f4f6c51 tree de010e4bd66681ec75657746d652eb89f08142b7 parent 6ed9fcec85d5ef0e34ea18affe95e4a246714565 author Shaohua Li Sat, 03 Sep 2005 15:57:04 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:17 -0700 [PATCH] swsusp: add locking to software_resume It is trying to protect swsusp_resume_device and software_resume() from two users banging it from userspace at the same time. Signed-off-by: Shaohua Li Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ed9fcec85d5ef0e34ea18affe95e4a246714565 tree 1a75c25b528d763f2771cc36ed6e17072091fd3d parent 56057e1a128a9aab516350500e5b154e70577929 author Andreas Steinmetz Sat, 03 Sep 2005 15:57:03 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:17 -0700 [PATCH] swsusup with dm-crypt mini howto The attached patch contains a mini howto for using dm-crypt together with swsusp. Signed-off-by: Andreas Steinmetz Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56057e1a128a9aab516350500e5b154e70577929 tree 68f323a6e919d96dad59471decb3bea3ec6a36fc parent 46dacba52a19d1414ba249499a48382c16242d99 author Michal Schmidt Sat, 03 Sep 2005 15:57:02 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:17 -0700 [PATCH] swsusp: simpler calculation of number of pages in PBE list The function calc_nr uses an iterative algorithm to calculate the number of pages needed for the image and the pagedir. Exactly the same result can be obtained with a one-line expression. Note that this was even proved correct ;-). Signed-off-by: Michal Schmidt Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46dacba52a19d1414ba249499a48382c16242d99 tree 760538eb1cac1f6e7c0b4b99c0a31b282b59e467 parent c2ff18f4070f6303a81fd7d9d967d7c9e01b588f author Michal Schmidt Sat, 03 Sep 2005 15:57:01 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:16 -0700 [PATCH] swsusp: prevent disks from spinning down and up Stop the disks from spinning down and up on suspend. Signed-off-by: Michal Schmidt Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2ff18f4070f6303a81fd7d9d967d7c9e01b588f tree 250a50e27885a179d0fee37cef31cf3a4d4627d3 parent 583a4e88db1eadc52116e1f97b4519de655b2b80 author Andreas Steinmetz Sat, 03 Sep 2005 15:56:59 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:16 -0700 [PATCH] encrypt suspend data for easy wiping The patch protects from leaking sensitive data after resume from suspend. During suspend a temporary key is created and this key is used to encrypt the data written to disk. When, during resume, the data was read back into memory the temporary key is destroyed which simply means that all data written to disk during suspend are then inaccessible so they can't be stolen lateron. Think of the following: you suspend while an application is running that keeps sensitive data in memory. The application itself prevents the data from being swapped out. Suspend, however, must write these data to swap to be able to resume lateron. Without suspend encryption your sensitive data are then stored in plaintext on disk. This means that after resume your sensitive data are accessible to all applications having direct access to the swap device which was used for suspend. If you don't need swap after resume these data can remain on disk virtually forever. Thus it can happen that your system gets broken in weeks later and sensitive data which you thought were encrypted and protected are retrieved and stolen from the swap device. Signed-off-by: Andreas Steinmetz Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 583a4e88db1eadc52116e1f97b4519de655b2b80 tree d86d570bd4c20227efe4d19429a1955580c040ad parent ca078bae813dd46c0f9b102fdfb4a3384641ff48 author Pavel Machek Sat, 03 Sep 2005 15:56:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:16 -0700 [PATCH] fix pm_message_t stuff in -mm tree This should bits from -mm tree that are affected by pm_message_t conversion. [I'm not 100% sure I got all of them, but I certainly got all the errors on make allyesconfig build, and most of warnings, too. I'll go through the buildlog tommorow and fix any remaining bits]. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca078bae813dd46c0f9b102fdfb4a3384641ff48 tree e3348f5dcb24159a522941aa2e3ee40bc9e0589b parent 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea author Pavel Machek Sat, 03 Sep 2005 15:56:57 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:16 -0700 [PATCH] swsusp: switch pm_message_t to struct This adds type-checking to pm_message_t, so that people can't confuse it with int or u32. It also allows us to fix "disk yoyo" during suspend (disk spinning down/up/down). [We've tried that before; since that cpufreq problems were fixed and I've tried make allyes config and fixed resulting damage.] Signed-off-by: Pavel Machek Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea tree 044087fb18aa4b5f5bbd233f54f9eec3439ad6de parent 7e958883bced7e435f5a76349e15684858d3477c author Pavel Machek Sat, 03 Sep 2005 15:56:56 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:15 -0700 [PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion Fix remaining bits of u32 vs. pm_message confusion. Should not break anything. Signed-off-by: Pavel Machek Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e958883bced7e435f5a76349e15684858d3477c tree d5b5a670c5917825ac08a67cb9efd0e64afe9799 parent 7dc24db1757f950f8bd21b7191106d4bf5134be7 author Pavel Machek Sat, 03 Sep 2005 15:56:56 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:14 -0700 [PATCH] suspend: update documentation Update suspend documentation. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dc24db1757f950f8bd21b7191106d4bf5134be7 tree 16a1e393544b76b688f703b659db6e20e61ca404 parent 795312e763569ce4df67e7a0ca726a9901358fa2 author Pierre Ossman Sat, 03 Sep 2005 15:56:55 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:14 -0700 [PATCH] ISA DMA suspend for x86_64 Reset the ISA DMA controller into a known state after a suspend. Primary concern was reenabling the cascading DMA channel (4). Signed-off-by: Pierre Ossman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 795312e763569ce4df67e7a0ca726a9901358fa2 tree c04db2abe5b75fd8c5e40e4365aa9d267bc66b7d parent 2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d author Pierre Ossman Sat, 03 Sep 2005 15:56:54 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:14 -0700 [PATCH] ISA DMA suspend for i386 Reset the ISA DMA controller into a known state after a suspend. Primary concern was reenabling the cascading DMA channel (4). Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d tree 60eede3a1a0a92837c0207de2750880d9a309db1 parent 52fdd08903a1d1162e184114837e232640191627 author Pavel Machek Sat, 03 Sep 2005 15:56:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:14 -0700 [PATCH] remove busywait in refrigerator This should make refrigerator sleep properly, not busywait after the first schedule() returns. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52fdd08903a1d1162e184114837e232640191627 tree 9469f521b7ba12ac48337155bc5a65049d361229 parent 4ad8d38342430f8b52f7a8458dce90caf8c8ca64 author Benjamin LaHaise Sat, 03 Sep 2005 15:56:52 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:14 -0700 [PATCH] unify x86/x86-64 semaphore code This patch moves the common code in x86 and x86-64's semaphore.c into a single file in lib/semaphore-sleepers.c. The arch specific asm stubs are left in the arch tree (in semaphore.c for i386 and in the asm for x86-64). There should be no changes in code/functionality with this patch. Signed-off-by: Benjamin LaHaise Cc: Andi Kleen Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ad8d38342430f8b52f7a8458dce90caf8c8ca64 tree 090c471fdb44d8fe88c52e95be0e8e43e31fcd5a parent d7271b14b2e9e5905aba0fbf5c4dc4f8980c0cb2 author Zwane Mwaikambo Sat, 03 Sep 2005 15:56:51 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:13 -0700 [PATCH] i386 boottime for_each_cpu broken for_each_cpu walks through all processors in cpu_possible_map, which is defined as cpu_callout_map on i386 and isn't initialised until all processors have been booted. This breaks things which do for_each_cpu iterations early during boot. So, define cpu_possible_map as a bitmap with NR_CPUS bits populated. This was triggered by a patch i'm working on which does alloc_percpu before bringing up secondary processors. From: Alexander Nyberg i386-boottime-for_each_cpu-broken.patch i386-boottime-for_each_cpu-broken-fix.patch The SMP version of __alloc_percpu checks the cpu_possible_map before allocating memory for a certain cpu. With the above patches the BSP cpuid is never set in cpu_possible_map which breaks CONFIG_SMP on uniprocessor machines (as soon as someone tries to dereference something allocated via __alloc_percpu, which in fact is never allocated since the cpu is not set in cpu_possible_map). Signed-off-by: Zwane Mwaikambo Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7271b14b2e9e5905aba0fbf5c4dc4f8980c0cb2 tree 2e8bb68bb2501be464a4eda66c323978c2d9bb70 parent 748f2edb52712aa3d926470a888608dc500d17e8 author Zachary Amsden Sat, 03 Sep 2005 15:56:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:13 -0700 [PATCH] i386: encapsulate copying of pgd entries Add a clone operation for pgd updates. This helps complete the encapsulation of updates to page tables (or pages about to become page tables) into accessor functions rather than using memcpy() to duplicate them. This is both generally good for consistency and also necessary for running in a hypervisor which requires explicit updates to page table entries. The new function is: clone_pgd_range(pgd_t *dst, pgd_t *src, int count); dst - pointer to pgd range anwhere on a pgd page src - "" count - the number of pgds to copy. dst and src can be on the same page, but the range must not overlap and must not cross a page boundary. Note that I ommitted using this call to copy pgd entries into the software suspend page root, since this is not technically a live paging structure, rather it is used on resume from suspend. CC'ing Pavel in case he has any feedback on this. Thanks to Chris Wright for noticing that this could be more optimal in PAE compiles by eliminating the memset. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 748f2edb52712aa3d926470a888608dc500d17e8 tree 9fb37795934642e11bad0d747d1271df393a993d parent f2f30ebca6c0c95e987cb9a1fd1495770a75432e author George Anzinger Sat, 03 Sep 2005 15:56:48 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:13 -0700 [PATCH] x86 NMI: better support for debuggers This patch adds a notify to the die_nmi notify that the system is about to be taken down. If the notify is handled with a NOTIFY_STOP return, the system is given a new lease on life. We also change the nmi watchdog to carry on if die_nmi returns. This give debug code a chance to a) catch watchdog timeouts and b) possibly allow the system to continue, realizing that the time out may be due to debugger activities such as single stepping which is usually done with "other" cpus held. Signed-off-by: George Anzinger Cc: Keith Owens Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2f30ebca6c0c95e987cb9a1fd1495770a75432e tree ea7b1763aa0e0d36b52fa245449c79338fe735b3 parent e9f86e351fda5b3c40192fc3990453613f160779 author Zachary Amsden Sat, 03 Sep 2005 15:56:47 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:13 -0700 [PATCH] x86: introduce a write acessor for updating the current LDT Introduce a write acessor for updating the current LDT. This is required for hypervisors like Xen that do not allow LDT pages to be directly written. Testing - here's a fun little LDT test that can be trivially modified to test limits as well. /* * Copyright (c) 2005, Zachary Amsden (zach@vmware.com) * This is licensed under the GPL. */ #include #include #include #include #include #include #include #define __KERNEL__ #include void main(void) { struct user_desc desc; char *code; unsigned long long tsc; code = (char *)mmap(0, 8192, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); desc.entry_number = 0; desc.base_addr = code; desc.limit = 1; desc.seg_32bit = 1; desc.contents = MODIFY_LDT_CONTENTS_CODE; desc.read_exec_only = 0; desc.limit_in_pages = 1; desc.seg_not_present = 0; desc.useable = 1; if (modify_ldt(1, &desc, sizeof(desc)) != 0) { perror("modify_ldt"); } printf("code base is 0x%08xn", (unsigned)code); code[0x0ffe] = 0x0f; /* rdtsc */ code[0x0fff] = 0x31; code[0x1000] = 0xcb; /* lret */ __asm__ __volatile("lcall $7,$0xffe" : "=A" (tsc)); printf("TSC is 0x%016llxn", tsc); } Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9f86e351fda5b3c40192fc3990453613f160779 tree 26e6dae576d3f352da0743ae713bb7da175f95de parent a5201129307f414890f9a4410e38da205f5d7359 author Zachary Amsden Sat, 03 Sep 2005 15:56:45 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:13 -0700 [PATCH] x86: remove redundant TSS clearing When reviewing GDT updates, I found the code: set_tss_desc(cpu,t); /* This just modifies memory; ... */ per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS].b &= 0xfffffdff; This second line is unnecessary, since set_tss_desc() has already cleared the busy bit. Commented disassembly, line 1: c028b8bd: 8b 0c 86 mov (%esi,%eax,4),%ecx c028b8c0: 01 cb add %ecx,%ebx c028b8c2: 8d 0c 39 lea (%ecx,%edi,1),%ecx => %ecx = per_cpu(cpu_gdt_table, cpu) c028b8c5: 8d 91 80 00 00 00 lea 0x80(%ecx),%edx => %edx = &per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS] c028b8cb: 66 c7 42 00 73 20 movw $0x2073,0x0(%edx) c028b8d1: 66 89 5a 02 mov %bx,0x2(%edx) c028b8d5: c1 cb 10 ror $0x10,%ebx c028b8d8: 88 5a 04 mov %bl,0x4(%edx) c028b8db: c6 42 05 89 movb $0x89,0x5(%edx) => ((char *)%edx)[5] = 0x89 (equivalent) ((char *)per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS])[5] = 0x89 c028b8df: c6 42 06 00 movb $0x0,0x6(%edx) c028b8e3: 88 7a 07 mov %bh,0x7(%edx) c028b8e6: c1 cb 10 ror $0x10,%ebx => other bits Commented disassembly, line 2: c028b8e9: 8b 14 86 mov (%esi,%eax,4),%edx c028b8ec: 8d 04 3a lea (%edx,%edi,1),%eax => %eax = per_cpu(cpu_gdt_table, cpu) c028b8ef: 81 a0 84 00 00 00 ff andl $0xfffffdff,0x84(%eax) => per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS].b &= 0xfffffdff; (equivalent) ((char *)per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS])[5] &= 0xfd Note that (0x89 & ~0xfd) == 0; i.e, set_tss_desc(cpu,t) has already stored the type field in the GDT with the busy bit clear. Eliminating redundant and obscure code is always a good thing; in fact, I pointed out this same optimization many moons ago in arch/i386/setup.c, back when it used to be called that. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5201129307f414890f9a4410e38da205f5d7359 tree ad70c5f1d3b336ef5665a7fd5ad8707aaec23847 parent 0998e4228aca046fbd747c3fed909791d52e88eb author Zachary Amsden Sat, 03 Sep 2005 15:56:44 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:12 -0700 [PATCH] x86: make IOPL explicit The pushf/popf in switch_to are ONLY used to switch IOPL. Making this explicit in C code is more clear. This pushf/popf pair was added as a bugfix for leaking IOPL to unprivileged processes when using sysenter/sysexit based system calls (sysexit does not restore flags). When requesting an IOPL change in sys_iopl(), it is just as easy to change the current flags and the flags in the stack image (in case an IRET is required), but there is no reason to force an IRET if we came in from the SYSENTER path. This change is the minimal solution for supporting a paravirtualized Linux kernel that allows user processes to run with I/O privilege. Other solutions require radical rewrites of part of the low level fault / system call handling code, or do not fully support sysenter based system calls. Unfortunately, this added one field to the thread_struct. But as a bonus, on P4, the fastest time measured for switch_to() went from 312 to 260 cycles, a win of about 17% in the fast case through this performance critical path. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0998e4228aca046fbd747c3fed909791d52e88eb tree 314cb04a6223100bf468cc420985bfe7e3680d44 parent f2ab4461249df85b20930a7a57b54f39c5ae291a author Zachary Amsden Sat, 03 Sep 2005 15:56:43 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:12 -0700 [PATCH] x86: privilege cleanup Privilege checking cleanup. Originally, these diffs were much greater, but recent cleanups in Linux have already done much of the cleanup. I added some explanatory comments in places where the reasoning behind certain tests is rather subtle. Also, in traps.c, we can skip the user_mode check in handle_BUG(). The reason is, there are only two call chains - one via die_if_kernel() and one via do_page_fault(), both entering from die(). Both of these paths already ensure that a kernel mode failure has happened. Also, the original check here, if (user_mode(regs)) was insufficient anyways, since it would not rule out BUG faults from V8086 mode execution. Saving the %ss segment in show_regs() rather than assuming a fixed value also gives better information about the current kernel state in the register dump. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2ab4461249df85b20930a7a57b54f39c5ae291a tree 17fbe46fdc6e95bf24faccb6001d89c989442f6f parent 4f0cb8d978ab4b6e3b40147f619f48316d9d7f63 author Zachary Amsden Sat, 03 Sep 2005 15:56:42 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:12 -0700 [PATCH] x86: more asm cleanups Some more assembler cleanups I noticed along the way. Signed-off-by: Zachary Amsden Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f0cb8d978ab4b6e3b40147f619f48316d9d7f63 tree 61be59b09245235862d3f1d932a06b0a28ecbf59 parent c9b02a24130e3ff14a553d966a79f46cf806b037 author Ingo Molnar Sat, 03 Sep 2005 15:56:41 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:12 -0700 [PATCH] i386: fix incorrect TSS entry for LDT Noticed by Chuck Ebbert: the .ldt entry of the TSS was set up incorrectly. It never mattered since this was a leftover from old times, so remove it. Signed-off-by: Ingo Molnar Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9b02a24130e3ff14a553d966a79f46cf806b037 tree 1c496ef13e8d2d991f5197ec1c1eb34282beddf0 parent e7a2ff593c0e48b130434dee4d2fd3452a850e6f author Zachary Amsden Sat, 03 Sep 2005 15:56:40 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:12 -0700 [PATCH] i386: use set_pte macros in a couple places where they were missing Also, setting PDPEs in PAE mode does not require atomic operations, since the PDPEs are cached by the processor, and only reloaded on an explicit or implicit reload of CR3. Since the four PDPEs must always be present in an active root, and the kernel PDPE is never updated, we are safe even from SMIs and interrupts / NMIs using task gates (which reload CR3). Actually, much of this is moot, since the user PDPEs are never updated either, and the only usage of task gates is by the doublefault handler. It appears the only place PGDs get updated in PAE mode is in init_low_mappings() / zap_low_mapping() for initial page table creation and recovery from ACPI sleep state, and these sites are safe by inspection. Getting rid of the cmpxchg8b saves code space and 720 cycles in pgd_alloc on P4. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7a2ff593c0e48b130434dee4d2fd3452a850e6f tree 89bca4c0a0818d1e217c76866f62c1b133a425d7 parent 2f2984eb4afb2a4298e3186cb49cc7e88dd6d929 author Zachary Amsden Sat, 03 Sep 2005 15:56:39 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:11 -0700 [PATCH] i386: load_tls() fix Subtle fix: load_TLS has been moved after saving %fs and %gs segments to avoid creating non-reversible segments. This could conceivably cause a bug if the kernel ever needed to save and restore fs/gs from the NMI handler. It currently does not, but this is the safest approach to avoiding fs/gs corruption. SMIs are safe, since SMI saves the descriptor hidden state. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f2984eb4afb2a4298e3186cb49cc7e88dd6d929 tree 213dfa4726dd010b226fbfffac9da0fbe140b3fe parent 4d37e7e3fd851428dede4d05d3e69d03795a744a author Zachary Amsden Sat, 03 Sep 2005 15:56:38 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:11 -0700 [PATCH] i386: generate better code around descriptor update and access functions GCC can generate better code around descriptor update and access functions when there is not an explicit "eax" register constraint. Testing: You won't boot if this is messed up, since the TSS descriptor will be corrupted. Verified the assembler and booted. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d37e7e3fd851428dede4d05d3e69d03795a744a tree f830928a0baf81f462bc9176dacbaad2dac2bb65 parent 245067d1674d451855692fcd4647daf9fd47f82d author Zachary Amsden Sat, 03 Sep 2005 15:56:38 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:11 -0700 [PATCH] i386: inline assembler: cleanup and encapsulate descriptor and task register management i386 inline assembler cleanup. This change encapsulates descriptor and task register management. Also, it is possible to improve assembler generation in two cases; savesegment may store the value in a register instead of a memory location, which allows GCC to optimize stack variables into registers, and MOV MEM, SEG is always a 16-bit write to memory, making the casting in math-emu unnecessary. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 245067d1674d451855692fcd4647daf9fd47f82d tree 9e82ee9ce5c1899e0da06622716dffda02e94b15 parent 4bb0d3ec3e5b1e9e2399cdc641b3b6521ac9cdaa author Zachary Amsden Sat, 03 Sep 2005 15:56:37 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:11 -0700 [PATCH] i386: cleanup serialize msr i386 arch cleanup. Introduce the serialize macro to serialize processor state. Why the microcode update needs it I am not quite sure, since wrmsr() is already a serializing instruction, but it is a microcode update, so I will keep the semantic the same, since this could be a timing workaround. As far as I can tell, this has always been there since the original microcode update source. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bb0d3ec3e5b1e9e2399cdc641b3b6521ac9cdaa tree 5e8d7646f5c6a2cec990b6d591f230d496b20664 parent 2a0694d15d55d0deed928786a6393d5e45e37d76 author Zachary Amsden Sat, 03 Sep 2005 15:56:36 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:11 -0700 [PATCH] i386: inline asm cleanup i386 Inline asm cleanup. Use cr/dr accessor functions. Also, a potential bugfix. Also, some CR accessors really should be volatile. Reads from CR0 (numeric state may change in an exception handler), writes to CR4 (flipping CR4.TSD) and reads from CR2 (page fault) prevent instruction re-ordering. I did not add memory clobber to CR3 / CR4 / CR0 updates, as it was not there to begin with, and in no case should kernel memory be clobbered, except when doing a TLB flush, which already has memory clobber. I noticed that page invalidation does not have a memory clobber. I can't find a bug as a result, but there is definitely a potential for a bug here: #define __flush_tlb_single(addr) % __asm__ __volatile__("invlpg %0": :"m" (*(char *) addr)) Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a0694d15d55d0deed928786a6393d5e45e37d76 tree 50b408c01b57b3d77069dc0e3bc1da42423174d3 parent 56f1d5d52a21b93bc2984c920b17e0d80df5d1b2 author Roland McGrath Sat, 03 Sep 2005 15:56:35 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:10 -0700 [PATCH] i386: clean up vDSO alignment padding This makes the vDSO use nops for all its padding around instructions, rather than sometimes zeros, and nop-pads the end of the area containing instructions to a 32-byte cache line, to keep text and data in separate lines. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56f1d5d52a21b93bc2984c920b17e0d80df5d1b2 tree c745389db3c5eda219dc6dadcb096377dc4be2cf parent a1740913cae231fb8e485306fb09671ed9a6e550 author Natalie.Protasevich@unisys.com Sat, 03 Sep 2005 15:56:34 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:10 -0700 [PATCH] ES7000 platform update (i386) This is subarch update for ES7000. I've modified platform check code and removed unnecessary OEM table parsing for newer systems that don't use OEM information during boot. Parsing the table in fact is causing problems, and the platform doesn't get recognized. The patch only affects the ES7000 subach. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1740913cae231fb8e485306fb09671ed9a6e550 tree 60cde26b254d6df2433016cfa1f328b59b00b828 parent 252943efcfce945d8dd3738ca4c4b9cbeb4f3fa9 author Karsten Wiese Sat, 03 Sep 2005 15:56:33 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:10 -0700 [PATCH] via vt8237 apic bypass deassertion quirk The VIA VT8237's IOAPIC sends 'APIC De-Assert Messages' by default, causing another CPU interrupt when the IRQ pin is de-asserted. This feature is switched off by the patch to get rid of doubled ioapic level interrupt rates. Signed-off-by: Karsten Wiese Tested-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 252943efcfce945d8dd3738ca4c4b9cbeb4f3fa9 tree c197c27a57e3cb0af818b304373d2b0e8fd6e40b parent 911a62d42365076209e2c327e7688db296e35d62 author Venkatesh Pallipadi Sat, 03 Sep 2005 15:56:32 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:10 -0700 [PATCH] x86: Add the check for all the cores in a package in cache information Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 911a62d42365076209e2c327e7688db296e35d62 tree 51e6d8525cd3547ea43129b5dd20339655674d57 parent 484b90c4b965d54037ff99b198d84cdf144f8a35 author Venkatesh Pallipadi Sat, 03 Sep 2005 15:56:31 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:10 -0700 [PATCH] x86: sutomatically enable bigsmp when we have more than 8 CPUs i386 generic subarchitecture requires explicit dmi strings or command line to enable bigsmp mode. The patch below removes that restriction, and uses bigsmp as soon as it finds more than 8 logical CPUs, Intel processors and xAPIC support. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 484b90c4b965d54037ff99b198d84cdf144f8a35 tree 559efa2585ee360e610882724500cbe3d5712d98 parent 5fd75ebb1a58c1a3c9e3d9fdf75ce7286b79bb74 author Vivek Goyal Sat, 03 Sep 2005 15:56:31 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] kdump: Save parameter segment in protected mode (x86) o With introduction of kexec as boot-loader, the assumption that parameter segment will always be loaded at lower address than kernel and will be addressable by early bootup page tables is no longer valid. In kexec on panic case parameter segment might well be loaded beyond kernel image and might not be addressable by early boot page tables. o This case might hit in the scenario where user has reserved a chunk of memory for second kernel, for example 16MB to 64MB, and has also built second kernel for physical memory location 16MB. In this case kexec has no choice but to load the parameter segment at a higher address than new kernel image at safe location where new kernel does not stomp it. o Though problem should automatically go away once relocatable kernel for i386 is in place and kexec can determine the location of new kernel at run time and load parameter segment at lower address than kernel image. But till then this patch can go in (assuming it does not break something else). o This patch moves up the boot parameter saving code. Now boot parameters are copied out in protected mode before page tables are initialized. This will ensure that parameter segment is always addressable irrespective of its physical location. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fd75ebb1a58c1a3c9e3d9fdf75ce7286b79bb74 tree 9597e94f20ba1fa317cc05c450e43c8fe80f39ea parent 7ae65fd334232468a9d6b523a4fc141cd6ec5ea4 author Petr Tesarik Sat, 03 Sep 2005 15:56:28 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] vm86: Honor TF bit when emulating an instruction If the virtual 86 machine reaches an instruction which raises a General Protection Fault (such as CLI or STI), the instruction is emulated (in handle_vm86_fault). However, the emulation ignored the TF bit, so the hardware debug interrupt was not invoked after such an emulated instruction (and the DOS debugger missed it). This patch fixes the problem by emulating the hardware debug interrupt as the last action before control is returned to the VM86 program. Signed-off-by: Petr Tesarik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ae65fd334232468a9d6b523a4fc141cd6ec5ea4 tree cbc63abb55033d88f9a631741603a2a379bebee2 parent 4116c527ea9517623369a5b3b037aedde280d672 author Matt Tolentino Sat, 03 Sep 2005 15:56:27 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] x86: fix EFI memory map parsing The memory descriptors that comprise the EFI memory map are not fixed in stone such that the size could change in the future. This uses the memory descriptor size obtained from EFI to iterate over the memory map entries during boot. This enables the removal of an x86 specific pad (and ifdef) in the EFI header. I also couldn't stomach the broken up nature of the function to put EFI runtime calls into virtual mode any longer so I fixed that up a bit as well. For reference, this patch only impacts x86. Signed-off-by: Matt Tolentino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4116c527ea9517623369a5b3b037aedde280d672 tree db09f25e4cb4517d7afb911d88478d376dc1b3dd parent 869f96a00e8f53c7db8470ca9cf72e2e3fa40119 author Venkatesh Pallipadi Sat, 03 Sep 2005 15:56:27 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] hpet: use read_timer_tsc only when CPU has TSC Only use read_timer_tsc only when CPU has TSC. Thanks to Andrea for pointing this out. Should not be issue on any platforms as all recent systems that has HPET also has CPUs that supports TSC. The patch is still required for correctness. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 869f96a00e8f53c7db8470ca9cf72e2e3fa40119 tree e28e526eb0e9d304d79dab3a20c944959a6ee38e parent 7e06066b87ffd2c7a7f4c3f1c612293307270976 author Ingo Molnar Sat, 03 Sep 2005 15:56:26 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] x86: compress the stack layout of do_page_fault() This patch pushes the creation of a rare signal frame (SIGBUS or SIGSEGV) into a separate function, thus saving stackspace in the main do_page_fault() stackframe. The effect is 132 bytes less of stack used by the typical do_page_fault() invocation - resulting in a denser cache-layout. (Another minor effect is that in case of kernel crashes that come from a pagefault, we add less space to the already existing frame, giving the crash functions a slightly higher chance to do their stuff without overflowing the stack.) (The changes also result in slightly cleaner code.) argument bugfix from "Guillaume C." Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e06066b87ffd2c7a7f4c3f1c612293307270976 tree 594abc766ea11011685573dc47a626b5fa0b6b97 parent 59df6bbf386d8f26870b28307d0e4f06d631685f author Adrian Bunk Sat, 03 Sep 2005 15:56:24 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:09 -0700 [PATCH] arch/sh64/Kconfig: doesn't need it's own LOG_BUF_SHIFT The LOG_BUF_SHIFT from lib/Kconfig.debug is sufficient. Signed-off-by: Adrian Bunk Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59df6bbf386d8f26870b28307d0e4f06d631685f tree 37e6fc9afe4455defde14f307999692a080eded1 parent 6fe7f2578fb4903af79abeb29bb9b9ab5eace1b5 author Ralf Baechle Sat, 03 Sep 2005 15:56:23 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: kludge envdev to build for 64-bit MIPS with 32-bit compat Extend the compat mode kludgeology in envdev to cover MIPS as well. Or why we should need something like is_compat_task() ... Signed-off-by: Ralf Baechle Cc: Vojtech Pavlik Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fe7f2578fb4903af79abeb29bb9b9ab5eace1b5 tree 868d2c5c42aa890fb55b75b0f9465c72c637dbe8 parent 766160c29fadbafad1d6eb5e965922c7e78beb88 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:23 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: remove timex.h for vr41xx vr41xx doesn't need mach-vr41xx/timex.h. This patch has removed mach-vr41xx/timex.h. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 766160c29fadbafad1d6eb5e965922c7e78beb88 tree 20641faf983fd27760cf476da9b956bd78c778d4 parent ed5ba2fbc6d03c41c4c3334648a6569bc42da764 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:22 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: fix build warnings This patch has fixed the following warnings. arch/mips/kernel/genex.S:250:5: warning: "CONFIG_64BIT" is not defined arch/mips/math-emu/cp1emu.c:1128:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:1206:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:1270:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:323:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:808:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:953:5: warning: "__mips64" is not defined arch/mips/mm/tlbex.c:519:5: warning: "CONFIG_64BIT" is not defined include/asm/reg.h:73:5: warning: "CONFIG_64BIT" is not defined Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed5ba2fbc6d03c41c4c3334648a6569bc42da764 tree 0966a70448c57a9341d8900732aa34a8811158e7 parent e63ea56fe2669c20f4668d89522500f4ab439b04 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:21 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: add more SYS_SUPPORT_*_KERNEL and CPU_SUPPORTS_*_KERNEL The addtion of SYS_SUPPORTS_*_KERNEL and CPU_SUPPORTS_*_KERNEL is halfway. This patch has added more SYS_SUPPORTS_*_KERNEL and CPU_SUPPORTS_*_KERNEL to arch/mips/Kconfig. Please apply. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e63ea56fe2669c20f4668d89522500f4ab439b04 tree 74f1eca199852ad6dbaf70bdc90d755b0e598d98 parent e2de84920d9489f7fd87fa4b04d996d569def4fa author Yoichi Yuasa Sat, 03 Sep 2005 15:56:20 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: add pcibios_bus_to_resource This patch has added pcibios_bus_to_resource to MIPS. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2de84920d9489f7fd87fa4b04d996d569def4fa tree 85dbab6cbb94a4e8db9b54869607f312f313ef4e parent 4ce588cd563e6b817adb0c7d03b3ed9c74cadc27 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:19 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:08 -0700 [PATCH] mips: add pcibios_select_root Add pcibios_select_root to MIPS. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ce588cd563e6b817adb0c7d03b3ed9c74cadc27 tree a20158d65f21e9fcf2ef9a7c50462905adfec248 parent 42a3b4f25af8f8d77feddf27f839fa0628dbff1a author Ralf Baechle Sat, 03 Sep 2005 15:56:19 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:07 -0700 [PATCH] mips: fix coherency configuration Fix the MIPS coherency configuration such that we always keep the mapping state in when we need to on non-coherent platforms. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42a3b4f25af8f8d77feddf27f839fa0628dbff1a tree 332370ff3889fabb66a45fb5dcf605b142de77c8 parent 875d43e72b5bf22161a81de7554f88eccf8a51ae author Ralf Baechle Sat, 03 Sep 2005 15:56:17 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:07 -0700 [PATCH] mips: nuke trailing whitespace Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 875d43e72b5bf22161a81de7554f88eccf8a51ae tree a676fe7298b478b7ee9fe7be9cb07c9a0b928370 parent 63fb6fd1c86181d9dd9ba0e6e6082799e149b56b author Ralf Baechle Sat, 03 Sep 2005 15:56:16 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:06 -0700 [PATCH] mips: clean up 32/64-bit configuration Start cleaning 32-bit vs. 64-bit configuration. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63fb6fd1c86181d9dd9ba0e6e6082799e149b56b tree 20270b17e4861440480e4a047b97a4c49fa7fe9d parent e07a7235dd05891a8c1695213ae1f2b48b09f69e author Yoichi Yuasa Sat, 03 Sep 2005 15:56:16 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:05 -0700 [PATCH] mips: changed from VR41xx to VR4100 series in Kconfig This patch has changed from VR41XX to VR4100 series in arch/mips/Kconfig. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e07a7235dd05891a8c1695213ae1f2b48b09f69e tree 31c3bc8c8d5620f0082f9868e7ceeb58c13faa5b parent 466adc66cf6eea0268c8678834c8c6a56e5a2f9e author Yoichi Yuasa Sat, 03 Sep 2005 15:56:15 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:05 -0700 [PATCH] mips: remove vrc4171 config This patch has removed obsolete VRC4171 config. Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 466adc66cf6eea0268c8678834c8c6a56e5a2f9e tree 7a75c4fd4eb917d351dfe9b3835a1f21788b7379 parent 8dd4aebe49b24348e48581af835ac41c8e483d68 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:14 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:04 -0700 [PATCH] fix warning of TANBAC_TB0219 in drivers/char/Kconfig $ make menuconfig scripts/kconfig/mconf arch/i386/Kconfig drivers/char/Kconfig:847:warning: 'select' used by config symbol 'TANBAC_TB0219' refer to undefined symbol 'PCI_VR41XX' Here is a patch for this warning fix. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dd4aebe49b24348e48581af835ac41c8e483d68 tree 513763f0800e821f41b36db59901942c713016c8 parent 63b799f9ded82444212afdcf61379a247d544909 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:14 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:04 -0700 [PATCH] mips: add default select configs for vr41xx This patch has added default select configs for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63b799f9ded82444212afdcf61379a247d544909 tree 11ecaac941b06cd0b97b82feeea1d3f739320de6 parent dc4ec916f6ea0c2818e9b81c4e9b33231f5f70e4 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:13 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:04 -0700 [PATCH] mips: add TANBAC VR4131 multichip module This patch has added TANBAC VR4131 multichip module in arch/mips/Kconfig Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc4ec916f6ea0c2818e9b81c4e9b33231f5f70e4 tree 924ed13c0f331036d550a79a8ce06849abdaacb9 parent 07119621e62de0a2c8db6e4896e762c498bfdd17 author Ralf Baechle Sat, 03 Sep 2005 15:56:12 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:04 -0700 [PATCH] MIPS Technologies PCI ID bits - MIPS Denmark does no longer exist; the PCI vendor ID is now owned by MIPS Technologies. - Add ID for SOC-it, MIPS's system controller. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07119621e62de0a2c8db6e4896e762c498bfdd17 tree c62dd52e8072235c8148e7f31b16ed30c5e45343 parent 7901c7998267d9d8c3f1b226a8c8cfd7f8e48a01 author Ralf Baechle Sat, 03 Sep 2005 15:56:11 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:04 -0700 [PATCH] mips: add support for Qemu system architecture Add support for the virtual MIPS system that is emulated by Qemu. See http://www.linux-mips.org/wiki/Qemu for a detailed current status. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7901c7998267d9d8c3f1b226a8c8cfd7f8e48a01 tree 4c1305130a69859354b3be336d5119d8c660b44d parent af690a948cc545d1eca19acab23016b96e178dcf author Ralf Baechle Sat, 03 Sep 2005 15:56:11 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] DEC PMAGB B framebuffer update Revive HX frame buffer support for 2.6. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af690a948cc545d1eca19acab23016b96e178dcf tree 74d3a6d343b877254add9081082ef7cbbe405d7d parent 61838ffeee8296de8bfee751e9ad67bf6c61d0b4 author Ralf Baechle Sat, 03 Sep 2005 15:56:09 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] DEC PMAG BA frame buffer update Rewrite PMAG BA frame buffer driver for 2.6. Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61838ffeee8296de8bfee751e9ad67bf6c61d0b4 tree ef515c86a475ebbfb0d5273f16e02e57adc5cfa7 parent 003b54925e2ac78306f74ac433126ad5de387f7a author Ralf Baechle Sat, 03 Sep 2005 15:56:09 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] DEC PMAG AA framebuffer update Get it working again. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 003b54925e2ac78306f74ac433126ad5de387f7a tree 25ca457509fe4bdcf085c184d8bd450447b371c4 parent ab1418a31619a47d78843c20b5fa2245c29824ca author Ralf Baechle Sat, 03 Sep 2005 15:56:08 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] mips: remove HP Laserjet remains Remove the one file which managed to survive the removel of HP Laserjet support. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab1418a31619a47d78843c20b5fa2245c29824ca tree 93b3608b8b46459e9c91ff443504c577f63b6c87 parent 0ad7305f52bc8880d50a6471c90d35a6768f2865 author Adrian Bunk Sat, 03 Sep 2005 15:56:07 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] more vr4181 removal Signed-off-by: Adrian Bunk Cc: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ad7305f52bc8880d50a6471c90d35a6768f2865 tree 518881896021448a6c917523342ef9cdba4ec84b parent 0fdda107e10133583f31c72326959555bfb61042 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:07 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:03 -0700 [PATCH] mips: moreover remove vr4181 We also need this patch for removing mips vr4181. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fdda107e10133583f31c72326959555bfb61042 tree 0173750da11cd60fbe9b2062349ad473401bfe4c parent 8bb670c1407c2a4890810fd3e348dac1b89e669e author Ralf Baechle Sat, 03 Sep 2005 15:56:06 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:02 -0700 [PATCH] mips: remove VR4181 support There seem to be no more users or interest in the NEC Osprey evaluation system for the NEC VR4181 SOC which is an old part anyway, so remove the code. More information on the Osprey can be found at http://www.linux-mips.org/wiki/Osprey. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bb670c1407c2a4890810fd3e348dac1b89e669e tree a001088c4c8fe47fee724f883ed710a76fb192a6 parent 979934da9e7a0005bd9c8b1d7d00febb59ff67f7 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:05 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:02 -0700 [PATCH] mips: change system type name in proc for vr41xx This patch has changed system type name in proc for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 979934da9e7a0005bd9c8b1d7d00febb59ff67f7 tree e42728186c3efaccfa9da1dd2103090846d0c9fc parent 006cfb51ad12047497a2a5ad796fb8914a1bc487 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:04 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:02 -0700 [PATCH] mips: update IRQ handling for vr41xx This patch has updated IRQ handling for vr41xx. o added common IRQ dispatch o changed IRQ number in int-handler.S o added resource management to icu.c Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 006cfb51ad12047497a2a5ad796fb8914a1bc487 tree 0cb543eb4a0640d6df1a81e5acb08da407767cca parent 0ba06ba6a142247589711b46f9ca7908adc21e21 author Yoichi Yuasa Sat, 03 Sep 2005 15:56:03 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] mips: remove obsolete GIU function call for vr41xx This patch has removed obsolete GIU function call for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ba06ba6a142247589711b46f9ca7908adc21e21 tree e4fa1aa6de5ab65e251467f685375a7736306a1f parent 0287ebedfa032a57bb47f4bc5cb5e268ecd844ad author Jesper Juhl Sat, 03 Sep 2005 15:56:02 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] frv: Remove export of strtok() Signed-off-by: Jesper Juhl Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0287ebedfa032a57bb47f4bc5cb5e268ecd844ad tree a30b87a024e4cedcc0fdcb242e7511f8a4c22aaf parent 233ccd0d0452682edb51725410e0f8c0384e8b34 author Nishanth Aravamudan Sat, 03 Sep 2005 15:56:01 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] ppc64: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() in ppc64-specific code to cleanup/simplify the sleeping logic. Change the units of the parameter of do_event_scan_all_cpus() to milliseconds from jiffies. The return value of rtas_extended_busy_delay_time() was incorrectly being used as a jiffies value (it is actually milliseconds), which is fixed by using the value as a parameter to msleep_interruptible(). Also, use rtas_extended_busy_delay_time() in another case where similar logic is duplicated. Signed-off-by: Nishanth Aravamudan Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 233ccd0d0452682edb51725410e0f8c0384e8b34 tree 061f94c9d9b15087328095b4b4ab1b26aa6cadd2 parent b749bfcd1be72f8cb8310e1cac12825bda029432 author Olof Johansson Sat, 03 Sep 2005 15:55:59 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] ppc64: Add VMX save flag to VPA We need to indicate to the hypervisor that it needs to save our VMX registers when switching partitions on a shared-processor system, just as it needs to for FP and PMC registers. This could be made to be on-demand when VMX is used, but we don't do that for FP nor PMC right now either so let's not overcomplicate things. Signed-off-by: Olof Johansson Acked-by: Paul Mackerras Cc: Anton Blanchard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b749bfcd1be72f8cb8310e1cac12825bda029432 tree e3555f1e17f9fd83ad49f7f92ba6dfa7f20e7052 parent f54bef9e9c84c8dc656c55dc96c1da7b6d1c53d8 author Olaf Hering Sat, 03 Sep 2005 15:55:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] ppc64: update xmon helptext xmon will do nothing but noise on a G5 if BOOTX_TEXT is not enabled. mention the recognized kernel cmdline options for xmon. Signed-off-by: Olaf Hering Cc: Paul Mackeras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f54bef9e9c84c8dc656c55dc96c1da7b6d1c53d8 tree de93df49c67ebf63aeca64941a201365440e9551 parent f4c6cc8d1e2305796f7fdad52d83b88cea4d2276 author Mark A. Greer Sat, 03 Sep 2005 15:55:57 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:01 -0700 [PATCH] ppc32: cpci690 updates Update the cpci690 platform code: - pass mem size in from bootwrapper via bi_rec - some minor fixups Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4c6cc8d1e2305796f7fdad52d83b88cea4d2276 tree be172cb018dd5bf26d76114f4b4549c772359e39 parent d01c08c9ae91c1526d4564b400b3e0e04b49d1ba author Mark A. Greer Sat, 03 Sep 2005 15:55:57 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:00 -0700 [PATCH] ppc32: katana updates Update the katana platform support code: - if booted as zImage, pass mem size in via bi_req from bootwrapper - if booted as uImage, get mem size from bd_info passed in from u-boot - add support for 82544 present on katana 752i's - set cacheline size on pci devices - some minor fixups Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d01c08c9ae91c1526d4564b400b3e0e04b49d1ba tree a1cc06a5342fdaf6185d2655a636cc181d56cb08 parent bbde630b553d349307fe719486bc06f8cf9c1a2d author Mark A. Greer Sat, 03 Sep 2005 15:55:56 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:00 -0700 [PATCH] ppc32: mv64x60 updates & enhancements Updates and enhancement to the ppc32 mv64x60 code: - move code to get mem size from mem ctlr to bootwrapper - address some errata in the mv64360 pic code - some minor cleanups - export one of the bridge's regs via sysfs so user daemon can watch for extraction events Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbde630b553d349307fe719486bc06f8cf9c1a2d tree de7a71a39423c907301dd4eab6ccf31736227c24 parent e8834801bf9e2ee96c3ac29adf0ff6840afcd841 author Kumar Gala Sat, 03 Sep 2005 15:55:55 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:00 -0700 [PATCH] ppc32: Added cputable entry for 7448 Added cputable entry for 7448 as well adding it to checks for saving and restoring of cpu state. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8834801bf9e2ee96c3ac29adf0ff6840afcd841 tree 03b26322908b7f87600763dd110c76f55e541cbe parent 3a0a401b40abe31b34673a190c57697e7eced149 author Eugene Surovegin Sat, 03 Sep 2005 15:55:54 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:00 -0700 [PATCH] ppc32: export cacheable_memcpy() Add declaration and cacheable_memcpy(). I'll be needing this function in new 4xx EMAC driver I'm going to submit to netdev soon. IMHO, the better place for the declaration would be asm-powerpc/string.h, unfortunately, ppc64 doesn't have this function, so asm-ppc/system.h is the next best place. Signed-off-by: Eugene Surovegin Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a0a401b40abe31b34673a190c57697e7eced149 tree 06f90cb48509877d6a162c63acfd452ab350abe4 parent 28fa031e765b808520173f750bafbade832ba909 author Eugene Surovegin Sat, 03 Sep 2005 15:55:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:06:00 -0700 [PATCH] ppc32: add dcr_base field to ocp_func_mal_data Add dcr_base field to ocp_func_mal_data. This is preparation step for the new EMAC driver. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28fa031e765b808520173f750bafbade832ba909 tree 62318206567f6c4e868438f407614a6571d227e1 parent 7c31625aa844d549cbb8a7aafb94ec4fde8b54a3 author Eugene Surovegin Sat, 03 Sep 2005 15:55:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: move 4xx PHY_MODE_XXX defines to ibm_ocp.h Move 4xx PHY_MODE_XXX defines to asm-ppc/ibm_ocp.h. This is a preparation step for the new EMAC driver. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c31625aa844d549cbb8a7aafb94ec4fde8b54a3 tree 7ef3428f805cf3c9ec1ae1f1e04d5700eadfc0fe parent ac1ff0477cbe640a6a3652a0cd1aa78026f19246 author Arthur Othieno Sat, 03 Sep 2005 15:55:52 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: Add cputable entry for 750CXe DD2.4 ("Gekko") Add a table entry for 750CXe DD2.4 ("Gekko") as found in the GameCube from Nintendo: http://www-306.ibm.com/chips/techlib/techlib.nsf/techdocs/291C8D0EF3EAEC1687256B72005C745C#C1 Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac1ff0477cbe640a6a3652a0cd1aa78026f19246 tree f23577ee164c0ce7427fec85bc5c288c8251d13a parent 66d2cc95d14b5d750a9c58209fddb62eb139eaab author Arthur Othieno Sat, 03 Sep 2005 15:55:51 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: Re-order cputable for 750CXe DD2.4 entry "745/755" (pvr_value:0x00083000) is a catch-all entry. Since arch/ppc/kernel/misc.S:identify_cpu() returns on first match, move this lower in the table so 750CXe DD2.4 (pvr_value:0x00083214) may be correctly enumerated. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66d2cc95d14b5d750a9c58209fddb62eb139eaab tree 7397b11eeb20801423e88975ecc1a79a81cf70e4 parent cc9c540b6c4c883d7ff250c17647dedfa4184ca6 author Kumar Gala Sat, 03 Sep 2005 15:55:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: Added PCI support MPC83xx Adds support for the two PCI busses on MPC83xx and the MPC834x SYS/PIBS reference board. The code initializes PCI inbound/outbound windows, allocates and registers PCI memory/io space. Be aware that setup of the PCI buses on the PIBs board is expected to be done by the firmware. Signed-off-by: Tony Li Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc9c540b6c4c883d7ff250c17647dedfa4184ca6 tree 185cbe3c5f5e88550956106c42c6f33f1f630626 parent 3acb23440f90b03b19846d2b3a005dcbf61a55cf author Lee Nicks Sat, 03 Sep 2005 15:55:49 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: defconfig for Marvell EV64360BP board Here is the default configuration for Marvell EV64360BP board. It has been tested on the board. Signed-off-by: Lee Nicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3acb23440f90b03b19846d2b3a005dcbf61a55cf tree 6c2c7feac536b1ee5a9bedf3342e4c81ca47a9bc parent 164ada643ddf4f492a206b9bf2f2b02918b618da author Lee Nicks Sat, 03 Sep 2005 15:55:48 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:59 -0700 [PATCH] ppc32: add support for Marvell EV64360BP board This patch adds support for Marvell EV64360BP board. So far, it supports mpsc serial console, gigabit ethernet, jffs2 root filesystem, etc. Other device support, like watchdog, RTC, will be added later. Signed-off-by: Lee Nicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 164ada643ddf4f492a206b9bf2f2b02918b618da tree 863031d8844e223ed50b782506ded5e0d4e8ddb0 parent 88adfe70c667c9e8fe5ec68eba78af566b539e24 author Kumar Gala Sat, 03 Sep 2005 15:55:47 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:58 -0700 [PATCH] ppc32: add CONFIG_HZ While ppc32 has the CONFIG_HZ Kconfig option, it wasnt actually being used. Connect it up and set all platforms to 250Hz. This pretty much mimics the ppc64 patch from Anton Blanchard. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88adfe70c667c9e8fe5ec68eba78af566b539e24 tree d5aab7e39596b537bcc202ed9b20e4405eccc57e parent fa71f0e0f541e65280fdb9d60b142012f1951b7c author Kumar Gala Sat, 03 Sep 2005 15:55:46 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:58 -0700 [PATCH] ppc32: ppc_sys system on chip identification additions Add the ability to identify an SOC by a name and id. There are cases in which the integer identifier is not sufficient to specify a specific SOC. In these cases we can use a string to further qualify the match. Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa71f0e0f541e65280fdb9d60b142012f1951b7c tree 6141a2379535b8fde4d0d17b4478ddba08998a87 parent cc506644202d23bcf115999ee911a53f177ce682 author Eugene Surovegin Sat, 03 Sep 2005 15:55:45 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:58 -0700 [PATCH] ppc32: disable IBM405_ERR77 and IBM405_ERR51 workarounds for 405EP Disable IBM405_ERR77 and IBM405_ERR51 errata workarounds for 405EP. This chip has these problems fixed. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc506644202d23bcf115999ee911a53f177ce682 tree e08a245cd3916a0012a776241c63c8e5aad2ffed parent cce9d7e36f92f2d48de8c701b65ad27e76fedd02 author Eugene Surovegin Sat, 03 Sep 2005 15:55:45 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:58 -0700 [PATCH] ppc32: fix Bamboo and Luan build warnings Fix STD_UART_OP definitions in Bamboo and Luan board ports which were causing "initialization makes pointer from integer without a cast" warnings. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cce9d7e36f92f2d48de8c701b65ad27e76fedd02 tree dd871e371519a05de0cd72459eb11262fb3ba095 parent 5a6a4d4320aed1918bf79dfb6bd841317f33b8e9 author Eugene Surovegin Sat, 03 Sep 2005 15:55:44 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:58 -0700 [PATCH] ppc32: fix EMAC Tx channel assignments for NPe405H Fix PowerPC NPe405H EMAC Tx channel assignments. EMAC unit in this chip uses common for 4xx "two Tx / one Rx" configuration. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a6a4d4320aed1918bf79dfb6bd841317f33b8e9 tree 6a66ffee8d8ff875cc07bc1cecd2b1f36df81c9a parent 656de7e46901fe3228b592e1d9fc89c353f0fa4e author Roland Dreier Sat, 03 Sep 2005 15:55:43 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:57 -0700 [PATCH] ppc32: Don't sleep in flush_dcache_icache_page() flush_dcache_icache_page() will be called on an instruction page fault. We can't sleep in the fault handler, so use kmap_atomic() instead of just kmap() for the Book-E case. Signed-off-by: Roland Dreier Acked-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 656de7e46901fe3228b592e1d9fc89c353f0fa4e tree e2d354af516f02e381558f9d525b16456425fe6a parent ac6295c289f205bed59b1edfdc4518468db7b1cb author Matt Porter Sat, 03 Sep 2005 15:55:42 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:57 -0700 [PATCH] ppc32: add cputable entry for 440SP Rev. A Adds the appropriate cputable entry for PPC440SP so cache line sizes are configured correctly. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac6295c289f205bed59b1edfdc4518468db7b1cb tree c97f3bf20041ff445489972f9b71b369a1705a2e parent 9149fb3b8e6913eeb0c80010afef9c55892f6e61 author Kumar Gala Sat, 03 Sep 2005 15:55:41 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:57 -0700 [PATCH] ppc32: removed find_name.c No one uses find_name.c and no one seems to care about either. So I'm removing it. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9149fb3b8e6913eeb0c80010afef9c55892f6e61 tree 1da8ba4071cd8f67df2ede07522d052dc6ba04d7 parent 39cdc4bfb5c587c617ab6a28083c19101154e149 author Eugene Surovegin Sat, 03 Sep 2005 15:55:40 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:57 -0700 [PATCH] ppc32: add 440GX rev.F cputable entry Add PowerPC 440GX rev.F cputable entry. Signed-off-by: Eugene Surovegin Cc: Benjamin Herrenschmidt Cc: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39cdc4bfb5c587c617ab6a28083c19101154e149 tree fce5cd394602d0a003124910d32833e9b9f65d68 parent b0531b9b3299f3066b1db78f1693edabbba08b5c author Kumar Gala Sat, 03 Sep 2005 15:55:39 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:57 -0700 [PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables Renamed global variables used to convey if the watchdog is enabled and periodicity of the timer and moved the declarations into a header for these variables Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0531b9b3299f3066b1db78f1693edabbba08b5c tree 1f4d3cb62eca4c12b95b4896357514dfa854acb7 parent 638861d54eec6b04a88d5d8df8b790d87de80b8d author Kumar Gala Sat, 03 Sep 2005 15:55:38 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] cpm_uart: Fix baseaddress for SMC 1 and 2 Base addess register for SMC 1 and 2 are never initialized. This means that they will not work unless a bootloader already configured them. The DPRAM already have space reserved, this patch just makes sure the base addess register is updated correctly on initialization. Signed-off-by: Rune Torgersen Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 638861d54eec6b04a88d5d8df8b790d87de80b8d tree 1ebb80d55a39369620dbb041244cdd3ce794fb8f parent 0d8ba1a9793302fdcee3d6d4133c455023ca8ce9 author Kumar Gala Sat, 03 Sep 2005 15:55:37 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] cpm_uart: use schedule_timeout instead of direct call to schedule use schedule_timeout instead of direct call to schedule Signed-off-by: Marcelo Tosatti Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d8ba1a9793302fdcee3d6d4133c455023ca8ce9 tree 6fa9483da37eb5ce02314420d99c49b3479da556 parent 2698ebcb4338f09206b5accd75bc5cf2ed3dc641 author Kumar Gala Sat, 03 Sep 2005 15:55:36 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] cpm_uart: Fix 2nd serial port on MPC8560 ADS The 2nd serial port on the MPC8560 ADS was not being configured correctly and thus could not be used as a console. Updated the defconfig for the board to configure the proper SCC channel for the 2nd serial port. Signed-off-by: Roy Zang Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2698ebcb4338f09206b5accd75bc5cf2ed3dc641 tree 36d594ab86d57a558edc143de2ece41597c8a13b parent 8e8fff09756bdb799154d034c63033192d6f8f89 author Matt Porter Sat, 03 Sep 2005 15:55:35 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] ppc32: add phy excluded features to ocp_func_emac_data This patch adds a field to struct ocp_func_emac_data that allows platform-specific unsupported PHY features to be passed in to the ibm_emac ethernet driver. This patch also adds some logic for the Bamboo eval board to populate this field based on the dip switches on the board. This is a workaround for the improperly biased RJ-45 sockets on the Rev. 0 Bamboo. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e8fff09756bdb799154d034c63033192d6f8f89 tree db3dcdb7f7a98d983c117a0ad80941fad90df318 parent a2f40ccd294d14e5aca464c1913e8e0d8de35fca author Kumar Gala Sat, 03 Sep 2005 15:55:34 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] ppc32: Add ppc_sys descriptions for PowerQUICC II devices Added ppc_sys device and system definitions for PowerQUICC II devices. This will allow drivers for PQ2 to be proper platform device drivers. Which can be shared on PQ3 processors with the same peripherals. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2f40ccd294d14e5aca464c1913e8e0d8de35fca tree d900ebdbf37656d77acf7934db40021b21d49fde parent 886b9fa49900b055e20cd98f379fda49835d1ee6 author Kumar Gala Sat, 03 Sep 2005 15:55:33 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:56 -0700 [PATCH] ppc32: Added support for the Book-E style Watchdog Timer PowerPC 40x and Book-E processors support a watchdog timer at the processor core level. The timer has implementation dependent timeout frequencies that can be configured by software. One the first Watchdog timeout we get a critical exception. It is left to board specific code to determine what should happen at this point. If nothing is done and another timeout period expires the processor may attempt to reset the machine. Command line parameters: wdt=0 : disable watchdog (default) wdt=1 : enable watchdog wdt_period=N : N sets the value of the Watchdog Timer Period. The Watchdog Timer Period meaning is implementation specific. Check User Manual for the processor for more details. This patch is based off of work done by Takeharu Kato. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 886b9fa49900b055e20cd98f379fda49835d1ee6 tree f4156ed32dcec8962661d7bdf2584524a91a8786 parent d27477c2259488825f2f425d24f209a1b6f8dc7d author Matt Porter Sat, 03 Sep 2005 15:55:32 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:55 -0700 [PATCH] ppc32: Add usb support to IBM stb04xxx platforms Support ochi-ppc-soc.c on IBM stb04xxx platforms Signed-off-by: Dale Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27477c2259488825f2f425d24f209a1b6f8dc7d tree d261e331c2f27f4899fd956470049dac35d3de6b parent 617bf9a47f017b7e91dab9ef9bdaaeaee24163a7 author Christoph Hellwig Sat, 03 Sep 2005 15:55:31 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:55 -0700 [PATCH] ppc32: fix asm-ppc/dma-mapping.h sparse warning GFP flags must be passed as unisgned int __nocast these days, else we'll get tons of sparse warnings in every driver. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617bf9a47f017b7e91dab9ef9bdaaeaee24163a7 tree fb60e409527908cf5fae83d256f5a60a09e8ae89 parent f4ad35a34bdc27ae18f97d684ca0e693bbffd5f5 author Kumar Gala Sat, 03 Sep 2005 15:55:30 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:55 -0700 [PATCH] ppc32: Remove board support for PCORE Support for the PCORE board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4ad35a34bdc27ae18f97d684ca0e693bbffd5f5 tree 3f238e3c86297b9fffb94984b0885912ba1d467b parent 8b1a97776d0e4ad76e1e350e7ec1f4406af5f9e1 author Kumar Gala Sat, 03 Sep 2005 15:55:29 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:55 -0700 [PATCH] ppc32: Remove board support for SPD823TS Support for the SPD823TS board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b1a97776d0e4ad76e1e350e7ec1f4406af5f9e1 tree dda38f9e23ef8d1c6531a34ed9243533c74a5f9f parent ea08dcfa5439acaf33660e372d44fc049a90b121 author Kumar Gala Sat, 03 Sep 2005 15:55:28 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:55 -0700 [PATCH] ppc32: Remove board support for SM850 Support for the SM850 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea08dcfa5439acaf33660e372d44fc049a90b121 tree 860427d0839b7501db795cf1065171da0172996b parent d2d34169cc9834f29dac0b02f95022b1e0b97e52 author Kumar Gala Sat, 03 Sep 2005 15:55:28 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:54 -0700 [PATCH] ppc32: Remove board support for REDWOOD Support for the REDWOOD board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2d34169cc9834f29dac0b02f95022b1e0b97e52 tree 4b79c71df45c60b0b5ff246034ab2723fe85d275 parent 37330c9146767fd4f5eb147b01cb500eabf773cf author Kumar Gala Sat, 03 Sep 2005 15:55:27 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:54 -0700 [PATCH] ppc32: Remove board support for RAINIER Support for the RAINIER board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37330c9146767fd4f5eb147b01cb500eabf773cf tree 24c39b09fe8d1394a952672ffea09b3a43c6950d parent 6db789b6a3a9ee41b22de3980748af85f7dbe416 author Kumar Gala Sat, 03 Sep 2005 15:55:26 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:54 -0700 [PATCH] ppc32: Remove board support for OAK Support for the OAK board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6db789b6a3a9ee41b22de3980748af85f7dbe416 tree 1759d89c2f6bb1ad396e4358f0d6c975495d3712 parent 89d7f53030baa2616eb2fe87cbc19bc73111a78e author Kumar Gala Sat, 03 Sep 2005 15:55:25 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:54 -0700 [PATCH] ppc32: Remove board support for MENF1 Support for the MENF1 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d7f53030baa2616eb2fe87cbc19bc73111a78e tree d8d851a37b0236e7be6d54f58d86a41ab93f879d parent ba9d1e2a3da505f0574751c3041bbc307c30aeca author Kumar Gala Sat, 03 Sep 2005 15:55:24 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:54 -0700 [PATCH] ppc32: Remove board support for MCPN765 Support for the MCPN765 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9d1e2a3da505f0574751c3041bbc307c30aeca tree 4020932fbdfcee1172bd85db63dbe5a1effb2091 parent 94cb20e951511051367493a1399e16eb1a7433ae author Kumar Gala Sat, 03 Sep 2005 15:55:23 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:53 -0700 [PATCH] ppc32: Remove board support for K2 Support for the K2 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94cb20e951511051367493a1399e16eb1a7433ae tree da5f98eb56ca62dd166eec948141fee1d0b1f015 parent b8bc6cedb272542ca401dfb01b17bf11ecb56a8c author Kumar Gala Sat, 03 Sep 2005 15:55:23 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:53 -0700 [PATCH] ppc32: Remove defconfig for CEDAR Support for the CEDAR board no longer exists, removing the defconfig for it Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8bc6cedb272542ca401dfb01b17bf11ecb56a8c tree 14d1211609efcc0dad4373421b28df4aede13a1b parent f4f1269cb36adfb452c04dcb3d40f51b8a1956bb author Kumar Gala Sat, 03 Sep 2005 15:55:22 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:53 -0700 [PATCH] ppc32: Remove board support for BEECH Support for the BEECH board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4f1269cb36adfb452c04dcb3d40f51b8a1956bb tree f078687fe13c314dabb8c68e1f50f8d99632b500 parent a3800d8ffa0a91f3047cbfa82e435d483ffc8dd4 author Kumar Gala Sat, 03 Sep 2005 15:55:21 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:53 -0700 [PATCH] ppc32: Remove board support for ASH Support for the ASH board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3800d8ffa0a91f3047cbfa82e435d483ffc8dd4 tree 9f21eecb73886b4fe6b53d2427e2ad7f43005e40 parent 4b4dc82247184504ba6d0689566a25d03eb1095c author Kumar Gala Sat, 03 Sep 2005 15:55:20 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:52 -0700 [PATCH] ppc32: Remove board support for ADIR Support for the ADIR board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b4dc82247184504ba6d0689566a25d03eb1095c tree 75c80bbe325ee4dbd825ec7718ff9a0e228b4349 parent f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 author Adrian Bunk Sat, 03 Sep 2005 15:55:19 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:52 -0700 [PATCH] arch/ppc/kernel/ppc_ksyms.c: remove unused #define EXPORT_SYMTAB_STROPS This #define is only used on sparc. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 tree 40d827736575f2a8c489761599e9a1e5e45005be parent b5bf6c55edf94e9c7fc01724d5b271f78eaf1d3f author Stephen Smalley Sat, 03 Sep 2005 15:55:18 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:52 -0700 [PATCH] Generic VFS fallback for security xattrs This patch modifies the VFS setxattr, getxattr, and listxattr code to fall back to the security module for security xattrs if the filesystem does not support xattrs natively. This allows security modules to export the incore inode security label information to userspace even if the filesystem does not provide xattr storage, and eliminates the need to individually patch various pseudo filesystem types to provide such access. The patch removes the existing xattr code from devpts and tmpfs as it is then no longer needed. The patch restructures the code flow slightly to reduce duplication between the normal path and the fallback path, but this should only have one user-visible side effect - a program may get -EACCES rather than -EOPNOTSUPP if policy denied access but the filesystem didn't support the operation anyway. Note that the post_setxattr hook call is not needed in the fallback case, as the inode_setsecurity hook call handles the incore inode security state update directly. In contrast, we do call fsnotify in both cases. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5bf6c55edf94e9c7fc01724d5b271f78eaf1d3f tree 0f2be4478fa5886f467fce8b4a8d56b5e8dbed46 parent 782ebb992ec20b5afdd5786ee8c2f1b58b631f24 author Alexey Dobriyan Sat, 03 Sep 2005 15:55:17 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:51 -0700 [PATCH] selinux: endian notations This patch adds endian notations to the SELinux code. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 782ebb992ec20b5afdd5786ee8c2f1b58b631f24 tree adf0af44fa591d803ec6b9ab7541ff3e5745dd93 parent 720d6c29e146e96cca858057469951e91e0e6850 author Stephen Smalley Sat, 03 Sep 2005 15:55:16 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:50 -0700 [PATCH] selinux: Reduce memory use by avtab This patch improves memory use by SELinux by both reducing the avtab node size and reducing the number of avtab nodes. The memory savings are substantial, e.g. on a 64-bit system after boot, James Morris reported the following data for the targeted and strict policies: #objs objsize kernmem Targeted: Before: 237888 40 9.1MB After: 19968 24 468KB Strict: Before: 571680 40 21.81MB After: 221052 24 5.06MB The improvement in memory use comes at a cost in the speed of security server computations of access vectors, but these computations are only required on AVC cache misses, and performance measurements by James Morris using a number of benchmarks have shown that the change does not cause any significant degradation. Note that a rebuilt policy via an updated policy toolchain (libsepol/checkpolicy) is required in order to gain the full benefits of this patch, although some memory savings benefits are immediately applied even to older policies (in particular, the reduction in avtab node size). Sources for the updated toolchain are presently available from the sourceforge CVS tree (http://sourceforge.net/cvs/?group_id=21266), and tarballs are available from http://www.flux.utah.edu/~sds. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 720d6c29e146e96cca858057469951e91e0e6850 tree 19839317cd225322dd41bf20d4f87434a71b5689 parent 964267e627966ffa018fc4a3e19e6bad337a9125 author Egry Gabor Sat, 03 Sep 2005 15:55:15 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] kconfig: linux.pot for all arch The 'make update-po-config' creates the .pot file for the default arch. This patch enhances it with all arch. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 964267e627966ffa018fc4a3e19e6bad337a9125 tree b13b700da9e5b674c6a819f8826b70d476a59139 parent c196eff3060270f155343b63ef3d06f31ccfcd2e author Egry Gabor Sat, 03 Sep 2005 15:55:14 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] kconfig: kxgettext: EOL fix The end of line character doesn't exist on end of help in all case, check it first. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c196eff3060270f155343b63ef3d06f31ccfcd2e tree 5a4c173a30b47459713af1a33343e4636eba529d parent c07e02db76940c75fc92f2f2c9adcdbb09ed70d0 author Egry Gabor Sat, 03 Sep 2005 15:55:12 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] kconfig: kxgettext: message fix The gettext doesn't handle the {CONFIG}:00000 markers as sources. I added a simple comment prefix for them. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c07e02db76940c75fc92f2f2c9adcdbb09ed70d0 tree 9d777784fd5e3658d8db5b01a965d4fc568ceb93 parent e070ad49f31155d872d8e96cab2142840993e3c0 author Martin Hicks Sat, 03 Sep 2005 15:55:11 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] VM: add page_state info to per-node meminfo Add page_state info to the per-node meminfo file in sysfs. This is mostly just for informational purposes. The lack of this information was brought up recently during a discussion regarding pagecache clearing, and I put this patch together to test out one of the suggestions. It seems like interesting info to have, so I'm submitting the patch. Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e070ad49f31155d872d8e96cab2142840993e3c0 tree 16d5bfd3d7627d6616c6b1008fac80e4cf77379e parent 00e145b6d59a16dd7740197a18f7abdb3af004a9 author Mauricio Lin Sat, 03 Sep 2005 15:55:10 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] add /proc/pid/smaps Add a "smaps" entry to /proc/pid: show howmuch memory is resident in each mapping. People that want to perform a memory consumption analysing can use it mainly if someone needs to figure out which libraries can be reduced for embedded systems. So the new features are the physical size of shared and clean [or dirty]; private and clean [or dirty]. Take a look the example below: # cat /proc/4576/smaps 08048000-080dc000 r-xp /bin/bash Size: 592 KB Rss: 500 KB Shared_Clean: 500 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 0 KB 080dc000-080e2000 rw-p /bin/bash Size: 24 KB Rss: 24 KB Shared_Clean: 0 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 24 KB 080e2000-08116000 rw-p Size: 208 KB Rss: 208 KB Shared_Clean: 0 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 208 KB b7e2b000-b7e34000 r-xp /lib/tls/libnss_files-2.3.2.so Size: 36 KB Rss: 12 KB Shared_Clean: 12 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 0 KB ... (Includes a cleanup from "Richard Purdie" ) From: Torsten Foertsch show_smap calls first show_map and then prints its additional information to the seq_file. show_map checks if all it has to print fits into the buffer and if yes marks the current vma as written. While that is correct for show_map it is not for show_smap. Here the vma should be marked as written only after the additional information is also written. The attached patch cures the problem. It moves the functionality of the show_map function to a new function show_map_internal that is called with an additional struct mem_size_stats* argument. Then show_map calls show_map_internal with NULL as struct mem_size_stats* whereas show_smap calls it with a real pointer. Now the final if (m->count < m->size) /* vma is copied successfully */ m->version = (vma != get_gate_vma(task))? vma->vm_start: 0; is done only if the whole entry fits into the buffer. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00e145b6d59a16dd7740197a18f7abdb3af004a9 tree 7b081ccfa6a34e5a17f4f1d6925d4945df2a97c1 parent 34342e863c3143640c031760140d640a06c6a5f8 author Manfred Spraul Sat, 03 Sep 2005 15:55:07 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:49 -0700 [PATCH] slab: removes local_irq_save()/local_irq_restore() pair Proposed by and based on a patch from Eric Dumazet : This patch removes unnecessary critical section in ksize() function, as cli/sti are rather expensive on modern CPUS. It additionally adds a docbook entry for ksize() and further simplifies the code. Signed-Off-By: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34342e863c3143640c031760140d640a06c6a5f8 tree f2855e8ca82929859cb1fe249982b3ba1ccf9b5e parent 61e06037e764337da39dff307cbcdbe9cf288349 author Eric Dumazet Sat, 03 Sep 2005 15:55:06 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:48 -0700 [PATCH] mm/slab.c: prefetchw the start of new allocated objects Mostobjects returned by __cache_alloc() will be written by the caller, (but not all callers want to write all the object, but just at the begining) prefetchw() tells the modern CPU to think about the future writes, ie start some memory transactions in advance. Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61e06037e764337da39dff307cbcdbe9cf288349 tree e9719788c751c1d4a437c98056e2ddd7e34d5dfa parent a600388d28419305aad3c4c0af52c223cf6fa0af author Zachary Amsden Sat, 03 Sep 2005 15:55:06 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:48 -0700 [PATCH] x86_64: avoid some atomic operations during address space destruction Any architecture that has hardware updated A/D bits that require synchronization against other processors during PTE operations can benefit from doing non-atomic PTE updates during address space destruction. Originally done on i386, now ported to x86_64. Doing a read/write pair instead of an xchg() operation saves the implicit lock, which turns out to be a big win on 32-bit (esp w PAE). Signed-off-by: Zachary Amsden Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a600388d28419305aad3c4c0af52c223cf6fa0af tree c70d3d80275f189c49311183472367f45d1a1ef2 parent fa5b08d5f818063d18433194f20359ef2ae50254 author Zachary Amsden Sat, 03 Sep 2005 15:55:04 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:48 -0700 [PATCH] x86: ptep_clear optimization Add a new accessor for PTEs, which passes the full hint from the mmu_gather struct; this allows architectures with hardware pagetables to optimize away atomic PTE operations when destroying an address space. Removing the locked operation should allow better pipelining of memory access in this loop. I measured an average savings of 30-35 cycles per zap_pte_range on the first 500 destructions on Pentium-M, but I believe the optimization would win more on older processors which still assert the bus lock on xchg for an exclusive cacheline. Update: I made some new measurements, and this saves exactly 26 cycles over ptep_get_and_clear on Pentium M. On P4, with a PAE kernel, this saves 180 cycles per ptep_get_and_clear, for a whopping 92160 cycles savings for a full address space destruction. pte_clear_full is not yet used, but is provided for future optimizations (in particular, when running inside of a hypervisor that queues page table updates, the full hint allows us to avoid queueing unnecessary page table update for an address space in the process of being destroyed. This is not a huge win, but it does help a bit, and sets the stage for further hypervisor optimization of the mm layer on all architectures. Signed-off-by: Zachary Amsden Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa5b08d5f818063d18433194f20359ef2ae50254 tree f2b2bc88347a618f0c4b535d57d2a5271a5eb98e parent 0e5c9f39f64d8a55c5db37a5ea43e37d3422fd92 author Kyle Moffett Sat, 03 Sep 2005 15:55:03 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:48 -0700 [PATCH] sab: consolidate kmem_bufctl_t This is used only in slab.c and each architecture gets to define whcih underlying type is to be used. Seems a bit silly - move it to slab.c and use the same type for all architectures: unsigned int. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e5c9f39f64d8a55c5db37a5ea43e37d3422fd92 tree 2b7da9a3813f1ce475d276d55243b2675b90349b parent 02b0ccef903e85673ead74ddb7c431f2f7ce183d author Chen, Kenneth W Sat, 03 Sep 2005 15:55:02 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:46 -0700 [PATCH] remove hugetlb_clean_stale_pgtable() and fix huge_pte_alloc() I don't think we need to call hugetlb_clean_stale_pgtable() anymore in 2.6.13 because of the rework with free_pgtables(). It now collect all the pte page at the time of munmap. It used to only collect page table pages when entire one pgd can be freed and left with staled pte pages. Not anymore with 2.6.13. This function will never be called and We should turn it into a BUG_ON. I also spotted two problems here, not Adam's fault :-) (1) in huge_pte_alloc(), it looks like a bug to me that pud is not checked before calling pmd_alloc() (2) in hugetlb_clean_stale_pgtable(), it also missed a call to pmd_free_tlb. I think a tlb flush is required to flush the mapping for the page table itself when we clear out the pmd pointing to a pte page. However, since hugetlb_clean_stale_pgtable() is never called, so it won't trigger the bug. Signed-off-by: Ken Chen Cc: Adam Litke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b0ccef903e85673ead74ddb7c431f2f7ce183d tree d359d49ef24f94a413e7dec69821645b42813921 parent 7bf07f3d4b4358aa6d99a26d7a0165f1e91c3fcc author Adam Litke Sat, 03 Sep 2005 15:55:01 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:46 -0700 [PATCH] hugetlb: check p?d_present in huge_pte_offset() For demand faulting, we cannot assume that the page tables will be populated. Do what the rest of the architectures do and test p?d_present() while walking down the page table. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bf07f3d4b4358aa6d99a26d7a0165f1e91c3fcc tree 150e1f1172e3a7912b37bef7b06a657d47bc1657 parent 32e51a8c976fc72c3e9bcece9767d9908816bf8e author Adam Litke Sat, 03 Sep 2005 15:55:00 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:46 -0700 [PATCH] hugetlb: move stale pte check into huge_pte_alloc() Initial Post (Wed, 17 Aug 2005) This patch moves the if (! pte_none(*pte)) hugetlb_clean_stale_pgtable(pte); logic into huge_pte_alloc() so all of its callers can be immune to the bug described by Kenneth Chen at http://lkml.org/lkml/2004/6/16/246 > It turns out there is a bug in hugetlb_prefault(): with 3 level page table, > huge_pte_alloc() might return a pmd that points to a PTE page. It happens > if the virtual address for hugetlb mmap is recycled from previously used > normal page mmap. free_pgtables() might not scrub the pmd entry on > munmap and hugetlb_prefault skips on any pmd presence regardless what type > it is. Unless I am missing something, it seems more correct to place the check inside huge_pte_alloc() to prevent a the same bug wherever a huge pte is allocated. It also allows checking for this condition when lazily faulting huge pages later in the series. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e51a8c976fc72c3e9bcece9767d9908816bf8e tree 480c62a4839b6c9553689da76f49fc208c6ac7f5 parent fd195c49fb17a21e232f50bddb2267150053cf34 author Adam Litke Sat, 03 Sep 2005 15:54:59 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:46 -0700 [PATCH] hugetlb: add pte_huge() macro This patch adds a macro pte_huge(pte) for i386/x86_64 which is needed by a patch later in the series. Instead of repeating (_PAGE_PRESENT | _PAGE_PSE), I've added __LARGE_PTE to i386 to match x86_64. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd195c49fb17a21e232f50bddb2267150053cf34 tree ab9370a3d351eb7594e5086ae8d3aa5401a1e375 parent 9b4ee40ebbbaf3f8c775b023d89ceedda1167d79 author Deepak Saxena Sat, 03 Sep 2005 15:54:58 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:46 -0700 [PATCH] arm: allow for arch-specific IOREMAP_MAX_ORDER Version 6 of the ARM architecture introduces the concept of 16MB pages (supersections) and 36-bit (40-bit actually, but nobody uses this) physical addresses. 36-bit addressed memory and I/O and ARMv6 can only be mapped using supersections and the requirement on these is that both virtual and physical addresses be 16MB aligned. In trying to add support for ioremap() of 36-bit I/O, we run into the issue that get_vm_area() allows for a maximum of 512K alignment via the IOREMAP_MAX_ORDER constant. To work around this, we can: - Allocate a larger VM area than needed (size + (1ul << IOREMAP_MAX_ORDER)) and then align the pointer ourselves, but this ends up with 512K of wasted VM per ioremap(). - Provide a new __get_vm_area_aligned() API and make __get_vm_area() sit on top of this. I did this and it works but I don't like the idea adding another VM API just for this one case. - My preferred solution which is to allow the architecture to override the IOREMAP_MAX_ORDER constant with it's own version. Signed-off-by: Deepak Saxena Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b4ee40ebbbaf3f8c775b023d89ceedda1167d79 tree e227c96cf51beaa942fefa64277618e5cfc71217 parent 4944e76d81801b8e60ed3e7789443f210c16ed65 author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:54:57 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:45 -0700 [PATCH] mm: correct _PAGE_FILE comment _PAGE_FILE does not indicate whether a file is in page / swap cache, it is set just for non-linear PTE's. Correct the comment for i386, x86_64, UML. Also clearify _PAGE_NONE. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4944e76d81801b8e60ed3e7789443f210c16ed65 tree d20096acf35b1af03eba1d043e6376a154cae054 parent d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:54:56 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:45 -0700 [PATCH] mm: remove implied vm_ops check If !vma->vm-ops we already BUG above, so retesting it is useless. The compiler cannot optimize this because BUG is a macro and is not thus marked noreturn; that should possibly be fixed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead tree 19614a214c186c62ee6c5d3879392f6184f93e5b parent 0abf40c1ac3f25d264c019e1cfe155d590defb87 author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:54:55 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:45 -0700 [PATCH] shmem_populate: avoid an useless check, and some comments Either shmem_getpage returns a failure, or it found a page, or it was told it couldn't do any I/O. So it's useless to check nonblock in the else branch. We could add a BUG() there but I preferred to comment the offending function. This was taken out from one Ingo Molnar's old patch I'm resurrecting. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Ingo Molnar Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0abf40c1ac3f25d264c019e1cfe155d590defb87 tree e33e79f2e2bdb8f5ceceabeff722ef087876eead parent e83a9596712eb784e7e6604f43a2c140eb912743 author Martin Hicks Sat, 03 Sep 2005 15:54:54 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:45 -0700 [PATCH] vm: slab.c spelling correction Fix a small spelling mistake. subtile->subtle Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e83a9596712eb784e7e6604f43a2c140eb912743 tree 21beadfab0d038684fae7534bc379e517061a81b parent 836d5ffd34550901ea024347693e689273ded8aa author Paolo 'Blaisorblade' Giarrusso Sat, 03 Sep 2005 15:54:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:45 -0700 [PATCH] comment typo fix smp_entry_t -> swap_entry_t Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 836d5ffd34550901ea024347693e689273ded8aa tree b4dbbbe436eae38aa2f0f5d333608f64c6338cd8 parent 53e9a6159fdc6419874ce4d86d3577dbedc77b62 author Hugh Dickins Sat, 03 Sep 2005 15:54:53 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:44 -0700 [PATCH] mm: fix madvise vma merging Better late than never, I've at last reviewed the madvise vma merging going into 2.6.13. Remove a pointless check and fix two little bugs - a simple test (with /proc//maps hacked to show ReadHints) showed both mismerges in practice: though being madvise, neither was disastrous. 1. Correct placement of the success label in madvise_behavior: as in mprotect_fixup and mlock_fixup, it is necessary to update vm_flags when vma_merge succeeds (to handle the exceptional Case 8 noted in the comments above vma_merge itself). 2. Correct initial value of prev when starting part way into a vma: as in sys_mprotect and do_mlock, it needs to be set to vma in this case (vma_merge handles only that minimum of cases shown in its comments). 3. If find_vma_prev sets prev, then the vma it returns is prev->vm_next, so it's pointless to make that same assignment again in sys_madvise. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53e9a6159fdc6419874ce4d86d3577dbedc77b62 tree 7c7f15325569cf5e02dafc1974fb080154616058 parent bce5f6ba340b09d8b29902add204bb95a6d3d88b author Martin Hicks Sat, 03 Sep 2005 15:54:51 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:44 -0700 [PATCH] VM: zone reclaim atomic ops cleanup Christoph Lameter and Marcelo Tosatti asked to get rid of the atomic_inc_and_test() to cleanup the atomic ops in the zone reclaim code. Signed-off-by: Martin Hicks Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce5f6ba340b09d8b29902add204bb95a6d3d88b tree 1cfeea969fa5848f0a8d31394829aec5c8571a79 parent 242e54686257493f0b10ac557e730419d9af7d24 author Martin Hicks Sat, 03 Sep 2005 15:54:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:44 -0700 [PATCH] VM: add capabilites check to set_zone_reclaim Add a capability check to sys_set_zone_reclaim(). This syscall is not something that should be available to a user. Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 242e54686257493f0b10ac557e730419d9af7d24 tree d68754b32c531141969a09ca0c5df246893c5b1e parent 9a61c349b28ec5aef7e929236571fd770fdef0bb author Nick Piggin Sat, 03 Sep 2005 15:54:50 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:44 -0700 [PATCH] mm: remove atomic This bitop does not need to be atomic because it is performed when there will be no references to the page (ie. the page is being freed). Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a61c349b28ec5aef7e929236571fd770fdef0bb tree c78c703dcca91302901d116031b311de7ad3fd78 parent 4d7670e0f649f9e6e6ea6c8bb9f52441fa00f92b author Nick Piggin Sat, 03 Sep 2005 15:54:49 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:44 -0700 [PATCH] mm: remap ZERO_PAGE mappings filemap_xip's nopage routine maps the ZERO_PAGE into readonly mappings, if it has no data page to map there: then if the hole in the file is later filled, __xip_unmap uses an rmap technique to replace the ZERO_PAGEs mapped for that offset by the newly allocated file page, so that established mappings will see the newly written data. However, on MIPS (alone) there's not one but as many as eight ZERO_PAGEs, chosen for coloring by user virtual address; and if mremap has meanwhile been used to move a mapping containing a ZERO_PAGE, it will generally not match the ZERO_PAGE(address) __xip_unmap is looking for. To maintain XIP's established mappings correctly on MIPS, we need Nick's fix to mremap's move_one_page (originally presented as an optimization), to replace the ZERO_PAGE appropriate to the old address by the ZERO_PAGE appropriate to the new address. (But when I first saw this, I was thinking the ZERO_PAGEs themselves would get corrupted, very bad. Now I think it's the other way round, that the established mappings will fail to see the newly written data: incorrect, but not corrupting everything else. Whether filemap_xip's technique is generally safe, I'd hesitate to say in a hurry: it's interesting, but we've never tried to do that in tmpfs.) Signed-off-by: Hugh Dickins Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d7670e0f649f9e6e6ea6c8bb9f52441fa00f92b tree 52009a96e89a4fe2ff390cd34a7832c89d28f588 parent 2822c1aa574d277b9ba0130b1e71c1a5874bc04a author Nick Piggin Sat, 03 Sep 2005 15:54:48 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:43 -0700 [PATCH] mm: cleanup rmap Thanks to Bill Irwin for pointing this out. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2822c1aa574d277b9ba0130b1e71c1a5874bc04a tree 6a48d5db83831b6521bbc5795a70ea5ab7446b0e parent c3dce2d89c269d5373a120d4a22fc2426ec992b0 author Nick Piggin Sat, 03 Sep 2005 15:54:47 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:43 -0700 [PATCH] mm: micro-optimise rmap Microoptimise page_add_anon_rmap. Although these expressions are used only in the taken branch of the if() statement, the compiler can't reorder them inside because atomic_inc_and_test is a barrier. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3dce2d89c269d5373a120d4a22fc2426ec992b0 tree d4a52e35751484935a15f3b95e84bd28d6662b18 parent 6e21c8f145f5052c1c2fb4a4b41bee01c848159b author Nick Piggin Sat, 03 Sep 2005 15:54:46 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:43 -0700 [PATCH] mm: comment rmap Just be clear that VM_RESERVED pages here are a bug, and the test is not there because they are expected. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e21c8f145f5052c1c2fb4a4b41bee01c848159b tree 0b956cfbd67636c19be79fc0cbe0a5ed89fb6b9a parent 839b9685e80592809d6dfdd865986cd1b5ddc2fb author Christoph Lameter Sat, 03 Sep 2005 15:54:45 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:43 -0700 [PATCH] /proc//numa_maps to show on which nodes pages reside This patch was recently discussed on linux-mm: http://marc.theaimsgroup.com/?t=112085728500002&r=1&w=2 I inherited a large code base from Ray for page migration. There was a small patch in there that I find to be very useful since it allows the display of the locality of the pages in use by a process. I reworked that patch and came up with a /proc//numa_maps that gives more information about the vma's of a process. numa_maps is indexes by the start address found in /proc//maps. F.e. with this patch you can see the page use of the "getty" process: margin:/proc/12008 # cat maps 00000000-00004000 r--p 00000000 00:00 0 2000000000000000-200000000002c000 r-xp 00000000 08:04 516 /lib/ld-2.3.3.so 2000000000038000-2000000000040000 rw-p 00028000 08:04 516 /lib/ld-2.3.3.so 2000000000040000-2000000000044000 rw-p 2000000000040000 00:00 0 2000000000058000-2000000000260000 r-xp 00000000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000260000-2000000000268000 ---p 00208000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000268000-2000000000274000 rw-p 00200000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000274000-2000000000280000 rw-p 2000000000274000 00:00 0 2000000000280000-20000000002b4000 r--p 00000000 08:04 9126923 /usr/lib/locale/en_US.utf8/LC_CTYPE 2000000000300000-2000000000308000 r--s 00000000 08:04 60071467 /usr/lib/gconv/gconv-modules.cache 2000000000318000-2000000000328000 rw-p 2000000000318000 00:00 0 4000000000000000-4000000000008000 r-xp 00000000 08:04 29576399 /sbin/mingetty 6000000000004000-6000000000008000 rw-p 00004000 08:04 29576399 /sbin/mingetty 6000000000008000-600000000002c000 rw-p 6000000000008000 00:00 0 [heap] 60000fff7fffc000-60000fff80000000 rw-p 60000fff7fffc000 00:00 0 60000ffffff44000-60000ffffff98000 rw-p 60000ffffff44000 00:00 0 [stack] a000000000000000-a000000000020000 ---p 00000000 00:00 0 [vdso] cat numa_maps 2000000000000000 default MaxRef=43 Pages=11 Mapped=11 N0=4 N1=3 N2=2 N3=2 2000000000038000 default MaxRef=1 Pages=2 Mapped=2 Anon=2 N0=2 2000000000040000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 2000000000058000 default MaxRef=43 Pages=61 Mapped=61 N0=14 N1=15 N2=16 N3=16 2000000000268000 default MaxRef=1 Pages=2 Mapped=2 Anon=2 N0=2 2000000000274000 default MaxRef=1 Pages=3 Mapped=3 Anon=3 N0=3 2000000000280000 default MaxRef=8 Pages=3 Mapped=3 N0=3 2000000000300000 default MaxRef=8 Pages=2 Mapped=2 N0=2 2000000000318000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N2=1 4000000000000000 default MaxRef=6 Pages=2 Mapped=2 N1=2 6000000000004000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 6000000000008000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 60000fff7fffc000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 60000ffffff44000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 getty uses ld.so. The first vma is the code segment which is used by 43 other processes and the pages are evenly distributed over the 4 nodes. The second vma is the process specific data portion for ld.so. This is only one page. The display format is: Links to information in /proc//map This can be "default" "interleave={}", "prefer=" or "bind={}" MaxRef= Pages= Mapped= Anon= Nx= The content of the proc-file is self-evident. If this would be tied into the sparsemem system then the contents of this file would not be too useful. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 839b9685e80592809d6dfdd865986cd1b5ddc2fb tree 9c46cc93d8467035419028e6e47f25a547e6ad9a parent 3279ffd97f1b3962e40d3c5f09495ef8320b180b author Hugh Dickins Sat, 03 Sep 2005 15:54:43 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:42 -0700 [PATCH] rmap: don't test rss Remove the three get_mm_counter(mm, rss) tests from rmap.c: there was a time when testing rss was important to avoid a particular race between dup_mmap and the anonmm rmap; but now it's just a rather silly pseudo- optimization, made even more obscure by the get_mm_counter macro. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3279ffd97f1b3962e40d3c5f09495ef8320b180b tree 56c72808c731a73fd50f3df37fd3af770812a7ee parent dae06ac43d56d23e50a2300d511b32a9e38cd657 author Hugh Dickins Sat, 03 Sep 2005 15:54:43 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:42 -0700 [PATCH] delete from_swap_cache BUG_ONs Three of the four BUG_ONs in delete_from_swap_cache are immediately repeated in __delete_from_swap_cache: delete those and add the one. But perhaps mm/ is altogether overprovisioned with historic BUGs? Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dae06ac43d56d23e50a2300d511b32a9e38cd657 tree 62bfa95e769ec5c731f02435b49025a15c45faf4 parent 5d337b9194b1ce3b6fd5f3cb2799455ed2f9a3d1 author Hugh Dickins Sat, 03 Sep 2005 15:54:42 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:42 -0700 [PATCH] swap: update swsusp use of swap_info Aha, swsusp dips into swap_info[], better update it to swap_lock. It's bitflipping flags with 0xFF, so get_swap_page will allocate from only the one chosen device: let's change that to flip SWP_WRITEOK. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d337b9194b1ce3b6fd5f3cb2799455ed2f9a3d1 tree 91ed9ef6f4cb5f6a1832f2baaaabd53fcd83513e parent 048c27fd72816b44e096997d1c6901c3abbfd45b author Hugh Dickins Sat, 03 Sep 2005 15:54:41 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:42 -0700 [PATCH] swap: swap_lock replace list+device The idea of a swap_device_lock per device, and a swap_list_lock over them all, is appealing; but in practice almost every holder of swap_device_lock must already hold swap_list_lock, which defeats the purpose of the split. The only exceptions have been swap_duplicate, valid_swaphandles and an untrodden path in try_to_unuse (plus a few places added in this series). valid_swaphandles doesn't show up high in profiles, but swap_duplicate does demand attention. However, with the hold time in get_swap_pages so much reduced, I've not yet found a load and set of swap device priorities to show even swap_duplicate benefitting from the split. Certainly the split is mere overhead in the common case of a single swap device. So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock (generally we seem to prefer an _ in the name, and not hide in a macro). If someone can show a regression in swap_duplicate, then probably we should add a hashlock for the swap_map entries alone (shorts being anatomic), so as to help the case of the single swap device too. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 048c27fd72816b44e096997d1c6901c3abbfd45b tree 159a00b71ce9db161a48e4fc07b212db455a2cf1 parent 52b7efdbe5f5696fc80338560a3fc51e0b0a993c author Hugh Dickins Sat, 03 Sep 2005 15:54:40 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: scan_swap_map latency breaks The get_swap_page/scan_swap_map latency can be so bad that even those without preemption configured deserve relief: periodically cond_resched. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52b7efdbe5f5696fc80338560a3fc51e0b0a993c tree 30162de9fc8fe3dddb6462f8ff82f1594067cadd parent 7dfad4183bf9cd92f977caa3c12cc74f0eefc0e6 author Hugh Dickins Sat, 03 Sep 2005 15:54:39 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: scan_swap_map drop swap_device_lock get_swap_page has often shown up on latency traces, doing lengthy scans while holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map drop swap_device_lock before scanning the swap_map. While scanning for an empty cluster, don't worry that racing tasks may allocate what was free and free what was allocated; but when allocating an entry, check it's still free after retaking the lock. Avoid dropping the lock in the expected common path. No barriers beyond the locks, just let the cookie crumble; highest_bit limit is volatile, but benign. Guard against swapoff: must check SWP_WRITEOK before allocating, must raise SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to fall - just use schedule_timeout, we don't want to burden scan_swap_map itself, and it's very unlikely that anyone can really still be in scan_swap_map once swapoff gets this far. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dfad4183bf9cd92f977caa3c12cc74f0eefc0e6 tree e11306e1e82acba1832f07fdfb3296c34cf6e934 parent fb4f88dcabdc716c7c350e09cf4a38a419b007e1 author Hugh Dickins Sat, 03 Sep 2005 15:54:38 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: scan_swap_map restyled Rewrite scan_swap_map to allocate in just the same way as before (taking the next free entry SWAPFILE_CLUSTER-1 times, then restarting at the lowest wholly empty cluster, falling back to lowest entry if none), but with a view towards dropping the lock in the next patch. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb4f88dcabdc716c7c350e09cf4a38a419b007e1 tree 1a7806e3ac8bd45eded544763324c13c9f95c0e6 parent 89d09a2c80ea6baafb559b86d545fada05e14ab5 author Hugh Dickins Sat, 03 Sep 2005 15:54:37 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: get_swap_page drop swap_list_lock Rewrite get_swap_page to allocate in just the same sequence as before, but without holding swap_list_lock across its scan_swap_map. Decrement nr_swap_pages and update swap_list.next in advance, while still holding swap_list_lock. Skip full devices by testing highest_bit. Swapoff hold swap_device_lock as well as swap_list_lock to clear SWP_WRITEOK. Reduces lock contention when there are parallel swap devices of the same priority. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d09a2c80ea6baafb559b86d545fada05e14ab5 tree 90ff3c2a62c144b93c89b33d66583046f1a7efae parent 6eb396dc4a9781c5e7951143ab56ce5710687ab3 author Hugh Dickins Sat, 03 Sep 2005 15:54:36 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: freeing update swap_list.next This makes negligible difference in practice: but swap_list.next should not be updated to a higher prio in the general helper swap_info_get, but rather in swap_entry_free; and then only in the case when entry is actually freed. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6eb396dc4a9781c5e7951143ab56ce5710687ab3 tree 48b165c8934a0f3852344725fee060740dcdfa48 parent 53092a7402f227151a681b0c92ec8598c5618b1a author Hugh Dickins Sat, 03 Sep 2005 15:54:35 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:41 -0700 [PATCH] swap: swap unsigned int consistency The swap header's unsigned int last_page determines the range of swap pages, but swap_info has been using int or unsigned long in some cases: use unsigned int throughout (except, in several places a local unsigned long is useful to avoid overflows when adding). Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53092a7402f227151a681b0c92ec8598c5618b1a tree ea482a18567c8b3b1778331ee3c4864e2f4dae6f parent 11d31886dbcb61039ed3789e583d21c6e70960fd author Hugh Dickins Sat, 03 Sep 2005 15:54:34 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:40 -0700 [PATCH] swap: show span of swap extents The "Adding %dk swap" message shows the number of swap extents, as a guide to how fragmented the swapfile may be. But a useful further guide is what total extent they span across (sometimes scarily large). And there's no need to keep nr_extents in swap_info: it's unused after the initial message, so save a little space by keeping it on stack. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d31886dbcb61039ed3789e583d21c6e70960fd tree ddaebfd35080a530a30c56587707c2c5ef452591 parent 4cd3bb10ff0b21b77b5a4cd13b4bd36694e054c4 author Hugh Dickins Sat, 03 Sep 2005 15:54:34 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:40 -0700 [PATCH] swap: swap extent list is ordered There are several comments that swap's extent_list.prev points to the lowest extent: that's not so, it's extent_list.next which points to it, as you'd expect. And a couple of loops in add_swap_extent which go all the way through the list, when they should just add to the other end. Fix those up, and let map_swap_page search the list forwards: profiles shows it to be twice as quick that way - because prefetch works better on how the structs are typically kmalloc'ed? or because usually more is written to than read from swap, and swap is allocated ascendingly? Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cd3bb10ff0b21b77b5a4cd13b4bd36694e054c4 tree e2a76a229b2c030a7d4aec1155e505fd4c087067 parent e2244ec2efa4ee1edf391d0001d314933e2b2974 author Hugh Dickins Sat, 03 Sep 2005 15:54:33 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:40 -0700 [PATCH] swap: move destroy_swap_extents calls sys_swapon's call to destroy_swap_extents on failure is made after the final swap_list_unlock, which is faintly unsafe: another sys_swapon might already be setting up that swap_info_struct. Calling it earlier, before taking swap_list_lock, is safe. sys_swapoff's call to destroy_swap_extents was safe, but likewise move it earlier, before taking the locks (once try_to_unuse has completed, nothing can be needing the swap extents). Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2244ec2efa4ee1edf391d0001d314933e2b2974 tree c9e43f9b6e11ce41d976025c6f9d94c273521132 parent b0d9bcd4bb79a7834f8492f2ae5c2655a551f23d author Hugh Dickins Sat, 03 Sep 2005 15:54:32 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:40 -0700 [PATCH] swap: correct swapfile nr_good_pages If a regular swapfile lies on a filesystem whose blocksize is less than PAGE_SIZE, then setup_swap_extents may have to cut the number of usable swap pages; but sys_swapon's nr_good_pages was not expecting that. Also, setup_swap_extents takes no account of badpages listed in the swap header: not worth doing so, but ensure nr_badpages is 0 for a regular swapfile. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0d9bcd4bb79a7834f8492f2ae5c2655a551f23d tree 8978577cf4b132e08e5abc7101e934ffd3106d3c parent fd4fd5aac1282825195c6816ed40a2a6d42db5bf author Hugh Dickins Sat, 03 Sep 2005 15:54:31 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:40 -0700 [PATCH] swap: update swapfile i_sem comment Update swap extents comment: nowadays we guard with S_SWAPFILE not i_sem. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd4fd5aac1282825195c6816ed40a2a6d42db5bf tree 5908cf4c88a7c9d69ea7bdc1c354d51b6ff47f86 parent 28ae55c98e4d16eac9a05a8a259d7763ef3aeb18 author Stephen Rothwell Sat, 03 Sep 2005 15:54:30 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:39 -0700 [PATCH] mm: consolidate get_order Someone mentioned that almost all the architectures used basically the same implementation of get_order. This patch consolidates them into asm-generic/page.h and includes that in the appropriate places. The exceptions are ia64 and ppc which have their own (presumably optimised) versions. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28ae55c98e4d16eac9a05a8a259d7763ef3aeb18 tree 0ac0a08d88a692b9b9934344b5e439058d71772a parent 3e347261a80b57df792ab9464b5f0ed59add53a8 author Dave Hansen Sat, 03 Sep 2005 15:54:29 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:38 -0700 [PATCH] sparsemem extreme: hotplug preparation This splits up sparse_index_alloc() into two pieces. This is needed because we'll allocate the memory for the second level in a different place from where we actually consume it to keep the allocation from happening underneath a lock Signed-off-by: Dave Hansen Signed-off-by: Bob Picco Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e347261a80b57df792ab9464b5f0ed59add53a8 tree 047b35e0f9ec82b3beeff882a9af6292a500097c parent 802f192e4a600f7ef84ca25c8b818c8830acef5a author Bob Picco Sat, 03 Sep 2005 15:54:28 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:38 -0700 [PATCH] sparsemem extreme implementation With cleanups from Dave Hansen SPARSEMEM_EXTREME makes mem_section a one dimensional array of pointers to mem_sections. This two level layout scheme is able to achieve smaller memory requirements for SPARSEMEM with the tradeoff of an additional shift and load when fetching the memory section. The current SPARSEMEM implementation is a one dimensional array of mem_sections which is the default SPARSEMEM configuration. The patch attempts isolates the implementation details of the physical layout of the sparsemem section array. SPARSEMEM_EXTREME requires bootmem to be functioning at the time of memory_present() calls. This is not always feasible, so architectures which do not need it may allocate everything statically by using SPARSEMEM_STATIC. Signed-off-by: Andy Whitcroft Signed-off-by: Bob Picco Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 802f192e4a600f7ef84ca25c8b818c8830acef5a tree 51e9a6ed164e6a2d8741af510c3954ad79bf19af parent 0216f86dafb389c0ad97529fd45e64e883298cfd author Bob Picco Sat, 03 Sep 2005 15:54:26 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:38 -0700 [PATCH] SPARSEMEM EXTREME A new option for SPARSEMEM is ARCH_SPARSEMEM_EXTREME. Architecture platforms with a very sparse physical address space would likely want to select this option. For those architecture platforms that don't select the option, the code generated is equivalent to SPARSEMEM currently in -mm. I'll be posting a patch on ia64 ml which uses this new SPARSEMEM feature. ARCH_SPARSEMEM_EXTREME makes mem_section a one dimensional array of pointers to mem_sections. This two level layout scheme is able to achieve smaller memory requirements for SPARSEMEM with the tradeoff of an additional shift and load when fetching the memory section. The current SPARSEMEM -mm implementation is a one dimensional array of mem_sections which is the default SPARSEMEM configuration. The patch attempts isolates the implementation details of the physical layout of the sparsemem section array. ARCH_SPARSEMEM_EXTREME depends on 64BIT and is by default boolean false. I've boot tested under aim load ia64 configured for ARCH_SPARSEMEM_EXTREME. I've also boot tested a 4 way Opteron machine with !ARCH_SPARSEMEM_EXTREME and tested with aim. Signed-off-by: Andy Whitcroft Signed-off-by: Bob Picco Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0216f86dafb389c0ad97529fd45e64e883298cfd tree 5afd066d3b888c9cce1f9e73768891d079de78e3 parent e8a650150b1001bc34d506e4c44538463d368890 author Matt Mackall Sat, 03 Sep 2005 15:54:25 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:37 -0700 [PATCH] kbuild: fix make clean damaging hg repos Running 'make clean' was quietly deleting files in Mercurial kernel repositories matching '.*.d', which was corrupting the tags portions of the repository. Spotted and fixed by several people. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a650150b1001bc34d506e4c44538463d368890 tree e2ddab9a4482b59f8658ad474cdbc12a08794a1d parent e770e8506110a57c868bbef9706d132285c2090f author Marcel Selhorst Sat, 03 Sep 2005 15:54:20 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:37 -0700 [PATCH] tpm_infineon: Bugfix in PNPACPI-handling This patch corrects the PNP-handling inside the tpm-driver and some minor coding style bugs. Note: the pci-device and pnp-device mixture is currently necessary, since the used "tpm"-interface requires a pci-dev in order to register the driver. This will be fixed within the next iterations. Signed-off-by: Marcel Selhorst Cc: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e770e8506110a57c868bbef9706d132285c2090f tree d345357c6597dca2ee4753d46bddbaa78dd5f0a7 parent f505380ba7b98ec97bf25300c2a58aeae903530b author Michael Krufky Sat, 03 Sep 2005 15:54:18 -0700 committer Linus Torvalds Mon, 05 Sep 2005 00:05:37 -0700 [PATCH] dvb: saa7134-dvb must select tda1004x Please apply this to 2.6.14, and also to 2.6.13.1 -stable. Without this patch, users will have to EXPLICITLY select tda1004x in Kconfig. This SHOULD be done automatically when saa7134-dvb is selected. This patch corrects this problem. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664399e1fbdceb18da9c9c5534dedd62327c63e8 tree edcd0711c9dc15d1ca296b1bab0d85415781276e parent 7801907b8c4a49f8ec033d13a938751114a97a55 author Russell King Sun, 04 Sep 2005 19:45:00 +0100 committer Russell King Sun, 04 Sep 2005 19:45:00 +0100 [ARM] Wrap calls to descriptor handlers This is part of Thomas Gleixner's generic IRQ patch, which converts ARM to use the generic IRQ subsystem. Here, we wrap calls to desc->handler() in an inline function, desc_handle_irq(). This reduces the size of Thomas' patch since the changes become more localised. Signed-off-by: Russell King commit 7801907b8c4a49f8ec033d13a938751114a97a55 tree c8f3cb07b2f224313519fbc7157d1f647f74d107 parent e24da5d316667a91b3a19b5761a211946ec649bb author Russell King Sun, 04 Sep 2005 19:43:13 +0100 committer Russell King Sun, 04 Sep 2005 19:43:13 +0100 [ARM] Change irq_chip wake/type methods to set_wake/set_type This is part of Thomas Gleixner's generic IRQ patch, which converts ARM to use the generic IRQ subsystem. Here, we rename two of the irq_chip methods - wake becomes set_wake, and type becomes set_type. Signed-off-by: Russell King commit e24da5d316667a91b3a19b5761a211946ec649bb tree d2a7e9dda426f98e43841c3ddae227f59cac8232 parent 7db078be194469490caacac7d13bace38eaebdf5 author Pavel Machek Sun, 04 Sep 2005 11:33:12 +0100 committer Russell King Sun, 04 Sep 2005 11:33:12 +0100 [ARM] Fix compilation in locomo.c Do not access children in struct device directly, use device_for_each_child helper instead. It fixes compilation. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 7db078be194469490caacac7d13bace38eaebdf5 tree 054ee351733cc9cc8a206bd6b73b05a64e4867f4 parent ca6ca91d8c7498d45e0d35800503699164366f10 author Russell King Sun, 04 Sep 2005 11:03:15 +0100 committer Russell King Sun, 04 Sep 2005 11:03:15 +0100 [ARM] Stack starts at THREAD_START_SP offset, not THREAD_SIZE-8 Use the correct constants. Signed-off-by: Russell King commit ca6ca91d8c7498d45e0d35800503699164366f10 tree 3e340cd984e08f4f1edd7c8f33c4e45cf6ace743 parent 9bed07d0fed01f7c39d128e59e5d35d7d67ff439 author Timothy Baldwin Sun, 04 Sep 2005 10:13:48 +0100 committer Russell King Sun, 04 Sep 2005 10:13:48 +0100 [ARM] 2875/1: Data Abort fixes Patch from Timothy Baldwin All data aborts are treated as read accesses. The existing code updates the wrong bit of r1, also the comments are wrong in that the sense of the L bit is inverted. Signed-off-by: Timothy E. Baldwin Signed-off-by: Russell King commit 9bed07d0fed01f7c39d128e59e5d35d7d67ff439 tree d46faa0788ddac45579b52ba9fb9313075b746c2 parent f36598aeca4c2dbaa607bf6f774e38eb965402f2 author Ben Dooks Sat, 03 Sep 2005 19:39:26 +0100 committer Russell King Sat, 03 Sep 2005 19:39:26 +0100 [ARM] 2874/1: S3C2410 - add cpu_init() call after sleep wakeup Patch from Ben Dooks The power management sleep code needs to call cpu_init() to restore the cpu state after the system resumes from suspend. Also clear off an un-necessary comment. Thanks to Dimitry Andric for reporting the bug and for rmk for pointing out the cause. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f36598aeca4c2dbaa607bf6f774e38eb965402f2 tree e3f6ac9524f05d821b5fbe0c547c268ae3bedc3f parent f505380ba7b98ec97bf25300c2a58aeae903530b author Richard Purdie Sat, 03 Sep 2005 19:39:25 +0100 committer Russell King Sat, 03 Sep 2005 19:39:25 +0100 [ARM] 2873/1: PCMCIA soc: Allow access to filesystems on CF at boot time Patch from Richard Purdie This change makes the soc pcmcia interfaces available earlier in the boot process meaning devices like CF microdrives can be used for the root filesystem. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1656fa579e44691a860b095016eee910bc0b2793 tree 4373e726038d317d3011adf0bf6ba4028a750cfa parent 865e9f13c94891daed4f6a5f69c5d6ec04d4932f author Pierre Ossman Sat, 03 Sep 2005 16:45:49 +0100 committer Russell King Sat, 03 Sep 2005 16:45:49 +0100 [MMC] support for mmc chip select in wbsd Use the chip select ios in the wbsd driver. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 865e9f13c94891daed4f6a5f69c5d6ec04d4932f tree ea969a896c3b5be5dca761605275e0895efc3976 parent f505380ba7b98ec97bf25300c2a58aeae903530b author Pierre Ossman Sat, 03 Sep 2005 16:45:02 +0100 committer Russell King Sat, 03 Sep 2005 16:45:02 +0100 [MMC] ios for mmc chip select Adds a new ios for setting the chip select pin on MMC cards. Needed on SD controllers which use this pin for other things and therefore cannot have it pulled high at all times. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 9b4e3b13b147e9b737de63188a9ae740eaa8c36d tree 8ef40261167f125a5c36bdeab9284886f1b8d34f parent 707b1c84ec828da479107e839eae0322bacec4d7 author Sergey Vlasov Sat, 03 Sep 2005 16:26:49 +0100 committer Russell King Sat, 03 Sep 2005 16:26:49 +0100 [SERIAL] Fix moxa tty driver name The moxa driver was named "ttya", which is wrong: 1) Documentation/devices.txt says that the name should be "ttyMX". 2) First 10 ports (ttya0...ttya9) clash with the legacy pty driver. This patch changes the driver name to "ttyMX". http://bugme.osdl.org/show_bug.cgi?id=5012 Signed-off-by: Sergey Vlasov Signed-off-by: Russell King commit 707b1c84ec828da479107e839eae0322bacec4d7 tree 03e17176a50e89918a5b1ca34b31154df7668416 parent 30b7a3bc133c5b4a723163be35157ed709fca91c author Adrian Bunk Sat, 03 Sep 2005 15:36:36 +0100 committer Russell King Sat, 03 Sep 2005 15:36:36 +0100 [SERIAL] feature-removal-schedule.txt: remove {,un}register_serial entry If the feature is removed, there's no need to keep the entry in feature-removal-schedule.txt. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 30b7a3bc133c5b4a723163be35157ed709fca91c tree fbd56e4acffb5d4ec271b9b4fc6506e6098bca44 parent d27400746189f3b5194b49575833ea660c430118 author Russell King Sat, 03 Sep 2005 15:30:21 +0100 committer Russell King Sat, 03 Sep 2005 15:30:21 +0100 [SERIAL] Prefix serial printks with KERN_INFO and pre-format Pre-format the IO part of the ttyS printks, and prefix them with KERN_INFO to avoid bootsplash corruption. Signed-off-by: Russell King commit ebede60741e2cec6d210f137fd22a30e37abc0be tree 3e81432238b970702455756730145a9a122e33c7 parent a7a6cac204147634aba7487e4d618b028ff54c0d author Al Viro Fri, 02 Sep 2005 12:20:18 -0700 committer David S. Miller Fri, 02 Sep 2005 12:20:18 -0700 [SPARC32]: More dependencies fallout More stuff that got exposed to sparc32 build due to inclusion of drivers/char/Kconfig in arch/sparc/Kconfig needs to be excluded. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d70063c4634af060a5387337b7632f6334ca3458 tree da02edf31bd8ae1f4ff5fa62ca664166d4d4a4d8 parent 6475be16fd9b3c6746ca4d18959246b13c669ea8 author Al Viro Fri, 02 Sep 2005 12:18:03 -0700 committer David S. Miller Fri, 02 Sep 2005 12:18:03 -0700 [ATM]: Fix dereference of uninitialized pointer in zatm Fixing breakage from [NET]: Kill skb->list - original was assign vcc do a bunch of stuff using ZATM_VCC(vcc)->pool as common subexpression Now we do int pos = ZATM_VCC(vcc)->pool; assign vcc do a bunch of stuff even though vcc is not even initialized when we enter that block... Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d27400746189f3b5194b49575833ea660c430118 tree 6934944ddb35915046e36479d676cc7e016c6e7c parent bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 author Adrian Bunk Fri, 02 Sep 2005 16:58:06 +0100 committer Russell King Fri, 02 Sep 2005 16:58:06 +0100 [SERIAL] crisv10: Remove {,un}register_serial dummies It seems we can simply kill these dummies with this patch. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit f505380ba7b98ec97bf25300c2a58aeae903530b tree 9ebec4563616b2ffe1b945ae0d4018bcf841291a parent 13ae6d81b963c7b22ab9c158ee5a392fb57579fe parent 504be3aa095903895f9b99abfed40709ff5d1e62 author Linus Torvalds Fri, 02 Sep 2005 02:01:35 -0700 committer Linus Torvalds Fri, 02 Sep 2005 02:01:35 -0700 Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 504be3aa095903895f9b99abfed40709ff5d1e62 tree ec5fb715ed818dccd7089d35ac5ba560e6e0a2b5 parent ceeec3dc375e3b0618f16b34efc56fe093918f8b author Jeff Garzik Fri, 02 Sep 2005 04:44:25 -0400 committer Jeff Garzik Fri, 02 Sep 2005 04:44:25 -0400 [wireless hostap] automatically select ieee80211 dependency in Kconfig commit 13ae6d81b963c7b22ab9c158ee5a392fb57579fe tree 872c7eaf9799e221dbaeae2cc13e96c1628cb2f5 parent d51fe1be3f738e7d73f63bb5aa0df88bafb41a21 author Rolf Eike Beer Fri, 02 Sep 2005 09:03:09 +0200 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] remove driverfs references from init/do_mounts.c This patch is against 2.6.10, but still applies cleanly. It's just s/driverfs/sysfs/ in this file. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit d51fe1be3f738e7d73f63bb5aa0df88bafb41a21 tree 6ba09a8214aed02d11c0f43bb281e3ed4d825463 parent 6a9b28dda3baf6fbbda349788cfe236f631f0359 author Rolf Eike Beer Fri, 02 Sep 2005 08:59:25 +0200 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] remove driverfs references from include/linux/cpu.h and net/sunrpc/rpc_pipe.c This patch is against 2.6.10, but still applies cleanly. It's just s/driverfs/sysfs/ in these two files. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit 6a9b28dda3baf6fbbda349788cfe236f631f0359 tree dd0451607917958c22ab9f4fe2f0672478087178 parent 20216fc86d83e5e96fca7fa8d22de94d294695eb author Miles Bader Fri, 02 Sep 2005 15:13:31 +0900 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] v850: Add show_mem Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 20216fc86d83e5e96fca7fa8d22de94d294695eb tree eef8a887a4d6557dc030731ef6ac0a039c2eaafc parent 023239c6c96dfacbf32e7162ee7692bdd4f58213 author Miles Bader Fri, 02 Sep 2005 15:13:30 +0900 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] v850: Update defconfigs Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 023239c6c96dfacbf32e7162ee7692bdd4f58213 tree d91b0a0253542dcdaa55b6e4c89ee701648315e9 parent 213b24c93b6c43d96973b9db453bf845c97bbe18 author Miles Bader Fri, 02 Sep 2005 15:13:30 +0900 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] v850: Round up length passed to slram driver to a multiple of SLRAM_BLK_SZ Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 213b24c93b6c43d96973b9db453bf845c97bbe18 tree d47aea7e40411d997392b1ce12cc82fd02908ec8 parent 03a002e783b71517a5203e681f84a2719e9cec0e author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:31 -0700 [PATCH] uclinux: use MAP_PRIVATE when mmaping code regions in flat binary loader Use MAP_PRIVATE when calling mmap to get memory for the code region. The flat loader was using MAP_SHARED, but underlying changes to the MMUless mmap means this is now wrong. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 03a002e783b71517a5203e681f84a2719e9cec0e tree 94fc40e32fb968ad6ec331d14beb0e82967a93ae parent 4945b30291ba85a36adffdaafb75bd73f5d887b6 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: update defconfig for m68knommu Updated defconfig for m68knommu arch. Patch originaly submitted by Jan Dittmer Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 4945b30291ba85a36adffdaafb75bd73f5d887b6 tree 03f1420a2b9b3985cd4fa5db4ba14e80c8a02a0e parent e70bd1160109f2b7e62222550a7af37910dba88a author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: new board support in linker script . add support for the M5235EVB board . add support for the SOM5282 board . add support for the MOD5272 board . fix end of memory define for eLITE board Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e70bd1160109f2b7e62222550a7af37910dba88a tree ea46b9013d37c56f8784ae3d93667c5caca9e6b7 parent 8410a546765c10d929b82d1e8237398904a79283 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: need pfn_valid macro Need pfn_valid macro, even on MMUless platforms. Enclose the macro args of __pa and __va in parentheses. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 8410a546765c10d929b82d1e8237398904a79283 tree 97376fb00d48074bacfaa04c64653beba81f7fe7 parent 5c4dbba9fc5e562db502e775e95023453b620409 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: use THREAD_SIZE instead of hard coded size Use the THREAD_SIZE define when manipulating the stack instead of hard coded values (for the 68328 and 68360 sub-architectures). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5c4dbba9fc5e562db502e775e95023453b620409 tree 002de0316f6cd42a6b3890c1fd7743ca17f83be8 parent 777354b63f3fabf702ff88f12c4d513a7219832b author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: new family (523x) and board config support New architecture and board configuration support for m68knommu. . add 523x ColdFire support . add support for SOM5282 and MOD5272 boards . break up the 527x to be separate 5271 and 5275. There is some subtle differences that (like RAM config) that need to be dealt with . add option to support selecting 4k kernel stack Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 777354b63f3fabf702ff88f12c4d513a7219832b tree 0dfd17d6f4f2fae996e88e644576069eac32b0d9 parent db81fb8486563573aca023dac30a2d70c46855e8 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: 523x ColdFire processor support in arch Makefile Add support for the 523x ColdFire family of processors Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit db81fb8486563573aca023dac30a2d70c46855e8 tree b86af0ec7bb953ae45f3e47627b6580227d14f00 parent 5d052c170e9a7ac0c7d58fe4fbf39fca3c24f2cc author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:30 -0700 [PATCH] m68knommu: cleanup showstack() Make show_stack() consistent with other architectures. Put the vector string names in the .rodata section. Patch originally submitted by Philippe De Muyter . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5d052c170e9a7ac0c7d58fe4fbf39fca3c24f2cc tree d1d96d57f30af7ed5f84e8c38557d55ded434d8f parent 029fc1375fcf687a83faf7521358a9f5c589da13 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:29 -0700 [PATCH] uclinux: update MAINTAINERS entry for UCLINUX Modify maintainers for uClinux (MMUless). Neither Dave nor Jeff manitain the 2.6 code in mainline, so no point emailing them about problems. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 029fc1375fcf687a83faf7521358a9f5c589da13 tree 2dd027f39fbbc4359c5f26233219faed1e8e62ac parent e6070a1712e69779f322239056fb5f1e1db802ce author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:29 -0700 [PATCH] m68knommu: fix ColdFire startup code to properly handle non 0 based ram Correctly determine the end of ram for ram setups that do not start at base address of 0. Add support for the MOD5272 board, which doesn not have a ram base of 0. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e6070a1712e69779f322239056fb5f1e1db802ce tree a223bb24216ee3f81e99feb2dbca5d9c2d9697dd parent b5aaf3f71cf5a6115cf76671b011de0209223fc2 author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:29 -0700 [PATCH] m68knommu: new family (523x) and board setup . setup for the new 523x ColdFire family . break up of 527x to be 5271 and 5275 . some white space cleanup Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b5aaf3f71cf5a6115cf76671b011de0209223fc2 tree 29a2f997df94da3de8dc43903f1f89661c3a33c1 parent 138307b475286a5bcc985b06b3e71fcd33dd5e2c author Greg Ungerer Fri, 02 Sep 2005 10:42:52 +1000 committer Linus Torvalds Fri, 02 Sep 2005 00:57:29 -0700 [PATCH] m68knommu: 523x ColdFire processor init code Low level initialization code for the 523x ColdFire processor family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 138307b475286a5bcc985b06b3e71fcd33dd5e2c tree e025c7cb26396b07f157eea20a1cfb037b66758f parent 66f3767376e2bbffb4c2c78ea171e1fdcb62201b parent bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 author Linus Torvalds Fri, 02 Sep 2005 00:53:36 -0700 committer Linus Torvalds Fri, 02 Sep 2005 00:53:36 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial commit 66f3767376e2bbffb4c2c78ea171e1fdcb62201b tree 2006a0d4e087d34b4f8767574e36946c0254fbbc parent 5d8c397f304e1363f8ff9749b08172eb59e6534a parent 86a8a83963a3f6beeca4900d26da93c7d2a9d92d author Linus Torvalds Fri, 02 Sep 2005 00:52:05 -0700 committer Linus Torvalds Fri, 02 Sep 2005 00:52:05 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm commit 5d8c397f304e1363f8ff9749b08172eb59e6534a tree 57ff502553918aa7309b7375e983f27f719e7b28 parent 44757223cd77f6e332dfa0b043c67df7b665bc19 parent ceeec3dc375e3b0618f16b34efc56fe093918f8b author Linus Torvalds Fri, 02 Sep 2005 00:48:33 -0700 committer Linus Torvalds Fri, 02 Sep 2005 00:48:33 -0700 Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 44757223cd77f6e332dfa0b043c67df7b665bc19 tree 0222e33d9ce59212f309114294424187691f2ca9 parent 712fbdd33306aa07085d1e648b5f3d45d7943794 parent ee05f031ec72cc06abc4002992649c3a8344d246 author Linus Torvalds Fri, 02 Sep 2005 00:46:53 -0700 committer Linus Torvalds Fri, 02 Sep 2005 00:46:53 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 6475be16fd9b3c6746ca4d18959246b13c669ea8 tree 03e0da36680ddb227591a4007fa4e6f18d82782c parent ef015786152adaff5a6a8bf0c8ea2f70cee8059d author David S. Miller Thu, 01 Sep 2005 22:47:01 -0700 committer David S. Miller Thu, 01 Sep 2005 22:47:01 -0700 [TCP]: Keep TSO enabled even during loss events. All we need to do is resegment the queue so that we record SACK information accurately. The edges of the SACK blocks guide our resegmenting decisions. With help from Herbert Xu. Signed-off-by: David S. Miller commit a7a6cac204147634aba7487e4d618b028ff54c0d tree 8c68a738984d823a830e95c72fd3df4d6c4dc6f6 parent 8a36895c0ddac143b7f0e87d46153f4f75d9fff7 author David S. Miller Thu, 01 Sep 2005 21:51:26 -0700 committer David S. Miller Thu, 01 Sep 2005 21:51:26 -0700 [SPARC]: Kill io_remap_page_range() It's been deprecated long enough and there are no in-tree users any longer. Signed-off-by: David S. Miller commit ef015786152adaff5a6a8bf0c8ea2f70cee8059d tree 3042db7e451c61aefc60c1463bb6e307ca510638 parent d80d99d643090c3cf2b1f9fb3fadd1256f7e384f author Herbert Xu Thu, 01 Sep 2005 17:48:59 -0700 committer David S. Miller Thu, 01 Sep 2005 17:48:59 -0700 [TCP]: Fix sk_forward_alloc underflow in tcp_sendmsg I've finally found a potential cause of the sk_forward_alloc underflows that people have been reporting sporadically. When tcp_sendmsg tacks on extra bits to an existing TCP_PAGE we don't check sk_forward_alloc even though a large amount of time may have elapsed since we allocated the page. In the mean time someone could've come along and liberated packets and reclaimed sk_forward_alloc memory. This patch makes tcp_sendmsg check sk_forward_alloc every time as we do in do_tcp_sendpages. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d80d99d643090c3cf2b1f9fb3fadd1256f7e384f tree 5e8bd46fa6c73cace5efb77c43e863cd36edb0c9 parent 2dac4b96b9362954a0638317b90e3e7bcb112e83 author Herbert Xu Thu, 01 Sep 2005 17:48:23 -0700 committer David S. Miller Thu, 01 Sep 2005 17:48:23 -0700 [NET]: Add sk_stream_wmem_schedule This patch introduces sk_stream_wmem_schedule as a short-hand for the sk_forward_alloc checking on egress. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2dac4b96b9362954a0638317b90e3e7bcb112e83 tree 8cf0b815263b1809488b4071b4a5a3a1aece2ad1 parent 573dbd95964b01a942aa0c68e92b06f2c9536964 author YOSHIFUJI Hideaki Thu, 01 Sep 2005 17:44:49 -0700 committer David S. Miller Thu, 01 Sep 2005 17:44:49 -0700 [IPV6]: Repair Incoming Interface Handling for Raw Socket. Due to changes to enforce checking interface bindings, sockets did not see loopback packets bound for our local address on our interface. e.g.) When we ping6 fe80::1%eth0, skb->dev points loopback_dev while IP6CB(skb)->iif indicates eth0. This patch fixes the issue by using appropriate incoming interface, in the sense of scoping architecture. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 573dbd95964b01a942aa0c68e92b06f2c9536964 tree 4ada5dff2a15e1ad1edee7294d6f0d3c260987d1 parent 5170dbebbb2e9159cdf6bbf35e5d79cd7009799a author Jesper Juhl Thu, 01 Sep 2005 17:44:29 -0700 committer David S. Miller Thu, 01 Sep 2005 17:44:29 -0700 [CRYPTO]: crypto_free_tfm() callers no longer need to check for NULL Since the patch to add a NULL short-circuit to crypto_free_tfm() went in, there's no longer any need for callers of that function to check for NULL. This patch removes the redundant NULL checks and also a few similar checks for NULL before calls to kfree() that I ran into while doing the crypto_free_tfm bits. I've succesfuly compile tested this patch, and a kernel with the patch applied boots and runs just fine. When I posted the patch to LKML (and other lists/people on Cc) it drew the following comments : J. Bruce Fields commented "I've no problem with the auth_gss or nfsv4 bits.--b." Sridhar Samudrala said "sctp change looks fine." Herbert Xu signed off on the patch. So, I guess this is ready to be dropped into -mm and eventually mainline. Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5170dbebbb2e9159cdf6bbf35e5d79cd7009799a tree 9608724311af6f32806c87c368fd26c3daec3ae4 parent 12a49ffd842bf5b07c62eaabf178703ce4fe09d7 author KOVACS Krisztian Thu, 01 Sep 2005 17:44:06 -0700 committer David S. Miller Thu, 01 Sep 2005 17:44:06 -0700 [NETFILTER]: CLUSTERIP: fix memcpy() length typo Fix a trivial typo in clusterip_config_init(). Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 12a49ffd842bf5b07c62eaabf178703ce4fe09d7 tree 7b545e72c8bc1d11aef96dba359221f7174d752b parent eb6f1160ddb2fdadf50f350da79d0796c37f17e2 author Patrick Caulfield Thu, 01 Sep 2005 17:43:45 -0700 committer David S. Miller Thu, 01 Sep 2005 17:43:45 -0700 [DECNET]: Tidy send side socket SKB allocation. Patch from Steve Whitehouse which I've vetted and tested: "This patch is really intended has a move towards fixing the sendmsg/recvmsg functions in various ways so that we will finally have working nagle. Also reduces code duplication." Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit eb6f1160ddb2fdadf50f350da79d0796c37f17e2 tree e7b048b089b4b0ec9f121eea9a7f5864999dbac3 parent 64baf3cfea974d2b9e671ccfdbc03e030ea5ebc6 author Herbert Xu Thu, 01 Sep 2005 17:43:25 -0700 committer David S. Miller Thu, 01 Sep 2005 17:43:25 -0700 [CRYPTO]: Use CRYPTO_TFM_REQ_MAY_SLEEP where appropriate This patch goes through the current users of the crypto layer and sets CRYPTO_TFM_REQ_MAY_SLEEP at crypto_alloc_tfm() where all crypto operations are performed in process context. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 64baf3cfea974d2b9e671ccfdbc03e030ea5ebc6 tree 2bae23bf3d7378ba2d60be8aee6b0178d1d9c721 parent fb4f10ed50f01b0f953068456bfb6e2885921b01 author Herbert Xu Thu, 01 Sep 2005 17:43:05 -0700 committer David S. Miller Thu, 01 Sep 2005 17:43:05 -0700 [CRYPTO]: Added CRYPTO_TFM_REQ_MAY_SLEEP flag The crypto layer currently uses in_atomic() to determine whether it is allowed to sleep. This is incorrect since spin locks don't always cause in_atomic() to return true. Instead of that, this patch returns to an earlier idea of a per-tfm flag which determines whether sleeping is allowed. Unlike the earlier version, the default is to not allow sleeping. This ensures that no existing code can break. As usual, this flag may either be set through crypto_alloc_tfm(), or just before a specific crypto operation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fb4f10ed50f01b0f953068456bfb6e2885921b01 tree e9eb4112522d7969fdc4bbf6455b6d0d59426121 parent 75c80c382fbd08acf06fbef9d54c9844e806a8b4 author Aaron Grothe Thu, 01 Sep 2005 17:42:46 -0700 committer David S. Miller Thu, 01 Sep 2005 17:42:46 -0700 [CRYPTO]: Fix XTEA implementation The XTEA implementation was incorrect due to a misinterpretation of operator precedence. Because of the wide-spread nature of this error, the erroneous implementation will be kept, albeit under the new name of XETA. Signed-off-by: Aaron Grothe Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 75c80c382fbd08acf06fbef9d54c9844e806a8b4 tree 7f23d59358c647a1253fc92e75d3906a47878a63 parent 51b9146869ab9492da785c5c9321d85f01655ab6 author David S. Miller Thu, 01 Sep 2005 17:42:23 -0700 committer David S. Miller Thu, 01 Sep 2005 17:42:23 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 51b9146869ab9492da785c5c9321d85f01655ab6 tree d95f8fda63a7e4a2508f1fc440dcc5e162140334 parent 86d9f7f0c9cf06d7d3cfa2a9f0514cf21fa5fda1 author Michael Chan Thu, 01 Sep 2005 17:41:28 -0700 committer David S. Miller Thu, 01 Sep 2005 17:41:28 -0700 [TG3]: Minimize locking in TX path. This is similar to Eric Dumazet's tx_lock patch for tg3 but takes it one step further to eliminate the tx_lock in the tx_completion path when the tx queue is not stopped. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 86d9f7f0c9cf06d7d3cfa2a9f0514cf21fa5fda1 tree c34402cdb31bf1d8733b52a8f2d5ba9965bad734 parent 0014c6156f9e7d034d20742d164d7d4da289b42a author Eric Lemoine Thu, 01 Sep 2005 17:41:07 -0700 committer David S. Miller Thu, 01 Sep 2005 17:41:07 -0700 [SUNGEM]: Fix netpoll bug in Sun GEM Ether driver From: Eric Lemoine To me the bug is that __LINK_STATE_RX_SCHED can be set while __netif_rx_schedule() hasen't be called. Why don't fix it in the simplest way ? See attached patch (absolutely untested). Signed-off-by: Geoff Levand Signed-off-by: David S. Miller commit 0014c6156f9e7d034d20742d164d7d4da289b42a tree 78a3d88903fcbad61935c9c804f78f8cd3720dd1 parent 732db659b83579b922c18dee9123e1529b5fb5d2 author Geoff Levand Thu, 01 Sep 2005 17:40:46 -0700 committer David S. Miller Thu, 01 Sep 2005 17:40:46 -0700 [SUNGEM]: fix minor bug in sungem.h This changes the Sun Gem Ether driver's tx ring buffer length to the proper constant. Currently TX_RING_SIZE and RX_RING_SIZE are equal, so no malfunction occurs. Signed-off-by: Geoff Levand Signed-off-by: David S. Miller commit 732db659b83579b922c18dee9123e1529b5fb5d2 tree d4d30957d739486145ad46dcfc63f21e02fbbb0f parent ff4cc3ac93e1d0369928fd60ec1fe82417afc576 author Adrian Bunk Thu, 01 Sep 2005 17:40:26 -0700 committer David S. Miller Thu, 01 Sep 2005 17:40:26 -0700 [IPVS]: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ff4cc3ac93e1d0369928fd60ec1fe82417afc576 tree c8f9380cfaedfd9f63f8e2eb0fff2d660aa81bab parent 80ac2912f846c01d702774bb6aa7100ec71e88b9 author Mike Kershaw Thu, 01 Sep 2005 17:40:05 -0700 committer David S. Miller Thu, 01 Sep 2005 17:40:05 -0700 [TUNTAP]: Allow setting the linktype of the tap device from userspace Currently tun/tap only supports the EN10MB ARP type. For use with wireless and other networking types it should be possible to set the ARP type via an ioctl. Patch v2: Included check that the tap interface is down before changing the link type out from underneath it Signed-off-by: Mike Kershaw Signed-off-by: David S. Miller commit ceeec3dc375e3b0618f16b34efc56fe093918f8b tree 2293d02721ee05131aaf1c60e4fba7e281585eec parent fbff868db3a4cc6a89d51da9a6d49b26c29d04fb parent e3ee3b78f83688a0ae4315e8be71b2eac559904a author Jeff Garzik Thu, 01 Sep 2005 18:02:27 -0400 committer Jeff Garzik Thu, 01 Sep 2005 18:02:27 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit e3ee3b78f83688a0ae4315e8be71b2eac559904a tree deb03bcdd020262af450ed23382d7c921263f5cf parent 91cb70c1769d9b72dd1efe40c31f01005820b09e parent 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 author Jeff Garzik Thu, 01 Sep 2005 18:02:01 -0400 committer Jeff Garzik Thu, 01 Sep 2005 18:02:01 -0400 /spare/repo/netdev-2.6 branch 'master' commit 86a8a83963a3f6beeca4900d26da93c7d2a9d92d tree 67c38d24dc4d2b3360c7d41588244f3a0d424cf5 parent 103461a80c2f2dd95fe9a39a5decd984622c2a9e author Russell King Thu, 01 Sep 2005 22:41:55 +0100 committer Russell King Thu, 01 Sep 2005 22:41:55 +0100 [ARM] Fix ARMv6 page table bits We weren't explicitly setting the page table bits we desired in user_prot in the protection table, which resulted in the user mappings for v6 CPUs being marked global. Signed-off-by: Russell King commit 712fbdd33306aa07085d1e648b5f3d45d7943794 tree 5e8c905d983df3d54ae27e9c080fc6cfafe180eb parent b25dd2842bcaef2413db7a06c67034b187aa007f parent 986632fd7033a0199f9548c44606377cdf1f4a80 author Linus Torvalds Thu, 01 Sep 2005 10:58:18 -0700 committer Linus Torvalds Thu, 01 Sep 2005 10:58:18 -0700 Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit b25dd2842bcaef2413db7a06c67034b187aa007f tree ad489c6e7ef828be8b411e00b7c5609769c6a3fb parent 80ac2912f846c01d702774bb6aa7100ec71e88b9 parent 147056fb84150966d736fe21fa01d5e0f08e0980 author Linus Torvalds Thu, 01 Sep 2005 10:56:57 -0700 committer Linus Torvalds Thu, 01 Sep 2005 10:56:57 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git commit 80ac2912f846c01d702774bb6aa7100ec71e88b9 tree a43d483cf144eb0f770a6e2e8ac9f721965a7fa9 parent 8085ce084c0f0144c353963853f81486fc331120 author Kumar Gala Wed, 31 Aug 2005 14:54:47 +1000 committer Linus Torvalds Thu, 01 Sep 2005 10:52:29 -0700 [PATCH] ppc: L2 cache prefetch fixes on 745x We run into problems if we blindly enable L2 prefetching without checking that the L2 cache is actually enabled. Additionaly, if we disable the L2 cache we need to ensure that we disable L2 prefetching. Signed-off-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 8085ce084c0f0144c353963853f81486fc331120 tree 6821eb3b64158ec230982f4db5f027b326edd620 parent 319e76a1ae835c34a2838c2bfebe3db4d5a6b387 author Benjamin Herrenschmidt Wed, 31 Aug 2005 14:16:53 +1000 committer Linus Torvalds Thu, 01 Sep 2005 10:50:29 -0700 [PATCH] Fix PCI ROM mapping This fixes a problem with pci_map_rom() which doesn't properly update the ROM BAR value with the address thas allocated for it by the PCI code. This problem, among other, breaks boot on Mac laptops. It'ss a new version based on Linus latest one with better error checking. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 319e76a1ae835c34a2838c2bfebe3db4d5a6b387 tree 7e4ce062242df4690c6711ae1274d76e8ef5fce9 parent 7eaa414ee86cda4c153002ed218b9a0ad17f7de1 author David Gibson Wed, 31 Aug 2005 14:34:05 +1000 committer Linus Torvalds Thu, 01 Sep 2005 10:48:20 -0700 [PATCH] Fix bug in ppc64 dynamic hugepage support In adjusting the logic for SLB miss for the dynamic hugepage stuff, I messed up the !CONFIG_HUGETLB_PAGE case, failing to set the SLB flags properly. This fixes it. It also streamlines the logic for the HUGETLB_PAGE case (removing a couple of branches) while we're at it. Booted, and roughly tested on POWER5 (with and without HUGETLB_PAGE), iSeries/RS64 (no hugepage available), and G5 (with and without HUGETLB_PAGE). Signed-off-by: David Gibson Signed-off-by: Linus Torvalds commit 7eaa414ee86cda4c153002ed218b9a0ad17f7de1 tree d6a45b71753d97d85dc1bbd7dd7a095144a6c50f parent 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 author Adrian Bunk Wed, 31 Aug 2005 17:43:51 +0200 committer Linus Torvalds Thu, 01 Sep 2005 10:43:33 -0700 [PATCH] Add missing select's to DVB_BUDGET_AV This fixes the following compile error: ... LD .tmp_vmlinux1 drivers/built-in.o: In function `frontend_init': budget-av.c:(.text+0xb9448): undefined reference to `tda10046_attach' budget-av.c:(.text+0xb9518): undefined reference to `tda10021_attach' drivers/built-in.o: In function `philips_tu1216_request_firmware': budget-av.c:(.text+0xb937b): undefined reference to `request_firmware' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk Acked-by: Johannes Stezenbach Acked-by: Michael Krufky Signed-off-by: Linus Torvalds commit bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 tree 96788588be2c9a6ce4d39d4b54bde7c03e93ce5a parent f8dd49fa054814f365fcff8d72ca47e8afda9743 author Russell King Thu, 01 Sep 2005 15:56:26 +0100 committer Russell King Thu, 01 Sep 2005 15:56:26 +0100 [SERIAL] Move serial8250_*_port prototypes to linux/serial_8250.h Signed-off-by: Russell King commit 103461a80c2f2dd95fe9a39a5decd984622c2a9e tree 01d0fa7bfa325cbbeec6ea484378355a18269444 parent 08f4ffb3eb4ff23daf9c61bcd523940d43c2270c author Russell King Thu, 01 Sep 2005 14:51:59 +0100 committer Russell King Thu, 01 Sep 2005 14:51:59 +0100 [ARM] Simplify setup_mm_for_reboot() No point checking what CPU architecture level we have each time within the loop, so precompute the base PMD flags outside the loop. Signed-off-by: Russell King commit 08f4ffb3eb4ff23daf9c61bcd523940d43c2270c tree 4aefef161593bc013a0d848a0be05610eaea0d69 parent 569d2c34dcf259b07977835492aa8813d1168230 author Russell King Thu, 01 Sep 2005 14:45:18 +0100 committer Russell King Thu, 01 Sep 2005 14:45:18 +0100 [ARM] Convert open-coded __pmd_populate to use inline function Signed-off-by: Russell King commit f8dd49fa054814f365fcff8d72ca47e8afda9743 tree 21cd9b7db02a67d6420068b95aa394b504e10eff parent 5981d644209c38029df7f91eb8c61bc5952f182b author Russell King Thu, 01 Sep 2005 14:25:45 +0100 committer Russell King Thu, 01 Sep 2005 14:25:45 +0100 [SERIAL] mwave is no longer broken Signed-off-by: Russell King commit 569d2c34dcf259b07977835492aa8813d1168230 tree aa16ba481ff295b1cf7d0bafa503078bc54249a2 parent 20e912680842504ab4633deaa644c2b855ad3d44 author Nicolas Pitre Thu, 01 Sep 2005 12:48:48 +0100 committer Russell King Thu, 01 Sep 2005 12:48:48 +0100 [ARM] 2864/1: VST aka CONFIG_NO_IDLE_HZ support for SA11x0 Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 20e912680842504ab4633deaa644c2b855ad3d44 tree b92a5c0c287c9a115a43b85f55a818996df5e319 parent 5c53ff088cb76dca52bdf2ef36ea63147763f9ea author Nicolas Pitre Thu, 01 Sep 2005 12:48:47 +0100 committer Russell King Thu, 01 Sep 2005 12:48:47 +0100 [ARM] 2863/1: clarify comment in PXA2xx and SA1x00 timer code Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 5c53ff088cb76dca52bdf2ef36ea63147763f9ea tree d3d740367c93594860087531124213379e7345e4 parent 68d9102f76de7a923fb81c8b6de4764f8f50ed17 author Nicolas Pitre Thu, 01 Sep 2005 12:48:40 +0100 committer Russell King Thu, 01 Sep 2005 12:48:40 +0100 [ARM] 2862/1: VST aka CONFIG_NO_IDLE_HZ support for PXA2xx Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 68d9102f76de7a923fb81c8b6de4764f8f50ed17 tree 635711b71ef8aca704638b01bb2f58902b93d04a parent 147056fb84150966d736fe21fa01d5e0f08e0980 author Nicolas Pitre Thu, 01 Sep 2005 12:37:13 +0100 committer Russell King Thu, 01 Sep 2005 12:37:13 +0100 [ARM] 2865/2: fix fadvise64_64 syscall argument passing Patch from Nicolas Pitre The prototype for sys_fadvise64_64() is: long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) The argument list is therefore as follows on legacy ABI: fd: type int (r0) offset: type long long (r1-r2) len: type long long (r3-sp[0]) advice: type int (sp[4]) With EABI this becomes: fd: type int (r0) offset: type long long (r2-r3) len: type long long (sp[0]-sp[4]) advice: type int (sp[8]) Not only do we have ABI differences here, but the EABI version requires one additional word on the syscall stack. To avoid the ABI mismatch and the extra stack space required with EABI this syscall is now defined with a different argument ordering on ARM as follows: long sys_arm_fadvise64_64(int fd, int advice, loff_t offset, loff_t len) This gives us the following ABI independent argument distribution: fd: type int (r0) advice: type int (r1) offset: type long long (r2-r3) len: type long long (sp[0]-sp[4]) Now, since the syscall entry code takes care of 5 registers only by default including the store of r4 to the stack, we need a wrapper to store r5 to the stack as well. Because that wrapper was missing and was always required this means that sys_fadvise64_64 never worked on ARM and therefore we can safely reuse its syscall number for our new sys_arm_fadvise64_64 interface. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit fbff868db3a4cc6a89d51da9a6d49b26c29d04fb tree 3582ea805d0153b42979bdc8315c68607db928b6 parent a8eef8a22232e64be76410100c52038b21bda7ed author Jouni Malinen Sun, 28 Aug 2005 17:53:32 -0700 committer Jeff Garzik Wed, 31 Aug 2005 22:48:39 -0400 [PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present() local->hw_priv was initialized only after the interrupt handler was registered. This could trigger a NULL pointer dereference in prism2_pccard_card_present() that assumed that local->hw_priv is always set (and it should have been). Fix this by setting local->hw_priv before registering the interrupt handler. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ee05f031ec72cc06abc4002992649c3a8344d246 tree 75fdfcc259b9a62796766219df10799cd9ad342d parent 59f17aebabef709a32a8fc09b4cd3507f32dea01 author Michael Ellerman Thu, 01 Sep 2005 11:29:29 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:43:42 -0400 [PATCH] iseries_veth: Be consistent about driver name, increment version The iseries_veth driver tells sysfs that it's called 'iseries_veth', but if you ask it via ethtool it thinks it's called 'veth'. I think this comes from 2.4 when the driver was called 'veth', but it's definitely called 'iseries_veth' now, so fix it. To make sure we don't do it again define DRV_NAME and use it everywhere. While we're at it, change the version number to 2.0, to reflect the changes made in this patch series. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 59f17aebabef709a32a8fc09b4cd3507f32dea01 tree 9bdf374b21bfa92a5fd22e6f9367017b54575054 parent 642d1a4c36b9002a45ea6498bda5d1e911eeb933 author Michael Ellerman Thu, 01 Sep 2005 11:29:27 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:43:42 -0400 [PATCH] iseries_veth: Remove studly caps from iseries_veth.c Having merged iseries_veth.h, let's remove some of the studly caps that came with it. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 642d1a4c36b9002a45ea6498bda5d1e911eeb933 tree a409815ba4897bc06e60a45044a4bb45001c4521 parent 07a5c1727d6bf5c917034fe4006acf726cb158bf author Michael Ellerman Thu, 01 Sep 2005 11:29:25 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:43:42 -0400 [PATCH] iseries_veth: Incorporate iseries_veth.h in iseries_veth.c iseries_veth.h is only used by iseries_veth.c, so merge the former into the latter. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 07a5c1727d6bf5c917034fe4006acf726cb158bf tree 06a57b62a3129cf4f63a237119c1f97ec891e7df parent 76812d81238cda5c5c4060da27517a08287620fc author Michael Ellerman Thu, 01 Sep 2005 11:29:21 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:42:46 -0400 [PATCH] iseries_veth: Add sysfs support for port structs Also to aid debugging, add sysfs support for iseries_veth's port structures. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 76812d81238cda5c5c4060da27517a08287620fc tree 461d70f89c14cfc4586729ad082c92cee3306f4e parent db5e8718eac0b8166d6fd05b1ed7f8114c243988 author Michael Ellerman Thu, 01 Sep 2005 11:29:20 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:42:46 -0400 [PATCH] iseries_veth: Add sysfs support for connection structs To aid in field debugging, add sysfs support for iseries_veth's connection structures. At the moment this is all read-only, however we could think about adding write support for some attributes in future. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit db5e8718eac0b8166d6fd05b1ed7f8114c243988 tree e0adc928ffa6735e228c6fd2867381f8442875e7 parent e0808494ff44d5cedcaf286bb8a93d08e8d9af49 author Michael Ellerman Thu, 01 Sep 2005 11:29:19 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:42:45 -0400 [PATCH] iseries_veth: Fix bogus counting of TX errors There's a number of problems with the way iseries_veth counts TX errors. Firstly it counts conditions which aren't really errors as TX errors. This includes if we don't have a connection struct for the other LPAR, or if the other LPAR is currently down (or just doesn't want to talk to us). Neither of these should count as TX errors. Secondly, it counts one TX error for each LPAR that fails to accept the packet. This can lead to TX error counts higher than the total number of packets sent through the interface. This is confusing for users. This patch fixes that behaviour. The non-error conditions are no longer counted, and we introduce a new and I think saner meaning to the TX counts. If a packet is successfully transmitted to any LPAR then it is transmitted and tx_packets is incremented by 1. If there is an error transmitting a packet to any LPAR then that is counted as one error, ie. tx_errors is incremented by 1. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit e0808494ff44d5cedcaf286bb8a93d08e8d9af49 tree e2d90bb9d07454266ebc9fe36901aa97305c15e0 parent 24562ffa8bdf3a111278a8b93ab92837b9ec9113 author Michael Ellerman Thu, 01 Sep 2005 11:29:18 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:42:45 -0400 [PATCH] iseries_veth: Simplify full-queue handling The iseries_veth driver often has multiple netdevices sending packets over a single connection to another LPAR. If the bandwidth to the other LPAR is exceeded, all the netdevices must have their queues stopped. The current code achieves this by queueing one incoming skb on the per-netdevice port structure. When the connection is able to send more packets we iterate through the port structs and flush any packet that is queued, as well as restarting the associated netdevice's queue. This arrangement makes less sense now that we have per-connection TX timers, rather than the per-netdevice generic TX timer. The new code simply detects when one of the connections is full, and stops the queue of all associated netdevices. Then when a packet is acked on that connection (ie. there is space again) all the queues are woken up. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 24562ffa8bdf3a111278a8b93ab92837b9ec9113 tree fd61f42ecad239577edf680efe3f93ac95b70a26 parent 48683d72f8146dfb896e05c90d3544bbad63778c author Michael Ellerman Thu, 01 Sep 2005 11:29:17 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:42:45 -0400 [PATCH] iseries_veth: Add a per-connection ack timer Currently the iseries_veth driver contravenes the specification in Documentation/networking/driver.txt, in that if packets are not acked by the other LPAR they will sit around forever. This patch adds a per-connection timer which fires if we've had no acks for five seconds. This is superior to the generic TX timer because it catches the case of a small number of packets being sent and never acked. This fixes a bug we were seeing on real systems, where some IPv6 neighbour discovery packets would not be acked and then prevent the module from being removed, due to skbs lying around. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 48683d72f8146dfb896e05c90d3544bbad63778c tree 20154b85d4a5f62d74890b1b5b8568c16475f853 parent f0c129caa34b4bb0944bbb758b56c3d85b105557 author Michael Ellerman Thu, 01 Sep 2005 11:29:12 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:39:43 -0400 [PATCH] iseries_veth: Remove TX timeout code The iseries_veth driver uses the generic TX timeout watchdog, however a better solution is in the works, so remove this code. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit f0c129caa34b4bb0944bbb758b56c3d85b105557 tree 84f22d680065e39d11be61ecd992d6b8597704dd parent ec60beebed497691c97d674c1facac5ca3d7a4b3 author Michael Ellerman Thu, 01 Sep 2005 11:29:09 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:39:43 -0400 [PATCH] iseries_veth: Use kobjects to track lifecycle of connection structs The iseries_veth driver can attach to multiple vlans, which correspond to multiple net devices. However there is only 1 connection between each LPAR, so the connection structure may be shared by multiple net devices. This makes module removal messy, because we can't deallocate the connections until we know there are no net devices still using them. The solution is to use ref counts on the connections, so we can delete them (actually stop) as soon as the ref count hits zero. This patch fixes (part of) a bug we were seeing with IPv6 sending probes to a dead LPAR, which would then hang us forever due to leftover skbs. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit ec60beebed497691c97d674c1facac5ca3d7a4b3 tree 0591903d946969283238116291b2755b1cfa86d2 parent cbf9074cc30ca0eee19c9bd7304faf9f1beb1e76 author Michael Ellerman Thu, 01 Sep 2005 11:29:08 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:39:43 -0400 [PATCH] iseries_veth: Make init_connection() & destroy_connection() symmetrical This patch makes veth_init_connection() and veth_destroy_connection() symmetrical in that they allocate/deallocate the same data. Currently if there's an error while initialising connections (ie. ENOMEM) we call veth_module_cleanup(), however this will oops because we call driver_unregister() before we've called driver_register(). I've never seen this actually happen though. So instead we explicitly call veth_destroy_connection() for each connection, any that have been set up will be deallocated. We also fix a potential leak if vio_register_driver() fails. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit cbf9074cc30ca0eee19c9bd7304faf9f1beb1e76 tree f3d0133df8c9a46135148e34b0a553849153c04f parent b08bd5c0a3110f143faeef9cd057d9d8ff2f0714 author Michael Ellerman Thu, 01 Sep 2005 11:29:07 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:39:43 -0400 [PATCH] iseries_veth: Only call dma_unmap_single() if dma_map_single() succeeded The iseries_veth driver unconditionally calls dma_unmap_single() even when the corresponding dma_map_single() may have failed. Rework the code a bit to keep the return value from dma_unmap_single() around, and then check if it's a dma_mapping_error() before we do the dma_unmap_single(). Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit b08bd5c0a3110f143faeef9cd057d9d8ff2f0714 tree ee9e8d2e5457a2bb06d301b528203fca2c4db18e parent d7893ddd1b2110a54a5b1773a405748172ba1fe5 author Michael Ellerman Thu, 01 Sep 2005 11:29:06 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:39:43 -0400 [PATCH] iseries_veth: Replace lock-protected atomic with an ordinary variable The iseries_veth driver uses atomic ops to manipulate the in_use field of one of its per-connection structures. However all references to the flag occur while the connection's lock is held, so the atomic ops aren't necessary. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit d7893ddd1b2110a54a5b1773a405748172ba1fe5 tree 29e6558fcc6156bdbf97507e631d37d34e4c1a22 parent 2a5391a12297d1759b1c736634acb95793d43fb3 author Michael Ellerman Thu, 01 Sep 2005 11:29:05 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:37:57 -0400 [PATCH] iseries_veth: Remove redundant message stack lock The iseries_veth driver keeps a stack of messages for each connection and a lock to protect the stack. However there is also a per-connection lock which makes the message stack lock redundant. Remove the message stack lock and document the fact that callers of the stack-manipulation functions must hold the connection's lock. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 2a5391a12297d1759b1c736634acb95793d43fb3 tree 1ada6ec6cd236f98371c32fc02c30c97546f84d9 parent 58c5900bdaffbf76afd7ad5e053410cb95eb3169 author Michael Ellerman Thu, 01 Sep 2005 11:29:02 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:37:57 -0400 [PATCH] iseries_veth: Fix broken promiscuous handling Due to a logic bug, once promiscuous mode is enabled in the iseries_veth driver it is never disabled. The driver keeps two flags, promiscuous and all_mcast which have exactly the same effect. This is because we only ever receive packets destined for us, or multicast packets. So consolidate them into one promiscuous flag for simplicity. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 58c5900bdaffbf76afd7ad5e053410cb95eb3169 tree 1d6e6eba8392f496f9ac2f632fdda8aa48b0b732 parent abfda4719c61550be4efaf277d4a904a7930d410 author Michael Ellerman Thu, 01 Sep 2005 11:29:00 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:37:56 -0400 [PATCH] iseries_veth: Try to avoid pathological reset behaviour The iseries_veth driver contains a state machine which is used to manage how connections are setup and neogotiated between LPARs. If one side of a connection resets for some reason, the two LPARs can get stuck in a race to re-setup the connection. This can lead to the connection being declared dead by one or both ends. In practice the connection is declared dead by one or both ends approximately 8/10 times a connection is reset, although it is rare for connections to be reset. (an example here: http://michael.ellerman.id.au/files/misc/veth-trace.html) The core of the problem is that the end that resets the connection doesn't wait for the other end to become aware of the reset. So the resetting end starts setting the connection back up, and then receives a reset from the other end (which is the response to the initial reset). And so on. We're severely limited in what we can do to fix this. The protocol between LPARs is essentially fixed, as we have to interoperate with both OS/400 and old Linux drivers. Which also means we need a fix that only changes the code on one end. The only fix I've found given that, is to just blindly sleep for a bit when resetting the connection, in the hope that the other end will get itself sorted. Needless to say I'd love it if someone has a better idea. This does work, I've so far been unable to get it to break, whereas without the fix a reset of one end will lead to a dead connection ~8/10 times. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit abfda4719c61550be4efaf277d4a904a7930d410 tree 868c89f3f74f3771a336bca4c9abcbc75e61105c parent 61a3c6966158dfd9b1279c10ea8eeb3bc7acdef4 author Michael Ellerman Thu, 01 Sep 2005 11:28:59 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:37:56 -0400 [PATCH] iseries_veth: Remove a FIXME WRT deletion of the ack_timer The iseries_veth driver has a timer which we use to send acks. When the connection is reset or stopped we need to delete the timer. Currently we only call del_timer() when resetting a connection, which means the timer might run again while the connection is being re-setup. As it turns out that's ok, because the flags the timer consults have been reset. It's cleaner though to call del_timer_sync() once we've dropped the lock, although the timer may still run between us dropping the lock and calling del_timer_sync(), but as above that's ok. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 61a3c6966158dfd9b1279c10ea8eeb3bc7acdef4 tree 299cc2a18fea9eb046a32e6f7ec3a2db13f16ad4 parent afc7097f45bdfddc2a0d375ef4a2c38b6e09c339 author Michael Ellerman Thu, 01 Sep 2005 11:28:57 +1000 committer Jeff Garzik Wed, 31 Aug 2005 22:37:56 -0400 [PATCH] iseries_veth: Cleanup error and debug messages Currently the iseries_veth driver prints the file name and line number in its error messages. This isn't very useful for most users, so just print "iseries_veth: message" instead. - convert uses of veth_printk() to veth_debug()/veth_error()/veth_info() - make terminology consistent, ie. always refer to LPAR not lpar - be consistent about printing return codes as %d not %x - make format strings fit in 80 columns Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 8a36895c0ddac143b7f0e87d46153f4f75d9fff7 tree eefe211a3b8ebe26e9d706c14760a5d3a91c56fb parent 5843e37e24d7cf32f7996dd015245633e0790595 author David S. Miller Wed, 31 Aug 2005 15:01:33 -0700 committer David S. Miller Wed, 31 Aug 2005 15:01:33 -0700 [SPARC64]: Use 'unsigned long' for port argument to I/O string ops. This kills warnings when building drivers/ide/ide-iops.c and puts us in-line with what other platforms do here. Signed-off-by: David S. Miller commit 986632fd7033a0199f9548c44606377cdf1f4a80 tree 04a705d9cdcb911a86371499f0036ed1034239b4 parent a994018a5fc987702dfb4f5d31172842ea6186dc parent 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 author Tony Luck Wed, 31 Aug 2005 14:19:44 -0700 committer Tony Luck Wed, 31 Aug 2005 14:19:44 -0700 Auto-update from upstream commit 5981d644209c38029df7f91eb8c61bc5952f182b tree 68d05c78caee0ac9e8e9e0d569326bdbd3fb73a9 parent 0f302dc35412dc67035efc188b9d5c40711b4222 author Alan Cox Wed, 31 Aug 2005 22:19:33 +0100 committer Russell King Wed, 31 Aug 2005 22:19:33 +0100 [SERIAL] Convert mwave to use serial8250_(un)?register_port Signed-off-by: Alan Cox Signed-off-by: Russell King commit a994018a5fc987702dfb4f5d31172842ea6186dc tree 53e353c9d7d29ddeffe378821ef82498cb5ecc42 parent ff67b59726a8cd3549b069dfa78de2f538d3b8e3 author Martin Hicks Wed, 31 Aug 2005 11:21:00 -0700 committer Tony Luck Wed, 31 Aug 2005 14:18:04 -0700 [IA64] uncached allocator: use generic (not sn2 specific) functions Change sn2-specific calls into generic functions. Without this change the uncached allocator will not work on non-sn2 platforms. Signed-off-by: Greg Edwards Signed-off-by: Martin Hicks Signed-off-by: Tony Luck commit 0f302dc35412dc67035efc188b9d5c40711b4222 tree 57cbbe8e722e6a82bfd8bb3b8227898c54615c72 parent b129a8ccd53f74c43e4c83c8e0031a4990040830 author Sascha Hauer Wed, 31 Aug 2005 21:48:47 +0100 committer Russell King Wed, 31 Aug 2005 21:48:47 +0100 [ARM] 2866/1: add i.MX set_mctrl / get_mctrl functions Patch from Sascha Hauer This patch adds support for setting and getting RTS / CTS via set_mtctrl / get_mctrl functions. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 147056fb84150966d736fe21fa01d5e0f08e0980 tree db963abf96ca53fc5379689fe0dab42f23e4e1a4 parent dcb86e8cbd66c5bd6b51a5485ea3ff35bb4ced22 author David Vrabel Wed, 31 Aug 2005 21:45:14 +0100 committer Russell King Wed, 31 Aug 2005 21:45:14 +0100 [ARM] 2869/1: ixp4xx: correct ioread*/iowrite* Patch from David Vrabel Correct the ioread* and iowrite* functions. In particular, add an offset to the cookie in ioport_map so we can map I/O port ranges starting from 0 (0 is for reporting errors). Signed-off-by: David Vrabel Signed-off-by: Russell King commit dcb86e8cbd66c5bd6b51a5485ea3ff35bb4ced22 tree 2786483d279749d67a2923fd3636ee9845b1b130 parent f21ee2d4245293ee6906eb7afd0a701f40e839b9 author Catalin Marinas Wed, 31 Aug 2005 21:45:14 +0100 committer Russell King Wed, 31 Aug 2005 21:45:14 +0100 [ARM] 2868/1: Include linux/cpumask.h in arch/arm/common/gic.c Patch from Catalin Marinas Minor compilation error fix. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit f21ee2d4245293ee6906eb7afd0a701f40e839b9 tree a7c1339ca77ecc664c53ffa16864788ee41f3933 parent 3618886f645c2ede45742d3e3d22a96b2ee2f527 author Steve Longerbeam Wed, 31 Aug 2005 21:22:20 +0100 committer Russell King Wed, 31 Aug 2005 21:22:20 +0100 [ARM] 2867/2: unaligned ldrd/strd fixups Patch from Steve Longerbeam Adds an implementation of unaligned LDRD and STRD fixups. Also fixes a bug where do_alignment() would misinterpret and fixup an unaligned LDRD/STRD as LDRH/STRH, causing memory corruption. This is the same as Patch #2867/1, but with minor whitespace and comments changes, plus a check for arch-level >= v5TE before printing ai_dword count in proc_alignment_read(). Signed-off-by: Steve Longerbeam Signed-off-by: Russell King commit afc7097f45bdfddc2a0d375ef4a2c38b6e09c339 tree 22ea258a4bd0c2d0837c830e7c11d426662d61e7 parent 1a4493584078be87fa9dcbdd8def3cb53d41720c author Jeff Garzik Wed, 31 Aug 2005 06:11:16 -0400 committer Jeff Garzik Wed, 31 Aug 2005 06:11:16 -0400 [netdrvr de2104x] store PCI bus addresses in unsigned long BZ# 4475. commit 1a4493584078be87fa9dcbdd8def3cb53d41720c tree 28c53be510dd345624aaaaa0de3f4710871b1daf parent 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 author Jeff Garzik Wed, 31 Aug 2005 05:48:59 -0400 committer Jeff Garzik Wed, 31 Aug 2005 05:48:59 -0400 [netdrvr tulip] new PCI ID Noted in BZ# 2960. commit b129a8ccd53f74c43e4c83c8e0031a4990040830 tree 4c40afd836be87166d6d014380262f1baa19694f parent 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 parent 194d0710e1a7fe92dcf860ddd31fded8c3103b7a author Russell King Wed, 31 Aug 2005 10:12:14 +0100 committer Russell King Wed, 31 Aug 2005 10:12:14 +0100 [SERIAL] Clean up and fix tty transmission start/stoping The start_tx and stop_tx methods were passed a flag to indicate whether the start/stop was from the tty start/stop callbacks, and some drivers used this flag to decide whether to ask the UART to immediately stop transmission (where the UART supports such a feature.) There are other cases when we wish this to occur - when CTS is lowered, or if we change from soft to hard flow control and CTS is inactive. In these cases, this flag was false, and we would allow the transmitter to drain before stopping. There is really only one case where we want to let the transmitter drain before disabling, and that's when we run out of characters to send. Hence, re-jig the start_tx and stop_tx methods to eliminate this flag, and introduce new functions for the special "disable and allow transmitter to drain" case. Signed-off-by: Russell King commit 3618886f645c2ede45742d3e3d22a96b2ee2f527 tree 7fdfb43dd3a4db112343caccce091c12435210da parent 083bc6b3c9b52b5998cc49d4aa2f8f15c2e84e6b author Ben Dooks Wed, 31 Aug 2005 09:42:14 +0100 committer Russell King Wed, 31 Aug 2005 09:42:14 +0100 [ARM] 2857/2: Dynamic tick - fix OOPS if configured and not provided Patch from Ben Dooks timer_dyn_reprogram() fails with an OOPS if the configuration for CONFIG_NO_IDLE_HZ is enabled, and the system has no support for it. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5843e37e24d7cf32f7996dd015245633e0790595 tree d665ee3a23306c79f6b285c32e13a47b2db79fe6 parent 2ef27778a26dd828dd0d348ff12d2c180062746e author David S. Miller Tue, 30 Aug 2005 21:46:19 -0700 committer David S. Miller Tue, 30 Aug 2005 21:46:19 -0700 [SPARC64]: Use drivers/Kconfig And move some other stuff into drivers/sbus/char/Kconfig. Signed-off-by: David S. Miller commit 2ef27778a26dd828dd0d348ff12d2c180062746e tree 83a7dc19bc79b6b7abde3387db469bcf5daa9a05 parent 3c2cafaf50a0f9e7efe2b3f584f3bba6c5ee929a author David S. Miller Tue, 30 Aug 2005 20:21:34 -0700 committer David S. Miller Tue, 30 Aug 2005 20:21:34 -0700 [SPARC64]: Preserve nucleus ctx page size during TLB flushes. Signed-off-by: David S. Miller commit 3c2cafaf50a0f9e7efe2b3f584f3bba6c5ee929a tree 25570b27ce62b6179f6447e8827c3a3f197a8e3c parent dbd2fdf549317de00e0b5ea465de5372039b7ee8 author David S. Miller Tue, 30 Aug 2005 15:11:52 -0700 committer David S. Miller Tue, 30 Aug 2005 15:11:52 -0700 [SPARC64]: Do not expand CHEETAH_LOG_ERROR 3 times. We only need to expand this thing once, saving some text section space. Signed-off-by: David S. Miller commit ff67b59726a8cd3549b069dfa78de2f538d3b8e3 tree 0a587cec3a6bd4fdd53fcfb75f87bc45da5d1a7f parent 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 author Tony Luck Tue, 30 Aug 2005 14:59:24 -0700 committer Tony Luck Tue, 30 Aug 2005 14:59:24 -0700 [IA64] Low byte of current->personality is not a bitmask. Peter Staubach pointed out that it is not correct to check current->personality & PER_LINUX32 (this will have false hits on several other personality values). Signed-off-by: Tony Luck commit dbd2fdf549317de00e0b5ea465de5372039b7ee8 tree 67fad29313468b3f232264e98b508d9f3bd6a4de parent d7ce78fd9a51ca0d6b9a8cf35baef884ddb9a95c author David S. Miller Tue, 30 Aug 2005 11:26:15 -0700 committer David S. Miller Tue, 30 Aug 2005 11:26:15 -0700 [SPARC64]: Kill BRANCH_IF_ANY_CHEETAH() from copy page. Just patch the branch at boot time instead. Signed-off-by: David S. Miller commit 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 tree 09933113cf28f253db1dd539463bdab741d67139 parent 62c592edead3c3a045662595f7ade3c12f133373 parent ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 author Linus Torvalds Tue, 30 Aug 2005 11:16:30 -0700 committer Linus Torvalds Tue, 30 Aug 2005 11:16:30 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git commit 62c592edead3c3a045662595f7ade3c12f133373 tree caf636ca0b69b0ca175757320948238abe961c95 parent 81d4af1340badcd2100c84fbd1bfd13156de41aa author Marcelo Tosatti Tue, 30 Aug 2005 13:40:22 -0300 committer Linus Torvalds Tue, 30 Aug 2005 11:15:19 -0700 [PATCH] ppc32 8xx: fix warnings in m8xx_setup.c The following patch fixes two warnings in arch/ppc/syslib/m8xx_setup.c Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit 81d4af1340badcd2100c84fbd1bfd13156de41aa tree 67b7302a238eb930c7416d00b3a316def6396b3d parent ae11be6f37dfa140b6c2d1a53b307ef57da69a04 author Ivan Kokshaysky Tue, 30 Aug 2005 18:48:52 +0400 committer Linus Torvalds Tue, 30 Aug 2005 11:14:48 -0700 [PATCH] x86: pci_assign_unassigned_resources() update I had some time to think about PCI assign issues in 2.6.13-rc series. The major problem here is that we call pci_assign_unassigned_resources() way too early - at subsys_initcall level. Therefore we give no chances to ACPI and PnP routines (called at fs_initcall level) to reserve their respective resources properly, as the comments in drivers/pnp/system.c and drivers/acpi/motherboard.c suggest: /** * Reserve motherboard resources after PCI claim BARs, * but before PCI assign resources for uninitialized PCI devices */ So I moved the pci_assign_unassigned_resources() call to pcibios_assign_resources() (fs_initcall), which should hopefully fix a lot of problems and make PCIBIOS_MIN_IO tweaks unnecessary. Other changes: - remove resource assignment code from pcibios_assign_resources(), since it duplicates pci_assign_unassigned_resources() functionality and actually does nothing in 2.6.13; - modify ROM assignment code as per Ben's suggestion: try to use firmware settings by default (if PCI_ASSIGN_ROMS is not set); - set CARDBUS_IO_SIZE back to 4K as it's a wonderful stress test for various setups. Confirmed by Tero Roponen (who had problems with the 4kB CardBus IO size previously). Signed-off-by: Linus Torvalds commit ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 tree b8cc69814d2368b08d0a84c8da0c12028bd04867 parent 39fbe47377062200acc26ea0ccef223b4399a82c parent d8971fcb702e24d1e22c77fd1772f182ffee87e3 author Jeff Garzik Tue, 30 Aug 2005 13:32:29 -0400 committer Jeff Garzik Tue, 30 Aug 2005 13:32:29 -0400 Merge HEAD from /spare/repo/linux-2.6/.git commit 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 tree eab3d229c7a527816db405299ce9603e538b521f parent e438befd76a5a743725a89365140a8a7bf276096 parent d8971fcb702e24d1e22c77fd1772f182ffee87e3 author Tony Luck Tue, 30 Aug 2005 09:30:09 -0700 committer Tony Luck Tue, 30 Aug 2005 09:30:09 -0700 Auto-update from upstream commit ae11be6f37dfa140b6c2d1a53b307ef57da69a04 tree e6957b1373c077f36e5e791bf3d59d6cd78fe214 parent 444bd6fc18e4788f701a119cdfefe4f02444d9cb parent 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f author Linus Torvalds Tue, 30 Aug 2005 07:47:42 -0700 committer Linus Torvalds Tue, 30 Aug 2005 07:47:42 -0700 Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git commit 444bd6fc18e4788f701a119cdfefe4f02444d9cb tree 605ad11a825acf4bae9d98973becb3977ac2bae5 parent 3cb904caa97f5c193df21b8cdf780a826564baff parent c88469704d63787e8d44ca5ea1c1bd0adc29572d author Linus Torvalds Tue, 30 Aug 2005 07:47:01 -0700 committer Linus Torvalds Tue, 30 Aug 2005 07:47:01 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa commit 3cb904caa97f5c193df21b8cdf780a826564baff tree d154725dbf0a7f74a7c0190c9748304ce7885678 parent d8971fcb702e24d1e22c77fd1772f182ffee87e3 parent 7a9aff3cff807261e476a1719273a4ac5d254ecb author Linus Torvalds Tue, 30 Aug 2005 07:45:15 -0700 committer Linus Torvalds Tue, 30 Aug 2005 07:45:15 -0700 Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 commit c88469704d63787e8d44ca5ea1c1bd0adc29572d tree e898ee29e49ae3cef7440dfeb7f9972126b3fd06 parent d568121ce3151c36cc4718dd4e977f217c6144c2 author Clemens Ladisch Tue, 02 Aug 2005 15:26:52 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 13:14:13 +0200 [ALSA] usb-audio: throttle MIDI URB resubmits on USB errors USB generic driver When a USB error occurs that might indicate that the device has been unplugged, don't resubmit the URB immediately to prevent flooding the log with error messages before khubd has us disconnect()ed. Signed-off-by: Clemens Ladisch commit d568121ce3151c36cc4718dd4e977f217c6144c2 tree ee61f946a485c7cbe74c888d53ea7775aeef7444 parent 68c339d9068502347015ce462530ec54c4d841e4 author Takashi Iwai Tue, 30 Aug 2005 08:58:37 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:58:37 +0200 [PATCH] Assign device pointer to OSS devices Add register_sound_special_device() function to allow assignment of device pointer to a specific OSS device for HAL. Signed-off-by: Takashi Iwai commit 68c339d9068502347015ce462530ec54c4d841e4 tree d998b393e4ccb088a54689d649fc4d1e596d9f87 parent c6c0b841dd85c878fe9794862b10ce8eb4e90761 author Jaroslav Kysela Tue, 30 Aug 2005 08:48:35 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:48:35 +0200 [ALSA] version 1.0.10rc1 commit c6c0b841dd85c878fe9794862b10ce8eb4e90761 tree 09d18e764b8f5ff143d49f6d2303f15f7ffbd49c parent 6a293552ba0d104ef9d35b48972a01540fbd181b author Lee Revell Mon, 29 Aug 2005 17:42:00 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:48 +0200 [ALSA] Add identification for Live 5.1 [SB0220] EMU10K1/EMU10K2 driver Add identification for Live 5.1 [SB0220] Signed-off-by: Lee Revell Signed-off-by: Takashi Iwai commit 6a293552ba0d104ef9d35b48972a01540fbd181b tree efc4e418c80bf61beb2e1cfd1b2db405b471111f parent 9970dce56686d7b71310388025d8925d3d29e6ec author Takashi Iwai Fri, 26 Aug 2005 17:26:40 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:46 +0200 [ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1 EMU10K1/EMU10K2 driver Added the missing ac97 support on SBLive! Player 5.1. Signed-off-by: Takashi Iwai commit 9970dce56686d7b71310388025d8925d3d29e6ec tree 8b3feca7206f572e6dfc9760b1c265d5b31dec72 parent 7153a558ad598ff521f1d9430982e2a4a6865126 author Takashi Iwai Thu, 25 Aug 2005 20:30:27 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:43 +0200 [ALSA] intel8x0 - Add quirk for FSC 4010 Intel8x0 driver Added ac97_quirk for FSC 4010. Signed-off-by: Takashi Iwai commit 7153a558ad598ff521f1d9430982e2a4a6865126 tree 79b0a39ef01f45c25966c7bce3ab35d8a5a183db parent e0c93cf311b3eaa04bfb5769cff38861d4e748c8 author Takashi Iwai Thu, 25 Aug 2005 19:51:47 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:40 +0200 [ALSA] pcm - Fix zero-division in 32bit compat layer PCM Midlevel Fixed zero-division bug in PCM 32bit compat layer. Signed-off-by: Takashi Iwai commit e0c93cf311b3eaa04bfb5769cff38861d4e748c8 tree 76fdb87f8cba8c4adfb236200a2e3c8879431add parent c347e9fca710551f0def6a4d58505a6f4c0d87f6 author Daniel Horchner Thu, 25 Aug 2005 13:02:24 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:37 +0200 [ALSA] intel8x0 - add AC97_TUNE_MUTE_LED quirk for HP nx8220 laptop 103c:0934 Intel8x0 driver Signed-off-by: Jaroslav Kysela commit c347e9fca710551f0def6a4d58505a6f4c0d87f6 tree 7a581a03569249bd70d9dbba96966d94d9e96a9e parent a278655ff5d0c9d5eb34cf99f3a4c20da09eb09e author Clemens Ladisch Thu, 25 Aug 2005 11:10:05 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:34 +0200 [ALSA] usb-audio: fix Emagic MIDI protocol handling USB generic driver Emagic devices pad their packets not with 0xff bytes but with a 0xff byte followed by garbage, so we have to stop at the first such byte. Signed-off-by: Clemens Ladisch commit a278655ff5d0c9d5eb34cf99f3a4c20da09eb09e tree 52162aff3ff31b35e7abeb72760e93a75076a5cd parent f442e8b0eae4fbb6bbf9b8b005002b51a59e23bf author Takashi Iwai Wed, 24 Aug 2005 17:57:25 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:31 +0200 [ALSA] Fix missing spin_unlock au88x0 driver,Common EMU synth Fixed missing spin_unlock. Signed-off-by: Takashi Iwai commit f442e8b0eae4fbb6bbf9b8b005002b51a59e23bf tree 0117e66944825e10a0e7c03e82d124d84595609d parent 07e4ca50a5f82aa6eab52e348059579b250c63db author Adrian Bunk Wed, 24 Aug 2005 17:01:02 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:25 +0200 [ALSA] include/sound/gus.h: 'extern inline' -> 'static inline' GUS Library 'extern inline' doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai commit 07e4ca50a5f82aa6eab52e348059579b250c63db tree 763675632577306e798bd78f1c8bfb7a0d43e84b parent 3c10a9d9f8c76fd87c92a14c201ae211d0b81288 author Takashi Iwai Wed, 24 Aug 2005 14:14:57 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:22 +0200 [ALSA] hda-intel - Fix ULI M5461 support HDA Intel driver Fix and clean up for the support of ULI M5461 - set CORB/RIRB sizes explicitly - add workarounds for ULI on ia32 - max number of streams depends on the chip type now - increase the size of BDL Signed-off-by: Takashi Iwai commit 3c10a9d9f8c76fd87c92a14c201ae211d0b81288 tree bea7ded36742ae5c252b3bdf79b3df3aa4b321f7 parent 5ba094dbf14828858cdff27c8201df33b7a0bc96 author Takashi Iwai Tue, 23 Aug 2005 20:02:27 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:19 +0200 [ALSA] hda-codec - Add beep support for Uniwill HDA Codec driver Added the missing beep support for Uniwill laptop (ALSA bug#1358). Signed-off-by: Takashi Iwai commit 5ba094dbf14828858cdff27c8201df33b7a0bc96 tree 1d832ea365ba32f16c299894f7db20e4fb354db5 parent adf111e6ff1674b81cae3ff7cdd5a5d1edf003f0 author Takashi Iwai Tue, 23 Aug 2005 19:27:31 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:16 +0200 [ALSA] vxpocket - Register device pointer Digigram VX Pocket driver Add snd_card_set_dev() to register the device pointer. Signed-off-by: Takashi Iwai commit adf111e6ff1674b81cae3ff7cdd5a5d1edf003f0 tree e5b9d885e08242a0afe5a10c45bf15542029c387 parent 328ac7da6f49f2c8b8af349fef525ad79b4a3987 author Takashi Iwai Tue, 23 Aug 2005 19:01:38 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:13 +0200 [ALSA] vxpocket - Fix wrong index assignment Digigram VX Pocket driver Fixed the wrong index number assignment. Signed-off-by: Takashi Iwai commit 328ac7da6f49f2c8b8af349fef525ad79b4a3987 tree 319816aeee907509043fb406ea1f0b8f96143b82 parent e0be4d32bdae5cebc4e6d9dc65886e279aa69d08 author Takashi Iwai Tue, 23 Aug 2005 15:50:41 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:10 +0200 [ALSA] vxpocket - Add missing event callback Digigram VX Pocket driver Added the missing event callback. Signed-off-by: Takashi Iwai commit e0be4d32bdae5cebc4e6d9dc65886e279aa69d08 tree 3c0a4cbe19033c6af32a53fe453f5cdba77c08c6 parent befdf316eaba02ed52284fb78a8027ff35c6a736 author Takashi Iwai Tue, 23 Aug 2005 11:11:03 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:07 +0200 [ALSA] Fix compilation without CONFIG_PROC_FS Memalloc module Fix an error when built without CONFIG_PROC_FS. Signed-off-by: Takashi Iwai commit befdf316eaba02ed52284fb78a8027ff35c6a736 tree 629325f6d110c4dc2799423b2cd679aabbfe1f6f parent 9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd author Takashi Iwai Mon, 22 Aug 2005 13:57:55 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:47:02 +0200 [ALSA] hda-codec - Code clean up HDA Codec driver Use struct instead of array to improve the readability of hda_codec.c. Signed-off-by: Takashi Iwai commit 9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd tree da7a9da8ac95c9ed30eb0aafd4ceb2dd9efcacc1 parent 66d10647feb32178e1204d5b5c7126b1731efe9c author Nicolas Graziano Mon, 22 Aug 2005 13:47:16 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:59 +0200 [ALSA] hda-intel - correct a bug in detection of rate supported HDA Codec driver The insertion of the rate 9600 make a shift in detection of supported rate, put this rate at the end of the list. Signed-off-by: Nicolas Graziano Signed-off-by: Takashi Iwai commit 66d10647feb32178e1204d5b5c7126b1731efe9c tree de6defee8130140f9aca2342b63a192bc9144ab5 parent 5049c35b1389097a1c0c7686519928eaaf31e40b author Sergey Vlasov Mon, 22 Aug 2005 13:43:39 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:55 +0200 [ALSA] HP nx6110 quirks Intel8x0 driver,AC97 Codec The HP nx6110 laptop needs to have Headphone Jack Sense enabled so that the internal speakers will be turned off when headphones are plugged in. Also ac97_quirk=hp_only is needed to make a single Master volume in the mixer instead of separate volumes for internal speakers and headphones, which just confuses the user. Signed-off-by: Sergey Vlasov Signed-off-by: Takashi Iwai commit 5049c35b1389097a1c0c7686519928eaaf31e40b tree b731fd1d2923e2220a0390fddf6f336f46d26af7 parent 34ad73b9c5b5b25b795136c23f65b9a3ac21130b author Jaroslav Kysela Mon, 22 Aug 2005 12:19:14 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:52 +0200 [ALSA] ac97_bus - revert last change and do it only in the ALSA tree AC97 Codec Signed-off-by: Jaroslav Kysela commit 34ad73b9c5b5b25b795136c23f65b9a3ac21130b tree 364be2f8f2e054e51cbf34af590525677af66afd parent 352dbfd0e6eb7733bcca79c14f8711bb86b55e4e author Jaroslav Kysela Mon, 22 Aug 2005 11:30:37 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:48 +0200 [ALSA] ac97_bus - replace with for consistency AC97 Codec Signed-off-by: Jaroslav Kysela commit 352dbfd0e6eb7733bcca79c14f8711bb86b55e4e tree b731fd1d2923e2220a0390fddf6f336f46d26af7 parent 41e4845c426024ec41724326397a36b3aa2cb6a3 author Takashi Iwai Fri, 19 Aug 2005 17:49:10 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:45 +0200 [ALSA] via82xx - Add DXS entry for MSI 7142 VIA82xx driver Added the DXS entry for MSI 7142 (K8MM-V). Signed-off-by: Takashi Iwai commit 41e4845c426024ec41724326397a36b3aa2cb6a3 tree 6dba0a8b52b04b82fa1dd92641897d8e0872f29a parent 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 author Jaroslav Kysela Thu, 18 Aug 2005 13:43:12 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:40 +0200 [ALSA] PCM resume cleanups Digigram VX core,CS4231 driver,ATIIXP driver,VIA82xx driver VIA82xx-modem driver,au88x0 driver,CS46xx driver,Trident driver This patch disables SNDRV_PCM_INFO_RESUME flag for drivers which does not support the full resume. Signed-off-by: Jaroslav Kysela commit 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 tree 32d050e4ad8d6de7e03640a901f8878818b104cd parent e8da2fbc2dd1fb4d603442f7220d23a2192955fa author Bjorge Dijkstra Tue, 16 Aug 2005 17:05:05 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:34 +0200 [ALSA] ac97 - make ac97 codec device name unique AC97 Codec The patch fixes the bus_id conflict error when registering two codecs of the same type (ALSA bug#1334). Signed-off-by: Bjorge Dijkstra Signed-off-by: Takashi Iwai commit e8da2fbc2dd1fb4d603442f7220d23a2192955fa tree 67405487347f61e898b443e9e28c2b4369844367 parent 1204de32d0df87892e56062042e25c775ca0e08c author Takashi Iwai Tue, 16 Aug 2005 16:55:13 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:33 +0200 [ALSA] hdspm - Fix module parameter description RME9652 driver Fix the module parameter description after proofreading. Signed-off-by: Takashi Iwai commit 1204de32d0df87892e56062042e25c775ca0e08c tree 4a5ea83086b0b35cbb63b19a902b293302334bc4 parent 1cfe43d21bc5ff751e95b6a62410e05956c09e38 author Takashi Iwai Tue, 16 Aug 2005 16:54:12 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:29 +0200 [ALSA] nm256 - Fix PM and irq handling NM256 driver - Fixed the PCM resume - restoring the rate setting - Fixed the handling of buggy irqs - Dynamically acquire/release irq handler to make the driver more robust to unknown irq storms (as OSS driver does). Signed-off-by: Takashi Iwai commit 1cfe43d21bc5ff751e95b6a62410e05956c09e38 tree 8809519d9ad946a9fc5a1535ce171df64fdf8d97 parent 65d11d95515db3efb629202104cfc672476618b5 author Takashi Iwai Tue, 16 Aug 2005 16:52:24 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:26 +0200 [ALSA] intel8x0 - Fix PM Intel8x0 driver Fixed the PCM resume of intel8x0. Restores the requested register setting. Signed-off-by: Takashi Iwai commit 65d11d95515db3efb629202104cfc672476618b5 tree 3cc88cae6e03fdc16292a2fe70fedb13141b2e16 parent 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3 author Jaroslav Kysela Tue, 16 Aug 2005 13:05:43 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:23 +0200 [ALSA] ALSA timer - fixed compilation Timer Midlevel Signed-off-by: Jaroslav Kysela commit 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3 tree ccd6692a450bd033689d0dda53bba4f6530e6cc9 parent a501dfa3a763451dedd583eb90a6c9e90d0e3a3c author Jaroslav Kysela Tue, 16 Aug 2005 11:32:04 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:21 +0200 [ALSA] Timer API - SNDRV_TIMER_EVENT_RESUME - val is resolution in ns ALSA Core Signed-off-by: Jaroslav Kysela commit a501dfa3a763451dedd583eb90a6c9e90d0e3a3c tree 4e7ce36dcef022ae6c29ef7461290fb32463a70c parent 47123197c5522f4ae3dc5914e7832dd047f9ddc8 author Jaroslav Kysela Tue, 16 Aug 2005 11:09:05 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:18 +0200 [ALSA] Timer API - added SUSPEND/RESUME events PCM Midlevel,Timer Midlevel,ALSA Core - added SNDRV_TIMER_EVENT_SUSPEND / RESUME events - changed timer events from PAUSE / CONTINUE in PCM midlevel to SUSPEND / RESUME Signed-off-by: Jaroslav Kysela commit 47123197c5522f4ae3dc5914e7832dd047f9ddc8 tree 1b7938b8755ca012f2b7878df49b2b55c1584c2d parent 5a47fe3c5e8f394fb1578bbe8117f3dcc250b6fd author Jaroslav Kysela Mon, 15 Aug 2005 20:53:07 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:15 +0200 [ALSA] hda-intel: Suspend/resume fixes for PCM devices HDA Intel driver - removed SNDRV_PCM_INFO_RESUME (the driver cannot do PCM resume at the time) - fixed chip->pcm_devs initialization Signed-off-by: Jaroslav Kysela commit 5a47fe3c5e8f394fb1578bbe8117f3dcc250b6fd tree a782bef5f40c1be8bd05b2b8ca2e401774afdb1b parent 16d3f140fc265c9b9c0f8975e0b36fe15912508f author Jaroslav Kysela Mon, 15 Aug 2005 20:01:40 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:12 +0200 [ALSA] hda-patch-realtek - added pci subdevice ID for Acer TravelMate 8100 (3 stack model + digital out) HDA Codec driver Signed-off-by: Jaroslav Kysela commit 16d3f140fc265c9b9c0f8975e0b36fe15912508f tree 4f1a8c3e3ab7626112cf27439ad38a2ad747cca4 parent b27113102f576092cd8f5d6ce8365aa6e2f58134 author Takashi Iwai Mon, 15 Aug 2005 15:02:28 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:09 +0200 [ALSA] via82xx - Fix SPDIF sample rates VIA82xx driver Fixed the sample rates set in the fourth DXS channel with Non-VRA mode. Signed-off-by: Takashi Iwai commit b27113102f576092cd8f5d6ce8365aa6e2f58134 tree 9cdbf08c070d430c1959ce2ee60a2714681e8150 parent cff79742fc9e80242a9147a348621e4373c76287 author Takashi Iwai Mon, 15 Aug 2005 15:01:10 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:06 +0200 [ALSA] Fix PCM 32bit compat layer PCM Midlevel Fixed the handling of boundary in PCM 32bit compat layer. Positions in hwsync are bound in the 32bit boundary size. Signed-off-by: Takashi Iwai commit cff79742fc9e80242a9147a348621e4373c76287 tree e48f0b94b2790cae085cce6331e5bfb077b8abf6 parent 3e6c6139f0cf9c196c3fd700055f2e22ca22e726 author Jaroslav Kysela Mon, 15 Aug 2005 13:08:04 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:03 +0200 [ALSA] opl3sa2 - use different name for PnP BIOS driver OPL3SA2 driver - use different name (opl3sa2-pnpbios) for PnP BIOS driver - don't print warning when manual config of resources fails (PnP BIOS) Signed-off-by: Jaroslav Kysela commit 3e6c6139f0cf9c196c3fd700055f2e22ca22e726 tree 17d71cb3ec61e93add167e29606aca7b30318bac parent 6207e51b79f89352a8623f806df5bfafb012e489 author Clemens Ladisch Mon, 15 Aug 2005 09:13:32 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:46:00 +0200 [ALSA] ac97: make patch_wolfson_wm97??_specific() functions static AC97 Codec Make the patch_wolfson_wm97??_specific() functions static again. This patch was accidentally reverted in rev. 1.92. Signed-off-by: Clemens Ladisch commit 6207e51b79f89352a8623f806df5bfafb012e489 tree 9fcf8208991a35a6bff0361858c94702bf5b4e76 parent 55851f734d7af7e5362d43b60331c95c32a3b027 author Clemens Ladisch Mon, 15 Aug 2005 08:35:25 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:57 +0200 [ALSA] usb-audio: use vmalloc for the PCM buffer USB generic driver With the double buffering, we no longer need contiguous memory for the PCM buffer, so we can use vmalloc() instead of the preallocation functions, and increase the maximum size to 256 KB. Signed-off-by: Clemens Ladisch commit 55851f734d7af7e5362d43b60331c95c32a3b027 tree 6eef6e6915e459f959a596fa37b6c2f87b55f863 parent daa150ef7d437d17973210f47a1c58623415df94 author Clemens Ladisch Mon, 15 Aug 2005 08:34:16 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:53 +0200 [ALSA] usb-audio: use usb_buffer_alloc/free USB generic driver Use the USB buffer allocation functions to avoid repeated DMA mappings of our buffers, which are re-used quite a lot. Signed-off-by: Clemens Ladisch commit daa150ef7d437d17973210f47a1c58623415df94 tree e41056adf7f00cad4681051d4b7d6b524ea8a68f parent 9624ea812c7afd2e403c56366cadddb9ecfb88c6 author Clemens Ladisch Mon, 15 Aug 2005 08:25:50 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:50 +0200 [ALSA] usb-audio: properly lock hwptr_done accesses USB generic driver Take the substream lock when reading hwptr_done to avoid a race condition with the updates in the URB callbacks. Signed-off-by: Clemens Ladisch commit 9624ea812c7afd2e403c56366cadddb9ecfb88c6 tree 6d48ed32f35a3b1ebb1fac0021e810f57a141e0d parent 7efd8bc800324a967a37e8a425433468b7f06adb author Clemens Ladisch Mon, 15 Aug 2005 08:25:24 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:47 +0200 [ALSA] usb-audio: actually schedule playback URBs at frame boundaries USB generic driver Change prepare_playback_urb() not to stop preparing packets before a frame boundary has been reached. Signed-off-by: Clemens Ladisch commit 7efd8bc800324a967a37e8a425433468b7f06adb tree 9366f8d7b709cca8fa243708910783b8977919b7 parent b263a9bdf9394062a4fc4272ebed60de331c5490 author Clemens Ladisch Mon, 15 Aug 2005 08:24:44 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:43 +0200 [ALSA] usb-audio: double-buffer all playback data USB generic driver We always had to use double buffering when capturing, and when playback data for one URB crosses a buffer boundary. The latter would make hwptr updates less precise because the double-buffered data is read from the buffer much earlier than the other data is read by the host controller. Double-buffering all data allows to update hwptr immediately after the data was copied to the USB buffer(s), which has the additional benefit of avoiding the latency imposed by the host controller's delay of up to one frame when interrupting. Signed-off-by: Clemens Ladisch commit b263a9bdf9394062a4fc4272ebed60de331c5490 tree 440f459eb1cd93ed015c38bf20e93e122d4a32e0 parent 99250872fc619bb5b5ddddcf1c58714a774526fc author Clemens Ladisch Mon, 15 Aug 2005 08:22:39 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:41 +0200 [ALSA] usb-audio: optimize handling of capture URBs USB generic driver When preparing capture URBs, we don't need to stop when we cross a period boundary because we now never handle more than one millisecond of data per URB anyway. When handling captured data, use an extra flag to call snd_pcm_period_elapsed() no more than once. This allows us to move the period boundary checking code before the copying of the data which avoids a second locking of the substream's lock. Signed-off-by: Clemens Ladisch commit 99250872fc619bb5b5ddddcf1c58714a774526fc tree 664cc61af846c57f45201560eba29d9c286497e2 parent 1b05962e8b2d8a1b1f5934087a4a00f7532fa2d1 author James Courtier-Dutton Fri, 12 Aug 2005 23:54:58 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:38 +0200 [ALSA] Add new card ID. Fixes ALSA bug #1297 EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit 1b05962e8b2d8a1b1f5934087a4a00f7532fa2d1 tree 11f11ad593fefc98c81f9ba8dc3a3885a6bb96f8 parent 53b266632b79e2adc48754d5a6e9e5ebbde08c12 author James Courtier-Dutton Fri, 12 Aug 2005 23:50:13 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:35 +0200 [ALSA] Add new ID. Fixes ALSA bug #1298 CA0106 driver Signed-off-by: James Courtier-Dutton commit 53b266632b79e2adc48754d5a6e9e5ebbde08c12 tree 040127f1f9492c71e673d146e101aed771a7c589 parent 1265509cb0f00206c2ed93f120121dd818a3902d author Jaroslav Kysela Fri, 12 Aug 2005 17:35:09 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:32 +0200 [ALSA] opl3sa2 - fixed typo in PnP BIOS IDs (YMF0021 -> YMH0021) OPL3SA2 driver Signed-off-by: Jaroslav Kysela commit 1265509cb0f00206c2ed93f120121dd818a3902d tree 75a7a7aec027b217eb039460dee86955d9614317 parent f347c774c37c83e7b2d2b75d962ca40b9a283b2b author Jaroslav Kysela Fri, 12 Aug 2005 17:24:24 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:28 +0200 [ALSA] opl3sa2 driver - added support for PnP BIOS devices OPL3SA2 driver The driver has been extended to support also PnP BIOS devices. The detection path is: 1) detect PnP BIOS devices 2) detect ISA PnP devices Signed-off-by: Jaroslav Kysela commit f347c774c37c83e7b2d2b75d962ca40b9a283b2b tree 3da8008f66843dd1f93bebec160000735377d449 parent 4b4994869d68328276f6a3cc9df90cce8c82b43d author Takashi Iwai Fri, 12 Aug 2005 16:47:49 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:26 +0200 [ALSA] via82xx - Add DXS entry for MSI K8MM-V VIA82xx driver Added the DXS entry for MSI K8MM-V. Also fixed a typo in last patch for Acer Aspire 1524 WLMi. Signed-off-by: Takashi Iwai commit 4b4994869d68328276f6a3cc9df90cce8c82b43d tree 3ac409515c501318f1db774884eab6e8d7d2501d parent 47672310789431c16de22f16934febf4d55b4bb0 author Philip Prindeville Fri, 12 Aug 2005 16:46:17 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:22 +0200 [ALSA] Add VT1617A codec support AC97 Codec Added (minimal) support of VT1617A codec with SPDIF. Signed-off-by: Takashi Iwai commit 47672310789431c16de22f16934febf4d55b4bb0 tree a325ef0802df6e4da3b67639b0c32580960bc3ed parent a93bf99077886d209f8e72bc134e1ceb36e76aa2 author Takashi Iwai Fri, 12 Aug 2005 16:44:04 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:19 +0200 [ALSA] hda-intel - Add SiS966 support HDA Intel driver Added SiS966 pci id to snd-hda-intel driver. Signed-off-by: Takashi Iwai commit a93bf99077886d209f8e72bc134e1ceb36e76aa2 tree a26ba330656f9d0aa693dabea5c585e266a90555 parent 71d848ca00a16179b17e58e5f51c2d9a6c4f97a2 author Clemens Ladisch Fri, 12 Aug 2005 15:19:39 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:16 +0200 [ALSA] usb-audio: schedule high speed URBs with 1 ms alignment USB generic driver The EHCI driver doesn't interrupt more than once per millisecond, and organizes all iso transfers with frame-sized ITDs, so we can (try to) be more efficient by aligning all URBs on frame boundaries. Signed-off-by: Clemens Ladisch commit 71d848ca00a16179b17e58e5f51c2d9a6c4f97a2 tree 5dd195f2e30f6dbc225b97c03cc52d49a31033b7 parent d6db392e9235c48bb945624798e9beede7b85b12 author Clemens Ladisch Fri, 12 Aug 2005 15:18:00 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:14 +0200 [ALSA] usb-audio: make nrpacks parameter writeable USB generic driver The nrpacks module parameter is used only when initializing a playback stream, so it doesn't hurt to make it writeable. Signed-off-by: Clemens Ladisch commit d6db392e9235c48bb945624798e9beede7b85b12 tree 5f17b000a18f476ea296b1387150b7ff92837215 parent 15a24c0778e9bdd48d8e1cf60a263837b5c30ed5 author Clemens Ladisch Fri, 12 Aug 2005 08:28:27 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:08 +0200 [ALSA] usb-audio: fix packets per URB calculation for playback USB generic driver When determining how many packets are needed for one period, we cannot assume that all packets have their maximum size -- we always use the nominal sample rate when sending data, and could use an even lower rate when the endpoint uses frequency feedback. Signed-off-by: Clemens Ladisch commit 15a24c0778e9bdd48d8e1cf60a263837b5c30ed5 tree b7bde1b8f54e4cf8224ed6445d6b8cf9977151ab parent a53fc188ec6fc406276799da465fe789c40d96b2 author Clemens Ladisch Fri, 12 Aug 2005 08:25:26 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:04 +0200 [ALSA] usb-audio: use 1 ms URBs when capturing USB generic driver When capturing audio data, we do not know beforehand how many samples the device sends per frame, so we have to use URBs that are as short as possible to make sure that we can handle period boundaries without any additional latencies. Furthermore, the total count of URBs submitted doesn't matter when capturing, so we can just use the maximum number. Signed-off-by: Clemens Ladisch commit a53fc188ec6fc406276799da465fe789c40d96b2 tree 491eec5ff01481a95f803010e87de4bea4c9b1ed parent b65f824c1ea954ea2b974e42c064f72bfbfe3dd2 author Clemens Ladisch Thu, 11 Aug 2005 15:59:17 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:45:01 +0200 [ALSA] make local objects static Memalloc module,PCM Midlevel,Timer Midlevel,GUS Library,AC97 Codec ALI5451 driver,RME9652 driver Make some functions/variables that are used in only one file static. Signed-off-by: Clemens Ladisch commit b65f824c1ea954ea2b974e42c064f72bfbfe3dd2 tree d4abca4fc6d40207d998ba19c6a2f7e45b11262f parent 673b683a07272bdc1f757aa32784b9fcc4b3a014 author Sasha Khapyorsky Thu, 11 Aug 2005 11:18:38 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:56 +0200 [ALSA] hda-codec - support for Si3054/5 HDA modems HDA generic driver,HDA Codec driver Support for Si3054/5 HDA modem codecs. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 673b683a07272bdc1f757aa32784b9fcc4b3a014 tree d2eafb452ad96aa349a62f6350bca1480f69bbed parent 443feb882679e21ba5d1e0ff9eff067ac26d9461 author Sasha Khapyorsky Thu, 11 Aug 2005 11:00:16 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:53 +0200 ALSA CVS update HDA Codec driver,HDA generic driver Summar: hda-codec - MFG support This adds Modem Functional Group (MFG) support and option for 9600 sample rate. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 443feb882679e21ba5d1e0ff9eff067ac26d9461 tree df831615407843f4c33a16adc9efe841ec70aa46 parent 9bcf655109ae06a8e652671a0de6fe2da5c213c2 author Karsten Wiese Wed, 10 Aug 2005 11:18:19 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:48 +0200 [ALSA] ALSA's struct _snd_pcm_substream: Obsolete open_flag PCM Midlevel,ALSA<-OSS emulation,USB USX2Y This patch removes open_flag from struct _snd_pcm_substream. All of its uses are substituted by querying struct _snd_pcm_substream's member ffile instead. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai commit 9bcf655109ae06a8e652671a0de6fe2da5c213c2 tree 13c6001737bf5f0ae3e32b188259bff64c8d4e01 parent a55bfdc5821df787068da15a6864f2c669d7d22c author Clemens Ladisch Wed, 10 Aug 2005 10:21:43 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:46 +0200 [ALSA] ymfpci: add per-voice volume controls YMFPCI driver Implements mixer controls for the volume of each playback substream of the main PCM device. Signed-off-by: Clemens Ladisch commit a55bfdc5821df787068da15a6864f2c669d7d22c tree 8ac7b469e58d05efdbc5e3c8ebf873a82581450b parent 064d2112ff24937f9aabb6baae8de88b6e5ef453 author Dirk Opfer Mon, 08 Aug 2005 16:29:43 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:29 +0200 [ALSA] Fix compiler warnings in PXA2XX-AC97 ARM PXA2XX driver - change pxa2xx_ac97_do_suspend and pxa2xx_ac97_do_resume to use the expected arguments Signed-off-by: Dirk Opfer Signed-off-by: Takashi Iwai commit 064d2112ff24937f9aabb6baae8de88b6e5ef453 tree 80882406068c9890ecc29d7aa16ab8e64aac3111 parent 4a677ac5d0a4fad286cdfb4890a5e2de61534b1c author Liam Girdwood Fri, 05 Aug 2005 10:25:08 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:19 +0200 [ALSA] WM9713 modem detection AC97 Codec This patch fixes a problem whereby the WM9713 has modem functionality incorrectly detected after an AC97 cold reset. Changes:- o Cleared AC97_SCAP_MODEM in wm9713 scaps Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 4a677ac5d0a4fad286cdfb4890a5e2de61534b1c tree b3dd803720194a55b535fc37883e557839c38c64 parent 5b8f7f7329289fa3b74ef8cdbaa9d2929787d3e6 author Liam Girdwood Fri, 05 Aug 2005 10:24:36 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:44:10 +0200 [ALSA] PXA27x AC97 warm reset ARM PXA2XX driver This patch extends the period of an AC97 warm reset on the PXA27x from 50uS to 500uS. The shorter reset didn't always guarantee that the codec would wake up. Changes:- o Change pxa27x warm reset period to 500uS o Removed double semi-colon. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 5b8f7f7329289fa3b74ef8cdbaa9d2929787d3e6 tree a90354362cd044d3ef6b2e272eb73124b973e3f3 parent 5549d54992391d81a8cbfbaac45a958876fbc9cb author Takashi Iwai Wed, 03 Aug 2005 14:02:47 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:43 +0200 [ALSA] ad1816a - Add clockfreq module option Documentation,AD1816A driver Added clockfreq module option for the card with a different clock frequency than 33kHz. Signed-off-by: Takashi Iwai commit 5549d54992391d81a8cbfbaac45a958876fbc9cb tree 167448ed62cbf5c60b4237df23945a34b5e38abe parent 10e8d78a94fc57f1bf11d50b97ff85b005e46d0b author Clemens Ladisch Wed, 03 Aug 2005 13:50:30 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:39 +0200 [ALSA] use PCM interface for IEC958 controls Digigram VX core,ENS1370/1+ driver,CA0106 driver,EMU10K1/EMU10K2 driver RME HDSP driver,RME9652 driver For consistency, use the PCM interface instead of MIXER for IEC958 default/mask/stream mixer controls. Signed-off-by: Clemens Ladisch commit 10e8d78a94fc57f1bf11d50b97ff85b005e46d0b tree ddb1cc2444c9e6a067e7d6f891f68260f5ce2434 parent 506d4c6a5f909d78c3d624693f10d8cc0eafda48 author Clemens Ladisch Wed, 03 Aug 2005 13:40:08 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:35 +0200 [ALSA] use SNDRV_CTL_NAME_IEC958 macro CMI8330 driver,ENS1370/1+ driver,FM801 driver,VIA82xx driver,AC97 Codec ALI5451 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver ICE1712 driver,ICE1724 driver Where appropriate, use the SNDRV_CTL_NAME_IEC958 instead of a literal string. Signed-off-by: Clemens Ladisch commit 506d4c6a5f909d78c3d624693f10d8cc0eafda48 tree 98c3467f5b4e0f129c5656890e0f2bc28f98addc parent 267d4d6475cf591a5f838449b40cbacfc2915e8b author Takashi Iwai Wed, 03 Aug 2005 14:02:47 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:32 +0200 [ALSA] ad1816a - Add clockfreq module option Documentation Added clockfreq module option for the card with a different clock frequency than 33kHz. Signed-off-by: Takashi Iwai commit 267d4d6475cf591a5f838449b40cbacfc2915e8b tree 0eddfd765063df1257cd6ac2780e0b6232671321 parent 0ca06a00e206b963587ac471e6d1c52bf33b9a18 author Henrik Kretzschmar Fri, 29 Jul 2005 16:59:31 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:29 +0200 [ALSA] adds __init and in snd_memory_init() ALSA Core This patch adds the __init macro to snd_memory_init(). Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit 0ca06a00e206b963587ac471e6d1c52bf33b9a18 tree d7f3ecf33bc0c46368ba5429373d0f00b5da1cf6 parent 67ed4161f60d76b3b27efc085b36357a6a90768c author Liam Girdwood Fri, 29 Jul 2005 16:13:36 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:26 +0200 [ALSA] AC97 bus interface for ad-hoc drivers AC97 Codec,PCI drivers I've made the review changes and as requested I've pasted the RFC by Nicolas below:- 'I would like to know what people think of the following patch. It allows for a codec on an AC97 bus to be shared with other drivers which are completely unrelated to audio. It registers a new bus type, and whenever a codec instance is created then a device for it is also registered with the driver model using that bus type. This allows, for example, to use the extra features of the UCB1400 like the touchscreen interface and the additional GPIOs and ADCs available on that chip for battery monitoring. I have a working UCB1400 touchscreen driver here that simply registers with the driver model happily working alongside with audio features using this.' Changes over RFC:- o Now matches codec name within codec group. o Added ac97_dev_release() to stop kernel complaining about no release method for device. o Added 'config SND_AC97_BUS' to sound/pci/Kconfig and moved 'config SND_AC97_CODEC' out with the PCI=n statement. o module is now called snd-ac97-bus Signed-off-by: Liam Girdwood Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 67ed4161f60d76b3b27efc085b36357a6a90768c tree d69bd70f968a1e439d8b9a43ff8d4b60eb3c8bdf parent 42dfd0adab83c95890e562623264999914771763 author Clemens Ladisch Fri, 29 Jul 2005 15:32:58 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:22 +0200 [ALSA] sound - fix .iface field of mixer control elements Documentation,CS46xx driver,EMU10K1/EMU10K2 driver,AD1848 driver SB16/AWE driver,CMIPCI driver,ENS1370/1+ driver,RME32 driver RME96 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver RME HDSP driver,RME9652 driver This patch changes .iface to SNDRV_CTL_ELEM_IFACE_MIXER whre _PCM or _HWDEP was used in controls that are not associated with a specific PCM (sub)stream or hwdep device, and changes some controls that got inconsitent .iface values due to copy+paste errors. Furthermore, it makes sure that all control that do use _PCM or _HWDEP use the correct number in the .device field. Signed-off-by: Clemens Ladisch commit 42dfd0adab83c95890e562623264999914771763 tree 963cec83c0cf098621df3ad68839945822c3df1b parent b9f5a89c74e541533766dcda55d34a06253f60f3 author Takashi Iwai Fri, 29 Jul 2005 14:18:39 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:18 +0200 [ALSA] via82xx - Add dxs entry for Acer Aspire 1524 WMLi VIA82xx driver Added the dxs entry for Acer Aspire 1524 WMLi. Signed-off-by: Takashi Iwai commit b9f5a89c74e541533766dcda55d34a06253f60f3 tree c6368abb5f77f63663911fb4edc769e18de658e6 parent d827560c96346e0b8b02c1000cc347d73488c818 author Nicolas Graziano Fri, 29 Jul 2005 12:17:20 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:15 +0200 [ALSA] hda-codec - Fix LFE volume/switch HDA Codec driver Fixed LFE volume/switch control. Signed-off-by: Nicolas Graziano Signed-off-by: Takashi Iwai commit d827560c96346e0b8b02c1000cc347d73488c818 tree 1ae2359f49f9a2489d0a524cc6f885b0d52cedaa parent cb8e2f83851ff17b1b361644e82420a923fbc318 author Takashi Iwai Fri, 29 Jul 2005 11:56:41 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:11 +0200 [ALSA] hda-codec - Add default config for ASUS P5AD2 HDA Codec driver Added the default config for ASUS P5AD2. Signed-off-by: Takashi Iwai commit cb8e2f83851ff17b1b361644e82420a923fbc318 tree 09eafd6c0b6f9e7a156d33a919265fdac2bd9502 parent 3998b70fd0ab40a276147a0f55816d383fcbeb54 author Takashi Iwai Fri, 29 Jul 2005 11:54:32 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:09 +0200 [ALSA] hda-codec - Fix reordering of surround channels HDA Codec driver - Fixed the reordering of surround channels. Originally reported by Nicolas GRAZIANO . - Show the selected ssid when debug option is set. Signed-off-by: Takashi Iwai commit 3998b70fd0ab40a276147a0f55816d383fcbeb54 tree f2730dcfca4393a29f24dc3c89724d7f8fc8ddde parent 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 author Liam Girdwood Fri, 29 Jul 2005 11:41:55 +0200 committer Jaroslav Kysela Tue, 30 Aug 2005 08:43:05 +0200 [ALSA] WM97xx AC97 codec controls AC97 Codec o Enhanced current WM97xx support to provide additional controls and use the kcontrol suffix naming convention. o Added AC97_HAS_NO_MIC, AC97_HAS_NO_TONE and AC97_HAS_NO_STD_PCM. o Cleaned up WM97xx related comments. o Removed some wm9713 double mono controls and replaced with stereo controls. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit d8971fcb702e24d1e22c77fd1772f182ffee87e3 tree c5bb70df39b4816ceb86b77672c49115702f1e20 parent 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 author Stephen Hemminger Mon, 29 Aug 2005 22:51:28 -0700 committer David S. Miller Mon, 29 Aug 2005 22:51:28 -0700 [INET]: compile errors when DEBUG is defined Fix build problem found by compiling driver with DEBUG defined that used tcp.h. Since pr_debug(arg) expands to printk("<7>" arg) the argument needs to be string that can be concatenated. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d7ce78fd9a51ca0d6b9a8cf35baef884ddb9a95c tree d7103663f1b5262d7a90f9d99e0c2af611ad07c9 parent 826509f8110049663799bc20f2b5b6170e2f78ca author David S. Miller Mon, 29 Aug 2005 22:46:43 -0700 committer David S. Miller Mon, 29 Aug 2005 22:46:43 -0700 [SPARC64]: Eliminate irq_cpustat_t. We can put the __softirq_pending mask in the cpudata, no need for the silly NR_CPUS array in kernel/softirq.c Signed-off-by: David S. Miller commit 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 tree cc2917f41eee3ae7c30195308456a034f5baaa1a parent a8e4f435d9ea38bfe9171d7458b2057d440825b1 parent 7ef24b69f9ff4858d7242059fbb19477c10e6dd7 author Linus Torvalds Mon, 29 Aug 2005 22:05:21 -0700 committer Linus Torvalds Mon, 29 Aug 2005 22:05:21 -0700 Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit a8e4f435d9ea38bfe9171d7458b2057d440825b1 tree 817ed67ed85f04e821f5ad980fc53ed76fb57d06 parent 8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 parent 502c7f1dd566e7ca8aabdb755182664c5fdaebf1 author Linus Torvalds Mon, 29 Aug 2005 22:04:58 -0700 committer Linus Torvalds Mon, 29 Aug 2005 22:04:58 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 tree e7c85eca8d55007b0a467b99820820cd40ef4963 parent 826509f8110049663799bc20f2b5b6170e2f78ca parent 8913ca1c9ccb5eb6471afd419159729eef6e2730 author Linus Torvalds Mon, 29 Aug 2005 21:44:33 -0700 committer Linus Torvalds Mon, 29 Aug 2005 21:44:33 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 commit 7ef24b69f9ff4858d7242059fbb19477c10e6dd7 tree 13b7016d033a58aa9688155c2c6c5659b2491808 parent 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 author Andrew Morton Thu, 25 Aug 2005 17:14:46 -0700 committer Jeff Garzik Tue, 30 Aug 2005 00:37:35 -0400 [PATCH] s2io build fix Damir Perisa reports: drivers/net/s2io.h:765: error: invalid lvalue in assignment drivers/net/s2io.h:766: error: invalid lvalue in assignment That's a gcc4 error. I don't see why the casts are there anyway.. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 8913ca1c9ccb5eb6471afd419159729eef6e2730 tree 8c0a4d1334fe6ccb3097b96426152b15fd3d8336 parent 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17 author David Gibson Wed, 27 Jul 2005 15:47:23 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:52:12 +1000 [PATCH] Remove nested feature sections The {BEGIN,END}_FTR_SECTION asm macros used in ppc64 to nop out sections of code at runtime cannot be nested. However, we do nest them in hash_low.S. We get away with it there, because there is nothing between the BEGIN markers for each section. However, that's confusing to someone reading the code. This patch removes the nested ifset and ifclr feature sections, replacing them with a single feature section in the full mask/value form. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17 tree 210cf02ca0d699bd2cc8f63f9e02d3ca69ceb5ab parent 5ff98ae18bec792d77bfea801aa4b3385b98b355 author Joel Schopp Fri, 12 Aug 2005 14:34:58 -0500 committer Paul Mackerras Tue, 30 Aug 2005 13:42:35 +1000 [PATCH] ppc64: lparconfig.c memory leak This patch fixes a rare memory leak found by Coverity. Signed-off-by: Joel Schopp Signed-off-by: Paul Mackerras commit 5ff98ae18bec792d77bfea801aa4b3385b98b355 tree d96e431da57f63a33f42a5ed6067b7e490365c3e parent 717522ff44f1fbee5ea09e83d7cd4b5c956e30f9 author Joel Schopp Thu, 11 Aug 2005 17:39:28 -0500 committer Paul Mackerras Tue, 30 Aug 2005 13:42:33 +1000 [PATCH] ppc64: of_device.c remove useless code Coverity found more unused code. Signed-off-by: Joel Schopp Signed-off-by: Paul Mackerras commit 717522ff44f1fbee5ea09e83d7cd4b5c956e30f9 tree 9585541eb45c8afa0a9f024e145b43063189e0f4 parent 04ed65190a5d1562220dd3a7fc9eac2402c7104c author Anton Blanchard Wed, 24 Aug 2005 08:53:03 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:40:02 +1000 [PATCH] ppc64: Add CONFIG_HZ While ppc64 has the CONFIG_HZ Kconfig option, it wasnt actually being used. Connect it up and set all platforms to 250Hz. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 04ed65190a5d1562220dd3a7fc9eac2402c7104c tree d0ea2c3cb29383f7387da3c7caf95ee7091ec114 parent 7fea82ab1a74030f79a2adfac1af3d93b8638fc3 author Jake Moilanen Wed, 24 Aug 2005 15:22:12 -0500 committer Paul Mackerras Tue, 30 Aug 2005 13:38:19 +1000 [PATCH] oprofile PVR 970MP Here's the 970MP's PVR (processor version register) entry for oprofile. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 7fea82ab1a74030f79a2adfac1af3d93b8638fc3 tree 9bf8a09179f60ddddbebceb4df34445eff12de16 parent 6f9aa727433fe7647869c9b64ce2f7b5feac0052 author Olof Johansson Sun, 28 Aug 2005 21:42:10 -0500 committer Paul Mackerras Tue, 30 Aug 2005 13:32:08 +1000 [PATCH] PPC64: Don't try to claim memory from OF at 1GB mark Some RS64-based machines (p620, F80, others) have problems with firmware returning 0xdeadbeef instead of failure to allocations that end at the 1GB mark. We have two options: 1. Detect the undocumented 0xdeadbeef return value and interpret it as a failure. 2. Avoid allocating that high. (2) is really the cleaner solution here. 768MB is plenty of room so use that as the max alloc_top instead of 1GB. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 6f9aa727433fe7647869c9b64ce2f7b5feac0052 tree 4c2986147fc3373f4ec6a097147f65611ca5f565 parent 88999ceb55bf959e63df0c911915166b005977fc author Stephen Rothwell Mon, 29 Aug 2005 14:08:11 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:32:06 +1000 [PATCH] Move all the very similar files to asm-powerpc They differed in either simple comments or in the protecting ifdefs. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 88999ceb55bf959e63df0c911915166b005977fc tree 2ab61aa1eadfccaaa3cef32f0cf04e58f76d52f8 parent 45e2a6e4e5e22acd4321f69e84b726c2a568dacf author Stephen Rothwell Mon, 29 Aug 2005 14:06:56 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:32:05 +1000 [PATCH] Move the identical files from include/asm-ppc{,64} Move the identical files from include/asm-ppc{,64}/ to include/asm-powerpc/. Remove hdreg.h completely as it is unused in the tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 45e2a6e4e5e22acd4321f69e84b726c2a568dacf tree 91e1efaf3a713487ffae8e9def01ed6bd550e560 parent fb120da678c517f72d4b39932062c2191827b331 author Stephen Rothwell Mon, 29 Aug 2005 13:15:50 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:32:04 +1000 [PATCH] Create include/asm-powerpc The ppc and ppc64 trees are hopefully going to merge over time, so this patch begins the process by creating a place for the merging of the header files. Create include/asm-powerpc (and move linkage.h into it from asm-{ppc,ppc64} since we don't like empty directories). Modify the ppc and ppc64 Makefiles to cope. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit fb120da678c517f72d4b39932062c2191827b331 tree 0ae6b9d42e0c66293c3cc567f2f8279ca2e89cde parent 71d276d751ff5ddba28312aecefb174b20a5b970 author Stephen Rothwell Wed, 17 Aug 2005 16:42:59 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:31:56 +1000 [PATCH] Make MODULE_DEVICE_TABLE work for vio devices Make MODULE_DEVICE_TABLE work for vio devices. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 71d276d751ff5ddba28312aecefb174b20a5b970 tree 1d2262f427fb0e117d0ad464eaf3375373e166f8 parent b877b90f227fb9698d99fb70492d432362584082 author Stephen Rothwell Wed, 17 Aug 2005 16:41:44 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:23:47 +1000 [PATCH] Create vio_bus_ops Create vio_bus_ops so that we just pass a structure to vio_bus_init instead of three separate function pointers. Rearrange vio.h to avoid forward references. vio.h only needs struct device_node from prom.h so remove the include and just declare it. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b877b90f227fb9698d99fb70492d432362584082 tree b58168217324bc07c8d6e7368246fa24ba7e96db parent 5c0b4b8759f78c31172088a91e10733fc014ccee author Stephen Rothwell Wed, 17 Aug 2005 16:40:12 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:23:47 +1000 [PATCH] Create vio_register_device Take some assignments out of vio_register_device_common and rename it to vio_register_device. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 5c0b4b8759f78c31172088a91e10733fc014ccee tree 85dc031ac08abe63476ae3230d9385b7bf972906 parent 1e4a79e0458beca871c662028610ae3a88e3f1bf author Stephen Rothwell Wed, 17 Aug 2005 16:37:35 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:08:53 +1000 [PATCH] Formatting changes to vio.c Formatting changes to vio.c to bring it closer to the kernel coding standard. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 1e4a79e0458beca871c662028610ae3a88e3f1bf tree fe4b4940e5673a658d9bd07feebc3ba596f9d225 parent 2739e8cf113ce6e931608986a28bab5a42c0acd9 author Stephen Rothwell Mon, 29 Aug 2005 18:26:01 +1000 committer Paul Mackerras Tue, 30 Aug 2005 13:08:53 +1000 [PATCH] fix iSeries build for gcc-3.4 gcc 3.4 (at least the build we are using) puts the gcc generated .ident string into a .note section at the end of the files it compiles (gcc 3.3.3-hammer and gcc 4.0.2 Debian puts it in the .text section). This means that the lparmap.s file we produce in the iSeries build may end with a .note section. When we include it into head.S, the assembler can no longer resolve some of the conditional branches since the target label ends up too far away. This patch just forces us back to the .text section after including lparmap.s. The breakage was caused by my patch "iSeries build with newer assemblers and compilers" (sha1-id: 2ad56496627630ebc99f06af5f81ca23e17e014e). Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 2739e8cf113ce6e931608986a28bab5a42c0acd9 tree 264d88ebd4399ec49f882560ea655f93b8bbc095 parent b74d0bd53406c23636707565d87ddaa55d315b26 author David Gibson Tue, 30 Aug 2005 12:54:07 +1000 committer Paul Mackerras Tue, 30 Aug 2005 12:59:48 +1000 [PATCH] Restore lparmap.s include for iSeries A mistake rebasing the series of ppc64 head.S cleanup patches meant the #include of lparmap.s, needed for iSeries was lost. This patch puts it back again. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit b74d0bd53406c23636707565d87ddaa55d315b26 tree 6f4245e1363b7cf5e74d84cd025ad804eeb04bfe parent 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 author Andrew Morton Wed, 10 Aug 2005 13:53:41 +1000 committer Paul Mackerras Tue, 30 Aug 2005 12:08:10 +1000 [PATCH] ppc64: four level pagetables fix With CONFIG_HUGETLB_PAGE=n: In file included from kernel/sysctl.c:37: include/linux/hugetlb.h:104:1: warning: "hugetlb_free_pgd_range" redefined In file included from include/linux/mm.h:36, from kernel/sysctl.c:23: include/asm/pgtable.h:492:1: warning: this is the location of the previous definition Signed-off-by: Andrew Morton Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 826509f8110049663799bc20f2b5b6170e2f78ca tree 9d8823cf283592625b882125b4b13988f2934cc6 parent d992895ba2b27cf5adf1ba0ad6d27662adc54c5e parent c530cfb1ce1e8f230744c3f3bd86771f50725053 author Linus Torvalds Mon, 29 Aug 2005 17:36:46 -0700 committer Linus Torvalds Mon, 29 Aug 2005 17:36:46 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git commit d992895ba2b27cf5adf1ba0ad6d27662adc54c5e tree 65a4d1f18a93a9e89d43fe0b8e0b3009675c50f0 parent 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 author Nick Piggin Sun, 28 Aug 2005 16:49:11 +1000 committer Linus Torvalds Mon, 29 Aug 2005 17:25:04 -0700 [PATCH] Lazy page table copies in fork() Defer copying of ptes until fault time when it is possible to reconstruct the pte from backing store. Idea from Andi Kleen and Nick Piggin. Thanks to input from Rik van Riel and Linus and to Hugh for correcting my blundering. Ray Fucillo reports: "I applied this latest patch to a 2.6.12 kernel and found that it does resolve the problem. Prior to the patch on this machine, I was seeing about 23ms spent in fork for ever 100MB of shared memory segment. After applying the patch, fork is taking about 1ms regardless of the shared memory size." Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 tree db2ce73665b250672f5f5c0cf7544ec370c122f9 parent 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 parent c594adad5653491813959277fb87a2fef54c4e05 author Linus Torvalds Mon, 29 Aug 2005 17:11:29 -0700 committer Linus Torvalds Mon, 29 Aug 2005 17:11:29 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 commit c530cfb1ce1e8f230744c3f3bd86771f50725053 tree 8309c7803ccb3cbbe07e610e6a0e5580a63d83e2 parent a84ffe430342db6ee585a5038f3242a6b4112d69 author Arnaldo Carvalho de Melo Mon, 29 Aug 2005 02:15:54 -0300 committer David S. Miller Mon, 29 Aug 2005 16:13:46 -0700 [CCID3]: Call sk->sk_write_space(sk) when receiving a feedback packet This makes the send rate calculations behave way more closely to what is specified, with the jitter previously seen on x and x_recv disappearing completely on non lossy setups. This resembles the tcp_data_snd_check code, that possibly we'll end up using in DCCP as well, perhaps moving this code to inet_connection_sock. For now I'm doing the simplest implementation tho. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a84ffe430342db6ee585a5038f3242a6b4112d69 tree db6eeaf68290a0247449e824e3c46a7929f4be02 parent 0ac4f893f20ed524198da5ebf591fc0b9e2ced2f author Arnaldo Carvalho de Melo Sun, 28 Aug 2005 04:51:32 -0300 committer David S. Miller Mon, 29 Aug 2005 16:13:37 -0700 [DCCP]: Introduce DCCP_SOCKOPT_PACKET_SIZE So that applications can set dccp_sock->dccps_pkt_size, that in turn is used in the CCID3 half connection init routines to set ccid3hc[tr]x_s and use it in its rate calculations. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e438befd76a5a743725a89365140a8a7bf276096 tree 7f2f4912712d4b123fbd446683a884bd21ef8e64 parent 329058028523a5b36de449f130111b7671a4f269 author Tony Luck Mon, 29 Aug 2005 16:13:36 -0700 committer Tony Luck Mon, 29 Aug 2005 16:13:36 -0700 [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup Some shub2 changes were not in the tree when Greg cleaned up the sn2 region definitions in 1b66776da71e33dff5edcc0b096ec3b7c40c75ad, so this one didn't get fixed. Signed-off-by: Tony Luck commit 0ac4f893f20ed524198da5ebf591fc0b9e2ced2f tree 63650617f3bff152c3bdbd53e470abef6764b784 parent 5f2c3b910744f68e1a507f027398f404b3feb5fb author Harald Welte Sat, 27 Aug 2005 22:37:30 -0700 committer David S. Miller Mon, 29 Aug 2005 16:13:29 -0700 [NETFILTER6]: Add new ip6tables HOPLIMIT target This target allows users to modify the hoplimit header field of the IPv6 header. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 5f2c3b910744f68e1a507f027398f404b3feb5fb tree 0e5d7b5ed87f73bd89943358560c72625dd158f1 parent 29e4f8b3c340c4b2a0c6dd197b985e03826afd13 author Harald Welte Sat, 27 Aug 2005 22:37:03 -0700 committer David S. Miller Mon, 29 Aug 2005 16:13:22 -0700 [NETFILTER]: Add new iptables TTL target This new iptables target allows manipulation of the TTL of an IPv4 packet. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 29e4f8b3c340c4b2a0c6dd197b985e03826afd13 tree a8a66f054d7c912f3b6b0d10d86d137a203b0ed2 parent 072ab6c68e3dd158b68d97eaff16734474d2f8f8 author Arnaldo Carvalho de Melo Sun, 28 Aug 2005 02:00:28 -0300 committer David S. Miller Mon, 29 Aug 2005 16:13:17 -0700 [CCID3]: Move ccid3_hc_rx_detect_loss to packet_history.c Renaming it to dccp_rx_hist_detect_loss. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 072ab6c68e3dd158b68d97eaff16734474d2f8f8 tree 5b5d09d34e546fd67c2e7c2bb5c88ae426a8add4 parent 36729c1a73c354a155db18d64d9e79b86c446fcf author Arnaldo Carvalho de Melo Sun, 28 Aug 2005 01:19:14 -0300 committer David S. Miller Mon, 29 Aug 2005 16:13:10 -0700 [CCID3]: Move ccid3_hc_rx_add_hist to packet_history.c Renaming it to dccp_rx_hist_add_packet. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 36729c1a73c354a155db18d64d9e79b86c446fcf tree fea16e7c173151a795d7c617478073e7c36eceb6 parent 5cea0ddce56ff3406a81fbbab80ef45c65701673 author Arnaldo Carvalho de Melo Sun, 28 Aug 2005 00:47:15 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:47 -0700 [DCCP]: Move the calc_X routines to dccp_tfrc_lib Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5cea0ddce56ff3406a81fbbab80ef45c65701673 tree 84e5e9ead29dd53358394407479735034314cca1 parent 4524b259541e1eea07020af825d8e7b0e4faaec5 author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 23:50:46 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:33 -0700 [DCCP]: Introduce dccp_tfrc_lib module with net/dccp/ccids/lib/*.c I'll now take a look at the other proposed TFRC DCCP CCIDs to find more code that is now in ccid3.c and move to this module, the loss event rate, calc_X, etc most probably will be moved there. The main goal of these changes is to pave the way for the implementation of more TFRC based DCCP CCIDs and to shrink ccid3.c, reducing its complexity and helping in getting it rock solid. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4524b259541e1eea07020af825d8e7b0e4faaec5 tree a0aee23c08b3f98f0e96183309afb2d43ca12bd6 parent ae6706f0678b89de07ad3b456893cc883584f711 author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 23:18:26 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:25 -0700 [DCCP]: Just move packet_history.[ch] to net/dccp/ccids/lib/ Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ae6706f0678b89de07ad3b456893cc883584f711 tree d9d854ccb0bf7124d98dfaad959f34c11cceef23 parent cfc3c525a3b434cabf92bf7054f2c6c93497fbea author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 23:03:09 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:17 -0700 [CCID3]: Move the loss interval code to loss_interval.[ch] And put this into net/dccp/ccids/lib/, where packet_history.[ch] will also be moved and then we'll have a tfrc_lib.ko module that will be used by dccp_ccid3.ko and other CCIDs that are variations of TFRC (RFC 3448). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit cfc3c525a3b434cabf92bf7054f2c6c93497fbea tree 3c7b4ecf350942b866b2b143b68f40913593dca1 parent 6b5e633ab1525b4def3f36b53903b00586e9966d author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 20:20:37 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:10 -0700 [CCID3]: Move the CCID3 defines to ccid3.h Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6b5e633ab1525b4def3f36b53903b00586e9966d tree 3ba04b849920289a8ee6d6beae0fa72dc80b0e24 parent b6ee3d4ada4e85d9b9b9164c1327ef0850c79d5e author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 20:11:28 -0300 committer David S. Miller Mon, 29 Aug 2005 16:12:03 -0700 [CCID3]: Introduce usecs_div To avoid open coding this all over the place. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b6ee3d4ada4e85d9b9b9164c1327ef0850c79d5e tree 26dfc68ab042ebb8186fe3a93a34723cb1faaae1 parent 1f2333aea3269e196c44ae9a220e714cc1427792 author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 18:18:18 -0300 committer David S. Miller Mon, 29 Aug 2005 16:11:56 -0700 [CCID3]: Reorganise timeval handling Introducing functions to add to or subtract from a timeval variable and renaming now_delta to timeval_new_delta that calls do_gettimeofday and then timeval_delta, that should be used when there are several deltas made relative to the current time or setting variables to it, so as to avoid calling do_gettimeofday excessively. I'm leaving these "timeval_" prefixed funcions internal to DCCP for a while till we're sure there are no subtle bugs in it. It also is more correct as it checks if the number of usecs added to or subtracted from a tv_usec field is more than 2 seconds. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 1f2333aea3269e196c44ae9a220e714cc1427792 tree 45e261a982d1739fc5e00a9e45e9a44fdce639f5 parent d6809c12b3334a929c39bf08ea63bd819e0500f7 author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 03:51:58 -0300 committer David S. Miller Mon, 29 Aug 2005 16:11:46 -0700 [CCID3]: Reflow to mostly fit under 80 columns No code changes. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d6809c12b3334a929c39bf08ea63bd819e0500f7 tree 47fc3aa37c35ae6a83bc41b1ecf4a78c1189a00b parent 75b3f207b433dcb807fcf0f47de1c8398571ba5f author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 03:06:35 -0300 committer David S. Miller Mon, 29 Aug 2005 16:11:38 -0700 [DCCP]: Introduce dccp_wait_for_ccid and use it in dccp_write_xmit This is not quite what I think we should have long term but improves performance for now, so lets use it till we get CCID3 working well, then we can think about using sk_write_queue, perhaps using some ideas from Juwen Lai's old stack for 2.4.20. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 75b3f207b433dcb807fcf0f47de1c8398571ba5f tree cbe6fc0550f3b0b5593c6ee6763928c95dd7c443 parent ba89966c1984513f4f2cc0a6c182266be44ddd03 author Arnaldo Carvalho de Melo Sat, 27 Aug 2005 02:35:30 -0300 committer David S. Miller Mon, 29 Aug 2005 16:11:27 -0700 [DCCP]: Make the Debug Menu available when DCCP is statically linked too Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba89966c1984513f4f2cc0a6c182266be44ddd03 tree 6e5766fc5c287708c03e0a162531dfd4785b0703 parent 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 author Eric Dumazet Fri, 26 Aug 2005 12:05:31 -0700 committer David S. Miller Mon, 29 Aug 2005 16:11:18 -0700 [NET]: use __read_mostly on kmem_cache_t , DEFINE_SNMP_STAT pointers This patch puts mostly read only data in the right section (read_mostly), to help sharing of these data between CPUS without memory ping pongs. On one of my production machine, tcp_statistics was sitting in a heavily modified cache line, so *every* SNMP update had to force a reload. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 tree e3e16f62e7d203093e5d582db32ea357e3e70a58 parent 8082e4ed0a61da347f1c7f210493c4e9e55c8cd0 author David S. Miller Thu, 25 Aug 2005 16:23:11 -0700 committer David S. Miller Mon, 29 Aug 2005 16:11:11 -0700 [LIB]: Make TEXTSEARCH_BM plain tristate like the others And select it when the relevant modules are enabled. Signed-off-by: David S. Miller commit 8082e4ed0a61da347f1c7f210493c4e9e55c8cd0 tree f77b01974f0c773a828b7f910f9269a0a07d298f parent cf4ef01440ca5c6d96f2ea2b793a37a0a863a045 author Pablo Neira Ayuso Thu, 25 Aug 2005 16:12:22 -0700 committer David S. Miller Mon, 29 Aug 2005 16:11:06 -0700 [LIB]: Boyer-Moore extension for textsearch infrastructure strike #2 Attached the implementation of the Boyer-Moore string search algorithm for the new textsearch infrastructure. I've added as well a note about the limitations that this approach presents, as Thomas has remarked. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit cf4ef01440ca5c6d96f2ea2b793a37a0a863a045 tree 53e017b2608442cb919595ad0cb6ed3a0108bbbf parent 57bf1451ac79640c5a0a4f31284c43539fac2903 author Paul E. McKenney Thu, 25 Aug 2005 16:08:37 -0700 committer David S. Miller Mon, 29 Aug 2005 16:11:00 -0700 [LIST]: Add docbook header comments for hlist_add_{before,after}_rcu() Signed-off-by: David S. Miller commit 57bf1451ac79640c5a0a4f31284c43539fac2903 tree 2bd74fd185c8e6a5fa41c7c5befaea122932b2b8 parent 73eef4cddb2738c4e8c5ef157ebb1b19d6c9272f author Alexey Dobriyan Thu, 25 Aug 2005 16:06:19 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:54 -0700 [NET]: net/802: more endian annotations The rest of endian warnings now belongs to tr.c exclusively. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 73eef4cddb2738c4e8c5ef157ebb1b19d6c9272f tree adb68a5d7901439a2667fb6f60bbfa28c034d177 parent c770a65cee7cc250d7bccd99fa55e742988ae4e0 author Michael Chan Thu, 25 Aug 2005 15:39:15 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:48 -0700 [BNX2]: update version and minor fixes Update version and add 4 minor fixes, the last 2 were suggested by Jeff Garzik: 1. check for a valid ethernet address before setting it 2. zero out bp->regview if init_one encounters an error and unmaps the IO address. This prevents remove_one from unmapping again. 3. use netif_rx_schedule() instead of hand coding the same. 4. use IRQ_HANDLED and IRQ_NONE. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c770a65cee7cc250d7bccd99fa55e742988ae4e0 tree dad6acf451d5b227ddf39a892cf0bd596933dfdb parent e89bbf1049aac3625fdafe3657ed8d7d5373d351 author Michael Chan Thu, 25 Aug 2005 15:38:39 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:43 -0700 [BNX2]: change irq locks to bh locks Change all locks from spin_lock_irqsave() to spin_lock_bh(). All places that require spinlocks are in BH context. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e89bbf1049aac3625fdafe3657ed8d7d5373d351 tree 15e0fc01d553ce5bc38de546d80f5f2e3736b0bf parent cd339a0ed61097d92ce03b6d1042b1e4d58535e7 author Michael Chan Thu, 25 Aug 2005 15:36:58 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:38 -0700 [BNX2]: remove atomics in tx Remove atomic operations in the fast tx path. Expensive atomic operations were used to keep track of the number of available tx descriptors. The new code uses the difference between the consumer and producer index to determine the number of free tx descriptors. As suggested by Jeff Garzik, the name of the inline function is changed to all lower case. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cd339a0ed61097d92ce03b6d1042b1e4d58535e7 tree 872886c450910072c3615e8b69a71fb70fa0d42e parent afdc08b9f9a7174d7912a160f657f39d46379b5e author Michael Chan Thu, 25 Aug 2005 15:35:24 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:34 -0700 [BNX2]: speedup serdes linkup This speeds up link-up time on 5706 SerDes if the link partner does not autoneg, a rather common scenario in blade servers. Some blade servers use IPMI for keyboard input and it's important to minimize link disruptions. The speedup is achieved by shortening the timer to (HZ / 3) during the transient period right after initiating a SerDes autoneg. If autoneg does not complete, parallel detect can be done sooner. After the transient period is over, the timer goes back to its normal HZ interval. As suggested by Jeff Garzik, the timer initialization is moved to bnx2_init_board() from bnx2_open(). An eeprom bit is also added to allow default forced SerDes speed for even faster link-up time. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit afdc08b9f9a7174d7912a160f657f39d46379b5e tree 04856840d578c029c8c675130ba93bd607bcaa1e parent 2373ce1ca04dd46bf2b8b0f9a799eb2a90da92fb author Michael Chan Thu, 25 Aug 2005 15:34:29 -0700 committer David S. Miller Mon, 29 Aug 2005 16:10:29 -0700 [BNX2]: Fix rtnl deadlock in bnx2_close This fixes an rtnl deadlock problem when flush_scheduled_work() is called from bnx2_close(). In rare cases, linkwatch_event() may be on the workqueue from a previous close of a different device and it will try to get the rtnl lock which is already held by dev_close(). The fix is to set a flag if we are in the reset task which is run from the workqueue. bnx2_close() will loop until the flag is cleared. As suggested by Jeff Garzik, the loop is changed to call msleep(1) instead of yield() in the original patch. flush_scheduled_work() is also moved to bnx2_remove_one() before the netdev is freed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2373ce1ca04dd46bf2b8b0f9a799eb2a90da92fb tree ad517ad6e5b45f52ea05d97a78b85f8c114183d9 parent e5b4376074e02b783e56a8f7c42d544e18112c4e author Robert Olsson Thu, 25 Aug 2005 13:01:29 -0700 committer David S. Miller Mon, 29 Aug 2005 16:09:03 -0700 [IPV4]: Convert FIB Trie to RCU. * Removes RW-lock * Proteced read functions uses rcu_dereference proteced with rcu_read_lock() * writing of procted pointer w. rcu_assigen_pointer * Insert/Replace atomic list_replace_rcu * A BUG_ON condition removed.in trie_rebalance With help from Paul E. McKenney. Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e5b4376074e02b783e56a8f7c42d544e18112c4e tree 7269e327d5132da92cd5c7238c03266b7c9f391b parent 3625796806419d97641d90e0f197eab9b952212e author Robert Olsson Thu, 25 Aug 2005 13:01:03 -0700 committer David S. Miller Mon, 29 Aug 2005 16:08:31 -0700 [IPV4]: Prepare FIB core for RCU. * RCU versions of hlist_***_rcu * fib_alias partial rcu port just whats needed now. Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3625796806419d97641d90e0f197eab9b952212e tree c7e5ebb741b7d66d2bc6a729028a49f2f5ef1af7 parent c91326db013ddff478da8a8d66fb99ef4579f19a author Ralf Baechle Wed, 24 Aug 2005 11:38:53 -0700 committer David S. Miller Mon, 29 Aug 2005 16:08:23 -0700 [IPV4]: Module export of ip_rcv() no longer needed. With ip_rcv nowhere outside the IP stack being used anymore it's EXPORT_SYMBOL is not needed any longer either. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit c91326db013ddff478da8a8d66fb99ef4579f19a tree 07c6111590cef5ce52909c3b50ac64ae19eee3bb parent 98a82febb6340466824c3a453738d4fbd05db81a author Ralf Baechle Wed, 24 Aug 2005 11:37:45 -0700 committer David S. Miller Mon, 29 Aug 2005 16:08:15 -0700 [AX25/NETROM/ROSE]: Kill net/ip.h inclusion All these are claiming to include to get ip_rcv() but in fact don't need the header at all, so away with the inclusion. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 98a82febb6340466824c3a453738d4fbd05db81a tree ce1e22a4d8ccb662ed116a90c78dbf8bcbb3e0f4 parent 0c7770c740156c8802c23d24fc094d06967d997d author Ralf Baechle Wed, 24 Aug 2005 11:35:51 -0700 committer David S. Miller Mon, 29 Aug 2005 16:08:09 -0700 [AX25/NETROM]: Cleanup direct calls into IP stack Get rid of the calls to ip_rcv and arp_rcv which were layering violations anyway. With those being replaced by netif_rx, less parts of AX.25 and relatives depend on INET support actually being enabled. This also will make PF_PACKET sockets work for IP and ARP packets received over AX.25 and for IP packets over NET/ROM. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 0c7770c740156c8802c23d24fc094d06967d997d tree 420a2ca7dc7457d38e9a1b526d3072f610044926 parent 331968bd0c1b2437f3ad773cbf55f2e0737bafc0 author Stephen Hemminger Tue, 23 Aug 2005 21:59:41 -0700 committer David S. Miller Mon, 29 Aug 2005 16:08:01 -0700 [IPV4]: FIB trie cleanup This is a redo of earlier cleanup stuff: * replace DBG() macro with pr_debug() * get rid of duplicate extern's that are already in fib_lookup.h * use BUG_ON and WARN_ON * don't use BUG checks for null pointers where next statement would get a fault anyway * remove debug printout when rebalance causes deep tree * remove trailing blanks Signed-off-by: Stephen Hemminger Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 502c7f1dd566e7ca8aabdb755182664c5fdaebf1 tree 31934a4da45c0cb83acd118a181db4c51967ac8a parent 2cba582a49f1535c1a12a687cfb3dab713c22cc4 parent 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 author Jeff Garzik Mon, 29 Aug 2005 19:06:29 -0400 committer Jeff Garzik Mon, 29 Aug 2005 19:06:29 -0400 Merge /spare/repo/linux-2.6/ commit 331968bd0c1b2437f3ad773cbf55f2e0737bafc0 tree ec9c5aeaa5217c8ce009a7e5e07a60c3a390e021 parent 8efa544f9c84919c047dc2f96e308c902e8fb1a4 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:54:23 -0700 committer David S. Miller Mon, 29 Aug 2005 16:05:45 -0700 [DCCP]: Initial dccp_poll implementation Tested with a patched netcat, no horror stories so far 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8efa544f9c84919c047dc2f96e308c902e8fb1a4 tree c1df76c8e03900c0d6f13f0486e3fc6f05b0c51b parent dc40c7bc76054f5e4382835ca2bafb895b993a8a author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:54:00 -0700 committer David S. Miller Mon, 29 Aug 2005 16:05:38 -0700 [DCCP]: Call the HC exit routines at dccp_v4_destroy_sock Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit dc40c7bc76054f5e4382835ca2bafb895b993a8a tree 70951f8d97dc191df3c772c830b667ad7af6dfd9 parent 2babe1f6fea717c36c008c878fe095d1ca5696c1 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:52:58 -0700 committer David S. Miller Mon, 29 Aug 2005 16:05:32 -0700 [ICSK]: Generalise tcp_listen_poll Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2babe1f6fea717c36c008c878fe095d1ca5696c1 tree f2ce23b6e5898a6bec8726f17104074516559397 parent 4fded33b3e8177d1d2eec0ccc69af8dfe8b4c3c3 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:52:35 -0700 committer David S. Miller Mon, 29 Aug 2005 16:05:07 -0700 [DCCP]: Introduce dccp_get_info And also hc_tx and hc_rx get_info functions for the CCIDs to fill in information that is specific to them. For now reusing struct tcp_info, later I'll try to figure out a better solution, for now its really nice to get this kind of info: [root@qemu ~]# ./ss -danemi State Recv-Q Send-Q Local Addr:Port Peer Addr:Port LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040 mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0 ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0 mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377 This, for instance, shows that we're not congestion controlling ACKs, as the above output is in the ttcp receiving host, and ttcp is a one way app, i.e. the received never calls sendmsg, so ccid_hc_tx_send_packet is never called, so the TX half connection stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated, stays with the value set in ccid3_hc_tx_init, 4us, as show above in milliseconds (0.004ms), upcoming patches will fix this. rcv_rtt seems sane tho, matching ping results :-) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4fded33b3e8177d1d2eec0ccc69af8dfe8b4c3c3 tree 4b1dd2fbcd56886c863e380c7a8ea85c8705eb8f parent d4b81ff70547b40c9b0742b163e8354560003cc0 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:51:59 -0700 committer David S. Miller Mon, 29 Aug 2005 16:05:01 -0700 [CCID3]: Calculate the RTT in the RX half connection Using TIMESTAMP_ECHO and ELAPSED_TIME options received. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d4b81ff70547b40c9b0742b163e8354560003cc0 tree dde55db47394af881411a33e06843ff8ab3fd3d8 parent 012e13eac7579fcc7618df4ca1d5af3cdc03748c author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:51:36 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:53 -0700 [DCCP]: Export dccp_insert_option_timestamp to CCIDs And don't insert a TIMESTAMP option in all packets, leave the decision to the CCIDs. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 012e13eac7579fcc7618df4ca1d5af3cdc03748c tree 934c71228174d0da4a324afc1b7b001db9978911 parent a4beb1b64f5846e216bf2c439022df480151902a author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:51:13 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:48 -0700 [CCID]: Make ccid_hc_[rt]x_exit accept NULL arguments Just like kfree, etc it will just not call the CCID exit routines when the private data area is set to NULL. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a4beb1b64f5846e216bf2c439022df480151902a tree b9415975544fa2bcd78f3f9b51a8eeb11a60c6bc parent 20472af986569b0615bd77f0fd7ca9e3d33e9895 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:50:45 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:43 -0700 [DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 20472af986569b0615bd77f0fd7ca9e3d33e9895 tree 1f2fe837d53cc894c81710623bb1fd99f3b52a8d parent 7ad07e7cf343181002c10c39d3f57a88e4903d4f author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:50:21 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:38 -0700 [DCCP]: Fix skb leak in dccp_sendmsg Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7ad07e7cf343181002c10c39d3f57a88e4903d4f tree c22067f3f443faebdcd3403fa8ce7c5c89662c60 parent 58e45131dc269eff0983c6d44494f9e687686900 author Arnaldo Carvalho de Melo Tue, 23 Aug 2005 21:50:06 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:31 -0700 [DCCP]: Implement the CLOSING timer So that we retransmit CLOSE/CLOSEREQ packets till they elicit an answer or we hit a timeout. Most of the machinery uses TCP approaches, this code has to be polished & audited, but this is better than we had before. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 58e45131dc269eff0983c6d44494f9e687686900 tree 2ad04be66ec5ac7471c89180ff85f301e4f19a87 parent 05465343bf74e00c8c2c5a310740157de3149f27 author David S. Miller Sun, 21 Aug 2005 23:46:01 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:27 -0700 [DCCP]: Fix printf format warnings on 64-bit. Signed-off-by: David S. Miller commit 05465343bf74e00c8c2c5a310740157de3149f27 tree 393fc1fb09668faf3968726f6e8e5039109224a9 parent 764d8a9f240729534a1d8a0ffd39e722cf5cc5af author Patrick McHardy Sun, 21 Aug 2005 23:31:43 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:18 -0700 [NETFILTER]: Add goto target Originally written by Henrik Nordstrom , taken from netfilter patch-o-matic and added ip6_tables support. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 764d8a9f240729534a1d8a0ffd39e722cf5cc5af tree ee5d5e0b203149938a5151126b2e3ae46051dfbf parent 7567662ba896ee0c33d6215f32e2011488a6d1bf author Patrick McHardy Sun, 21 Aug 2005 23:31:06 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:12 -0700 [NETFILTER]: Add IPv6 REJECT target Originally written by Yasuyuki Kozakai , taken from netfilter patch-o-matic and fixed up to work with current kernels. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7567662ba896ee0c33d6215f32e2011488a6d1bf tree d259de5c48a54b7017ee21b5a141c223f8b082e6 parent 24117727b753426d85ba09671c24854834f81b2c author Pablo Neira Ayuso Sun, 21 Aug 2005 23:30:34 -0700 committer David S. Miller Mon, 29 Aug 2005 16:04:07 -0700 [NETFILTER]: Add string match Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 24117727b753426d85ba09671c24854834f81b2c tree 3a72f0f6e92bec1db7cd4431fc04f454ac1d4569 parent 03ace394ac9bcad38043a381ae5f4860b9c9fa1c author Arnaldo Carvalho de Melo Sun, 21 Aug 2005 05:40:16 -0300 committer David S. Miller Mon, 29 Aug 2005 16:03:52 -0700 [DCCP]: Fix ackno setting in SYNC/SYNCACK packets Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 03ace394ac9bcad38043a381ae5f4860b9c9fa1c tree bbe5f7fc56074224ded47113974dbc3db550b303 parent a3054d48b9b9d6290eccc9fc09c286ef450d9b1d author Arnaldo Carvalho de Melo Sun, 21 Aug 2005 05:36:45 -0300 committer David S. Miller Mon, 29 Aug 2005 16:03:42 -0700 [DCCP]: Fix the ACK and SEQ window variables settings This is from a first audit, more eyeballs are more than welcome. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a3054d48b9b9d6290eccc9fc09c286ef450d9b1d tree 08a6b91f57e6c7c66a4839ba4fb3c0bf570cebf6 parent 2807d4ffb0dccb8f932c3e1701b6b6163153d333 author Arnaldo Carvalho de Melo Sun, 21 Aug 2005 05:35:18 -0300 committer David S. Miller Mon, 29 Aug 2005 16:03:33 -0700 [DCCP]: Give more info on Step 6 failure debug printk Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2807d4ffb0dccb8f932c3e1701b6b6163153d333 tree 77379d35e53a7c531e78659e8244652b8c6635d5 parent c68e64cfb5ac675b002215b5659146b73d2e9d5d author Arnaldo Carvalho de Melo Sun, 21 Aug 2005 05:33:48 -0300 committer David S. Miller Mon, 29 Aug 2005 16:03:25 -0700 [DCCP]: Fix seqno setting in dccp_v4_ctl_send_reset Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c68e64cfb5ac675b002215b5659146b73d2e9d5d tree d975d49f4be2187002ae86e1f5a7a30956231697 parent 33d043d65bbd3d97efca96c9bbada443cac3c4da author Arnaldo Carvalho de Melo Sun, 21 Aug 2005 05:07:37 -0300 committer David S. Miller Mon, 29 Aug 2005 16:03:18 -0700 [CCID3]: Reintroduce ccid3hctx_t_rto CCID3 keeps this variable in usecs, inet_connection_socks in jiffies, so to avoid Mars orbiter losses lets reintroduce ccid3hctx_t_rto 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 33d043d65bbd3d97efca96c9bbada443cac3c4da tree 1411bba571bac24220a938d204ebf651b9df49c5 parent 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 author Thomas Graf Sat, 20 Aug 2005 17:27:34 -0700 committer David S. Miller Mon, 29 Aug 2005 16:03:10 -0700 [IPV4]: ip_finish_output() can be inlined Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 tree 5761421b50e94b6df9dd1353b03f472b489826e5 parent 3e192beaf5ef260a31e84a12c0a04eff2eec02ab author Thomas Graf Sat, 20 Aug 2005 17:27:09 -0700 committer David S. Miller Mon, 29 Aug 2005 16:03:06 -0700 [IPV4]: Remove some dead code from ip_forward() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 3e192beaf5ef260a31e84a12c0a04eff2eec02ab tree f3a0e434a460a8abf50329ed4b99eea037fe65e0 parent d245407e758b14c464c609b632873f85709360c7 author Thomas Graf Sat, 20 Aug 2005 17:26:30 -0700 committer David S. Miller Mon, 29 Aug 2005 16:03:03 -0700 [IPV4]: Avoid common branch mispredictions in ip_rcv_finish() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d245407e758b14c464c609b632873f85709360c7 tree 9e9cb6b08e0298bcd501c5e5b672c4ff6679a43a parent e9c604227391308b185aa6b14c7f93b0a0c2e51b author Thomas Graf Sat, 20 Aug 2005 17:26:12 -0700 committer David S. Miller Mon, 29 Aug 2005 16:03:00 -0700 [IPV4]: Move ip options parsing out of ip_rcv_finish() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit e9c604227391308b185aa6b14c7f93b0a0c2e51b tree 7562b6a91b5dacd25e19086a354cde1a281471af parent 58615242417638794a5ba299c49e3fbd6f47c2a3 author Thomas Graf Sat, 20 Aug 2005 17:25:52 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:57 -0700 [IPV4]: Avoid common branch misprediction while checking csum in ip_rcv() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 58615242417638794a5ba299c49e3fbd6f47c2a3 tree af64e1a3ca7755a7962282042c342abb92daeee1 parent 2c656491e9ce77e12337073973794c4be467a489 author Thomas Graf Sat, 20 Aug 2005 17:25:29 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:53 -0700 [IPV4]: Consistency and whitespace cleanup of ip_rcv() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2c656491e9ce77e12337073973794c4be467a489 tree 141e5506fdca8c0ba79f0f4cf13bbd0ba25d04e2 parent a6f9a70578b981321b63786ac8015f17cca4fcbd author Thomas Graf Sat, 20 Aug 2005 17:24:25 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:48 -0700 [NET]: Fix ipl=>ihl typo in ip_fast_csum Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a6f9a70578b981321b63786ac8015f17cca4fcbd tree 5cbc50f95419f4d8d5b13186ccc42b293e0e684a parent 8cd25c1fcfbf6460983e99091d278187421c1a1d author Jon Wetzel Sat, 20 Aug 2005 17:15:54 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:44 -0700 [NET]: Add support for getting the permanent hardware address. This patch adds a new field to net device to hold the permanent hardware address, and adds a new generic ethtool_op function to get that address. Signed-off-by: Jon Wetzel Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 8cd25c1fcfbf6460983e99091d278187421c1a1d tree 1ce86192ffd1ff35f22e18e07284845850e5fa96 parent 1bc0986957b63a2fbbc46ab95d3d1d72830bda83 author Adrian Bunk Sat, 20 Aug 2005 17:14:11 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:38 -0700 [NET]: fix PROC_FS=n compile Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1bc0986957b63a2fbbc46ab95d3d1d72830bda83 tree 8be8f0e0e19f58cc5cc9cb7d789f3283436712ed parent bf0ff9e578ba7dd8331005f00ad7310122011f43 author Ian McDonald Sat, 20 Aug 2005 00:23:43 -0300 committer David S. Miller Mon, 29 Aug 2005 16:02:34 -0700 [DCCP]: Fix the timestamp options This changes timestamp, timestamp echo, and elapsed time to use units of 10 usecs as per DCCP spec. This has been tested to verify that times are correct. Also fixed up length and used hton/ntoh more. Still to add in later patches: - actually use elapsed time to adjust RTT (commented out as was prior to this patch) - send options at times more closely following the spec (content is now correct) Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bf0ff9e578ba7dd8331005f00ad7310122011f43 tree f2dc2518debb5ab2c48d224bbfe9e82bdbb1b9e8 parent c59eab4637dbc3f832503be4ccb9213b0f323d92 author David S. Miller Fri, 19 Aug 2005 16:37:30 -0700 committer David S. Miller Mon, 29 Aug 2005 16:02:29 -0700 [IPVS]: ipv4_table --> ipvs_ipv4_table Fix conflict with symbol of same name in global namespace. Signed-off-by: David S. Miller commit c59eab4637dbc3f832503be4ccb9213b0f323d92 tree 95bf99ecc5150dc9a97c63f20b9e5d90a61edc13 parent 5480855bfbc125f34d9b752689bb9a64da7e1fc6 author Arnaldo Carvalho de Melo Thu, 18 Aug 2005 21:12:02 -0300 committer David S. Miller Mon, 29 Aug 2005 16:02:26 -0700 [DCCP]: Use LIMIT_NETDEBUG in some debugging printks Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5480855bfbc125f34d9b752689bb9a64da7e1fc6 tree e93e168a842bf3b6a7d24cc36a7ca580b064c449 parent b1c9fe7b818acbd36dc908c5c1ad4cab34c67b39 author Arnaldo Carvalho de Melo Thu, 18 Aug 2005 20:47:02 -0300 committer David S. Miller Mon, 29 Aug 2005 16:02:22 -0700 [DCCP]: Set dccp_ctl_socket to NULL in dccp_ctl_sock_exit Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b1c9fe7b818acbd36dc908c5c1ad4cab34c67b39 tree 7cc9a954c01b9161e44fc90ed24692fe6d933828 parent d179cd12928443f3ec29cfbc3567439644bd0afc author Ian McDonald Thu, 18 Aug 2005 20:45:29 -0300 committer David S. Miller Mon, 29 Aug 2005 16:02:03 -0700 [DCCP]: Fix elapsed time option as per section 13.2 of spec v11 The elapsed time can be two bytes or four bytes only. Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d179cd12928443f3ec29cfbc3567439644bd0afc tree 0bfc57e73f0bf9f7bb9d5c8ce7d3d5afe550f94e parent e92ae93a8aa66aea12935420cb22d4df1c18d023 author David S. Miller Wed, 17 Aug 2005 14:57:30 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:54 -0700 [NET]: Implement SKB fast cloning. Protocols that make extensive use of SKB cloning, for example TCP, eat at least 2 allocations per packet sent as a result. To cut the kmalloc() count in half, we implement a pre-allocation scheme wherein we allocate 2 sk_buff objects in advance, then use a simple reference count to free up the memory at the correct time. Based upon an initial patch by Thomas Graf and suggestions from Herbert Xu. Signed-off-by: David S. Miller commit e92ae93a8aa66aea12935420cb22d4df1c18d023 tree 61ffc292a8e437f7d44bbfe00c4e052f7488dd25 parent ba602a816132dcc66e875dddf2c62512a9f6f8cb author Arnaldo Carvalho de Melo Wed, 17 Aug 2005 03:10:59 -0300 committer David S. Miller Mon, 29 Aug 2005 16:01:50 -0700 [DCCP]: Send SYNCACK packets in response to SYNC packets Also fix step 6 when receiving SYNC or SYNCACK packets, i.e. we were not using the updated swl. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba602a816132dcc66e875dddf2c62512a9f6f8cb tree 2aaee0552a8ed9c0f986b0684a7e1f63f10b5874 parent bf73d1c5d726ac717755efc7e15d2a86dd383448 author David S. Miller Tue, 16 Aug 2005 20:50:16 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:47 -0700 [IPVS]: Rename tcp_{init,exit}() --> ip_vs_tcp_{init,exit}() Conflicts with global namespace functions with the same name. Signed-off-by: David S. Miller commit bf73d1c5d726ac717755efc7e15d2a86dd383448 tree 50d1038ea7c010c193f7f1d40d093a8efbf259c2 parent 4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d author Adrian Bunk Tue, 16 Aug 2005 20:45:45 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:43 -0700 [IRDA]: Possible cleanups. This patch contains the following possible cleanups: - make the following needlessly global function static: - irnet/irnet_ppp.c: irnet_init - remove the following unneeded EXPORT_SYMBOL's: - irlmp.c: sysctl_discovery_timeout - irlmp.c: irlmp_reasons - irlmp.c: irlmp_dup - irqueue.c: hashbin_find_next Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d tree a11270e23933664056cfd3d53e3ae2a661515d23 parent 6ed8a48582c08432e84e5610564c1d25fe00dd7f author Arnaldo Carvalho de Melo Tue, 16 Aug 2005 19:46:48 -0300 committer David S. Miller Mon, 29 Aug 2005 16:01:39 -0700 [IP]: Introduce ip_options_get_from_user This variant is needed to satisfy sparse __user annotations. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6ed8a48582c08432e84e5610564c1d25fe00dd7f tree 3508cea2d856ec8405059815bd9eba4a67c8a5cd parent 20380731bc2897f2952ae055420972ded4cd786e author Arnaldo Carvalho de Melo Tue, 16 Aug 2005 19:02:15 -0300 committer David S. Miller Mon, 29 Aug 2005 16:01:35 -0700 [NETLINK]: Fix sparse warnings Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 20380731bc2897f2952ae055420972ded4cd786e tree abd31e5ebfadcf4f9024634eec8b11855029e512 parent 9deff7f2365958c5c5aa8cb5a0dd651c4dd83f8f author Arnaldo Carvalho de Melo Tue, 16 Aug 2005 02:18:02 -0300 committer David S. Miller Mon, 29 Aug 2005 16:01:32 -0700 [NET]: Fix sparse warnings Of this type, mostly: CHECK net/ipv6/netfilter.c net/ipv6/netfilter.c:96:12: warning: symbol 'ipv6_netfilter_init' was not declared. Should it be static? net/ipv6/netfilter.c:101:6: warning: symbol 'ipv6_netfilter_fini' was not declared. Should it be static? Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 9deff7f2365958c5c5aa8cb5a0dd651c4dd83f8f tree d92a266b33deaa9a8ff78640df8126da61b97a76 parent 63a1222b1fd79c52491c14534b086bffbfaed8bf author Andrew Morton Mon, 15 Aug 2005 21:13:25 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:24 -0700 [RXRPC]: Fix build failure introduced by skb->stamp changes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 63a1222b1fd79c52491c14534b086bffbfaed8bf tree 36ec7df2a9ed5b3750223c8ebad4aa7b93ce4d94 parent 216efaaaa006d2f3ecbb5bbc2b6673423813254e author Andrew Morton Mon, 15 Aug 2005 20:35:44 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:20 -0700 [DECNET]: Fix build after netlink changes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 216efaaaa006d2f3ecbb5bbc2b6673423813254e tree c05cd2d0ec829d18a8f85ff8611c0e1424303f52 parent 066286071d3542243baa68166acb779187c848b3 author James Morris Mon, 15 Aug 2005 20:34:48 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:15 -0700 [SELINUX]: Update for tcp_diag rename to inet_diag. Also, support dccp sockets. Signed-off-by: James Morris Signed-off-by: David S. Miller commit 066286071d3542243baa68166acb779187c848b3 tree ef6604f16ceb13842a30311654e6a64aac716c48 parent 9a4595bc7e67962f13232ee55a64e063062c3a99 author Patrick McHardy Mon, 15 Aug 2005 12:33:26 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:11 -0700 [NETLINK]: Add "groups" argument to netlink_kernel_create Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9a4595bc7e67962f13232ee55a64e063062c3a99 tree 9691d77701cad7e0d4fb62390acf525f3adb9d60 parent f7fa9b10edbb9391bdd4ec8e8b3d621d0664b198 author Patrick McHardy Mon, 15 Aug 2005 12:32:15 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:07 -0700 [NETLINK]: Add set/getsockopt options to support more than 32 groups NETLINK_ADD_MEMBERSHIP/NETLINK_DROP_MEMBERSHIP are used to join/leave groups, NETLINK_PKTINFO is used to enable nl_pktinfo control messages for received packets to get the extended destination group number. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f7fa9b10edbb9391bdd4ec8e8b3d621d0664b198 tree 5b4b3a6b96b0ede7030915996e63f3858ed72a7b parent ab33a1711cf60bfb562b1ab89ac9f23d1425e8b1 author Patrick McHardy Mon, 15 Aug 2005 12:29:13 -0700 committer David S. Miller Mon, 29 Aug 2005 16:01:02 -0700 [NETLINK]: Support dynamic number of multicast groups per netlink family Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ab33a1711cf60bfb562b1ab89ac9f23d1425e8b1 tree abd497f5b7023ff748001d6ef182d74f882f1a07 parent ac6d439d2097b72ea0cbc2322ce1263a38bc1fd0 author Patrick McHardy Sun, 14 Aug 2005 19:31:36 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:58 -0700 [NETLINK]: Return -EPROTONOSUPPORT in netlink_create() if no kernel socket is registered This is necessary for dynamic number of netlink groups to make sure we know the number of possible groups before bind() is called. With this change pure userspace communication using unused netlink protocols becomes impossible. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ac6d439d2097b72ea0cbc2322ce1263a38bc1fd0 tree 19e638a226993dddede5a2da577e2572f7555a95 parent d629b836d151d43332492651dd841d32e57ebe3b author Patrick McHardy Sun, 14 Aug 2005 19:29:52 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:54 -0700 [NETLINK]: Convert netlink users to use group numbers instead of bitmasks Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d629b836d151d43332492651dd841d32e57ebe3b tree 0276547438963b51b8d92df201e91d867c7fa9c0 parent 77247bbb3094246be9d057e7be442cc708f123a8 author Patrick McHardy Sun, 14 Aug 2005 19:27:50 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:49 -0700 [NETLINK]: Use group numbers instead of bitmasks internally Using the group number allows increasing the number of groups without beeing limited by the size of the bitmask. It introduces one limitation for netlink users: messages can't be broadcasted to multiple groups anymore, however this feature was never used inside the kernel. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 77247bbb3094246be9d057e7be442cc708f123a8 tree f6129e1aa25be790fdf38d5f39e1d38b2fa19587 parent db080529798b497eb5a37b92a25e966be5a7dd5d author Patrick McHardy Sun, 14 Aug 2005 19:27:13 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:45 -0700 [NETLINK]: Fix module refcounting problems Use-after-free: the struct proto_ops containing the module pointer is freed when a socket with pid=0 is released, which besides for kernel sockets is true for all unbound sockets. Module refcount leak: when the kernel socket is closed before all user sockets have been closed the proto_ops struct for this family is replaced by the generic one and the module refcount can't be dropped. The second problem can't be solved cleanly using module refcounting in the generic socket code, so this patch adds explicit refcounting to netlink_create/netlink_release. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit db080529798b497eb5a37b92a25e966be5a7dd5d tree 8986bf4196a343bdf181bc9f667bdd131c05186d parent 43e943c32b9213b5d25407b281c94aaa474fd9a6 author Patrick McHardy Sun, 14 Aug 2005 19:26:34 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:39 -0700 [NETLINK]: Remove unused groups member from struct netlink_skb_parms Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 43e943c32b9213b5d25407b281c94aaa474fd9a6 tree 7844a1aa95d697ae378bc799085e1b29eb0b8a48 parent ad93e266a17c6f606e96304c866eb73665ae34fa author Patrick McHardy Sun, 14 Aug 2005 19:25:47 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:34 -0700 [NETLINK]: Fix missing dst_groups initializations in netlink_broadcast users netlink_broadcast users must initialize NETLINK_CB(skb).dst_groups to the destination group mask for netlink_recvmsg. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ad93e266a17c6f606e96304c866eb73665ae34fa tree 12368a84d94fde2e3be86518464f6bd259f52847 parent 7de76272b54e3677bcd247d1e1809015236a298d author Evgeniy Polyakov Sun, 14 Aug 2005 19:24:58 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:29 -0700 [NETLINK]: w1_int.c: fix default netlink group w1 does not need to multicast its state to several groups at once, and upcoming netlink changes will not allow bitmask for groups anyway. Signed-off-by: Evgeniy Polyakov Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7de76272b54e3677bcd247d1e1809015236a298d tree 0d497d40143c3a4f02456c57820d946f8de31d09 parent a10cedd4b905236603c6c4fd77cf338ebbfb1a60 author David S. Miller Sun, 14 Aug 2005 18:01:08 -0700 committer David S. Miller Mon, 29 Aug 2005 16:00:24 -0700 [IPX]: Fix build error in ipx_recvmsg() Missing semicolon introduced by skb->stamp changeset: d3258b7d8ed96f97032639bc745179f1951b0da5 Signed-off-by: David S. Miller commit a10cedd4b905236603c6c4fd77cf338ebbfb1a60 tree 118dd7b2c02317220b5d275edb8c1d04cd9cbe51 parent a1d3a35518779df0579dd9de0121354b49c68ddc author Patrick McHardy Sun, 14 Aug 2005 21:05:53 -0300 committer David S. Miller Mon, 29 Aug 2005 16:00:12 -0700 [DCCP]: Fix compiler warnings may be a false warning if there always is something on ccid3hcrx_hist: net/dccp/ccids/ccid3.c: In function 'ccid3_hc_rx_packet_recv': net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_usec' may be used uninitialized in this function net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_sec' may be used uninitialized in this function const on inline functions doesn't have any effect: net/dccp/dccp.h:64: warning: type qualifiers ignored on function return type net/dccp/dccp.h:70: warning: type qualifiers ignored on function return type net/dccp/dccp.h:76: warning: type qualifiers ignored on function return type Signed-off-by: Patrick McHardy Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a1d3a35518779df0579dd9de0121354b49c68ddc tree 1d99d52393b5eb2d46e306cecbaf86547cafbc6a parent 8649b0d4166e6e80ffa298e75abd8f2afdd491a6 author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 22:42:25 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:59 -0700 [DCCP]: Fix sparse warnings Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8649b0d4166e6e80ffa298e75abd8f2afdd491a6 tree e6024532d165f5dc9987fe38fb84cb2076c86100 parent 725ba8eee3881e619c8e5a0116f1bdb6480ac2d9 author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 20:36:01 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:50 -0700 [DCCP]: Fix RESET handling in dccp_rcv_state_process To avoid holding TIMEWAIT state for sockets in the LISTEN state. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 725ba8eee3881e619c8e5a0116f1bdb6480ac2d9 tree e4d92f0fcbac811ae5954f771794165225b0726f parent 531669a0a9041d60d13920973ef8aa4f743c14a0 author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 20:35:39 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:43 -0700 [DCCP]: Introduce the DCCP Kernel hacking menu Only available if CONFIG_DEBUG_KERNEL is enabled in the "Kernel Hacking" Menu. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 531669a0a9041d60d13920973ef8aa4f743c14a0 tree e1225d8e4e3ef708117729f264e6fad14df0c283 parent 7690af3fff7633e40b1b9950eb8489129251d074 author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 20:35:17 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:34 -0700 [DCCP]: Rewrite dccp_sendmsg to be more like UDP Based on discussions with Nishida-san. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7690af3fff7633e40b1b9950eb8489129251d074 tree 92fa07234a7547c4a7dd74877972b5a291673fcf parent c173437669967301facff151bfeb7bae67354e4c author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 20:34:54 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:26 -0700 [DCCP]: Just reflow the source code to fit in 80 columns Andrew Morton should be happy now 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c173437669967301facff151bfeb7bae67354e4c tree 87f041617855039182e3c1e6bb0d22945f218415 parent 34b4a4a624bafe089107966a6c56d2a1aca026d4 author Arnaldo Carvalho de Melo Sat, 13 Aug 2005 20:34:23 -0300 committer David S. Miller Mon, 29 Aug 2005 15:59:17 -0700 [PACKET_HISTORY]: Add dccphtx_rtt and rename the win_count fields As requested by Ian. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit 34b4a4a624bafe089107966a6c56d2a1aca026d4 tree d0546ea54dc1f7169447133df89e1512eb48ae39 parent 000efe1d86620244b8e017429e57fab4170ab05a author Christoph Hellwig Sun, 14 Aug 2005 17:33:59 -0700 committer David S. Miller Mon, 29 Aug 2005 15:59:07 -0700 [NETFILTER]: Remove tasklist_lock abuse in ipt{,6}owner Rip out cmd/sid/pid matching since its unfixable broken and stands in the way of locking changes to tasklist_lock. Signed-off-by: Christoph Hellwig Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 000efe1d86620244b8e017429e57fab4170ab05a tree 481faa0d09fccb3835624574030da25492c2e38b parent 9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7 author Gary Wayne Smith Sun, 14 Aug 2005 17:33:24 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:41 -0700 [NETFILTER]: Make NETMAP target usable in OUTPUT Signed-off-by: Gary Wayne Smith Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7 tree 27f2c48e12e1bb5e3e6d5f8320651c213892ed20 parent fb13ab2849074244a51ae5147483610529a29ced author Patrick McHardy Sun, 14 Aug 2005 17:32:50 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:36 -0700 [NETFILTER]: Don't exclude local packets from MASQUERADING Increases consistency in source-address selection. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fb13ab2849074244a51ae5147483610529a29ced tree 858541a34d1e72632958bb788cf38b790d212757 parent a61bbcf28a8cb0ba56f8193d512f7222e711a294 author Domen Puncer Sun, 14 Aug 2005 17:32:05 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:29 -0700 [NETFILTER]: Remove two unused files Signed-off-by: Domen Puncer Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a61bbcf28a8cb0ba56f8193d512f7222e711a294 tree 33ae1976ab3b08aac516debb2742d2c6696d5436 parent 25ed891019b84498c83903ecf53df7ce35e9cff6 author Patrick McHardy Sun, 14 Aug 2005 17:24:31 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:24 -0700 [NET]: Store skb->timestamp as offset to a base timestamp Reduces skb size by 8 bytes on 64-bit. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 25ed891019b84498c83903ecf53df7ce35e9cff6 tree 8ff7446b2ecaf535da762186d64c6a5af1762de7 parent 8ffde671730df0b392ca478643b88ef7153244c0 author Patrick McHardy Sat, 13 Aug 2005 13:58:21 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:17 -0700 [NETFILTER]: Nicer names for ipt_connbytes constants Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8ffde671730df0b392ca478643b88ef7153244c0 tree d7c57be003aff2de6068acbe751182264acf3d25 parent 9d810fd2d28a9d672eca3136476af1a54a380bb2 author Patrick McHardy Sat, 13 Aug 2005 13:57:58 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:11 -0700 [NETFILTER]: Fix div64_64 in ipt_connbytes Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9d810fd2d28a9d672eca3136476af1a54a380bb2 tree 1eaa57851bbc1eeee094b92c539de8e7509aa297 parent 0ba2c6e8c0fb5cde5a23a213c2e7cb851b85c310 author Harald Welte Sat, 13 Aug 2005 13:56:26 -0700 committer David S. Miller Mon, 29 Aug 2005 15:58:04 -0700 [NETFILTER]: Add new iptables "connbytes" match This patch ads a new "connbytes" match that utilizes the CONFIG_NF_CT_ACCT per-connection byte and packet counters. Using it you can do things like packet classification on average packet size within a connection. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ba2c6e8c0fb5cde5a23a213c2e7cb851b85c310 tree 62317e893be4261f456d666efd1105b7871d36b9 parent 17b085eacef81a6286bd478f2ec75e04abb091cb author Harald Welte Sat, 13 Aug 2005 13:55:44 -0700 committer David S. Miller Mon, 29 Aug 2005 15:57:59 -0700 [NETFILTER]: introduce and use aligned_u64 data type As proposed by Andi Kleen, this is required esp. for x86_64 architecture, where 64bit code needs 8byte aligned 64bit data types, but 32bit userspace apps will only align to 4bytes. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 17b085eacef81a6286bd478f2ec75e04abb091cb tree b990ca4a3b8e2c08fbcf09ba18e9ae469754b2df parent a8c2190ee7da1a1dc68ff1a6b5f03feb61e523a5 author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 12:59:17 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:54 -0700 [INET_DIAG]: Move the tcp_diag interface to the proper place With this the previous setup is back, i.e. tcp_diag can be built as a module, as dccp_diag and both share the infrastructure available in inet_diag. If one selects CONFIG_INET_DIAG as module CONFIG_INET_TCP_DIAG will also be built as a module, as will CONFIG_INET_DCCP_DIAG, if CONFIG_IP_DCCP was selected static or as a module, if CONFIG_INET_DIAG is y, being statically linked CONFIG_INET_TCP_DIAG will follow suit and CONFIG_INET_DCCP_DIAG will be built in the same manner as CONFIG_IP_DCCP. Now to aim at UDP, converting it to use inet_hashinfo, so that we can use iproute2 for UDP sockets as well. Ah, just to show an example of this new infrastructure working for DCCP :-) [root@qemu ~]# ./ss -dane State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 0 *:5001 *:* ino:942 sk:cfd503a0 ESTAB 0 0 127.0.0.1:5001 127.0.0.1:32770 ino:943 sk:cfd50a60 ESTAB 0 0 127.0.0.1:32770 127.0.0.1:5001 ino:947 sk:cfd50700 TIME-WAIT 0 0 127.0.0.1:32769 127.0.0.1:5001 timer:(timewait,3.430ms,0) ino:0 sk:cf209620 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a8c2190ee7da1a1dc68ff1a6b5f03feb61e523a5 tree 30ab4f0cb01c493249a858ce315a1847a8c2e65f parent 73c1f4a033675f168df7e98bbeeafca3c644b8a6 author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 12:56:38 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:48 -0700 [INET_DIAG]: Rename tcp_diag.[ch] to inet_diag.[ch] Next changeset will introduce net/ipv4/tcp_diag.c, moving the code that was put transitioanlly in inet_diag.c. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 73c1f4a033675f168df7e98bbeeafca3c644b8a6 tree 041e0c203be710b39c8b3a1c18d23e7a50e321a6 parent 4f5736c4c7cf6f9bd8db82b712cfdd51c87e06b9 author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 12:51:49 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:44 -0700 [TCPDIAG]: Just rename everything to inet_diag Next changeset will rename tcp_diag.[ch] to inet_diag.[ch]. I'm taking this longer route so as to easy review, making clear the changes made all along the way. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4f5736c4c7cf6f9bd8db82b712cfdd51c87e06b9 tree 403d4b49b4c1d51445f3ff279d75f74a39e2cc17 parent 5324a040ccc708998e61ea93e669b81312f0ae11 author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 09:27:49 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:38 -0700 [TCPDIAG]: Introduce inet_diag_{register,unregister} Next changeset will rename tcp_diag to inet_diag and move the tcp_diag code out of it and into a new tcp_diag.c, similar to the net/dccp/diag.c introduced in this changeset, completing the transition to a generic inet_diag infrastructure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5324a040ccc708998e61ea93e669b81312f0ae11 tree 08e40652e7c9394277a0b5e08148c43a97d46670 parent 505cbfc577f3fa778005e2800b869eca25727d5f author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 09:26:18 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:29 -0700 [INET6_HASHTABLES]: Move inet6_lookup functions to net/ipv6/inet6_hashtables.c Doing this we allow tcp_diag to support IPV6 even if tcp_diag is compiled statically and IPV6 is compiled as a module, removing the previous restriction while not building any IPV6 code if it is not selected. Now to work on the tcpdiag_register infrastructure and then to rename the whole thing to inetdiag, reflecting its by then completely generic nature. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 505cbfc577f3fa778005e2800b869eca25727d5f tree a823df4b3e919b06b08d49014ad233c48a5903ff parent b766b305d3f2d8be173e5d9853534ea1afdbabba author Arnaldo Carvalho de Melo Fri, 12 Aug 2005 09:19:38 -0300 committer David S. Miller Mon, 29 Aug 2005 15:57:24 -0700 [IPV6]: Generalise the tcp_v6_lookup routines In the same way as was done with the v4 counterparts, this will be moved to inet6_hashtables.c. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b766b305d3f2d8be173e5d9853534ea1afdbabba tree f3368c13b2644965cb16dfd80dd044621ec35608 parent 0a242efc4fb859b2da506cdf8f3366231602e4ff author Harald Welte Fri, 12 Aug 2005 11:36:44 -0700 committer David S. Miller Mon, 29 Aug 2005 15:57:14 -0700 [NETFILTER]: Fix gcc-3.4.x warning about iplicit operator precedence Fix gcc-3.4.x warning about iplicit operator precedence in NF_QUEUE_NR() Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0a242efc4fb859b2da506cdf8f3366231602e4ff tree a4f4174ba8ccdedf892cc3358033b61e1a92babd parent 5917ed961def82a4dba9198d11a75f79d115a8cb author Denis Vlasenko Thu, 11 Aug 2005 15:32:53 -0700 committer David S. Miller Mon, 29 Aug 2005 15:57:08 -0700 [NET]: Deinline netif_carrier_{on,off}(). # grep -r 'netif_carrier_o[nf]' linux-2.6.12 | wc -l 246 # size vmlinux.org vmlinux.carrier text data bss dec hex filename 4339634 1054414 259296 5653344 564360 vmlinux.org 4337710 1054414 259296 5651420 563bdc vmlinux.carrier And this ain't an allyesconfig kernel! Signed-off-by: David S. Miller commit 5917ed961def82a4dba9198d11a75f79d115a8cb tree 4e7ba1b827e70d60cb6fd42ea18bd618757a8908 parent 622439270c74f3ad4f69d1417aca4bb3b79514f4 author Harald Welte Thu, 11 Aug 2005 15:31:15 -0700 committer David S. Miller Mon, 29 Aug 2005 15:57:03 -0700 [NETFILTER]: Fix NF_QUEUE_NR() macro I obviously wanted to use bitwise-or, not logical or. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 622439270c74f3ad4f69d1417aca4bb3b79514f4 tree fde205886d09db76b0042092be0be7a509791349 parent e41aac41e3856c87fee52c5b8bca71705d15449b author Harald Welte Thu, 11 Aug 2005 15:30:45 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:54 -0700 [NETFILTER]: Fix compilation when no PROC_FS enabled Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e41aac41e3856c87fee52c5b8bca71705d15449b tree c3023f226eac22b32bbcc3cfe09af6625f91443d parent 14ab9b867aa6c107b4886bdc5b23f277ab10792e author Arnaldo Carvalho de Melo Thu, 11 Aug 2005 14:37:16 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:49 -0700 [TCPDIAG]: Introduce CONFIG_IP_TCPDIAG_DCCP Similar to CONFIG_IP_TCPDIAG_IPV6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 14ab9b867aa6c107b4886bdc5b23f277ab10792e tree dec16a22fe4e18c1de63256454f5a0810ce17379 parent 07dc3f0718d2c88c3094a0aadeeb4744effc5439 author Peter Hagervall Wed, 10 Aug 2005 14:18:16 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:43 -0700 [BNX2]: Possible sparse fixes, take two This patch contains the following possible cleanups/fixes: - use C99 struct initializers - make a few arrays and structs static - remove a few uses of literal 0 as NULL pointer - use convenience function instead of cast+dereference in bnx2_ioctl() - remove superfluous casts to u8 * in calls to readl/writel Signed-off-by: Peter Hagervall Acked-by: Michael Chan Signed-off-by: David S. Miller commit 07dc3f0718d2c88c3094a0aadeeb4744effc5439 tree d0bb49ac931db8ad0d5887da75193b42bc00e95f parent cef07fd6029c20f95571d09cefce45ee3276a920 author Benjamin LaHaise Wed, 10 Aug 2005 14:16:04 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:38 -0700 [NET]: Make use of ->private_data in sockfd_lookup Please consider the patch below which makes use of file->private_data to store the pointer to the socket, which avoids touching several unused cachelines in the dentry and inode in sockfd_lookup. Signed-off-by: Benjamin LaHaise Signed-off-by: David S. Miller commit cef07fd6029c20f95571d09cefce45ee3276a920 tree 7d559e7006438b3f256e516d60ca89d153bcaf9d parent 8c60f3fab55712f23f2bd557ceedfbb00c649f37 author Arnaldo Carvalho de Melo Wed, 10 Aug 2005 13:29:27 -0300 committer David S. Miller Mon, 29 Aug 2005 15:56:33 -0700 [CCID3]: Ditch USEC_IN_SEC as time.h has USEC_PER_SEC That is equivalent, no need to have a private one. Signed-off-by: Arnaldo Carvalho de Melo commit 8c60f3fab55712f23f2bd557ceedfbb00c649f37 tree a131a54e9790b1b85e5c7f78a2e74e33af2bbd87 parent 540722ffc3a0d7e11d97a13e1ce6f3bc23b061c1 author Arnaldo Carvalho de Melo Wed, 10 Aug 2005 12:59:38 -0300 committer David S. Miller Mon, 29 Aug 2005 15:56:28 -0700 [CCID3]: Separate most of the packet history code This also changes the list_for_each_entry_safe_continue behaviour to match its kerneldoc comment, that is, to start after the pos passed. Also adds several helper functions from previously open coded fragments, making the code more clear. Signed-off-by: Arnaldo Carvalho de Melo commit 540722ffc3a0d7e11d97a13e1ce6f3bc23b061c1 tree 0d750a23bc5e5e65ae4fd7baef237476398ca2ec parent 6687e988d9aeaccad6774e6a8304f681f3ec0a03 author Arnaldo Carvalho de Melo Wed, 10 Aug 2005 05:54:28 -0300 committer David S. Miller Mon, 29 Aug 2005 15:56:23 -0700 [TCPDIAG]: Implement cheapest way of supporting DCCPDIAG_GETSOCK With ugly ifdefs, etc, but this actually: 1. keeps the existing ABI, i.e. no need to recompile the iproute2 utilities if not interested in DCCP. 2. Provides all the tcp_diag functionality in DCCP, with just a small patch that makes iproute2 support DCCP. Of course I'll get this cleaned-up in time, but for now I think its OK to be this way to quickly get this functionality. iproute2-ss050808 patch at: http://vger.kernel.org/~acme/iproute2-ss050808.dccp.patch Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6687e988d9aeaccad6774e6a8304f681f3ec0a03 tree ecd3d28f9989847aa1dcde4782de0210aeadc290 parent 64ce207306debd7157f47282be94770407bec01c author Arnaldo Carvalho de Melo Wed, 10 Aug 2005 04:03:31 -0300 committer David S. Miller Mon, 29 Aug 2005 15:56:18 -0700 [ICSK]: Move TCP congestion avoidance members to icsk This changeset basically moves tcp_sk()->{ca_ops,ca_state,etc} to inet_csk(), minimal renaming/moving done in this changeset to ease review. Most of it is just changes of struct tcp_sock * to struct sock * parameters. With this we move to a state closer to two interesting goals: 1. Generalisation of net/ipv4/tcp_diag.c, becoming inet_diag.c, being used for any INET transport protocol that has struct inet_hashinfo and are derived from struct inet_connection_sock. Keeps the userspace API, that will just not display DCCP sockets, while newer versions of tools can support DCCP. 2. INET generic transport pluggable Congestion Avoidance infrastructure, using the current TCP CA infrastructure with DCCP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 64ce207306debd7157f47282be94770407bec01c tree b4004f01b2b0e935b95bcce9a78e60a9e9e17f65 parent 64cf1e5d8b5f88d56509260e08fa0d8314277350 author Patrick McHardy Tue, 09 Aug 2005 20:50:53 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:08 -0700 [NET]: Make NETDEBUG pure printk wrappers Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 64cf1e5d8b5f88d56509260e08fa0d8314277350 tree 1b2decb48c52d8f3f3abe04ffb8e0dca80f0747a parent 696ab2d3bffc746fb8cf3712f066d42b9886aeed author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:45:21 -0700 committer David S. Miller Mon, 29 Aug 2005 15:56:03 -0700 [DCCP]: Finish the TIMEWAIT minisock support Using most of the infrastructure TCP uses, with a dccp_death_row, etc. As per my current interpretation of the draft what we have with this changeset seems to be all we need (or very close to it 8)). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 696ab2d3bffc746fb8cf3712f066d42b9886aeed tree d0990b1d6f5fd6b3b7ddce553a16cccf6f029651 parent 295ff7edb8f72b77d524759266f7524deae379b3 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:45:03 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:58 -0700 [TIMEWAIT]: Move inet_timewait_death_row routines to net/ipv4/inet_timewait_sock.c Also export the ones that will be used in the next changeset, when DCCP uses this infrastructure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 295ff7edb8f72b77d524759266f7524deae379b3 tree e16e99e324444fb01ae3dfd221b5d47a88acfeb8 parent 0b4e03bf0bc43ad6250a1e2fa25fc3eb2b028977 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:44:40 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:48 -0700 [TIMEWAIT]: Introduce inet_timewait_death_row That groups all of the tables and variables associated to the TCP timewait schedulling/recycling/killing code, that now can be isolated from the TCP specific code and used by other transport protocols, such as DCCP. Next changeset will move this code to net/ipv4/inet_timewait_sock.c Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0b4e03bf0bc43ad6250a1e2fa25fc3eb2b028977 tree fc21dfde1ae4c64c2ebcc56e4cdc84641fc06229 parent 27258ee54f8cd4a43d09319aa5448145afc2cb8d author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:31:11 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:43 -0700 [DCCP]: Initialize icsk_rto in dccp_v4_init_sock Fixes nasty bug related to the retransmit timer (yeah, DCCP does retransmits) firing too early. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 27258ee54f8cd4a43d09319aa5448145afc2cb8d tree 4a52d16da47f7ab0777252169406ae85e53488b1 parent 0d48d93947dd9ea21c5cdc76a8581b06a4a39281 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:30:56 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:18 -0700 [DCCP]: Introduce dccp_write_xmit from code in dccp_sendmsg This way it gets closer to the TCP flow, where congestion window checks are done, it seems we can map ccid_hc_tx_send_packet in dccp_write_xmit to tcp_snd_wnd_test in tcp_write_xmit, a CCID2 decision should just fit in here as well... Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0d48d93947dd9ea21c5cdc76a8581b06a4a39281 tree 96a1cbfe83a02e27fed3d30f1ac9f2fe05c17506 parent 2eb25a6c34504254760e67172f7518d6bfdd7676 author Marcel Holtmann Tue, 09 Aug 2005 20:30:28 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:13 -0700 [Bluetooth]: Move packet type into the SKB control buffer This patch moves the usage of packet type into the SKB control buffer. After this patch it is now possible to shrink the sk_buff structure and redefine its pkt_type. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 2eb25a6c34504254760e67172f7518d6bfdd7676 tree fc2f39fedac03f773b7bbb3489774df57edc721c parent 3a5e903c09aed19ca4a1bb26d87b8d6461a93818 author Victor Fusco Tue, 09 Aug 2005 20:29:11 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:07 -0700 [Bluetooth]: Fix sparse warnings (__nocast type) This patch fixes the sparse warnings "implicit cast to nocast type" for the priority or gfp_mask parameters of the memory allocations. Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 3a5e903c09aed19ca4a1bb26d87b8d6461a93818 tree b9761b89aaba6537d06893091a2f43c9a8e17c3f parent 7b9eb9e2099f6f4acd6a36bcd7820d27c3cf5ee3 author J. Suter Tue, 09 Aug 2005 20:28:46 -0700 committer David S. Miller Mon, 29 Aug 2005 15:55:03 -0700 [Bluetooth]: Implement RFCOMM remote port negotiation This patch implements the remote port negotiation (RPN) of the RFCOMM protocol for Bluetooth. Signed-off-by: J. Suter Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 7b9eb9e2099f6f4acd6a36bcd7820d27c3cf5ee3 tree 0cbd3c78723f3a66b9a35c725fa1328ebad28453 parent 85a1e930bf628700e8e9c166b1f5c1c26d3651cc author Timo Teräs Tue, 09 Aug 2005 20:28:21 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:58 -0700 [Bluetooth]: Call tty_hangup() when DCD is de-asserted The RFCOMM layer does not handle properly the de-assertation of CD signal. It should call tty_hangup() to work properly. Signed-off-by: Timo Teräs Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 85a1e930bf628700e8e9c166b1f5c1c26d3651cc tree 3361d42b6c32145517df9ac95117221a01a8132c parent 45bb4bf08b9c16122af84d3f26a018c8022b24e5 author Marcel Holtmann Tue, 09 Aug 2005 20:28:02 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:53 -0700 [Bluetooth]: Track page scan repetition mode changes The HCI page scan repetition mode change event contains the actual page scan repetition mode for the remote device. It is the same value that is received from an inquiry response and it can be used to make further reconnections faster. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 45bb4bf08b9c16122af84d3f26a018c8022b24e5 tree f8eb941e9ba34345652ab6330ab6b84c8598dec1 parent 4aa769b99724953a6f322c648c0cfbe8c6616382 author Marcel Holtmann Tue, 09 Aug 2005 20:27:49 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:47 -0700 [Bluetooth]: Workaround for inquiry results with RSSI and page scan mode This patch implements a workaround for buggy Bluetooth 1.2 devices from Silicon Wave. Their inquiry results with RSSI contain the page scan mode field. This field was removed in the final Bluetooth 1.2 specification. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 4aa769b99724953a6f322c648c0cfbe8c6616382 tree 464078550df33ac4f9c8eaf286e95a4f5f46a890 parent f6ccf55419c4f0021e7382f000f2fd14a29f3d3c author Marcel Holtmann Tue, 09 Aug 2005 20:27:37 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:42 -0700 [Bluetooth]: Update and cleanup of the virtual HCI driver This patch cleans up the virtual HCI driver. It also adds support for the dynamic minor device number allocation. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit f6ccf55419c4f0021e7382f000f2fd14a29f3d3c tree c0b6446bf3ebf84437eeb16d357a7845598de206 parent 1d3de414eb20d937d82c5219fd13ee4cedc499cb author David S. Miller Tue, 09 Aug 2005 20:27:14 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:34 -0700 [DCCP]: Fix u64 printf format warnings. Signed-off-by: David S. Miller commit 1d3de414eb20d937d82c5219fd13ee4cedc499cb tree 3e249fc3ecd33bdec336208a29f0a8fdea062439 parent e2e268665f6c01686b477a6b0cc5a70bab689d54 author Harald Welte Tue, 09 Aug 2005 20:26:55 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:28 -0700 [NETFILTER]: New iptables DCCP protocol header match Using this new iptables DCCP protocol header match, it is possible to create simplistic stateless packet filtering rules for DCCP. It permits matching of port numbers, packet type and options. Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e2e268665f6c01686b477a6b0cc5a70bab689d54 tree 1e0ea532c344e09c0747f488088bf7f85feed3ec parent 5a47a470e602eecb168ddd3b78841b84ceddd319 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:26:28 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:23 -0700 [DCCP]: Fix struct sockaddr_dccp definition Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5a47a470e602eecb168ddd3b78841b84ceddd319 tree 9b2408cd295189662f4909522a15d24101bf3fdc parent bb435b8d816582064ee0ddb1e2a6fbca67f34108 author Harald Welte Tue, 09 Aug 2005 20:26:03 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:18 -0700 [DCCP]: make include-able from userspace The protocol header files in are usually structured in a way to be included by userspace code. The top section consists of general protocol structure definitions, typedefs, enums - followed by an #ifdef __KERNEL__ section. Currently doesn't follow that convention and can therefore not be used from userspace. However, for example iptables' libipt_dccp.c actually needs various definitions from there. Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bb435b8d816582064ee0ddb1e2a6fbca67f34108 tree 48fb873d1f030a49747cc574636e80a3a9e99ac2 parent 2f80b3c8262d0d646812f776db024d88d569a0c1 author Stephen Hemmigner Tue, 09 Aug 2005 20:25:39 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:08 -0700 [IPV4]: fib_trie: Use const Use const where possible and get rid of EXTRACT() macro that was never used. Signed-off-by: Stephen Hemmigner Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 2f80b3c8262d0d646812f776db024d88d569a0c1 tree 75701c5c920eaaa51bb6a1d8cb5ab80379398a9b parent 91b9a277fc4d207249e459a455abf804ebb5499d author Robert Olsson Tue, 09 Aug 2005 20:25:06 -0700 committer David S. Miller Mon, 29 Aug 2005 15:54:00 -0700 [IPV4]: fib_trie: Use ERR_PTR to handle errno return Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 91b9a277fc4d207249e459a455abf804ebb5499d tree a9e150feeec7788e59a9585e935189325a32e043 parent 7663f18807805f02608457af8e2f59eee5d910fd author Olof Johansson Tue, 09 Aug 2005 20:24:39 -0700 committer David S. Miller Mon, 29 Aug 2005 15:53:52 -0700 [IPV4]: FIB Trie cleanups. Below is a patch that cleans up some of this, supposedly without changing any behaviour: * Whitespace cleanups * Introduce DBG() * BUG_ON() instead of if () { BUG(); } * Remove some of the deep nesting to make the code flow more comprehensible * Some mask operations were simplified Signed-off-by: Olof Johansson Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 7663f18807805f02608457af8e2f59eee5d910fd tree f485ca844f9b854ea53a92263d4cfb533849ee86 parent 8a61fadb3908454ccfa538aaa75eb1d22def5700 author Yasuyuki Kozakai Tue, 09 Aug 2005 20:24:15 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:28 -0700 [NETFILTER]: return ENOMEM when ip_conntrack_alloc() fails. This patch fixes the bug which doesn't return ERR_PTR(-ENOMEM) if it failed to allocate memory space from slab cache. This bug leads to erroneously not dropped packets under stress, and wrong statistic counters ('invalid' is incremented instead of 'drop'). It was introduced during the ctnetlink merge in the net-2.6.14 tree, so no stable or mainline releases affected. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 8a61fadb3908454ccfa538aaa75eb1d22def5700 tree e3e2b131c03b3cab2f81e6cdeeaadf50071046b9 parent d72367b6f36e557f122beefaa8c6b80eb1c7f245 author Harald Welte Tue, 09 Aug 2005 20:23:53 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:25 -0700 [NETFILTER]: check nf_log function call arguments Check whether pf is too large in order to prevent array overflow. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d72367b6f36e557f122beefaa8c6b80eb1c7f245 tree 650d0bdca48e7f3ea6bc356f6aa868f34c6a226f parent bbd86b9fc469b7e91dc7444e6abb8930811d79cb author Harald Welte Tue, 09 Aug 2005 20:23:36 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:21 -0700 [NETFILTER]: more verbose return codes from nf_{log,queue} This adds EEXIST to distinguish between the following return values: 0: nobody was registered, registration successful EEXIST: the exact same handler was already registered, no registration required EBUSY: somebody else is registered, registration unsuccessful. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bbd86b9fc469b7e91dc7444e6abb8930811d79cb tree 0d1133f5f499cab639784407f53938ba5060807f parent fbcd923c3e0c8ec9e4ed64f5a4e5766807b32729 author Harald Welte Tue, 09 Aug 2005 20:23:11 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:18 -0700 [NETFILTER]: add /proc/net/netfilter interface to nf_queue This patch adds a /proc/net/netfilter/nf_queue file, similar to the recently-added /proc/net/netfilter/nf_log. It indicates which queue handler is registered to which protocol family. This is useful since there are now multiple queue handlers in the treee (ip[6]_queue, nfnetlink_queue). Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit fbcd923c3e0c8ec9e4ed64f5a4e5766807b32729 tree 68aa12364efe574d3c8fa667ad088c8746843a5d parent f6ebe77f955d77a988ce726f0818ec0103b11323 author Harald Welte Tue, 09 Aug 2005 20:22:10 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:15 -0700 [NETFILTER]: add correct bridging support to nfnetlink_{queue,log} This patch adds support for passing the real 'physical' device ifindex down to userspace via nfnetlink_log and nfnetlink_queue. This feature basically obsoletes net/bridge/netfilter/ebt_ulog.c, and it is likely ebt_ulog.c will die with one of the next couple of patches. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f6ebe77f955d77a988ce726f0818ec0103b11323 tree 8fefa0e00c4214c3d8ba06c5122c5977b3a9391a parent 210a9ebef2d1bd32d9e9d81c84d538e237769cdb author Harald Welte Tue, 09 Aug 2005 20:21:49 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:11 -0700 [NETFILTER]: split net/core/netfilter.c into net/netfilter/*.c This patch doesn't introduce any code changes, but merely splits the core netfilter code into four separate files. It also moves it from it's old location in net/core/ to the recently-created net/netfilter/ directory. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 210a9ebef2d1bd32d9e9d81c84d538e237769cdb tree b4ad1d992f137020333090c0fae6c898ee77fe5b parent f682faefb8c6045468c4cf0fe435128352683c22 author Harald Welte Tue, 09 Aug 2005 20:20:54 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:08 -0700 [NETFILTER]: ip{6}_queue: prevent unregistration race with nfnetlink_queue Since nfnetlink_queue can override ip{6}_queue as queue handlers, we can no longer blindly unregister whoever is registered for PF_INET[6], but only unregister ourselves. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f682faefb8c6045468c4cf0fe435128352683c22 tree 87605b4608f5fbc28d7bbaedea4d07e1e7e89fce parent 91483c4b711549bff5e9069e25c4c1400b135198 author Harald Welte Tue, 09 Aug 2005 20:20:34 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:04 -0700 [NETFILTER]: fix autoloading of nfnetlink_log This patch adds the MODULE_ALIAS required for netnlink autoloading of nfnetlink_log. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 91483c4b711549bff5e9069e25c4c1400b135198 tree 8b9941f4ebd6fa745ff33e78023f4c79e1cf43fe parent 2669d63d20683828f673b606915957f3a070602d author Andrew Morton Tue, 09 Aug 2005 20:20:07 -0700 committer David S. Miller Mon, 29 Aug 2005 15:51:01 -0700 [SUNRPC]: svcsock.c needs linux/tcp.h Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2669d63d20683828f673b606915957f3a070602d tree 7e8ab15a956035e63b22237ffdd6d0101b391589 parent bb97d31f5130d677644d9931ef38613d1164ec94 author Harald Welte Tue, 09 Aug 2005 20:19:44 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:57 -0700 [NETFILTER]: move conntrack helper buffers from BSS to kmalloc()ed memory According to DaveM, it is preferrable to have large data structures be allocated dynamically from the module init() function rather than putting them as static global variables into BSS. This patch moves the conntrack helper packet buffers into dynamically allocated memory. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bb97d31f5130d677644d9931ef38613d1164ec94 tree 879827671531cf7b1a4aaeb8958009294e01ba04 parent 087fe256f0aef8d16b19a30c6fb10b899bf1a701 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:19:14 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:54 -0700 [INET]: Make inet_create try to load protocol modules Syntax is net-pf-PROTOCOL_FAMILY-PROTOCOL-SOCK_TYPE and if this fails net-pf-PROTOCOL_FAMILY-PROTOCOL. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 087fe256f0aef8d16b19a30c6fb10b899bf1a701 tree 64e88bc4cb0984f225ef7830aef566f5ba0d203e parent 15f5a585c6b8dac31ed0a55693aacf51934f0f5d author Michael Chan Tue, 09 Aug 2005 20:17:41 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:49 -0700 [TG3]: Fix bug in setting a tg3_flag Found a bug while reviewing the patches the second time. The TG3_FLAG_TXD_MBOX_HWBUG flag is set after the register access methods have been determined. This patch fixes it by moving it up before the various access methods are assigned. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 15f5a585c6b8dac31ed0a55693aacf51934f0f5d tree 3c24f5536451b44d53e58373f9d4718ae25ca094 parent 6892914fb7980d844f2bac859f4095df9ebd18da author Michael Chan Tue, 09 Aug 2005 20:17:28 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:45 -0700 [TG3]: Eliminate one register write in tg3_restart_ints() The register write to register 0x68 to restart interrupts is unnecessary as the interrupt wasn't masked in that register by the irq handler. This will save one register write in the fast path. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6892914fb7980d844f2bac859f4095df9ebd18da tree ddeb1904b798bb69ed248840f25477bf8891d250 parent 09ee929cccfd0b56ea3724b3c6299fbbe813df43 author Michael Chan Tue, 09 Aug 2005 20:17:14 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:42 -0700 [TG3]: Add indirect register method for 5703 behind ICH This patch adds the new workaround for 5703 A1/A2 if it is behind certain ICH bridges. The workaround disables memory and uses config. cycles only to access all registers. The 5702/03 chips can mistakenly decode the special cycles from the ICH chipsets as memory write cycles, causing corruption of register and memory space. Only certain ICH bridges will drive special cycles with non-zero data during the address phase which can fall within the 5703's address range. This is not an ICH bug as the PCI spec allows non-zero address during special cycles. However, only these ICH bridges are known to drive non-zero addresses during special cycles. The indirect_lock is also changed to spin_lock_irqsave from spin_lock_bh because it is used in irq handler when using the indirect method to disable interrupts. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 09ee929cccfd0b56ea3724b3c6299fbbe813df43 tree 52d0002518d41a6eea12859f9134c17d2af6c473 parent 1ee582d8e49a1c9dd43b2599f1cd26507182a8d4 author Michael Chan Tue, 09 Aug 2005 20:17:00 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:38 -0700 [TG3]: Add mailbox read method This patch adds the mailbox read method and also adds an inline function tw32_mailbox_f() for mailbox writes that require read flush. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 329058028523a5b36de449f130111b7671a4f269 tree 7a0860f7b349d26118eac385af4c50b6d038297a parent bcdd3a911499abd65bf1f123b2a6ad9c1d5611ea parent 1b66776da71e33dff5edcc0b096ec3b7c40c75ad author Tony Luck Mon, 29 Aug 2005 15:50:32 -0700 committer Tony Luck Mon, 29 Aug 2005 15:50:32 -0700 Pull rationalise-regions into release branch commit 1ee582d8e49a1c9dd43b2599f1cd26507182a8d4 tree 335928fc4470391ff894616e53a186200682c072 parent 2009493065e01b1fe27c1b98ffbcfab98e185f72 author Michael Chan Tue, 09 Aug 2005 20:16:46 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:15 -0700 [TG3]: Add various register methods This patch adds various dedicated register read/write methods for the existing workarounds, including PCIX target workaround, write with read flush, etc. The chips that require these workarounds will use these dedicated access functions. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2009493065e01b1fe27c1b98ffbcfab98e185f72 tree 8a8981461a4f84a007f4725a027f3185055737ea parent 757f612e091e7d13707eedc3ff71f1a9b53f5537 author Michael Chan Tue, 09 Aug 2005 20:16:32 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:12 -0700 [TG3]: Add basic register access function pointers This patch adds the basic function pointers to do register accesses in the fast path. This was suggested by David Miller. The idea is that various register access methods for different hardware errata can easily be implemented with these function pointers and performance will not be degraded on chips that use normal register access methods. The various register read write macros (e.g. tw32, tr32, tw32_mailbox) are redefined to call the function pointers. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 757f612e091e7d13707eedc3ff71f1a9b53f5537 tree 9ee923abbafb48b5f3220b817c84ba206914ab1c parent 74459dc7bacda04d14626d239c8f5c4dac22560d author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:16:04 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:08 -0700 [CCID3]: Reenable list_for_each_entry_safe_continue usage Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 74459dc7bacda04d14626d239c8f5c4dac22560d tree 7e24efa82b69765490c778ed5a7068b3b7613344 parent 95b81ef794278c835b321f6376b0522cd5df59b7 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:15:51 -0700 committer David S. Miller Mon, 29 Aug 2005 15:50:04 -0700 [LIST]: Introduce list_for_each_entry_safe_continue Used in the dccp CCID3 code, that is going to be submitted RSN. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 95b81ef794278c835b321f6376b0522cd5df59b7 tree c2163130b2a2e1bc8ced9ee70b4c87fcbe7cdf8e parent a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3 author Yoshifumi Nishida Tue, 09 Aug 2005 20:15:35 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:55 -0700 [DCCP]: Fix checksum routines Signed-off-by: Yoshifumi Nishida Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3 tree f82f0523c313228d64998fac30790edcfd0785c3 parent 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:15:09 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:50 -0700 [ICSK]: Move generalised functions from tcp to inet_connection_sock This also improves reqsk_queue_prune and renames it to inet_csk_reqsk_queue_prune, as it deals with both inet_connection_sock and inet_request_sock objects, not just with request_sock ones thus belonging to inet_request_sock. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c tree 3cb2732870c9cf8f976cb6fa57e0223f1c648e2a parent c4365c9235f80128c3c3d5993074173941b1c1f0 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:14:34 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:46 -0700 [DCCP]: Initial implementation Development to this point was done on a subversion repository at: http://oops.ghostprotocols.net:81/cgi-bin/viewcvs.cgi/dccp-2.6/ This repository will be kept at this site for the foreseable future, so that interested parties can see the history of this code, attributions, etc. If I ever decide to take this offline I'll provide the full history at some other suitable place. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c4365c9235f80128c3c3d5993074173941b1c1f0 tree f507b8360bab9f4c86050d75bb7372aa28ce890e parent d8c97a9451068dd9f7b838a240bb6db894133a5e author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:12:30 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:40 -0700 [RANDOM]: Introduce secure_dccp_sequence_number Code contributed by Stephen Hemminger. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d8c97a9451068dd9f7b838a240bb6db894133a5e tree 76d087cbfe404755a385eef131f7063b48525695 parent 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:12:12 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:35 -0700 [NET]: Export symbols needed by the current DCCP code Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 tree 509c113d2622a28836303590ba1a40cecea59d3b parent 0a5578cf8e5e045aaa68643c17ce885426697c6b author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:11:56 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:29 -0700 [ICSK]: Introduce reqsk_queue_prune from code in tcp_synack_timer With this we're very close to getting all of the current TCP refactorings in my dccp-2.6 tree merged, next changeset will export some functions needed by the current DCCP code and then dccp-2.6.git will be born! Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0a5578cf8e5e045aaa68643c17ce885426697c6b tree 1c58ba5c3236499ec5abeedcc43faa7bed816b07 parent 9f1d2604c71498579609b1532fedc5a89276bb00 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:11:41 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:24 -0700 [ICSK]: Generalise tcp_listen_{start,stop} This also moved inet_iif from tcp to inet_hashtables.h, as it is needed by the inet_lookup callers, perhaps this needs a bit of polishing, but for now seems fine. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 9f1d2604c71498579609b1532fedc5a89276bb00 tree b87d6b9a610f015889b0b1f91b8669adfb600763 parent 3f421baa4720b708022f8bcc52a61e5cd6f10bf8 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:11:24 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:20 -0700 [ICSK]: Introduce inet_csk_clone Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 3f421baa4720b708022f8bcc52a61e5cd6f10bf8 tree e4201b1e2356cea8b7bd8d68dfba06e84002a77d parent 463c84b97f24010a67cd871746d6a7e4c925a5f9 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:11:08 -0700 committer David S. Miller Mon, 29 Aug 2005 15:49:14 -0700 [NET]: Just move the inet_connection_sock function from tcp sources Completing the previous changeset, this also generalises tcp_v4_synq_add, renaming it to inet_csk_reqsk_queue_hash_add, already geing used in the DCCP tree, which I plan to merge RSN. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bcdd3a911499abd65bf1f123b2a6ad9c1d5611ea tree a72709cf2686dbfb390f4e8d43be221058562b19 parent b946ecbb11145ae2f375d2d7289a6e7280462b02 parent d1e079b3fc90c7c114f46771e983a72ac8740882 author Tony Luck Mon, 29 Aug 2005 15:48:51 -0700 committer Tony Luck Mon, 29 Aug 2005 15:48:51 -0700 Pull ngam-maule-steiner into release branch commit b946ecbb11145ae2f375d2d7289a6e7280462b02 tree 9a3102c429d4918a6506770e307bb6f725485384 parent 7115c13bd6d166982212276610b27773b8c27aec parent f8220c7f15c54aefb4976ad7c6e2aa98b27a8ce8 author Tony Luck Mon, 29 Aug 2005 15:48:23 -0700 committer Tony Luck Mon, 29 Aug 2005 15:48:23 -0700 Pull pending-2.6.14 into release branch commit 463c84b97f24010a67cd871746d6a7e4c925a5f9 tree 48df67ede4ebb5d12b3c0ae55d72531574bd51a6 parent 87d11ceb9deb7a3f13fdee6e89d9bb6be7d27a71 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:10:42 -0700 committer David S. Miller Mon, 29 Aug 2005 15:43:19 -0700 [NET]: Introduce inet_connection_sock This creates struct inet_connection_sock, moving members out of struct tcp_sock that are shareable with other INET connection oriented protocols, such as DCCP, that in my private tree already uses most of these members. The functions that operate on these members were renamed, using a inet_csk_ prefix while not being moved yet to a new file, so as to ease the review of these changes. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 87d11ceb9deb7a3f13fdee6e89d9bb6be7d27a71 tree 3b5f6f15a76e6d58e5088cad707859390757181a parent c676270bcd25015b978722ec0352c330dcc87883 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:10:12 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:36 -0700 [SOCK]: Introduce sk_clone Out of tcp_create_openreq_child, will be used in dccp_create_openreq_child, and is a nice sock function anyway. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c676270bcd25015b978722ec0352c330dcc87883 tree 098cc52c71d68465e7ee5fbae462d58126b68885 parent e48c414ee61f4ac8d5cff2973e66a7cbc8a93aa5 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:09:59 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:26 -0700 [INET_TWSK]: Introduce inet_twsk_alloc With the parts of tcp_time_wait that are not TCP specific, tcp_time_wait uses it and so will dccp_time_wait. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e48c414ee61f4ac8d5cff2973e66a7cbc8a93aa5 tree c4656efe48b75adf5742514c3e4286007f20bdca parent 8feaf0c0a5488b3d898a9c207eb6678f44ba3f26 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:09:46 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:18 -0700 [INET]: Generalise the TCP sock ID lookup routines And also some TIME_WAIT functions. [acme@toy net-2.6.14]$ grep built-in /tmp/before.size /tmp/after.size /tmp/before.size: 282955 13122 9312 305389 4a8ed net/ipv4/built-in.o /tmp/after.size: 281566 13122 9312 304000 4a380 net/ipv4/built-in.o [acme@toy net-2.6.14]$ I kept them still inlined, will uninline at some point to see what would be the performance difference. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8feaf0c0a5488b3d898a9c207eb6678f44ba3f26 tree ddd004afe2f7c8295f6fdb94d34f78a42b5961cb parent 33b62231908c58ae04185e4f1063d1e35a7c8576 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:09:30 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:13 -0700 [INET]: Generalise tcp_tw_bucket, aka TIME_WAIT sockets This paves the way to generalise the rest of the sock ID lookup routines and saves some bytes in TCPv4 TIME_WAIT sockets on distro kernels (where IPv6 is always built as a module): [root@qemu ~]# grep tw_sock /proc/slabinfo tw_sock_TCPv6 0 0 128 31 1 tw_sock_TCP 0 0 96 41 1 [root@qemu ~]# Now if a protocol wants to use the TIME_WAIT generic infrastructure it only has to set the sk_prot->twsk_obj_size field with the size of its inet_timewait_sock derived sock and proto_register will create sk_prot->twsk_slab, for now its only for INET sockets, but we can introduce timewait_sock later if some non INET transport protocolo wants to use this stuff. Next changesets will take advantage of this new infrastructure to generalise even more TCP code. [acme@toy net-2.6.14]$ grep built-in /tmp/before.size /tmp/after.size /tmp/before.size: 188646 11764 5068 205478 322a6 net/ipv4/built-in.o /tmp/after.size: 188144 11764 5068 204976 320b0 net/ipv4/built-in.o [acme@toy net-2.6.14]$ Tested with both IPv4 & IPv6 (::1 (localhost) & ::ffff:172.20.0.1 (qemu host)). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 33b62231908c58ae04185e4f1063d1e35a7c8576 tree 502ba8c1c445d0b0f4c19d1aa3b86b01ea88478d parent 81849d106b1fb97f8e2d311c0c4d36347def55b8 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:09:06 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:08 -0700 [INET]: Generalise tcp_v4_lookup_listener [acme@toy net-2.6.14]$ grep built-in /tmp/before /tmp/after /tmp/before: 282560 13122 9312 304994 4a762 net/ipv4/built-in.o /tmp/after: 282560 13122 9312 304994 4a762 net/ipv4/built-in.o Will be used in DCCP, not exporting it right now not to get in Adrian Bunk's exported-but-not-used-on-modules radar 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 81849d106b1fb97f8e2d311c0c4d36347def55b8 tree ba1188f1b38f5b608756d94395c919ab5f7b8b3c parent c752f0739f09b803aed191c4765a3b6650a08653 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:08:50 -0700 committer David S. Miller Mon, 29 Aug 2005 15:42:02 -0700 [INET]: Generalise tcp_v4_hash & tcp_unhash It really just makes the existing code be a helper function that tcp_v4_hash and tcp_unhash uses, specifying the right inet_hashinfo, tcp_hashinfo. One thing I'll investigate at some point is to have the inet_hashinfo pointer in sk_prot, so that we get all the hashtable information from the sk pointer, this can lead to some extra indirections that may well hurt performance/code size, we'll see. Ultimate idea would be that sk_prot would provide _all_ the information about a protocol implementation. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c752f0739f09b803aed191c4765a3b6650a08653 tree 33dcc7acf66ec51952b76276c758e38811f4f708 parent f3f05f7046e7c85b04af390d95a82a27160dd5d0 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:08:28 -0700 committer David S. Miller Mon, 29 Aug 2005 15:41:54 -0700 [TCP]: Move the tcp sock states to net/tcp_states.h Lots of places just needs the states, not even linux/tcp.h, where this enum was, needs it. This speeds up development of the refactorings as less sources are rebuilt when things get moved from net/tcp.h. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit f3f05f7046e7c85b04af390d95a82a27160dd5d0 tree 9a4a552c030ea8b2428ceee75311d73a6b339255 parent 6e04e02165a7209a71db553b7bc48d68421e5ebf author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:08:09 -0700 committer David S. Miller Mon, 29 Aug 2005 15:41:49 -0700 [INET]: Generalise the tcp_listen_ lock routines Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6e04e02165a7209a71db553b7bc48d68421e5ebf tree 004157924013e6c099cacac59f39d3dd61f3e0e5 parent 2d8c4ce51903636ce0f60addc8134aa50ab8fa76 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:07:35 -0700 committer David S. Miller Mon, 29 Aug 2005 15:41:44 -0700 [INET]: Move tcp_port_rover to inet_hashinfo Also expose all of the tcp_hashinfo members, i.e. killing those tcp_ehash, etc macros, this will more clearly expose already generic functions and some that need just a bit of work to become generic, as we'll see in the upcoming changesets. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2d8c4ce51903636ce0f60addc8134aa50ab8fa76 tree 1ea4d4faf831b832489b30b13d8910777020feed parent ff21d5774b4a186c98be6398eacde75d896db804 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:07:13 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:29 -0700 [INET]: Generalise tcp_bind_hash & tcp_inherit_port This required moving tcp_bucket_cachep to inet_hashinfo. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ff21d5774b4a186c98be6398eacde75d896db804 tree f2b1da2cec09742fd9b5e90479e2ebb2068ea1e8 parent 28b19d99ac6d92e4fb2fe34144c495019a638a64 author Pablo Neira Ayuso Tue, 09 Aug 2005 20:06:42 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:25 -0700 [NETFILTER]: fix list traversal order in ctnetlink Currently conntracks are inserted after the head. That means that conntracks are sorted from the biggest to the smallest id. This happens because we use list_prepend (list_add) instead list_add_tail. This can result in problems during the list iteration. list_for_each(i, &ip_conntrack_hash[cb->args[0]]) { h = (struct ip_conntrack_tuple_hash *) i; if (DIRECTION(h) != IP_CT_DIR_ORIGINAL) continue; ct = tuplehash_to_ctrack(h); if (ct->id <= *id) continue; In that case just the first conntrack in the bucket will be dumped. To fix this, we iterate the list from the tail to the head via list_for_each_prev. Same thing for the list of expectations. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 28b19d99ac6d92e4fb2fe34144c495019a638a64 tree 368bde8bbf20f61b72d0b9d3433c2ade0815207f parent 37012f7fd326eb3c959428a4fe7e203e6304fe43 author Pablo Neira Ayuso Tue, 09 Aug 2005 20:06:27 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:21 -0700 [NETFILTER]: Fix typo in ctnl_exp_cb array (no bug, just memory waste) This fixes the size of the ctnl_exp_cb array that is IPCTNL_MSG_EXP_MAX instead of IPCTNL_MSG_MAX. Simple typo. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 37012f7fd326eb3c959428a4fe7e203e6304fe43 tree 018066c05be0924990ed9a79ccef0ab553f6b710 parent 14a50bbaa51202b676a95e9b41bc5ed6c77aa9cc author Pablo Neira Ayuso Tue, 09 Aug 2005 20:06:11 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:17 -0700 [NETFILTER]: fix conntrack refcount leak in unlink_expect() In unlink_expect(), the expectation is removed from the list so the refcount must be dropped as well. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 14a50bbaa51202b676a95e9b41bc5ed6c77aa9cc tree 1f480a6f147ace8c4fbaad5e94bca88152bba30d parent 1444fc559b01aa5d4fedf4ee4f306a9e9cd56f95 author Pablo Neira Ayuso Tue, 09 Aug 2005 20:05:52 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:13 -0700 [NETFILTER]: ctnetlink: make sure event order is correct The following sequence is displayed during events dumping of an ICMP connection: [NEW] [DESTROY] [UPDATE] This happens because the event IPCT_DESTROY is delivered in death_by_timeout(), that is called from the icmp protocol helper (ct->timeout.function) once we see the reply. To fix this, we move this event to destroy_conntrack(). Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1444fc559b01aa5d4fedf4ee4f306a9e9cd56f95 tree 03ce8666d82f7c41e2a7410b889fd6b5a4a60c5a parent a42827b71b87fc9816d2f58626e825b0eb500efe author Harald Welte Tue, 09 Aug 2005 20:04:07 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:09 -0700 [NETFILTER]: don't use nested attributes for conntrack_expect We used to use nested nfattr structures for ip_conntrack_expect. This is bogus, since ip_conntrack and ip_conntrack_expect are communicated in different netlink message types. both should be encoded at the top level attributes, no extra nesting required. This patch addresses the issue. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a42827b71b87fc9816d2f58626e825b0eb500efe tree 9f90bd210ca9d0d57bbdcd54beca2bc39c23c05d parent 927ccbcc28dceee29dad876982768cca29738564 author Harald Welte Tue, 09 Aug 2005 20:03:54 -0700 committer David S. Miller Mon, 29 Aug 2005 15:40:06 -0700 [NETFILTER]: cleanup nfnetlink_check_attributes() 1) memset return parameter 'cda' (nfattr pointer array) only on success 2) a message without attributes and just a 'struct nfgenmsg' is valid, don't return -EINVAL 3) use likely() and unlikely() where apropriate Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 927ccbcc28dceee29dad876982768cca29738564 tree a5bc50c92c1627e373e3cf9efbaec5c1d3f1b2b7 parent bd9a26b7f2ee7567571bb5b7acc1a256c544a0dd author Harald Welte Tue, 09 Aug 2005 20:03:40 -0700 committer David S. Miller Mon, 29 Aug 2005 15:39:14 -0700 [NETFILTER]: attribute count is an attribute of message type, not subsytem Prior to this patch, every nfnetlink subsystem had to specify it's attribute count. However, in reality the attribute count depends on the message type within the subsystem, not the subsystem itself. This patch moves 'attr_count' from 'struct nfnetlink_subsys' into nfnl_callback to fix this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bd9a26b7f2ee7567571bb5b7acc1a256c544a0dd tree fd17d11fbbedf67f6e5edde8ce76d18a3f6230f2 parent 88aa0429048d08c18f2772782588f953bbbd79be author Harald Welte Tue, 09 Aug 2005 20:03:22 -0700 committer David S. Miller Mon, 29 Aug 2005 15:39:10 -0700 [NETFILTER]: fix ctnetlink 'create_expect' parsing There was a stupid copy+paste mistake where we parse the MASK nfattr into the "tuple" variable instead of the "mask" variable. This patch fixes it. Thanks to Pablo Neira. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 88aa0429048d08c18f2772782588f953bbbd79be tree b8f6cebd9e682882394b92e7e737436b3648e1d7 parent 94cd2b67641e7ddc2e6ed71d76e00116957423db author Pablo Neira Tue, 09 Aug 2005 20:02:55 -0700 committer David S. Miller Mon, 29 Aug 2005 15:39:05 -0700 [NETFILTER]: conntrack_netlink: Fix locking during conntrack_create The current codepath allowed for ip_conntrack_lock to be unlock'ed twice. Signed-off-by: Pablo Neira Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 94cd2b67641e7ddc2e6ed71d76e00116957423db tree 4741237af1e0106a8b164f89c02f158247f1ebc1 parent a86888b925299330053d20e0eba03ac4d2648c4b author Pablo Neira Tue, 09 Aug 2005 20:02:36 -0700 committer David S. Miller Mon, 29 Aug 2005 15:39:00 -0700 [NETFILTER]: remove bogus memset() calls from ip_conntrack_netlink.c nfattr_parse_nested() calls nfattr_parse() which in turn does a memset on the 'tb' array. All callers therefore don't need to memset before calling it. Signed-off-by: Pablo Neira Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a86888b925299330053d20e0eba03ac4d2648c4b tree 27c2d22d98a9eed22749df1a8d32f72e1b5a2468 parent a55ebcc4c4532107ad9eee1c9bb698ab5f12c00f author Patrick McHardy Tue, 09 Aug 2005 20:02:13 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:54 -0700 [NETFILTER]: Fix multiple problems with the conntrack event cache refcnt underflow: the reference count is decremented when a conntrack entry is removed from the hash but it is not incremented when entering new entries. missing protection of process context against softirq context: all cache operations need to locally disable softirqs to avoid races. Additionally the event cache can't be initialized when a packet enteres the conntrack code but needs to be initialized whenever we cache an event and the stored conntrack entry doesn't match the current one. incorrect flushing of the event cache in ip_ct_iterate_cleanup: without real locking we can't flush the cache for different CPUs without incurring races. The cache for different CPUs can only be flushed when no packets are going through the code. ip_ct_iterate_cleanup doesn't need to drop all references, so flushing is moved to the cleanup path. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a55ebcc4c4532107ad9eee1c9bb698ab5f12c00f tree 964be5918610e6f89cc7f2fee48418979b48773b parent 77d8bf9c6208eb535f05718168ffcc476be0ca8c author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:01:14 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:48 -0700 [INET]: Move bind_hash from tcp_sk to inet_sk This should really be in a inet_connection_sock, but I'm leaving it for a later optimization, when some more fields common to INET transport protocols now in tcp_sk or inet_sk will be chunked out into inet_connection_sock, for now its better to concentrate on getting the changes in the core merged to leave the DCCP tree with only DCCP specific code. Next changesets will take advantage of this move to generalise things like tcp_bind_hash, tcp_put_port, tcp_inherit_port, making the later receive a inet_hashinfo parameter, and even __tcp_tw_hashdance, etc in the future, when tcp_tw_bucket gets transformed into the struct timewait_sock hierarchy. tcp_destroy_sock also is eligible as soon as tcp_orphan_count gets moved to sk_prot. A cascade of incremental changes will ultimately make the tcp_lookup functions be fully generic. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 77d8bf9c6208eb535f05718168ffcc476be0ca8c tree 255d84f4f222161235d54f82793667cccc509229 parent 0f7ff9274e72fd254fbd1ab117bbc1db6e7cdb34 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 20:00:51 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:39 -0700 [INET]: Move the TCP hashtable functions/structs to inet_hashtables.[ch] Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0f7ff9274e72fd254fbd1ab117bbc1db6e7cdb34 tree 95736729a2f5302666604c4287a2af97ececd734 parent 304a16180fb6d2b153b45f6fbbcec1fa814496e5 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:59:44 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:32 -0700 [INET]: Just rename the TCP hashtable functions/structs to inet_ This is to break down the complexity of the series of patches, making it very clear that this one just does: 1. renames tcp_ prefixed hashtable functions and data structures that were already mostly generic to inet_ to share it with DCCP and other INET transport protocols. 2. Removes not used functions (__tb_head & tb_head) 3. Removes some leftover prototypes in the headers (tcp_bucket_unlock & tcp_v4_build_header) Next changesets will move tcp_sk(sk)->bind_hash to inet_sock so that we can make functions such as tcp_inherit_port, __tcp_inherit_port, tcp_v4_get_port, __tcp_put_port, generic and get others like tcp_destroy_sock closer to generic (tcp_orphan_count will go to sk->sk_prot to allow this). Eventually most of these functions will be used passing the transport protocol inet_hashinfo structure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 304a16180fb6d2b153b45f6fbbcec1fa814496e5 tree 3cf82b06fcf12480a49d89ead016cb60e50c36b3 parent 0597f2680d666a3bcf101ac0c771ba7e50016bbd author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:59:20 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:22 -0700 [INET]: Move the TCP ehash functions to include/net/inet_hashtables.h To be shared with DCCP (and others), this is the start of a series of patches that will expose the already generic TCP hash table routines. The few changes noticed when calling gcc -S before/after on a pentium4 were of this type: movl 40(%esp), %edx cmpl %esi, 472(%edx) je .L168 - pushl $291 + pushl $272 pushl $.LC0 pushl $.LC1 pushl $.LC2 [acme@toy net-2.6.14]$ size net/ipv4/tcp_ipv4.before.o net/ipv4/tcp_ipv4.after.o text data bss dec hex filename 17804 516 140 18460 481c net/ipv4/tcp_ipv4.before.o 17804 516 140 18460 481c net/ipv4/tcp_ipv4.after.o Holler if some weird architecture has issues with things like this 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0597f2680d666a3bcf101ac0c771ba7e50016bbd tree ce43bf3284ce162ccb34d4ee5a9981089df5bce0 parent 608c8e4f7b6e61cc783283e9dff8a465a5ad59bb author Harald Welte Tue, 09 Aug 2005 19:58:39 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:12 -0700 [NETFILTER]: Add new "nfnetlink_log" userspace packet logging facility This is a generic (layer3 independent) version of what ipt_ULOG is already doing for IPv4 today. ipt_ULOG, ebt_ulog and finally also ip[6]t_LOG will be deprecated by this mechanism in the long term. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 608c8e4f7b6e61cc783283e9dff8a465a5ad59bb tree 55ca8bed99789cd6af07f6cc6ee99b0cf718a611 parent 838ab6364956d9bdcefe84712de1621cf20a40b3 author Harald Welte Tue, 09 Aug 2005 19:58:27 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:07 -0700 [NETFILTER]: Extend netfilter logging API This patch is in preparation to nfnetlink_log: - loggers now have to register struct nf_logger instead of nf_logfn - nf_log_unregister() replaced by nf_log_unregister_pf() and nf_log_unregister_logger() - add comment to ip[6]t_LOG.h to assure nobody redefines flags - add /proc/net/netfilter/nf_log to tell user which logger is currently registered for which address family - if user has configured logging, but no logging backend (logger) is available, always spit a message to syslog, not just the first time. - split ip[6]t_LOG.c into two parts: Backend: Always try to register as logger for the respective address family Frontend: Always log via nf_log_packet() API - modify all users of nf_log_packet() to accomodate additional argument Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 838ab6364956d9bdcefe84712de1621cf20a40b3 tree 15f07f237723f682969fd63330097cef366e2aeb parent 32519f11d38ea8f4f60896763bacec7db1760f9c author Harald Welte Tue, 09 Aug 2005 19:50:45 -0700 committer David S. Miller Mon, 29 Aug 2005 15:38:01 -0700 [NETFILTER]: Add refcounting and /proc/net/netfilter interface to nfnetlink_queue Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 32519f11d38ea8f4f60896763bacec7db1760f9c tree 9e3fe09e4f7468f119350d80a6ecb8d871a86dd0 parent 6cbb0df788b90777a7ed0f9d8261260353f48076 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:50:02 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:55 -0700 [INET]: Introduce inet_sk_rebuild_header From tcp_v4_rebuild_header, that already was pretty generic, I only needed to use sk->sk_protocol instead of the hardcoded IPPROTO_TCP and establish the requirement that INET transport layer protocols that want to use this function map TCP_SYN_SENT to its equivalent state. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6cbb0df788b90777a7ed0f9d8261260353f48076 tree 152b75c0279b8f612412f24a5ab35ab6d5a208d8 parent 614c6cb4f225a7da9f13e5dd0fac3b531078eb9f author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:49:02 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:48 -0700 [SOCK]: Introduce sk_setup_caps From tcp_v4_setup_caps, that always is preceded by a call to __sk_dst_set, so coalesce this sequence into sk_setup_caps, removing one call to a TCP function in the IP layer. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 614c6cb4f225a7da9f13e5dd0fac3b531078eb9f tree 2fd96c3476681cf76647592d4f162004b8c7416e parent e6848976b721eeb5551cd94673faafeef78d9f35 author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:47:37 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:42 -0700 [SOCK]: Rename __tcp_v4_rehash to __sk_prot_rehash This operation was already generic and DCCP will use it. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e6848976b721eeb5551cd94673faafeef78d9f35 tree 6c78b0eb52614ff6386b603ca64091b5aefaa418 parent d13964f4490157b8a290903362bfbc54f750a6bc author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:45:38 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:29 -0700 [NET]: Cleanup INET_REFCNT_DEBUG code Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d13964f4490157b8a290903362bfbc54f750a6bc tree 377297846b513224a30185fb279afd6640e361f5 parent 0bd1b59b15e4057101c89d4db15a3683c0d897f7 author Patrick McHardy Tue, 09 Aug 2005 19:45:02 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:22 -0700 [IPV4/6]: Check if packet was actually delivered to a raw socket to decide whether to send an ICMP unreachable Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0bd1b59b15e4057101c89d4db15a3683c0d897f7 tree 1912652fdf55f1bcc703ae9a3dcb93036dcfca67 parent 7af4cc3fa158ff1dda6e7451c7e6afa6b0bb85cb author Andrew McDonald Tue, 09 Aug 2005 19:44:42 -0700 committer David S. Miller Mon, 29 Aug 2005 15:37:06 -0700 [IPV6]: Check interface bindings on IPv6 raw socket reception Take account of whether a socket is bound to a particular device when selecting an IPv6 raw socket to receive a packet. Also perform this check when receiving IPv6 packets with router alert options. Signed-off-by: Andrew McDonald Signed-off-by: David S. Miller commit 7af4cc3fa158ff1dda6e7451c7e6afa6b0bb85cb tree 752acd1f26063b23e5629124ee0a33078d2fb9a1 parent 0ab43f84995f2c2fcc5cc58a9accaa1095e1317f author Harald Welte Tue, 09 Aug 2005 19:44:15 -0700 committer David S. Miller Mon, 29 Aug 2005 15:36:56 -0700 [NETFILTER]: Add "nfnetlink_queue" netfilter queue handler over nfnetlink - Add new nfnetlink_queue module - Add new ipt_NFQUEUE and ip6t_NFQUEUE modules to access queue numbers 1-65535 - Mark ip_queue and ip6_queue Kconfig options as OBSOLETE - Update feature-removal-schedule to remove ip[6]_queue in December Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ab43f84995f2c2fcc5cc58a9accaa1095e1317f tree f58711648f91bbd880fcada7718a2462f0249a78 parent 2cc7d5730957c4a3f3659d17d2ba5e06d5581c1f author Harald Welte Tue, 09 Aug 2005 19:43:44 -0700 committer David S. Miller Mon, 29 Aug 2005 15:36:49 -0700 [NETFILTER]: Core changes required by upcoming nfnetlink_queue code - split netfiler verdict in 16bit verdict and 16bit queue number - add 'queuenum' argument to nf_queue_outfn_t and its users ip[6]_queue - move NFNL_SUBSYS_ definitions from enum to #define - introduce autoloading for nfnetlink subsystem modules - add MODULE_ALIAS_NFNL_SUBSYS macro - add nf_unregister_queue_handlers() to register all handlers for a given nf_queue_outfn_t - add more verbose DEBUGP macro definition to nfnetlink.c - make nfnetlink_subsys_register fail if subsys already exists - add some more comments and debug statements to nfnetlink.c Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2cc7d5730957c4a3f3659d17d2ba5e06d5581c1f tree c2c3d03d8120831d487bb8fcc73e5dcbe13aebea parent 4fdb3bb723db469717c6d38fda667d8b0fa86ebd author Harald Welte Tue, 09 Aug 2005 19:42:34 -0700 committer David S. Miller Mon, 29 Aug 2005 15:36:19 -0700 [NETFILTER]: Move reroute-after-queue code up to the nf_queue layer. The rerouting functionality is required by the core, therefore it has to be implemented by the core and not in individual queue handlers. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 4fdb3bb723db469717c6d38fda667d8b0fa86ebd tree 43d82e717922e6319cf8a8f9dc5ee902c651b491 parent 020b4c12dbe3868d792a01d7c1470cd837abe10f author Harald Welte Tue, 09 Aug 2005 19:40:55 -0700 committer David S. Miller Mon, 29 Aug 2005 15:35:08 -0700 [NETLINK]: Add properly module refcounting for kernel netlink sockets. - Remove bogus code for compiling netlink as module - Add module refcounting support for modules implementing a netlink protocol - Add support for autoloading modules that implement a netlink protocol as soon as someone opens a socket for that protocol Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 020b4c12dbe3868d792a01d7c1470cd837abe10f tree 4c5963a206f67eda6f8ff74ac33f7ed7e4acc164 parent 089af26c706d1473f641c909fee7c878d29c1f1a author Harald Welte Tue, 09 Aug 2005 19:39:00 -0700 committer David S. Miller Mon, 29 Aug 2005 15:35:01 -0700 [NETFILTER]: Move ipv4 specific code from net/core/netfilter.c to net/ipv4/netfilter.c Netfilter cleanup - Move ipv4 code from net/core/netfilter.c to net/ipv4/netfilter.c - Move ipv6 netfilter code from net/ipv6/ip6_output.c to net/ipv6/netfilter.c Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 089af26c706d1473f641c909fee7c878d29c1f1a tree 6dd04c64ad16c998eaf8850ee8e520da2c5cb7d4 parent 373ac73595491b7c1f2f10cb37e9b7bae6901227 author Harald Welte Tue, 09 Aug 2005 19:37:23 -0700 committer David S. Miller Mon, 29 Aug 2005 15:34:40 -0700 [NETFILTER]: Rename skb_ip_make_writable() to skb_make_writable() There is nothing IPv4-specific in it. In fact, it was already used by IPv6, too... Upcoming nfnetlink_queue code will use it for any kind of packet. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 373ac73595491b7c1f2f10cb37e9b7bae6901227 tree f5b3cb508fd9b2c63aa2c24d3dafc37c2c18941f parent 86e65da9c1fc6fb421b9f796b597b3eced6b55ab author Patrick McHardy Tue, 09 Aug 2005 19:36:53 -0700 committer David S. Miller Mon, 29 Aug 2005 15:33:34 -0700 [NETFILTER]: C99 initizalizers for NAT protocols Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 86e65da9c1fc6fb421b9f796b597b3eced6b55ab tree 69ae9d0c30afe54cea3e4c6119791c1318c2198d parent 0742fd53a3774781255bd1e471e7aa2e4a82d5f7 author David S. Miller Tue, 09 Aug 2005 19:36:29 -0700 committer David S. Miller Mon, 29 Aug 2005 15:33:26 -0700 [NET]: Remove explicit initializations of skb->input_dev Instead, set it in one place, namely the beginning of netif_receive_skb(). Based upon suggestions from Jamal Hadi Salim. Signed-off-by: David S. Miller commit 0742fd53a3774781255bd1e471e7aa2e4a82d5f7 tree 020e6d1ccb1d7ce07cdb26b7317fa2ca58e689b3 parent f2ccd8fa06c8e302116e71df372f5c1f83432e03 author Adrian Bunk Tue, 09 Aug 2005 19:35:47 -0700 committer David S. Miller Mon, 29 Aug 2005 15:33:20 -0700 [IPV4]: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global function: - xfrm4_state.c: xfrm4_state_fini - remove the following unneeded EXPORT_SYMBOL's: - ip_output.c: ip_finish_output - ip_output.c: sysctl_ip_default_ttl - fib_frontend.c: ip_dev_find - inetpeer.c: inet_peer_idlock - ip_options.c: ip_options_compile - ip_options.c: ip_options_undo - net/core/request_sock.c: sysctl_max_syn_backlog Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit f2ccd8fa06c8e302116e71df372f5c1f83432e03 tree 6e933f4bdc8899009edb33642b908779f123fb4a parent b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 author David S. Miller Tue, 09 Aug 2005 19:34:12 -0700 committer David S. Miller Mon, 29 Aug 2005 15:32:25 -0700 [NET]: Kill skb->real_dev Bonding just wants the device before the skb_bond() decapsulation occurs, so simply pass that original device into packet_type->func() as an argument. It remains to be seen whether we can use this same exact thing to get rid of skb->input_dev as well. Signed-off-by: David S. Miller commit b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 tree d9bdbd412bec6474e6845480a806edd74c3a2808 parent 83e3609eba3818f6e18b8bf9442195169ac306b7 author Patrick McHardy Tue, 09 Aug 2005 19:33:51 -0700 committer David S. Miller Mon, 29 Aug 2005 15:32:20 -0700 [NET]: Reduce tc_index/tc_verd to u16 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 83e3609eba3818f6e18b8bf9442195169ac306b7 tree b0dd71b7e5ea6e8b17813cf6b3736a1b0f443ab7 parent 080774a243f56ce2195ace96fba3d18548ee48ce author Arnaldo Carvalho de Melo Tue, 09 Aug 2005 19:33:31 -0700 committer David S. Miller Mon, 29 Aug 2005 15:32:11 -0700 [REQSK]: Move the syn_table destroy from tcp_listen_stop to reqsk_queue_destroy Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 080774a243f56ce2195ace96fba3d18548ee48ce tree 2065041cb2b85891ca45648122122796122c38dc parent 6f1cf16582160c4839f05007c978743911aa022b author Harald Welte Tue, 09 Aug 2005 19:32:58 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:49 -0700 [NETFILTER]: Add ctnetlink subsystem Add ctnetlink subsystem for userspace-access to ip_conntrack table. This allows reading and updating of existing entries, as well as creating new ones (and new expect's) via nfnetlink. Please note the 'strange' byte order: nfattr (tag+length) are in host byte order, while the payload is always guaranteed to be in network byte order. This allows a simple userspace process to encapsulate netlink messages into arch-independent udp packets by just processing/swapping the headers and not knowing anything about the actual payload. Signed-off-by: Harald Welte Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6f1cf16582160c4839f05007c978743911aa022b tree 78c87b929e9c0469869db1c91a6691fe6ca689c6 parent b0573dea1fb32ebc72ffa05980fd840df1d80860 author Stephen Hemminger Tue, 09 Aug 2005 19:31:17 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:42 -0700 [NET]: Remove HIPPI private from skbuff.h This removes the private element from skbuff, that is only used by HIPPI. Instead it uses skb->cb[] to hold the additional data that is needed in the output path from hard_header to device driver. PS: The only qdisc that might potentially corrupt this cb[] is if netem was used over HIPPI. I will take care of that by fixing netem to use skb->stamp. I don't expect many users of netem over HIPPI Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b0573dea1fb32ebc72ffa05980fd840df1d80860 tree ae10ad849dce6dbeec1b281fbd51214030f21902 parent f9e815b376dc19e6afc551cd755ac64e9e42d81f author Patrick McHardy Tue, 09 Aug 2005 19:30:51 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:35 -0700 [NET]: Introduce SO_{SND,RCV}BUFFORCE socket options Allows overriding of sysctl_{wmem,rmrm}_max Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f9e815b376dc19e6afc551cd755ac64e9e42d81f tree 1cbc3d1e64d3dd51404c8935e676beb468867979 parent ac3247baf8ecadf168642e3898b0212c29c79715 author Harald Welte Tue, 09 Aug 2005 19:30:24 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:29 -0700 [NETFITLER]: Add nfnetlink layer. Introduce "nfnetlink" (netfilter netlink) layer. This layer is used as transport layer for all userspace communication of the new upcoming netfilter subsystems, such as ctnetlink, nfnetlink_queue and some day even the mythical pkttables ;) Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ac3247baf8ecadf168642e3898b0212c29c79715 tree f2b1c65f34c035491d921006efcf8b2e7a707785 parent abc3bc58047efa72ee9c2e208cbeb73d261ad703 author Harald Welte Tue, 09 Aug 2005 19:28:03 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:24 -0700 [NETFILTER]: connection tracking event notifiers This adds a notifier chain based event mechanism for ip_conntrack state changes. As opposed to the previous implementations in patch-o-matic, we do no longer need a field in the skb to achieve this. Thanks to the valuable input from Patrick McHardy and Rusty on the idea of a per_cpu implementation. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit abc3bc58047efa72ee9c2e208cbeb73d261ad703 tree 05701d5210afd76fded4bd4268a0e7e8c90a06bf parent 8728b834b226ffcf2c94a58530090e292af2a7bf author Patrick McHardy Tue, 09 Aug 2005 19:25:56 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:18 -0700 [NET]: Kill skb->tc_classid Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8728b834b226ffcf2c94a58530090e292af2a7bf tree 2fd51ff3b7097eb3ffc41ea3a1d8b3ba04715b4c parent 6869c4d8e066e21623c812c448a05f1ed931c9c6 author David S. Miller Tue, 09 Aug 2005 19:25:21 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:14 -0700 [NET]: Kill skb->list Remove the "list" member of struct sk_buff, as it is entirely redundant. All SKB list removal callers know which list the SKB is on, so storing this in sk_buff does nothing other than taking up some space. Two tricky bits were SCTP, which I took care of, and two ATM drivers which Francois Romieu fixed up. Signed-off-by: David S. Miller Signed-off-by: Francois Romieu commit 6869c4d8e066e21623c812c448a05f1ed931c9c6 tree ce18efc459e121e3a0b1bf5f85615567cdb30f68 parent bf3a46aa9b96f6eb3a49a568f72a2801c3e830c0 author Harald Welte Tue, 09 Aug 2005 19:24:19 -0700 committer David S. Miller Mon, 29 Aug 2005 15:31:04 -0700 [NETFILTER]: reduce netfilter sk_buff enlargement As discussed at netconf'05, we're trying to save every bit in sk_buff. The patch below makes sk_buff 8 bytes smaller. I did some basic testing on my notebook and it seems to work. The only real in-tree user of nfcache was IPVS, who only needs a single bit. Unfortunately I couldn't find some other free bit in sk_buff to stuff that bit into, so I introduced a separate field for them. Maybe the IPVS guys can resolve that to further save space. Initially I wanted to shrink pkt_type to three bits (PACKET_HOST and alike are only 6 values defined), but unfortunately the bluetooth code overloads pkt_type :( The conntrack-event-api (out-of-tree) uses nfcache, but Rusty just came up with a way how to do it without any skb fields, so it's safe to remove it. - remove all never-implemented 'nfcache' code - don't have ipvs code abuse 'nfcache' field. currently get's their own compile-conditional skb->ipvs_property field. IPVS maintainers can decide to move this bit elswhere, but nfcache needs to die. - remove skb->nfcache field to save 4 bytes - move skb->nfctinfo into three unused bits to save further 4 bytes Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bf3a46aa9b96f6eb3a49a568f72a2801c3e830c0 tree 4387ee7d8ef83348338a9d433c93139a4747dcb5 parent 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 author Harald Welte Tue, 09 Aug 2005 19:22:01 -0700 committer David S. Miller Mon, 29 Aug 2005 15:29:31 -0700 [NETFILTER]: convert nfmark and conntrack mark to 32bit As discussed at netconf'05, we convert nfmark and conntrack-mark to be 32bits even on 64bit architectures. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 083bc6b3c9b52b5998cc49d4aa2f8f15c2e84e6b tree 935852aa0f2bee2d68d704d8007a2524189a3f4f parent 3e88a579d05e1bb6c51d88f0936e372895edb8ff author Deepak Saxena Mon, 29 Aug 2005 22:54:53 +0100 committer Russell King Mon, 29 Aug 2005 22:54:53 +0100 [ARM] 2853/1: Make alloc_init_supersection() work with 36-bit mappings Patch from Deepak Saxena Working on adding support for 36-bit static mappings for ARMv6 and Intel's XSC3 core and noticed that alloc_init_supersection currently increments the phys addr by 1MB on each of the 16 iterations and then forces alignment to supersection size (16MB). This is really uneeded b/c we have already forced the phys address to be 16MB aligned in create_mapping(). Furthermore, this breaks 36-bit addressing b/c bits [23:20] of the PMD contain bits [35:32] of the physical address and the masking causes us to loose those bits thus ending up with an incorrect virt -> phys translation. The other option is to have an alloc_init_supersection36. Tested on Intel IXP2350 CPU with 36-bit static I/O mappings. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 3e88a579d05e1bb6c51d88f0936e372895edb8ff tree bd359dd6edb014808b69781916e26c6d626574e3 parent cb85a502e0c2019d8bc302b011150bd62ecf70ab author Richard Purdie Mon, 29 Aug 2005 22:46:33 +0100 committer Russell King Mon, 29 Aug 2005 22:46:33 +0100 [ARM] 2861/1: PXA: Add some extra pxa27x register definitions Patch from Richard Purdie Add some extra pxa27x register definitions needed for the Sharp SL-C3000 (Spitz). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit cb85a502e0c2019d8bc302b011150bd62ecf70ab tree 727e8342c862c09c89cc719a432d70e1e634d043 parent 01b9c414828d951148a3792237ff3bf6e6debc85 author Nicolas Pitre Mon, 29 Aug 2005 22:46:32 +0100 committer Russell King Mon, 29 Aug 2005 22:46:32 +0100 [ARM] 2858/1: ARM has sys_fadvise64_64 only Patch from Nicolas Pitre There is no need to define __ARCH_WANT_SYS_FADVISE64 on ARM since it only serves to compile in a compatibility wrapper for sys_fadvise64 which never was tied to any syscall number. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 01b9c414828d951148a3792237ff3bf6e6debc85 tree b3d41af3d79fee4ae1c617a6da596202709fd2d5 parent d6b0bf213b4be478029b768fcee80058ace7150a author Ben Dooks Mon, 29 Aug 2005 22:46:31 +0100 committer Russell King Mon, 29 Aug 2005 22:46:31 +0100 [ARM] 2856/1: S3C2440 - show DVS status at startup Patch from Ben Dooks Show the state of DVS (Dynamic Voltage Scaling) when starting up on the S3C2440 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d6b0bf213b4be478029b768fcee80058ace7150a tree e963fa53b688c1c8001d9da2e764cd57d62fcb4b parent bdf82b59c5dcf04bbdbd1938eefca14dd9cb44d3 author Ben Dooks Mon, 29 Aug 2005 22:46:30 +0100 committer Russell King Mon, 29 Aug 2005 22:46:30 +0100 [ARM] 2855/1: S3C2410 - add CLKSLOW definitions, and show in init Patch from Ben Dooks Add the definitions for the S3C2410_CLKSLOW registers to the header files, and show the values when the system starts up Signed-off-by: Ben Dooks Signed-off-by: Russell King commit bdf82b59c5dcf04bbdbd1938eefca14dd9cb44d3 tree 68983f484e96c737cd504ecd08e7bf669a925cec parent e605ecd7c8a38f65759c938a235a1b84f41a744e author Deepak Saxena Mon, 29 Aug 2005 22:46:30 +0100 committer Russell King Mon, 29 Aug 2005 22:46:30 +0100 [ARM] 2836/1: Cleanup IXP4xx GPIO code Patch from Deepak Saxena This patch implements the set_irq_type() hooks for configuring GPIO IRQ type and updates all the platforms to use it instead of the gpio_line_config() function which is now used to configure input vs. output on the pins. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit e605ecd7c8a38f65759c938a235a1b84f41a744e tree 6fbc546cc3de5876ca7938e7c2da96a92b1e2ee8 parent bf4e70e54cf31dcca48d279c7f7e71328eebe749 author Deepak Saxena Mon, 29 Aug 2005 22:46:29 +0100 committer Russell King Mon, 29 Aug 2005 22:46:29 +0100 [ARM] 2834/1: Remove IXP4xx board-specific map_io routines Patch from Deepak Saxena None of the board-specific map_io routines do anything, so kill them. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7115c13bd6d166982212276610b27773b8c27aec tree 00c78ca82f738acdc6adfde7dede2689ed13b833 parent 7d2e423addf3054a3238347740df6f46d4d83f3d parent 4db8699bcfa8faddb5727b1cb010a4d9b8a42e8c author Tony Luck Mon, 29 Aug 2005 14:15:10 -0700 committer Tony Luck Mon, 29 Aug 2005 14:15:10 -0700 Pull acpi-p-state into release branch commit 7d2e423addf3054a3238347740df6f46d4d83f3d tree b850ced2f211b15bcb0ce4600a80b8b822d24a5e parent 3ec8a773d2775db86cc21d28b77bea29c8a1ea3c parent a877bd36f7584fd7e4729099348cfc9190ba00aa author Tony Luck Mon, 29 Aug 2005 14:14:40 -0700 committer Tony Luck Mon, 29 Aug 2005 14:14:40 -0700 Pull asm-segment into release branch commit 3ec8a773d2775db86cc21d28b77bea29c8a1ea3c tree 6318ed9ec67651f182fb0f0c966ca7b5dd12ba35 parent 95ecc5e5a3b20a3c76164d089c69051662e9d9b3 parent e8579e72ca240f3fbaa669f09a9d610436505366 author Tony Luck Mon, 29 Aug 2005 14:14:18 -0700 committer Tony Luck Mon, 29 Aug 2005 14:14:18 -0700 Pull swiotlb-size into release branch commit 95ecc5e5a3b20a3c76164d089c69051662e9d9b3 tree c0850c88d511210e52757320af633481dc02f222 parent 87dbaaabde5ce141ac4f8d726e6d3c937209e0a5 parent 1a402aaca51b7d56e62348f50a426c531b6bc29e author Tony Luck Mon, 29 Aug 2005 14:13:49 -0700 committer Tony Luck Mon, 29 Aug 2005 14:13:49 -0700 Pull unaligned-snsc_event into release branch commit 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 tree 82c0316704804a652f5fc4fe4de14b0a6ab27ba0 parent 4f07118f656c179740cad35b827032e2e29b1210 parent 70d374ea9907036e15574a5ce89219edd5baee10 author Linus Torvalds Mon, 29 Aug 2005 13:54:35 -0700 committer Linus Torvalds Mon, 29 Aug 2005 13:54:35 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 39fbe47377062200acc26ea0ccef223b4399a82c tree f814fd07700893cda1822128098150e45dd758c9 parent cfc4692825ea4d932b94c0ec791f2f01d055b79f parent c1b054d03f5b31c33eaa0b267c629b118eaf3790 author Jeff Garzik Mon, 29 Aug 2005 16:53:08 -0400 committer Jeff Garzik Mon, 29 Aug 2005 16:53:08 -0400 /spare/repo/netdev-2.6 branch 'chelsio' commit c1b054d03f5b31c33eaa0b267c629b118eaf3790 tree 9333907ca767be24fcb3667877242976c3e3c8dd parent 559fb51ba7e66fe298b8355fabde1275b7def35f parent bf4e70e54cf31dcca48d279c7f7e71328eebe749 author Jeff Garzik Mon, 29 Aug 2005 16:40:27 -0400 committer Jeff Garzik Mon, 29 Aug 2005 16:40:27 -0400 Merge /spare/repo/linux-2.6/ commit 70d374ea9907036e15574a5ce89219edd5baee10 tree b858bb4a841eb91b1d91b41c33698d05fa7bfb37 parent aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec parent bf4e70e54cf31dcca48d279c7f7e71328eebe749 author Jeff Garzik Mon, 29 Aug 2005 15:59:42 -0400 committer Jeff Garzik Mon, 29 Aug 2005 15:59:42 -0400 Merge /spare/repo/linux-2.6/ commit cfc4692825ea4d932b94c0ec791f2f01d055b79f tree bc74a8ee7b3762629f8bd29e6151f76af5505d95 parent 8aaf226a8eaa0823c4f3c58d5207004ff6e3e758 parent 611494dccacb3e42f55359df74d604b67312598b author Jeff Garzik Mon, 29 Aug 2005 15:55:26 -0400 committer Jeff Garzik Mon, 29 Aug 2005 15:55:26 -0400 /spare/repo/netdev-2.6 branch 'e100' commit 8aaf226a8eaa0823c4f3c58d5207004ff6e3e758 tree c1e4c4f573b4704aa7298775d4a8724be3036b64 parent 1703ecc7e88ea2d583fc9ebe7de8edb004eff863 parent 3690b6c124fbc7259634f3b80d92a6d9fe51ec79 author Jeff Garzik Mon, 29 Aug 2005 15:52:56 -0400 committer Jeff Garzik Mon, 29 Aug 2005 15:52:56 -0400 /spare/repo/netdev-2.6 branch 'sis190' commit 1703ecc7e88ea2d583fc9ebe7de8edb004eff863 tree d289dc6e1567babb075c3c4f5cc296cf44a086c7 parent bf4e70e54cf31dcca48d279c7f7e71328eebe749 parent 945a787675cc5ba362f5d4ce135d2a2c20be5985 author Jeff Garzik Mon, 29 Aug 2005 15:52:42 -0400 committer Jeff Garzik Mon, 29 Aug 2005 15:52:42 -0400 /spare/repo/netdev-2.6 branch 'uli-tulip' commit 4f07118f656c179740cad35b827032e2e29b1210 tree 7ddeb17346fe25ae75aa5373659c053afb9ef5f5 parent 442464a50077ff00454ff8d7628cbe1b8eacc034 author David S. Miller Mon, 29 Aug 2005 12:46:22 -0700 committer David S. Miller Mon, 29 Aug 2005 12:46:22 -0700 [SPARC64]: More fully work around Spitfire Errata 51. It appears that a memory barrier soon after a mispredicted branch, not just in the delay slot, can cause the hang condition of this cpu errata. So move them out-of-line, and explicitly put them into a "branch always, predict taken" delay slot which should fully kill this problem. Signed-off-by: David S. Miller commit 442464a50077ff00454ff8d7628cbe1b8eacc034 tree d076c18c8f9d860ee9f357a78b87d0ede8286585 parent ca7c8d2c1e2a2f2445cb5e00f45b93af57f22c1b author David S. Miller Mon, 29 Aug 2005 12:46:07 -0700 committer David S. Miller Mon, 29 Aug 2005 12:46:07 -0700 [SPARC64]: Make debugging spinlocks usable again. When the spinlock routines were moved out of line into kernel/spinlock.c this made it so that the debugging spinlocks record lock acquisition program counts in the kernel/spinlock.c functions not in their callers. This makes the debugging info kind of useless. So record the correct caller's program counter and now this feature is useful once more. Signed-off-by: David S. Miller commit ca7c8d2c1e2a2f2445cb5e00f45b93af57f22c1b tree 918852a9920587595d46a62292c2924b117c76b4 parent 3d6364abcfdaedeb34418c2894f61251d48614f6 author Kumar Gala Mon, 29 Aug 2005 12:45:44 -0700 committer David S. Miller Mon, 29 Aug 2005 12:45:44 -0700 [SPARC]: remove use of asm/segment.h Removed sparc architecture specific users of asm/segment.h and asm-sparc/segment.h itself Signed-off-by: Kumar Gala Signed-off-by: David S. Miller commit 3d6364abcfdaedeb34418c2894f61251d48614f6 tree 931f13bef897515bc570b04394daf8018c7aaf96 parent 6c52a96e6cacb35403b85c3b42db0faf26f3ed85 author Kumar Gala Mon, 29 Aug 2005 12:45:30 -0700 committer David S. Miller Mon, 29 Aug 2005 12:45:30 -0700 [SPARC64]: remove use of asm/segment.h Removed sparc64 architecture specific users of asm/segment.h and asm-sparc64/segment.h itself Signed-off-by: Kumar Gala Signed-off-by: David S. Miller commit 6c52a96e6cacb35403b85c3b42db0faf26f3ed85 tree 07ebe2ce68511ffb75575603b0c58bf00c78f8c7 parent bde4e4ee9f90142d550e2684dec2c8df302f5f8e author David S. Miller Mon, 29 Aug 2005 12:45:11 -0700 committer David S. Miller Mon, 29 Aug 2005 12:45:11 -0700 [SPARC64]: Revamp Spitfire error trap handling. Current uncorrectable error handling was poor enough that the processor could just loop taking the same trap over and over again. Fix things up so that we at least get a log message and perhaps even some register state. In the process, much consolidation became possible, particularly with the correctable error handler. Prefix assembler and C function names with "spitfire" to indicate that these are for Ultra-I/II/IIi/IIe only. More work is needed to make these routines robust and featureful to the level of the Ultra-III error handlers. Signed-off-by: David S. Miller commit bde4e4ee9f90142d550e2684dec2c8df302f5f8e tree 9ea03bd0e3cfe7ed1de41171dd5a906779b02e72 parent 5ea68e02766c52c153c62fc423cda659a80e45fa author David S. Miller Mon, 29 Aug 2005 12:44:57 -0700 committer David S. Miller Mon, 29 Aug 2005 12:44:57 -0700 [SPARC64]: Do not call winfix_dax blindly Verify we really are taking a data access exception trap, at TL1, from one of the window spill/fill handlers. Else call a new function, data_access_exception_tl1, to log the error. Signed-off-by: David S. Miller commit 5ea68e02766c52c153c62fc423cda659a80e45fa tree 36b2d363204e817d360670b996ce310df7eebff1 parent bf4e70e54cf31dcca48d279c7f7e71328eebe749 author David S. Miller Mon, 29 Aug 2005 12:44:40 -0700 committer David S. Miller Mon, 29 Aug 2005 12:44:40 -0700 [SPARC64]: Fix trap state reading for instruction_access_exception. 1) Read ASI_IMMU SFSR not ASI_DMMU. 2) IMMU has no SFAR, read TPC instead 3) Delete old and incorrect comment about the DTLB protection trap having a dependency on the SFSR contents in order to function correctly Signed-off-by: David S. Miller commit aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec tree 032246a8cc72b934c85e6695bd461848df377548 parent af36d7f0df56de3e3e4bbfb15d0915097ecb8cab author Jeff Garzik Mon, 29 Aug 2005 15:12:56 -0400 committer Jeff Garzik Mon, 29 Aug 2005 15:12:56 -0400 [libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPL commit 87dbaaabde5ce141ac4f8d726e6d3c937209e0a5 tree f32162a747a7c41af7703a399cf61af9248b0048 parent 7ee175f7418cfb17872afd8ffca767ab0e75aff3 parent 16592d269801ea68130b283c888ffb3c3e988299 author Tony Luck Mon, 29 Aug 2005 11:39:18 -0700 committer Tony Luck Mon, 29 Aug 2005 11:39:18 -0700 Pull lameter-rwsem-limit into release branch commit 7ee175f7418cfb17872afd8ffca767ab0e75aff3 tree a78d7381c2e5086f5f098d76c888cf6e10d66ae5 parent dcf8296216065fb391a5e29e44e814b0d1ab88aa parent badea125d7cbd93f1678a95cf009b3bdfe6065cd author Tony Luck Mon, 29 Aug 2005 11:38:48 -0700 committer Tony Luck Mon, 29 Aug 2005 11:38:48 -0700 Pull mm-context-fix into release branch commit dcf8296216065fb391a5e29e44e814b0d1ab88aa tree 76b4297b8f23efbbde12a24d33874a38ed20d1ae parent 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b parent f521089158cd48a81b4d72e8e39da006dd79779b author Tony Luck Mon, 29 Aug 2005 11:38:01 -0700 committer Tony Luck Mon, 29 Aug 2005 11:38:01 -0700 Pull lameter-spinlock-optimization into release branch commit bf4e70e54cf31dcca48d279c7f7e71328eebe749 tree 9fc11cc4d05afdbb99d3b029cd1afcdcda4f3bd0 parent 03ecc6749ab2bfe7baf84b3e0e35018884758fa3 author Al Viro Sun, 28 Aug 2005 03:52:22 +0100 committer Linus Torvalds Mon, 29 Aug 2005 10:42:40 -0700 [PATCH] missing include in smc-ultra Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 03ecc6749ab2bfe7baf84b3e0e35018884758fa3 tree 3749acb2626a4a2392f6ece246cd42620c875fa8 parent 9e2d3cd34a159948dc753a14573e16bffc04dba8 author Al Viro Sun, 28 Aug 2005 03:47:50 +0100 committer Linus Torvalds Mon, 29 Aug 2005 10:42:39 -0700 [PATCH] missing include in tda80xx Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9e2d3cd34a159948dc753a14573e16bffc04dba8 tree 155627810033ac56d06734360c56b612f08b9134 parent 5bbe6ab938208bb3d4e16f7a28b11fcddd4f9ff2 author Al Viro Sun, 28 Aug 2005 03:19:14 +0100 committer Linus Torvalds Mon, 29 Aug 2005 10:42:39 -0700 [PATCH] mod_devicetable.h fixes * ieee1394_device_id has kernel_ulong_t field after an odd number of __u32 ones. Since mod_devicetable.h is included both from kernel and from host build helper, we may be in trouble if we are building on 32bit host for 64bit target - userland sees unsigned long long, kernel sees unsigned long and while their sizes match, alignments might not. Fixed by forcing alignment. Fortunately, almost nobody else needs that - the rest of such fields is naturally aligned as it is. * of_device_id has void * in it. Host userland helpers need kernel_ulong_t instead, since their void * might have nothing to do with the kernel one. Fixed in the same way it's done for similar problems in pcmcia_device_id (ifdef __KERNEL__). * pcmcia_device_id has the same problem as ieee1394_device_id. Fixed the same way. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5bbe6ab938208bb3d4e16f7a28b11fcddd4f9ff2 tree 94d29094a0aba6d69d0f1f5af1ed7ad49e3b9881 parent a78b3371b628559eb5c46ee1518df27c62f3e801 author Benjamin LaHaise Sun, 28 Aug 2005 18:05:17 -0400 committer Linus Torvalds Mon, 29 Aug 2005 10:40:08 -0700 [PATCH] new name for 2.6.14 We've had Woozy Numbat for a while now. Here's an updated name care of Jeff Garzik and myself. Signed-off-by: Benjamin LaHaise Signed-off-by: Linus Torvalds commit a78b3371b628559eb5c46ee1518df27c62f3e801 tree dd32333307ce6a7e4d39ea8c07c34bc3dc5540a1 parent 97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 parent a4d61e84804f3b14cc35c5e2af768a07c0f64ef6 author Linus Torvalds Mon, 29 Aug 2005 10:36:48 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:36:48 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git commit 97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 tree 8e1287cc995a9792e35b2687a7ef870ff15a483d parent 9ab7486e446447c8e62f8f46ca85b809e6a9d491 parent 4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 author Linus Torvalds Mon, 29 Aug 2005 10:35:43 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:35:43 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git commit 9ab7486e446447c8e62f8f46ca85b809e6a9d491 tree eabab23a08b361a204523e46147c930c318d5520 parent 975f957dc408925805dd8f5aa4217b7eeea2d005 parent dce773771834221817e2d359a7e07a618ba08807 author Linus Torvalds Mon, 29 Aug 2005 10:35:21 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:35:21 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git commit 975f957dc408925805dd8f5aa4217b7eeea2d005 tree 2198bb72323a016d93c7440c9240bac94a5c0016 parent 2321fbd2b87539edc1fbfc2e186528a1ef93835f parent 661299d9d0437a0ff72240f3d60016ac3a361a6e author Linus Torvalds Mon, 29 Aug 2005 10:34:59 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:34:59 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial.git commit 2321fbd2b87539edc1fbfc2e186528a1ef93835f tree cd7d22794eb262b040b6c2f99f9a46d0293935f2 parent 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 parent 323cdfc191b7c1597dc748175062c368568d6af4 author Linus Torvalds Mon, 29 Aug 2005 10:34:31 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:34:31 -0700 Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git commit 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 tree 9449490978cdb7858a7c713ee88f15ffc26a6d71 parent 5be1d85c208f135fc88f972f91b91a879b702b40 parent e13934563db047043ccead26412f552375cea90c author Linus Torvalds Mon, 29 Aug 2005 10:04:37 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:04:37 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 5be1d85c208f135fc88f972f91b91a879b702b40 tree 6ca884e6cd58d596a64ef12fa62405524d6cd5f1 parent 69be8f189653cd81aae5a74e26615b12871bb72e parent 135932651fd1eeb95eb6c5d4f6652aae73fe2c24 author Linus Torvalds Mon, 29 Aug 2005 10:03:46 -0700 committer Linus Torvalds Mon, 29 Aug 2005 10:03:46 -0700 Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 69be8f189653cd81aae5a74e26615b12871bb72e tree 89c7d7b5b68ae47818b9dbc9015f1e4452ec2075 parent 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b author Steven Rostedt Mon, 29 Aug 2005 11:44:09 -0400 committer Linus Torvalds Mon, 29 Aug 2005 10:03:11 -0700 [PATCH] convert signal handling of NODEFER to act like other Unix boxes. It has been reported that the way Linux handles NODEFER for signals is not consistent with the way other Unix boxes handle it. I've written a program to test the behavior of how this flag affects signals and had several reports from people who ran this on various Unix boxes, confirming that Linux seems to be unique on the way this is handled. The way NODEFER affects signals on other Unix boxes is as follows: 1) If NODEFER is set, other signals in sa_mask are still blocked. 2) If NODEFER is set and the signal is in sa_mask, then the signal is still blocked. (Note: this is the behavior of all tested but Linux _and_ NetBSD 2.0 *). The way NODEFER affects signals on Linux: 1) If NODEFER is set, other signals are _not_ blocked regardless of sa_mask (Even NetBSD doesn't do this). 2) If NODEFER is set and the signal is in sa_mask, then the signal being handled is not blocked. The patch converts signal handling in all current Linux architectures to the way most Unix boxes work. Unix boxes that were tested: DU4, AIX 5.2, Irix 6.5, NetBSD 2.0, SFU 3.5 on WinXP, AIX 5.3, Mac OSX, and of course Linux 2.6.13-rcX. * NetBSD was the only other Unix to behave like Linux on point #2. The main concern was brought up by point #1 which even NetBSD isn't like Linux. So with this patch, we leave NetBSD as the lonely one that behaves differently here with #2. Signed-off-by: Linus Torvalds commit 2cba582a49f1535c1a12a687cfb3dab713c22cc4 tree de96780844fe9181e8e63f72d7af50ef8b18ec49 parent 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b author Jeff Garzik Mon, 29 Aug 2005 05:12:30 -0400 committer Jeff Garzik Mon, 29 Aug 2005 05:12:30 -0400 [libata sata_promise] Do not attempt to use SATA phy on PATA controllers commit c594adad5653491813959277fb87a2fef54c4e05 tree baefdce10a0b490017b0a5acbe9dbeb8cb14c003 parent 9a5573e378c5c8976c6000a7643b52e2a0481688 author David Gibson Thu, 11 Aug 2005 16:55:21 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:38 +1000 [PATCH] Dynamic hugepage addresses for ppc64 Paulus, I think this is now a reasonable candidate for the post-2.6.13 queue. Relax address restrictions for hugepages on ppc64 Presently, 64-bit applications on ppc64 may only use hugepages in the address region from 1-1.5T. Furthermore, if hugepages are enabled in the kernel config, they may only use hugepages and never normal pages in this area. This patch relaxes this restriction, allowing any address to be used with hugepages, but with a 1TB granularity. That is if you map a hugepage anywhere in the region 1TB-2TB, that entire area will be reserved exclusively for hugepages for the remainder of the process's lifetime. This works analagously to hugepages in 32-bit applications, where hugepages can be mapped anywhere, but with 256MB (mmu segment) granularity. This patch applies on top of the four level pagetable patch (http://patchwork.ozlabs.org/linuxppc64/patch?id=1936). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 9a5573e378c5c8976c6000a7643b52e2a0481688 tree fc8e0e366460434b515128a287448fa64d15f105 parent 95920324f51b3a12603cf6d9bacbd831f34c5b60 author Michael Ellerman Tue, 09 Aug 2005 15:20:20 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:38 +1000 [PATCH] ppc64: Check of_chosen in check_for_initrd() You can't call get_property() on a NULL node, so check if of_chosen is set in check_for_initrd(). Signed-off-by: Michael Ellerman arch/ppc64/kernel/setup.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) Signed-off-by: Paul Mackerras commit 95920324f51b3a12603cf6d9bacbd831f34c5b60 tree f74faa0172cc88148e00b1484fd97fa90d2d9d23 parent 145ec7d51ae507c7cc8889ad05e24af05bbd9147 author Michael Ellerman Tue, 09 Aug 2005 15:20:19 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:38 +1000 [PATCH] ppc64: unflatten_device_tree() should check if lmb_alloc() fails unflatten_device_tree() doesn't check if lmb_alloc() succeeds or not, it should. All it can do is panic, but at least there's an error message (assuming you have some sort of console at that point). Signed-off-by: Michael Ellerman arch/ppc64/kernel/prom.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Signed-off-by: Paul Mackerras commit 145ec7d51ae507c7cc8889ad05e24af05bbd9147 tree d9f9200ea9869a9056839c76ad5f0763e4f91160 parent 180a33627d958d5d9d3602dde6ac74b315e136f0 author Michael Ellerman Tue, 09 Aug 2005 15:20:18 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:38 +1000 [PATCH] ppc64: Fix a misleading printk in unflatten_dt_node() When unflatten_dt_node() fails to find an OF_DT_END_NODE tag it prints "Weird tag at start of node", this should be "Weird tag at end of node". Signed-off-by: Michael Ellerman arch/ppc64/kernel/prom.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Paul Mackerras commit 180a33627d958d5d9d3602dde6ac74b315e136f0 tree 2c480741288f1f27ff3b65a95bb67fdf2f206a8f parent b13cfd173f73c3f6f9a307b7b6e64d45fbd756b2 author Michael Ellerman Tue, 09 Aug 2005 11:13:36 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:38 +1000 [PATCH] ppc64: Move ppc64_enable_pmcs() logic into a ppc_md function This patch moves power4_enable_pmcs() to arch/ppc64/kernel/pmc.c. I've tested it on P5 LPAR and P4. It does what it used to. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b13cfd173f73c3f6f9a307b7b6e64d45fbd756b2 tree 47d9a6ab54c4b068e3300d026c4402c14f53d384 parent bef5686229810709091fb6e505071f4aa41e3760 author Olaf Hering Thu, 04 Aug 2005 19:26:42 +0200 committer Paul Mackerras Mon, 29 Aug 2005 10:53:37 +1000 [PATCH] ppc64: allow xmon=off If both CONFIG_XMON and CONFIG_XMON_DEFAULT is enabled in the .config, there is no way to disable xmon again. setup_system calls first xmon_init, later parse_early_param. So a new 'xmon=off' cmdline option will do the right thing. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit bef5686229810709091fb6e505071f4aa41e3760 tree 417f40e7ec6a0d593857ebd338794b664c1f4bcc parent 71e1f55ad4bc4c8bcfe696400a950a34263a750e author Michael Ellerman Wed, 03 Aug 2005 20:21:26 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:37 +1000 [PATCH] ppc64: Remove CONFIG_MSCHUNKS We can now remove CONFIG_MSCHUNKS as it doesn't do anything interesting anymore. The only macro in abs_addr.h which is called by non-iSeries code is phys_to_abs(), so remove the other dummy implementations, and we add a firmware feature check to phys_to_abs(). Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 71e1f55ad4bc4c8bcfe696400a950a34263a750e tree d8355e0b1302b201114c9998570c0a4ee7a26fcc parent 180379dcefb39e8bd05d562b0685e9084dffcc0a author Michael Ellerman Wed, 03 Aug 2005 20:21:26 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:37 +1000 [PATCH] ppc64: Simplify some lmb functions lmb_phys_mem_size() can always return lmb.memory.size, as long as it's called after lmb_analyze(), which it is. There's no need to recalculate the size on every call. lmb_analyze() was calculating a few things we then threw away, so just don't calculate them to start with. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 180379dcefb39e8bd05d562b0685e9084dffcc0a tree d4a3f2bec69481d3f21903b5bee7c2d1a5e86c16 parent e88bcd1b29f63738b702e57d831758706162347e author Michael Ellerman Wed, 03 Aug 2005 20:21:26 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:37 +1000 [PATCH] ppc64: Remove physbase from the lmb_property struct We no longer need the lmb code to know about abs and phys addresses, so remove the physbase variable from the lmb_property struct. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit e88bcd1b29f63738b702e57d831758706162347e tree 71304874af3f0c2601658e5c175968f0b5e46164 parent a4a0f97020444f83bf22bb9c8c20d8af2b4e6317 author Michael Ellerman Wed, 03 Aug 2005 20:21:25 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:37 +1000 [PATCH] ppc64: Remove redundant abs_to_phys() macro abs_to_phys() is a macro that turns out to do nothing, and also has the unfortunate property that it's not the inverse of phys_to_abs() on iSeries. The following is for my benefit as much as everyone else. With CONFIG_MSCHUNKS enabled, the lmb code is changed such that it keeps a physbase variable for each lmb region. This is used to take the possibly discontiguous lmb regions and present them as a contiguous address space beginning from zero. In this context each lmb region's base address is its "absolute" base address, and its physbase is it's "physical" address (from Linux's point of view). The abs_to_phys() macro does the mapping from "absolute" to "physical". Note: This is not related to the iSeries mapping of physical to absolute (ie. Hypervisor) addresses which is maintained with the msChunks structure. And the msChunks structure is not controlled via CONFIG_MSCHUNKS. Once upon a time you could compile for non-iSeries with CONFIG_MSCHUNKS enabled. But these days CONFIG_MSCHUNKS depends on CONFIG_PPC_ISERIES, so for non-iSeries code abs_to_phys() is a no-op. On iSeries we always have one lmb region which spans from 0 to systemcfg->physicalMemorySize (arch/ppc64/kernel/iSeries_setup.c line 383). This region has a base (ie. absolute) address of 0, and a physbase address of 0 (as calculated in lmb_analyze() (arch/ppc64/kernel/lmb.c line 144)). On iSeries, abs_to_phys(aa) is defined as lmb_abs_to_phys(aa), which finds the lmb region containing aa (and there's only one, ie. 0), and then does: return lmb.memory.region[0].physbase + (aa - lmb.memory.region[0].base) physbase == base == 0, so you're left with "return aa". So remove abs_to_phys(), and lmb_abs_to_phys() which is the implementation of abs_to_phys() for iSeries. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit a4a0f97020444f83bf22bb9c8c20d8af2b4e6317 tree e57ee269fa71c46a43d8a4ffe4df82ec6780c744 parent aefd16b0c5a594b5feaba23954ad74061f45c8a5 author Michael Ellerman Wed, 03 Aug 2005 20:21:24 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:36 +1000 [PATCH] ppc64: Remove redundant use of pointers in lmb code The lmb code is all written to use a pointer to an lmb struct. But it's always the same lmb struct, called "lmb". So we take the address of lmb, call it _lmb and then start using _lmb->foo everywhere, which is silly. This patch removes the _lmb pointers and replaces them with direct references to the one "lmb" struct. We do the same for some _mem and _rsv pointers which point to lmb.memory and lmb.reserved respectively. This patch looks quite busy, but it's basically just: s/_lmb->/lmb./g s/_mem->/lmb.memory./g s/_rsv->/lmb.reserved./g s/_rsv/&lmb.reserved/g s/mem->/lmb.memory./g Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit aefd16b0c5a594b5feaba23954ad74061f45c8a5 tree 64c52d1e3f1ce58b178561f6d5815887b37a81ba parent ce21795275ab469b97384faa36462350af17eca0 author Michael Ellerman Wed, 03 Aug 2005 20:21:24 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:36 +1000 [PATCH] ppc64: Remove redundant uses of physRpn_to_absRpn physRpn_to_absRpn is a no-op on non-iSeries platforms, remove the two redundant calls. There's only one caller on iSeries so fold the logic in there so we can get rid of it completely. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ce21795275ab469b97384faa36462350af17eca0 tree a2f8be762b20849f37b02f1cbc2bfc9519771cde parent 56e97b71bf55edb69dc8e9715553972ce50b1564 author Michael Ellerman Wed, 03 Aug 2005 20:21:23 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:36 +1000 [PATCH] ppc64: Consolidate some macros The only caller of chunk_offset() and abs_chunk() is phys_to_abs(), so fold the former two into the latter. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 56e97b71bf55edb69dc8e9715553972ce50b1564 tree 2abf3ef9339d3152a7a14c94e6273ecc559ab342 parent 34c8f6961fc601294a38c5bd5ca12131b2e52674 author Michael Ellerman Wed, 03 Aug 2005 20:21:23 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:36 +1000 [PATCH] ppc64: Rename msChunks structure Rename the msChunks struct to get rid of the StUdlY caps and make it a bit clearer what it's for. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 34c8f6961fc601294a38c5bd5ca12131b2e52674 tree 98035e5581a0addfca935fa2d8afddfc7c56c631 parent 38e85dc18036804ada8698951cfad4e6114fec1b author Michael Ellerman Wed, 03 Aug 2005 20:21:23 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:35 +1000 [PATCH] ppc64: msChunks cleanups Chunks are 256KB, so use constants for the size/shift/mask, rather than getting them from the msChunks struct. The iSeries debugger (??) might still need access to the values in the msChunks struct, so we keep them around for now, but set them from the constant values. Replace msChunks_entry typedef with regular u32. Simplify msChunks_alloc() to manipulate klimit directly, rather than via a parameter. Move msChunks_alloc() and msChunks into iSeries_setup.c, as that's where they're used. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 38e85dc18036804ada8698951cfad4e6114fec1b tree e1c503d81ce23d1ac7d50897bb2b190db09ace5d parent aed31351941aa990fb0865c186565a589c56d3fe author Michael Ellerman Wed, 03 Aug 2005 20:21:23 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:35 +1000 [PATCH] ppc64: Remove PTRRELOC() from msChunks code The msChunks code was written to work on pSeries, but now it's only used on iSeries. This means there's no need to do PTRRELOC anymore, so remove it all. A few places were getting "extern reloc_offset()" from abs_addr.h, move it into system.h instead. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit aed31351941aa990fb0865c186565a589c56d3fe tree 79bb2308dc028b0563ec774541f1636fbc871042 parent 8d15a3e55f49678b0900dcf5c1cddb322a129325 author Stephen Rothwell Wed, 03 Aug 2005 14:43:21 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:35 +1000 [PATCH] ppc64: introduce FW_FEATURE_ISERIES Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8d15a3e55f49678b0900dcf5c1cddb322a129325 tree c86205bde42833c25bf2f3b51f8b67f9d4e52a22 parent 1ababe11480d59d75be806804c71fa55d203a5a6 author Stephen Rothwell Wed, 03 Aug 2005 14:40:16 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:35 +1000 [PATCH] ppc64: make firmware_has_feature() stronger Make firmware_has_feature() evaluate at compile time for the non pSeries case and tidy up code where possible. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 1ababe11480d59d75be806804c71fa55d203a5a6 tree c9c8e21945479daa3ae8784588648b9c9bb5206f parent 7a6af5e38054d8e658a4b1b703902331a845de1a author Stephen Rothwell Wed, 03 Aug 2005 14:35:25 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:35 +1000 [PATCH] ppc64: create firmware_has_feature() Create the firmware_has_feature() inline and move the firmware feature stuff into its own header file. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7a6af5e38054d8e658a4b1b703902331a845de1a tree 8388d65aec62a65d10bd18306a7e84e7c5e7b18c parent 6fbb49d56d228b666cb4534bbc3c2dfe833c8053 author Stephen Rothwell Wed, 03 Aug 2005 14:32:30 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:34 +1000 [PATCH] ppc64: remove firmware features from cpu_spec The firmware_features field of struct cpu_spec should really be a separate variable as the firmware features do not depend on the chip and the bitmask is constructed independently. By removing it, we save 112 bytes from the cpu_specs array and we access the bitmask directly instead of via the cur_cpu_spec pointer. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6fbb49d56d228b666cb4534bbc3c2dfe833c8053 tree 882f26e7b97d564eb52fbb9462812c87cb146fca parent 91a57fc6723d778e12686b5106a38583072fd767 author David Gibson Fri, 19 Aug 2005 14:52:32 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:34 +1000 [PATCH] Move variables in ppc64 head.S from .data to .bss The ppc64 head.S defines several zero-initialized structures, such as the empty_zero_page and the kernel top-level pagetable. Currently they are defined to be in the data section. However, they're not used until after the bss is cleared, so this patch moves them to the bss, saving two and a half pages from the vmlinux. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 91a57fc6723d778e12686b5106a38583072fd767 tree cf711cff7b1b41605c870417fc9259476bf85127 parent 1d086e6bd605ac44154e019fe96ae3568e8b2ba2 author David Gibson Fri, 19 Aug 2005 14:52:32 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:34 +1000 [PATCH] Tweak comments in ppc64 head.S This patch adjust some comments in head.S for accuracy, clarity, and spelling. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 1d086e6bd605ac44154e019fe96ae3568e8b2ba2 tree 02143cb69ab39a8d3c54e7444ff79836282517a7 parent 60ba44945714d9b7dae8b85ab0926f6f13809c73 author David Gibson Fri, 19 Aug 2005 14:52:32 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:34 +1000 [PATCH] Remove unneeded #defines in head.S arch/ppc64/kernel/head.S #defines SECONDARY_PROCESSORS then has some #ifdefs based on it. Whatever purpose this had is long lost, this patch removes it. Likewise, head.S defines H_SET_ASR, which is now defined, along with other hypervisor call numbers in hvcall.h. This patch deletes it, as well, from head.S. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 60ba44945714d9b7dae8b85ab0926f6f13809c73 tree cdf432886e5e36ca2f45eac7daa09d09ec1c9882 parent 0ab20002f4b41f4b1799bad5948389da1c4c8444 author David Gibson Fri, 19 Aug 2005 14:52:32 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:34 +1000 [PATCH] Fix apparent code overlap in ppc64 head.S An #if/#else construct near the top of ppc64's head.S appears to create overlapping sections of code for iSeries and pSeries (i.e. one thing on iSeries and something different in the same place on pSeries). In fact, checking the various absolute offsets, it doesn't. This patch unravels the #ifdefs to make it more obvious what's going on. This accomplishes another microstep towards a single kernel image which can boot both iSeries and pSeries. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 0ab20002f4b41f4b1799bad5948389da1c4c8444 tree 631d3f533f47bfbc18be3a18233d9c1ad11d7870 parent c59c464a3e29830bcfae5eea1777cad9e00087f3 author David Gibson Fri, 19 Aug 2005 14:52:31 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:33 +1000 [PATCH] Remove general use functions from head.S As well as the interrupt vectors and initialization code, head.S contains several asm functions which are used during runtime. This patch moves these to misc.S, a more sensible location for random asm support code. A couple The functions moved are: disable_kernel_fp giveup_fpu disable_kernel_altivec giveup_altivec __setup_cpu_power3 (empty function) Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit c59c464a3e29830bcfae5eea1777cad9e00087f3 tree ebf8eb2885e8431c82c011f46138d41630a8ba49 parent ec465515eeb662f66725c8c483a46b6bdd9bdd48 author David Gibson Fri, 19 Aug 2005 14:52:31 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:33 +1000 [PATCH] Change address of ppc64 initial segment table On ppc64 machines with segment tables, CPU0's segment table is at a fixed address, currently 0x9000. This patch moves it to the free space at 0x6000, just below the fwnmi data area. This saves 8k of space in vmlinux and the runtime kernel image. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit ec465515eeb662f66725c8c483a46b6bdd9bdd48 tree bde2ec1fe896a8c0f2b71fec6ec748805540961e parent 2e2446ea0758cd57dd065962d9544e3f4d44ea2b author David Gibson Fri, 19 Aug 2005 14:52:31 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:33 +1000 [PATCH] Move iSeries and common vectors into unused space in head.S In the ppc64 kernel head.S there is currently quite a lot of unused space between the naca (at fixed address 0x4000) and the fwnmi data area (at fixed address 0x7000). This patch moves various exception vectors and support code into this region to use the wasted space. The functions load_up_fpu and load_up_altivec are moved down as well, since they are essentially continuations of the fp_unavailable_common and altivec_unavailable_common vectors, respectively. Likewise, the fwnmi vectors themselves are moved down into this area, because while the location of the fwnmi data area is fixed by the RPA, the vectors themselves can be anywhere sufficiently low. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 2e2446ea0758cd57dd065962d9544e3f4d44ea2b tree 745b7fb19e2fb48265aed6eb8ee33217a9e3f22a parent 19dbd0f6a74f7529d6d49dd50ad6b31adbe0598d author David Gibson Fri, 19 Aug 2005 14:52:31 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:33 +1000 [PATCH] Remove NACA fixed address constraint Comments in head.S suggest that the iSeries naca has a fixed address, because tools expect to find it there. The only tool which appears to access the naca is addRamDisk, but both the in-kernel version and the version used in RHEL and SuSE in fact locate the NACA the same way as the hypervisor does, by following the pointer in the hvReleaseData structure. Since the requirement for a fixed address seems to be obsolete, this patch removes the naca from head.S and replaces it with a normal C initializer. For good measure, it removes an old version of addRamDisk.c which was sitting, unused, in the ppc32 tree. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 19dbd0f6a74f7529d6d49dd50ad6b31adbe0598d tree 25a20ad9071dea6ccd4a740ddcfff1691151ec84 parent 6312236fe82bbd3b0e1dee60b3eb3b270a2f6aeb author Stephen Rothwell Tue, 12 Jul 2005 17:50:26 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:32 +1000 [PATCH] ppc64: split pSeries specific parts out of vio.c This patch just splits out the pSeries specific parts of vio.c. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6312236fe82bbd3b0e1dee60b3eb3b270a2f6aeb tree cf23f21d9d423e7999270cb4d7050697c72ea80b parent 8c65b5c955b8598d9c63b4e97392377269873a54 author Stephen Rothwell Tue, 12 Jul 2005 17:45:27 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:32 +1000 [PATCH] ppc64: make the bus matching function platform specific This patch allows us to have a different bus if matching function for each platform. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8c65b5c955b8598d9c63b4e97392377269873a54 tree 2afafee95db21a3ddadf888206c37f4a151272a0 parent 3e494c80481653bbc810b4e67651097595ea0294 author Stephen Rothwell Tue, 12 Jul 2005 17:42:49 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:32 +1000 [PATCH] ppc64: move iSeries vio iommu init Since the iSeries vio iommu tables cannot be used until after the vio bus has been initialised, move the initialisation of the tables to there. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 3e494c80481653bbc810b4e67651097595ea0294 tree 013625b5fb925d7ddd59067e6ce27f69dda8f4d3 parent 6020164499ff3a61cd8bebceb9e294a155079f71 author Stephen Rothwell Tue, 12 Jul 2005 17:40:17 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:32 +1000 [PATCH] ppc64: split iSeries specific parts out of vio.c This patch splits the iSeries specific parts out of vio.c. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6020164499ff3a61cd8bebceb9e294a155079f71 tree 48e3407b76918314af13b7f38f4a3d2813f11fe8 parent 293da76b3d4c2f362f906bce8c5d2e053bdf8d44 author Frank Rowand Tue, 28 Jun 2005 16:48:04 -0700 committer Paul Mackerras Mon, 29 Aug 2005 10:53:32 +1000 [PATCH] ppc64: change duplicate Kconfig menu "General setup" to "Bus Options" arch/ppc64/Kconfig defines a "General setup" menu, but also sources init/Kconfig which also defines a "General setup" menu. Both of these menus appear at the top level of make menuconfig. Having two menus with the same name is confusing. This patch renames the ppc64/Kconfig menu to be "Bus Options" and moves options in this menu which are not bus related to the end of the "Platform support" menu. There are many variations among architectures on the exact naming of the "Bus Options" menu. I chose to use the simplest one, which is also used in arch/ppc/Kconfig. Signed-off-by: Frank Rowand Signed-off-by: Paul Mackerras commit 293da76b3d4c2f362f906bce8c5d2e053bdf8d44 tree 8df51f65e8fafd152ce0fa57fd0fe9ef56659ef1 parent 34153fa3af45d84f3221d9b67ba2ab7e8a220d28 author Jake Moilanen Thu, 09 Jun 2005 09:31:12 -0500 committer Paul Mackerras Mon, 29 Aug 2005 10:53:31 +1000 [PATCH] ppc64: PCI device-node failure detection OpenFirmware marks devices as failed in the device-tree when a hardware problem is detected. The kernel needs to fail config reads/writes to prevent a kernel crash when incorrect data is read. This patch validates that the device-node is not marked "fail" when config space reads/writes are attempted. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 34153fa3af45d84f3221d9b67ba2ab7e8a220d28 tree 74f69cd35bef255583acaac181324558a286e40c parent e28f7faf05159f1cfd564596f5e6178edba6bd49 author Benjamin Herrenschmidt Tue, 09 Aug 2005 10:36:34 +0200 committer Paul Mackerras Mon, 29 Aug 2005 10:53:31 +1000 [PATCH] flattened device tree changes This patch updates the format of the flattened device-tree passed between the boot trampoline and the kernel to support a more compact representation, for use by embedded systems mostly. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e28f7faf05159f1cfd564596f5e6178edba6bd49 tree 45534d2c33bff8b64e3fd155fba55146cb7518e6 parent decd300b30e499fe6be1bbfc5650fc971de8c1fa author David Gibson Fri, 05 Aug 2005 19:39:06 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:31 +1000 [PATCH] Four level pagetables for ppc64 Implement 4-level pagetables for ppc64 This patch implements full four-level page tables for ppc64, thereby extending the usable user address range to 44 bits (16T). The patch uses a full page for the tables at the bottom and top level, and a quarter page for the intermediate levels. It uses full 64-bit pointers at every level, thus also increasing the addressable range of physical memory. This patch also tweaks the VSID allocation to allow matching range for user addresses (this halves the number of available contexts) and adds some #if and BUILD_BUG sanity checks. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit decd300b30e499fe6be1bbfc5650fc971de8c1fa tree ef4c2842b943b951130abcd0fdf844fcb53720fd parent 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b author Olaf Hering Mon, 08 Aug 2005 13:24:38 +1000 committer Paul Mackerras Mon, 29 Aug 2005 10:53:31 +1000 [PATCH] ppc64: make arch/ppc64/boot standalone Make the bootheader for ppc64 independent from kernel and libc headers. * add -nostdinc -isystem $gccincludes to not include libc headers * declare all functions in header files, also the stuff from string.S * declare some functions static * use stddef.h to get size_t (hopefully ok) * remove ppc32-types.h, only elf.h used the __NN types With further modifications by Paul Mackerras and Stephen Rothwell. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit e13934563db047043ccead26412f552375cea90c tree 4013ca99f718559447315370c9d5e220e71d99d5 parent 86f0cd505781e42000763821ec6f70127a6abaae author Andy Fleming Wed, 24 Aug 2005 18:46:21 -0500 committer Jeff Garzik Sun, 28 Aug 2005 20:28:25 -0400 [PATCH] PHY Layer fixup This patch adds back the code that was taken out, thus re-enabling: * The PHY Layer to initialize without crashing * Drivers to actually connect to PHYs * The entire PHY Control Layer This patch is used by the gianfar driver, and other drivers which are in development. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit af36d7f0df56de3e3e4bbfb15d0915097ecb8cab tree cbeb3d387b99fe8b83e0ff8631c422e7a0489645 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Jeff Garzik Sun, 28 Aug 2005 20:18:39 -0400 committer Jeff Garzik Sun, 28 Aug 2005 20:18:39 -0400 [libata] license change, other bits - changes license of all code from OSL+GPL to plain ole GPL - except for NVIDIA, who hasn't yet responded about sata_nv - copyright holders were already contacted privately - adds info in each driver about where hardware/protocol docs may be obtained - where I have made major contributions, updated copyright dates commit a8eef8a22232e64be76410100c52038b21bda7ed tree 100c6e7d12bea013586d540b3d8ca27c451af049 parent 6c5b90d2c84d557baed56e71729504b467ff3e5b author Kalle Valo Sun, 28 Aug 2005 22:46:57 +0300 committer Jeff Garzik Sun, 28 Aug 2005 19:25:02 -0400 [PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present() With my Buffalo WLI-CF-S11G PC Card kernel oopses every time in prism2_interrupt() when I try load the hostap module. local->hw_priv is null during the first call to prism2_interrupt(). It feels like interrupts are enabled too early, or something. This patch fixes the symptom, but not the cause. Signed-off-by: Kalle Valo Signed-off-by: Jeff Garzik commit 6c5b90d2c84d557baed56e71729504b467ff3e5b tree 02d19e6dac3b340b3ef756e868b703bf50ecfeab parent c6e3f95df7328479e2a454eedb5614eacbdb84ac author Jouni Malinen Sun, 28 Aug 2005 10:51:36 -0700 committer Jeff Garzik Sun, 28 Aug 2005 19:25:02 -0400 [PATCH] hostap: Fix hash values for product strings hostap_cs: 0.4.1-kernel (Jouni Malinen ) pcmcia: hostap_cs: invalid hash for product string "BUFFALO": is 0x1b01a57b, should be 0x2decece3 pcmcia: see Documentation/pcmcia/devicetable.txt for details pcmcia: hostap_cs: invalid hash for product string "WLI-CF-S11G": is 0xefd5102a, should be 0x82067c18 pcmcia: see Documentation/pcmcia/devicetable.txt for details This patch fixes them. Signed-off-by: Kalle Valo Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit c6e3f95df7328479e2a454eedb5614eacbdb84ac tree 56f80ba621279be1dbcc414cbd4aea938efe05bc parent fd67b0641118031a65d370f65bd80eef1982b45a author Jouni Malinen Sun, 28 Aug 2005 10:51:35 -0700 committer Jeff Garzik Sun, 28 Aug 2005 19:25:02 -0400 [PATCH] hostap: Update version Version 0.4.4 of Host AP driver was released, so let's sync the version number in netdev-2.6 tree. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit fd67b0641118031a65d370f65bd80eef1982b45a tree 2e3b8fa3fc93bc1b2b94588b83069e9ea6f602ad parent 831a179fc9387af6dbaa12816ae1e074d1f1a730 parent 91cb70c1769d9b72dd1efe40c31f01005820b09e author Jeff Garzik Sun, 28 Aug 2005 19:23:37 -0400 committer Jeff Garzik Sun, 28 Aug 2005 19:23:37 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 91cb70c1769d9b72dd1efe40c31f01005820b09e tree 2bf0b83759860617d7d2b73a04a0e61fd2e0851a parent 51e828b6a123912f27afc512377ad3e2ab40d2eb author Jouni Malinen Sun, 28 Aug 2005 10:51:34 -0700 committer Jeff Garzik Sun, 28 Aug 2005 19:23:07 -0400 [PATCH] ieee80211: Fix debug comments ipw->ieee80211 Debug variables and procfs dir should be "ieee80211", not "ipw". Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 51e828b6a123912f27afc512377ad3e2ab40d2eb tree 878cb9f93b541af1e6ed4653a58640bb5acf7713 parent 5f55d0850e4ae0b4bfabc9a372af5b9f52be02da author Jouni Malinen Sun, 28 Aug 2005 10:51:33 -0700 committer Jeff Garzik Sun, 28 Aug 2005 19:23:07 -0400 [PATCH] ieee80211: Remove EAPOL debug IEEE 802.11 code has no business touching payloads of EAPOL frames. There are some EAPOL structures defined for debugging and these were confusingly called EAP types which they are not. Let's just remove these before someone else starts using them in the kernel. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 5f55d0850e4ae0b4bfabc9a372af5b9f52be02da tree 0800fc7d25f9b74d4f0fd16fd852a7ad44424bea parent 099c5bb169e9816a7761336f668b63010762807b author Jouni Malinen Sun, 28 Aug 2005 10:51:32 -0700 committer Jeff Garzik Sun, 28 Aug 2005 19:23:06 -0400 [PATCH] ieee80211: Remove WIRELESS_EXT < 17 support No need to maintain support for WIRELESS_EXT < 17 since this kernel tree is already using WIRELESS_EXT 18. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 tree 314aafb0bf58c9f65f49dab8122554828258806d parent e0c93142ceed0a2ea4f5b8e9d0f62c884241e9c0 author Pavel Machek Sun, 28 Aug 2005 22:39:08 +0100 committer Russell King Sun, 28 Aug 2005 22:39:08 +0100 [ARM] drop i386-isms from arm Kconfig This kills i386-specific stuff from arm Kconfig. Please apply, Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 86f0cd505781e42000763821ec6f70127a6abaae tree e6b02e8ee3461a80f8334bcf3a815bd5c51af07f parent 815f62bf742718458ba822a7e1f51f285eb997f2 author Francois Romieu Wed, 24 Aug 2005 01:14:23 +0200 committer Jeff Garzik Sat, 27 Aug 2005 04:41:01 -0400 [PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032 Both revisions share the same PCI device ID and vendor ID but revision 2 of the device uses SysKonnect's chipset whereas revision 3 of the device uses Realtek's 8169 chipset. Credit goes to Christiaan Lutzer for reporting the issue and giving the actual value for the different revisions. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 815f62bf742718458ba822a7e1f51f285eb997f2 tree 01e1dc8b4447bcceca8106182e4cf1327ee9a3ad parent 75a95178dafb5c8d69b4abe45ea746a9cea23142 author Ralf Baechle Wed, 24 Aug 2005 18:06:36 +0100 committer Jeff Garzik Sat, 27 Aug 2005 04:35:31 -0400 [PATCH] SMP rewrite of mkiss Rewrite the mkiss driver to make it SMP-proof following the example of 6pack.c. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik commit 135932651fd1eeb95eb6c5d4f6652aae73fe2c24 tree 3a440b2a471ef4ab57b8aa75c3b068b2b52910ed parent d18d36b4edbb980c9de7fe00724c3ded5de1b7a7 author Jeff Garzik Sat, 27 Aug 2005 04:20:12 -0400 committer Jeff Garzik Sat, 27 Aug 2005 04:20:12 -0400 [libata scsi] fix read/write translation edge cases Fix bugs for unlikely edge cases noticed by Douglas Gilbert: - When READ(6)/WRITE(6) sector count == 0, treat it as 256 sectors - For other READ(x)/WRITE(x), when sector count == 0, error. We don't support successfully completing zero-length transfers at this time. commit d18d36b4edbb980c9de7fe00724c3ded5de1b7a7 tree 387952fb886e995b90fbe91ae4097201c991d938 parent 953d1137fc4aba16deace262e93974913596dcfe author Jeff Garzik Sat, 27 Aug 2005 04:13:52 -0400 committer Jeff Garzik Sat, 27 Aug 2005 04:13:52 -0400 libata: fix a few alan-isms commit a4d61e84804f3b14cc35c5e2af768a07c0f64ef6 tree ecd1d07e5d5643ef1764e2e99de5ddd4103aec5d parent 1ad62a19f177e61d4dde111ba35fb4badd0c2106 author Roland Dreier Thu, 25 Aug 2005 13:40:04 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:38 -0700 [PATCH] IB: move include files to include/rdma Move the InfiniBand headers from drivers/infiniband/include to include/rdma. This allows InfiniBand-using code to live elsewhere, and lets us remove the ugly EXTRA_CFLAGS include path from the InfiniBand Makefiles. Signed-off-by: Roland Dreier commit 1ad62a19f177e61d4dde111ba35fb4badd0c2106 tree e427260a9049b1300fe69c7542bdb4a85fa2fa9a parent fe9e08e17af414a5fd8f3141b0fd88677f81a883 author Michael S. Tsirkin Wed, 24 Aug 2005 14:41:51 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:38 -0700 [PATCH] IPoIB: Fix device removal race Currently we may have work scheduled in default kernel workqueue when the device is going down. The device could get freed before this workqueue gets serviced. I am actually seeing this causing system hangs. The following patch fixes this by using ipoib_workqueue which gets flushed when the device is going down. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit fe9e08e17af414a5fd8f3141b0fd88677f81a883 tree 45c7277413c61cdc2797f2245d010161446c91c9 parent b9ef520f9caf20aba8ac7cb2bbba45b52ff19d53 author Sean Hefty Fri, 19 Aug 2005 13:50:33 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:38 -0700 [PATCH] IB: Add handling for ABORT and STOP RMPP MADs. Add handling for ABORT / STOP RMPP MADs. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit b9ef520f9caf20aba8ac7cb2bbba45b52ff19d53 tree b5e81a95dc8a9a099b85af13c476bf35d49ba56c parent 4ce059378c04b40c2e9f658b1c6a2e9078b85c7c author Sean Hefty Fri, 19 Aug 2005 13:46:34 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:38 -0700 [PATCH] IB: fix userspace CM deadlock Fix deadlock condition resulting from trying to destroy a cm_id from the context of a CM thread. The synchronization around the ucm context structure is simplified as a result, and some simple code cleanup is included. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4ce059378c04b40c2e9f658b1c6a2e9078b85c7c tree b06c073dec56407c784eea3058f5d79da0bf81af parent ec34a922d243c3401a694450734e9effb2bafbfe author Roland Dreier Fri, 19 Aug 2005 12:03:17 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IPoIB: Set full membership bit in P_Keys Always make sure that the full membership bit is set in the P_Keys that IPoIB uses. This makes sure that all hosts join the correct multicast groups so that hosts that are partial partition members can talk to the rest of the network. Signed-off-by: Roland Dreier commit ec34a922d243c3401a694450734e9effb2bafbfe tree 7d79ed1848d1b63665d7565274c1d2b56d09df9d parent d20a40192868082eff6fec729b311cb8463b4a21 author Roland Dreier Fri, 19 Aug 2005 10:59:31 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB/mthca: Add SRQ implementation Add mthca support for shared receive queues (SRQs), including userspace SRQs. Signed-off-by: Roland Dreier commit d20a40192868082eff6fec729b311cb8463b4a21 tree dae3cac48c76da789215cb9067559a7b721cbc5f parent c04bc3d1f417a8a90eef9ab46523dfd44858b28d author Roland Dreier Fri, 19 Aug 2005 10:36:11 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB/mthca: Handle context tables smaller than our chunk size When creating a table in context memory where the table is smaller than our chunk size, we don't want to allocate and map a full chunk. Instead, allocate just enough memory to cover the table. This can be pretty simple because all tables are a power-of-2 size, so either the table is a multiple of the chunk size, or it's smaller than one chunk. Signed-off-by: Roland Dreier commit c04bc3d1f417a8a90eef9ab46523dfd44858b28d tree 5ac9dac7c37fc0b644814f8563fa3dad3c73e789 parent 288bdeb4bc5b89befd7ee2f0f0183604034ff6c5 author Roland Dreier Fri, 19 Aug 2005 10:33:35 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB/mthca: Move WQE structures into their own header Move the definitions of the WQE structures from mthca_qp.c into mthca_wqe.h, so that we'll be able to share them when we add the SRQ code in mthca_srq.c. Signed-off-by: Roland Dreier commit 288bdeb4bc5b89befd7ee2f0f0183604034ff6c5 tree f7b41185acd11fb7e0daf66f7b771621bd604159 parent 87b816706bb2b79fbaff8e0b8e279e783273383e author Roland Dreier Fri, 19 Aug 2005 09:19:05 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB/mthca: Simplify handling of completions with error Mem-free HCAs never generate error CQEs that complete multiple WQEs, so just skip the call to mthca_free_err_wqe() for them rather than having logic to handle the mem-free case in mthca_free_err_wqe(). Signed-off-by: Roland Dreier commit 87b816706bb2b79fbaff8e0b8e279e783273383e tree 94e9a87fd5cbf1f069cba4e8a766ef718d18e5e4 parent f520ba5aa48e2891c3fb3e364eeaaab4212c7c45 author Roland Dreier Thu, 18 Aug 2005 13:39:31 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB/mthca: Factor out common queue alloc code Clean up the allocation of memory for queues by factoring out the common code into mthca_buf_alloc() and mthca_buf_free(). Now CQs and QPs share the same queue allocation code, which we'll also use for SRQs. Signed-off-by: Roland Dreier commit f520ba5aa48e2891c3fb3e364eeaaab4212c7c45 tree ba512b75aaef8bf0c89ab4f75b80c75af5ead60c parent d41fcc6705eddd04f7218c985b6da35435ed73cc author Roland Dreier Thu, 18 Aug 2005 12:24:13 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:37 -0700 [PATCH] IB: userspace SRQ support Add SRQ support to userspace verbs module. This adds several commands and associated structures, but it's OK to do this without bumping the ABI version because the commands are added at the end of the list so they don't change the existing numbering. There are two cases to worry about: 1. New kernel, old userspace. This is OK because old userspace simply won't try to use the new SRQ commands. None of the old commands are changed. 2. Old kernel, new userspace. This works perfectly as long as userspace doesn't try to use SRQ commands. If userspace tries to use SRQ commands, it will get EINVAL, which is perfectly reasonable: the kernel doesn't support SRQs, so we couldn't do any better. Signed-off-by: Roland Dreier commit d41fcc6705eddd04f7218c985b6da35435ed73cc tree 9c560f65a731ef79309e07598d63ab57fdfedc46 parent d1887ec2125988adccbd8bf0de638c41440bf80e author Roland Dreier Thu, 18 Aug 2005 12:23:08 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB: Add SRQ support to midlayer Make the required core API additions and changes for shared receive queues (SRQs). Signed-off-by: Roland Dreier commit d1887ec2125988adccbd8bf0de638c41440bf80e tree 418a4b95defa44fce5d52688e29265ded4d1a6d0 parent da6561c285a6e28a075b97fd5a1560a2b0ce843e author Roland Dreier Thu, 18 Aug 2005 12:14:11 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB/mthca: Report correct max_msg_sz Set the max_msg_sz port property correctly in mthca's port_query function. Also zero out the attr struct so that we don't leave any other members uninitialized. Signed-off-by: Roland Dreier commit da6561c285a6e28a075b97fd5a1560a2b0ce843e tree f39c9f1529e3c8aede42490d67a75321a8d8a25e parent 2aeba9a03b0d249fc710b9939fc089ce53d8cd30 author Roland Dreier Wed, 17 Aug 2005 07:39:10 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB/mthca: Use correct port width capability value When we call the INIT_IB firmware command to bring up a port, use the actual port width capability returned by the QUERY_DEV_LIM command instead of always trying to enable both 1X and 4X. This fixes breakage seen when the firmware is build to allow 4X only. Signed-off-by: Roland Dreier commit 2aeba9a03b0d249fc710b9939fc089ce53d8cd30 tree 86c6bee15f6e581fa6b035ee3506e92eab1d775a parent 5dd2ce1200f4b12687d74de89a527f99e16c344e author Olaf Hering Mon, 15 Aug 2005 14:29:03 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB: Remove unnecessary includes of changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. Remove unneeded includes of . Signed-off-by: Olaf Hering Signed-off-by: Roland Dreier commit 5dd2ce1200f4b12687d74de89a527f99e16c344e tree 42df0cb1c801b60f8e4e3604bd736bddae8de641 parent 7f9f2dba729cee6ea10596ccb07447d467705b08 author Hal Rosenstock Mon, 15 Aug 2005 14:16:36 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB: Fix ib_mad_thread_completion_handler declaration Change ib_mad_thread_completion_handler to conform to ib_comp_handler declaration. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 7f9f2dba729cee6ea10596ccb07447d467705b08 tree 55119f1141a71bf24265e37f6fb4d53110a1ed4c parent ffbf4c34f1916fa1e0554269c94c57da4a21a348 author Guy German Mon, 15 Aug 2005 07:38:50 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB/mthca: use generic function instead of arbel_ version in mthca_free_region() Use the generic key_to_hw_index() function instead of the Arbel-specific version in mthca_free_region(). Signed-off-by: Guy German Signed-off-by: Roland Dreier commit ffbf4c34f1916fa1e0554269c94c57da4a21a348 tree 1361f0ca29e0a8d4e22fb508b7493db441007c7f parent 2e8b981c5d5c6fe5479ad47c44e3e76ebb5408ef author Roland Dreier Mon, 15 Aug 2005 07:35:16 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:36 -0700 [PATCH] IB: unmap FMRs when destroying FMR pool Make sure that all FMRs are unmapped before we deallocate them so that we don't leak references to our protection domain when destroying an FMR pool. (Bug reported by Guy German ) Signed-off-by: Roland Dreier commit 2e8b981c5d5c6fe5479ad47c44e3e76ebb5408ef tree d01fc31cb120666633f92d0eaf48b82b6a22be46 parent 97f52eb438be7caebe026421545619d8a0c1398a author Michael S. Tsirkin Sat, 13 Aug 2005 21:19:38 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:35 -0700 [PATCH] IB/mthca: add HCA board ID to sysfs info Add support for reporting HCA board ID returned from QUERY_ADAPTER firmware command through sysfs. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 97f52eb438be7caebe026421545619d8a0c1398a tree 1085acb833b691e9cc7ef607e4b4ac8cbd81e03f parent 92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 author Sean Hefty Sat, 13 Aug 2005 21:05:57 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:35 -0700 [PATCH] IB: sparse endianness cleanup Fix sparse warnings. Use __be* where appropriate. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 tree 847c73d3cf07ec28357579417070f8952952e253 parent 2a1d9b7f09aaaacf235656cb32a40ba2c79590b3 author Hal Rosenstock Sat, 13 Aug 2005 20:50:27 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:35 -0700 [PATCH] IB: Eliminate redundant NULL checks IPoIB: Eliminate NULL checks prior to calling kfree Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 2a1d9b7f09aaaacf235656cb32a40ba2c79590b3 tree bf3666faca29dc1938851ec305e8d78d8daa4d21 parent 49f6a7fbe123dde25ca4193a7d60705784e18317 author Roland Dreier Wed, 10 Aug 2005 23:03:10 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:35 -0700 [PATCH] IB: Add copyright notices Make some lawyers happy and add copyright notices for people who forgot to include them when they actually touched the code. Signed-off-by: Roland Dreier commit 49f6a7fbe123dde25ca4193a7d60705784e18317 tree 6ad84bd7dc565bbfbc74efd89b8646671fd567b7 parent 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 author Tziporet Koren Wed, 10 Aug 2005 23:00:50 -0700 committer Roland Dreier Fri, 26 Aug 2005 20:37:34 -0700 [PATCH] IB: Update current firmware versions in mthca driver Update FW versions in mthca according to July 05 Mellanox release Signed-off-by: Tziporet Koren Signed-off-by: Roland Dreier commit 953d1137fc4aba16deace262e93974913596dcfe tree eab6d64bfb298f1a42dc16c5e4d424ec57c42909 parent b73fc89f6d1f84326e5e897ad249d00a9f218fd7 author Jeff Garzik Fri, 26 Aug 2005 19:46:24 -0400 committer Jeff Garzik Fri, 26 Aug 2005 19:46:24 -0400 [libata sata_sil] list documentation URL, since its public commit f8220c7f15c54aefb4976ad7c6e2aa98b27a8ce8 tree 98afd79d11f51239cd69617865c77e9165ea5f08 parent b5f3616ba73699d07deee1f244179fae49502052 author Kenneth Chen Fri, 26 Aug 2005 14:57:00 -0700 committer Tony Luck Fri, 26 Aug 2005 16:01:25 -0700 [IA64] Delete erroneous copy_page.o in global lib-y list copy_page.o appeared twice in arch/ia64/lib/Makefile. The one in global lib-y is wrong where it should be just in lib-$(CONFIG_ITANIUM). Both copy_page.o and copy_page_mck.o are build for Itanium2 processor and the link order will pick up the low performing copy_page function (originally written for itanium processor). In this case, we really want the copy_page_mck.o for optimized version. Signed-off-by: Kenneth Chen Signed-off-by: Tony Luck commit 4db8699bcfa8faddb5727b1cb010a4d9b8a42e8c tree eb4cb14927ed9cf4507f875cd69fe35f87b3b3bc parent fd589e0b662c1ea8cfb1e0d20d60a2510979865b author Venkatesh Pallipadi Fri, 29 Jul 2005 16:15:00 -0700 committer Tony Luck Fri, 26 Aug 2005 15:09:24 -0700 [IA64] Add ACPI based P-state support Patch to support P-state transitions on ia64. This driver is based on ACPI, and uses the ACPI processor driver interface to find out the P-state support information for the processor. This driver plugs into generic cpufreq infrastructure. Once this driver is loaded successfully, ondemand/userspace governor can be used to change the CPU frequency dynamically based on load or on request from userspace process. Refer : ACPI specification - http://www.acpi.info P-state related PAL calls - http://developer.intel.com/design/itanium/downloads/24869909.pdf Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit d1e079b3fc90c7c114f46771e983a72ac8740882 tree 7c0bf2cdece65ae355977bf7aff3925fd20217ea parent 8409668b561fbe464f7a392e8dc77eca225d27ac author Russ Anderson <(rja@sgi.com)> Mon, 15 Aug 2005 14:46:00 -0700 committer Tony Luck Fri, 26 Aug 2005 15:01:37 -0700 [IA64-SGI] fix bte_copy() calling smp_processor_id() while preemptible bte_copy() calls calls smp_processor_id(), which will get flagged if preemption if enabled. raw_smp_processor_id() is used instead because we are just using it to pick a BTE interface and are not tied to a specific cpu. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit b73fc89f6d1f84326e5e897ad249d00a9f218fd7 tree 557d5ba51a4f6c58be0717c0da13c2e409fd6008 parent 31433ea369d250ad011577eee6110d3efcb9d861 author Alan Cox Fri, 26 Aug 2005 16:03:19 +0100 committer Jeff Garzik Fri, 26 Aug 2005 17:36:26 -0400 [PATCH] libata: regularize dma_start/stop arguments Needed for a few PATA drivers. Also fix up a wrong comment. Signed-off-by: Jeff Garzik commit 31433ea369d250ad011577eee6110d3efcb9d861 tree 5fc76351fd3049cb3548e958fd79236bf202b332 parent b8f6153ee421014f42b620238f4203a4106db309 author Alan Cox Fri, 26 Aug 2005 15:56:47 +0100 committer Jeff Garzik Fri, 26 Aug 2005 17:36:25 -0400 [PATCH] libata: typo You spelt heuristic wrongly. Also reformatted to 80 columns, ignore the diff and fix the typo if you prefer that. Signed-off-by: Jeff Garzik commit 8409668b561fbe464f7a392e8dc77eca225d27ac tree 7783a2e701b7ae866be858e9121ec70f91fe4fa9 parent 5b9021bc5800796e23e4994f8cf2dc61536be0a7 author Mark Maule Thu, 25 Aug 2005 11:45:00 -0700 committer Tony Luck Fri, 26 Aug 2005 12:09:01 -0700 [IA64] altix: Abstract irq_affinity at the sn pci provider Altix patch to abstract irq_affinity down to the pci provider level since different SGI hardware implements this in different ways. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 3690b6c124fbc7259634f3b80d92a6d9fe51ec79 tree 406f56331a1dc94054f08cff65d5bd9b49e28562 parent e9985d53e3da3b51d0334d0622c449fda78ae089 author Francois Romieu Fri, 26 Aug 2005 00:30:37 +0200 committer Jeff Garzik Fri, 26 Aug 2005 00:52:11 -0400 [PATCH] sis190: complete the mii probe before registering the netdevice The userspace must not be able to issue ethtool command and manage the mii before it is completely initialized. Avoid some pesky "eth%d" messages. Signed-off-by: Arnaud Patard Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit b8f6153ee421014f42b620238f4203a4106db309 tree ebc9eac4517325be0a91a4e2b2cb38f08d36812e parent 617e44fdfd7ee3d53388ab295d9411b826437ce9 author Jeff Garzik Thu, 25 Aug 2005 22:01:20 -0400 committer Jeff Garzik Thu, 25 Aug 2005 22:01:20 -0400 libata: fix EH locking Wrap ata_qc_complete() calls in EH context in spinlocks, to prevent races (mainly in ATAPI code paths). commit 831a179fc9387af6dbaa12816ae1e074d1f1a730 tree efb3ea5fc390e7cefdaadb535dc166319ac6f69d parent b4bf343093e81e33d75bede45896eda52cd5f2b4 author Jeff Garzik Thu, 25 Aug 2005 20:59:10 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:59:10 -0400 hostap: s/IEEE80211_FCTL_WEP/IEEE80211_FCTL_PROTECTED/ to fix build commit b4bf343093e81e33d75bede45896eda52cd5f2b4 tree 7fd5ce5f428995e6d612014e3ca7ad3f917fcf65 parent 343b0597297c3190647854881c087c01faf40a6f parent 099c5bb169e9816a7761336f668b63010762807b author Jeff Garzik Thu, 25 Aug 2005 20:31:13 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:31:13 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 099c5bb169e9816a7761336f668b63010762807b tree 021fc2d3afa5889e45593aef433a4051633d6abf parent 95d5185d1ab6875b86a639310919dc48a716c7be author Jiri Benc Thu, 25 Aug 2005 20:15:10 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:15:10 -0400 ieee80211: use endian-aware types From: Michael Wu This patch: - fixes misc. whitespace/comments - replaces u16 with __le16/__be16 where appropriate Signed-off-by: Michael Wu Signed-off-by: Jiri Benc commit 95d5185d1ab6875b86a639310919dc48a716c7be tree 4e127ad70ce5de9a33d81c875e665c229e66000d parent f13baae43e97e84d3f06080908db75a017c62165 author Jiri Benc Thu, 25 Aug 2005 20:13:04 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:13:04 -0400 ieee80211: convert defines to enums From: Gertjan van Wingerde Attached patch cleans up the long lists of #defines for status codes, reason codes, and information elements. Signed-off-by: Gertjan van Wingerde Signed-off-by: Jiri Benc commit f13baae43e97e84d3f06080908db75a017c62165 tree f1611a5418f2c9790d99017b1cd001fc3a065d0b parent 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f author Jiri Benc Thu, 25 Aug 2005 20:11:46 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:11:46 -0400 ieee80211: new constants from latest 802.11x specifications From: Gertjan van Wingerde Attached patch updates the definitions of the generic ieee80211 stack to the latest versions of the published 802.11x specification suite. Signed-off-by: Gertjan van Wingerde Signed-off-by: Jiri Benc commit 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f tree 404fb9ba1a837bc9661bbbf45c3734adf3ef957a parent 771abed990d8642f289f733dc0fa8a395ab31ca1 author Jiri Benc Thu, 25 Aug 2005 20:09:39 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:09:39 -0400 ipw2200: minor cleanups This removes one trap for a programmer, few unused macros, and one unused struct. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 771abed990d8642f289f733dc0fa8a395ab31ca1 tree 576836a8eb68aeb27741199e0a6f0a2382fdf85e parent 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe author Jiri Benc Thu, 25 Aug 2005 20:08:22 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:08:22 -0400 This removes support for old (and non-mainline) kernels from ipw2200. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe tree 8f31ce7cd3da75ad255c1bedc2a16dee75dc21af parent 53788015c736b9957448aebd7b7c286da217ee51 author Jiri Benc Thu, 25 Aug 2005 20:07:01 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:07:01 -0400 ipw2100: interface-up carrier state fix From: Imre Deak I had a problem where doing an open after a close left the device unusable. netif_carrier_on should be called whenever we go to the associated state, but this is not so in case of a close->open sequence. Signed-off-by: Jiri Benc commit 53788015c736b9957448aebd7b7c286da217ee51 tree 8a86bf1e50bf971f2515faeaa9320e17548a4810 parent c4aee8c21ff5d8d6f9a27112468f5e840d5ced1b author Jiri Benc Thu, 25 Aug 2005 20:05:45 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:05:45 -0400 ipw2100: Fix incorrectly named config option. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit c4aee8c21ff5d8d6f9a27112468f5e840d5ced1b tree 8bbd4c06bcbcb94083b6424dcd592f7245833e89 parent 797b4f7652a4dcf06bdf6a8c870991acdf56c03d author Jiri Benc Thu, 25 Aug 2005 20:04:43 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:04:43 -0400 ipw2100: minor cleanups From: Adrian Bunk This patch contains the following possible cleanups: - make needlessly global code static - remove the unused IPW_DEBUG_ENABLED Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit 797b4f7652a4dcf06bdf6a8c870991acdf56c03d tree 8f948ed3592fe9e4f726955f4d1e217af00622a7 parent 19f7f74297e7f88f60c183acb105a5488dd189b6 author Jiri Benc Thu, 25 Aug 2005 20:03:27 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:03:27 -0400 ipw2100: remove custom debug-print macros From: Pavel Machek ipw2100 uses custom debug prints that are sometimes longer and always harder to read than normal printk. They also introduced some bugs where prefix is printed twice. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 19f7f74297e7f88f60c183acb105a5488dd189b6 tree bda720299a5212d3da8d23017fbf54c92c0bd527 parent e88187eedc0a9223914b23b063342db8bcc31f9c author Jiri Benc Thu, 25 Aug 2005 20:02:10 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:02:10 -0400 ipw2100: remove strange symbol prefixes From: Pavel Machek ipw2100 uses strange X__ prefixes even for symbols already prefixed by ipw2100. Fixed. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit e88187eedc0a9223914b23b063342db8bcc31f9c tree bbe79e548146565c0119f36b4e71599b63c6af4f parent b2382b363df828f25e35ed8b70a3da33b29b2a64 author Jiri Benc Thu, 25 Aug 2005 20:00:53 -0400 committer Jeff Garzik Thu, 25 Aug 2005 20:00:53 -0400 ieee80211: Puts debug macros together and makes escape_essid not inlined. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit 611494dccacb3e42f55359df74d604b67312598b tree 25961f5c87147b44ee0ba63317b3caa8dda0272e parent 685fac63f5ca6c5ca06bab641e1a32bbf9287e89 author Malli Chilakala Thu, 25 Aug 2005 13:06:52 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:33 -0400 [PATCH] e100: Driver version, white space, comments & other Driver version, white space, comments & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 685fac63f5ca6c5ca06bab641e1a32bbf9287e89 tree 0619bdb57b40f4e8521afe2d0fb231b1ba51f87b parent e6280f26b43775d8fa0c54e50c92491cfccbf738 author Malli Chilakala Thu, 25 Aug 2005 13:06:34 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:33 -0400 [PATCH] e100: CPU cycle saver microcode Add cpu cycle saver microcode to 8086:{1209/1229} other than ICH devices. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit e6280f26b43775d8fa0c54e50c92491cfccbf738 tree 6b92e1d76e38a75198382011f2f4702757e1de72 parent 996ec3533ae15424e339089a8045ca1c998f8a87 author Malli Chilakala Thu, 25 Aug 2005 13:06:23 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:33 -0400 [PATCH] e100: Increased delay loop for command blocks Increased delay loop for command blocks Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 996ec3533ae15424e339089a8045ca1c998f8a87 tree e61cce4f8f1d96461e2fbd76307b88061bc4f5ec parent a074fb860846937a4a46dbbf439cbbb2e2ba960c author Malli Chilakala Thu, 25 Aug 2005 13:06:08 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:32 -0400 [PATCH] e100: fixed endian bug in xmit_prepare routine Fixed endian bug associated with cb_i bit in xmit_prepare Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a074fb860846937a4a46dbbf439cbbb2e2ba960c tree 97c7c923e7733ba0b3d72b84c75111802f2c4133 parent 136df52d532af9c19e5cd0e43a54ea4ee2d934fc author Malli Chilakala Thu, 25 Aug 2005 13:05:57 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:32 -0400 [PATCH] e100: added msleep_interruptible delay added msleep_interruptible delay right before returning from diag_test Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 136df52d532af9c19e5cd0e43a54ea4ee2d934fc tree 104e7d162e5f85d3113946fd54c0ccb48e517da1 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Malli Chilakala Thu, 25 Aug 2005 13:05:41 -0700 committer Jeff Garzik Thu, 25 Aug 2005 16:18:32 -0400 [PATCH] e100: Do not check Rx packet length against mtu Do not check Rx packet length against mtu - patch from Darren Tucker Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 5b9021bc5800796e23e4994f8cf2dc61536be0a7 tree fdc500b570471049213c1ba623b7f8c5645768d7 parent 5390970d1c11b6d5d6a8253a718ed100e2178e14 author Russ Anderson <(rja@sgi.com)> Wed, 17 Aug 2005 10:00:00 -0700 committer Tony Luck Wed, 24 Aug 2005 16:26:13 -0700 [IA64] SGI SN remove redundant partition SAL call Clean up of SGI SN partitioning related code. The SN_SAL_GET_SN_INFO SAL call returns the partition ID, making the SN_SAL_SYSCTL_PARTITION_GET SAL call redundant. Remove sn_partid and use sn_partition_id. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 5390970d1c11b6d5d6a8253a718ed100e2178e14 tree 37a15b2e8249386b230e29fe6a067ad7184d0223 parent 60a3ba0bb45995ecf9cfe208527d7cfd6128d053 author Mark Goodwin Tue, 16 Aug 2005 00:51:00 -0700 committer Tony Luck Wed, 24 Aug 2005 16:25:21 -0700 [IA64] - SGI SN hwperf enhancements - Update the SN pci device info to use the nearest node function to allocate driver memory on the nearest node (rather than defaulting to node 0). Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit 60a3ba0bb45995ecf9cfe208527d7cfd6128d053 tree 3a510269b2e336f58ecc3735877e60c1677a4b11 parent ecc3c30ae39c4d3cbf249a1ebd599465e0e25708 author Mark Goodwin Wed, 17 Aug 2005 15:17:00 -0700 committer Tony Luck Wed, 24 Aug 2005 16:24:42 -0700 [IA64] - SGI SN hwperf enhancements - Add a new exported function for determining the nearest node with CPUs for I/O nodes and fix a bug where the hwperf dynamic misc device was being registered before misc_init(). Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit ecc3c30ae39c4d3cbf249a1ebd599465e0e25708 tree 0a5ee4e1400fc05abc230e99e4d633d9f27304bd parent 470ceb05d9a2b4d61c19fac615a79e56e8401565 author Mark Goodwin Tue, 16 Aug 2005 00:50:00 -0700 committer Tony Luck Wed, 24 Aug 2005 16:23:39 -0700 [IA64] - SGI SN hwperf enhancements - export_pci_topology Bugfix to export PCI topology information in /proc/sgi_sn/sn_topology. Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit 1b66776da71e33dff5edcc0b096ec3b7c40c75ad tree 138e13ac97b8af1f52f7fa798bc8f29851b9e176 parent 0a41e2501160587eb8f66cef3bdf1c6f2cb86997 author Greg Edwards Mon, 22 Aug 2005 09:57:00 -0700 committer Tony Luck Wed, 24 Aug 2005 15:37:26 -0700 [IA64] clean up sn2 region definitions Clean up some duplicate region definitions in sn2 code. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 0a41e2501160587eb8f66cef3bdf1c6f2cb86997 tree 9f5b0288c3101344acd22f7e901fe909a8f98df6 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Peter Chubb Tue, 16 Aug 2005 19:54:00 -0700 committer Tony Luck Wed, 24 Aug 2005 15:35:41 -0700 [IA64] Rationalise Region Definitions Currently, region numbers are defined in several files, with several names. For example, we have REGION_KERNEL in asm/page.h and RGN_KERNEL in pgtable.h We also have address definitions that should depend on the RGN_XXX macros, but are currently just long constants. The following patch reorganises all the definitions so that they have the same form (RGN_XXX), are in one place, and that addresses that depend on RGN_XXX are derived from them. (This is a necessary but not sufficient patch to allow UML-like operation on IA64). Thanks to David Mosberger for catching the change I missed in mmu_context.h. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit b5f3616ba73699d07deee1f244179fae49502052 tree 22081641f3873ec2f7632005357be03ca1468e3d parent 38d26b9f577ec63ba64926c45f4ee3805ed2041c author Bjorn Helgaas Tue, 23 Aug 2005 09:24:00 -0700 committer Tony Luck Wed, 24 Aug 2005 14:55:09 -0700 [IA64] fix IO_SPACE_SPARSE_ENCODING macro ambiguity Parenthesize "p" to avoid ambiguity. No callers have a problem today; this is just to clean up the bad form. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 38d26b9f577ec63ba64926c45f4ee3805ed2041c tree d9ff25263dfa04c0926f8865d68e2e505ddfce2f parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Adrian Bunk Wed, 24 Aug 2005 03:58:00 -0700 committer Tony Luck Wed, 24 Aug 2005 14:50:37 -0700 [IA64] arch/ia64/hp/sim/boot/fw-emu.c: remove egcs workaround Kernel 2.6 doesn't support egcs, and I didn't find any user of this function. Signed-off-by: Adrian Bunk Signed-off-by: Tony Luck commit a877bd36f7584fd7e4729099348cfc9190ba00aa tree 24e8946ece51b37d54c6a76146d6523eef6c34d8 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Kumar Gala Wed, 24 Aug 2005 09:53:00 -0700 committer Tony Luck Wed, 24 Aug 2005 13:23:30 -0700 [IA64] remove use of asm/segment.h Removed IA64 architecture specific users of asm/segment.h The removal of asm-ia64/segment.h itself can wait until all of the kernel source has been purged of references. Signed-off-by: Kumar Gala Signed-off-by: Tony Luck commit 75a95178dafb5c8d69b4abe45ea746a9cea23142 tree 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 parent 8531c5ffbca65f6df868637c26e6df6f88bff738 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Jeff Garzik Wed, 24 Aug 2005 01:03:34 -0400 committer Jeff Garzik Wed, 24 Aug 2005 01:03:34 -0400 Merge upstream into 'upstream' branch of netdev-2.6.git. Hand fix merge conflict in drivers/net/tokenring/Kconfig. commit 343b0597297c3190647854881c087c01faf40a6f tree 81cf818936bfd4aff891d1ca4d4ea4d47b2d1631 parent b2dabd5aadae6a93026f35269e1e53c1a0c6de2d parent b2382b363df828f25e35ed8b70a3da33b29b2a64 author Jeff Garzik Wed, 24 Aug 2005 01:02:24 -0400 committer Jeff Garzik Wed, 24 Aug 2005 01:02:24 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit b2382b363df828f25e35ed8b70a3da33b29b2a64 tree 23aa2e70ba4650390c9281b3696172313bdb0f38 parent 1b5cca3a88b7682d538d129c25f0e3092613a243 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Jeff Garzik Wed, 24 Aug 2005 01:02:04 -0400 committer Jeff Garzik Wed, 24 Aug 2005 01:02:04 -0400 Merge upstream into ieee80211. Hand-fix merge conflict in drivers/usb/net/zd1201.c. commit 617e44fdfd7ee3d53388ab295d9411b826437ce9 tree ed6bd2a5960f706fa93c6df2cbfb75ede926fd1c parent 4887f76ec3d38e99286c9d0fdd6a719174d02e44 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Jeff Garzik Wed, 24 Aug 2005 00:55:22 -0400 committer Jeff Garzik Wed, 24 Aug 2005 00:55:22 -0400 Merge /spare/repo/linux-2.6/ commit 16592d269801ea68130b283c888ffb3c3e988299 tree b6a2666e8c2f496c20c97eea06b6e1012593b80b parent f6fdd7d9c273bb2a20ab467cb57067494f932fa3 author Christoph Lameter Mon, 22 Aug 2005 12:20:00 -0700 committer Tony Luck Tue, 23 Aug 2005 10:31:57 -0700 [IA64] Remove rwsem limitation of 32k waiters We ran into the limit with the maximum number of waiters at one of our sites. This patch increases the number of possible waiters from 2^15 to 2^31 by using a long for the counter in struct rw_semaphore. S390 and alpha already do this. Signed-off-by: Christoph Lameter Acked-by: Kenneth Chen Signed-off-by: Tony Luck commit 4887f76ec3d38e99286c9d0fdd6a719174d02e44 tree 9b691ba8f76dd294f2f792d58663ab69e964233e parent 1410b0a7ad3178968c120bad726976fb48ab336b parent 6885433c25aaca2cb13ee52a94be156163d6aa23 author Jeff Garzik Tue, 23 Aug 2005 03:35:44 -0400 committer Jeff Garzik Tue, 23 Aug 2005 03:35:44 -0400 /spare/repo/libata-dev branch 'upstream-fixes' commit 8531c5ffbca65f6df868637c26e6df6f88bff738 tree 2f4fc2f57c83b4d67e06273df4964dc1d724daa5 parent efcce839360fb3a7b6dedeacaec80f68b0f2d052 author Arthur Kepner Tue, 23 Aug 2005 01:34:53 -0400 committer Jeff Garzik Tue, 23 Aug 2005 01:34:53 -0400 [PATCH] bonding: inherit zero-copy flags of slaves This change allows a bonding device to inherit the "zero-copy" features of its slave devices. It was inspired by a couple of previous postings on this topic: http://marc.theaimsgroup.com/?l=bonding-devel&m=111924607327794&w=2 http://marc.theaimsgroup.com/?l=bonding-devel&m=111925242706297&w=2 and it's largely a combination of the patches that appear in those emails. Signed-off-by: Arthur Kepner commit efcce839360fb3a7b6dedeacaec80f68b0f2d052 tree 7ddeeb994619d0c29f3a9c7ac923a376dec413f5 parent 2600636065406dc14948ac2d2913c66c51be80d5 author Finn Thain Sat, 20 Aug 2005 15:53:22 +1000 committer Jeff Garzik Tue, 23 Aug 2005 01:32:12 -0400 [PATCH] macsonic/jazzsonic network drivers update The purpose of this patch: - Adopt the DMA API (jazzsonic, macsonic & core driver). - Adopt the driver model (macsonic). This part was cribbed from jazzsonic. As a consequence, macsonic once again works as a module. Driver model is also used by the DMA calls. - Support 16 bit cards (macsonic & core driver, also affects jazzsonic) This code was adapted from the mac68k linux 2.2 kernel, where it has languished for a long time. - Support more 32-bit mac cards (macsonic) Also from mac68k repo. - Zero-copy buffer handling (core driver) Provides a nice performance improvement. The new algorithm incidentally helped to replace the old Jazz DMA code. The patch was tested on a variety of macs (several 32-bit quadra built-in NICs, a 16-bit LC PDS NIC and a 16-bit comm-slot NIC), and also on MIPS Jazz. Signed-off-by: Finn Thain Acked-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit 1410b0a7ad3178968c120bad726976fb48ab336b tree 1a2178acfeca2b9a33091e562f84f53bbcec9186 parent e4deec6304cbd5fd08bf573eccc68787945071c2 parent f6fdd7d9c273bb2a20ab467cb57067494f932fa3 author Jeff Garzik Tue, 23 Aug 2005 01:07:10 -0400 committer Jeff Garzik Tue, 23 Aug 2005 01:07:10 -0400 Merge /spare/repo/linux-2.6/ commit e4deec6304cbd5fd08bf573eccc68787945071c2 tree a204b3a824019d1ef1839318612ab0224c55beb0 parent 40e8c82c74b9be793601e098fd1313bc2632c5dc author Tejun Heo Tue, 23 Aug 2005 07:27:25 +0900 committer Jeff Garzik Tue, 23 Aug 2005 01:05:55 -0400 [PATCH] sil: apply M15W quirk selectively (take 2) As SII reports that only original 3112's are affected by M15W quirk, This patch adds SIL_FLAG_MOD15WRITE to selectively apply M15W quirk depending on chipsets. As of yet, we don't know exactly which PCI IDs are for original 3112, so M15W quirk is applied to all except for 3512 and 3124. Once more info is avaliable, we can change some of these sil_3112_m15w's to sil_3112. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 40e8c82c74b9be793601e098fd1313bc2632c5dc tree b3c89b2aaa5d477e8db5acc9bf4ee6f31acf3db8 parent c1389503710ef4b4e5d21bea284afde19e9619cf author Tejun Heo Mon, 22 Aug 2005 17:12:45 +0900 committer Jeff Garzik Tue, 23 Aug 2005 01:05:55 -0400 [PATCH] libata: implement ata_poll_qc_complete and use it in polling functions [PATCH libata-dev-2.6:upstream] implement ata_poll_qc_complete and use it in polling functions Previously, libata polling functions turned irq back on and completed qc commands without holding host lock. This creates a race condition between the polling task and interrupts from other ports on the same host set or spurious interrupt from itself. This patch implements ata_poll_qc_complete which enables irq and completes qc atomically and convert all polling functions. Note: atapi_packet_task() didn't use to turn irq back on or clear ATA_FLAG_NOINTR on error exits. This patch makes it use ata_poll_qc_complete which does both. Note: With this change, ALL invocations of ata_qc_complete() are now done under host_set lock. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c1389503710ef4b4e5d21bea284afde19e9619cf tree 270bf8ea0c2ac354273766d8a1ddfb12cd58b608 parent c0b34ad2956036cdba87792d6c46d8f491539df1 author Tejun Heo Mon, 22 Aug 2005 14:59:24 +0900 committer Jeff Garzik Tue, 23 Aug 2005 01:05:55 -0400 [PATCH] fix atapi_packet_task vs. intr race (take 2) Interrupts from devices sharing the same IRQ could cause ata_host_intr to finish commands being processed by atapi_packet_task if the commands are using ATA_PROT_ATAPI_NODATA or ATA_PROT_ATAPI_DMA protocol. This is because libata interrupt handler is unaware that interrupts are not expected during that period. This patch adds ATA_FLAG_NOINTR flag to tell the interrupt handler that we're not expecting interrupts. Note that once proper HSM is implemented for interrupt-driven PIO, this should be merged into it and this flag will be removed. ahci.c is a different kind of beast, so it's left alone. * The following drivers use ata_qc_issue_prot and ata_interrupt, so changes in libata core will do. ata_piix sata_sil sata_svw sata_via sata_sis sata_uli * The following drivers use ata_qc_issue_prot and custom intr handler. They need this change to work correctly. sata_nv sata_vsc * The following drivers use custom issue function and intr handler. Currently all custom issue functions don't support ATAPI, so this change is irrelevant, updated for consistency and to avoid later mistakes. sata_promise sata_qstor sata_sx4 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c0b34ad2956036cdba87792d6c46d8f491539df1 tree aff0dd3b2db8856aba533c7421acb78847f072e3 parent 9309049544935f804b745aa4dea043fb39b2bf2a author Martin Wilck Thu, 04 Aug 2005 09:04:56 +0200 committer Jeff Garzik Tue, 23 Aug 2005 01:03:39 -0400 [PATCH] Fix HD activity LED with ahci Patch: fix wrong HD activity control by ahci driver The ahci driver 1.0 sets the SActive bit on every transaction, causing the LED to light up. The SActive bit is used only for native command queuing (NCQ) which the current driver version doesn't implement. Resetting the SActive bit is the device's responsibility (by sending a "Set Device Bits FIS" to the host adapter) but this is not required in response to non-NCQ commands, and (most) devices don't. Thus the LED stays always on. This patch fixes the LED behavior. Spec references: http://www.intel.com/technology/serialata/pdf/rev1_1.pdf, sec. 3.3.13, 5.5.1 http://www.serialata.org/docs/serialata10a.pdf http://www.intel.com/design/storage/papers/25266401.pdf Signed-off-by: Martin.Wilck@fujitsu-siemens.com Signed-off-by: Jeff Garzik commit 9309049544935f804b745aa4dea043fb39b2bf2a tree eccfe660bf094bcf096f3b612f84752e7cb8e6f5 parent 08b791c02b86e25f456cba64f5f1a1f90326db1d author Daniel Drake Mon, 22 Aug 2005 14:59:23 +0100 committer Jeff Garzik Tue, 23 Aug 2005 01:03:39 -0400 [PATCH] sata_promise: Add PDC40519 id The Promise TX4200 is a 4-port SATA controller based on the PDC40519 chip. It meets the description of the 20319, so just a simple ID needs to be added to support this hardware. Thanks to Martin Povolný for testing. Signed-off-by: Daniel Drake Signed-off-by: Jeff Garzik commit 08b791c02b86e25f456cba64f5f1a1f90326db1d tree c837405e84aef8f59706d41067c8c250d113c589 parent 3f3791d30036a367f05b9d0be28ce7ff2e017a5a author Otto Meier Mon, 22 Aug 2005 14:58:57 +0100 committer Jeff Garzik Tue, 23 Aug 2005 01:03:39 -0400 [PATCH] sata_promise: Add PDC40718 id Otto Meier recently submitted a patch to support the PDC40718 chip (marketed as SATA300 TX4, a 4-port SATA controller). Signed-off-by: Otto Meier Signed-off-by: Daniel Drake Signed-off-by: Jeff Garzik commit 3f3791d30036a367f05b9d0be28ce7ff2e017a5a tree 06bd36db635380e3ba5371b15c899b3b03c095a4 parent 443d089703ffa585aea1af47c68f1be5d0ec3115 author Albert Lee Tue, 16 Aug 2005 14:25:38 +0800 committer Jeff Garzik Tue, 23 Aug 2005 01:03:38 -0400 [PATCH] libata: Clear ATA_QCFLAG_ACTIVE flag before calling the completion callback Description: After calling the completion callback, the libata error handler might be running and getting atapi sense data. Clearing the ATA_QCFLAG_ACTIVE flag at this point might interfere with the libata error handler. Changes: - Clear the ATA_QCFLAG_ACTIVE flag before calling the completion callback (and also before the error handler) - Add some comment Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 443d089703ffa585aea1af47c68f1be5d0ec3115 tree 14e88928b28697db68d2a87857be451e6f7a4ab9 parent 972dcafb6d743a6c7611a2e4681ed814e30d6230 parent 563a6e1fb0af58433beec1ab418e1fafbd100b56 author Jeff Garzik Tue, 23 Aug 2005 00:59:54 -0400 committer Jeff Garzik Tue, 23 Aug 2005 00:59:54 -0400 /spare/repo/libata-dev branch 'upstream-fixes' commit 2600636065406dc14948ac2d2913c66c51be80d5 tree 954eea2e62f50366c8a63681571f50f98bd83a55 parent e960fc5c7d9144b1ce80dda9891ca7dfc656c078 author Dale Farnsworth Mon, 22 Aug 2005 15:53:29 -0700 committer Jeff Garzik Tue, 23 Aug 2005 00:51:34 -0400 [PATCH] mv643xx: add workaround for HW checksum generation bug [PATCH] [NET] mv643xx: add workaround for HW checksum generation bug The hardware checksum generator on the mv64xxx occasionally generates an incorrect checksum. This patch works around the issue and enables hardware checksum generation. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 7a9aff3cff807261e476a1719273a4ac5d254ecb tree 535f15a1a395a5043ba60436ca99dc66484dd21f parent 88f399cd0a5a540db2815eee3002f8f00ef6461e author Dave Airlie Tue, 23 Aug 2005 12:15:43 +1000 committer Dave Airlie Tue, 23 Aug 2005 12:15:43 +1000 drm: fix a bad VERSION check. I found why my G5 was crashing when using the linux-2.6 version of the DRM + git-drm.patch from 2.6.13-rc6-mm1, but not with the CVS DRM. The reason was that dev->agp->cant_use_aperture wasn't getting set, and the reason for that was that no longer gets included and the #if LINUX_VERSION_CODE < 0x020408 in drm_agpsupport.c was going the wrong way. With this patch (and a few others) a 32-bit server works correctly, as does DRI. From: Paul Mackerras Signed-off-by: Dave Airlie commit e0c93142ceed0a2ea4f5b8e9d0f62c884241e9c0 tree aca9e6f777a3dfd4078385b8ddac9d03dc7b4946 parent f27ecacc54cc0e5397c9b35f6c25065f07c4448d author Adrian Bunk Sat, 20 Aug 2005 17:20:28 +0100 committer Russell King Sat, 20 Aug 2005 17:20:28 +0100 [ARM] fs/adfs/adfs.h: "extern inline" doesn't make sense "extern inline" doesn't make sense. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 88f399cd0a5a540db2815eee3002f8f00ef6461e tree ac5d9520a6272c589446e555a1295962e43cae75 parent ffbbf7a3ccdcac7526296a55968e5dac0626fd9e author Dave Airlie Sat, 20 Aug 2005 17:43:33 +1000 committer Dave Airlie Sat, 20 Aug 2005 17:43:33 +1000 drm: fixes for powerpc Remove a bogus check on whether an area is memory (we need a better interface) also change pgprot flags for powerpc don't check on x86-64 either From: Paul Mackerras Signed-off-by: Dave Airlie commit ffbbf7a3ccdcac7526296a55968e5dac0626fd9e tree 2f639f34f66548fc8364c423eb72454a04972812 parent c8b432dc0c8d635254010513ca1a3a10a77037a1 author Dave Airlie Sat, 20 Aug 2005 17:40:04 +1000 committer Dave Airlie Sat, 20 Aug 2005 17:40:04 +1000 drm: add new texture upload code from r300 project Paul Mackerras did some new upload code for r300, I forgot to add it to the kernel with r300 merge. Signed-off-by: Dave Airlie commit 945a787675cc5ba362f5d4ce135d2a2c20be5985 tree d9b8730281fc4635b280840c1fe989d2e5a91f50 parent ea8f400c98ec9ae0604bc5a6721174ef68635815 author Peer Chen Sat, 20 Aug 2005 01:10:06 -0400 committer Jeff Garzik Sat, 20 Aug 2005 01:10:06 -0400 [netdrvr uli526x] fix problems found in review - s/DEVICE/net_device/ - improve formatting - remove dead code - check return value, in several areas commit e960fc5c7d9144b1ce80dda9891ca7dfc656c078 tree d3e46f30bc21b1704c84e1d4e52cf4e171c7e0d0 parent 3d52365c4f62edb9ff9710e1c57952e957b2879f author ravinandan.arakali@neterion.com Fri, 12 Aug 2005 10:15:59 -0700 committer Jeff Garzik Fri, 19 Aug 2005 21:42:06 -0400 [PATCH] S2io: Hardware fixes for Xframe II adapter Hi, Patch Description: This patch incorporates the following hardware fixes required for Xframe II adapter. 1. New values to program the dtx_control register. 2. Disable memory controller interrupts(MC_INTR) since these are now monitored thru' a poll routine. 3. Don't reset an XframeII card on an ECC double-bit error(It can recover). 4. Save/restore PCI config space before/after a reset irrespective of Xframe I or II card. 5. Bumped up the driver version no. to 2.0.3.1 Please review the patch and apply the same if it looks ok. Signed-off-by: Ravinandan Arakali Signed-off-by: Jeff Garzik commit 3d52365c4f62edb9ff9710e1c57952e957b2879f tree b18259c6cda8cd449dbbf600708012458a322678 parent 84c3ea01d163a24323d827e1d280dc3346905972 author Jochen Friedrich Fri, 19 Aug 2005 15:51:46 +0200 committer Jeff Garzik Fri, 19 Aug 2005 21:06:23 -0400 [PATCH] tms380tr: remove prototypes in Space.c Cleanup: remove two prototypes. Signed-off-by: Jochen Friedrich Signed-off-by: Jeff Garzik commit 84c3ea01d163a24323d827e1d280dc3346905972 tree 342cf01cc82c1e8f8be6920c388c66d2110e36ab parent 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 author Jochen Friedrich Fri, 19 Aug 2005 21:05:56 -0400 committer Jeff Garzik Fri, 19 Aug 2005 21:05:56 -0400 [netdrvr] Convert madgemc to new MCA API. Now that all tms380 devices have a valid struct device with dma_mask, remove dmalimit from tmsdev_init(). Kconfig: depend tms380tr and madgemc on MCA. abyss.c, proteon.c, skisa.c, tmspci.c, tms380tr.h: remove dmalimit parameter from tmsdev_init(). tms380tr.c: use device->dma_mask instead of dmalimit. madgemc.c: move to new MCA API using struct device. Signed-off-by: Jochen Friedrich Signed-off-by: Jeff Garzik commit 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f tree 5c290dcd84389e8a5bacc052bf61ea89ac02a4fb parent 686762c8049457a6255ad5caf9275c100fbaceb6 parent 2ad56496627630ebc99f06af5f81ca23e17e014e author Dave Kleikamp Fri, 19 Aug 2005 10:37:59 -0500 committer Dave Kleikamp Fri, 19 Aug 2005 10:37:59 -0500 Merge with /home/shaggy/git/linus-clean/ commit dce773771834221817e2d359a7e07a618ba08807 tree 433c4c4d75ebbf2b2671c7368afdb0fed8163a10 parent 1ad434d7cf5f490c71cfbbb2fb91076c01c8704e author Russell King Fri, 19 Aug 2005 09:42:52 +0100 committer Russell King Fri, 19 Aug 2005 09:42:52 +0100 [MMC] Use an IDR for host name indicies Signed-off-by: Russell King commit 1ad434d7cf5f490c71cfbbb2fb91076c01c8704e tree 150758fc182cabcd231e8975a44062ee5d44dc71 parent 00b137cfda5276b3d2c87d44236fe4c5ee68b405 author Russell King Fri, 19 Aug 2005 09:42:21 +0100 committer Russell King Fri, 19 Aug 2005 09:42:21 +0100 [MMC] Use class device name for mmc host name There's no point in having the host name duplicated between the mmc_host structure and the encapsulated class device structure. Signed-off-by: Russell King commit 00b137cfda5276b3d2c87d44236fe4c5ee68b405 tree 2ecf68ba041d4cb94be9bf6b5e640a94ee0974a2 parent d366b6436386875b1310ce8f70e3f9dea4647bac author Russell King Fri, 19 Aug 2005 09:41:24 +0100 committer Russell King Fri, 19 Aug 2005 09:41:24 +0100 [MMC] Add MMC class devices Create a mmc_host class to allow enumeration of MMC host controllers even though they have no card(s) inserted. Patch based on work by Pierre Ossman. Signed-off-by: Russell King commit d366b6436386875b1310ce8f70e3f9dea4647bac tree 85db10adf35d9a936701b36642001152e3a9df4a parent 099d44e869f1886b5eb02a5145ca97b5e4142e28 author Russell King Fri, 19 Aug 2005 09:40:08 +0100 committer Russell King Fri, 19 Aug 2005 09:40:08 +0100 [MMC] Add mmc_hostname() macro mmc_hostname() returns a pointer to the hostname for the mmc_host. Signed-off-by: Russell King commit 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 tree c91977c79026edbec9da29539f3e0901b3a84db8 parent b4ee21f442ba7a8c43e00b32088d437259890cd0 author Jeff Garzik Fri, 19 Aug 2005 03:52:49 -0400 committer Jeff Garzik Fri, 19 Aug 2005 03:52:49 -0400 [netdrvr eepro100] check for skb==NULL before calling rx_align(skb) commit b4ee21f442ba7a8c43e00b32088d437259890cd0 tree 3eb34017b8f9aabecdf7d99a2d50def7685aadf6 parent d9a8a0a3574525bf422fd2f05eec739c0d25814f author Andrew Morton Wed, 27 Jul 2005 01:14:44 -0700 committer Jeff Garzik Fri, 19 Aug 2005 03:12:16 -0400 [PATCH] e1000 printk warning fix 2 drivers/net/e1000/e1000_main.c: In function `e1000_clean_tx_irq': drivers/net/e1000/e1000_main.c:2774: warning: size_t format, dma_addr_t arg (arg 8) Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d9a8a0a3574525bf422fd2f05eec739c0d25814f tree 9392a6c76050785db77319a5b45b80db41736b31 parent 913168de6284cd27810e9ee7ae029d408a2a0555 author Komuro Sat, 06 Aug 2005 12:01:43 +0900 committer Jeff Garzik Fri, 19 Aug 2005 03:11:38 -0400 [PATCH] network: fix fmvj18x_cs multicast code The multicast code of the fmvj18x_cs driver is broken. I fixed it to work properly. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik commit e9985d53e3da3b51d0334d0622c449fda78ae089 tree 020ddcd5e7a35759125c845ae04382e32174b804 parent 8348b4db5f56d2c0d3849db06055225ec15b255a author Adrian Bunk Tue, 09 Aug 2005 02:41:00 +0200 committer Jeff Garzik Fri, 19 Aug 2005 03:10:00 -0400 [PATCH] SIS190 must select MII SIS190 must select MII since it's using it. While I was editing the Kconfig entry, I also converted the spaces to tabs. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 913168de6284cd27810e9ee7ae029d408a2a0555 tree cdc80bf12fbc2b0ea21c44c923febf93fcb390f0 parent a51d74409d856e472bad753aecf1f2715718c242 author Francois Romieu Sat, 30 Jul 2005 01:12:11 +0200 committer Jeff Garzik Fri, 19 Aug 2005 03:04:10 -0400 [PATCH] r8169: PCI ID for the Linksys EG1032 The Linksys EG1032 uses Realtek's 8169 chipset. Credit goes to Bob Wilson for the report. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit b2dabd5aadae6a93026f35269e1e53c1a0c6de2d tree 96dfb10f6ed608a0af775871e007669e4a691ac8 parent ea6bfb0adf1361c2039adac3fcaca27f91d7c2c7 author Andrew Morton Wed, 13 Jul 2005 00:33:46 -0700 committer Jeff Garzik Fri, 19 Aug 2005 03:00:01 -0400 [PATCH] more-u32-vs-pm_message_t-fixes-6 Cc: Pavel Machek Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a51d74409d856e472bad753aecf1f2715718c242 tree ff77451bd2702b2e1754b5298b23ca70f4b1f87c parent 1b1b3c9b6d346d441a99e2de0b34f3ba93963ad8 author Nishanth Aravamudan Mon, 27 Jun 2005 09:20:04 -0700 committer Jeff Garzik Fri, 19 Aug 2005 02:55:02 -0400 [PATCH] net/cycx_drv: replace delay_cycx() with msleep_interruptible() Use msleep_interruptible() instead of delay_cycx() to guarantee the task delays as expected. Remove the prototype and definition of delay_cycx(). Signed-off-by: Nishanth Aravamudan Signed-off-by: Jeff Garzik commit 1b1b3c9b6d346d441a99e2de0b34f3ba93963ad8 tree e140e27b52b70ecad6c79c46ed7653b2c7002283 parent a3bc068022b968a3042b48eb9a8e8b0418fb9cdd author Manfred Spraul Sat, 06 Aug 2005 23:47:55 +0200 committer Jeff Garzik Fri, 19 Aug 2005 02:12:16 -0400 [PATCH] forcedeth: Initialize link settings in every nv_open() Rüdiger found a bug in nv_open that explains some of the reports with duplex mismatches: nv_open calls nv_update_link_speed for initializing the hardware link speed registers. If current link setting matches the values in np->linkspeed and np->duplex, then the function does nothing. Usually, doing nothing is the right thing, but not in nv_open: During nv_open, the registers must be initialized because the nic was reset. The attached patch fixes that by setting np->linkspeed to an invalid value before calling nv_update_link_speed from nv_open. Signed-Off-By: Manfred Spraul Signed-off-by: Jeff Garzik commit a3bc068022b968a3042b48eb9a8e8b0418fb9cdd tree 6bbc2806756924105802f4584157396fb98d282c parent 54cfb5aa0f4859bd38706eabe0118175780a542f parent 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 author Jeff Garzik Thu, 18 Aug 2005 22:14:39 -0400 committer Jeff Garzik Thu, 18 Aug 2005 22:14:39 -0400 Merge /spare/repo/linux-2.6/ commit e8579e72ca240f3fbaa669f09a9d610436505366 tree 8b2cca8bedf9305dc9686e25d90b4f15752b88fc parent 30d5b64b63fa69af31b2cba32e6d71d68526eec9 author Alex Williamson Thu, 04 Aug 2005 13:06:00 -0700 committer Tony Luck Thu, 18 Aug 2005 16:33:28 -0700 [IA64, X86_64] fix swiotlb sizing Fix swiotlb sizing to match what the comments and the kernel parameters documentation indicate. Given a default 16k page size kernel (ia64) and a 2k swiotlb page size, we're off by a multiple of 8 trying to size the swiotlb. When specified on the boot line, the swiotlb is made 8x bigger than requested. When left to the default value, it's 8x smaller than the comments indicate. For x86_64 the multiplier would be 2x. The patch below fixes this. Now, what's a good default swiotlb size? Apparently we don't really need 64MB. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit f27ecacc54cc0e5397c9b35f6c25065f07c4448d tree 38df53b999f4da0cb4af91d5d61ab9c36d566039 parent 099d44e869f1886b5eb02a5145ca97b5e4142e28 author Russell King Thu, 18 Aug 2005 21:31:00 +0100 committer Russell King Thu, 18 Aug 2005 21:31:00 +0100 [ARM] Add support for ARM GIC Add support for the ARM Generic Interrupt Controller. Signed-off-by: Russell King commit 323cdfc191b7c1597dc748175062c368568d6af4 tree 7f4b242501db5498e889cc14054674ef4a7629b9 parent 5e742ad66b4a8ba6f9d729660f822676d9e405d4 author Russell King Thu, 18 Aug 2005 10:10:46 +0100 committer Russell King Thu, 18 Aug 2005 10:10:46 +0100 [MFD] Add SA11x0 MCP platform device support Add platform device data for the SA11x0 MCP device. This allows platforms to customise the configuration of the SA11x0 MCP device according to their needs. Signed-off-by: Russell King commit 5e742ad66b4a8ba6f9d729660f822676d9e405d4 tree db0916606495e12463a6356e6375fb362dac1851 parent a4e137ab1447fc5009f21e257971aa60a9ec98fb author Russell King Thu, 18 Aug 2005 10:08:15 +0100 committer Russell King Thu, 18 Aug 2005 10:08:15 +0100 [MFD] Add SA11x0 MCP support This adds support for the MCP interface found on SA11x0 devices. Signed-off-by: Russell King commit a4e137ab1447fc5009f21e257971aa60a9ec98fb tree 5ceb2e007a746fa84e45f08fefe6d37a3572fea1 parent 099d44e869f1886b5eb02a5145ca97b5e4142e28 author Russell King Thu, 18 Aug 2005 10:06:59 +0100 committer Russell King Thu, 18 Aug 2005 10:06:59 +0100 [MFD] Add multimedia communication port core support Add support for the core of the multimedia communication port framework. This is a port used to communicate with devices with two DMA paths and a control path. Signed-off-by: Russell King commit 470ceb05d9a2b4d61c19fac615a79e56e8401565 tree eb9e2b0b971bbe287dd4bef0b46c7307e3258bf0 parent 68b9753f47953930cb94de0223c163f289399091 author Jack Steiner Thu, 11 Aug 2005 10:28:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:32:24 -0700 [IA64-SGI] - New SN hardware support - ptc_fixes Shub2 provides a much improved mechanism for issuing internode TLB purges. Add code to support the newer mechanism. There is also some debug code (disabled) that is useful for testing. Collect statistics on the number, type & duration of TLB purges. This data will be useful for making future improvements in the algorithms. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 68b9753f47953930cb94de0223c163f289399091 tree d30b9def802b154eef00c8e9fc1dc35ddf0631e6 parent 7e95b9d6e21eda23bac1ff024d465d2072c8996d author Jack Steiner Thu, 11 Aug 2005 10:28:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:31:53 -0700 [IA64-SGI] - New SN hardware support - cpu_relax Add a few missing calls to "hint @pause". Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 7e95b9d6e21eda23bac1ff024d465d2072c8996d tree 42b21d53fe8f1f4b1edf32c2509fd69e7a0a7a2a parent 1007d02160974a46cc4fd3b1737c183c0471b88f author Jack Steiner Thu, 11 Aug 2005 10:27:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:31:14 -0700 [IA64-SGI] - New SN hardware support - bte_fixes Change the BTE driver so that it works for both shub1 and shub2. Most of the changes are related to the number of cores that use the BTE engine, to the MMR addresses of various shub registers, and to using the correct processor or network physical address. Signed-off-by: Russ Anderson Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 1007d02160974a46cc4fd3b1737c183c0471b88f tree 920faa4c274b19d789ad217a662e81c7b5f5453a parent 2fdbb590e4f9b346e5d06cf7f85dcb7a9f2e0a48 author Jack Steiner Thu, 11 Aug 2005 10:27:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:30:44 -0700 [IA64-SGI] - New SN hardware support - no_wars Disable some shub1-specific code when running on systems with shub2. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 2fdbb590e4f9b346e5d06cf7f85dcb7a9f2e0a48 tree f02bdaba4ccf801ad31c4981a97098f376fec0f2 parent 0aa2c72e59cf1d09a0b321e4e6292af78a51b8b3 author Jack Steiner Thu, 11 Aug 2005 10:26:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:30:14 -0700 [IA64-SGI] - New SN hardware support - boot_init_shub2 Update the addresses of the pio_write_status_addr so that they are correct for newer processors. Shub2 did not number the threads in the order that I had expected. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 0aa2c72e59cf1d09a0b321e4e6292af78a51b8b3 tree 8d4e6cb59dac0bb17124f8ecac8dbfe450231b8e parent 3d14487b2677cc44b5d1ef115d9d4301ec046591 author Jack Steiner Thu, 11 Aug 2005 10:26:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:29:43 -0700 [IA64-SGI] - New SN hardware support - use_alias_space Use local SHUB alias space when referencing MMRs that are known to be node local. There is a slight performance benefit & code simplification. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 3d14487b2677cc44b5d1ef115d9d4301ec046591 tree 709ed616ca4d62ab61a8127208901cc102ee54b2 parent c9221da9f2796f082642c3498edb2c8783ad4774 author Jack Steiner Thu, 11 Aug 2005 10:25:00 -0700 committer Tony Luck Wed, 17 Aug 2005 15:29:11 -0700 [IA64-SGI] - New SN hardware support - addr_macros Update the SN address macros so that they work on both shub1 and shub2. Most of the code to support shub2 was added last year but this patch fixes a few bugs and adds macros to help generate both processor-specific physical addresses & numalink physical addresses. More cleanup & optimization will be done later. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 686762c8049457a6255ad5caf9275c100fbaceb6 tree e0c6412bfb3abd32e1b15df9a788615c73dea332 parent cf59001235c5a36f3e3701bd593a78cf955a4242 author Dave Kleikamp Wed, 17 Aug 2005 13:53:13 -0500 committer Dave Kleikamp Wed, 17 Aug 2005 13:53:13 -0500 JFS: Initialize dentry->d_op for negative dentries too Signed-off-by: Dave Kleikamp commit 54cfb5aa0f4859bd38706eabe0118175780a542f tree 336c9f1db0834e0d542c019f1844ebb85ba2000e parent c59230818f7a8969c2f9d3b601745679127a4016 author Stephen Hemminger Tue, 16 Aug 2005 14:01:05 -0700 committer Jeff Garzik Tue, 16 Aug 2005 17:03:13 -0400 [PATCH] skge: turn on link status LED Turn on the link status LED when link comes up. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c59230818f7a8969c2f9d3b601745679127a4016 tree bdac1d9f572cdd0a4e68c13464babb53b6258db8 parent 5e1705ddc83f77da4b29a6d687da14e971912e41 author Stephen Hemminger Tue, 16 Aug 2005 14:01:02 -0700 committer Jeff Garzik Tue, 16 Aug 2005 17:03:13 -0400 [PATCH] skge: increase receive flush threshold default The flush threshold in the MAC chip should be increased. Found while reviewing vendor version of sk98lin driver. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5e1705ddc83f77da4b29a6d687da14e971912e41 tree 860a096343965350294f1a57024e14c1227d0043 parent 050ec18a35f3106437da8e9c55e441c076c7b93e author Stephen Hemminger Tue, 16 Aug 2005 14:00:58 -0700 committer Jeff Garzik Tue, 16 Aug 2005 17:03:13 -0400 [PATCH] skge: fibre vs copper detection cleanup Cleanup the code that handles fibre vs copper detection. Signed-off-by: Stephen Hemminger drivers/net/skge.c | 26 ++++++++++++-------------- drivers/net/skge.h | 11 ++--------- 2 files changed, 14 insertions(+), 23 deletions(-) Signed-off-by: Jeff Garzik commit 050ec18a35f3106437da8e9c55e441c076c7b93e tree e0de01c46c50d466e515a8459807bb491c4af767 parent ab707da7cf0a1a1d27c6021356cfb3692cf1bd26 author Stephen Hemminger Tue, 16 Aug 2005 14:00:54 -0700 committer Jeff Garzik Tue, 16 Aug 2005 17:03:13 -0400 [PATCH] skge: stop bogus sensor messages Some versions of the Marvell yukon generate bogus sensor warning interrupts. The driver would flood log with these messages. Handle this situation cleanly by masking away at boot time. Fixes: http://bugs.gentoo.org/show_bug.cgi?id=87182 Signed-off-by: Stephen Hemminger drivers/net/skge.c | 24 ++++++++++-------------- drivers/net/skge.h | 8 ++++++-- 2 files changed, 16 insertions(+), 16 deletions(-) Signed-off-by: Jeff Garzik commit c8b432dc0c8d635254010513ca1a3a10a77037a1 tree 23435d1455cad08e4ccba7efe7eddadb983eb36c parent 414ed537995617f4cbcab65e193f26a2b2dcfa5e author Dave Airlie Tue, 16 Aug 2005 20:54:18 +1000 committer Dave Airlie Tue, 16 Aug 2005 20:54:18 +1000 drm: update pci ids for savage and via Fixup savage and via pci ids From: Dave Airlie commit 414ed537995617f4cbcab65e193f26a2b2dcfa5e tree 7bd1b77bfd80819f7253fe4cbdb0c25560d8924c parent 282a16749ba63256bcdce2766817f46aaac4dc20 author Dave Airlie Tue, 16 Aug 2005 20:43:16 +1000 committer Dave Airlie Tue, 16 Aug 2005 20:43:16 +1000 drm: add initial r300 3D support. This adds initial r300 3D support to the radeon DRM. From: Nicolai Haehnle, Vladimir Dergachev, and others. Signed-off-by: David Airlie commit 1a402aaca51b7d56e62348f50a426c531b6bc29e tree f11678902e54db1205bad348e2a6cdb2017ccfbe parent 2ba84684e8cf6f980e4e95a2300f53a505eb794e author Greg Howard Mon, 15 Aug 2005 13:00:00 -0700 committer Tony Luck Mon, 15 Aug 2005 14:17:49 -0700 [IA64-SGI] fix unaligned memory access in snsc_event.c It's been pointed out that environmental events from the system controllers on Altix machines cause the kernel to complain about unaligned memory accesses. This turns out to be because "be32_to_cpup()" didn't do everything I thought/hoped it did. I've added calls to pull the offending integers out of the buffers using get_unaligned() before feeding them to be32_to_cpup(). Signed-off-by: Greg Howard Signed-off-by: Tony Luck commit ea6bfb0adf1361c2039adac3fcaca27f91d7c2c7 tree 0b16c8604083f665a2465b2457234a126957eccd parent b2f4a2e3b1620667da9654f9e220c92ea52bdbe4 parent 1b5cca3a88b7682d538d129c25f0e3092613a243 author Jeff Garzik Mon, 15 Aug 2005 00:32:24 -0400 committer Jeff Garzik Mon, 15 Aug 2005 00:32:24 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 1b5cca3a88b7682d538d129c25f0e3092613a243 tree 45c295e640707d44ad30100698e8df2b50012612 parent 2474385e5b623fc46cf172a921d94f9f03a9a704 author Jeff Garzik Mon, 15 Aug 2005 00:32:15 -0400 committer Jeff Garzik Mon, 15 Aug 2005 00:32:15 -0400 ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS commit b2f4a2e3b1620667da9654f9e220c92ea52bdbe4 tree db5e024ea15f6d78f373074d6d32a726db736633 parent e313087e42da177df00652d03be9afccf25f9545 author Jouni Malinen Sun, 14 Aug 2005 21:00:01 -0700 committer Jeff Garzik Mon, 15 Aug 2005 00:29:20 -0400 [PATCH] hostap: Replace WLAN_FC_ defines with ieee80211 ones Replace remaining WLAN_FC_* defines with the ones used in ieee80211 header file. This completes the move from hostap version of frame control field processing to ieee80211 version. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit e313087e42da177df00652d03be9afccf25f9545 tree 769236258d9c2045af6bad59f50997dbbd7aca58 parent eff349b136be49b0569bfdc225b49e28ce66ed22 author Jouni Malinen Sun, 14 Aug 2005 21:00:00 -0700 committer Jeff Garzik Mon, 15 Aug 2005 00:29:20 -0400 [PATCH] hostap: Capability field is called ESS, not BSS Remove backwards compatibility define for WLAN_CAPABILITY_ESS now that net/ieee80211.h defines this. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit eff349b136be49b0569bfdc225b49e28ce66ed22 tree 4043811f5813119fc0f203252b2431642b08b9c8 parent 20445cc9159089d9d6b88d7864578efb10eb6590 parent 2474385e5b623fc46cf172a921d94f9f03a9a704 author Jeff Garzik Mon, 15 Aug 2005 00:28:33 -0400 committer Jeff Garzik Mon, 15 Aug 2005 00:28:33 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 2474385e5b623fc46cf172a921d94f9f03a9a704 tree af2e7e7695e3dc46b8db9d0770dcbab3e58849b5 parent 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 author Jouni Malinen Sun, 14 Aug 2005 20:59:59 -0700 committer Jeff Garzik Mon, 15 Aug 2005 00:28:17 -0400 [PATCH] ieee80211: Capability field is called ESS, not BSS IEEE 802.11 has a capability field flag called ESS, but ieee80211 had renamed this to BSS for some reason. hostap has been using WLAN_CAPABILITY_ESS and since that matches with the standard, lets use it as the name for this define. Add WLAN_CAPABILITY_BSS as a backwards compatibility name for the same bit since ieee80211 and ipw2200 are using this and there are versions outside kernel tree that expect to find this define name. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 20445cc9159089d9d6b88d7864578efb10eb6590 tree fbbb27fd8baa82c77ebc4e020e8ee9ddb57e3ae2 parent 4339d328631aa815fe2181b9164b3690ca2db4da parent 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 author Jeff Garzik Sun, 14 Aug 2005 23:10:26 -0400 committer Jeff Garzik Sun, 14 Aug 2005 23:10:26 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 tree 07aea7539f78f221c6fc535a94a07befa2afdb63 parent f241be74b803dcf9d70c9978292946370654320f parent 2ba84684e8cf6f980e4e95a2300f53a505eb794e author Jeff Garzik Sun, 14 Aug 2005 23:10:00 -0400 committer Jeff Garzik Sun, 14 Aug 2005 23:10:00 -0400 Merge /spare/repo/linux-2.6/ commit f241be74b803dcf9d70c9978292946370654320f tree 36dfbae39ee8d3becd87afba8e5c0dbf3da702dc parent bf79451ec5862510b402c112c039698e68d0c250 author Jouni Malinen Sun, 14 Aug 2005 19:08:45 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:09:03 -0400 [PATCH] ieee80211: Fix frame control pver mask IEEE 802.11 frame control has two bits reserved for protocol version. IEEE80211_FCTL_VERS was not used anywhere, but I would assume it was supposed to be a mask for the protocol field and as such, it should be 0x0003, not 0x0002. This matches with WLAN_FC_PVER definition in hostap. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 4339d328631aa815fe2181b9164b3690ca2db4da tree 1848ffbf700ccd4e38c70e218f91dd2a7eadf018 parent c0f72ca8e4f1b459b5582c1c8dcaf7e53151f069 author Jouni Malinen Sun, 14 Aug 2005 19:08:44 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:07:30 -0400 [PATCH] hostap: Use ieee80211 WLAN_FC_GET_{TYPE,STYPE} Replace temporary HOSTAP_FC_GET_{TYPE,STYPE} macros with the ieee80211 version of WLAN_FC_GET_{TYPE,STYPE}. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit c0f72ca8e4f1b459b5582c1c8dcaf7e53151f069 tree 4362f671ba43b48b73ac5378a1cb0954b407f09e parent 3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77 author Jouni Malinen Sun, 14 Aug 2005 19:08:43 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:07:30 -0400 [PATCH] hostap: Replace hostap_ieee80211_hdr with ieee80211_hdr Replace hostap-specific struct hostap_ieee80211_hdr with struct ieee80211_hdr from net/ieee80211.h. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77 tree badaa7f340e6ed65ecbb70837a8fbdb004f2d202 parent 67e0e473fb54e7657f6604236e42ef07fd7a2768 author Jouni Malinen Sun, 14 Aug 2005 19:08:42 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:07:30 -0400 [PATCH] hostap: Remove extra defines Remove unused defines that are already available from generic kernel header files. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 67e0e473fb54e7657f6604236e42ef07fd7a2768 tree 97b8086510c2ec70ffdc607df62c0f651dbab3cb parent ea3f1865f33bd328bf043f47492f401a42de5edb author Jouni Malinen Sun, 14 Aug 2005 19:08:41 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:06:27 -0400 [PATCH] hostap: Use void *hw_priv instead of #ifdef in local data Replace hardware model specific #ifdef's in struct local_info with void *hw_priv that is pointing to cs/pci/plx specific data structure. This removes unneeded #ifdef's and as such, is a step towards making it possible to share objects for hostap_hw.c and hostap_download.c with cs/pci/plx drivers without having to compile and link the same code separately for each one. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ea3f1865f33bd328bf043f47492f401a42de5edb tree 03036e8bd28fd97296b1938e28cbb3723dff61a2 parent 5bee720fd7fa5ed4eade96058acd3a684da30932 author Jouni Malinen Sun, 14 Aug 2005 19:08:40 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:06:27 -0400 [PATCH] hostap: Remove experimental PCI bus master/DMA code PCI version of Prism2.5/3 has undocumented DMA support for TX/RX data, but this seems to have some hardware bugs that prevent it from being used properly for TX. RX side could possibly be made to work reliably. Even though DMA support would be very useful for saving host CPU (from about 40% to 5-10% when operating at maximum throughput), it seems to be best to just remove this code finally. The implementation has always been commented out by default and has received very limited testing. The code may have already been broken number of times and I don't have much interested in trying to verify whether it works or not. Getting this out makes it easier to maintain the driver and allows some cleanups that have been partly postponed because of this experimental bus master/DMA code. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 5bee720fd7fa5ed4eade96058acd3a684da30932 tree 916d3c4c880c64ba13edc4f890fa3b021be4ded8 parent 1e4adbdb3f0348dcf4fce92f1acc7c8386982c17 author Jouni Malinen Sun, 14 Aug 2005 19:08:39 -0700 committer Jeff Garzik Sun, 14 Aug 2005 23:06:26 -0400 [PATCH] hostap: Fix skb->cb use for TX meta data Old AP mode code for power saving was using skb->cb for couple of flags before the more generic 802.11 TX code started using the same buffer for struct hostap_skb_tx_data. This resulted in the power save code corrupting the magic value in beginning of the buffer and TX code dropping the power saved packets because of this for the case where STAs send PS-Poll frames with PwrMgmt flag set. This patch modifies the power save code to use the same struct hostap_skb_tx_data as rest of the TX path in order to avoid corrupting the data in skb->cb. In addition, this patch reorders fields in the structure and makes them use smaller types in order to make the structure fit in skb->cb on 64-bit hosts. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit badea125d7cbd93f1678a95cf009b3bdfe6065cd tree c9cd47cfc5f7474fdf60735548734e647a4f7a9d parent 7d69fa6266770eeb6317eddd46b64456e8a515bf author David Mosberger-Tang Mon, 25 Jul 2005 22:23:00 -0700 committer Tony Luck Fri, 12 Aug 2005 15:05:21 -0700 [IA64] Fix race in mm-context wrap-around logic. The patch below should fix a race which could cause stale TLB entries. Specifically, when 2 CPUs ended up racing for entrance to wrap_mmu_context(). The losing CPU would find that by the time it acquired ctx.lock, mm->context already had a valid value, but then it failed to (re-)check the delayed TLB flushing logic and hence could end up using a context number when there were still stale entries in its TLB. The fix is to check for delayed TLB flushes only after mm->context is valid (non-zero). The patch also makes GCC v4.x happier by defining a non-volatile variant of mm_context_t called nv_mm_context_t. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 563a6e1fb0af58433beec1ab418e1fafbd100b56 tree dcf2145bbf63751722f694044fe547a7dab27d1f parent 6ae4cfb5711b6f2878c9e384617971d98c34a7f5 author Albert Lee Fri, 12 Aug 2005 14:17:50 +0800 committer Jeff Garzik Fri, 12 Aug 2005 02:44:20 -0400 [PATCH] libata handle the case when device returns/needs extra data PATCH 2/2: handle the case when device returns/needs extra data Description: Sometimes the device returns/needs extra data than expected. Changes: Modify __atapi_pio_bytes() to handle the case where device returns/needs extra data. - for read case, discard trailing data from the device - for write case, padding zero data to the device Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6ae4cfb5711b6f2878c9e384617971d98c34a7f5 tree d5e4f3ab6381c0c5429429eb9f4159e321af8431 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Albert Lee Fri, 12 Aug 2005 14:15:34 +0800 committer Jeff Garzik Fri, 12 Aug 2005 02:44:20 -0400 [PATCH] libata ata_data_xfer() fix PATCH 1/2: ata_data_xfer() fix Changes: - Modify ata_mmio_data_xfer() and ata_pio_data_xfer() to handle odd-lengthed buffer. - Add some function comments This patch does not reuse ap->pad as alignment buffer since using local variable seems good enough. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c9221da9f2796f082642c3498edb2c8783ad4774 tree 1603dbace88f4790b6b0138f6e0b43a8958dd656 parent 5b53ed1f2ed6c85e2b1c39d97cc112ea32004609 author Mark Maule Wed, 03 Aug 2005 14:07:00 -0700 committer Tony Luck Thu, 11 Aug 2005 15:56:31 -0700 [IA64-SGI] sn pci provider for TIOCE (pci Altix patch to add an SN pci provider for TIOCE, which is SGI's PCI Express implementation. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 5b53ed1f2ed6c85e2b1c39d97cc112ea32004609 tree 538fb3307b1f16928dde68c6f6ff5565be3a2efb parent 735e60f4c67823a3e01655c990296e2e56574885 author Mark Maule Wed, 03 Aug 2005 14:06:00 -0700 committer Tony Luck Thu, 11 Aug 2005 15:37:13 -0700 [IA64-SGI] add support for TIO huge-window Altix patch to add TIO "huge-window" address support to sn_dma_flush(). Update copyright in affected files. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 735e60f4c67823a3e01655c990296e2e56574885 tree eedca515f820a1310937a629d8f95fc0833235e9 parent 89963d16dc50a5d91ed09914a1232d59e6461fd6 author Mark Maule Wed, 03 Aug 2005 14:06:00 -0700 committer Tony Luck Thu, 11 Aug 2005 15:36:39 -0700 [IA64-SGI] abstract force_interrupt() mechanism Altix patch to abstract the force_interrupt() mechanism away from the pcibr provider. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 89963d16dc50a5d91ed09914a1232d59e6461fd6 tree b1bbba93f06088b2f1e35bafced3d3bcff69f995 parent 674c6479b7bdc78528ea83dd43897e3161558b8b author Mark Maule Wed, 03 Aug 2005 14:06:00 -0700 committer Tony Luck Thu, 11 Aug 2005 15:36:00 -0700 [IA64-SGI] altix: cosmetic rename of SGI_PCIBR_ERROR Cosmetic altix patch to rename SGI_PCIBR_ERROR to something more generic and remove a duplicate #define. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 674c6479b7bdc78528ea83dd43897e3161558b8b tree 5ae55cc33867c1f6d0df1e6af8fe71e88ffee046 parent b5da623ae9be680ea59f268eeb339f0acb2d88c4 author Colin Ngam Wed, 03 Aug 2005 13:35:00 -0700 committer Tony Luck Thu, 11 Aug 2005 15:35:13 -0700 [IA64-SGI] Altix only: Add PCI Domain number support. This patch enables PCI Domain numbering on Altix. Signed-off-by: Colin Ngam Signed-off-by: Tony Luck commit ab707da7cf0a1a1d27c6021356cfb3692cf1bd26 tree d8b5f97a7a4b1545f6ce244053ce917414c22096 parent b40a1f06c062d5fb2dc11fcb826d97b28918524f author Malli Chilakala Thu, 11 Aug 2005 13:59:59 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:25 -0400 [PATCH] ixgb: Driver version, white space, comments Driver version, white space, comments & added Module_version Patch from linville Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b40a1f06c062d5fb2dc11fcb826d97b28918524f tree bdb960566c1cb26b54e954a189b007cb71d384ed parent fcb01756e8e95e8d4e423377bc435e8856194328 author Malli Chilakala Thu, 11 Aug 2005 13:59:44 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:25 -0400 [PATCH] ixgb: Redefined buffer_info-dma to be dma_addr_t instead of uint64 Redefined buffer_info-dma to be dma_addr_t instead of uint64 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit fcb01756e8e95e8d4e423377bc435e8856194328 tree ade7fa54e7d670b1bf33ba9c3c2a4589218091a3 parent db0bacaa8313e00bb571e2d1102dc9f567353a24 author Malli Chilakala Thu, 11 Aug 2005 13:59:31 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:21 -0400 [PATCH] ixgb: Remove unused functions Remove unused functions, render some variable static instead of global - based on patch from Adrian Bunk Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit db0bacaa8313e00bb571e2d1102dc9f567353a24 tree ac4e79396d6eef017e32566f5ecf2fe886ec9ff2 parent 9ef2eec39383f8fe2bd7c9fac4dfdd4fdf7173e6 author Malli Chilakala Thu, 11 Aug 2005 13:59:20 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Ethtool cleanup patch from Stephen Hemminger Ethtool cleanup patch from Stephen Hemminger * use ADVERTISED_xxx fields when setting advertised fields Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9ef2eec39383f8fe2bd7c9fac4dfdd4fdf7173e6 tree 7f0ee44df6d39666b74de88e55d9d08a93b6ee8f parent 7b89178d1d803c854dfd6f4e81633109a1238884 author Malli Chilakala Thu, 11 Aug 2005 13:59:07 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Fix data output by ethtool -d Fix data output by ethtool -d Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7b89178d1d803c854dfd6f4e81633109a1238884 tree c47811a75214c4f98ccc64248bc93aef36df104f parent 8908c6cd1d6889850148aeb50bb14301959adaa7 author Malli Chilakala Thu, 11 Aug 2005 13:58:55 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Fix Broadcast/Multicast packets received statistics Fix Broadcast/Multicast packets received statistics Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 8908c6cd1d6889850148aeb50bb14301959adaa7 tree f2d35f3f9dbad26caa665cdaef261ba42dac15fb parent 51b54b512cd26c4477ccd57b8d3736b99ccef7a0 author Malli Chilakala Thu, 11 Aug 2005 13:58:40 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Use netdev_priv() instead of netdev->priv Use netdev_priv() instead of netdev->priv Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 51b54b512cd26c4477ccd57b8d3736b99ccef7a0 tree 0f673988ea89b8ab895181b776face14088570bb parent 9c15d24f2420c2155eccd32d7ab909a9c0e63c2b author Malli Chilakala Thu, 11 Aug 2005 13:58:23 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Fix unnecessary link state messages Fix unnecessary link state messages Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9c15d24f2420c2155eccd32d7ab909a9c0e63c2b tree 3451199b0eba23a0b4687ce915fd2caa38b82b55 parent 2bf69b5fe90b3246ab50064c5a690a363e8c53e2 author Malli Chilakala Thu, 11 Aug 2005 13:58:02 -0700 committer Jeff Garzik Thu, 11 Aug 2005 17:09:19 -0400 [PATCH] ixgb: Set RXDCTL:PTHRESH/HTHRESH to zero Set RXDCTL:PTHRESH/HTHRESH to zero Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ea8f400c98ec9ae0604bc5a6721174ef68635815 tree e3efacd1bc34f9a6cee8632b8ac4a34512c204f3 parent 4689ced99b18937e28c0f6c190394ccc3c61d651 author Peer Chen Thu, 11 Aug 2005 15:09:23 -0400 committer Jeff Garzik Thu, 11 Aug 2005 15:09:23 -0400 [netdrvr tulip] Remove ULi-specific code from generic tulip driver It has a separate driver now, 'uli526x'. commit 972dcafb6d743a6c7611a2e4681ed814e30d6230 tree d294613ec5d9ffc90534e4ebfdb81325649d8167 parent 4c71812261ce3c48a7c5dd257d96d9fd35d62287 author Douglas Gilbert Thu, 11 Aug 2005 03:35:53 -0400 committer Jeff Garzik Thu, 11 Aug 2005 03:35:53 -0400 [libata scsi] add START STOP UNIT translation commit 4c71812261ce3c48a7c5dd257d96d9fd35d62287 tree 71a5dfc434fea89f9dfa45b9433f857cc433ef10 parent 3db368f71a91f08c5a93a5bfb6ca1e2de2668e04 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Jeff Garzik Thu, 11 Aug 2005 03:33:08 -0400 committer Jeff Garzik Thu, 11 Aug 2005 03:33:08 -0400 Merge /spare/repo/linux-2.6/ commit 2bf69b5fe90b3246ab50064c5a690a363e8c53e2 tree fcae64d1ea5670ca8cb33d5711e181708927e883 parent 67c4f3fa25502ce7ed82fb0307e09cf36f1f81da author Jeff Garzik Thu, 11 Aug 2005 02:47:54 -0400 committer Jeff Garzik Thu, 11 Aug 2005 02:47:54 -0400 phy subsystem: more cleanups - unexport symbols never used outside of home module - remove dead code - remove CONFIG_PHYCONTROL, make it unconditionally enabled commit 67c4f3fa25502ce7ed82fb0307e09cf36f1f81da tree d368d796618d52361f6aced3dcf2c1beb26ceec3 parent 303bcb4b675d7284a1097dd1c18c995c0179883a author Jeff Garzik Thu, 11 Aug 2005 02:07:25 -0400 committer Jeff Garzik Thu, 11 Aug 2005 02:07:25 -0400 Fix numerous minor problems with new phy subsystem. Includes fixes for problems noted by Adrian Bunk, Andrew Morton, and one other person lost in the annals of history (and email folders). commit 1e4adbdb3f0348dcf4fce92f1acc7c8386982c17 tree 7f1e85e46a4a8a147669f1b2a6b8fef45d2b2ae0 parent 74fae82c8bd5dd78365abe25506a9ba388d4a889 author Richard Purdie Thu, 04 Aug 2005 00:16:27 +0100 committer Jeff Garzik Thu, 11 Aug 2005 00:14:47 -0400 [PATCH] hostap update Add the device ID of the Buffalo AirStation WLI-CF-S11G Signed-off-by: Richard Purdie Signed-off-by: Jeff Garzik commit 303bcb4b675d7284a1097dd1c18c995c0179883a tree 1ac3e3adc6deb4f0c6c5ba987adcc28b66fa2f64 parent 0b1f7ebe455ba4f1f46e7024150eeddbbf08addc author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:41:38 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:46 -0400 [PATCH] S2io: Errors found during review Hi, This is a patch to incorporate comments from earlier 12 patches. It also fixes a few issues we found during this time. Following is a list of changes in this patch. Item 1 incorporates earlier comments. Issues addressed in items 2 to 4 were discovered recently. 1. wmb() call in s2io_xmit() replaced with mmiowb(). 2. The dtx_control register was earlier programmed incorrectly for Xframe II adapter. 3. As suggested by hardware team, after a reset, in case of Xframe II adapter, we clear certain spurious errors by clearing PCI-X ECC status register, "detected parity error" bit in PCI_STATUS register and PCI_STATUS bit in txpic_int register. 4. On IBM PPC platforms, we found that in the Rx buffer replenish function, two memory writes(one to the the descriptor length and another to the ownership) were getting reordered. This was causing the adapter to see the ownership transfered to it before the length was updated. One solution was to add a wmb() but since this would turnout expensive on some platforms if called for every descriptor, we set the ownership bit and other fields of '2' to 'N' Rx descriptors followed by a wmb() and then set the ownership of first descriptor ('1'). Here the value 'N' is configurable by making it a module loadable parameter (rxsync_frequency). (NOTE: This parameter is a power of 2). 5. Bumped up the driver version no. to 2.0.2.1 Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 0b1f7ebe455ba4f1f46e7024150eeddbbf08addc tree 1d9f34fc02fdd7ae18034ced47061ac239b2af7c parent a371a07de9bce837ea4e84569a2b390a42e360ef author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:39:56 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: Miscellaneous fixes Hi, The last patch in this series fixes the following issues found during testing. 1. Ensure we don't pass zero sized buffers to the card(which can lockup) 2. Restore the PCI-X parameters(in case of Xframe I adapter) after a reset. 3. Make sure total size of all FIFOs does not exceed 8192. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit a371a07de9bce837ea4e84569a2b390a42e360ef tree d8b8f2f18d6a1ff620e53363f22288321730ddb1 parent b6e3f9828b9dc188cfe80364365cc68bf45df949 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:38:59 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: New link handling scheme for Xframe II Hi, The below patch implements a new "Link state change handling" scheme supported by the Xframe II adapter. It also bumps up the driver version to 2.0.2.0. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit b6e3f9828b9dc188cfe80364365cc68bf45df949 tree 37b0669386484455f6a2fea10acc63d44bcf1d04 parent 541ae68f6ddf1c27aa6879935ce541f110484202 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:38:01 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: Support for bimodal interrupts Hi, This is a patch to provide bimodal interrupt moderation support for Xframe II adapter. Basically, in this moderation scheme, the adapter raises a traffic interrupt if the no. of packets transmitted and/or received reaches a programmable threshold. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 541ae68f6ddf1c27aa6879935ce541f110484202 tree f85387531b0e3f5888c296dfab185409ba4c1265 parent be3a6b02eb68a4d47397b771b6e4aa1f7f0f7ffb author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:36:55 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: Support for Xframe II NIC Hi, This patch provides basic support for the Xframe II adapter. Includes the following changes: 1. New values to program XAUI interface. 2. Print the PCI/PCI-X mode(bus frequency, width). 3. Remove EOI from reset during intialization. 4. Enable all 8 PCCs if Xframe II adapter. 5. Programs the RLDRAM size depending on the device. (Note: RLDRAM size on XFARME-I is 64Mb whereas on XFRAME-II it's 32 Mb). 6. Enable extended(64-bit) statistics counters. 7. Program timer interrupt duration based on PCI/PCI-X clock speed. 8. Not required to save/restore PCI config space before/after reset. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit be3a6b02eb68a4d47397b771b6e4aa1f7f0f7ffb tree 67564ac815ce2475364dd215a000150240b763ca parent 25fff88eb7dbc63e03f1766e130515900d440dbb author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:35:55 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: VLAN support Hi, Patch below adds VLAN support to the driver. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 25fff88eb7dbc63e03f1766e130515900d440dbb tree 8ca0644a07520e4b2beec8caf7d9ba091ef50299 parent d8892c6ee39614bc6d282dbef0ff9fa461a6467c author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:34:11 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: Timer based slowpath handling Hi, This patch implements the slow-path handling functions(link state change, hardware errors) as a timer. It is not handled in interrupt handler as was done previously. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit d8892c6ee39614bc6d282dbef0ff9fa461a6467c tree 676ff9cba6f3f8bff8715c7f78cf3d1cea473872 parent fe113638328995b69d8797e6466b29661b1602d1 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:33:12 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:45 -0400 [PATCH] S2io: Support for runtime MTU change Hi, Patch below supports MTU change on-the-fly(without bringing interface down) Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit fe113638328995b69d8797e6466b29661b1602d1 tree e9ebbbcd7ac3fce17c9f39e2cf1eca1ae209bae7 parent 1ddc50d40a19b3524d302d1d6bfd52ac7bc6b6f7 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:32:00 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:44 -0400 [PATCH] S2io: Performance improvements Hi, This patch relates to mostly performance related changes. 1. Fixed incorrect computation of PANIC level in rx_buffer_level(). 2. Removed unnecessary PIOs(read/write of tx_traffic_int and rx_traffic_int) from interrupt handler and removed read of general_int_status register from xmit routine. 3. Enable two-buffer mode(for Rx path) automatically for SGI systems. This improves Rx performance dramatically on SGI systems. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 1ddc50d40a19b3524d302d1d6bfd52ac7bc6b6f7 tree f97dc6eda470a52e1fbfb1a6dac52b79092752c7 parent 7ba013ac029513eb4b70cfcd4b86e37c5f16c483 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:30:43 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:44 -0400 [PATCH] S2io: Removed memory leaks Hi, This patch fixes certain memory leaks discovered in free_tx_buffers() and rx_osm_handler() Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 7ba013ac029513eb4b70cfcd4b86e37c5f16c483 tree 67eb8b6d9e313f957aa228dab8cd62c1d1cea0cf parent 5e25b9ddb6683fe225a2266b53d73c57381a0c18 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:29:20 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:44 -0400 [PATCH] S2io: Software fixes Hi, Below patch includes fixes for few purely software bugs identified since last release. 1. Keep track and display(as part of ethtool command output) the no. of single-bit and double-bit ECC errors. 2. Handle race condition between intr handler and "interface down" routine. 3. Initial link state setting modified so that the link state displayed after "interface Up" is correct. 4. Fix for "Incorrect Tx packet count when TSO is enabled". 5. Disable periodic DMA of statistics and schedule one-shot DMA only when required. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 5e25b9ddb6683fe225a2266b53d73c57381a0c18 tree b67e4253ec02e5a38c82cef823f76a815318db4f parent 20346722ec474245446bcbf460594a935a5c0512 author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:27:09 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:44 -0400 [PATCH] S2io: Hardware fixes Hi, Below patch addresses few h/w specific issues. 1. Check for additional ownership bit on Rx path before starting Rx processing. 2. Enable only 4 PCCs(Per Context Controller) for Xframe I revisions less than 4. 3. Program Rx and Tx round robin registers depending on no. of rings/FIFOs. 4. Tx continous interrupts is now a loadable parameter. 5. Reset the card if we get double-bit ECC errors. 6. A soft reset of XGXS being done to force a link state change has been eliminated. 7. After a reset, clear "parity error detected" bit, PCI-X ECC status register, and PCI_STATUS bit in tx_pic_int register. 8. The error in the disabling allmulticast implementation has been rectified. 9. Leave the PCI-X parameters MMRBC, OST etc. at their BIOS/system defaults. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 20346722ec474245446bcbf460594a935a5c0512 tree ab907a8c754fce58a97a0da9b4f19424c64eefde parent cd04b947bc674f8fc9cac38ec30497bae5d664ad author raghavendra.koushik@neterion.com Wed, 03 Aug 2005 12:24:33 -0700 committer Jeff Garzik Thu, 11 Aug 2005 00:10:44 -0400 [PATCH] S2io: Code cleanup Hi, We are submitting a series of 13 patches to support our Xframe I and Xframe II line of products. The patches can be categorized as follows: Patches 1-8 : Changes applicable to both Xframe I and II Patches 9-11: Xframe II specific features Patch 12: Addresses issues found during testing cycle. Patch 13: Incorpoates mostly the review comments from community and some last moment bug fixes. Please review the patches and let us know your comments. Starting with patch 1 below. This patch involves cosmetic changes(tabs and indentation, regrouping of transmit and receive data structures, typecasting, code cleanup). Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit cd04b947bc674f8fc9cac38ec30497bae5d664ad tree 988b0b7ea08063e5499672346eb2f619f0629717 parent b3df9f813bc7b9db62ae0c90b8990b1cebf97345 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Jeff Garzik Thu, 11 Aug 2005 00:07:03 -0400 committer Jeff Garzik Thu, 11 Aug 2005 00:07:03 -0400 Merge /spare/repo/linux-2.6/ commit f521089158cd48a81b4d72e8e39da006dd79779b tree e5053eba17c84c64e2c86e67adefe56f3ef5ba10 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Christoph Lameter Fri, 05 Aug 2005 08:02:00 -0700 committer Tony Luck Wed, 10 Aug 2005 16:13:10 -0700 [IA64] Spinlock optimizations 1. Nontemporal store for spin unlock. A nontemporal store will not update the LRU setting for the cacheline. The cacheline with the lock may therefore be evicted faster from the cpu caches. Doing so may be useful since it increases the chance that the exclusive cache line has been evicted when another cpu is trying to acquire the lock. The time between dropping and reacquiring a lock on the same cpu is typically very small so the danger of the cacheline being evicted is negligible. 2. Avoid semaphore operation in write_unlock and use nontemporal store write_lock uses a cmpxchg like the regular spin_lock but write_unlock uses clear_bit which requires a load and then a loop over a cmpxchg. The following patch makes write_unlock simply use a nontemporal store to clear the highest 8 bits. We will then still have the lower 3 bytes (24 bits) left to count the readers. Doing the byte store will reduce the number of possible readers from 2^31 to 2^24 = 16 million. These patches were discussed already: http://marc.theaimsgroup.com/?t=111472054400001&r=1&w=2 http://marc.theaimsgroup.com/?l=linux-ia64&m=111401837707849&w=2 The nontemporal stores will only work using GCC. If a compiler is used that does not support inline asm then fallback C code is used. This will preserve the byte store but not be able to do the nontemporal stores. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit 3db368f71a91f08c5a93a5bfb6ca1e2de2668e04 tree 50ca8901a35e599b7d18f79d45ca1cbe53ed0df1 parent a7144b23da073f4b3192e356ad74de12aba60e00 author Jason Gaston Wed, 10 Aug 2005 06:18:43 -0700 committer Jeff Garzik Wed, 10 Aug 2005 13:43:15 -0400 [PATCH] ahci: AHCI mode SATA patch for Intel ICH7-M DH Hello, This patch adds the Intel ICH7-M DH DID to the ahci.c file for AHCI mode SATA support.  This patch was built against the 2.6.13-rc6 kernel.   If acceptable, please apply. Thanks, Jason Gaston Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit a7144b23da073f4b3192e356ad74de12aba60e00 tree 2b93bdf54563bfe447a167d832c43d24f56c7a95 parent 8a60a07129fad60bba779a2a4038c7518b167fc7 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Jeff Garzik Wed, 10 Aug 2005 13:43:09 -0400 committer Jeff Garzik Wed, 10 Aug 2005 13:43:09 -0400 Merge /spare/repo/linux-2.6/ commit 282a16749ba63256bcdce2766817f46aaac4dc20 tree 51a44a864e8f526c1654a08ea5a57fadddab25ad parent d27c9b548ad79c14830c57355dbe3a35f970532a author Dave Airlie Sun, 07 Aug 2005 15:43:54 +1000 committer Dave Airlie Sun, 07 Aug 2005 15:43:54 +1000 drm: add savage driver Add driver for savage chipsets. From: Felix Kuehling Signed-off-by: Dave Airlie commit d27c9b548ad79c14830c57355dbe3a35f970532a tree e274cd6193597b3860cbf9768241528067905912 parent aa0ca6b4bb818406d4769edb9ff115500c8e4090 author Dave Airlie Sun, 07 Aug 2005 15:19:58 +1000 committer Dave Airlie Sun, 07 Aug 2005 15:19:58 +1000 drm: remove version.h and any version checks.. This patch removes all the drm kernel conditionals from the kernel DRM tree. Signed-off-by: Dave Airlie commit aa0ca6b4bb818406d4769edb9ff115500c8e4090 tree 3e92571c642288e6f95bd77b1cfe8f80445c4a39 parent 1fad99499afdd2730adb1d53413b91580b1f0662 author Dave Airlie Fri, 05 Aug 2005 23:09:14 +1000 committer Dave Airlie Fri, 05 Aug 2005 23:09:14 +1000 drm: fix warning in drm_pci.c Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 1fad99499afdd2730adb1d53413b91580b1f0662 tree 0fec6e843bc6904166e8679c40836ef43d65b808 parent db215327c62c2db533afb322761fa04ea6244164 author Dave Airlie Fri, 05 Aug 2005 22:40:34 +1000 committer Dave Airlie Fri, 05 Aug 2005 22:40:34 +1000 drm: remove the gamma driver The gamma driver has been broken for quite a while, it doesn't build, we don't have a userspace, mine is in Ireland etc... Signed-off-by: Dave Airlie commit db215327c62c2db533afb322761fa04ea6244164 tree 40c377b02336c5cc2fba378c7a3b921401719a9f parent d1f2b55ad2c11f46e30547a9f7754e99b478348e author Dave Airlie Fri, 05 Aug 2005 22:13:15 +1000 committer Dave Airlie Fri, 05 Aug 2005 22:13:15 +1000 drm: switch drm_handle_t to unsigned int This converts the drm_handle_t to unsigned int. This is currently safe to do as we don't pass these across the kernel/user boundary, but userspace does use these, but no-one builds userspace against the kernel headers at present so it is okay to switch over the kernel copy of drm.h at this point. (The CVS tree will switch over soon in sync with some Mesa changes) From: Egbert Eich Signed-off-by: Dave Airlie commit d1f2b55ad2c11f46e30547a9f7754e99b478348e tree cabf9060c4f6cb419c7ed7fdcbcc6b6a91a83ac1 parent c73681e77b40697d16ada777adf2c6dc4db05917 author Dave Airlie Fri, 05 Aug 2005 22:11:22 +1000 committer Dave Airlie Fri, 05 Aug 2005 22:11:22 +1000 drm: updated DRM map patch for 32/64 bit systems I basically combined Paul's patches with additions that I had made for PCI scatter gather. I also tried more carefully to avoid problems with the same token assigned multiple times while trying to use the base address in the token if possible to gain as much backward compatibility as possible for broken DRI clients. From: Paul Mackerras and Egbert Eich Signed-off-by: Dave Airlie commit c73681e77b40697d16ada777adf2c6dc4db05917 tree 4904148ca238f74690819a532626f457e662a194 parent 24d109422787119337cd83732feef930d6a23f5c author Dave Airlie Fri, 05 Aug 2005 22:02:48 +1000 committer Dave Airlie Fri, 05 Aug 2005 22:02:48 +1000 drm: copy the right data back to userspace for getreserved contexts ioctl This fixes the information copied back to userspace by the get reserved contexts ioctl. From: Egbert Eich Signed-off-by: Dave Airlie commit 24d109422787119337cd83732feef930d6a23f5c tree 7eb80136109a989f76edfee8a5e8f2af87bf210a parent 727e6e932d76f05f8691a32bbeabd1061b051a3b author Dave Airlie Fri, 05 Aug 2005 21:52:18 +1000 committer Dave Airlie Fri, 05 Aug 2005 21:52:18 +1000 drm: fix ioctl direction in r128 getparam Set the IOWR correctly for r128 getparam. From: Egbert Eich Signed-off-by: Dave Airlie commit 8a60a07129fad60bba779a2a4038c7518b167fc7 tree 3bec0fea8b4c98c51d8865d5144068420f0fd09f parent 541134cfe7af179f45458b68421ee1da7bab9cba author Jeff Garzik Sun, 31 Jul 2005 13:13:24 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:13:24 -0400 libata: trim trailing whitespace. Also, fixup a tabs-to-spaces block of code in ata_piix. commit 74fae82c8bd5dd78365abe25506a9ba388d4a889 tree 3cec275b2d612891abfa43e1529dbd484bfd1990 parent 4fa969cfb2a6406fcffd0d1ec5f33ebf3fea9053 author Jeff Garzik Sun, 31 Jul 2005 13:08:32 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:08:32 -0400 [wireless hostap] trim trailing whitespace commit 4fa969cfb2a6406fcffd0d1ec5f33ebf3fea9053 tree e6d62bb802fade3a58cd3d67dcd5bd7e2a2878f1 parent 24735354f3074fa90b185b8cd7cb13fd53c39e6b parent bf79451ec5862510b402c112c039698e68d0c250 author Jeff Garzik Sun, 31 Jul 2005 13:07:36 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:07:36 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit bf79451ec5862510b402c112c039698e68d0c250 tree 37f0db177a88f980e1e0132d6cd0130f23474941 parent 2ff55fefc32bc8ead7eb46287e4daf0c2d83dafa author Jeff Garzik Sun, 31 Jul 2005 13:07:26 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:07:26 -0400 [wireless ipw2200] trim trailing whitespace commit 24735354f3074fa90b185b8cd7cb13fd53c39e6b tree 20bd5c8ce3a58ec7b1022dce44a7120931f583dd parent 62fe7e378109537ff80971c5208e12d40bf88bee parent 2ff55fefc32bc8ead7eb46287e4daf0c2d83dafa author Jeff Garzik Sun, 31 Jul 2005 13:06:03 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:06:03 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit 2ff55fefc32bc8ead7eb46287e4daf0c2d83dafa tree b075497ae0dd6783d50d218c5c2d13ca9ef49bc6 parent b7721ff96fa15459c7c5de59323bedd61f1bcbd7 author Jeff Garzik Sun, 31 Jul 2005 13:05:43 -0400 committer Jeff Garzik Sun, 31 Jul 2005 13:05:43 -0400 ieee80211: trim trailing whitespace commit b3df9f813bc7b9db62ae0c90b8990b1cebf97345 tree 712dc3cdd33b5acbd1ed579d88eb548a0856168c parent 72b317825728942383b0c2e35016d29bbfb4df00 author Manfred Spraul Sun, 31 Jul 2005 18:38:58 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:57 -0400 [PATCH] forcedeth: write back original mac address during ifdown This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 72b317825728942383b0c2e35016d29bbfb4df00 tree 79829afab5775412378ed87f2885f8e5b81ac023 parent ee73362cdd7d9b8166424f5f9e3176c629ac5cb2 author Manfred Spraul Sun, 31 Jul 2005 18:33:34 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:57 -0400 [PATCH] forcedeth: Add set_mac_address support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit ee73362cdd7d9b8166424f5f9e3176c629ac5cb2 tree de286b3f681482846cbbc412b3251a7201cf6b36 parent c2dba06dae7d6c4d15b83ea12d8c601cffd0aee9 author Manfred Spraul Sun, 31 Jul 2005 18:32:26 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:56 -0400 [PATCH] forcedeth: 64-bit DMA support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit c2dba06dae7d6c4d15b83ea12d8c601cffd0aee9 tree ed0a3caa4bb6e601bd92643188d992213567c3b9 parent dc8216c192795b62f30ca34299fb79e897438372 author Manfred Spraul Sun, 31 Jul 2005 18:29:47 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:56 -0400 [PATCH] forcedeth: rewritten tx irq handling This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit dc8216c192795b62f30ca34299fb79e897438372 tree 383af26fbfd1ae517cbc7ad4626ca3c1ba751da1 parent d81c0983de80c956cf37835b0d35adb3ab4bb03a author Manfred Spraul Sun, 31 Jul 2005 18:26:05 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:56 -0400 [PATCH] forcedeth: Improve ethtool support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit d81c0983de80c956cf37835b0d35adb3ab4bb03a tree 95828311e7b3a19b58feb9950c75755c59de98e7 parent 0e920bfb0395fb16909fb98cb6e2782a1c6b73c7 author Manfred Spraul Sun, 31 Jul 2005 18:20:30 +0200 committer Jeff Garzik Sun, 31 Jul 2005 12:59:56 -0400 [PATCH] forcedeth: Jumbo Frame Support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 0e920bfb0395fb16909fb98cb6e2782a1c6b73c7 tree 20f83aeaf19fd833f0a8aa36f8b9ce7bacb985da parent 18c16c696e8b2323a306af455c686df15c717206 author Chuck Ebbert <76306.1226@compuserve.com> Sat, 02 Jul 2005 21:28:23 -0400 committer Jeff Garzik Sun, 31 Jul 2005 01:06:11 -0400 [PATCH] loopback: whitespace cleanup Whitespace cleanup for loopback driver. Hopefully it fixes the last few annoyances. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit 18c16c696e8b2323a306af455c686df15c717206 tree a273c9fe65d970a10490b838f95e2d52e2193ed3 parent d2ae1d2ff9282ca061b6f5244eee4c28ee2b3ffa author Chuck Ebbert <76306.1226@compuserve.com> Sat, 02 Jul 2005 21:28:22 -0400 committer Jeff Garzik Sun, 31 Jul 2005 01:06:10 -0400 [PATCH] loopback: optimize stats This patch slightly optimizes the loopback driver's stats update. Saves two loads, one add and one increment per packet sent. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit d2ae1d2ff9282ca061b6f5244eee4c28ee2b3ffa tree 12bc14f038ed644faa6299912453f2784f755315 parent 2f761478a2b436efa23659b4d5c826e53b11f91a author Chuck Ebbert <76306.1226@compuserve.com> Sat, 02 Jul 2005 21:28:21 -0400 committer Jeff Garzik Sun, 31 Jul 2005 01:06:10 -0400 [PATCH] loopback: #ifdef the TSO code This patch #ifdefs the TSO code in the loopback driver. Saves ~800 bytes of text on i386 and avoids a conditional in the fast path. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit 541134cfe7af179f45458b68421ee1da7bab9cba tree 7920f8356f5ac7188fd775bbe6465688130fc2fe parent b0825488a642cadcf39709961dde61440cb0731c author Daniel Drake Sun, 03 Jul 2005 13:44:39 +0100 committer Jeff Garzik Sun, 31 Jul 2005 01:04:43 -0400 [PATCH] sata_nv: Support MCP51/MCP55 device IDs This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 2f761478a2b436efa23659b4d5c826e53b11f91a tree 433081bd7bcb1c7b90abc94f35231f6d8c9f1d4b parent cd8749b4aa6b7502e234d72cb53c00a3bc27ed1b author Victor Fusco Fri, 01 Jul 2005 00:03:12 +0200 committer Jeff Garzik Sun, 31 Jul 2005 00:54:14 -0400 [PATCH] drivers/net/pci-skeleton.c: MODULE_PARM -> module_param Use module_param() instead of the old MODULE_PARM() Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Jeff Garzik commit cd8749b4aa6b7502e234d72cb53c00a3bc27ed1b tree 409a83008f86b569b40404b9996a8bc46194e3f6 parent 6b9b97ce70b789014515f808b1b64c8e29e300d1 author Marcelo Feitoza Parisi Fri, 15 Jul 2005 11:16:42 +0100 committer Jeff Garzik Sun, 31 Jul 2005 00:51:49 -0400 [PATCH] Use time_before in hamradio drivers Use of time_before() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle DL5RB baycom_epp.c | 3 ++- baycom_par.c | 3 ++- baycom_ser_fdx.c | 3 ++- baycom_ser_hdx.c | 3 ++- mkiss.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) Signed-off-by: Jeff Garzik commit b7721ff96fa15459c7c5de59323bedd61f1bcbd7 tree 0be8c1e34afe958458757c23ecce9b104562160f parent a670fcb43f01a67ef56176afc76e5d43d128b25c author Adrian Bunk Fri, 22 Jul 2005 23:39:12 +0200 committer Jeff Garzik Sun, 31 Jul 2005 00:44:10 -0400 [PATCH] include/net/ieee80211.h must #include -Wundef found an (although perhaps harmless) bug: <-- snip --> ... CC net/ieee80211/ieee80211_crypt.o In file included from net/ieee80211/ieee80211_crypt.c:21: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined CC net/ieee80211/ieee80211_crypt_wep.o In file included from net/ieee80211/ieee80211_crypt_wep.c:20: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined CC net/ieee80211/ieee80211_crypt_ccmp.o CC net/ieee80211/ieee80211_crypt_tkip.o In file included from net/ieee80211/ieee80211_crypt_tkip.c:23: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 6b9b97ce70b789014515f808b1b64c8e29e300d1 tree f7581213da09c33bdddd44eeaddaaa43ff243205 parent 504ff16cecf2a788181eddc9d6e47d94ce50a9f6 author Peter Hagervall Wed, 27 Jul 2005 01:14:46 -0700 committer Jeff Garzik Sun, 31 Jul 2005 00:37:30 -0400 [PATCH] orinoco: Sparse fixes A few sparse cleanups for orinoco.c Signed-off-by: Peter Hagervall Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 504ff16cecf2a788181eddc9d6e47d94ce50a9f6 tree 7306b7d1909306fcec2e46cd3afdea02fbbeac5e parent 6b38aefe924daf2e4fdd73b384f21c913f31b668 author Jochen Friedrich Wed, 27 Jul 2005 01:14:50 -0700 committer Jeff Garzik Sun, 31 Jul 2005 00:37:29 -0400 [PATCH] tms380tr: move to DMA API This patch makes tms380tr use the new DMA API. Now that on Alpha, this API also supports bus master DMA for ISA (platform) devices, i changed the driver to use this new API. This also works around a bug in the firmware loader: The example provided in Documentation/firmware_class no longer works, as the firmware loader now calls get_kobj_path_length() and the kernel promptly oopses, as the home-grown device doesn't have a parent. Of course, this doesn't happen with a "real" device which has its bus (or pseudo bus in the case of platform) as parent. Converted tms380tr to use new DMA API: - proteon.c, skisa.c: use platform pseudo bus to create a struct device - Space.c: delete init hooks - abyss.c, tmspci.c: pass struct device to tms380tr.c - tms380tr.c, tms380tr.h: new DMA API, use real device fo firmware loader Signed-off-by: Jochen Friedrich Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6b38aefe924daf2e4fdd73b384f21c913f31b668 tree b8b46e695f3b0685e1962f88a4115d8b69de8fb3 parent 00db8189d984d6c51226dafbbe4a667ce9b7d5da author John W. Linville Thu, 28 Jul 2005 15:00:15 -0400 committer Jeff Garzik Sun, 31 Jul 2005 00:37:29 -0400 [PATCH] bonding: ALB -- allow slave to use bond's MAC address if its own MAC address conflicts In ALB mode, allow new slave to use bond's MAC address if the new slave's MAC address is being used within the bond and no other slave is using the bond's MAC address. Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit 62fe7e378109537ff80971c5208e12d40bf88bee tree 6facd4654afbef6590e21c4fde0c71fb7ed79f2e parent ebed67d2847a9d299b47eeb5d82744671ab2b198 author Jouni Malinen Sat, 30 Jul 2005 20:43:20 -0700 committer Jeff Garzik Sun, 31 Jul 2005 00:28:02 -0400 [PATCH] hostap: Replace crypto code with net/ieee80211 version Replace Host AP version of WEP, TKIP, CCMP implementation with net/ieee80211 that has more or less identical implementation (since it is based on the Host AP implementation). Remove Host AP specific implementation and modules from drivers/net/wireless/hostap. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ebed67d2847a9d299b47eeb5d82744671ab2b198 tree 9565c6fdaa7745669ec11087e259544cc6b31d2f parent f3b10e1636dec053f4874d593e3de5d46da48a5f author Jouni Malinen Sat, 30 Jul 2005 20:43:19 -0700 committer Jeff Garzik Sun, 31 Jul 2005 00:28:02 -0400 [PATCH] hostap: Start using net/ieee80211.h Preparations for starting to use net/ieee80211 instead of private IEEE 802.11 implementation. Include net/ieee80211.h and net/ieee80211_crypt.h into files that will be needed these in the future. Remove duplicate definitions from hostap_common.h and rename WLAN_FC_GET_{TYPE,STYPE} macros for now sinc net/ieee80211.h is using incompatible definitions. This will be resolved in the future by updating Host AP to use the versions that do not shift type/stype. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 727e6e932d76f05f8691a32bbeabd1061b051a3b tree 07572434f36144336e4d4d05f68de840f45db96b parent bdf242eeb0f69567fe43eba93889d80ecacbfe94 parent 889371f61fd5bb914d0331268f12432590cf7e85 author Dave Airlie Sun, 31 Jul 2005 13:34:09 +1000 committer Dave Airlie Sun, 31 Jul 2005 13:34:09 +1000 Merge ../linux-2.6/ commit 00db8189d984d6c51226dafbbe4a667ce9b7d5da tree f19468548c938523e3519670f8554e7a1b9c0c31 parent b0825488a642cadcf39709961dde61440cb0731c author Andy Fleming Sat, 30 Jul 2005 19:31:23 -0400 committer Jeff Garzik Sat, 30 Jul 2005 19:31:23 -0400 This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit 8348b4db5f56d2c0d3849db06055225ec15b255a tree f98fc7c7cee7c04f88d24c0cafcae0c628ace260 parent 560d3d521decc6d05dc0d6e007f1d2e1d3048102 author Francois Romieu Sat, 30 Jul 2005 13:16:14 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:01 -0400 [PATCH] sis190: compare the lpa to the local advertisement The station control register must depend on both the advertisement and the lpa The link partner ability has better be intersected with the current advertised value before it is feed to the station control register. Sight-catched-by: Lars Vahlenberg Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 560d3d521decc6d05dc0d6e007f1d2e1d3048102 tree 59f38e46a795247100d9d23bb8222dd40c2b86fa parent fcb9821d3dd62ede360e7991734ac22b79e9a4f0 author Francois Romieu Sat, 30 Jul 2005 13:15:51 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:01 -0400 [PATCH] sis190: PHY identifier for the K8S-MX motherboard. Added PHY identifier for the Asus K8S-MX motherboard Note: the same ID appears in the sis900 driver. Signed-off-by: Lars Vahlenberg Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit fcb9821d3dd62ede360e7991734ac22b79e9a4f0 tree 9c0818820beb5f6660dcb21ea820a25c179f7bd5 parent fc10c39d7920b1db9ad2d80fa845896e529355dc author Francois Romieu Sat, 30 Jul 2005 13:15:22 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: new PHY detection code. New PHY detection code. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit fc10c39d7920b1db9ad2d80fa845896e529355dc tree 4835f69f454be1677094a95da85c65a7cdaef1fb parent 9ede109bbe93d5bbe4271e346106847fbfea95a1 author Francois Romieu Sat, 30 Jul 2005 13:15:01 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: dummy read is required by the status register Add a dummy read before accessing the status register SiS driver suggests it. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 9ede109bbe93d5bbe4271e346106847fbfea95a1 tree d3ab06379a0303bddfef4643a9a4f3cf5f417c24 parent 3cec93c7124c3037dbff826d6c08e9758a301cd7 author Francois Romieu Sat, 30 Jul 2005 13:14:38 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: allow a non-hardcoded ID for the PHY. Allow a non-hardcoded ID for the PHY This is the first step before the driver probes for the PHY address. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 3cec93c7124c3037dbff826d6c08e9758a301cd7 tree 895aa5c42daf9c5bdb7f25b5fc87d663c4b871bd parent bcad5e537840ef6fa28b2f1e126fefb4c39a7248 author Francois Romieu Sat, 30 Jul 2005 13:14:18 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: add endian annotations. Add endian annotations. Signed-off-by: Alexey Dobriyan Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit bcad5e537840ef6fa28b2f1e126fefb4c39a7248 tree 4663de2cc7981c24ee177189afb3af7cdc322cc5 parent 8b5641d4f1f7376257783b79f121a19ccd86b56b author Francois Romieu Sat, 30 Jul 2005 13:13:47 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: extract bits definition from SiS driver. extract bits definition from SiS driver - fix the Rx stats; - minor pieces of documentation. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 8b5641d4f1f7376257783b79f121a19ccd86b56b tree ff22ed47573d826d8744effd78edefd30100c8fe parent 830fb7d23217ae748df0b16d4d419110810036b7 author Francois Romieu Sat, 30 Jul 2005 13:13:03 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: the size of the Rx buffer is constrained Add a restriction to the size of the Rx buffer SiS driver forces the size of any Rx buffer to be a multiple of 64 bit. I would not be surprized that it goes along with some alignment issues which have been experienced before. So far it does not make much of a difference (both drivers use 1536 bytes buffer). Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 830fb7d23217ae748df0b16d4d419110810036b7 tree 86596d111407994a02e14525ae87081882467734 parent 40292fb0f041362bca2f6ad975acedce4f6e3f3e author Francois Romieu Sat, 30 Jul 2005 13:12:37 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: initialisation of MAC address. Extract some mac addr code from SiS's driver. Some magic may hide beyond the isa bridge. The Rx mac control register is now set without condition. Note: good or bad, this part of the code is quite close to sis900.c. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 40292fb0f041362bca2f6ad975acedce4f6e3f3e tree eb2ce359b1bf105cad86f3e01f228ac8115c92e6 parent 188f23ba94a618b12cc205306f02b4f5036c4fa7 author Francois Romieu Sat, 30 Jul 2005 13:12:06 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: remove hardcoded constants. Replace hardcoded constants by enumerated values in sis190_read_eeprom The names of the enumerated values have been extracted from SiS'official driver (v1.00.00 published on 2005/07/11). Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 188f23ba94a618b12cc205306f02b4f5036c4fa7 tree 6797141c149c05c09d8997c859a675c8bd555eb4 parent 92aab3c08eca4770228715d26c8234cca4fae9af author Francois Romieu Sat, 30 Jul 2005 13:11:43 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:21:00 -0400 [PATCH] sis190: merge some register related information from SiS driver. Merge some register related information from SiS driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 92aab3c08eca4770228715d26c8234cca4fae9af tree e1e0dda9fd712c0440a54ed756b4ac1976409d3f parent 43afb949a955a7d88f4baf43d5c676bf4c31ff6c author Francois Romieu Sat, 30 Jul 2005 13:11:18 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:20:59 -0400 [PATCH] sis190: add MAINTAINER entry. add MAINTAINER entry Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 43afb949a955a7d88f4baf43d5c676bf4c31ff6c tree e179f7694439d8668c6f0691a8b468d20746ede3 parent 4405d3b5ef0a870e8d70ee4a3d050c89fcc40a86 author Francois Romieu Sat, 30 Jul 2005 13:10:21 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:20:59 -0400 [PATCH] sis190: ethtool/mii support. ethtool/mii support Bug: disabling autonegotiation and setting the link parameters at the same time does not provide the expected result. More investigation is needed. Note: past the initial probe/open time, the link is managed from user-space or accessed through sis190_phy_task, i.e. in a usermode context. Whence the very limited locking needs. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 4405d3b5ef0a870e8d70ee4a3d050c89fcc40a86 tree 1948cc6cd7acdee92a837ecd452d0c16c88e9267 parent 890e8d0a3ded0b1dee9020bbef7e9908e2228ffb author Francois Romieu Sat, 30 Jul 2005 13:09:20 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:20:59 -0400 [PATCH] sis190: netconsole support. netconsole support. This stuff should be factored out of every driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 890e8d0a3ded0b1dee9020bbef7e9908e2228ffb tree 9f9cb58c1490f492cd4f9d0edce8829f7518d7e5 parent b0825488a642cadcf39709961dde61440cb0731c author Francois Romieu Sat, 30 Jul 2005 13:08:43 +0200 committer Jeff Garzik Sat, 30 Jul 2005 18:20:59 -0400 [PATCH] sis190: resurrection Raise the sis190 driver from the dead The driver handles the integrated network device found on SiS 965L chipset. It follows the classical (non-napi) interrupt-driven model and provides minimal ethtool support. The code comes from a heavy cleanup/rewrite of the original code which was removed from the kernel on 14/04/2004. Since the r8169 driver does not work too bad and there will probably be (at least) a few months of improvements/testing/fixing, I made the code as close as possible to the r8169 one. Pascal Chapperon deserves some special credit for testing and bug-catching. Many thanks to Lars Vahlenberg as well. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit f3b10e1636dec053f4874d593e3de5d46da48a5f tree 57d78b3fd950bfa2c6991e14090ee9bee98f51f4 parent b15eff2632be3fcea68e01ba7f12e26a731e3157 author Jouni Malinen Sat, 30 Jul 2005 12:50:06 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:23 -0400 [PATCH] hostap update Fixed beacon frame when moving from monitor mode to master mode (workaround for firmware bug that left IBSS IE in the Beacon frames). This is using the same workaround that was previously used when moving from adhoc mode to master mode. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit b15eff2632be3fcea68e01ba7f12e26a731e3157 tree e61b3a7b99c1078faed0dc0594b1df8c09caa9b2 parent 3e1d393240880e3d7ae580c46f1ba265643fcd15 author Pavel Roskin Sat, 30 Jul 2005 12:50:05 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:23 -0400 [PATCH] hostap update Warning fix for 64-bit platforms Hello! The patch fixes following warning seen on 64-bit platforms (in my case - x86_64, gcc-4.0): In file included from /usr/local/src/hostap/driver/modules/hostap_cs.c:203: /usr/local/src/hostap/driver/modules/hostap_hw.c: In function ?prism2_transmit_cb?: /usr/local/src/hostap/driver/modules/hostap_hw.c:1674: warning: cast from pointer to integer of different size /usr/local/src/hostap/driver/modules/hostap_hw.c: In function ?prism2_transmit?: /usr/local/src/hostap/driver/modules/hostap_hw.c:1758: warning: cast to pointer from integer of different size prism2_transmit_cb uses a (void *) argument to get an integer. A simple fix would be to use double cast from pointer to long and then to int (and vice versa when int is passed as a pointer). But I prefer a slightly longer patch. I believe that whenever an argument can hold both a pointer and an integer, it should be declared long. long can hold both pointers and integers (except win64, but we are not coding for Windows), it can be cast to both of them and it's never assumed to be a valid pointer, which could be useful for some automatic code checkers. Signed-off-by: Pavel Roskin Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 3e1d393240880e3d7ae580c46f1ba265643fcd15 tree 2e720a490a9cb47d3c1a9b929955e0fdba1889f5 parent 0c629a69fd8ec7b67566cfc052a9b1c4b927805a author Brandon Enochs Sat, 30 Jul 2005 12:50:04 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:23 -0400 [PATCH] hostap update line 129 of hostap_80211_rx.c should read: LWNG_SETVAL(mactime, 2, 0, 4, rx_stats->mac_time); not: LWNG_SETVAL(mactime, 2, 0, 0, rx_stats->mac_time); The length field is incorrect. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0c629a69fd8ec7b67566cfc052a9b1c4b927805a tree 13c08758ef220b91a94299909d29252497313fc9 parent 2e4fd068e7e25e654a454ed4a425f239c0f6407a author Jouni Malinen Sat, 30 Jul 2005 12:50:03 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:23 -0400 [PATCH] hostap update Firmware seems to be getting into odd state in host_roaming mode 2 when hostscan is used without join command, so try to fix this by re-joining the current AP. This does not actually trigger a new association if the current AP is still in the scan results. This makes background scans (iwlist wlan0 scan) not to break data connection when in host_roaming 2 mode, e.g., when using wpa_supplicant. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 2e4fd068e7e25e654a454ed4a425f239c0f6407a tree 64206e16c44242428b9eeb48b21109d478de6782 parent 72ca9c61cddb82a8596cee8141656d50aba42be5 author Jouni Malinen Sat, 30 Jul 2005 12:50:02 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:23 -0400 [PATCH] hostap update Cleaned up scan result processing by converting struct hfa384x_scan_result into struct hfa384x_hostscan_result. This removes special cases from result processing since the results are only used in one, hostscan, format. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 72ca9c61cddb82a8596cee8141656d50aba42be5 tree fe2fa88ebe7d39538e6d4789d29db0e5a58b50b3 parent f06ac319c05c6822f878f201ae80e54fbbe8be8c author Jouni Malinen Sat, 30 Jul 2005 12:50:01 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update Added support for setting channel mask for scan requests ('iwpriv wlan0 scan_channels 0x00ff' masks scans to use channels 1-8). Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit f06ac319c05c6822f878f201ae80e54fbbe8be8c tree 354bcbfa84521287f3492f9a93ca824799753f22 parent 093853c395df33104ee12c3df4398820d665d107 author Jouni Malinen Sat, 30 Jul 2005 12:50:00 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update Add MODULE_VERSION information for the Host AP kernel modules and update the version string to indicate which version of the external Host AP driver is included in the kernel tree. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 093853c395df33104ee12c3df4398820d665d107 tree 035632e5c3ca12eac6d8a8f9031e4430866d6bcf parent 0cd545d6ba0e0138782eb0ec287d0eb3db529b69 author Henrik Brix Andersen Sat, 30 Jul 2005 12:49:59 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update pcmcia id_table for hostap_cs.c Hi Jouni, Here's a patch for adding a pcmcia id_table to hostap_cs.c as introduced by the PCMCIA subsystem changes in linux-2.6.13-rc1. The id_table allows hotplug (along with pcmciautils [1]) to load the driver without the need for the pcmcia-cs cardmgr daemon. The id_table was generated from the CVS version of hostap_cs.conf using a script borrowed from Dominik Brodowski. I have removed any duplicate entries, but I have only been able to test the functionality of the patch with a Linksys WPC11v3. Sincerely, Brix [1]: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0cd545d6ba0e0138782eb0ec287d0eb3db529b69 tree 0039836752d1ae1a3d3aab8b514e9159573fd146 parent 0ef79ee22cf5c1b177184c18b6525889bcc6681f author Dave Hansen Sat, 30 Jul 2005 12:49:58 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update Create sysfs "device" files for hostap I was writing some scripts to automatically build kismet source lines, and I noticed that hostap devices don't have device files, unlike my prism54 and ipw2200 cards: $ ls -l /sys/class/net/eth0/device /sys/class/net/eth0/device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:02:01.0 $ ls -l /sys/class/net/wifi0 ls: /sys/class/net/wifi0/device: No such file or directory $ ls -l /sys/class/net/wlan0 ls: /sys/class/net/wlan0/device: No such file or directory The following (quite small) patch makes sure that both the wlan and wifi net devices have that pointer to the bus device. This way, I can do things like for i in /sys/class/net/*; do if ! [ -e $i/device/drive ]; then continue; fi; driver=$(basename $(readlink $i/device/driver)) case $driver in hostap*) echo -- hostap,$i,$i-$driver break; ipw2?00) echo -- $driver,$i,$i-$driver break; prism54) echo prism54g,$i esac done Which should generate a working set of source lines for kismet no matter what order I plug the cards in. It might also be handy to have a link between the two net devices, but that's a patch for another day. That patch is against 2.6.13-rc1-mm1. -- Dave Signed-off-by: Dave Hansen Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0ef79ee22cf5c1b177184c18b6525889bcc6681f tree d1fd0e8f8de80e0728dfd46f7ae130e9a6999439 parent 1fad810473423bbf0626fab2fbeb27a4663fa2d5 author Jar Sat, 30 Jul 2005 12:49:57 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update hostap_cs: Remove irq_list, irq_mask and pcmcia/version.h Remove irq_list, irq_mask and pcmcia/version.h as suggested in http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 1fad810473423bbf0626fab2fbeb27a4663fa2d5 tree 38caa068662b2a661939a7e34e66eed83ccbbf3b parent 47e362cf6942de8b3a227929bf8bab578d92ad49 author Adrian Bunk Sat, 30 Jul 2005 12:49:56 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update EXPORT_SYMTAB does nothing. There's no need to define something if it doesn't have any effect. Signed-off-by: Adrian Bunk Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 47e362cf6942de8b3a227929bf8bab578d92ad49 tree 80072940762e0b471eed05fcbdd6502e57d97678 parent de745fb27983770ebfdeaa70f8a36f791fb33786 author Jouni Malinen Sat, 30 Jul 2005 12:49:55 -0700 committer Jeff Garzik Sat, 30 Jul 2005 18:17:22 -0400 [PATCH] hostap update Update hostap_cs to use new PCMCIA event callback registration. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit de745fb27983770ebfdeaa70f8a36f791fb33786 tree 701555a1a7a2a5ff9a6c67896cf1ea089597750e parent 08cd84c81f27d5bd22ba958b7cae6d566c509280 parent a670fcb43f01a67ef56176afc76e5d43d128b25c author Jeff Garzik Sat, 30 Jul 2005 18:14:50 -0400 committer Jeff Garzik Sat, 30 Jul 2005 18:14:50 -0400 /spare/repo/netdev-2.6 branch 'ieee80211' commit a670fcb43f01a67ef56176afc76e5d43d128b25c tree 09c9411c78a33ff980e9ea871bc7686e7589abbf parent 327309e899662b482c58cf25f574513d38b5788c parent b0825488a642cadcf39709961dde61440cb0731c author Jeff Garzik Sat, 30 Jul 2005 18:14:15 -0400 committer Jeff Garzik Sat, 30 Jul 2005 18:14:15 -0400 /spare/repo/netdev-2.6 branch 'master' commit bdf242eeb0f69567fe43eba93889d80ecacbfe94 tree dc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb parent 836cf0465c422ee6d654060edd7c620d9cf0c09c parent b0825488a642cadcf39709961dde61440cb0731c author Dave Airlie Sat, 30 Jul 2005 14:37:43 +1000 committer Dave Airlie Sat, 30 Jul 2005 14:37:43 +1000 Merge ../linux-2.6/ commit 4689ced99b18937e28c0f6c190394ccc3c61d651 tree aaec0912f3802359f1fd2023e078cf3d31c57286 parent c32511e2718618f0b53479eb36e07439aa363a74 author Peer Chen Fri, 29 Jul 2005 15:33:58 -0400 committer Jeff Garzik Fri, 29 Jul 2005 15:33:58 -0400 [netdrvr] add 'uli526x' driver (a tulip clone) We want to extract our LAN card driver from tulip core driver and make a new file uli526x.c at tulip folder, because we have added some ethtool interface support and non-eprom support in our driver and may be other change in the futher. If our controllers support are still contained in the tulip core driver, I think it'll increase the complexity of maintenance, you know, tulip core driver include several files and support so many other controllers. Furthermore, I tested the newest kernel 2.6.12 and I found the tulip driver can not work on our lan controller, and I no time to debug it, so I aspired want to make a single uli526x.c file just for our controllers. Could you help us remove the ULi m5261/m5263 lan controller support from tulip core driver and add the new single uli526x.c file for us? Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 661299d9d0437a0ff72240f3d60016ac3a361a6e tree 765512576314fc3612b503f182b9ae4e60fcf849 parent 05caac585f8abd6c0113856bc8858e3ef214d8a6 parent 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af author Russell King Thu, 28 Jul 2005 09:30:20 +0100 committer Russell King Thu, 28 Jul 2005 09:30:20 +0100 Merge with Linus' 2.6 tree commit 05caac585f8abd6c0113856bc8858e3ef214d8a6 tree ac9f8f2cc032281af09200da514257d120510906 parent 241fc4367b3ca5d407b043599ed980304a70b91f author Russell King Wed, 27 Jul 2005 11:41:18 +0100 committer Russell King Wed, 27 Jul 2005 11:41:18 +0100 [SERIAL] Convert parport_serial to use new 8250_pci interfaces Convert parport_serial to use the new 8250_pci interface, converting the table to a pciserial_board table. This also unuses the SPCI_* definitions in serialP.h, which can now be removed. Signed-off-by: Russell King commit 241fc4367b3ca5d407b043599ed980304a70b91f tree 26fca6996c9b3fe89cf86864681adcffc62aac6c parent 70db3d91a5228c98603c55fa06c87184a1f9f6db author Russell King Wed, 27 Jul 2005 11:35:54 +0100 committer Russell King Wed, 27 Jul 2005 11:35:54 +0100 [SERIAL] Expose 8250_pci setup/removal/suspend/resume functions Re-jig the setup/removal/suspend/resume of 8250 pci ports so that they know slightly less about how they're attached to a PCI device. Expose this as the new interface for registering PCI serial ports, as well as the pciserial_board structure and associated flag definitions. Signed-off-by: Russell King commit 70db3d91a5228c98603c55fa06c87184a1f9f6db tree 498c6d2d46467753b59a808e2e65a4e51a0d145c parent 67d74b870725448e0108984eec551609771e6b73 author Russell King Wed, 27 Jul 2005 11:34:27 +0100 committer Russell King Wed, 27 Jul 2005 11:34:27 +0100 [SERIAL] Pass around serial_private instead of pci_dev Pass the serial_private structure via the setup method instead of the pci_dev. We don't want to assume that the pci_dev's driver data is a pointer to serial_private. Instead, put the pci_dev inside serial_private. Signed-off-by: Russell King commit 67d74b870725448e0108984eec551609771e6b73 tree 60c49c145880f16ef62d60861ee0723d268091e2 parent 72ce9a83331afdd4df944f210a5210bf5acb7d6a author Russell King Wed, 27 Jul 2005 11:33:03 +0100 committer Russell King Wed, 27 Jul 2005 11:33:03 +0100 [SERIAL] Collapse the SIIG quirk entries Collapse all the SIIG quirk entries into one. SIIG10x cards all have PCI device IDs of 0x10xx, SIIG20x cards all have PCI device IDs of 0x20xx. Signed-off-by: Russell King commit 72ce9a83331afdd4df944f210a5210bf5acb7d6a tree 232cb0eefd8f62916e0a5732e876742517bfce25 parent 1c7c1fe51629d82e1dff22b2c4d409b252fb2b05 author Russell King Wed, 27 Jul 2005 11:32:04 +0100 committer Russell King Wed, 27 Jul 2005 11:32:04 +0100 [SERIAL] Factor out the common setup from the per-serial port loop. Signed-off-by: Russell King commit 1c7c1fe51629d82e1dff22b2c4d409b252fb2b05 tree 10fffc573c4951098900044727f53af908020779 parent 9e566d8bd61f939b7f5d7d969f5b178571471cf9 author Russell King Wed, 27 Jul 2005 11:31:19 +0100 committer Russell King Wed, 27 Jul 2005 11:31:19 +0100 [SERIAL] Rename pci_board to pciserial_board. Signed-off-by: Russell King commit 08cd84c81f27d5bd22ba958b7cae6d566c509280 tree 6fdb546c151410851fd3c604d42590afa4215084 parent e9dd2561793c05d70c9df1bc16a2dde6f23388df parent 327309e899662b482c58cf25f574513d38b5788c author Jeff Garzik Wed, 13 Jul 2005 19:11:44 -0400 committer Jeff Garzik Wed, 13 Jul 2005 19:11:44 -0400 Merge /spare/repo/netdev-2.6 branch 'ieee80211' commit 327309e899662b482c58cf25f574513d38b5788c tree 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 parent 0c168775709faa74c1b87f1e61046e0c51ade7f3 parent c32511e2718618f0b53479eb36e07439aa363a74 author Jeff Garzik Wed, 13 Jul 2005 16:23:51 -0400 committer Jeff Garzik Wed, 13 Jul 2005 16:23:51 -0400 Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. commit 836cf0465c422ee6d654060edd7c620d9cf0c09c tree 622ed9a2ca774818084ffdcfbf1622ef1735bb74 parent d01cff408057fa925b2f766fa1fd5a305fd1acbf author Dave Airlie Sun, 10 Jul 2005 19:27:04 +1000 committer Dave Airlie Sun, 10 Jul 2005 19:27:04 +1000 drm: cleanup buffer/map code This is a patch from DRM CVS that cleans up some code that was in CVS that I never moved to the kernel, this patch produces the result of the cleanups and puts it into the kernel drm. From: Eric Anholt , Jon Smirl, Dave Airlie Signed-off-by: Dave Airlie commit d01cff408057fa925b2f766fa1fd5a305fd1acbf tree 26efcd2c8646af15203f46c8351d930fd869b0e9 parent 6795c985a648d1e90b367cc1387c18205ecca4b8 author Dave Airlie Sun, 10 Jul 2005 19:24:35 +1000 committer Dave Airlie Sun, 10 Jul 2005 19:24:35 +1000 drm: add mga driver callbacks Add some missing driver callback for the PCI support Signed-off-by: Dave Airlie commit 6795c985a648d1e90b367cc1387c18205ecca4b8 tree c764bbcf801ecd95c8a90fb1c6660a88c8bf4077 parent b5d499cfdeebcb71f00f3513045796ccae718140 author Dave Airlie Sun, 10 Jul 2005 18:20:09 +1000 committer Dave Airlie Sun, 10 Jul 2005 18:20:09 +1000 Add support for PCI MGA cards to MGA DRM. This patch adds serveral new ioctls and a new query to get_param query to support PCI MGA cards. Two ioctls were added to implement interrupt based waiting. With this change, the client-side driver no longer needs to map the primary DMA region or the MMIO region. Previously, end-of-frame waiting was done by busy waiting in the client-side driver until one of the MMIO registers (the current DMA pointer) matched a pointer to the end of primary DMA space. By using interrupts, the busy waiting and the extra mappings are removed. A third ioctl was added to bootstrap DMA. This ioctl, which is used by the X-server, moves a *LOT* of code from the X-server into the kernel. This allows the kernel to do whatever needs to be done to setup DMA buffers. The entire process and the locations of the buffers are hidden from user-mode. Additionally, a get_param query was added to differentiate between G4x0 cards and G550 cards. A gap was left in the numbering sequence so that, if needed, G450 cards could be distinguished from G400 cards. According to Ville Syrjälä, the G4x0 cards and the G550 cards handle anisotropic filtering differently. This seems the most compatible way to let the client-side driver know which card it's own. Doing this very small change now eliminates the need to bump the DRM minor version twice. http://marc.theaimsgroup.com/?l=dri-devel&m=106625815319773&w=2 (airlied - this may not work at this point, I think the follow on buffer cleanup patches will be needed) From: Ian Romanick Signed-off-by: Dave Airlie commit b5d499cfdeebcb71f00f3513045796ccae718140 tree 009eccb0fc8657fda446851f7c7df497ef3470b6 parent 93f453f3ffd8f4dbb0311b58b854e7655da3d601 author Dave Airlie Sun, 10 Jul 2005 18:17:42 +1000 committer Dave Airlie Sun, 10 Jul 2005 18:17:42 +1000 drm: make drm_alloc_agp take a dev arg. Signed-off-by: Dave Airlie commit 93f453f3ffd8f4dbb0311b58b854e7655da3d601 tree ce4be3b521fd73bf077bc447b5ef799fbdd15263 parent cda173806644d2af22ffd9896eed8ef99b97d356 author Dave Airlie Sun, 10 Jul 2005 17:45:34 +1000 committer Dave Airlie Sun, 10 Jul 2005 17:45:34 +1000 drm: add new mga ids and types From: Ian Romanick Signed-off-by: Dave Airlie commit cda173806644d2af22ffd9896eed8ef99b97d356 tree 374ad48818df951a03c59d54ec75d5b19d4a24c3 parent ceb9c27aa7d61c70f4c75f017d9fbc9de50034f1 author Dave Airlie Sun, 10 Jul 2005 17:31:26 +1000 committer Dave Airlie Sun, 10 Jul 2005 17:31:26 +1000 drm: add test for AGP devices and driver override for it. Added device_is_agp callback to drm_driver. This function is called by the platform-specific drm_device_is_agp function. Added implementation of this function the the Linux-specific portion of the MGA driver to detect PCI G450 cards. Added code to the Linux-specific portion of the generic DRM layer to not initialize AGP infrastructure if the card is not AGP (this matches what already existed in BSD). Fix up i810/i830 and i915 drivers to always return AGP as they don't always report the capability. Fix the MGA to not report AGP for a card that has an AGP chip behind a PCI bridge. From: Ian Romanick, Dave Airlie, Alan Hourihane Signed-off-by: Dave Airlie commit ceb9c27aa7d61c70f4c75f017d9fbc9de50034f1 tree 9d87bbbc1b7819b355c50807717a3e0099ee2815 parent d84f76d37c5eebb94c48337958d5a2ff2965c02d author Dave Airlie Sun, 10 Jul 2005 17:07:23 +1000 committer Dave Airlie Sun, 10 Jul 2005 17:07:23 +1000 drm: destatic exported function. Signed-off-by: Dave Airlie commit d84f76d37c5eebb94c48337958d5a2ff2965c02d tree ce59b2cb9d82420a1b41b184813a36c918069552 parent aff138ab8ec340c23e7c6e1a95c1518ee832a8c6 author Dave Airlie Sun, 10 Jul 2005 17:04:22 +1000 committer Dave Airlie Sun, 10 Jul 2005 17:04:22 +1000 drm: export symbols for use by drivers This just exports symbols for use in drivers. From: Ian Romanick Signed-off-by: Dave Airlie commit aff138ab8ec340c23e7c6e1a95c1518ee832a8c6 tree 751435ac696780929091b6ff911cc898d1e540e0 parent 7ab984012a879a53abb56abfe03b0c686f42b281 author Dave Airlie Sun, 10 Jul 2005 16:58:40 +1000 committer Dave Airlie Sun, 10 Jul 2005 16:58:40 +1000 drm: fix minor function header issue From: Ian Romanick Signed-off-by: Dave Airlie commit 7ab984012a879a53abb56abfe03b0c686f42b281 tree 53738f82e57b2aa91c5706f6c463831ddf19164d parent 9c8da5ebbf6f87293cf8555182da271449889a69 author Dave Airlie Sun, 10 Jul 2005 16:56:52 +1000 committer Dave Airlie Sun, 10 Jul 2005 16:56:52 +1000 drm: update some function so a driver can call them This patch splits some ioctl functions so that they can be called in-kernel by a DRM driver. The driver will use them later. From: Ian Romanick Signed-off-by: Dave Airlie commit 9c8da5ebbf6f87293cf8555182da271449889a69 tree c036835be2ec09249f960518ff2703316257d815 parent d59431bf96d1e8a3d6d240343f559f5e2ace7f1d author Dave Airlie Sun, 10 Jul 2005 15:38:56 +1000 committer Dave Airlie Sun, 10 Jul 2005 15:38:56 +1000 drm: update support for drm pci buffers The DRM needs to change the drm_pci interface for FreeBSD compatiblity, this patch introduces the drm_dma_handle_t and uses it in the Linux code. From: Tonnerre Lombard, Eric Anholt, and Sergey Vlasov Signed-off-by: David Airlie commit d59431bf96d1e8a3d6d240343f559f5e2ace7f1d tree 7d0d8f7d61b3870d661fcd514fb05b53d11153fe parent b84397d6390ef04e8080d66bf528418ab5e75dc0 author Dave Airlie Sun, 10 Jul 2005 15:00:06 +1000 committer Dave Airlie Sun, 10 Jul 2005 15:00:06 +1000 Refactor common, boilerplate ioctl code from drm_addbufs_* functions into drm_addbufs. This makes the code more like the BSD code, and makes the drm_addbufs_* functions callable in-kernel. From: Ian Romanick Signed-off-by: Dave Airlie commit b84397d6390ef04e8080d66bf528418ab5e75dc0 tree 39c78eb64f60eee701cf31663e37370f402603d3 parent 2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3 author Dave Airlie Sun, 10 Jul 2005 14:46:12 +1000 committer Dave Airlie Sun, 10 Jul 2005 14:46:12 +1000 drm: add framebuffer maps The patch makes drmAddBufs/drmMapBufs can handle buffers in video memory The attached patch adds a new buffer type DRM_FB_BUFFER. It works like AGP memory but uses video memory. From: Austin Yuan Signed-off-by: Dave Airlie commit 2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3 tree 6602c6a936254ae1175073fdd3f800ed67730c17 parent f179bc77d09b9087bfc559d0368bba350342ac76 author Dave Airlie Sun, 10 Jul 2005 14:34:13 +1000 committer Dave Airlie Sun, 10 Jul 2005 14:34:13 +1000 drm: add _DRM_CONSISTENT map type Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It uses drm_pci_alloc/free for allocating/freeing the memory. From: Felix Kuhling Signed-off-by: David Airlie commit e9dd2561793c05d70c9df1bc16a2dde6f23388df tree 20099972569cc0748133a6351600fff9cbb15f4a parent d011e151bc5d1a581bf35b492a4fde44d30382b9 parent 0c168775709faa74c1b87f1e61046e0c51ade7f3 author Jeff Garzik Thu, 30 Jun 2005 00:49:38 -0400 committer Jeff Garzik Thu, 30 Jun 2005 00:49:38 -0400 Merge /spare/repo/netdev-2.6 branch 'ieee80211' commit 0c168775709faa74c1b87f1e61046e0c51ade7f3 tree c40fd8818c64c5d7d1d90afab0bd6ffd94505526 parent 9bd481f85940726bf66aae5cd03c5b912ad0ae4c parent 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 author Jeff Garzik Thu, 30 Jun 2005 00:49:18 -0400 committer Jeff Garzik Thu, 30 Jun 2005 00:49:18 -0400 Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6. commit 9bd481f85940726bf66aae5cd03c5b912ad0ae4c tree 3ccd9be1df9cff30863e47d32f631b9c43da5783 parent 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 author Jeff Garzik Tue, 28 Jun 2005 01:46:35 -0400 committer Jeff Garzik Tue, 28 Jun 2005 01:46:35 -0400 wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h commit d011e151bc5d1a581bf35b492a4fde44d30382b9 tree a912c745d3093127a767b7456c46c517bdc0baf7 parent 30b4d6565e4d57c6d03600c7822411c7cac19638 parent 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 author Jeff Garzik Tue, 28 Jun 2005 00:46:58 -0400 committer Jeff Garzik Tue, 28 Jun 2005 00:46:58 -0400 Merge /spare/repo/netdev-2.6 branch 'ieee80211' commit 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 tree 575f59b6a0918b11f7c763aecf0c3e70478460d2 parent ad3fee560bc508008b3b2cf6358105c4c7081921 parent 99f95e5286df2f69edab8a04c7080d986ee4233b author Jeff Garzik Tue, 28 Jun 2005 00:46:46 -0400 committer Jeff Garzik Tue, 28 Jun 2005 00:46:46 -0400 Merge /spare/repo/linux-2.6/ commit 30b4d6565e4d57c6d03600c7822411c7cac19638 tree 57244f2a9694de61b373631841fc493bbdf43022 parent aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f parent ad3fee560bc508008b3b2cf6358105c4c7081921 author Jeff Garzik Mon, 27 Jun 2005 23:45:25 -0400 committer Jeff Garzik Mon, 27 Jun 2005 23:45:25 -0400 Merge /spare/repo/netdev-2.6 branch 'ieee80211' commit ad3fee560bc508008b3b2cf6358105c4c7081921 tree 21dfeb0daf6354cec40e71ee6a5865e28593e9c1 parent edfc43f2ec542c17c479d8ec7e4b0cee7b20f578 author Andrew Morton Mon, 20 Jun 2005 14:30:36 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:37:30 -0400 [PATCH] wireless-device-attr-fixes-2 More fixes for greg depredations. Also nuke lots of pointless typecasts. All this new wireless code adds near-infinite amounts of trailing whitespace. Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton commit edfc43f2ec542c17c479d8ec7e4b0cee7b20f578 tree a66fcda6b17aba0cae1e13364a7c8d3bb2b2d69a parent 011fe95a3b25ff124486fc27dc0395904ecf5852 author Andrew Morton Mon, 20 Jun 2005 14:30:35 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:37:29 -0400 [PATCH] wireless-device-attr-fixes Repair Jeff's stuff after gregkh depredations. Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton commit 011fe95a3b25ff124486fc27dc0395904ecf5852 tree 57adf80a6e63d189da1edb32be3fff186f76bc7f parent 8724a118031a4eb62174b3e12745e4d35d4b03fe author Andrew Morton Mon, 20 Jun 2005 14:30:36 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:28:35 -0400 [PATCH] ipw2100 old gcc fix drivers/net/wireless/ipw2100.c: In function `ipw2100_set_key_index': drivers/net/wireless/ipw2100.c:5326: array index in non-array initializer drivers/net/wireless/ipw2100.c:5326: (near initialization for `cmd') drivers/net/wireless/ipw2100.c:5326: warning: missing braces around initializer drivers/net/wireless/ipw2100.c:5326: warning: (near initialization for `cmd.host_command_parameters') Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 8724a118031a4eb62174b3e12745e4d35d4b03fe tree eb896a9608da4a175e42279f5d8ffe2d4a3c6c7b parent 5dc54a65b6981d327a84c7651bbfeef0c0aff977 author Pavel Machek Mon, 20 Jun 2005 14:28:43 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:26:31 -0400 [PATCH] ipw2100: small cleanups Fix few typos/thinkos in ipw, remove ugly macro (it is commented around, anyway), and fix types passed to pci_set_power_state. Signed-off-by: Andrew Morton commit 5dc54a65b6981d327a84c7651bbfeef0c0aff977 tree 8dde1717c6748c73b3287104662c238d43b57450 parent 4663663f1d91aa0b84526841e47f401598bfa2f4 author Pavel Machek Mon, 20 Jun 2005 14:28:43 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:26:30 -0400 [PATCH] ipw2100: kill dead macros There are several never used macros in ipw2100. This removes them. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton commit 4663663f1d91aa0b84526841e47f401598bfa2f4 tree aad2d6fc255ad462fa8151ba49491b15759f32b2 parent 0e08b44eedacb7824c88678d9a9ea7db25b5401c author Pavel Machek Mon, 20 Jun 2005 14:28:42 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:26:30 -0400 [PATCH] ipw2100: assume recent kernel ipw2100 still has support for old kernels. Thats considered bad for patch in mainline... this fixes few instances. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton commit 0e08b44eedacb7824c88678d9a9ea7db25b5401c tree 84ee98bf0e580b5e552933053df9410fb1b6de76 parent 05743d165be9f0293b4ff67f4e1cf3724eb13e1f author Tobias Klauser Mon, 20 Jun 2005 14:28:41 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:25:10 -0400 [PATCH] drivers/net/wireless/ipw2200: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 05743d165be9f0293b4ff67f4e1cf3724eb13e1f tree e1c925bb8c981f4051f78432ed4d330018fa760e parent 070d01651296d3c87bca94f3b1313447e9e06c2f author Tobias Klauser Mon, 20 Jun 2005 14:28:40 -0700 committer Jeff Garzik Mon, 27 Jun 2005 23:25:10 -0400 [PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 070d01651296d3c87bca94f3b1313447e9e06c2f tree 0e6982c0973311e831c980a7a9c2d92e421313da parent aaa4d308a8cbc4ccfd870ee556def2e481557274 author Pavel Machek Mon, 20 Jun 2005 13:33:07 +0200 committer Jeff Garzik Mon, 27 Jun 2005 23:24:18 -0400 [PATCH] ipw2100: remove commented-out code This removes up various code/defines that was just commented out instead of being deleted. commit aaa4d308a8cbc4ccfd870ee556def2e481557274 tree 8d3d17298dcd9acca396ca783f64c5922d253677 parent e19b813e0c9c5995423dc95b01379c89f188ae70 author Jiri Benc Tue, 07 Jun 2005 14:58:41 +0200 committer Jeff Garzik Mon, 27 Jun 2005 23:13:59 -0400 [PATCH] ieee80211: fix ipw 64bit compilation warnings On Mon, 06 Jun 2005 14:29:52 +0800, Zhu Yi wrote: > ("%zd", sizeof()) should be better. Thanks. This is a corrected version of the patch. This patch fixes warnings when compiling ipw2100 and ipw2200 on x86_64. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit e19b813e0c9c5995423dc95b01379c89f188ae70 tree f5f76662cc575cbe0247ab3841b34bcc5586f147 parent 7c9d4c70b20e165eb11d8aed2b6374377d17f43a author Adrian Bunk Fri, 03 Jun 2005 18:29:20 +0200 committer Jeff Garzik Mon, 27 Jun 2005 23:12:35 -0400 [PATCH] ieee80211: fix recursive ipw2200 dependencies This results in recursive dependencies: - IPW2200 depends on NET_RADIO - IPW2200 selects IEEE80211 - IEEE80211 selects NET_RADIO This patch fixes the IPW2200 dependencies in a way that they are similar to the IPW2100 dependencies. Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit 7c9d4c70b20e165eb11d8aed2b6374377d17f43a tree 7173a182677332e31d4b2461ec18eaa1c4d7fc10 parent 245ac8738b0b840552d56b842e70e750d65911cc author Adrian Bunk Fri, 03 Jun 2005 18:28:19 +0200 committer Jeff Garzik Mon, 27 Jun 2005 23:12:35 -0400 [PATCH] ieee80211: remove pci.h #include's I was wondering why editing pci.h triggered the rebuild of three files under net/, and as far as I can see, there's no reason for these three files to #include pci.h . Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f tree 57ca3e27227695acbd97408eabb0f967726c3b51 parent f45727d52d1581e9ff4df9d1a12a60789ad2d1eb parent 245ac8738b0b840552d56b842e70e750d65911cc author Jeff Garzik Mon, 27 Jun 2005 22:50:10 -0400 committer Jeff Garzik Mon, 27 Jun 2005 22:50:10 -0400 Merge /spare/repo/netdev-2.6 branch 'ieee80211' commit 245ac8738b0b840552d56b842e70e750d65911cc tree 2609d6b0a8c603804d71aed65d7f74097ebe0e58 parent 716b43303df605510399d6da0d0dd4e2ea376e7c parent a5fe736eaf9bae1b45317313de04b564441b94f2 author Jeff Garzik Mon, 27 Jun 2005 22:49:47 -0400 committer Jeff Garzik Mon, 27 Jun 2005 22:49:47 -0400 Merge upstream net/ieee80211.h changes into 'ieee80211' branch. commit 716b43303df605510399d6da0d0dd4e2ea376e7c tree 57412aaf516b7a10b4b81064aeda318514fec168 parent 5696c1944a33b4434a9a1ebb6383b906afd43a10 parent c7b645f934e52a54af58142d91fb51f881f8ce26 author Jeff Garzik Mon, 27 Jun 2005 22:03:52 -0400 committer Jeff Garzik Mon, 27 Jun 2005 22:03:52 -0400 Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6) commit f45727d52d1581e9ff4df9d1a12a60789ad2d1eb tree 773ae25f98542e6d382c688f7e85e8137d065614 parent 4c925f452cfd16c690209e96821ee094e09a2404 parent 5696c1944a33b4434a9a1ebb6383b906afd43a10 author Jeff Garzik Sun, 26 Jun 2005 23:42:30 -0400 committer Jeff Garzik Sun, 26 Jun 2005 23:42:30 -0400 Merge /spare/repo/netdev-2.6/ branch 'ieee80211' commit 5696c1944a33b4434a9a1ebb6383b906afd43a10 tree 16fbe6ba431bcf949ee8645510b0c2fd39b5810f parent 66b04a80eea60cabf9d89fd34deb3234a740052f parent 020f46a39eb7b99a575b9f4d105fce2b142acdf1 author Jeff Garzik Sun, 26 Jun 2005 23:38:58 -0400 committer Jeff Garzik Sun, 26 Jun 2005 23:38:58 -0400 Merge /spare/repo/linux-2.6/ commit 559fb51ba7e66fe298b8355fabde1275b7def35f tree e1de3eb86ea5e6ac8c5f27dc32140a0c2aacc51e parent a5324343955997d1439f26518ddac567cd5d134b author Scott Bardone Thu, 23 Jun 2005 01:40:19 -0400 committer Jeff Garzik Thu, 23 Jun 2005 01:40:19 -0400 Update Chelsio gige net driver. - Use extern prefix for functions required. - Removed a lot of wrappers, including t1_read/write_reg_4. - Removed various macros, using native kernel calls now. - Enumerated various #defines. - Removed a lot of shared code which is not currently used in "NIC only" mode. - Removed dead code. Documentation/networking/cxgb.txt: - Updated release notes for version 2.1.1 drivers/net/chelsio/ch_ethtool.h - removed file, no longer using ETHTOOL namespace. drivers/net/chelsio/common.h - moved code from osdep.h to common.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cphy.h - removed dead code. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cxgb2.c - use DMA_{32,64}BIT_MASK in include/linux/dma-mapping.h. - removed unused code. - use printk message for link info resembling drivers/net/mii.c. - no longer using the MODULE_xxx namespace. - no longer using "pci_" namespace. - no longer using ETHTOOL namespace. drivers/net/chelsio/cxgb2.h - removed file, merged into common.h drivers/net/chelsio/elmer0.h - removed dead code. - added various enums. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/espi.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. drivers/net/chelsio/espi.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/gmac.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/mv88x201x.c - changes to sync with Chelsio TOT. drivers/net/chelsio/osdep.h - removed file, consolidation. osdep was used to translate wrapper functions since our code supports multiple OSs. removed wrappers. drivers/net/chelsio/pm3393.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/regs.h - added a few register entries for future and current feature support. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/sge.c - rewrote large portion of scatter-gather engine to stabilize performance. - using u8/u16/u32 kernel types instead of __u8/__u16/__u32 compiler types. drivers/net/chelsio/sge.h - rewrote large portion of scatter-gather engine to stabilize performance. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/subr.c - merged tp.c into subr.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/suni1x10gexp_regs.h - modified copyright and authorship of file. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/tp.c - removed file, merged into subr.c. drivers/net/chelsio/tp.h - removed file. include/linux/pci_ids.h - patched to include PCI_VENDOR_ID_CHELSIO 0x1425, removed define from our code. commit a5324343955997d1439f26518ddac567cd5d134b tree f43558389c41e3a0f076c4ee55d77c4aa1561779 parent 8199d3a79c224bbe5943fa08684e1f93a17881b0 parent a4936044001694f033fe4ea94d6034d51a6b465c author Jeff Garzik Wed, 22 Jun 2005 21:50:57 -0400 committer Jeff Garzik Wed, 22 Jun 2005 21:50:57 -0400 Merge /spare/repo/linux-2.6/ commit 4c925f452cfd16c690209e96821ee094e09a2404 tree 4b4ba76aa81b3627142787262fd2f8049dd3662d parent 51a730d758ae4052e10ca7e06336f10af598c4fc parent 66b04a80eea60cabf9d89fd34deb3234a740052f author Fri, 27 May 2005 22:57:33 -0400 committer Jeff Garzik Fri, 27 May 2005 22:57:33 -0400 Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 commit 66b04a80eea60cabf9d89fd34deb3234a740052f tree 287fe022d75e287aeff6d115316b93e6308ae28d parent 286d974797705ae7ceedc846666ef98bdeee3646 author Jeff Garzik Fri, 27 May 2005 22:53:55 -0400 committer Jeff Garzik Fri, 27 May 2005 22:53:55 -0400 [wireless] ipw2100: fix build after applying SuSE cleanups s/ieee80211_header_data/ieee80211_hdr_3addr/ commit 286d974797705ae7ceedc846666ef98bdeee3646 tree 512275d067849ba49a41d1fe00b9954cb1fe38ee parent 76fe1b0e4c093f985c66a062c9c10370b4985796 author Jiri Benc Tue, 24 May 2005 15:10:18 +0200 committer Jeff Garzik Fri, 27 May 2005 22:43:30 -0400 [PATCH] ieee80211: cleanup Cleanup of unused and duplicated constants and structures in the ieee80211 header. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit 76fe1b0e4c093f985c66a062c9c10370b4985796 tree d7b03713a116d26518ec2ede12799a70f38e3417 parent e157249d948bf0c5da10ce8610e2b4b36d0a3c4c author Adrian Bunk Sat, 07 May 2005 00:54:49 +0200 committer Jeff Garzik Fri, 27 May 2005 22:26:44 -0400 [PATCH] fix IEEE80211_CRYPT_* selects Some of the options didn't obey the most important rule of select If you select something, you have to ensure that the dependencies of what you do select are fulfilled. resulting in the following compile error: <-- snip --> ... LD .tmp_vmlinux1 crypto/built-in.o(.init.text+0x31b): In function `aes_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.init.text+0x326): In function `michael_mic_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.exit.text+0x6): In function `aes_fini': : undefined reference to `crypto_unregister_alg' crypto/built-in.o(.exit.text+0x16): In function `michael_mic_exit': : undefined reference to `crypto_unregister_alg' net/built-in.o(.text+0x5ba52): In function `ieee80211_ccmp_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5ba94): In function `ieee80211_ccmp_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5bab7): In function `ieee80211_ccmp_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c5c2): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c5d5): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c623): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c62a): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c65e): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c665): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> This patch adds the missing selects of CRYPTO (similar to how IEEE80211_CRYPT_WEP already does it). Yes, you could argue whether CRYPTO should be select'ed by the CRYPTO_* options, but with the current CRYPTO* dependencies this patch is required. commit e157249d948bf0c5da10ce8610e2b4b36d0a3c4c tree c55f18c62d814fafe291e55019ec95221bdcf8eb parent 3dcefbc9d6bd8b5ff0fc4bdbe3df938be5460f79 author Adrian Bunk Fri, 06 May 2005 23:32:39 +0200 committer Jeff Garzik Fri, 27 May 2005 22:26:43 -0400 [PATCH] net/ieee80211/: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk commit 3dcefbc9d6bd8b5ff0fc4bdbe3df938be5460f79 tree e3519e48dc40bf5dbda5159f49cbaa67fade8212 parent 695b5bc3ecfc7da0a29360a6c2ee0849ffdb300a author Al Viro Tue, 26 Apr 2005 18:43:05 +0100 committer Jeff Garzik Fri, 27 May 2005 22:23:04 -0400 [PATCH] zd1201 fixes In netdev-2.6 we need to update zd1201.c since we don't have driver/net/wireless/ieee802_11.h anymore. Signed-off-by: Al Viro commit 695b5bc3ecfc7da0a29360a6c2ee0849ffdb300a tree 5c6d8a4a44acccb6f9685b8d601d4b24357fb130 parent ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf author Al Viro Sun, 03 Apr 2005 09:15:52 +0100 committer Jeff Garzik Fri, 27 May 2005 22:15:13 -0400 [PATCH] ieee80211_module.c::store_debug_level() cleanup * trivial __user annotations * store_debug_level() sanitized a bit Signed-off-by: Al Viro commit 51a730d758ae4052e10ca7e06336f10af598c4fc tree b76a004c00cd7139659be515ee03398e47067290 parent 6cd15a9daf826115356f9403494c76e5aafa7793 parent ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf author Fri, 27 May 2005 22:08:07 -0400 committer Jeff Garzik Fri, 27 May 2005 22:08:07 -0400 Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 commit ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf tree 963cdd52a4032cd4827896c4e813cfbf6dd7b3e6 parent 43f66a6ce8da299344cf1bc2ac2311889cc88555 parent 1f15d694522af9cd7492695f11dd2dc77b6cf098 author Fri, 27 May 2005 22:07:40 -0400 committer Jeff Garzik Fri, 27 May 2005 22:07:40 -0400 Automatic merge of /spare/repo/netdev-2.6 branch we18 commit 6cd15a9daf826115356f9403494c76e5aafa7793 tree 3ab9372fca7974dcb4c3c25fa5dc6f267cddeef9 parent ff1d2767d5a43c85f944e86a45284b721f66196c parent 43f66a6ce8da299344cf1bc2ac2311889cc88555 author Fri, 27 May 2005 22:02:58 -0400 committer Jeff Garzik Fri, 27 May 2005 22:02:58 -0400 Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 commit 43f66a6ce8da299344cf1bc2ac2311889cc88555 tree c918d137e808acb0d12492f7f0fd9ba015d6cc28 parent 2c86c275015c880e810830304a3a4ab94803b38b author James Ketrenos Fri, 25 Mar 2005 12:31:53 -0600 committer Jeff Garzik Fri, 27 May 2005 21:59:35 -0400 Add ipw2200 wireless driver. commit 2c86c275015c880e810830304a3a4ab94803b38b tree 219bf554765cd7bacf1e120290359dfa8370c0f7 parent 0a989b24fd59e8867274246587b46f5595fa0baa author James Ketrenos Wed, 23 Mar 2005 17:32:29 -0600 committer Jeff Garzik Fri, 27 May 2005 21:57:53 -0400 Add ipw2100 wireless driver. commit 0a989b24fd59e8867274246587b46f5595fa0baa tree a240d10b44bfe328afc86e914b469ce48e0d7d73 parent b453872c35cfcbdbf5a794737817f7d4e7b1b579 author Adrian Bunk Mon, 11 Apr 2005 16:52:15 -0700 committer Jeff Garzik Sun, 15 May 2005 23:21:19 -0400 [PATCH] net/ieee80211/ieee80211_tx.c: swapped memset arguments Fix swapped memset() arguments in net/ieee80211/ieee80211_tx.c found by Maciej Soltysiak. Patch by Jesper Juhl. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton commit 8199d3a79c224bbe5943fa08684e1f93a17881b0 tree 77726ddade7ca4282bc12315abcb01fdf241be74 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Christoph Lameter Wed, 30 Mar 2005 13:34:31 -0800 committer Jeff Garzik Sun, 15 May 2005 19:15:02 -0400 [PATCH] A new 10GB Ethernet Driver by Chelsio Communications A Linux driver for the Chelsio 10Gb Ethernet Network Controller by Chelsio (http://www.chelsio.com). This driver supports the Chelsio N210 NIC and is backward compatible with the Chelsio N110 model 10Gb NICs. It supports AMD64, EM64T and x86 systems. Signed-off-by: Tina Yang Signed-off-by: Scott Bardone Signed-off-by: Christoph Lameter Adrian said: - my3126.c is unused (because t1_my3126_ops isn't used anywhere) - what are the EXTRA_CFLAGS in drivers/net/chelsio/Makefile for? - $(cxgb-y) in drivers/net/chelsio/Makefile seems to be unneeded - completely unused global functions: - espi.c: t1_espi_get_intr_counts - sge.c: t1_sge_get_intr_counts - the following functions can be made static: - sge.c: t1_espi_workaround - sge.c: t1_sge_tx - subr.c: __t1_tpi_read - subr.c: __t1_tpi_write - subr.c: t1_wait_op_done shemminger said: The performance recommendations in cxgb.txt are common to all fast devices, and should be in one file rather than just for this device. I would rather see ip-sysctl.txt updated or a new file on tuning recommendations started. Some of them have consequences that aren't documented well. For example, turning off TCP timestamps risks data corruption from sequence wrap. A new driver shouldn't need so may #ifdef's unless you want to putit on older vendor versions of 2.4 Some accessor and wrapper functions like: t1_pci_read_config_4 adapter_name t1_malloc are just annoying noise. Why have useless dead code like: /* Interrupt handler */ +static int pm3393_interrupt_handler(struct cmac *cmac) +{ + u32 master_intr_status; +/* + 1. Read master interrupt register. + 2. Read BLOCK's interrupt status registers. + 3. Handle BLOCK interrupts. +*/ Jeff said: step 1: kill all the OS wrappers. And do you really need hooks for multiple MACs, when only one MAC is really supported? Typically these hooks are at a higher level anyway -- struct net_device. From: Christoph Lameter Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton diff -puN /dev/null Documentation/networking/cxgb.txt commit ff1d2767d5a43c85f944e86a45284b721f66196c tree 91c1b6dd20bd772bc112c0012830678b46b69604 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Jouni Malinen Thu, 12 May 2005 22:54:16 -0400 committer Jeff Garzik Thu, 12 May 2005 22:54:16 -0400 Add HostAP wireless driver. Includes minor cleanups from Adrian Bunk . commit b453872c35cfcbdbf5a794737817f7d4e7b1b579 tree 6639da0b12e3f071b57f388c97d28e451f8f3cd3 parent fff9cfd99c0f88645c3f50d7476d6c8cef99f140 author Jeff Garzik Thu, 12 May 2005 22:48:20 -0400 committer Jeff Garzik Thu, 12 May 2005 22:48:20 -0400 [NET] ieee80211 subsystem Contributors: Host AP contributors James Ketrenos Francois Romieu Adrian Bunk Matthew Galgoci